From edf1a3e7b44231fee3cf5ab2df0c78e35e9f48e6 Mon Sep 17 00:00:00 2001 From: Amish Shah Date: Sun, 30 Apr 2017 11:56:24 +0100 Subject: [PATCH] Undeprecate uws and fix support for it --- src/client/websocket/WebSocketConnection.js | 5 ++--- test/random.js | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/client/websocket/WebSocketConnection.js b/src/client/websocket/WebSocketConnection.js index 392a10afb..bcd6f57ca 100644 --- a/src/client/websocket/WebSocketConnection.js +++ b/src/client/websocket/WebSocketConnection.js @@ -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() { if (browser) return window.WebSocket; // eslint-disable-line no-undef try { - return getUWS(); + return require('uws'); } catch (e) { return require('ws'); } @@ -346,6 +344,7 @@ class WebSocketConnection extends EventEmitter { */ onError(error) { this.client.emit(Constants.Events.ERROR, error); + if (error.message === 'uWs client connection error') this.reconnect(); } /** diff --git a/test/random.js b/test/random.js index a7450a26e..6cc9ed559 100644 --- a/test/random.js +++ b/test/random.js @@ -19,8 +19,8 @@ client.on('ready', () => { client.on('debug', console.log); -client.on('error', m => console.log('debug', m)); -client.on('reconnecting', m => console.log('debug', m)); +client.on('error', m => console.log('debug', new Error(m).stack)); +client.on('reconnecting', m => console.log('reconnecting', m)); client.on('message', message => { if (true) {