From 45f0c31949e892faff37cacf9645fbc6354b3e5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 7 Jan 2023 19:11:59 +0000 Subject: [PATCH] chore(deps): update dependency mock-socket to v8.1.1 --- package-lock.json | 68 ++++---------------------- package.json | 2 +- test/services/webSocketServer/index.ts | 7 ++- 3 files changed, 13 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index f64ec42..2fafccd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "chai": "^4.2.0", "eslint": "^6.8.0", "mocha": "^10.1.0", - "mock-socket": "8.0.5", + "mock-socket": "^9.1.5", "nodemon": "^2.0.20", "npm-run-all": "^4.1.5", "nyc": "^15.1.0", @@ -5371,15 +5371,12 @@ } }, "node_modules/mock-socket": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-8.0.5.tgz", - "integrity": "sha512-dE2EbcxJKQCeYLZSsI7BAiMZCe/bHbJ2LHb5aGwUuDmfoOINEJ8QI6qYJ85NHsSNkNa90F3s6onZcmt/+MppFA==", + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.1.5.tgz", + "integrity": "sha512-3DeNIcsQixWHHKk6NdoBhWI4t1VMj5/HzfnI1rE/pLl5qKx7+gd4DNA07ehTaZ6MoUU053si6Hd+YtiM/tQZfg==", "dev": true, - "dependencies": { - "url-parse": "^1.2.0" - }, "engines": { - "node": ">= 6" + "node": ">= 8" } }, "node_modules/modify-values": { @@ -8949,12 +8946,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -9306,12 +9297,6 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, "node_modules/resolve": { "version": "1.22.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", @@ -10724,16 +10709,6 @@ "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==", "dev": true }, - "node_modules/url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -15173,13 +15148,10 @@ } }, "mock-socket": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-8.0.5.tgz", - "integrity": "sha512-dE2EbcxJKQCeYLZSsI7BAiMZCe/bHbJ2LHb5aGwUuDmfoOINEJ8QI6qYJ85NHsSNkNa90F3s6onZcmt/+MppFA==", - "dev": true, - "requires": { - "url-parse": "^1.2.0" - } + "version": "9.1.5", + "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-9.1.5.tgz", + "integrity": "sha512-3DeNIcsQixWHHKk6NdoBhWI4t1VMj5/HzfnI1rE/pLl5qKx7+gd4DNA07ehTaZ6MoUU053si6Hd+YtiM/tQZfg==", + "dev": true }, "modify-values": { "version": "1.0.1", @@ -17712,12 +17684,6 @@ "side-channel": "^1.0.4" } }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -17981,12 +17947,6 @@ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, "resolve": { "version": "1.22.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", @@ -19060,16 +19020,6 @@ "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==", "dev": true }, - "url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/package.json b/package.json index 778e191..641fe7f 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "chai": "^4.2.0", "eslint": "^6.8.0", "mocha": "^10.1.0", - "mock-socket": "8.0.5", + "mock-socket": "^9.1.5", "nodemon": "^2.0.20", "npm-run-all": "^4.1.5", "nyc": "^15.1.0", diff --git a/test/services/webSocketServer/index.ts b/test/services/webSocketServer/index.ts index 705b2a6..0cc0ff9 100644 --- a/test/services/webSocketServer/index.ts +++ b/test/services/webSocketServer/index.ts @@ -10,7 +10,6 @@ type Destroyable = T & { destroy?: () => Promise; }; const checkOpen = async (c: WebSocket): Promise => { return new Promise(resolve => { c.onmessage = (event: object & { data?: string; }): void => { - c.onmessage = null; const message = JSON.parse(event.data as string); resolve(message.type === MessageType.OPEN); }; @@ -22,7 +21,6 @@ const checkSequence = async (c: WebSocket, msgs: { type: MessageType; error?: Er const restMessages = [...msgs]; const finish = (success = false): void => { - c.onmessage = null; resolve(success); }; @@ -57,7 +55,7 @@ const createTestServer = ({ realm, config, url }: { realm: Realm; config: { path const server = new Server(url); const webSocketServer: Destroyable = new WebSocketServer({ server, realm, config }); - server.on('connection', (socket: WebSocket & { on?: (eventName: string, callback: () => void) => void; }) => { + server.on('connection', (socket) => { const s = webSocketServer.socketServer; s.emit('connection', socket, { url: socket.url }); @@ -149,7 +147,8 @@ describe('WebSocketServer', () => { const fakeURL = 'ws://localhost:8080/peerjs'; const createClient = (id: string): Destroyable => { - const url = `${fakeURL}?key=${config.key}&id=${id}&token=${id}`; + // id in the path ensures that all mock servers listen on different urls + const url = `${fakeURL}${id}?key=${config.key}&id=${id}&token=${id}`; const webSocketServer = createTestServer({ url, realm, config }); const ws: Destroyable = new WebSocket(url);