Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Undeprecate uws and fix support for it

Browse Source
This commit is contained in:
Amish Shah
2017-04-30 11:56:24 +01:00
parent f20f49388d
commit edf1a3e7b4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,12 +14,10 @@ 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 getUWS(); return require('uws');
} catch (e) { } catch (e) {
return require('ws'); return require('ws');
} }
@@ -346,6 +344,7 @@ class WebSocketConnection extends EventEmitter {
*/ */
onError(error) { onError(error) {
this.client.emit(Constants.Events.ERROR, error); this.client.emit(Constants.Events.ERROR, error);
if (error.message === 'uWs client connection error') this.reconnect();
} }
/** /**

4
test/random.js
View File

@@ -19,8 +19,8 @@ client.on('ready', () => {
client.on('debug', console.log); client.on('debug', console.log);
client.on('error', m => console.log('debug', m)); client.on('error', m => console.log('debug', new Error(m).stack));
client.on('reconnecting', m => console.log('debug', m)); client.on('reconnecting', m => console.log('reconnecting', m));
client.on('message', message => { client.on('message', message => {
if (true) { if (true) {