Replace faye-websocket with isomorphic-ws

mopidy · Oct 9, 2018 · 703d18b82c34ab779471aa0cb2e5d90a3c39cb26 · 703d18b
1 parent e2e2118
commit 703d18b82c34ab779471aa0cb2e5d90a3c39cb26
Unified Split

Showing with 22 additions and 35 deletions.

+5 −0 README.md

+0 −1 lib/websocket/browser.js

+0 −4 lib/websocket/package.json

+0 −1 lib/websocket/server.js

+3 −2 package.json

+2 −2 src/mopidy.js

+12 −25 yarn.lock
diff --git a/README.md b/README.md
@@ -86,6 +86,11 @@ yarn build
  const Mopidy = new Mopidy(...);
  ```

+- Modernized dependencies:
+
+  - `isomorphic-ws` and `ws` has replaced our own wrapper around the browser's
+    `WebSocket` API and `faye-websocket` on Node.
+
 - Modernized development stack:

  - Testing: Jest has replaced Buster.JS and Sinon.
diff --git a/lib/websocket/browser.js b/lib/websocket/browser.js
diff --git a/lib/websocket/package.json b/lib/websocket/package.json
diff --git a/lib/websocket/server.js b/lib/websocket/server.js
diff --git a/package.json b/package.json
@@ -39,8 +39,9 @@
  },
  "dependencies": {
    "bane": "~1.1.0",
-    "faye-websocket": "~0.9.2",
-    "when": "~3.7.2"
+    "isomorphic-ws": "^4.0.1",
+    "when": "~3.7.2",
+    "ws": "^6.1.0"
  },
  "devDependencies": {
    "eslint-config-airbnb-base": "^13.1.0",
diff --git a/src/mopidy.js b/src/mopidy.js
@@ -1,6 +1,6 @@
 const bane = require("bane");
 const when = require("when");
-const websocket = require("../lib/websocket/");
+const WebSocket = require("isomorphic-ws");

 class Mopidy {
  constructor(settings) {
@@ -312,7 +312,7 @@ class ServerError extends Error {
 }
 Mopidy.ServerError = ServerError;

-Mopidy.WebSocket = websocket.Client;
+Mopidy.WebSocket = WebSocket;

 Mopidy.when = when;

diff --git a/yarn.lock b/yarn.lock