Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-18 12:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rudimentary support for uws while it is deprecated

Browse Source
This commit is contained in:
Amish Shah
2017-04-30 11:36:20 +01:00
parent 8e5c600227
commit 007b1226c9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/websocket/WebSocketConnection.js
View File

@@ -2,6 +2,7 @@ const browser = require('os').platform() === 'browser';
const EventEmitter = require('events'); const EventEmitter = require('events');
const Constants = require('../../util/Constants'); const Constants = require('../../util/Constants');
const zlib = require('zlib'); const zlib = require('zlib');
const util = require('util');
const PacketManager = require('./packets/WebSocketPacketManager'); const PacketManager = require('./packets/WebSocketPacketManager');
const erlpack = (function findErlpack() { const erlpack = (function findErlpack() {
try { try {
@@ -13,10 +14,12 @@ const erlpack = (function findErlpack() {
} }
}()); }());
const getUWS = util.deprecate(() => require('uws'), 'uws will soon no longer be supported, use ws instead');
const WebSocket = (function findWebSocket() { const WebSocket = (function findWebSocket() {
if (browser) return window.WebSocket; // eslint-disable-line no-undef if (browser) return window.WebSocket; // eslint-disable-line no-undef
try { try {
return require('uws'); return getUWS();
} catch (e) { } catch (e) {
return require('ws'); return require('ws');
} }
@@ -159,7 +162,10 @@ class WebSocketConnection extends EventEmitter {
if (erlpack && typeof data !== 'string') { if (erlpack && typeof data !== 'string') {
if (data instanceof ArrayBuffer) data = Buffer.from(new Uint8Array(data)); if (data instanceof ArrayBuffer) data = Buffer.from(new Uint8Array(data));
return erlpack.unpack(data); return erlpack.unpack(data);
} else if (data instanceof ArrayBuffer || data instanceof Buffer) { } else if (data instanceof ArrayBuffer) {
data = Buffer.from(data);
}
if (data instanceof Buffer) {
data = zlib.inflateSync(data).toString(); data = zlib.inflateSync(data).toString();
} }
return JSON.parse(data); return JSON.parse(data);
@@ -324,7 +330,7 @@ class WebSocketConnection extends EventEmitter {
* @param {Event} event Received open event * @param {Event} event Received open event
*/ */
onOpen(event) { onOpen(event) {
this.gateway = event.target.url; if (event && event.target && event.target.url) this.gateway = event.target.url;
this.debug(`Connected to gateway ${this.gateway}`); this.debug(`Connected to gateway ${this.gateway}`);
this.identify(); this.identify();
} }