Skip to content

Commit 703d18b

Browse files
committed
Replace faye-websocket with isomorphic-ws
1 parent e2e2118 commit 703d18b

File tree

7 files changed

+22
-35
lines changed

7 files changed

+22
-35
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ yarn build
8686
const Mopidy = new Mopidy(...);
8787
```
8888

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

9196
- Testing: Jest has replaced Buster.JS and Sinon.

lib/websocket/browser.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/websocket/package.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

lib/websocket/server.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@
3939
},
4040
"dependencies": {
4141
"bane": "~1.1.0",
42-
"faye-websocket": "~0.9.2",
43-
"when": "~3.7.2"
42+
"isomorphic-ws": "^4.0.1",
43+
"when": "~3.7.2",
44+
"ws": "^6.1.0"
4445
},
4546
"devDependencies": {
4647
"eslint-config-airbnb-base": "^13.1.0",

src/mopidy.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const bane = require("bane");
22
const when = require("when");
3-
const websocket = require("../lib/websocket/");
3+
const WebSocket = require("isomorphic-ws");
44

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

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

317317
Mopidy.when = when;
318318

yarn.lock

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2758,13 +2758,6 @@ fast-levenshtein@~2.0.4:
27582758
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
27592759
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
27602760

2761-
faye-websocket@~0.9.2:
2762-
version "0.9.4"
2763-
resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.9.4.tgz#885934c79effb0409549e0c0a3801ed17a40cdad"
2764-
integrity sha1-iFk0x57/sECVSeDAo4Ae0XpAza0=
2765-
dependencies:
2766-
websocket-driver ">=0.5.1"
2767-
27682761
fb-watchman@^2.0.0:
27692762
version "2.0.0"
27702763
resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
@@ -3250,11 +3243,6 @@ http-errors@~1.6.2:
32503243
setprototypeof "1.1.0"
32513244
statuses ">= 1.4.0 < 2"
32523245

3253-
http-parser-js@>=0.4.0:
3254-
version "0.4.13"
3255-
resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
3256-
integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
3257-
32583246
http-signature@~1.2.0:
32593247
version "1.2.0"
32603248
resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -3724,6 +3712,11 @@ isobject@^3.0.0, isobject@^3.0.1:
37243712
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
37253713
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
37263714

3715+
isomorphic-ws@^4.0.1:
3716+
version "4.0.1"
3717+
resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc"
3718+
integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==
3719+
37273720
isstream@~0.1.2:
37283721
version "0.1.2"
37293722
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -7311,19 +7304,6 @@ webidl-conversions@^4.0.2:
73117304
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
73127305
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
73137306

7314-
websocket-driver@>=0.5.1:
7315-
version "0.7.0"
7316-
resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
7317-
integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
7318-
dependencies:
7319-
http-parser-js ">=0.4.0"
7320-
websocket-extensions ">=0.1.1"
7321-
7322-
websocket-extensions@>=0.1.1:
7323-
version "0.1.3"
7324-
resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
7325-
integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
7326-
73277307
whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
73287308
version "1.0.5"
73297309
resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
@@ -7429,6 +7409,13 @@ ws@^5.1.1, ws@^5.2.0:
74297409
dependencies:
74307410
async-limiter "~1.0.0"
74317411

7412+
ws@^6.1.0:
7413+
version "6.1.0"
7414+
resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.0.tgz#119a9dbf92c54e190ec18d10e871d55c95cf9373"
7415+
integrity sha512-H3dGVdGvW2H8bnYpIDc3u3LH8Wue3Qh+Zto6aXXFzvESkTVT6rAfKR6tR/+coaUvxs8yHtmNV0uioBF62ZGSTg==
7416+
dependencies:
7417+
async-limiter "~1.0.0"
7418+
74327419
xml-name-validator@^3.0.0:
74337420
version "3.0.0"
74347421
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

0 commit comments

Comments
 (0)