From 641ee861053140e746d6a5711eef1094a037f549 Mon Sep 17 00:00:00 2001 From: Crawl Date: Fri, 31 Aug 2018 00:55:31 +0200 Subject: [PATCH] build(peer-deps): use uws fork backport (#2782) * build(peer-deps): uws backport * chore: update to 149 for uws --- README.md | 2 +- docs/general/welcome.md | 2 +- package.json | 3 ++- src/client/voice/VoiceWebSocket.js | 2 +- src/client/websocket/WebSocketConnection.js | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 342c50237..e75f67063 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ For production bots, using node-opus should be considered a necessity, especiall - One of the following packages can be installed for faster voice packet encryption and decryption: - [sodium](https://www.npmjs.com/package/sodium) (`npm install sodium`) - [libsodium.js](https://www.npmjs.com/package/libsodium-wrappers) (`npm install libsodium-wrappers`) -- [uws](https://www.npmjs.com/package/uws) for a much faster WebSocket connection (`npm install uws`) +- [uws](https://www.npmjs.com/package/@discordjs/uws) for a much faster WebSocket connection (`npm install @discordjs/uws`) ## Example usage ```js diff --git a/docs/general/welcome.md b/docs/general/welcome.md index 34e5e67bc..8f7c0181e 100644 --- a/docs/general/welcome.md +++ b/docs/general/welcome.md @@ -52,7 +52,7 @@ For production bots, using node-opus should be considered a necessity, especiall - One of the following packages can be installed for faster voice packet encryption and decryption: - [sodium](https://www.npmjs.com/package/sodium) (`npm install sodium`) - [libsodium.js](https://www.npmjs.com/package/libsodium-wrappers) (`npm install libsodium-wrappers`) -- [uws](https://www.npmjs.com/package/uws) for a much faster WebSocket connection (`npm install uws`) +- [uws](https://www.npmjs.com/package/@discordjs/uws) for a much faster WebSocket connection (`npm install @discordjs/uws`) ## Example usage ```js diff --git a/package.json b/package.json index 9e77c360a..39a3c2af8 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "node-opus": "^0.2.7", "opusscript": "^0.0.6", "sodium": "^2.0.3", - "uws": "<=10.148.1" + "@discordjs/uws": "^10.149.0" }, "devDependencies": { "@types/node": "^9.4.6", @@ -65,6 +65,7 @@ "browser": { "ws": false, "uws": false, + "@discordjs/uws": false, "erlpack": false, "prism-media": false, "opusscript": false, diff --git a/src/client/voice/VoiceWebSocket.js b/src/client/voice/VoiceWebSocket.js index 9179232fe..e0d532ecd 100644 --- a/src/client/voice/VoiceWebSocket.js +++ b/src/client/voice/VoiceWebSocket.js @@ -4,7 +4,7 @@ const EventEmitter = require('events').EventEmitter; let WebSocket; try { - WebSocket = require('uws'); + WebSocket = require('@discordjs/uws'); } catch (err) { WebSocket = require('ws'); } diff --git a/src/client/websocket/WebSocketConnection.js b/src/client/websocket/WebSocketConnection.js index 03b02a054..d56f8032f 100644 --- a/src/client/websocket/WebSocketConnection.js +++ b/src/client/websocket/WebSocketConnection.js @@ -16,7 +16,7 @@ const erlpack = (function findErlpack() { const WebSocket = (function findWebSocket() { if (browser) return window.WebSocket; // eslint-disable-line no-undef try { - return require('uws'); + return require('@discordjs/uws'); } catch (e) { return require('ws'); }