From 6b80626dca9bb7bdfffb899423d71b899fdbd9e9 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 17 Sep 2018 23:59:50 +0200
Subject: [PATCH] Replace `uws` with `ws` package

`uws` was deprecated by its maintainer and starts to cause more and more
problems and issue reports. So it's time to replace it and use a
maintained project instead. Lucky us, `uws` and `ws` can be used in an
identical way, without problems. To provide better performance, we
install the optional packages as well.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 app.js       | 2 +-
 package.json | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app.js b/app.js
index 24f0516f1..cd7ce9154 100644
--- a/app.js
+++ b/app.js
@@ -58,7 +58,7 @@ app.use(morgan('combined', {
 
 // socket io
 var io = require('socket.io')(server)
-io.engine.ws = new (require('uws').Server)({
+io.engine.ws = new (require('ws').Server)({
   noServer: true,
   perMessageDeflate: false
 })
diff --git a/package.json b/package.json
index b257a1149..598cfe40c 100644
--- a/package.json
+++ b/package.json
@@ -125,12 +125,12 @@
     "to-markdown": "^3.0.3",
     "toobusy-js": "^0.5.1",
     "uuid": "^3.1.0",
-    "uws": "~0.14.1",
     "validator": "^10.4.0",
     "velocity-animate": "^1.4.0",
     "visibilityjs": "^1.2.4",
     "viz.js": "^1.7.0",
     "winston": "^2.3.0",
+    "ws": "^6.0.0",
     "xss": "^1.0.3"
   },
   "engines": {
@@ -211,5 +211,9 @@
       "lib/ot",
       "public/vendor"
     ]
+  },
+  "optionalDependencies": {
+    "bufferutil": "^4.0.0",
+    "utf-8-validate": "^5.0.1"
   }
 }