From 4f21c36825313fbecb61a0c16b9ae55ba9a81eaa Mon Sep 17 00:00:00 2001
From: Zeal Murapa <1701383+GoGross@users.noreply.github.com>
Date: Mon, 29 Jul 2019 05:17:09 +0200
Subject: [PATCH] Update ParseWebSocketServer.js (#5860)

* Update ParseWebSocketServer.js

fix wss:// error by requiring 'ws' module, remove uws as it has been deprecated and removed from npm

* Update ParseWebSocketServer.js

* remove uws
---
 package-lock.json                     | 6 ------
 package.json                          | 3 +--
 src/LiveQuery/ParseWebSocketServer.js | 8 ++------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 18ae32c0..e9c86398 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11046,12 +11046,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
     },
-    "uws": {
-      "version": "10.148.1",
-      "resolved": "https://registry.npmjs.org/uws/-/uws-10.148.1.tgz",
-      "integrity": "sha1-/Rp5z2EYo4jgob7YoTlwMNLE/Sw=",
-      "optional": true
-    },
     "v8-compile-cache": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
diff --git a/package.json b/package.json
index 2f6a1740..573d700a 100644
--- a/package.json
+++ b/package.json
@@ -108,8 +108,7 @@
     "parse-server": "./bin/parse-server"
   },
   "optionalDependencies": {
-    "bcrypt": "3.0.6",
-    "uws": "10.148.1"
+    "bcrypt": "3.0.6"
   },
   "collective": {
     "type": "opencollective",
diff --git a/src/LiveQuery/ParseWebSocketServer.js b/src/LiveQuery/ParseWebSocketServer.js
index 1ec05c58..774a42d1 100644
--- a/src/LiveQuery/ParseWebSocketServer.js
+++ b/src/LiveQuery/ParseWebSocketServer.js
@@ -1,12 +1,8 @@
 import logger from '../logger';
 
 const typeMap = new Map([['disconnect', 'close']]);
-const getWS = function() {
-  try {
-    return require('uws');
-  } catch (e) {
-    return require('ws');
-  }
+const getWS = function(){
+  return require('ws');
 };
 
 export class ParseWebSocketServer {