dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-05-25 21:12:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove old uws-specific code (0.11.1 has the good stuff)

Browse source
This commit is contained in:
Schuyler Cebulskie 2016-11-25 19:40:53 -05:00
parent eedc097f3f
commit c683790de7
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -32,7 +32,7 @@
"pako": "^1.0.3",
"superagent": "^3.0.0",
"tweetnacl": "^0.14.3",
"uws": "^0.11.0"
"uws": "^0.11.1"
},
"peerDependencies": {
"node-opus": "^0.2.0",

9
src/client/voice/VoiceWebSocket.js
View file

@ -72,15 +72,10 @@ class VoiceWebSocket extends EventEmitter {
* @type {WebSocket}
*/
this.ws = new WebSocket(`wss://${this.voiceConnection.authentication.endpoint}`);
if (typeof window !== 'undefined') {
this.ws.onopen = this.onOpen.bind(this);
this.ws.onerror = this.onError.bind(this);
} else {
this.ws.on('open', this.onOpen.bind(this));
this.ws.on('error', this.onError.bind(this));
}
this.ws.onopen = this.onOpen.bind(this);
this.ws.onmessage = this.onMessage.bind(this);
this.ws.onclose = this.onClose.bind(this);
this.ws.onerror = this.onError.bind(this);
}
/**

15
src/client/websocket/WebSocketManager.js
View file

@ -79,16 +79,11 @@ class WebSocketManager extends EventEmitter {
this.normalReady = false;
if (this.status !== Constants.Status.RECONNECTING) this.status = Constants.Status.CONNECTING;
this.ws = new WebSocket(gateway);
if (browser) {
this.ws.binaryType = 'arraybuffer';
this.ws.onopen = () => this.eventOpen();
this.ws.onerror = (e) => this.eventError(e);
} else {
this.ws.on('open', this.eventOpen.bind(this));
this.ws.on('error', this.eventError.bind(this));
}
this.ws.onclose = (d) => this.eventClose(d);
this.ws.onmessage = (e) => this.eventMessage(e);
if (browser) this.ws.binaryType = 'arraybuffer';
this.ws.onopen = this.eventOpen.bind(this);
this.ws.onmessage = this.eventMessage.bind(this);
this.ws.onclose = this.eventClose.bind(this);
this.ws.onerror = this.eventError.bind(this);
this._queue = [];
this._remaining = 3;
}