From 5fec7d611a1b4fd52d1aebc61acb0339c9576423 Mon Sep 17 00:00:00 2001 From: Wang Guan Date: Mon, 12 Aug 2024 22:42:43 +0900 Subject: [PATCH 1/6] remove prettier v2 --- package-lock.json | 31 ++++++-------------------- package.json | 3 ++- packages/engine.io-parser/package.json | 3 --- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8cc71e0c8e..e31a69bcbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "socket.io", "workspaces": [ "packages/socket.io-component-emitter", "packages/engine.io-parser", @@ -51,7 +52,7 @@ "mocha": "^10.6.0", "node-forge": "^1.3.1", "nyc": "^17.0.0", - "prettier": "^2.8.8", + "prettier": "^3.3.2", "redis": "^4.6.15", "rimraf": "^6.0.0", "rollup": "^2.79.1", @@ -11320,15 +11321,15 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -15200,28 +15201,10 @@ "packages/engine.io-parser": { "version": "5.2.3", "license": "MIT", - "devDependencies": { - "prettier": "^3.3.2" - }, "engines": { "node": ">=10.0.0" } }, - "packages/engine.io-parser/node_modules/prettier": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", - "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", - "dev": true, - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "packages/engine.io/node_modules/debug": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", diff --git a/package.json b/package.json index 615d8bb067..d10a0029bf 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,5 @@ { + "name": "socket.io", "private": true, "workspaces": [ "packages/socket.io-component-emitter", @@ -52,7 +53,7 @@ "mocha": "^10.6.0", "node-forge": "^1.3.1", "nyc": "^17.0.0", - "prettier": "^2.8.8", + "prettier": "^3.3.2", "redis": "^4.6.15", "rimraf": "^6.0.0", "rollup": "^2.79.1", diff --git a/packages/engine.io-parser/package.json b/packages/engine.io-parser/package.json index 94a505d006..d661db3209 100644 --- a/packages/engine.io-parser/package.json +++ b/packages/engine.io-parser/package.json @@ -10,9 +10,6 @@ "require": "./build/cjs/index.js" }, "types": "build/esm/index.d.ts", - "devDependencies": { - "prettier": "^3.3.2" - }, "scripts": { "compile": "rimraf ./build && tsc && tsc -p tsconfig.esm.json && ./postcompile.sh", "test": "npm run format:check && npm run compile && if test \"$BROWSERS\" = \"1\" ; then npm run test:browser; else npm run test:node; fi", From 5cd666e750081eea09e9873dde8483004bc1f720 Mon Sep 17 00:00:00 2001 From: Wang Guan Date: Mon, 12 Aug 2024 22:56:47 +0900 Subject: [PATCH 2/6] make prettier happy --- packages/socket.io-parser/test/blob.js | 12 +++++----- packages/socket.io-parser/test/index.js | 12 +++++----- packages/socket.io-parser/test/parser.js | 28 ++++++++++++------------ packages/socket.io-parser/wdio.conf.js | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/socket.io-parser/test/blob.js b/packages/socket.io-parser/test/blob.js index 6030258329..6248241f0b 100644 --- a/packages/socket.io-parser/test/blob.js +++ b/packages/socket.io-parser/test/blob.js @@ -5,12 +5,12 @@ const BlobBuilderImpl = typeof BlobBuilder !== "undefined" ? BlobBuilder : typeof WebKitBlobBuilder !== "undefined" - ? WebKitBlobBuilder - : typeof MSBlobBuilder !== "undefined" - ? MSBlobBuilder - : typeof MozBlobBuilder !== "undefined" - ? MozBlobBuilder - : false; + ? WebKitBlobBuilder + : typeof MSBlobBuilder !== "undefined" + ? MSBlobBuilder + : typeof MozBlobBuilder !== "undefined" + ? MozBlobBuilder + : false; describe("Blob", () => { it("encodes a Blob", () => { diff --git a/packages/socket.io-parser/test/index.js b/packages/socket.io-parser/test/index.js index 06114c8a41..3c73eb1765 100644 --- a/packages/socket.io-parser/test/index.js +++ b/packages/socket.io-parser/test/index.js @@ -15,12 +15,12 @@ const BlobBuilderImpl = typeof BlobBuilder !== "undefined" ? BlobBuilder : typeof WebKitBlobBuilder !== "undefined" - ? WebKitBlobBuilder - : typeof MSBlobBuilder !== "undefined" - ? MSBlobBuilder - : typeof MozBlobBuilder !== "undefined" - ? MozBlobBuilder - : false; + ? WebKitBlobBuilder + : typeof MSBlobBuilder !== "undefined" + ? MSBlobBuilder + : typeof MozBlobBuilder !== "undefined" + ? MozBlobBuilder + : false; const blobBuilderSupported = !!BlobBuilderImpl && !!BlobBuilderImpl.prototype.append && diff --git a/packages/socket.io-parser/test/parser.js b/packages/socket.io-parser/test/parser.js index 1b7a415727..0bbc5716ea 100644 --- a/packages/socket.io-parser/test/parser.js +++ b/packages/socket.io-parser/test/parser.js @@ -110,7 +110,7 @@ describe("socket.io-parser", () => { it("throw an error upon parsing error", () => { const isInvalidPayload = (str) => expect(() => new Decoder().add(str)).to.throwException( - /^invalid payload$/ + /^invalid payload$/, ); isInvalidPayload('442["some","data"'); @@ -126,11 +126,11 @@ describe("socket.io-parser", () => { isInvalidPayload('2["disconnect","123"]'); expect(() => new Decoder().add("999")).to.throwException( - /^unknown packet type 9$/ + /^unknown packet type 9$/, ); expect(() => new Decoder().add(999)).to.throwException( - /^Unknown type: 999$/ + /^Unknown type: 999$/, ); }); @@ -154,7 +154,7 @@ describe("socket.io-parser", () => { isPacketValid({ type: 0, nsp: "/", - }) + }), ).to.eql(true); expect( @@ -162,7 +162,7 @@ describe("socket.io-parser", () => { type: 0, nsp: "/admin", data: "invalid", - }) + }), ).to.eql(false); expect( @@ -170,7 +170,7 @@ describe("socket.io-parser", () => { type: 0, nsp: "/", data: [], - }) + }), ).to.eql(false); expect( @@ -178,7 +178,7 @@ describe("socket.io-parser", () => { type: 1, nsp: "/admin", data: {}, - }) + }), ).to.eql(false); expect( @@ -186,7 +186,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/admin", data: "invalid", - }) + }), ).to.eql(false); expect( @@ -194,7 +194,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/admin", data: {}, - }) + }), ).to.eql(false); expect( @@ -202,7 +202,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: { toString: "foo" }, - }) + }), ).to.eql(false); expect( @@ -210,7 +210,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: [true, "foo"], - }) + }), ).to.eql(false); expect( @@ -218,7 +218,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: [null, "bar"], - }) + }), ).to.eql(false); expect( @@ -226,7 +226,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: ["connect"], - }) + }), ).to.eql(false); expect( @@ -234,7 +234,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: ["disconnect", "123"], - }) + }), ).to.eql(false); }); }); diff --git a/packages/socket.io-parser/wdio.conf.js b/packages/socket.io-parser/wdio.conf.js index c8c592a4f6..b5dc800a96 100644 --- a/packages/socket.io-parser/wdio.conf.js +++ b/packages/socket.io-parser/wdio.conf.js @@ -72,7 +72,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, { @@ -85,7 +85,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, ]; From f606cde1ee70686ba7b8a1e904a0009bb0e3157f Mon Sep 17 00:00:00 2001 From: Wang Guan Date: Mon, 12 Aug 2024 23:02:57 +0900 Subject: [PATCH 3/6] make prettier happy --- packages/socket.io-client/lib/index.ts | 4 ++-- packages/socket.io-client/lib/manager.ts | 8 ++++---- packages/socket.io-client/lib/on.ts | 2 +- packages/socket.io-client/lib/socket.ts | 18 +++++++++--------- packages/socket.io-client/lib/url.ts | 2 +- packages/socket.io-client/test/connection.ts | 2 +- packages/socket.io-client/test/socket.ts | 2 +- .../test/typed-events.test-d.ts | 8 ++++---- packages/socket.io-client/wdio.conf.js | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/socket.io-client/lib/index.ts b/packages/socket.io-client/lib/index.ts index 938ca86319..9ecc0b8005 100644 --- a/packages/socket.io-client/lib/index.ts +++ b/packages/socket.io-client/lib/index.ts @@ -25,11 +25,11 @@ const cache: Record = {}; function lookup(opts?: Partial): Socket; function lookup( uri: string, - opts?: Partial + opts?: Partial, ): Socket; function lookup( uri?: string | Partial, - opts?: Partial + opts?: Partial, ): Socket { if (typeof uri === "object") { opts = uri; diff --git a/packages/socket.io-client/lib/manager.ts b/packages/socket.io-client/lib/manager.ts index 6f7c61c094..8330af13ff 100644 --- a/packages/socket.io-client/lib/manager.ts +++ b/packages/socket.io-client/lib/manager.ts @@ -100,7 +100,7 @@ interface ManagerReservedEvents { export class Manager< ListenEvents extends EventsMap = DefaultEventsMap, - EmitEvents extends EventsMap = ListenEvents + EmitEvents extends EventsMap = ListenEvents, > extends Emitter<{}, {}, ManagerReservedEvents> { /** * The Engine.IO client instance @@ -152,11 +152,11 @@ export class Manager< constructor(uri?: string, opts?: Partial); constructor( uri?: string | Partial, - opts?: Partial + opts?: Partial, ); constructor( uri?: string | Partial, - opts?: Partial + opts?: Partial, ) { super(); if (uri && "object" === typeof uri) { @@ -405,7 +405,7 @@ export class Manager< on(socket, "error", this.onerror.bind(this)), on(socket, "close", this.onclose.bind(this)), // @ts-ignore - on(this.decoder, "decoded", this.ondecoded.bind(this)) + on(this.decoder, "decoded", this.ondecoded.bind(this)), ); } diff --git a/packages/socket.io-client/lib/on.ts b/packages/socket.io-client/lib/on.ts index 50bc6fdc6d..fe879343cd 100644 --- a/packages/socket.io-client/lib/on.ts +++ b/packages/socket.io-client/lib/on.ts @@ -3,7 +3,7 @@ import { Emitter } from "@socket.io/component-emitter"; export function on( obj: Emitter, ev: string, - fn: (err?: any) => any + fn: (err?: any) => any, ): VoidFunction { obj.on(ev, fn); return function subDestroy(): void { diff --git a/packages/socket.io-client/lib/socket.ts b/packages/socket.io-client/lib/socket.ts index e65ab4dd83..1f4255d66c 100644 --- a/packages/socket.io-client/lib/socket.ts +++ b/packages/socket.io-client/lib/socket.ts @@ -116,7 +116,7 @@ interface SocketReservedEvents { connect_error: (err: Error) => void; disconnect: ( reason: Socket.DisconnectReason, - description?: DisconnectDescription + description?: DisconnectDescription, ) => void; } @@ -146,7 +146,7 @@ interface SocketReservedEvents { */ export class Socket< ListenEvents extends EventsMap = DefaultEventsMap, - EmitEvents extends EventsMap = ListenEvents + EmitEvents extends EventsMap = ListenEvents, > extends Emitter { public readonly io: Manager; @@ -554,7 +554,7 @@ export class Socket< debug( "packet [%d] is discarded after %d tries", packet.id, - packet.tryCount + packet.tryCount, ); this._queue.shift(); if (ack) { @@ -591,7 +591,7 @@ export class Socket< if (packet.pending && !force) { debug( "packet [%d] has already been sent and is waiting for an ack", - packet.id + packet.id, ); return; } @@ -665,7 +665,7 @@ export class Socket< */ private onclose( reason: Socket.DisconnectReason, - description?: DisconnectDescription + description?: DisconnectDescription, ): void { debug("close (%s)", reason); this.connected = false; @@ -683,7 +683,7 @@ export class Socket< private _clearAcks() { Object.keys(this.acks).forEach((id) => { const isBuffered = this.sendBuffer.some( - (packet) => String(packet.id) === id + (packet) => String(packet.id) === id, ); if (!isBuffered) { // note: handlers that do not accept an error as first argument are ignored here @@ -716,8 +716,8 @@ export class Socket< this.emitReserved( "connect_error", new Error( - "It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)" - ) + "It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)", + ), ); } break; @@ -967,7 +967,7 @@ export class Socket< * @returns self */ public timeout( - timeout: number + timeout: number, ): Socket> { this.flags.timeout = timeout; return this; diff --git a/packages/socket.io-client/lib/url.ts b/packages/socket.io-client/lib/url.ts index 2561303223..c84bef16f4 100644 --- a/packages/socket.io-client/lib/url.ts +++ b/packages/socket.io-client/lib/url.ts @@ -39,7 +39,7 @@ type ParsedUrl = { export function url( uri: string | ParsedUrl, path: string = "", - loc?: Location + loc?: Location, ): ParsedUrl { let obj = uri as ParsedUrl; diff --git a/packages/socket.io-client/test/connection.ts b/packages/socket.io-client/test/connection.ts index 7b36c4f332..b8c90b794d 100644 --- a/packages/socket.io-client/test/connection.ts +++ b/packages/socket.io-client/test/connection.ts @@ -576,7 +576,7 @@ describe("connection", () => { reconnectionAttempts: 2, }); let delay = Math.floor( - manager.reconnectionDelay() * manager.randomizationFactor() * 0.5 + manager.reconnectionDelay() * manager.randomizationFactor() * 0.5, ); delay = Math.max(delay, 10); diff --git a/packages/socket.io-client/test/socket.ts b/packages/socket.io-client/test/socket.ts index 493920aa7a..a37331a519 100644 --- a/packages/socket.io-client/test/socket.ts +++ b/packages/socket.io-client/test/socket.ts @@ -336,7 +336,7 @@ describe("socket", () => { const socket = io(BASE_URL + "/no", { forceNew: true }); expect(() => socket.emit("disconnecting", "goodbye")).to.throwException( - /"disconnecting" is a reserved event name/ + /"disconnecting" is a reserved event name/, ); }); diff --git a/packages/socket.io-client/test/typed-events.test-d.ts b/packages/socket.io-client/test/typed-events.test-d.ts index 1cb30d6400..d7e56de46d 100644 --- a/packages/socket.io-client/test/typed-events.test-d.ts +++ b/packages/socket.io-client/test/typed-events.test-d.ts @@ -92,7 +92,7 @@ describe("typed events", () => { const value = await socket.emitWithAck( "ackFromClientSingleArg", "1", - 2 + 2, ); expectType(value); @@ -155,12 +155,12 @@ describe("typed events", () => { ackFromClient: ( a: string, b: number, - ack: (c: string, d: boolean) => void + ack: (c: string, d: boolean) => void, ) => void; ackFromClientSingleArg: ( a: string, b: number, - ack: (c: string) => void + ack: (c: string) => void, ) => void; ackFromClientNoArg: (ack: () => void) => void; } @@ -232,7 +232,7 @@ describe("typed events", () => { const value = await socket.emitWithAck( "ackFromClientSingleArg", "1", - 2 + 2, ); expectType(value); diff --git a/packages/socket.io-client/wdio.conf.js b/packages/socket.io-client/wdio.conf.js index 00cf312877..fc9d8f583b 100644 --- a/packages/socket.io-client/wdio.conf.js +++ b/packages/socket.io-client/wdio.conf.js @@ -79,7 +79,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, { @@ -92,7 +92,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, ]; From ff116daec3fcd0996ae7b2a9884a464014983c96 Mon Sep 17 00:00:00 2001 From: Wang Guan Date: Mon, 12 Aug 2024 23:04:49 +0900 Subject: [PATCH 4/6] make prettier happy --- packages/socket.io/lib/broadcast-operator.ts | 28 +++---- packages/socket.io/lib/client.ts | 16 ++-- packages/socket.io/lib/index.ts | 54 +++++++------- packages/socket.io/lib/namespace.ts | 53 ++++++++------ packages/socket.io/lib/parent-namespace.ts | 10 +-- packages/socket.io/lib/socket.ts | 14 ++-- packages/socket.io/lib/typed-events.ts | 61 ++++++++-------- packages/socket.io/lib/uws.ts | 6 +- .../test/connection-state-recovery.ts | 2 +- packages/socket.io/test/handshake.ts | 6 +- packages/socket.io/test/messaging-many.ts | 10 +-- packages/socket.io/test/middleware.ts | 2 +- packages/socket.io/test/namespaces.ts | 6 +- packages/socket.io/test/server-attachment.ts | 14 ++-- packages/socket.io/test/socket.io.test-d.ts | 73 ++++++++++--------- packages/socket.io/test/socket.ts | 8 +- packages/socket.io/test/support/util.ts | 6 +- packages/socket.io/test/utility-methods.ts | 2 +- packages/socket.io/test/uws.ts | 2 +- packages/socket.io/test/v2-compatibility.ts | 2 +- 20 files changed, 193 insertions(+), 182 deletions(-) diff --git a/packages/socket.io/lib/broadcast-operator.ts b/packages/socket.io/lib/broadcast-operator.ts index 48e295cb78..0553c027f0 100644 --- a/packages/socket.io/lib/broadcast-operator.ts +++ b/packages/socket.io/lib/broadcast-operator.ts @@ -23,7 +23,7 @@ export class BroadcastOperator private readonly exceptRooms: Set = new Set(), private readonly flags: BroadcastFlags & { expectSingleResponse?: boolean; - } = {} + } = {}, ) {} /** @@ -53,7 +53,7 @@ export class BroadcastOperator this.adapter, rooms, this.exceptRooms, - this.flags + this.flags, ); } @@ -98,7 +98,7 @@ export class BroadcastOperator this.adapter, this.rooms, exceptRooms, - this.flags + this.flags, ); } @@ -117,7 +117,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags + flags, ); } @@ -137,7 +137,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags + flags, ); } @@ -156,7 +156,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags + flags, ); } @@ -276,7 +276,7 @@ export class BroadcastOperator // each client sends an acknowledgement responses.push(clientResponse); checkCompleteness(); - } + }, ); this.adapter.serverCount().then((serverCount) => { @@ -326,7 +326,7 @@ export class BroadcastOperator public allSockets(): Promise> { if (!this.adapter) { throw new Error( - "No adapter for this namespace, are you trying to get the list of clients of a dynamic namespace?" + "No adapter for this namespace, are you trying to get the list of clients of a dynamic namespace?", ); } return this.adapter.sockets(this.rooms); @@ -371,7 +371,7 @@ export class BroadcastOperator } else { return new RemoteSocket( this.adapter, - socket as SocketDetails + socket as SocketDetails, ); } }); @@ -400,7 +400,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - Array.isArray(room) ? room : [room] + Array.isArray(room) ? room : [room], ); } @@ -425,7 +425,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - Array.isArray(room) ? room : [room] + Array.isArray(room) ? room : [room], ); } @@ -450,7 +450,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - close + close, ); } } @@ -489,7 +489,7 @@ export class RemoteSocket new Set(), { expectSingleResponse: true, // so that remoteSocket.emit() with acknowledgement behaves like socket.emit() - } + }, ); } @@ -517,7 +517,7 @@ export class RemoteSocket * @param timeout */ public timeout( - timeout: number + timeout: number, ): BroadcastOperator, SocketData> { return this.operator.timeout(timeout); } diff --git a/packages/socket.io/lib/client.ts b/packages/socket.io/lib/client.ts index 056d4b5a26..6ca7b77818 100644 --- a/packages/socket.io/lib/client.ts +++ b/packages/socket.io/lib/client.ts @@ -29,7 +29,7 @@ export class Client< ListenEvents extends EventsMap, EmitEvents extends EventsMap, ServerSideEvents extends EventsMap, - SocketData = any + SocketData = any, > { public readonly conn: RawSocket; @@ -61,7 +61,7 @@ export class Client< */ constructor( server: Server, - conn: any + conn: any, ) { this.server = server; this.conn = conn; @@ -126,7 +126,7 @@ export class Client< ( dynamicNspName: | Namespace - | false + | false, ) => { if (dynamicNspName) { this.doConnect(name, auth); @@ -140,7 +140,7 @@ export class Client< }, }); } - } + }, ); } @@ -185,7 +185,7 @@ export class Client< * @private */ _remove( - socket: Socket + socket: Socket, ): void { if (this.sockets.has(socket.id)) { const nsp = this.sockets.get(socket.id)!.nsp.name; @@ -229,11 +229,11 @@ export class Client< private writeToEngine( encodedPackets: Array, - opts: WriteOptions + opts: WriteOptions, ): void { if (opts.volatile && !this.conn.transport.writable) { debug( - "volatile packet is discarded since the transport is not currently writable" + "volatile packet is discarded since the transport is not currently writable", ); return; } @@ -316,7 +316,7 @@ export class Client< */ private onclose( reason: CloseReason | "forced server close", - description?: any + description?: any, ): void { debug("client close with reason %s", reason); diff --git a/packages/socket.io/lib/index.ts b/packages/socket.io/lib/index.ts index 396169314f..73d7d330e9 100644 --- a/packages/socket.io/lib/index.ts +++ b/packages/socket.io/lib/index.ts @@ -51,7 +51,7 @@ const dotMapRegex = /\.map/; type ParentNspNameMatchFn = ( name: string, auth: { [key: string]: any }, - fn: (err: Error | null, success: boolean) => void + fn: (err: Error | null, success: boolean) => void, ) => void; type AdapterConstructor = typeof Adapter | ((nsp: Namespace) => Adapter); @@ -144,7 +144,7 @@ export class Server< ListenEvents extends EventsMap = DefaultEventsMap, EmitEvents extends EventsMap = ListenEvents, ServerSideEvents extends EventsMap = DefaultEventsMap, - SocketData = any + SocketData = any, > extends StrictEventEmitter< ServerSideEvents, RemoveAcknowledgements, @@ -218,7 +218,7 @@ export class Server< private _corsMiddleware: ( req: http.IncomingMessage, res: http.ServerResponse, - next: () => void + next: () => void, ) => void; /** @@ -231,11 +231,11 @@ export class Server< constructor(srv?: TServerInstance | number, opts?: Partial); constructor( srv: undefined | Partial | TServerInstance | number, - opts?: Partial + opts?: Partial, ); constructor( srv: undefined | Partial | TServerInstance | number, - opts: Partial = {} + opts: Partial = {}, ) { super(); if ( @@ -258,7 +258,7 @@ export class Server< maxDisconnectionDuration: 2 * 60 * 1000, skipMiddlewares: true, }, - opts.connectionStateRecovery + opts.connectionStateRecovery, ); this.adapter(opts.adapter || SessionAwareAdapter); } else { @@ -308,8 +308,8 @@ export class Server< fn: ( nsp: | Namespace - | false - ) => void + | false, + ) => void, ): void { if (this.parentNsps.size === 0) return fn(false); @@ -356,7 +356,7 @@ export class Server< this.clientPathRegex = new RegExp( "^" + escapedPath + - "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)" + "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)", ); return this; } @@ -383,7 +383,7 @@ export class Server< public adapter(): AdapterConstructor | undefined; public adapter(v: AdapterConstructor): this; public adapter( - v?: AdapterConstructor + v?: AdapterConstructor, ): AdapterConstructor | undefined | this { if (!arguments.length) return this._adapter; this._adapter = v; @@ -402,7 +402,7 @@ export class Server< */ public listen( srv: TServerInstance | number, - opts: Partial = {} + opts: Partial = {}, ): this { return this.attach(srv, opts); } @@ -416,7 +416,7 @@ export class Server< */ public attach( srv: TServerInstance | number, - opts: Partial = {} + opts: Partial = {}, ): this { if ("function" == typeof srv) { const msg = @@ -501,7 +501,7 @@ export class Server< res.writeHeader("cache-control", "public, max-age=0"); res.writeHeader( "content-type", - "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8", ); res.writeHeader("etag", expectedEtag); @@ -522,7 +522,7 @@ export class Server< */ private initEngine( srv: TServerInstance, - opts: EngineOptions & AttachOptions + opts: EngineOptions & AttachOptions, ): void { // initialize engine debug("creating engine.io instance with opts %j", opts); @@ -598,7 +598,7 @@ export class Server< res.setHeader("Cache-Control", "public, max-age=0"); res.setHeader( "Content-Type", - "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8", ); res.setHeader("ETag", expectedEtag); @@ -614,10 +614,10 @@ export class Server< private static sendFile( filename: string, req: http.IncomingMessage, - res: http.ServerResponse + res: http.ServerResponse, ): void { const readStream = createReadStream( - path.join(__dirname, "../client-dist/", filename) + path.join(__dirname, "../client-dist/", filename), ); const encoding = accepts(req).encodings(["br", "gzip", "deflate"]); @@ -696,8 +696,8 @@ export class Server< public of( name: string | RegExp | ParentNspNameMatchFn, fn?: ( - socket: Socket - ) => void + socket: Socket, + ) => void, ): Namespace { if (typeof name === "function" || name instanceof RegExp) { const parentNsp = new ParentNamespace(this); @@ -707,7 +707,7 @@ export class Server< } else { this.parentNsps.set( (nsp, conn, next) => next(null, (name as RegExp).test(nsp)), - parentNsp + parentNsp, ); this.parentNamespacesFromRegExp.set(name, parentNsp); } @@ -783,8 +783,8 @@ export class Server< public use( fn: ( socket: Socket, - next: (err?: ExtendedError) => void - ) => void + next: (err?: ExtendedError) => void, + ) => void, ): this { this.sockets.use(fn); return this; @@ -1093,11 +1093,11 @@ export class Server< * Expose main namespace (/). */ -const emitterMethods = Object.keys(EventEmitter.prototype).filter(function ( - key -) { - return typeof EventEmitter.prototype[key] === "function"; -}); +const emitterMethods = Object.keys(EventEmitter.prototype).filter( + function (key) { + return typeof EventEmitter.prototype[key] === "function"; + }, +); emitterMethods.forEach(function (fn) { Server.prototype[fn] = function () { diff --git a/packages/socket.io/lib/namespace.ts b/packages/socket.io/lib/namespace.ts index 8e0d2d89e9..023b1f7f6a 100644 --- a/packages/socket.io/lib/namespace.ts +++ b/packages/socket.io/lib/namespace.ts @@ -31,13 +31,13 @@ export interface NamespaceReservedEventsMap< ListenEvents extends EventsMap, EmitEvents extends EventsMap, ServerSideEvents extends EventsMap, - SocketData + SocketData, > { connect: ( - socket: Socket + socket: Socket, ) => void; connection: ( - socket: Socket + socket: Socket, ) => void; } @@ -45,7 +45,7 @@ export interface ServerReservedEventsMap< ListenEvents extends EventsMap, EmitEvents extends EventsMap, ServerSideEvents extends EventsMap, - SocketData + SocketData, > extends NamespaceReservedEventsMap< ListenEvents, EmitEvents, @@ -53,7 +53,12 @@ export interface ServerReservedEventsMap< SocketData > { new_namespace: ( - namespace: Namespace + namespace: Namespace< + ListenEvents, + EmitEvents, + ServerSideEvents, + SocketData + >, ) => void; } @@ -118,7 +123,7 @@ export class Namespace< ListenEvents extends EventsMap = DefaultEventsMap, EmitEvents extends EventsMap = ListenEvents, ServerSideEvents extends EventsMap = DefaultEventsMap, - SocketData = any + SocketData = any, > extends StrictEventEmitter< ServerSideEvents, RemoveAcknowledgements, @@ -149,7 +154,7 @@ export class Namespace< _fns: Array< ( socket: Socket, - next: (err?: ExtendedError) => void + next: (err?: ExtendedError) => void, ) => void > = []; @@ -164,7 +169,7 @@ export class Namespace< */ constructor( server: Server, - name: string + name: string, ) { super(); this.server = server; @@ -200,8 +205,8 @@ export class Namespace< public use( fn: ( socket: Socket, - next: (err?: ExtendedError) => void - ) => void + next: (err?: ExtendedError) => void, + ) => void, ): this { this._fns.push(fn); return this; @@ -216,7 +221,7 @@ export class Namespace< */ private run( socket: Socket, - fn: (err: ExtendedError | null) => void + fn: (err: ExtendedError | null) => void, ) { const fns = this._fns.slice(0); if (!fns.length) return fn(null); @@ -316,8 +321,8 @@ export class Namespace< client: Client, auth: Record, fn: ( - socket: Socket - ) => void + socket: Socket, + ) => void, ) { debug("adding socket to nsp %s", this.name); const socket = await this._createSocket(client, auth); @@ -359,7 +364,7 @@ export class Namespace< private async _createSocket( client: Client, - auth: Record + auth: Record, ) { const sessionId = auth.pid; const offset = auth.offset; @@ -386,8 +391,8 @@ export class Namespace< private _doConnect( socket: Socket, fn: ( - socket: Socket - ) => void + socket: Socket, + ) => void, ) { // track socket this.sockets.set(socket.id, socket); @@ -410,7 +415,7 @@ export class Namespace< * @private */ _remove( - socket: Socket + socket: Socket, ): void { if (this.sockets.has(socket.id)) { this.sockets.delete(socket.id); @@ -447,7 +452,7 @@ export class Namespace< ): boolean { return new BroadcastOperator(this.adapter).emit( ev, - ...args + ...args, ); } @@ -563,7 +568,7 @@ export class Namespace< }); this.serverSideEmit( ev, - ...(args as any[] as EventParams) + ...(args as any[] as EventParams), ); }); } @@ -587,7 +592,7 @@ export class Namespace< */ public allSockets(): Promise> { return new BroadcastOperator( - this.adapter + this.adapter, ).allSockets(); } @@ -697,7 +702,7 @@ export class Namespace< */ public fetchSockets() { return new BroadcastOperator( - this.adapter + this.adapter, ).fetchSockets(); } @@ -719,7 +724,7 @@ export class Namespace< */ public socketsJoin(room: Room | Room[]) { return new BroadcastOperator( - this.adapter + this.adapter, ).socketsJoin(room); } @@ -741,7 +746,7 @@ export class Namespace< */ public socketsLeave(room: Room | Room[]) { return new BroadcastOperator( - this.adapter + this.adapter, ).socketsLeave(room); } @@ -763,7 +768,7 @@ export class Namespace< */ public disconnectSockets(close: boolean = false) { return new BroadcastOperator( - this.adapter + this.adapter, ).disconnectSockets(close); } } diff --git a/packages/socket.io/lib/parent-namespace.ts b/packages/socket.io/lib/parent-namespace.ts index 5a158b74e8..9df17da279 100644 --- a/packages/socket.io/lib/parent-namespace.ts +++ b/packages/socket.io/lib/parent-namespace.ts @@ -31,7 +31,7 @@ export class ParentNamespace< ListenEvents extends EventsMap = DefaultEventsMap, EmitEvents extends EventsMap = ListenEvents, ServerSideEvents extends EventsMap = DefaultEventsMap, - SocketData = any + SocketData = any, > extends Namespace { private static count: number = 0; private readonly children: Set< @@ -39,7 +39,7 @@ export class ParentNamespace< > = new Set(); constructor( - server: Server + server: Server, ) { super(server, "/_" + ParentNamespace.count++); } @@ -63,16 +63,16 @@ export class ParentNamespace< } createChild( - name: string + name: string, ): Namespace { debug("creating child namespace %s", name); const namespace = new Namespace(this.server, name); namespace._fns = this._fns.slice(0); this.listeners("connect").forEach((listener) => - namespace.on("connect", listener) + namespace.on("connect", listener), ); this.listeners("connection").forEach((listener) => - namespace.on("connection", listener) + namespace.on("connection", listener), ); this.children.add(namespace); diff --git a/packages/socket.io/lib/socket.ts b/packages/socket.io/lib/socket.ts index d37e099017..0adc9fea79 100644 --- a/packages/socket.io/lib/socket.ts +++ b/packages/socket.io/lib/socket.ts @@ -66,11 +66,11 @@ export interface SocketReservedEventsMap { export interface EventEmitterReservedEventsMap { newListener: ( eventName: string | Symbol, - listener: (...args: any[]) => void + listener: (...args: any[]) => void, ) => void; removeListener: ( eventName: string | Symbol, - listener: (...args: any[]) => void + listener: (...args: any[]) => void, ) => void; } @@ -180,7 +180,7 @@ export class Socket< ListenEvents extends EventsMap = DefaultEventsMap, EmitEvents extends EventsMap = ListenEvents, ServerSideEvents extends EventsMap = DefaultEventsMap, - SocketData = any + SocketData = any, > extends StrictEventEmitter< ListenEvents, EmitEvents, @@ -252,7 +252,7 @@ export class Socket< readonly nsp: Namespace, readonly client: Client, auth: Record, - previousSession?: Session + previousSession?: Session, ) { super(); this.server = nsp.server; @@ -529,7 +529,7 @@ export class Socket< */ private packet( packet: Omit & Partial>, - opts: any = {} + opts: any = {}, ): void { packet.nsp = this.nsp.name; opts.compress = false !== opts.compress; @@ -556,7 +556,7 @@ export class Socket< return this.adapter.addAll( this.id, - new Set(Array.isArray(rooms) ? rooms : [rooms]) + new Set(Array.isArray(rooms) ? rooms : [rooms]), ); } @@ -893,7 +893,7 @@ export class Socket< * @returns self */ public timeout( - timeout: number + timeout: number, ): Socket< ListenEvents, DecorateAcknowledgements, diff --git a/packages/socket.io/lib/typed-events.ts b/packages/socket.io/lib/typed-events.ts index a906e8f564..0a04e67577 100644 --- a/packages/socket.io/lib/typed-events.ts +++ b/packages/socket.io/lib/typed-events.ts @@ -27,7 +27,7 @@ export type EventNames = keyof Map & (string | symbol); */ export type EventNamesWithAck< Map extends EventsMap, - K extends EventNames = EventNames + K extends EventNames = EventNames, > = IfAny< Last> | Map[K], K, @@ -48,17 +48,17 @@ export type EventNamesWithAck< */ export type EventNamesWithoutAck< Map extends EventsMap, - K extends EventNames = EventNames + K extends EventNames = EventNames, > = IfAny< Last> | Map[K], K, K extends (Parameters extends never[] ? K : never) ? K : K extends ( - Last> extends (...args: any[]) => any ? never : K - ) - ? K - : never + Last> extends (...args: any[]) => any ? never : K + ) + ? K + : never >; export type RemoveAcknowledgements = { @@ -67,7 +67,7 @@ export type RemoveAcknowledgements = { export type EventNamesWithError< Map extends EventsMap, - K extends EventNamesWithAck = EventNamesWithAck + K extends EventNamesWithAck = EventNamesWithAck, > = IfAny< Last> | Map[K], K, @@ -81,7 +81,7 @@ export type EventNamesWithError< /** The tuple type representing the parameters of an event listener */ export type EventParams< Map extends EventsMap, - Ev extends EventNames + Ev extends EventNames, > = Parameters; /** @@ -89,7 +89,7 @@ export type EventParams< */ export type ReservedOrUserEventNames< ReservedEventsMap extends EventsMap, - UserEvents extends EventsMap + UserEvents extends EventsMap, > = EventNames | EventNames; /** @@ -99,13 +99,13 @@ export type ReservedOrUserEventNames< export type ReservedOrUserListener< ReservedEvents extends EventsMap, UserEvents extends EventsMap, - Ev extends ReservedOrUserEventNames + Ev extends ReservedOrUserEventNames, > = FallbackToUntypedListener< Ev extends EventNames ? ReservedEvents[Ev] : Ev extends EventNames - ? UserEvents[Ev] - : never + ? UserEvents[Ev] + : never >; /** @@ -145,7 +145,7 @@ export interface TypedEventBroadcaster { export abstract class StrictEventEmitter< ListenEvents extends EventsMap, EmitEvents extends EventsMap, - ReservedEvents extends EventsMap = {} + ReservedEvents extends EventsMap = {}, > extends EventEmitter implements TypedEventBroadcaster @@ -158,7 +158,7 @@ export abstract class StrictEventEmitter< */ on>( ev: Ev, - listener: ReservedOrUserListener + listener: ReservedOrUserListener, ): this { return super.on(ev, listener); } @@ -171,7 +171,7 @@ export abstract class StrictEventEmitter< */ once>( ev: Ev, - listener: ReservedOrUserListener + listener: ReservedOrUserListener, ): this { return super.once(ev, listener); } @@ -226,7 +226,7 @@ export abstract class StrictEventEmitter< * @returns Array of listeners subscribed to `event` */ listeners>( - event: Ev + event: Ev, ): ReservedOrUserListener[] { return super.listeners(event) as ReservedOrUserListener< ReservedEvents, @@ -255,9 +255,8 @@ type IsAny = 0 extends 1 & T ? true : false; * @author sindresorhus * @link https://github.com/sindresorhus/type-fest */ -type IfAny = IsAny extends true - ? TypeIfAny - : TypeIfNotAny; +type IfAny = + IsAny extends true ? TypeIfAny : TypeIfNotAny; /** * Extracts the type of the last element of an array. @@ -271,10 +270,10 @@ export type Last = ValueType extends readonly [infer ElementType] ? ElementType : ValueType extends readonly [infer _, ...infer Tail] - ? Last - : ValueType extends ReadonlyArray - ? ElementType - : never; + ? Last + : ValueType extends ReadonlyArray + ? ElementType + : never; export type FirstNonErrorTuple = T[0] extends Error ? T[1] @@ -316,13 +315,15 @@ type ExpectMultipleResponses = { ? Params extends [Error] ? (err: Error) => Result : Params extends [Error, ...infer Rest] - ? ( - err: Error, - ...args: InferFirstAndPreserveLabel> - ) => Result - : Params extends [] - ? () => Result - : (...args: InferFirstAndPreserveLabel>) => Result + ? ( + err: Error, + ...args: InferFirstAndPreserveLabel> + ) => Result + : Params extends [] + ? () => Result + : ( + ...args: InferFirstAndPreserveLabel> + ) => Result : T[K]; }; /** diff --git a/packages/socket.io/lib/uws.ts b/packages/socket.io/lib/uws.ts index 6e400c7f77..89a6bf7d33 100644 --- a/packages/socket.io/lib/uws.ts +++ b/packages/socket.io/lib/uws.ts @@ -76,7 +76,7 @@ export function patchAdapter(app /* : TemplatedApp */) { app.publish( topic, isBinary ? encodedPacket : "4" + encodedPacket, - isBinary + isBinary, ); }); @@ -93,7 +93,7 @@ function subscribe( namespaceName: string, socket: Socket, isNew: boolean, - rooms: Set + rooms: Set, ) { // @ts-ignore const sessionId = socket.conn.id; @@ -144,7 +144,7 @@ export function serveFile(res /* : HttpResponse */, filepath: string) { res.onWritable((offset) => { const [ok, done] = res.tryEnd( arrayBufferChunk.slice(offset - lastOffset), - size + size, ); if (!done && ok) { diff --git a/packages/socket.io/test/connection-state-recovery.ts b/packages/socket.io/test/connection-state-recovery.ts index e84cae6a04..c0dcbf0703 100644 --- a/packages/socket.io/test/connection-state-recovery.ts +++ b/packages/socket.io/test/connection-state-recovery.ts @@ -59,7 +59,7 @@ describe("connection state recovery", () => { await eioPush( httpServer, newSid, - `40{"pid":"${pid}","offset":"${offset}"}` + `40{"pid":"${pid}","offset":"${offset}"}`, ); const payload = await eioPoll(httpServer, newSid); diff --git a/packages/socket.io/test/handshake.ts b/packages/socket.io/test/handshake.ts index 27553eca01..fc38e29476 100644 --- a/packages/socket.io/test/handshake.ts +++ b/packages/socket.io/test/handshake.ts @@ -22,11 +22,11 @@ describe("handshake", () => { expect(res.status).to.be(204); expect(res.headers["access-control-allow-origin"]).to.be( - "http://localhost:54023" + "http://localhost:54023", ); expect(res.headers["access-control-allow-methods"]).to.be("GET,POST"); expect(res.headers["access-control-allow-headers"]).to.be( - "content-type" + "content-type", ); expect(res.headers["access-control-allow-credentials"]).to.be("true"); success(done, io); @@ -50,7 +50,7 @@ describe("handshake", () => { expect(res.status).to.be(200); expect(res.headers["access-control-allow-origin"]).to.be( - "http://localhost:54024" + "http://localhost:54024", ); expect(res.headers["access-control-allow-credentials"]).to.be("true"); success(done, io); diff --git a/packages/socket.io/test/messaging-many.ts b/packages/socket.io/test/messaging-many.ts index ce71062645..0a51815068 100644 --- a/packages/socket.io/test/messaging-many.ts +++ b/packages/socket.io/test/messaging-many.ts @@ -17,7 +17,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.on("a", (a) => { @@ -53,7 +53,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.on("bin", (a) => { @@ -142,7 +142,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2) + successFn(done, io, socket1, socket2), ); socket2.on("a", () => { @@ -178,7 +178,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.emit("join", "woot"); @@ -221,7 +221,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.emit("join", "woot"); diff --git a/packages/socket.io/test/middleware.ts b/packages/socket.io/test/middleware.ts index 46455a73e1..5211c05a64 100644 --- a/packages/socket.io/test/middleware.ts +++ b/packages/socket.io/test/middleware.ts @@ -179,7 +179,7 @@ describe("middleware", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2) + successFn(done, io, socket1, socket2), ); io.of("/chat").use((socket, next) => { diff --git a/packages/socket.io/test/namespaces.ts b/packages/socket.io/test/namespaces.ts index 621c589cef..a8b3f08fcf 100644 --- a/packages/socket.io/test/namespaces.ts +++ b/packages/socket.io/test/namespaces.ts @@ -389,7 +389,7 @@ describe("namespaces", () => { const io = new Server(); expect(() => io.emit("connect")).to.throwException( - /"connect" is a reserved event name/ + /"connect" is a reserved event name/, ); }); @@ -660,7 +660,9 @@ describe("namespaces", () => { c2.on("connect_error", () => { done( - new Error("Client got error when connecting to dynamic namespace") + new Error( + "Client got error when connecting to dynamic namespace", + ), ); }); }, 100); diff --git a/packages/socket.io/test/server-attachment.ts b/packages/socket.io/test/server-attachment.ts index 81da1acbcd..f653446c50 100644 --- a/packages/socket.io/test/server-attachment.ts +++ b/packages/socket.io/test/server-attachment.ts @@ -17,7 +17,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/javascript; charset=utf-8" + "application/javascript; charset=utf-8", ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); @@ -36,7 +36,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/json; charset=utf-8" + "application/json; charset=utf-8", ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.text).to.match(/engine\.io/); @@ -48,7 +48,7 @@ describe("server attachment", () => { it("should serve client", testSource("socket.io.js")); it( "should serve client with query string", - testSource("socket.io.js?buster=" + Date.now()) + testSource("socket.io.js?buster=" + Date.now()), ); it("should serve source map", testSourceMap("socket.io.js.map")); it("should serve client (min)", testSource("socket.io.min.js")); @@ -99,7 +99,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["access-control-allow-origin"]).to.be( - "https://good-origin.com" + "https://good-origin.com", ); expect(res.status).to.be(200); done(); @@ -108,19 +108,19 @@ describe("server attachment", () => { it( "should serve bundle with msgpack parser", - testSource("socket.io.msgpack.min.js") + testSource("socket.io.msgpack.min.js"), ); it( "should serve source map for bundle with msgpack parser", - testSourceMap("socket.io.msgpack.min.js.map") + testSourceMap("socket.io.msgpack.min.js.map"), ); it("should serve the ESM bundle", testSource("socket.io.esm.min.js")); it( "should serve the source map for the ESM bundle", - testSourceMap("socket.io.esm.min.js.map") + testSourceMap("socket.io.esm.min.js.map"), ); it("should handle 304", (done) => { diff --git a/packages/socket.io/test/socket.io.test-d.ts b/packages/socket.io/test/socket.io.test-d.ts index 28a6fa6a89..5c6ef3b187 100644 --- a/packages/socket.io/test/socket.io.test-d.ts +++ b/packages/socket.io/test/socket.io.test-d.ts @@ -123,7 +123,7 @@ describe("server", () => { const value1 = await s.emitWithAck( "ackFromServerSingleArg", true, - "123" + "123", ); expectType(value1); }); @@ -158,7 +158,7 @@ describe("server", () => { it("does not accept arguments of wrong types", (done) => { const srv = createServer(); const sio = new Server( - srv + srv, ); // @ts-expect-error - shouldn't accept arguments of the wrong types sio.on("random", (a, b, c) => {}); @@ -184,7 +184,7 @@ describe("server", () => { ) => boolean; type ToEmitWithAck< Map extends EventsMap, - Ev extends keyof Map = keyof Map + Ev extends keyof Map = keyof Map, > = (ev: Ev, ...args: Parameters) => ReturnType; interface ClientToServerEvents { noArgs: () => void; @@ -192,7 +192,7 @@ describe("server", () => { ackFromClient: ( a: string, b: number, - ack: (c: string, d: number) => void + ack: (c: string, d: number) => void, ) => void; } @@ -202,12 +202,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (c: boolean, d: string) => void + ack: (c: boolean, d: string) => void, ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (c: string) => void + ack: (c: string) => void, ) => void; onlyCallback: (a: () => void) => void; } @@ -226,12 +226,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (err: Error, c: boolean, d: string) => void + ack: (err: Error, c: boolean, d: string) => void, ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (err: Error, c: string) => void + ack: (err: Error, c: string) => void, ) => void; onlyCallback: (a: (err: Error) => void) => void; } @@ -243,7 +243,7 @@ describe("server", () => { ackFromServerSingleArg: ( a: boolean, b: string, - ack: (c: string[]) => void + ack: (c: string[]) => void, ) => void; onlyCallback: (a: () => void) => void; } @@ -253,12 +253,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (err: Error, c: boolean[]) => void + ack: (err: Error, c: boolean[]) => void, ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (err: Error, c: string[]) => void + ack: (err: Error, c: string[]) => void, ) => void; onlyCallback: (a: (err: Error) => void) => void; } @@ -315,7 +315,7 @@ describe("server", () => { untyped.of("/").emit("random2", 2, "string", Server); expectType>(untyped.to("1").emitWithAck("random", "test")); expectType<(ev: string, ...args: any[]) => Promise>( - untyped.to("1").emitWithAck + untyped.to("1").emitWithAck, ); }); it("has the correct types", () => { @@ -326,25 +326,25 @@ describe("server", () => { const nio = sio.of("/"); for (const emitter of [sio, nio]) { expectType>( - emitter.to("1") + emitter.to("1"), ); expectType>( - emitter.in("1") + emitter.in("1"), ); expectType>( - emitter.except("1") + emitter.except("1"), ); expectType>( - emitter.except("1") + emitter.except("1"), ); expectType>( - emitter.compress(true) + emitter.compress(true), ); expectType>( - emitter.volatile + emitter.volatile, ); expectType>( - emitter.local + emitter.local, ); expectType< BroadcastOperator @@ -367,16 +367,16 @@ describe("server", () => { >(s.timeout(0).broadcast); // ensure that turning socket to a broadcast works correctly expectType>( - s.broadcast + s.broadcast, ); expectType>( - s.in("1") + s.in("1"), ); expectType>( - s.except("1") + s.except("1"), ); expectType>( - s.to("1") + s.to("1"), ); // Ensure that adding a timeout to a broadcast works after the fact expectType< @@ -391,7 +391,7 @@ describe("server", () => { it("has the correct types for `emit`", () => { const sio = new Server(); expectType>( - sio.timeout(0).emit<"noArgs"> + sio.timeout(0).emit<"noArgs">, ); expectType< ToEmit @@ -414,7 +414,7 @@ describe("server", () => { const sansTimeout = sio.in("1"); // Without timeout, `emitWithAck` shouldn't accept any events expectType( - undefined as Parameters<(typeof sansTimeout)["emitWithAck"]>[0] + undefined as Parameters<(typeof sansTimeout)["emitWithAck"]>[0], ); // @ts-expect-error - "noArgs" doesn't have a callback and is thus excluded sio.timeout(0).emitWithAck("noArgs"); @@ -441,33 +441,33 @@ describe("server", () => { const sio = new Server(); const nio = sio.of("/test"); expectType>( - sio.emit<"noArgs"> + sio.emit<"noArgs">, ); expectType>( - nio.emit<"noArgs"> + nio.emit<"noArgs">, ); expectType>( // These errors will dissapear once the TS version is updated from 4.7.4 // the TSD instance is using a newer version of TS than the workspace version // to enable the ability to compare against `any` - sio.emit<"helloFromServer"> + sio.emit<"helloFromServer">, ); expectType>( - nio.emit<"helloFromServer"> + nio.emit<"helloFromServer">, ); sio.on("connection", (s) => { expectType>(s.emit<"noArgs">); expectType>( - s.emit<"helloFromServer"> + s.emit<"helloFromServer">, ); expectType>( - s.emit<"ackFromServerSingleArg"> + s.emit<"ackFromServerSingleArg">, ); expectType>( - s.emit<"ackFromServer"> + s.emit<"ackFromServer">, ); expectType>( - s.emit<"onlyCallback"> + s.emit<"onlyCallback">, ); }); }); @@ -631,7 +631,7 @@ describe("server", () => { const value = await sio.serverSideEmitWithAck( "ackFromServerToServer", - "foo" + "foo", ); expectType(value); @@ -652,7 +652,10 @@ describe("server", () => { io.adapter(Adapter); class MyCustomAdapter extends Adapter { - constructor(nsp, readonly opts) { + constructor( + nsp, + readonly opts, + ) { super(nsp); } } diff --git a/packages/socket.io/test/socket.ts b/packages/socket.io/test/socket.ts index f9c93ff00b..41882a7987 100644 --- a/packages/socket.io/test/socket.ts +++ b/packages/socket.io/test/socket.ts @@ -807,7 +807,7 @@ describe("socket", () => { io.on("connection", (s) => { s.conn.on("upgrade", () => { console.log( - "\u001b[96mNote: warning expected and normal in test.\u001b[39m" + "\u001b[96mNote: warning expected and normal in test.\u001b[39m", ); // @ts-ignore socket.io.engine.write("5woooot"); @@ -825,7 +825,7 @@ describe("socket", () => { io.on("connection", (s) => { s.conn.on("upgrade", () => { console.log( - "\u001b[96mNote: warning expected and normal in test.\u001b[39m" + "\u001b[96mNote: warning expected and normal in test.\u001b[39m", ); // @ts-ignore socket.io.engine.write('44["handle me please"]'); @@ -883,7 +883,7 @@ describe("socket", () => { const socket = createClient(io); io.on("connection", (s) => { expect(() => s.emit("connect_error")).to.throwException( - /"connect_error" is a reserved event name/ + /"connect_error" is a reserved event name/, ); socket.close(); success(done, io, socket); @@ -1112,7 +1112,7 @@ describe("socket", () => { const partialDone = createPartialDone( 3, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.on("disconnect", partialDone); diff --git a/packages/socket.io/test/support/util.ts b/packages/socket.io/test/support/util.ts index 9b1188f4de..1e59dd01ec 100644 --- a/packages/socket.io/test/support/util.ts +++ b/packages/socket.io/test/support/util.ts @@ -25,7 +25,7 @@ expect.Assertion.prototype.contain = function (...args) { }, function () { return "expected " + i(this.obj) + " to not contain " + i(obj); - } + }, ); }); return this; @@ -35,11 +35,11 @@ expect.Assertion.prototype.contain = function (...args) { export function createClient< CTS extends EventsMap = DefaultEventsMap, - STC extends EventsMap = DefaultEventsMap + STC extends EventsMap = DefaultEventsMap, >( io: Server, nsp: string = "/", - opts?: Partial + opts?: Partial, ): ClientSocket { const port = (io.httpServer.address() as AddressInfo).port; return ioc(`http://localhost:${port}${nsp}`, opts); diff --git a/packages/socket.io/test/utility-methods.ts b/packages/socket.io/test/utility-methods.ts index efbc21c0b7..030edccfbf 100644 --- a/packages/socket.io/test/utility-methods.ts +++ b/packages/socket.io/test/utility-methods.ts @@ -47,7 +47,7 @@ describe("utility methods", () => { ioc(`http://localhost:${port}`, { // FIXME needed so that clients are properly closed transports: ["websocket"], - }) + }), ); } diff --git a/packages/socket.io/test/uws.ts b/packages/socket.io/test/uws.ts index 3a287e6468..52e5c32d75 100644 --- a/packages/socket.io/test/uws.ts +++ b/packages/socket.io/test/uws.ts @@ -212,7 +212,7 @@ describe("socket.io with uWebSocket.js-based engine", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/javascript; charset=utf-8" + "application/javascript; charset=utf-8", ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); diff --git a/packages/socket.io/test/v2-compatibility.ts b/packages/socket.io/test/v2-compatibility.ts index 20d3d4a76f..2f626d0db1 100644 --- a/packages/socket.io/test/v2-compatibility.ts +++ b/packages/socket.io/test/v2-compatibility.ts @@ -32,7 +32,7 @@ describe("v2 compatibility", () => { `http://localhost:${getPort(io)}/the-namespace`, { multiplex: false, - } + }, ); clientSocket.query = { test: "123" }; From 5399a67a405818fe9b9122c2d710da4ef1639bfd Mon Sep 17 00:00:00 2001 From: Wang Guan Date: Mon, 12 Aug 2024 23:21:42 +0900 Subject: [PATCH 5/6] apply same prettier config --- .prettierrc.json | 3 + packages/engine.io-client/lib/socket.ts | 4 +- .../lib/decodePacket.browser.ts | 2 +- packages/engine.io-parser/lib/decodePacket.ts | 4 +- .../lib/encodePacket.browser.ts | 6 +- packages/engine.io-parser/lib/encodePacket.ts | 6 +- packages/engine.io-parser/lib/index.ts | 14 ++-- packages/engine.io-parser/test/index.ts | 2 +- packages/engine.io/lib/server.ts | 5 +- .../engine.io/lib/transports/webtransport.ts | 6 +- .../socket.io-adapter/test/cluster-adapter.ts | 5 +- packages/socket.io-client/lib/index.ts | 4 +- packages/socket.io-client/lib/manager.ts | 6 +- packages/socket.io-client/lib/on.ts | 2 +- packages/socket.io-client/lib/socket.ts | 16 ++--- packages/socket.io-client/lib/url.ts | 2 +- packages/socket.io-client/test/connection.ts | 2 +- packages/socket.io-client/test/socket.ts | 2 +- .../test/typed-events.test-d.ts | 8 +-- packages/socket.io-client/wdio.conf.js | 4 +- .../test/in-memory.ts | 5 +- packages/socket.io-parser/test/parser.js | 28 ++++---- packages/socket.io-parser/wdio.conf.js | 4 +- packages/socket.io/lib/broadcast-operator.ts | 28 ++++---- packages/socket.io/lib/client.ts | 14 ++-- packages/socket.io/lib/index.ts | 44 ++++++------ packages/socket.io/lib/namespace.ts | 47 ++++++------- packages/socket.io/lib/parent-namespace.ts | 8 +-- packages/socket.io/lib/socket.ts | 12 ++-- packages/socket.io/lib/typed-events.ts | 6 +- packages/socket.io/lib/uws.ts | 6 +- .../test/connection-state-recovery.ts | 2 +- packages/socket.io/test/handshake.ts | 6 +- packages/socket.io/test/messaging-many.ts | 10 +-- packages/socket.io/test/middleware.ts | 2 +- packages/socket.io/test/namespaces.ts | 6 +- packages/socket.io/test/server-attachment.ts | 14 ++-- packages/socket.io/test/socket.io.test-d.ts | 68 +++++++++---------- packages/socket.io/test/socket.ts | 8 +-- packages/socket.io/test/support/util.ts | 4 +- packages/socket.io/test/utility-methods.ts | 2 +- packages/socket.io/test/uws.ts | 2 +- packages/socket.io/test/v2-compatibility.ts | 2 +- 43 files changed, 220 insertions(+), 211 deletions(-) create mode 100644 .prettierrc.json diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000000..757fd64caa --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,3 @@ +{ + "trailingComma": "es5" +} diff --git a/packages/engine.io-client/lib/socket.ts b/packages/engine.io-client/lib/socket.ts index 0eb26ce46a..7adc3e1e23 100644 --- a/packages/engine.io-client/lib/socket.ts +++ b/packages/engine.io-client/lib/socket.ts @@ -381,8 +381,8 @@ export class SocketWithoutUpgrade extends Emitter< (typeof location !== "undefined" && location.port ? location.port : this.secure - ? "443" - : "80"); + ? "443" + : "80"); this.transports = []; this._transportsByName = {}; diff --git a/packages/engine.io-parser/lib/decodePacket.browser.ts b/packages/engine.io-parser/lib/decodePacket.browser.ts index ea043b3cfd..3736905ab1 100644 --- a/packages/engine.io-parser/lib/decodePacket.browser.ts +++ b/packages/engine.io-parser/lib/decodePacket.browser.ts @@ -11,7 +11,7 @@ const withNativeArrayBuffer = typeof ArrayBuffer === "function"; export const decodePacket = ( encodedPacket: RawData, - binaryType?: BinaryType, + binaryType?: BinaryType ): Packet => { if (typeof encodedPacket !== "string") { return { diff --git a/packages/engine.io-parser/lib/decodePacket.ts b/packages/engine.io-parser/lib/decodePacket.ts index 6a8efba2a7..f6ed520cbc 100644 --- a/packages/engine.io-parser/lib/decodePacket.ts +++ b/packages/engine.io-parser/lib/decodePacket.ts @@ -8,7 +8,7 @@ import { export const decodePacket = ( encodedPacket: RawData, - binaryType?: BinaryType, + binaryType?: BinaryType ): Packet => { if (typeof encodedPacket !== "string") { return { @@ -47,7 +47,7 @@ const mapBinary = (data: RawData, binaryType?: BinaryType) => { // from HTTP long-polling return data.buffer.slice( data.byteOffset, - data.byteOffset + data.byteLength, + data.byteOffset + data.byteLength ); } else { // from WebTransport (Uint8Array) diff --git a/packages/engine.io-parser/lib/encodePacket.browser.ts b/packages/engine.io-parser/lib/encodePacket.browser.ts index 8b229805dd..0eba6b9420 100644 --- a/packages/engine.io-parser/lib/encodePacket.browser.ts +++ b/packages/engine.io-parser/lib/encodePacket.browser.ts @@ -16,7 +16,7 @@ const isView = (obj) => { const encodePacket = ( { type, data }: Packet, supportsBinary: boolean, - callback: (encodedPacket: RawData) => void, + callback: (encodedPacket: RawData) => void ) => { if (withNativeBlob && data instanceof Blob) { if (supportsBinary) { @@ -40,7 +40,7 @@ const encodePacket = ( const encodeBlobAsBase64 = ( data: Blob, - callback: (encodedPacket: RawData) => void, + callback: (encodedPacket: RawData) => void ) => { const fileReader = new FileReader(); fileReader.onload = function () { @@ -64,7 +64,7 @@ let TEXT_ENCODER; export function encodePacketToBinary( packet: Packet, - callback: (encodedPacket: RawData) => void, + callback: (encodedPacket: RawData) => void ) { if (withNativeBlob && packet.data instanceof Blob) { return packet.data.arrayBuffer().then(toArray).then(callback); diff --git a/packages/engine.io-parser/lib/encodePacket.ts b/packages/engine.io-parser/lib/encodePacket.ts index ccf706221d..129f7f3ed7 100644 --- a/packages/engine.io-parser/lib/encodePacket.ts +++ b/packages/engine.io-parser/lib/encodePacket.ts @@ -3,11 +3,11 @@ import { PACKET_TYPES, Packet, RawData } from "./commons.js"; export const encodePacket = ( { type, data }: Packet, supportsBinary: boolean, - callback: (encodedPacket: RawData) => void, + callback: (encodedPacket: RawData) => void ) => { if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) { return callback( - supportsBinary ? data : "b" + toBuffer(data, true).toString("base64"), + supportsBinary ? data : "b" + toBuffer(data, true).toString("base64") ); } // plain string @@ -31,7 +31,7 @@ let TEXT_ENCODER; export function encodePacketToBinary( packet: Packet, - callback: (encodedPacket: RawData) => void, + callback: (encodedPacket: RawData) => void ) { if (packet.data instanceof ArrayBuffer || ArrayBuffer.isView(packet.data)) { return callback(toBuffer(packet.data, false)); diff --git a/packages/engine.io-parser/lib/index.ts b/packages/engine.io-parser/lib/index.ts index e36b35b5ab..d8c4daf9b6 100644 --- a/packages/engine.io-parser/lib/index.ts +++ b/packages/engine.io-parser/lib/index.ts @@ -12,7 +12,7 @@ const SEPARATOR = String.fromCharCode(30); // see https://en.wikipedia.org/wiki/ const encodePayload = ( packets: Packet[], - callback: (encodedPayload: string) => void, + callback: (encodedPayload: string) => void ) => { // some packets may be added to the array while encoding, so the initial length must be saved const length = packets.length; @@ -32,7 +32,7 @@ const encodePayload = ( const decodePayload = ( encodedPayload: string, - binaryType?: BinaryType, + binaryType?: BinaryType ): Packet[] => { const encodedPackets = encodedPayload.split(SEPARATOR); const packets = []; @@ -112,7 +112,7 @@ const enum State { export function createPacketDecoderStream( maxPayload: number, - binaryType: BinaryType, + binaryType: BinaryType ): any { if (!TEXT_DECODER) { TEXT_DECODER = new TextDecoder(); @@ -148,7 +148,7 @@ export function createPacketDecoderStream( expectedLength = new DataView( headerArray.buffer, headerArray.byteOffset, - headerArray.length, + headerArray.length ).getUint16(0); state = State.READ_PAYLOAD; } else if (state === State.READ_EXTENDED_LENGTH_64) { @@ -160,7 +160,7 @@ export function createPacketDecoderStream( const view = new DataView( headerArray.buffer, headerArray.byteOffset, - headerArray.length, + headerArray.length ); const n = view.getUint32(0); @@ -181,8 +181,8 @@ export function createPacketDecoderStream( controller.enqueue( decodePacket( isBinary ? data : TEXT_DECODER.decode(data), - binaryType, - ), + binaryType + ) ); state = State.READ_HEADER; } diff --git a/packages/engine.io-parser/test/index.ts b/packages/engine.io-parser/test/index.ts index e574c9bb1b..98312daddb 100644 --- a/packages/engine.io-parser/test/index.ts +++ b/packages/engine.io-parser/test/index.ts @@ -176,7 +176,7 @@ describe("engine.io-parser", () => { const header = await reader.read(); expect(header.value).to.eql( - Uint8Array.of(255, 0, 0, 0, 0, 7, 91, 205, 21), + Uint8Array.of(255, 0, 0, 0, 0, 7, 91, 205, 21) ); const payload = await reader.read(); diff --git a/packages/engine.io/lib/server.ts b/packages/engine.io/lib/server.ts index a010092fc7..3093472c26 100644 --- a/packages/engine.io/lib/server.ts +++ b/packages/engine.io/lib/server.ts @@ -632,7 +632,10 @@ export abstract class BaseServer extends EventEmitter { * @see https://nodejs.org/api/http.html#class-httpserverresponse */ class WebSocketResponse { - constructor(readonly req, readonly socket: Duplex) { + constructor( + readonly req, + readonly socket: Duplex + ) { // temporarily store the response headers on the req object (see the "headers" event) req[kResponseHeaders] = {}; } diff --git a/packages/engine.io/lib/transports/webtransport.ts b/packages/engine.io/lib/transports/webtransport.ts index 07852282ed..1e97553a88 100644 --- a/packages/engine.io/lib/transports/webtransport.ts +++ b/packages/engine.io/lib/transports/webtransport.ts @@ -10,7 +10,11 @@ const debug = debugModule("engine:webtransport"); export class WebTransport extends Transport { private readonly writer; - constructor(private readonly session, stream, reader) { + constructor( + private readonly session, + stream, + reader + ) { super({ _query: { EIO: "4" } }); const transformStream = createPacketEncoderStream(); diff --git a/packages/socket.io-adapter/test/cluster-adapter.ts b/packages/socket.io-adapter/test/cluster-adapter.ts index 350ecda241..9205e5f9ca 100644 --- a/packages/socket.io-adapter/test/cluster-adapter.ts +++ b/packages/socket.io-adapter/test/cluster-adapter.ts @@ -16,7 +16,10 @@ const NODES_COUNT = 3; class EventEmitterAdapter extends ClusterAdapterWithHeartbeat { private offset = 1; - constructor(nsp, readonly eventBus) { + constructor( + nsp, + readonly eventBus + ) { super(nsp, {}); this.eventBus.on("message", (message) => { this.onMessage(message as ClusterMessage); diff --git a/packages/socket.io-client/lib/index.ts b/packages/socket.io-client/lib/index.ts index 9ecc0b8005..938ca86319 100644 --- a/packages/socket.io-client/lib/index.ts +++ b/packages/socket.io-client/lib/index.ts @@ -25,11 +25,11 @@ const cache: Record = {}; function lookup(opts?: Partial): Socket; function lookup( uri: string, - opts?: Partial, + opts?: Partial ): Socket; function lookup( uri?: string | Partial, - opts?: Partial, + opts?: Partial ): Socket { if (typeof uri === "object") { opts = uri; diff --git a/packages/socket.io-client/lib/manager.ts b/packages/socket.io-client/lib/manager.ts index 8330af13ff..ed1e44c85a 100644 --- a/packages/socket.io-client/lib/manager.ts +++ b/packages/socket.io-client/lib/manager.ts @@ -152,11 +152,11 @@ export class Manager< constructor(uri?: string, opts?: Partial); constructor( uri?: string | Partial, - opts?: Partial, + opts?: Partial ); constructor( uri?: string | Partial, - opts?: Partial, + opts?: Partial ) { super(); if (uri && "object" === typeof uri) { @@ -405,7 +405,7 @@ export class Manager< on(socket, "error", this.onerror.bind(this)), on(socket, "close", this.onclose.bind(this)), // @ts-ignore - on(this.decoder, "decoded", this.ondecoded.bind(this)), + on(this.decoder, "decoded", this.ondecoded.bind(this)) ); } diff --git a/packages/socket.io-client/lib/on.ts b/packages/socket.io-client/lib/on.ts index fe879343cd..50bc6fdc6d 100644 --- a/packages/socket.io-client/lib/on.ts +++ b/packages/socket.io-client/lib/on.ts @@ -3,7 +3,7 @@ import { Emitter } from "@socket.io/component-emitter"; export function on( obj: Emitter, ev: string, - fn: (err?: any) => any, + fn: (err?: any) => any ): VoidFunction { obj.on(ev, fn); return function subDestroy(): void { diff --git a/packages/socket.io-client/lib/socket.ts b/packages/socket.io-client/lib/socket.ts index 1f4255d66c..c4b5294611 100644 --- a/packages/socket.io-client/lib/socket.ts +++ b/packages/socket.io-client/lib/socket.ts @@ -116,7 +116,7 @@ interface SocketReservedEvents { connect_error: (err: Error) => void; disconnect: ( reason: Socket.DisconnectReason, - description?: DisconnectDescription, + description?: DisconnectDescription ) => void; } @@ -554,7 +554,7 @@ export class Socket< debug( "packet [%d] is discarded after %d tries", packet.id, - packet.tryCount, + packet.tryCount ); this._queue.shift(); if (ack) { @@ -591,7 +591,7 @@ export class Socket< if (packet.pending && !force) { debug( "packet [%d] has already been sent and is waiting for an ack", - packet.id, + packet.id ); return; } @@ -665,7 +665,7 @@ export class Socket< */ private onclose( reason: Socket.DisconnectReason, - description?: DisconnectDescription, + description?: DisconnectDescription ): void { debug("close (%s)", reason); this.connected = false; @@ -683,7 +683,7 @@ export class Socket< private _clearAcks() { Object.keys(this.acks).forEach((id) => { const isBuffered = this.sendBuffer.some( - (packet) => String(packet.id) === id, + (packet) => String(packet.id) === id ); if (!isBuffered) { // note: handlers that do not accept an error as first argument are ignored here @@ -716,8 +716,8 @@ export class Socket< this.emitReserved( "connect_error", new Error( - "It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)", - ), + "It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)" + ) ); } break; @@ -967,7 +967,7 @@ export class Socket< * @returns self */ public timeout( - timeout: number, + timeout: number ): Socket> { this.flags.timeout = timeout; return this; diff --git a/packages/socket.io-client/lib/url.ts b/packages/socket.io-client/lib/url.ts index c84bef16f4..2561303223 100644 --- a/packages/socket.io-client/lib/url.ts +++ b/packages/socket.io-client/lib/url.ts @@ -39,7 +39,7 @@ type ParsedUrl = { export function url( uri: string | ParsedUrl, path: string = "", - loc?: Location, + loc?: Location ): ParsedUrl { let obj = uri as ParsedUrl; diff --git a/packages/socket.io-client/test/connection.ts b/packages/socket.io-client/test/connection.ts index b8c90b794d..7b36c4f332 100644 --- a/packages/socket.io-client/test/connection.ts +++ b/packages/socket.io-client/test/connection.ts @@ -576,7 +576,7 @@ describe("connection", () => { reconnectionAttempts: 2, }); let delay = Math.floor( - manager.reconnectionDelay() * manager.randomizationFactor() * 0.5, + manager.reconnectionDelay() * manager.randomizationFactor() * 0.5 ); delay = Math.max(delay, 10); diff --git a/packages/socket.io-client/test/socket.ts b/packages/socket.io-client/test/socket.ts index a37331a519..493920aa7a 100644 --- a/packages/socket.io-client/test/socket.ts +++ b/packages/socket.io-client/test/socket.ts @@ -336,7 +336,7 @@ describe("socket", () => { const socket = io(BASE_URL + "/no", { forceNew: true }); expect(() => socket.emit("disconnecting", "goodbye")).to.throwException( - /"disconnecting" is a reserved event name/, + /"disconnecting" is a reserved event name/ ); }); diff --git a/packages/socket.io-client/test/typed-events.test-d.ts b/packages/socket.io-client/test/typed-events.test-d.ts index d7e56de46d..1cb30d6400 100644 --- a/packages/socket.io-client/test/typed-events.test-d.ts +++ b/packages/socket.io-client/test/typed-events.test-d.ts @@ -92,7 +92,7 @@ describe("typed events", () => { const value = await socket.emitWithAck( "ackFromClientSingleArg", "1", - 2, + 2 ); expectType(value); @@ -155,12 +155,12 @@ describe("typed events", () => { ackFromClient: ( a: string, b: number, - ack: (c: string, d: boolean) => void, + ack: (c: string, d: boolean) => void ) => void; ackFromClientSingleArg: ( a: string, b: number, - ack: (c: string) => void, + ack: (c: string) => void ) => void; ackFromClientNoArg: (ack: () => void) => void; } @@ -232,7 +232,7 @@ describe("typed events", () => { const value = await socket.emitWithAck( "ackFromClientSingleArg", "1", - 2, + 2 ); expectType(value); diff --git a/packages/socket.io-client/wdio.conf.js b/packages/socket.io-client/wdio.conf.js index fc9d8f583b..00cf312877 100644 --- a/packages/socket.io-client/wdio.conf.js +++ b/packages/socket.io-client/wdio.conf.js @@ -79,7 +79,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS, + BASE_SAUCE_OPTIONS ), }, { @@ -92,7 +92,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS, + BASE_SAUCE_OPTIONS ), }, ]; diff --git a/packages/socket.io-cluster-engine/test/in-memory.ts b/packages/socket.io-cluster-engine/test/in-memory.ts index fe3a0ff95e..d34e869ce7 100644 --- a/packages/socket.io-cluster-engine/test/in-memory.ts +++ b/packages/socket.io-cluster-engine/test/in-memory.ts @@ -7,7 +7,10 @@ import { type ServerOptions } from "engine.io"; import { url, handshake } from "./util"; class InMemoryEngine extends ClusterEngine { - constructor(readonly eventBus: EventEmitter, opts?: ServerOptions) { + constructor( + readonly eventBus: EventEmitter, + opts?: ServerOptions + ) { super(opts); eventBus.on("message", (message) => this.onMessage(message)); } diff --git a/packages/socket.io-parser/test/parser.js b/packages/socket.io-parser/test/parser.js index 0bbc5716ea..1b7a415727 100644 --- a/packages/socket.io-parser/test/parser.js +++ b/packages/socket.io-parser/test/parser.js @@ -110,7 +110,7 @@ describe("socket.io-parser", () => { it("throw an error upon parsing error", () => { const isInvalidPayload = (str) => expect(() => new Decoder().add(str)).to.throwException( - /^invalid payload$/, + /^invalid payload$/ ); isInvalidPayload('442["some","data"'); @@ -126,11 +126,11 @@ describe("socket.io-parser", () => { isInvalidPayload('2["disconnect","123"]'); expect(() => new Decoder().add("999")).to.throwException( - /^unknown packet type 9$/, + /^unknown packet type 9$/ ); expect(() => new Decoder().add(999)).to.throwException( - /^Unknown type: 999$/, + /^Unknown type: 999$/ ); }); @@ -154,7 +154,7 @@ describe("socket.io-parser", () => { isPacketValid({ type: 0, nsp: "/", - }), + }) ).to.eql(true); expect( @@ -162,7 +162,7 @@ describe("socket.io-parser", () => { type: 0, nsp: "/admin", data: "invalid", - }), + }) ).to.eql(false); expect( @@ -170,7 +170,7 @@ describe("socket.io-parser", () => { type: 0, nsp: "/", data: [], - }), + }) ).to.eql(false); expect( @@ -178,7 +178,7 @@ describe("socket.io-parser", () => { type: 1, nsp: "/admin", data: {}, - }), + }) ).to.eql(false); expect( @@ -186,7 +186,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/admin", data: "invalid", - }), + }) ).to.eql(false); expect( @@ -194,7 +194,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/admin", data: {}, - }), + }) ).to.eql(false); expect( @@ -202,7 +202,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: { toString: "foo" }, - }), + }) ).to.eql(false); expect( @@ -210,7 +210,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: [true, "foo"], - }), + }) ).to.eql(false); expect( @@ -218,7 +218,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: [null, "bar"], - }), + }) ).to.eql(false); expect( @@ -226,7 +226,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: ["connect"], - }), + }) ).to.eql(false); expect( @@ -234,7 +234,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: ["disconnect", "123"], - }), + }) ).to.eql(false); }); }); diff --git a/packages/socket.io-parser/wdio.conf.js b/packages/socket.io-parser/wdio.conf.js index b5dc800a96..c8c592a4f6 100644 --- a/packages/socket.io-parser/wdio.conf.js +++ b/packages/socket.io-parser/wdio.conf.js @@ -72,7 +72,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS, + BASE_SAUCE_OPTIONS ), }, { @@ -85,7 +85,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS, + BASE_SAUCE_OPTIONS ), }, ]; diff --git a/packages/socket.io/lib/broadcast-operator.ts b/packages/socket.io/lib/broadcast-operator.ts index 0553c027f0..48e295cb78 100644 --- a/packages/socket.io/lib/broadcast-operator.ts +++ b/packages/socket.io/lib/broadcast-operator.ts @@ -23,7 +23,7 @@ export class BroadcastOperator private readonly exceptRooms: Set = new Set(), private readonly flags: BroadcastFlags & { expectSingleResponse?: boolean; - } = {}, + } = {} ) {} /** @@ -53,7 +53,7 @@ export class BroadcastOperator this.adapter, rooms, this.exceptRooms, - this.flags, + this.flags ); } @@ -98,7 +98,7 @@ export class BroadcastOperator this.adapter, this.rooms, exceptRooms, - this.flags, + this.flags ); } @@ -117,7 +117,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags, + flags ); } @@ -137,7 +137,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags, + flags ); } @@ -156,7 +156,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags, + flags ); } @@ -276,7 +276,7 @@ export class BroadcastOperator // each client sends an acknowledgement responses.push(clientResponse); checkCompleteness(); - }, + } ); this.adapter.serverCount().then((serverCount) => { @@ -326,7 +326,7 @@ export class BroadcastOperator public allSockets(): Promise> { if (!this.adapter) { throw new Error( - "No adapter for this namespace, are you trying to get the list of clients of a dynamic namespace?", + "No adapter for this namespace, are you trying to get the list of clients of a dynamic namespace?" ); } return this.adapter.sockets(this.rooms); @@ -371,7 +371,7 @@ export class BroadcastOperator } else { return new RemoteSocket( this.adapter, - socket as SocketDetails, + socket as SocketDetails ); } }); @@ -400,7 +400,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - Array.isArray(room) ? room : [room], + Array.isArray(room) ? room : [room] ); } @@ -425,7 +425,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - Array.isArray(room) ? room : [room], + Array.isArray(room) ? room : [room] ); } @@ -450,7 +450,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - close, + close ); } } @@ -489,7 +489,7 @@ export class RemoteSocket new Set(), { expectSingleResponse: true, // so that remoteSocket.emit() with acknowledgement behaves like socket.emit() - }, + } ); } @@ -517,7 +517,7 @@ export class RemoteSocket * @param timeout */ public timeout( - timeout: number, + timeout: number ): BroadcastOperator, SocketData> { return this.operator.timeout(timeout); } diff --git a/packages/socket.io/lib/client.ts b/packages/socket.io/lib/client.ts index 6ca7b77818..251dc25e52 100644 --- a/packages/socket.io/lib/client.ts +++ b/packages/socket.io/lib/client.ts @@ -61,7 +61,7 @@ export class Client< */ constructor( server: Server, - conn: any, + conn: any ) { this.server = server; this.conn = conn; @@ -126,7 +126,7 @@ export class Client< ( dynamicNspName: | Namespace - | false, + | false ) => { if (dynamicNspName) { this.doConnect(name, auth); @@ -140,7 +140,7 @@ export class Client< }, }); } - }, + } ); } @@ -185,7 +185,7 @@ export class Client< * @private */ _remove( - socket: Socket, + socket: Socket ): void { if (this.sockets.has(socket.id)) { const nsp = this.sockets.get(socket.id)!.nsp.name; @@ -229,11 +229,11 @@ export class Client< private writeToEngine( encodedPackets: Array, - opts: WriteOptions, + opts: WriteOptions ): void { if (opts.volatile && !this.conn.transport.writable) { debug( - "volatile packet is discarded since the transport is not currently writable", + "volatile packet is discarded since the transport is not currently writable" ); return; } @@ -316,7 +316,7 @@ export class Client< */ private onclose( reason: CloseReason | "forced server close", - description?: any, + description?: any ): void { debug("client close with reason %s", reason); diff --git a/packages/socket.io/lib/index.ts b/packages/socket.io/lib/index.ts index 73d7d330e9..13bf209d5e 100644 --- a/packages/socket.io/lib/index.ts +++ b/packages/socket.io/lib/index.ts @@ -51,7 +51,7 @@ const dotMapRegex = /\.map/; type ParentNspNameMatchFn = ( name: string, auth: { [key: string]: any }, - fn: (err: Error | null, success: boolean) => void, + fn: (err: Error | null, success: boolean) => void ) => void; type AdapterConstructor = typeof Adapter | ((nsp: Namespace) => Adapter); @@ -218,7 +218,7 @@ export class Server< private _corsMiddleware: ( req: http.IncomingMessage, res: http.ServerResponse, - next: () => void, + next: () => void ) => void; /** @@ -231,11 +231,11 @@ export class Server< constructor(srv?: TServerInstance | number, opts?: Partial); constructor( srv: undefined | Partial | TServerInstance | number, - opts?: Partial, + opts?: Partial ); constructor( srv: undefined | Partial | TServerInstance | number, - opts: Partial = {}, + opts: Partial = {} ) { super(); if ( @@ -258,7 +258,7 @@ export class Server< maxDisconnectionDuration: 2 * 60 * 1000, skipMiddlewares: true, }, - opts.connectionStateRecovery, + opts.connectionStateRecovery ); this.adapter(opts.adapter || SessionAwareAdapter); } else { @@ -308,8 +308,8 @@ export class Server< fn: ( nsp: | Namespace - | false, - ) => void, + | false + ) => void ): void { if (this.parentNsps.size === 0) return fn(false); @@ -356,7 +356,7 @@ export class Server< this.clientPathRegex = new RegExp( "^" + escapedPath + - "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)", + "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)" ); return this; } @@ -383,7 +383,7 @@ export class Server< public adapter(): AdapterConstructor | undefined; public adapter(v: AdapterConstructor): this; public adapter( - v?: AdapterConstructor, + v?: AdapterConstructor ): AdapterConstructor | undefined | this { if (!arguments.length) return this._adapter; this._adapter = v; @@ -402,7 +402,7 @@ export class Server< */ public listen( srv: TServerInstance | number, - opts: Partial = {}, + opts: Partial = {} ): this { return this.attach(srv, opts); } @@ -416,7 +416,7 @@ export class Server< */ public attach( srv: TServerInstance | number, - opts: Partial = {}, + opts: Partial = {} ): this { if ("function" == typeof srv) { const msg = @@ -501,7 +501,7 @@ export class Server< res.writeHeader("cache-control", "public, max-age=0"); res.writeHeader( "content-type", - "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8", + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" ); res.writeHeader("etag", expectedEtag); @@ -522,7 +522,7 @@ export class Server< */ private initEngine( srv: TServerInstance, - opts: EngineOptions & AttachOptions, + opts: EngineOptions & AttachOptions ): void { // initialize engine debug("creating engine.io instance with opts %j", opts); @@ -598,7 +598,7 @@ export class Server< res.setHeader("Cache-Control", "public, max-age=0"); res.setHeader( "Content-Type", - "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8", + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" ); res.setHeader("ETag", expectedEtag); @@ -614,10 +614,10 @@ export class Server< private static sendFile( filename: string, req: http.IncomingMessage, - res: http.ServerResponse, + res: http.ServerResponse ): void { const readStream = createReadStream( - path.join(__dirname, "../client-dist/", filename), + path.join(__dirname, "../client-dist/", filename) ); const encoding = accepts(req).encodings(["br", "gzip", "deflate"]); @@ -696,8 +696,8 @@ export class Server< public of( name: string | RegExp | ParentNspNameMatchFn, fn?: ( - socket: Socket, - ) => void, + socket: Socket + ) => void ): Namespace { if (typeof name === "function" || name instanceof RegExp) { const parentNsp = new ParentNamespace(this); @@ -707,7 +707,7 @@ export class Server< } else { this.parentNsps.set( (nsp, conn, next) => next(null, (name as RegExp).test(nsp)), - parentNsp, + parentNsp ); this.parentNamespacesFromRegExp.set(name, parentNsp); } @@ -783,8 +783,8 @@ export class Server< public use( fn: ( socket: Socket, - next: (err?: ExtendedError) => void, - ) => void, + next: (err?: ExtendedError) => void + ) => void ): this { this.sockets.use(fn); return this; @@ -1096,7 +1096,7 @@ export class Server< const emitterMethods = Object.keys(EventEmitter.prototype).filter( function (key) { return typeof EventEmitter.prototype[key] === "function"; - }, + } ); emitterMethods.forEach(function (fn) { diff --git a/packages/socket.io/lib/namespace.ts b/packages/socket.io/lib/namespace.ts index 023b1f7f6a..25a90a2ebe 100644 --- a/packages/socket.io/lib/namespace.ts +++ b/packages/socket.io/lib/namespace.ts @@ -34,10 +34,10 @@ export interface NamespaceReservedEventsMap< SocketData, > { connect: ( - socket: Socket, + socket: Socket ) => void; connection: ( - socket: Socket, + socket: Socket ) => void; } @@ -53,12 +53,7 @@ export interface ServerReservedEventsMap< SocketData > { new_namespace: ( - namespace: Namespace< - ListenEvents, - EmitEvents, - ServerSideEvents, - SocketData - >, + namespace: Namespace ) => void; } @@ -154,7 +149,7 @@ export class Namespace< _fns: Array< ( socket: Socket, - next: (err?: ExtendedError) => void, + next: (err?: ExtendedError) => void ) => void > = []; @@ -169,7 +164,7 @@ export class Namespace< */ constructor( server: Server, - name: string, + name: string ) { super(); this.server = server; @@ -205,8 +200,8 @@ export class Namespace< public use( fn: ( socket: Socket, - next: (err?: ExtendedError) => void, - ) => void, + next: (err?: ExtendedError) => void + ) => void ): this { this._fns.push(fn); return this; @@ -221,7 +216,7 @@ export class Namespace< */ private run( socket: Socket, - fn: (err: ExtendedError | null) => void, + fn: (err: ExtendedError | null) => void ) { const fns = this._fns.slice(0); if (!fns.length) return fn(null); @@ -321,8 +316,8 @@ export class Namespace< client: Client, auth: Record, fn: ( - socket: Socket, - ) => void, + socket: Socket + ) => void ) { debug("adding socket to nsp %s", this.name); const socket = await this._createSocket(client, auth); @@ -364,7 +359,7 @@ export class Namespace< private async _createSocket( client: Client, - auth: Record, + auth: Record ) { const sessionId = auth.pid; const offset = auth.offset; @@ -391,8 +386,8 @@ export class Namespace< private _doConnect( socket: Socket, fn: ( - socket: Socket, - ) => void, + socket: Socket + ) => void ) { // track socket this.sockets.set(socket.id, socket); @@ -415,7 +410,7 @@ export class Namespace< * @private */ _remove( - socket: Socket, + socket: Socket ): void { if (this.sockets.has(socket.id)) { this.sockets.delete(socket.id); @@ -452,7 +447,7 @@ export class Namespace< ): boolean { return new BroadcastOperator(this.adapter).emit( ev, - ...args, + ...args ); } @@ -568,7 +563,7 @@ export class Namespace< }); this.serverSideEmit( ev, - ...(args as any[] as EventParams), + ...(args as any[] as EventParams) ); }); } @@ -592,7 +587,7 @@ export class Namespace< */ public allSockets(): Promise> { return new BroadcastOperator( - this.adapter, + this.adapter ).allSockets(); } @@ -702,7 +697,7 @@ export class Namespace< */ public fetchSockets() { return new BroadcastOperator( - this.adapter, + this.adapter ).fetchSockets(); } @@ -724,7 +719,7 @@ export class Namespace< */ public socketsJoin(room: Room | Room[]) { return new BroadcastOperator( - this.adapter, + this.adapter ).socketsJoin(room); } @@ -746,7 +741,7 @@ export class Namespace< */ public socketsLeave(room: Room | Room[]) { return new BroadcastOperator( - this.adapter, + this.adapter ).socketsLeave(room); } @@ -768,7 +763,7 @@ export class Namespace< */ public disconnectSockets(close: boolean = false) { return new BroadcastOperator( - this.adapter, + this.adapter ).disconnectSockets(close); } } diff --git a/packages/socket.io/lib/parent-namespace.ts b/packages/socket.io/lib/parent-namespace.ts index 9df17da279..d75481aac6 100644 --- a/packages/socket.io/lib/parent-namespace.ts +++ b/packages/socket.io/lib/parent-namespace.ts @@ -39,7 +39,7 @@ export class ParentNamespace< > = new Set(); constructor( - server: Server, + server: Server ) { super(server, "/_" + ParentNamespace.count++); } @@ -63,16 +63,16 @@ export class ParentNamespace< } createChild( - name: string, + name: string ): Namespace { debug("creating child namespace %s", name); const namespace = new Namespace(this.server, name); namespace._fns = this._fns.slice(0); this.listeners("connect").forEach((listener) => - namespace.on("connect", listener), + namespace.on("connect", listener) ); this.listeners("connection").forEach((listener) => - namespace.on("connection", listener), + namespace.on("connection", listener) ); this.children.add(namespace); diff --git a/packages/socket.io/lib/socket.ts b/packages/socket.io/lib/socket.ts index 0adc9fea79..a7e798e1db 100644 --- a/packages/socket.io/lib/socket.ts +++ b/packages/socket.io/lib/socket.ts @@ -66,11 +66,11 @@ export interface SocketReservedEventsMap { export interface EventEmitterReservedEventsMap { newListener: ( eventName: string | Symbol, - listener: (...args: any[]) => void, + listener: (...args: any[]) => void ) => void; removeListener: ( eventName: string | Symbol, - listener: (...args: any[]) => void, + listener: (...args: any[]) => void ) => void; } @@ -252,7 +252,7 @@ export class Socket< readonly nsp: Namespace, readonly client: Client, auth: Record, - previousSession?: Session, + previousSession?: Session ) { super(); this.server = nsp.server; @@ -529,7 +529,7 @@ export class Socket< */ private packet( packet: Omit & Partial>, - opts: any = {}, + opts: any = {} ): void { packet.nsp = this.nsp.name; opts.compress = false !== opts.compress; @@ -556,7 +556,7 @@ export class Socket< return this.adapter.addAll( this.id, - new Set(Array.isArray(rooms) ? rooms : [rooms]), + new Set(Array.isArray(rooms) ? rooms : [rooms]) ); } @@ -893,7 +893,7 @@ export class Socket< * @returns self */ public timeout( - timeout: number, + timeout: number ): Socket< ListenEvents, DecorateAcknowledgements, diff --git a/packages/socket.io/lib/typed-events.ts b/packages/socket.io/lib/typed-events.ts index 0a04e67577..09108e854b 100644 --- a/packages/socket.io/lib/typed-events.ts +++ b/packages/socket.io/lib/typed-events.ts @@ -158,7 +158,7 @@ export abstract class StrictEventEmitter< */ on>( ev: Ev, - listener: ReservedOrUserListener, + listener: ReservedOrUserListener ): this { return super.on(ev, listener); } @@ -171,7 +171,7 @@ export abstract class StrictEventEmitter< */ once>( ev: Ev, - listener: ReservedOrUserListener, + listener: ReservedOrUserListener ): this { return super.once(ev, listener); } @@ -226,7 +226,7 @@ export abstract class StrictEventEmitter< * @returns Array of listeners subscribed to `event` */ listeners>( - event: Ev, + event: Ev ): ReservedOrUserListener[] { return super.listeners(event) as ReservedOrUserListener< ReservedEvents, diff --git a/packages/socket.io/lib/uws.ts b/packages/socket.io/lib/uws.ts index 89a6bf7d33..6e400c7f77 100644 --- a/packages/socket.io/lib/uws.ts +++ b/packages/socket.io/lib/uws.ts @@ -76,7 +76,7 @@ export function patchAdapter(app /* : TemplatedApp */) { app.publish( topic, isBinary ? encodedPacket : "4" + encodedPacket, - isBinary, + isBinary ); }); @@ -93,7 +93,7 @@ function subscribe( namespaceName: string, socket: Socket, isNew: boolean, - rooms: Set, + rooms: Set ) { // @ts-ignore const sessionId = socket.conn.id; @@ -144,7 +144,7 @@ export function serveFile(res /* : HttpResponse */, filepath: string) { res.onWritable((offset) => { const [ok, done] = res.tryEnd( arrayBufferChunk.slice(offset - lastOffset), - size, + size ); if (!done && ok) { diff --git a/packages/socket.io/test/connection-state-recovery.ts b/packages/socket.io/test/connection-state-recovery.ts index c0dcbf0703..e84cae6a04 100644 --- a/packages/socket.io/test/connection-state-recovery.ts +++ b/packages/socket.io/test/connection-state-recovery.ts @@ -59,7 +59,7 @@ describe("connection state recovery", () => { await eioPush( httpServer, newSid, - `40{"pid":"${pid}","offset":"${offset}"}`, + `40{"pid":"${pid}","offset":"${offset}"}` ); const payload = await eioPoll(httpServer, newSid); diff --git a/packages/socket.io/test/handshake.ts b/packages/socket.io/test/handshake.ts index fc38e29476..27553eca01 100644 --- a/packages/socket.io/test/handshake.ts +++ b/packages/socket.io/test/handshake.ts @@ -22,11 +22,11 @@ describe("handshake", () => { expect(res.status).to.be(204); expect(res.headers["access-control-allow-origin"]).to.be( - "http://localhost:54023", + "http://localhost:54023" ); expect(res.headers["access-control-allow-methods"]).to.be("GET,POST"); expect(res.headers["access-control-allow-headers"]).to.be( - "content-type", + "content-type" ); expect(res.headers["access-control-allow-credentials"]).to.be("true"); success(done, io); @@ -50,7 +50,7 @@ describe("handshake", () => { expect(res.status).to.be(200); expect(res.headers["access-control-allow-origin"]).to.be( - "http://localhost:54024", + "http://localhost:54024" ); expect(res.headers["access-control-allow-credentials"]).to.be("true"); success(done, io); diff --git a/packages/socket.io/test/messaging-many.ts b/packages/socket.io/test/messaging-many.ts index 0a51815068..ce71062645 100644 --- a/packages/socket.io/test/messaging-many.ts +++ b/packages/socket.io/test/messaging-many.ts @@ -17,7 +17,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3), + successFn(done, io, socket1, socket2, socket3) ); socket1.on("a", (a) => { @@ -53,7 +53,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3), + successFn(done, io, socket1, socket2, socket3) ); socket1.on("bin", (a) => { @@ -142,7 +142,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2), + successFn(done, io, socket1, socket2) ); socket2.on("a", () => { @@ -178,7 +178,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3), + successFn(done, io, socket1, socket2, socket3) ); socket1.emit("join", "woot"); @@ -221,7 +221,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3), + successFn(done, io, socket1, socket2, socket3) ); socket1.emit("join", "woot"); diff --git a/packages/socket.io/test/middleware.ts b/packages/socket.io/test/middleware.ts index 5211c05a64..46455a73e1 100644 --- a/packages/socket.io/test/middleware.ts +++ b/packages/socket.io/test/middleware.ts @@ -179,7 +179,7 @@ describe("middleware", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2), + successFn(done, io, socket1, socket2) ); io.of("/chat").use((socket, next) => { diff --git a/packages/socket.io/test/namespaces.ts b/packages/socket.io/test/namespaces.ts index a8b3f08fcf..621c589cef 100644 --- a/packages/socket.io/test/namespaces.ts +++ b/packages/socket.io/test/namespaces.ts @@ -389,7 +389,7 @@ describe("namespaces", () => { const io = new Server(); expect(() => io.emit("connect")).to.throwException( - /"connect" is a reserved event name/, + /"connect" is a reserved event name/ ); }); @@ -660,9 +660,7 @@ describe("namespaces", () => { c2.on("connect_error", () => { done( - new Error( - "Client got error when connecting to dynamic namespace", - ), + new Error("Client got error when connecting to dynamic namespace") ); }); }, 100); diff --git a/packages/socket.io/test/server-attachment.ts b/packages/socket.io/test/server-attachment.ts index f653446c50..81da1acbcd 100644 --- a/packages/socket.io/test/server-attachment.ts +++ b/packages/socket.io/test/server-attachment.ts @@ -17,7 +17,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/javascript; charset=utf-8", + "application/javascript; charset=utf-8" ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); @@ -36,7 +36,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/json; charset=utf-8", + "application/json; charset=utf-8" ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.text).to.match(/engine\.io/); @@ -48,7 +48,7 @@ describe("server attachment", () => { it("should serve client", testSource("socket.io.js")); it( "should serve client with query string", - testSource("socket.io.js?buster=" + Date.now()), + testSource("socket.io.js?buster=" + Date.now()) ); it("should serve source map", testSourceMap("socket.io.js.map")); it("should serve client (min)", testSource("socket.io.min.js")); @@ -99,7 +99,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["access-control-allow-origin"]).to.be( - "https://good-origin.com", + "https://good-origin.com" ); expect(res.status).to.be(200); done(); @@ -108,19 +108,19 @@ describe("server attachment", () => { it( "should serve bundle with msgpack parser", - testSource("socket.io.msgpack.min.js"), + testSource("socket.io.msgpack.min.js") ); it( "should serve source map for bundle with msgpack parser", - testSourceMap("socket.io.msgpack.min.js.map"), + testSourceMap("socket.io.msgpack.min.js.map") ); it("should serve the ESM bundle", testSource("socket.io.esm.min.js")); it( "should serve the source map for the ESM bundle", - testSourceMap("socket.io.esm.min.js.map"), + testSourceMap("socket.io.esm.min.js.map") ); it("should handle 304", (done) => { diff --git a/packages/socket.io/test/socket.io.test-d.ts b/packages/socket.io/test/socket.io.test-d.ts index 5c6ef3b187..a6cc51c1ff 100644 --- a/packages/socket.io/test/socket.io.test-d.ts +++ b/packages/socket.io/test/socket.io.test-d.ts @@ -123,7 +123,7 @@ describe("server", () => { const value1 = await s.emitWithAck( "ackFromServerSingleArg", true, - "123", + "123" ); expectType(value1); }); @@ -158,7 +158,7 @@ describe("server", () => { it("does not accept arguments of wrong types", (done) => { const srv = createServer(); const sio = new Server( - srv, + srv ); // @ts-expect-error - shouldn't accept arguments of the wrong types sio.on("random", (a, b, c) => {}); @@ -192,7 +192,7 @@ describe("server", () => { ackFromClient: ( a: string, b: number, - ack: (c: string, d: number) => void, + ack: (c: string, d: number) => void ) => void; } @@ -202,12 +202,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (c: boolean, d: string) => void, + ack: (c: boolean, d: string) => void ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (c: string) => void, + ack: (c: string) => void ) => void; onlyCallback: (a: () => void) => void; } @@ -226,12 +226,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (err: Error, c: boolean, d: string) => void, + ack: (err: Error, c: boolean, d: string) => void ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (err: Error, c: string) => void, + ack: (err: Error, c: string) => void ) => void; onlyCallback: (a: (err: Error) => void) => void; } @@ -243,7 +243,7 @@ describe("server", () => { ackFromServerSingleArg: ( a: boolean, b: string, - ack: (c: string[]) => void, + ack: (c: string[]) => void ) => void; onlyCallback: (a: () => void) => void; } @@ -253,12 +253,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (err: Error, c: boolean[]) => void, + ack: (err: Error, c: boolean[]) => void ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (err: Error, c: string[]) => void, + ack: (err: Error, c: string[]) => void ) => void; onlyCallback: (a: (err: Error) => void) => void; } @@ -315,7 +315,7 @@ describe("server", () => { untyped.of("/").emit("random2", 2, "string", Server); expectType>(untyped.to("1").emitWithAck("random", "test")); expectType<(ev: string, ...args: any[]) => Promise>( - untyped.to("1").emitWithAck, + untyped.to("1").emitWithAck ); }); it("has the correct types", () => { @@ -326,25 +326,25 @@ describe("server", () => { const nio = sio.of("/"); for (const emitter of [sio, nio]) { expectType>( - emitter.to("1"), + emitter.to("1") ); expectType>( - emitter.in("1"), + emitter.in("1") ); expectType>( - emitter.except("1"), + emitter.except("1") ); expectType>( - emitter.except("1"), + emitter.except("1") ); expectType>( - emitter.compress(true), + emitter.compress(true) ); expectType>( - emitter.volatile, + emitter.volatile ); expectType>( - emitter.local, + emitter.local ); expectType< BroadcastOperator @@ -367,16 +367,16 @@ describe("server", () => { >(s.timeout(0).broadcast); // ensure that turning socket to a broadcast works correctly expectType>( - s.broadcast, + s.broadcast ); expectType>( - s.in("1"), + s.in("1") ); expectType>( - s.except("1"), + s.except("1") ); expectType>( - s.to("1"), + s.to("1") ); // Ensure that adding a timeout to a broadcast works after the fact expectType< @@ -391,7 +391,7 @@ describe("server", () => { it("has the correct types for `emit`", () => { const sio = new Server(); expectType>( - sio.timeout(0).emit<"noArgs">, + sio.timeout(0).emit<"noArgs"> ); expectType< ToEmit @@ -414,7 +414,7 @@ describe("server", () => { const sansTimeout = sio.in("1"); // Without timeout, `emitWithAck` shouldn't accept any events expectType( - undefined as Parameters<(typeof sansTimeout)["emitWithAck"]>[0], + undefined as Parameters<(typeof sansTimeout)["emitWithAck"]>[0] ); // @ts-expect-error - "noArgs" doesn't have a callback and is thus excluded sio.timeout(0).emitWithAck("noArgs"); @@ -441,33 +441,33 @@ describe("server", () => { const sio = new Server(); const nio = sio.of("/test"); expectType>( - sio.emit<"noArgs">, + sio.emit<"noArgs"> ); expectType>( - nio.emit<"noArgs">, + nio.emit<"noArgs"> ); expectType>( // These errors will dissapear once the TS version is updated from 4.7.4 // the TSD instance is using a newer version of TS than the workspace version // to enable the ability to compare against `any` - sio.emit<"helloFromServer">, + sio.emit<"helloFromServer"> ); expectType>( - nio.emit<"helloFromServer">, + nio.emit<"helloFromServer"> ); sio.on("connection", (s) => { expectType>(s.emit<"noArgs">); expectType>( - s.emit<"helloFromServer">, + s.emit<"helloFromServer"> ); expectType>( - s.emit<"ackFromServerSingleArg">, + s.emit<"ackFromServerSingleArg"> ); expectType>( - s.emit<"ackFromServer">, + s.emit<"ackFromServer"> ); expectType>( - s.emit<"onlyCallback">, + s.emit<"onlyCallback"> ); }); }); @@ -631,7 +631,7 @@ describe("server", () => { const value = await sio.serverSideEmitWithAck( "ackFromServerToServer", - "foo", + "foo" ); expectType(value); @@ -654,7 +654,7 @@ describe("server", () => { class MyCustomAdapter extends Adapter { constructor( nsp, - readonly opts, + readonly opts ) { super(nsp); } diff --git a/packages/socket.io/test/socket.ts b/packages/socket.io/test/socket.ts index 41882a7987..f9c93ff00b 100644 --- a/packages/socket.io/test/socket.ts +++ b/packages/socket.io/test/socket.ts @@ -807,7 +807,7 @@ describe("socket", () => { io.on("connection", (s) => { s.conn.on("upgrade", () => { console.log( - "\u001b[96mNote: warning expected and normal in test.\u001b[39m", + "\u001b[96mNote: warning expected and normal in test.\u001b[39m" ); // @ts-ignore socket.io.engine.write("5woooot"); @@ -825,7 +825,7 @@ describe("socket", () => { io.on("connection", (s) => { s.conn.on("upgrade", () => { console.log( - "\u001b[96mNote: warning expected and normal in test.\u001b[39m", + "\u001b[96mNote: warning expected and normal in test.\u001b[39m" ); // @ts-ignore socket.io.engine.write('44["handle me please"]'); @@ -883,7 +883,7 @@ describe("socket", () => { const socket = createClient(io); io.on("connection", (s) => { expect(() => s.emit("connect_error")).to.throwException( - /"connect_error" is a reserved event name/, + /"connect_error" is a reserved event name/ ); socket.close(); success(done, io, socket); @@ -1112,7 +1112,7 @@ describe("socket", () => { const partialDone = createPartialDone( 3, - successFn(done, io, socket1, socket2, socket3), + successFn(done, io, socket1, socket2, socket3) ); socket1.on("disconnect", partialDone); diff --git a/packages/socket.io/test/support/util.ts b/packages/socket.io/test/support/util.ts index 1e59dd01ec..7d04ce8644 100644 --- a/packages/socket.io/test/support/util.ts +++ b/packages/socket.io/test/support/util.ts @@ -25,7 +25,7 @@ expect.Assertion.prototype.contain = function (...args) { }, function () { return "expected " + i(this.obj) + " to not contain " + i(obj); - }, + } ); }); return this; @@ -39,7 +39,7 @@ export function createClient< >( io: Server, nsp: string = "/", - opts?: Partial, + opts?: Partial ): ClientSocket { const port = (io.httpServer.address() as AddressInfo).port; return ioc(`http://localhost:${port}${nsp}`, opts); diff --git a/packages/socket.io/test/utility-methods.ts b/packages/socket.io/test/utility-methods.ts index 030edccfbf..efbc21c0b7 100644 --- a/packages/socket.io/test/utility-methods.ts +++ b/packages/socket.io/test/utility-methods.ts @@ -47,7 +47,7 @@ describe("utility methods", () => { ioc(`http://localhost:${port}`, { // FIXME needed so that clients are properly closed transports: ["websocket"], - }), + }) ); } diff --git a/packages/socket.io/test/uws.ts b/packages/socket.io/test/uws.ts index 52e5c32d75..3a287e6468 100644 --- a/packages/socket.io/test/uws.ts +++ b/packages/socket.io/test/uws.ts @@ -212,7 +212,7 @@ describe("socket.io with uWebSocket.js-based engine", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/javascript; charset=utf-8", + "application/javascript; charset=utf-8" ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); diff --git a/packages/socket.io/test/v2-compatibility.ts b/packages/socket.io/test/v2-compatibility.ts index 2f626d0db1..20d3d4a76f 100644 --- a/packages/socket.io/test/v2-compatibility.ts +++ b/packages/socket.io/test/v2-compatibility.ts @@ -32,7 +32,7 @@ describe("v2 compatibility", () => { `http://localhost:${getPort(io)}/the-namespace`, { multiplex: false, - }, + } ); clientSocket.query = { test: "123" }; From 66b2cf6b94eec2a1ab9fb9d5949e0a085ab549ea Mon Sep 17 00:00:00 2001 From: Damien Arrachequesne Date: Mon, 16 Sep 2024 08:32:26 +0200 Subject: [PATCH 6/6] remove prettier config --- .prettierrc.json | 3 - packages/engine.io-client/lib/globals.node.ts | 2 +- packages/engine.io-client/lib/socket.ts | 10 +- packages/engine.io-client/lib/transport.ts | 4 +- .../lib/transports/polling-xhr.node.ts | 4 +- .../lib/transports/polling-xhr.ts | 8 +- .../lib/transports/websocket.node.ts | 2 +- .../lib/transports/websocket.ts | 6 +- .../lib/transports/webtransport.ts | 4 +- packages/engine.io-client/test/connection.js | 4 +- packages/engine.io-client/test/socket.js | 4 +- .../engine.io-client/test/support/hooks.js | 2 +- packages/engine.io-client/test/transport.js | 6 +- .../engine.io-client/test/webtransport.mjs | 12 +- .../lib/decodePacket.browser.ts | 2 +- packages/engine.io-parser/lib/decodePacket.ts | 4 +- .../lib/encodePacket.browser.ts | 6 +- packages/engine.io-parser/lib/encodePacket.ts | 6 +- packages/engine.io-parser/lib/index.ts | 14 +- packages/engine.io-parser/test/index.ts | 2 +- packages/engine.io/lib/server.ts | 30 ++-- packages/engine.io/lib/socket.ts | 14 +- packages/engine.io/lib/transport.ts | 2 +- .../engine.io/lib/transports/websocket.ts | 4 +- .../engine.io/lib/transports/webtransport.ts | 2 +- packages/engine.io/lib/userver.ts | 18 +-- packages/engine.io/test/engine.io.js | 10 +- packages/engine.io/test/middlewares.js | 18 +-- packages/engine.io/test/parser.js | 2 +- packages/engine.io/test/server.js | 140 +++++++++--------- packages/engine.io/test/webtransport.mjs | 28 ++-- .../socket.io-adapter/lib/cluster-adapter.ts | 60 ++++---- .../socket.io-adapter/lib/contrib/yeast.ts | 2 +- .../lib/in-memory-adapter.ts | 10 +- .../socket.io-adapter/test/cluster-adapter.ts | 4 +- packages/socket.io-adapter/test/index.ts | 20 +-- packages/socket.io-client/lib/index.ts | 4 +- packages/socket.io-client/lib/manager.ts | 6 +- packages/socket.io-client/lib/on.ts | 2 +- packages/socket.io-client/lib/socket.ts | 16 +- packages/socket.io-client/lib/url.ts | 2 +- packages/socket.io-client/test/connection.ts | 2 +- packages/socket.io-client/test/socket.ts | 2 +- .../test/typed-events.test-d.ts | 8 +- packages/socket.io-client/wdio.conf.js | 4 +- .../socket.io-cluster-engine/lib/engine.ts | 36 ++--- .../socket.io-cluster-engine/lib/redis.ts | 10 +- .../test/in-memory.ts | 6 +- packages/socket.io-parser/test/parser.js | 28 ++-- packages/socket.io-parser/wdio.conf.js | 4 +- packages/socket.io/lib/broadcast-operator.ts | 28 ++-- packages/socket.io/lib/client.ts | 14 +- packages/socket.io/lib/index.ts | 46 +++--- packages/socket.io/lib/namespace.ts | 47 +++--- packages/socket.io/lib/parent-namespace.ts | 8 +- packages/socket.io/lib/socket.ts | 12 +- packages/socket.io/lib/typed-events.ts | 6 +- packages/socket.io/lib/uws.ts | 6 +- .../test/connection-state-recovery.ts | 2 +- packages/socket.io/test/handshake.ts | 6 +- packages/socket.io/test/messaging-many.ts | 10 +- packages/socket.io/test/middleware.ts | 2 +- packages/socket.io/test/namespaces.ts | 6 +- packages/socket.io/test/server-attachment.ts | 14 +- packages/socket.io/test/socket.io.test-d.ts | 68 ++++----- packages/socket.io/test/socket.ts | 8 +- packages/socket.io/test/support/util.ts | 4 +- packages/socket.io/test/utility-methods.ts | 2 +- packages/socket.io/test/uws.ts | 2 +- packages/socket.io/test/v2-compatibility.ts | 2 +- 70 files changed, 448 insertions(+), 444 deletions(-) delete mode 100644 .prettierrc.json diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index 757fd64caa..0000000000 --- a/.prettierrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "trailingComma": "es5" -} diff --git a/packages/engine.io-client/lib/globals.node.ts b/packages/engine.io-client/lib/globals.node.ts index 56f0dbd67d..77d65969b7 100644 --- a/packages/engine.io-client/lib/globals.node.ts +++ b/packages/engine.io-client/lib/globals.node.ts @@ -55,7 +55,7 @@ export function parse(setCookieString: string): Cookie { case "Max-Age": const expiration = new Date(); expiration.setUTCSeconds( - expiration.getUTCSeconds() + parseInt(value, 10) + expiration.getUTCSeconds() + parseInt(value, 10), ); cookie.expires = expiration; break; diff --git a/packages/engine.io-client/lib/socket.ts b/packages/engine.io-client/lib/socket.ts index 7adc3e1e23..605f6aef7b 100644 --- a/packages/engine.io-client/lib/socket.ts +++ b/packages/engine.io-client/lib/socket.ts @@ -408,7 +408,7 @@ export class SocketWithoutUpgrade extends Emitter< transportOptions: {}, closeOnBeforeunload: false, }, - opts + opts, ); this.opts.path = @@ -434,7 +434,7 @@ export class SocketWithoutUpgrade extends Emitter< addEventListener( "beforeunload", this._beforeunloadEventListener, - false + false, ); } if (this.hostname !== "localhost") { @@ -484,7 +484,7 @@ export class SocketWithoutUpgrade extends Emitter< secure: this.secure, port: this.port, }, - this.opts.transportOptions[name] + this.opts.transportOptions[name], ); debug("options: %j", opts); @@ -749,7 +749,7 @@ export class SocketWithoutUpgrade extends Emitter< type: PacketType, data?: RawData, options?: WriteOptions, - fn?: () => void + fn?: () => void, ) { if ("function" === typeof data) { fn = data; @@ -874,7 +874,7 @@ export class SocketWithoutUpgrade extends Emitter< removeEventListener( "beforeunload", this._beforeunloadEventListener, - false + false, ); removeEventListener("offline", this._offlineEventListener, false); } diff --git a/packages/engine.io-client/lib/transport.ts b/packages/engine.io-client/lib/transport.ts index 854b52bd46..ba9407157c 100644 --- a/packages/engine.io-client/lib/transport.ts +++ b/packages/engine.io-client/lib/transport.ts @@ -14,7 +14,7 @@ export class TransportError extends Error { constructor( reason: string, readonly description: any, - readonly context: any + readonly context: any, ) { super(reason); } @@ -79,7 +79,7 @@ export abstract class Transport extends Emitter< protected onError(reason: string, description: any, context?: any) { super.emitReserved( "error", - new TransportError(reason, description, context) + new TransportError(reason, description, context), ); return this; } diff --git a/packages/engine.io-client/lib/transports/polling-xhr.node.ts b/packages/engine.io-client/lib/transports/polling-xhr.node.ts index 91c35eb12f..172463fcf2 100644 --- a/packages/engine.io-client/lib/transports/polling-xhr.node.ts +++ b/packages/engine.io-client/lib/transports/polling-xhr.node.ts @@ -15,12 +15,12 @@ export class XHR extends BaseXHR { Object.assign( opts, { xd: this.xd, cookieJar: this.socket?._cookieJar }, - this.opts + this.opts, ); return new Request( (opts) => new XMLHttpRequest(opts), this.uri(), - opts as RequestOptions + opts as RequestOptions, ); } } diff --git a/packages/engine.io-client/lib/transports/polling-xhr.ts b/packages/engine.io-client/lib/transports/polling-xhr.ts index d24ef75e47..397c1ba858 100644 --- a/packages/engine.io-client/lib/transports/polling-xhr.ts +++ b/packages/engine.io-client/lib/transports/polling-xhr.ts @@ -122,7 +122,7 @@ export class Request extends Emitter< constructor( private readonly createRequest: (opts: RequestOptions) => XMLHttpRequest, uri: string, - opts: RequestOptions + opts: RequestOptions, ) { super(); installTimerFunctions(this, opts); @@ -151,7 +151,7 @@ export class Request extends Emitter< "ca", "ciphers", "rejectUnauthorized", - "autoUnref" + "autoUnref", ); opts.xdomain = !!this._opts.xd; @@ -197,7 +197,7 @@ export class Request extends Emitter< if (xhr.readyState === 3) { this._opts.cookieJar?.parseCookies( // @ts-ignore - xhr.getResponseHeader("set-cookie") + xhr.getResponseHeader("set-cookie"), ); } @@ -354,7 +354,7 @@ function newRequest(opts) { if (!xdomain) { try { return new globalThis[["Active"].concat("Object").join("X")]( - "Microsoft.XMLHTTP" + "Microsoft.XMLHTTP", ); } catch (e) {} } diff --git a/packages/engine.io-client/lib/transports/websocket.node.ts b/packages/engine.io-client/lib/transports/websocket.node.ts index fd78ba3ac9..a9f808100c 100644 --- a/packages/engine.io-client/lib/transports/websocket.node.ts +++ b/packages/engine.io-client/lib/transports/websocket.node.ts @@ -14,7 +14,7 @@ export class WS extends BaseWS { createSocket( uri: string, protocols: string | string[] | undefined, - opts: Record + opts: Record, ) { if (this.socket?._cookieJar) { opts.headers = opts.headers || {}; diff --git a/packages/engine.io-client/lib/transports/websocket.ts b/packages/engine.io-client/lib/transports/websocket.ts index fdcbc674af..25e2d4609b 100644 --- a/packages/engine.io-client/lib/transports/websocket.ts +++ b/packages/engine.io-client/lib/transports/websocket.ts @@ -43,7 +43,7 @@ export abstract class BaseWS extends Transport { "origin", "maxPayload", "family", - "checkServerIdentity" + "checkServerIdentity", ); if (this.opts.extraHeaders) { @@ -64,7 +64,7 @@ export abstract class BaseWS extends Transport { abstract createSocket( uri: string, protocols: string | string[] | undefined, - opts: Record + opts: Record, ); /** @@ -166,7 +166,7 @@ export class WS extends BaseWS { createSocket( uri: string, protocols: string | string[] | undefined, - opts: Record + opts: Record, ) { return !isReactNative ? protocols diff --git a/packages/engine.io-client/lib/transports/webtransport.ts b/packages/engine.io-client/lib/transports/webtransport.ts index 0062c3e5f2..ac03c7c5a8 100644 --- a/packages/engine.io-client/lib/transports/webtransport.ts +++ b/packages/engine.io-client/lib/transports/webtransport.ts @@ -30,7 +30,7 @@ export class WT extends Transport { // @ts-ignore this._transport = new WebTransport( this.createUri("https"), - this.opts.transportOptions[this.name] + this.opts.transportOptions[this.name], ); } catch (err) { return this.emitReserved("error", err); @@ -51,7 +51,7 @@ export class WT extends Transport { this._transport.createBidirectionalStream().then((stream) => { const decoderStream = createPacketDecoderStream( Number.MAX_SAFE_INTEGER, - this.socket.binaryType + this.socket.binaryType, ); const reader = stream.readable.pipeThrough(decoderStream).getReader(); diff --git a/packages/engine.io-client/test/connection.js b/packages/engine.io-client/test/connection.js index 2313931274..40c6da83ea 100644 --- a/packages/engine.io-client/test/connection.js +++ b/packages/engine.io-client/test/connection.js @@ -34,12 +34,12 @@ describe("connection", function () { const socket = new Socket(); socket.on("open", () => { socket.send( - "\uD800\uDC00-\uDB7F\uDFFF\uDB80\uDC00-\uDBFF\uDFFF\uE000-\uF8FF" + "\uD800\uDC00-\uDB7F\uDFFF\uDB80\uDC00-\uDBFF\uDFFF\uE000-\uF8FF", ); socket.on("message", (data) => { if ("hi" === data) return; expect(data).to.be( - "\uD800\uDC00-\uDB7F\uDFFF\uDB80\uDC00-\uDBFF\uDFFF\uE000-\uF8FF" + "\uD800\uDC00-\uDB7F\uDFFF\uDB80\uDC00-\uDBFF\uDFFF\uE000-\uF8FF", ); socket.close(); done(); diff --git a/packages/engine.io-client/test/socket.js b/packages/engine.io-client/test/socket.js index e1f999f1f0..a7037f6e94 100644 --- a/packages/engine.io-client/test/socket.js +++ b/packages/engine.io-client/test/socket.js @@ -90,7 +90,7 @@ describe("Socket", function () { socket.on("error", (err) => { expect(err.message).to.eql( - useFetch ? "fetch read error" : "xhr poll error" + useFetch ? "fetch read error" : "xhr poll error", ); done(); }); @@ -237,7 +237,7 @@ describe("Socket", function () { // err.context is a XMLHttpRequest object expect(err.context.readyState).to.eql(4); expect(err.context.responseText).to.eql( - '{"code":1,"message":"Session ID unknown"}' + '{"code":1,"message":"Session ID unknown"}', ); } }); diff --git a/packages/engine.io-client/test/support/hooks.js b/packages/engine.io-client/test/support/hooks.js index b7b9fcf1a3..9fb82b96ee 100644 --- a/packages/engine.io-client/test/support/hooks.js +++ b/packages/engine.io-client/test/support/hooks.js @@ -21,7 +21,7 @@ exports.mochaHooks = { maxHttpBufferSize: 100, allowRequest: (req, fn) => { const denyRequest = new URL(`http://${req.url}`).searchParams.has( - "deny" + "deny", ); fn(null, !denyRequest); }, diff --git a/packages/engine.io-client/test/transport.js b/packages/engine.io-client/test/transport.js index 614c39537f..5e5ad19bfa 100644 --- a/packages/engine.io-client/test/transport.js +++ b/packages/engine.io-client/test/transport.js @@ -100,7 +100,7 @@ describe("Transport", () => { timestampRequests: false, }); expect(polling.uri()).to.contain( - "http://localhost:3000/engine.io?sid=test" + "http://localhost:3000/engine.io?sid=test", ); }); @@ -124,7 +124,7 @@ describe("Transport", () => { timestampRequests: true, }); expect(polling.uri()).to.match( - /http:\/\/localhost\/engine\.io\?(j=[0-9]+&)?(t=[0-9A-Za-z-_]+)/ + /http:\/\/localhost\/engine\.io\?(j=[0-9]+&)?(t=[0-9A-Za-z-_]+)/, ); }); @@ -180,7 +180,7 @@ describe("Transport", () => { timestampRequests: true, }); expect(ws.uri()).to.match( - /ws:\/\/localhost\/engine\.io\?woot=[0-9A-Za-z-_]+/ + /ws:\/\/localhost\/engine\.io\?woot=[0-9A-Za-z-_]+/, ); }); diff --git a/packages/engine.io-client/test/webtransport.mjs b/packages/engine.io-client/test/webtransport.mjs index 69d92d808b..29866b31f6 100644 --- a/packages/engine.io-client/test/webtransport.mjs +++ b/packages/engine.io-client/test/webtransport.mjs @@ -17,7 +17,7 @@ async function setup(opts, cb) { [{ shortName: "CN", value: "localhost" }], { days: 14, // the total length of the validity period MUST NOT exceed two weeks (https://w3c.github.io/webtransport/#custom-certificate-requirements) - } + }, ); const engine = new Server(opts); @@ -73,8 +73,8 @@ function createSocket(port, certificate, opts) { }, }, }, - opts - ) + opts, + ), ); } @@ -113,7 +113,7 @@ describe("WebTransport", () => { httpServer.close(); success(engine, h3Server, done); }); - } + }, ); }); @@ -137,7 +137,7 @@ describe("WebTransport", () => { httpServer.close(); success(engine, h3Server, done); }); - } + }, ); }); @@ -160,7 +160,7 @@ describe("WebTransport", () => { success(engine, h3Server, done); } }); - } + }, ); }); diff --git a/packages/engine.io-parser/lib/decodePacket.browser.ts b/packages/engine.io-parser/lib/decodePacket.browser.ts index 3736905ab1..ea043b3cfd 100644 --- a/packages/engine.io-parser/lib/decodePacket.browser.ts +++ b/packages/engine.io-parser/lib/decodePacket.browser.ts @@ -11,7 +11,7 @@ const withNativeArrayBuffer = typeof ArrayBuffer === "function"; export const decodePacket = ( encodedPacket: RawData, - binaryType?: BinaryType + binaryType?: BinaryType, ): Packet => { if (typeof encodedPacket !== "string") { return { diff --git a/packages/engine.io-parser/lib/decodePacket.ts b/packages/engine.io-parser/lib/decodePacket.ts index f6ed520cbc..6a8efba2a7 100644 --- a/packages/engine.io-parser/lib/decodePacket.ts +++ b/packages/engine.io-parser/lib/decodePacket.ts @@ -8,7 +8,7 @@ import { export const decodePacket = ( encodedPacket: RawData, - binaryType?: BinaryType + binaryType?: BinaryType, ): Packet => { if (typeof encodedPacket !== "string") { return { @@ -47,7 +47,7 @@ const mapBinary = (data: RawData, binaryType?: BinaryType) => { // from HTTP long-polling return data.buffer.slice( data.byteOffset, - data.byteOffset + data.byteLength + data.byteOffset + data.byteLength, ); } else { // from WebTransport (Uint8Array) diff --git a/packages/engine.io-parser/lib/encodePacket.browser.ts b/packages/engine.io-parser/lib/encodePacket.browser.ts index 0eba6b9420..8b229805dd 100644 --- a/packages/engine.io-parser/lib/encodePacket.browser.ts +++ b/packages/engine.io-parser/lib/encodePacket.browser.ts @@ -16,7 +16,7 @@ const isView = (obj) => { const encodePacket = ( { type, data }: Packet, supportsBinary: boolean, - callback: (encodedPacket: RawData) => void + callback: (encodedPacket: RawData) => void, ) => { if (withNativeBlob && data instanceof Blob) { if (supportsBinary) { @@ -40,7 +40,7 @@ const encodePacket = ( const encodeBlobAsBase64 = ( data: Blob, - callback: (encodedPacket: RawData) => void + callback: (encodedPacket: RawData) => void, ) => { const fileReader = new FileReader(); fileReader.onload = function () { @@ -64,7 +64,7 @@ let TEXT_ENCODER; export function encodePacketToBinary( packet: Packet, - callback: (encodedPacket: RawData) => void + callback: (encodedPacket: RawData) => void, ) { if (withNativeBlob && packet.data instanceof Blob) { return packet.data.arrayBuffer().then(toArray).then(callback); diff --git a/packages/engine.io-parser/lib/encodePacket.ts b/packages/engine.io-parser/lib/encodePacket.ts index 129f7f3ed7..ccf706221d 100644 --- a/packages/engine.io-parser/lib/encodePacket.ts +++ b/packages/engine.io-parser/lib/encodePacket.ts @@ -3,11 +3,11 @@ import { PACKET_TYPES, Packet, RawData } from "./commons.js"; export const encodePacket = ( { type, data }: Packet, supportsBinary: boolean, - callback: (encodedPacket: RawData) => void + callback: (encodedPacket: RawData) => void, ) => { if (data instanceof ArrayBuffer || ArrayBuffer.isView(data)) { return callback( - supportsBinary ? data : "b" + toBuffer(data, true).toString("base64") + supportsBinary ? data : "b" + toBuffer(data, true).toString("base64"), ); } // plain string @@ -31,7 +31,7 @@ let TEXT_ENCODER; export function encodePacketToBinary( packet: Packet, - callback: (encodedPacket: RawData) => void + callback: (encodedPacket: RawData) => void, ) { if (packet.data instanceof ArrayBuffer || ArrayBuffer.isView(packet.data)) { return callback(toBuffer(packet.data, false)); diff --git a/packages/engine.io-parser/lib/index.ts b/packages/engine.io-parser/lib/index.ts index d8c4daf9b6..e36b35b5ab 100644 --- a/packages/engine.io-parser/lib/index.ts +++ b/packages/engine.io-parser/lib/index.ts @@ -12,7 +12,7 @@ const SEPARATOR = String.fromCharCode(30); // see https://en.wikipedia.org/wiki/ const encodePayload = ( packets: Packet[], - callback: (encodedPayload: string) => void + callback: (encodedPayload: string) => void, ) => { // some packets may be added to the array while encoding, so the initial length must be saved const length = packets.length; @@ -32,7 +32,7 @@ const encodePayload = ( const decodePayload = ( encodedPayload: string, - binaryType?: BinaryType + binaryType?: BinaryType, ): Packet[] => { const encodedPackets = encodedPayload.split(SEPARATOR); const packets = []; @@ -112,7 +112,7 @@ const enum State { export function createPacketDecoderStream( maxPayload: number, - binaryType: BinaryType + binaryType: BinaryType, ): any { if (!TEXT_DECODER) { TEXT_DECODER = new TextDecoder(); @@ -148,7 +148,7 @@ export function createPacketDecoderStream( expectedLength = new DataView( headerArray.buffer, headerArray.byteOffset, - headerArray.length + headerArray.length, ).getUint16(0); state = State.READ_PAYLOAD; } else if (state === State.READ_EXTENDED_LENGTH_64) { @@ -160,7 +160,7 @@ export function createPacketDecoderStream( const view = new DataView( headerArray.buffer, headerArray.byteOffset, - headerArray.length + headerArray.length, ); const n = view.getUint32(0); @@ -181,8 +181,8 @@ export function createPacketDecoderStream( controller.enqueue( decodePacket( isBinary ? data : TEXT_DECODER.decode(data), - binaryType - ) + binaryType, + ), ); state = State.READ_HEADER; } diff --git a/packages/engine.io-parser/test/index.ts b/packages/engine.io-parser/test/index.ts index 98312daddb..e574c9bb1b 100644 --- a/packages/engine.io-parser/test/index.ts +++ b/packages/engine.io-parser/test/index.ts @@ -176,7 +176,7 @@ describe("engine.io-parser", () => { const header = await reader.read(); expect(header.value).to.eql( - Uint8Array.of(255, 0, 0, 0, 0, 7, 91, 205, 21) + Uint8Array.of(255, 0, 0, 0, 0, 7, 91, 205, 21), ); const payload = await reader.read(); diff --git a/packages/engine.io/lib/server.ts b/packages/engine.io/lib/server.ts index 3093472c26..95c7e07130 100644 --- a/packages/engine.io/lib/server.ts +++ b/packages/engine.io/lib/server.ts @@ -78,7 +78,7 @@ export interface ServerOptions { */ allowRequest?: ( req: IncomingMessage, - fn: (err: string | null | undefined, success: boolean) => void + fn: (err: string | null | undefined, success: boolean) => void, ) => void; /** * The low-level transports that are enabled. WebTransport is disabled by default and must be manually enabled: @@ -146,7 +146,7 @@ export interface ServerOptions { type Middleware = ( req: IncomingMessage, res: ServerResponse, - next: (err?: any) => void + next: (err?: any) => void, ) => void; function parseSessionId(data: string) { @@ -192,7 +192,7 @@ export abstract class BaseServer extends EventEmitter { cors: false, allowEIO3: false, }, - opts + opts, ); if (opts.cookie) { @@ -204,7 +204,7 @@ export abstract class BaseServer extends EventEmitter { httpOnly: opts.cookie.path !== false, sameSite: "lax", }, - opts.cookie + opts.cookie, ); } @@ -217,7 +217,7 @@ export abstract class BaseServer extends EventEmitter { { threshold: 1024, }, - opts.perMessageDeflate + opts.perMessageDeflate, ); } @@ -263,7 +263,7 @@ export abstract class BaseServer extends EventEmitter { protected verify( req: any, upgrade: boolean, - fn: (errorCode?: number, errorContext?: any) => void + fn: (errorCode?: number, errorContext?: any) => void, ) { // transport check const transport = req._query.transport; @@ -361,7 +361,7 @@ export abstract class BaseServer extends EventEmitter { protected _applyMiddlewares( req: IncomingMessage, res: ServerResponse, - callback: (err?: any) => void + callback: (err?: any) => void, ) { if (this.middlewares.length === 0) { debug("no middleware to apply, skipping"); @@ -424,7 +424,7 @@ export abstract class BaseServer extends EventEmitter { protected async handshake( transportName: string, req: any, - closeConnection: (errorCode?: number, errorContext?: any) => void + closeConnection: (errorCode?: number, errorContext?: any) => void, ) { const protocol = req._query.EIO === "4" ? 4 : 3; // 3rd revision by default if (protocol === 3 && !this.opts.allowEIO3) { @@ -519,7 +519,7 @@ export abstract class BaseServer extends EventEmitter { public async onWebTransportSession(session: any) { const timeout = setTimeout(() => { debug( - "the client failed to establish a bidirectional stream in the given period" + "the client failed to establish a bidirectional stream in the given period", ); session.close(); }, this.opts.upgradeTimeout); @@ -535,7 +535,7 @@ export abstract class BaseServer extends EventEmitter { const stream = result.value; const transformStream = createPacketDecoderStream( this.opts.maxHttpBufferSize, - "nodebuffer" + "nodebuffer", ); const reader = stream.readable.pipeThrough(transformStream).getReader(); @@ -634,7 +634,7 @@ export abstract class BaseServer extends EventEmitter { class WebSocketResponse { constructor( readonly req, - readonly socket: Duplex + readonly socket: Duplex, ) { // temporarily store the response headers on the req object (see the "headers" event) req[kResponseHeaders] = {}; @@ -779,7 +779,7 @@ export class Server extends BaseServer { public handleUpgrade( req: EngineRequest, socket: Duplex, - upgradeHead: Buffer + upgradeHead: Buffer, ) { this.prepare(req); @@ -956,7 +956,7 @@ function abortRequest(res, errorCode, errorContext) { JSON.stringify({ code: errorCode, message, - }) + }), ); } @@ -971,7 +971,7 @@ function abortRequest(res, errorCode, errorContext) { function abortUpgrade( socket, errorCode, - errorContext: { message?: string } = {} + errorContext: { message?: string } = {}, ) { socket.on("error", () => { debug("ignoring error from closed connection"); @@ -987,7 +987,7 @@ function abortUpgrade( length + "\r\n" + "\r\n" + - message + message, ); } socket.destroy(); diff --git a/packages/engine.io/lib/socket.ts b/packages/engine.io/lib/socket.ts index d9f58a68ff..3ec838e3ae 100644 --- a/packages/engine.io/lib/socket.ts +++ b/packages/engine.io/lib/socket.ts @@ -80,7 +80,7 @@ export class Socket extends EventEmitter { server: BaseServer, transport: Transport, req: EngineRequest, - protocol: number + protocol: number, ) { super(); this.id = id; @@ -125,7 +125,7 @@ export class Socket extends EventEmitter { pingInterval: this.server.opts.pingInterval, pingTimeout: this.server.opts.pingTimeout, maxPayload: this.server.opts.maxHttpBufferSize, - }) + }), ); if (this.server.opts.initialPacket) { @@ -212,7 +212,7 @@ export class Socket extends EventEmitter { this.pingIntervalTimer = setTimeout(() => { debug( "writing ping packet - expecting pong within %sms", - this.server.opts.pingTimeout + this.server.opts.pingTimeout, ); this.sendPacket("ping"); this.resetPingTimeout(); @@ -233,7 +233,7 @@ export class Socket extends EventEmitter { }, this.protocol === 3 ? this.server.opts.pingInterval + this.server.opts.pingTimeout - : this.server.opts.pingTimeout + : this.server.opts.pingTimeout, ); } @@ -293,7 +293,7 @@ export class Socket extends EventEmitter { debug( 'might upgrade socket transport from "%s" to "%s"', this.transport.name, - transport.name + transport.name, ); this.upgrading = true; @@ -468,7 +468,7 @@ export class Socket extends EventEmitter { type: PacketType, data?: RawData, options: SendOptions = {}, - callback?: SendCallback + callback?: SendCallback, ) { if ("function" === typeof options) { callback = options; @@ -561,7 +561,7 @@ export class Socket extends EventEmitter { if (this.writeBuffer.length) { debug( "there are %d remaining packets in the buffer, waiting for the 'drain' event", - this.writeBuffer.length + this.writeBuffer.length, ); this.once("drain", () => { debug("all packets have been sent, closing the transport"); diff --git a/packages/engine.io/lib/transport.ts b/packages/engine.io/lib/transport.ts index 5e74813c43..1121e4e348 100644 --- a/packages/engine.io/lib/transport.ts +++ b/packages/engine.io/lib/transport.ts @@ -69,7 +69,7 @@ export abstract class Transport extends EventEmitter { "readyState updated from %s to %s (%s)", this._readyState, state, - this.name + this.name, ); this._readyState = state; } diff --git a/packages/engine.io/lib/transports/websocket.ts b/packages/engine.io/lib/transports/websocket.ts index 71ac94a79b..a95f4b0f19 100644 --- a/packages/engine.io/lib/transports/websocket.ts +++ b/packages/engine.io/lib/transports/websocket.ts @@ -54,13 +54,13 @@ export class WebSocket extends Transport { this.socket._sender.sendFrame( // @ts-ignore packet.options.wsPreEncodedFrame, - isLast ? this._onSentLast : this._onSent + isLast ? this._onSentLast : this._onSent, ); } else { this.parser.encodePacket( packet, this.supportsBinary, - isLast ? this._doSendLast : this._doSend + isLast ? this._doSendLast : this._doSend, ); } } diff --git a/packages/engine.io/lib/transports/webtransport.ts b/packages/engine.io/lib/transports/webtransport.ts index 1e97553a88..f675e7c37b 100644 --- a/packages/engine.io/lib/transports/webtransport.ts +++ b/packages/engine.io/lib/transports/webtransport.ts @@ -13,7 +13,7 @@ export class WebTransport extends Transport { constructor( private readonly session, stream, - reader + reader, ) { super({ _query: { EIO: "4" } }); diff --git a/packages/engine.io/lib/userver.ts b/packages/engine.io/lib/userver.ts index ce56575ad9..6cef789bca 100644 --- a/packages/engine.io/lib/userver.ts +++ b/packages/engine.io/lib/userver.ts @@ -64,7 +64,7 @@ export class uServer extends BaseServer { */ public attach( app /* : TemplatedApp */, - options: AttachOptions & uOptions = {} + options: AttachOptions & uOptions = {}, ) { const path = this._computePath(options); (app as TemplatedApp) @@ -84,7 +84,7 @@ export class uServer extends BaseServer { }, message: (ws, message, isBinary) => { ws.getUserData().transport.onData( - isBinary ? message : Buffer.from(message).toString() + isBinary ? message : Buffer.from(message).toString(), ); }, close: (ws, code, message) => { @@ -96,7 +96,7 @@ export class uServer extends BaseServer { override _applyMiddlewares( req: any, res: any, - callback: (err?: any) => void + callback: (err?: any) => void, ): void { if (this.middlewares.length === 0) { return callback(); @@ -116,7 +116,7 @@ export class uServer extends BaseServer { private handleRequest( res: HttpResponse, - req: HttpRequest & { res: any; _query: any } + req: HttpRequest & { res: any; _query: any }, ) { debug('handling "%s" http request "%s"', req.getMethod(), req.getUrl()); this.prepare(req, res); @@ -158,7 +158,7 @@ export class uServer extends BaseServer { private handleUpgrade( res: HttpResponse, req: HttpRequest & { res: any; _query: any }, - context + context, ) { debug("on upgrade"); @@ -202,7 +202,7 @@ export class uServer extends BaseServer { req._query.transport, req, (errorCode, errorContext) => - this.abortRequest(res, errorCode, errorContext) + this.abortRequest(res, errorCode, errorContext), ); if (!transport) { return; @@ -219,7 +219,7 @@ export class uServer extends BaseServer { req.getHeader("sec-websocket-key"), req.getHeader("sec-websocket-protocol"), req.getHeader("sec-websocket-extensions"), - context + context, ); }; @@ -235,7 +235,7 @@ export class uServer extends BaseServer { private abortRequest( res: HttpResponse | ResponseWrapper, errorCode, - errorContext + errorContext, ) { const statusCode = errorCode === Server.errors.FORBIDDEN @@ -252,7 +252,7 @@ export class uServer extends BaseServer { JSON.stringify({ code: errorCode, message, - }) + }), ); } } diff --git a/packages/engine.io/test/engine.io.js b/packages/engine.io/test/engine.io.js index 75d1748edf..ebf1b9899e 100644 --- a/packages/engine.io/test/engine.io.js +++ b/packages/engine.io/test/engine.io.js @@ -93,7 +93,7 @@ describe("engine", () => { "Upgrade: IRC/6.9", "", "", - ].join("\r\n") + ].join("\r\n"), ); const check = setTimeout(() => { @@ -122,7 +122,7 @@ describe("engine", () => { "Upgrade: IRC/6.9", "", "", - ].join("\r\n") + ].join("\r\n"), ); setTimeout(() => { @@ -154,7 +154,7 @@ describe("engine", () => { "Upgrade: IRC/6.9", "", "", - ].join("\r\n") + ].join("\r\n"), ); // send from client to server @@ -198,7 +198,7 @@ describe("engine", () => { "Upgrade: IRC/6.9", "", "", - ].join("\r\n") + ].join("\r\n"), ); // test that socket is still open by writing after the timeout period @@ -245,7 +245,7 @@ describe("engine", () => { server.once("close", done); server.close(); }); - } + }, ); }); }); diff --git a/packages/engine.io/test/middlewares.js b/packages/engine.io/test/middlewares.js index 586df621a2..60e1cc6b22 100644 --- a/packages/engine.io/test/middlewares.js +++ b/packages/engine.io/test/middlewares.js @@ -38,7 +38,7 @@ describe("middlewares", () => { }); const socket = new WebSocket( - `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket` + `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket`, ); socket.on("upgrade", (res) => { @@ -131,7 +131,7 @@ describe("middlewares", () => { }); const socket = new WebSocket( - `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket` + `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket`, ); socket.addEventListener("error", () => { @@ -169,7 +169,7 @@ describe("middlewares", () => { engine.use(helmet()); const socket = new WebSocket( - `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket` + `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket`, ); socket.on("upgrade", (res) => { @@ -196,7 +196,7 @@ describe("middlewares", () => { resave: false, saveUninitialized: true, cookie: {}, - }) + }), ); request @@ -206,7 +206,7 @@ describe("middlewares", () => { expect(err).to.be(null); // expect(res.status).to.eql(200); expect(res.headers["set-cookie"][0].startsWith("connect.sid=")).to.be( - true + true, ); if (engine.httpServer) { @@ -225,16 +225,16 @@ describe("middlewares", () => { resave: false, saveUninitialized: true, cookie: {}, - }) + }), ); const socket = new WebSocket( - `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket` + `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket`, ); socket.on("upgrade", (res) => { expect(res.headers["set-cookie"][0].startsWith("connect.sid=")).to.be( - true + true, ); if (engine.httpServer) { @@ -280,7 +280,7 @@ describe("middlewares", () => { }); const socket = new WebSocket( - `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket` + `ws://localhost:${port}/engine.io/?EIO=4&transport=websocket`, ); socket.addEventListener("error", () => { diff --git a/packages/engine.io/test/parser.js b/packages/engine.io/test/parser.js index 723e56c450..4bc5b7a738 100644 --- a/packages/engine.io/test/parser.js +++ b/packages/engine.io/test/parser.js @@ -16,7 +16,7 @@ describe("parser", () => { expect(decoded.data).to.eql("€€€€"); done(); }); - } + }, ); }); }); diff --git a/packages/engine.io/test/server.js b/packages/engine.io/test/server.js index 11b7d7eb27..25d87ce45e 100644 --- a/packages/engine.io/test/server.js +++ b/packages/engine.io/test/server.js @@ -143,7 +143,7 @@ describe("server", () => { expect(res.body.message).to.be("Thou shall not pass"); partialDone(); }); - } + }, ); }); @@ -161,7 +161,7 @@ describe("server", () => { client.on("error", () => { done(); }); - } + }, ); }); @@ -243,7 +243,7 @@ describe("server", () => { }); const socket = new WebSocket( - `ws://localhost:${port}/engine.io/?EIO=4&transport=__proto__` + `ws://localhost:${port}/engine.io/?EIO=4&transport=__proto__`, ); socket.onerror = partialDone; @@ -262,7 +262,7 @@ describe("server", () => { // hack-obtain sid const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `io=${sid}; Path=/; HttpOnly; SameSite=Lax` + `io=${sid}; Path=/; HttpOnly; SameSite=Lax`, ); done(); }); @@ -278,7 +278,7 @@ describe("server", () => { expect(err).to.be(null); const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `woot=${sid}; Path=/; HttpOnly; SameSite=Lax` + `woot=${sid}; Path=/; HttpOnly; SameSite=Lax`, ); done(); }); @@ -294,7 +294,7 @@ describe("server", () => { expect(err).to.be(null); const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `io=${sid}; Path=/custom; HttpOnly; SameSite=Lax` + `io=${sid}; Path=/custom; HttpOnly; SameSite=Lax`, ); done(); }); @@ -310,7 +310,7 @@ describe("server", () => { expect(err).to.be(null); const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `io=${sid}; SameSite=Lax` + `io=${sid}; SameSite=Lax`, ); done(); }); @@ -326,7 +326,7 @@ describe("server", () => { expect(err).to.be(null); const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `io=${sid}; Path=/; HttpOnly; SameSite=Lax` + `io=${sid}; Path=/; HttpOnly; SameSite=Lax`, ); done(); }); @@ -342,7 +342,7 @@ describe("server", () => { expect(err).to.be(null); const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `io=${sid}; Path=/; HttpOnly; SameSite=Strict` + `io=${sid}; Path=/; HttpOnly; SameSite=Strict`, ); done(); }); @@ -358,7 +358,7 @@ describe("server", () => { expect(err).to.be(null); const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `io=${sid}; Path=/; SameSite=Lax` + `io=${sid}; Path=/; SameSite=Lax`, ); done(); }); @@ -374,7 +374,7 @@ describe("server", () => { expect(err).to.be(null); const sid = res.text.match(/"sid":"([^"]+)"/)[1]; expect(res.headers["set-cookie"][0]).to.be( - `io=${sid}; Path=/; HttpOnly; SameSite=Lax` + `io=${sid}; Path=/; HttpOnly; SameSite=Lax`, ); done(); }); @@ -681,14 +681,14 @@ describe("server", () => { expect(res.body.code).to.be(3); expect(res.body.message).to.be("Bad request"); expect(res.header["access-control-allow-credentials"]).to.be( - "true" + "true", ); expect(res.header["access-control-allow-origin"]).to.be( - "http://engine.io" + "http://engine.io", ); partialDone(); }); - } + }, ); }); @@ -1130,7 +1130,7 @@ describe("server", () => { expect(res.statusCode).to.eql(400); res.resume(); res.on("end", done); - } + }, ); req.end(); }); @@ -1174,7 +1174,7 @@ describe("server", () => { // OPENED readyState is expected - we are actually polling expect( socket.transport.pollXhr[IS_CLIENT_V3 ? "xhr" : "_xhr"] - .readyState + .readyState, ).to.be(1); // 2 requests sent to the server over an unique port means @@ -1194,7 +1194,7 @@ describe("server", () => { }, 50); }); }); - } + }, ); it("should not trigger with connection: close header", ($done) => { @@ -1260,7 +1260,7 @@ describe("server", () => { done(); }, 200); }); - } + }, ); it( @@ -1295,7 +1295,7 @@ describe("server", () => { done(); }, 100); }); - } + }, ); it( @@ -1331,7 +1331,7 @@ describe("server", () => { }); }); }); - } + }, ); if (IS_CLIENT_V3) { @@ -1370,7 +1370,7 @@ describe("server", () => { }); }); }); - } + }, ); } else { it( @@ -1408,7 +1408,7 @@ describe("server", () => { }); }); }); - } + }, ); } @@ -1435,7 +1435,7 @@ describe("server", () => { socket.send("test"); }); }); - } + }, ); // tests https://github.com/LearnBoost/engine.io-client/issues/207 @@ -1727,7 +1727,7 @@ describe("server", () => { engine.on("connection", (conn) => { conn.on("message", (msg) => { done( - new Error("Test invalidation (message is longer than allowed)") + new Error("Test invalidation (message is longer than allowed)"), ); }); }); @@ -1749,7 +1749,7 @@ describe("server", () => { engine.on("connection", (conn) => { conn.on("message", (msg) => { done( - new Error("Test invalidation (message is longer than allowed)") + new Error("Test invalidation (message is longer than allowed)"), ); }); }); @@ -2060,7 +2060,7 @@ describe("server", () => { client.on("open", () => { client.send("a".repeat(1e6)); }); - } + }, ); }); @@ -2202,7 +2202,7 @@ describe("server", () => { }); }); }); - } + }, ); it("should support chinese", (done) => { @@ -2546,7 +2546,7 @@ describe("server", () => { j, ((value) => { j++; - })(j) + })(j), ); } @@ -2585,7 +2585,7 @@ describe("server", () => { j, ((value) => { j++; - })(j) + })(j), ); } @@ -2999,7 +2999,7 @@ describe("server", () => { done(); }); }); - } + }, ); }); }); @@ -3031,7 +3031,7 @@ describe("server", () => { done(); }); }); - } + }, ); }); }); @@ -3174,11 +3174,11 @@ describe("server", () => { .on("error", done) .on("end", done) .resume(); - } + }, ); - } + }, ); - } + }, ); }); @@ -3212,11 +3212,11 @@ describe("server", () => { .on("error", done) .on("end", done) .resume(); - } + }, ); - } + }, ); - } + }, ); }); @@ -3250,11 +3250,11 @@ describe("server", () => { (res) => { expect(res.headers["content-encoding"]).to.equal("gzip"); done(); - } + }, ); - } + }, ); - } + }, ); }); @@ -3284,11 +3284,11 @@ describe("server", () => { (res) => { expect(res.headers["content-encoding"]).to.be(undefined); done(); - } + }, ); - } + }, ); - } + }, ); }); @@ -3318,11 +3318,11 @@ describe("server", () => { (res) => { expect(res.headers["content-encoding"]).to.be(undefined); done(); - } + }, ); - } + }, ); - } + }, ); }); @@ -3352,11 +3352,11 @@ describe("server", () => { (res) => { expect(res.headers["content-encoding"]).to.be(undefined); done(); - } + }, ); - } + }, ); - } + }, ); }); }); @@ -3599,20 +3599,20 @@ describe("server", () => { expect(res.status).to.be(204); expect(res.body).to.be.empty(); expect(res.header["access-control-allow-origin"]).to.be( - "http://engine.io" + "http://engine.io", ); expect(res.header["access-control-allow-methods"]).to.be( - "GET,HEAD,PUT,PATCH,POST,DELETE" + "GET,HEAD,PUT,PATCH,POST,DELETE", ); expect(res.header["access-control-allow-headers"]).to.be( - "my-header" + "my-header", ); expect(res.header["access-control-allow-credentials"]).to.be( - "true" + "true", ); done(); }); - } + }, ); }); @@ -3629,20 +3629,20 @@ describe("server", () => { expect(res.status).to.be(200); expect(res.body).to.be.empty(); expect(res.header["access-control-allow-origin"]).to.be( - "http://engine.io" + "http://engine.io", ); expect(res.header["access-control-allow-methods"]).to.be( - undefined + undefined, ); expect(res.header["access-control-allow-headers"]).to.be( - undefined + undefined, ); expect(res.header["access-control-allow-credentials"]).to.be( - "true" + "true", ); done(); }); - } + }, ); }); @@ -3663,14 +3663,14 @@ describe("server", () => { expect(res.status).to.be(204); expect(res.body).to.be.empty(); expect(res.header["access-control-allow-origin"]).to.be( - undefined + undefined, ); expect(res.header["access-control-allow-credentials"]).to.be( - undefined + undefined, ); done(); }); - } + }, ); }); @@ -3697,24 +3697,24 @@ describe("server", () => { expect(res.status).to.be(200); expect(res.body).to.be.empty(); expect(res.header["access-control-allow-origin"]).to.be( - "http://good-domain.com" + "http://good-domain.com", ); expect(res.header["access-control-allow-methods"]).to.be( - "GET,PUT,POST" + "GET,PUT,POST", ); expect(res.header["access-control-allow-headers"]).to.be( - "my-header" + "my-header", ); expect(res.header["access-control-expose-headers"]).to.be( - "my-exposed-header" + "my-exposed-header", ); expect(res.header["access-control-allow-credentials"]).to.be( - "true" + "true", ); expect(res.header["access-control-max-age"]).to.be("123"); done(); }); - } + }, ); }); @@ -3739,7 +3739,7 @@ describe("server", () => { client.close(); done(); }); - } + }, ); }); }); @@ -3767,7 +3767,7 @@ describe("server", () => { done(); }); }); - } + }, ); }); }); diff --git a/packages/engine.io/test/webtransport.mjs b/packages/engine.io/test/webtransport.mjs index 10948ba2d9..220d691054 100644 --- a/packages/engine.io/test/webtransport.mjs +++ b/packages/engine.io/test/webtransport.mjs @@ -31,7 +31,7 @@ async function setupServer(opts, cb) { [{ shortName: "CN", value: "localhost" }], { days: 14, // the total length of the validity period MUST NOT exceed two weeks (https://w3c.github.io/webtransport/#custom-certificate-requirements) - } + }, ); const engine = new eio.Server(opts); @@ -76,7 +76,7 @@ function setup(opts, cb) { value: certificate.hash, }, ], - } + }, ); await client.ready; @@ -106,7 +106,7 @@ describe("WebTransport", () => { setupServer({}, async ({ engine, h3Server, certificate }) => { const partialDone = createPartialDone( () => success(engine, h3Server, done), - 2 + 2, ); engine.on("connection", (socket) => { @@ -123,7 +123,7 @@ describe("WebTransport", () => { value: certificate.hash, }, ], - } + }, ); await client.ready; @@ -188,7 +188,7 @@ describe("WebTransport", () => { value: certificate.hash, }, ], - } + }, ); await client.ready; @@ -216,14 +216,14 @@ describe("WebTransport", () => { await writer.write(Uint8Array.of(31)); await writer.write( - TEXT_ENCODER.encode(`0{"sid":"${payload.sid}"}`) + TEXT_ENCODER.encode(`0{"sid":"${payload.sid}"}`), ); await writer.write(Uint8Array.of(6)); await writer.write(TEXT_ENCODER.encode(`2probe`)); await writer.write(Uint8Array.of(1)); await writer.write(TEXT_ENCODER.encode(`5`)); }); - } + }, ); }); @@ -242,7 +242,7 @@ describe("WebTransport", () => { value: certificate.hash, }, ], - } + }, ); await client.ready; @@ -250,7 +250,7 @@ describe("WebTransport", () => { client.closed.then(() => { success(engine, h3Server, done); }); - } + }, ); }); @@ -269,7 +269,7 @@ describe("WebTransport", () => { value: certificate.hash, }, ], - } + }, ); await client.ready; @@ -281,7 +281,7 @@ describe("WebTransport", () => { client.closed.then(() => { success(engine, h3Server, done); }); - } + }, ); }); @@ -304,7 +304,7 @@ describe("WebTransport", () => { } success(engine, h3Server, done); - } + }, ); }); @@ -322,7 +322,7 @@ describe("WebTransport", () => { }); client.closed.then(() => success(engine, h3Server, partialDone)); - } + }, ); }); @@ -440,7 +440,7 @@ describe("WebTransport", () => { const header = await reader.read(); expect(header.value).to.eql( - Uint8Array.of(255, 0, 0, 0, 0, 0, 15, 66, 64) + Uint8Array.of(255, 0, 0, 0, 0, 0, 15, 66, 64), ); const chunk1 = await reader.read(); diff --git a/packages/socket.io-adapter/lib/cluster-adapter.ts b/packages/socket.io-adapter/lib/cluster-adapter.ts index 143bb6f356..10caf5fc77 100644 --- a/packages/socket.io-adapter/lib/cluster-adapter.ts +++ b/packages/socket.io-adapter/lib/cluster-adapter.ts @@ -203,7 +203,7 @@ export abstract class ClusterAdapter extends Adapter { "[%s] new event of type %d from %s", this.uid, message.type, - message.uid + message.uid, ); switch (message.type) { @@ -217,7 +217,7 @@ export abstract class ClusterAdapter extends Adapter { debug( "[%s] waiting for %d client acknowledgements", this.uid, - clientCount + clientCount, ); this.publishResponse(message.uid, { type: MessageType.BROADCAST_CLIENT_COUNT, @@ -231,7 +231,7 @@ export abstract class ClusterAdapter extends Adapter { debug( "[%s] received acknowledgement with value %j", this.uid, - arg + arg, ); this.publishResponse(message.uid, { type: MessageType.BROADCAST_ACK, @@ -240,7 +240,7 @@ export abstract class ClusterAdapter extends Adapter { packet: arg, }, }); - } + }, ); } else { const packet = message.data.packet; @@ -264,7 +264,7 @@ export abstract class ClusterAdapter extends Adapter { case MessageType.DISCONNECT_SOCKETS: super.disconnectSockets( decodeOptions(message.data.opts), - message.data.close + message.data.close, ); break; @@ -272,7 +272,7 @@ export abstract class ClusterAdapter extends Adapter { debug( "[%s] calling fetchSockets with opts %j", this.uid, - message.data.opts + message.data.opts, ); super .fetchSockets(decodeOptions(message.data.opts)) @@ -356,7 +356,7 @@ export abstract class ClusterAdapter extends Adapter { "[%s] received response %s to request %s", this.uid, response.type, - requestId + requestId, ); switch (response.type) { @@ -381,7 +381,7 @@ export abstract class ClusterAdapter extends Adapter { request.current++; response.data.sockets.forEach((socket) => - request.responses.push(socket) + request.responses.push(socket), ); if (request.current === request.expected) { @@ -433,7 +433,7 @@ export abstract class ClusterAdapter extends Adapter { return debug( "[%s] error while broadcasting message: %s", this.uid, - e.message + e.message, ); } } @@ -453,7 +453,7 @@ export abstract class ClusterAdapter extends Adapter { private addOffsetIfNecessary( packet: any, opts: BroadcastOptions, - offset: Offset + offset: Offset, ) { if (!this.nsp.server.opts.connectionStateRecovery) { return; @@ -473,7 +473,7 @@ export abstract class ClusterAdapter extends Adapter { packet: any, opts: BroadcastOptions, clientCountCallback: (clientCount: number) => void, - ack: (...args: any[]) => void + ack: (...args: any[]) => void, ) { const onlyLocal = opts?.flags?.local; if (!onlyLocal) { @@ -582,8 +582,8 @@ export abstract class ClusterAdapter extends Adapter { if (storedRequest) { reject( new Error( - `timeout reached: only ${storedRequest.current} responses received out of ${storedRequest.expected}` - ) + `timeout reached: only ${storedRequest.current} responses received out of ${storedRequest.expected}`, + ), ); this.requests.delete(requestId); } @@ -627,7 +627,7 @@ export abstract class ClusterAdapter extends Adapter { debug( '[%s] waiting for %d responses to "serverSideEmit" request', this.uid, - expectedResponseCount + expectedResponseCount, ); if (expectedResponseCount <= 0) { @@ -641,9 +641,9 @@ export abstract class ClusterAdapter extends Adapter { if (storedRequest) { ack( new Error( - `timeout reached: only ${storedRequest.current} responses received out of ${storedRequest.expected}` + `timeout reached: only ${storedRequest.current} responses received out of ${storedRequest.expected}`, ), - storedRequest.responses + storedRequest.responses, ); this.requests.delete(requestId); } @@ -669,7 +669,7 @@ export abstract class ClusterAdapter extends Adapter { } protected publish( - message: DistributiveOmit + message: DistributiveOmit, ): void { this.publishAndReturnOffset(message).catch((err) => { debug("[%s] error while publishing message: %s", this.uid, err); @@ -677,7 +677,7 @@ export abstract class ClusterAdapter extends Adapter { } protected publishAndReturnOffset( - message: DistributiveOmit + message: DistributiveOmit, ) { (message as ClusterMessage).uid = this.uid; (message as ClusterMessage).nsp = this.nsp.name; @@ -695,14 +695,14 @@ export abstract class ClusterAdapter extends Adapter { protected publishResponse( requesterUid: ServerId, - response: Omit + response: Omit, ) { (response as ClusterResponse).uid = this.uid; (response as ClusterResponse).nsp = this.nsp.name; this.doPublishResponse(requesterUid, response as ClusterResponse).catch( (err) => { debug("[%s] error while publishing response: %s", this.uid, err); - } + }, ); } @@ -715,7 +715,7 @@ export abstract class ClusterAdapter extends Adapter { */ protected abstract doPublishResponse( requesterUid: ServerId, - response: ClusterResponse + response: ClusterResponse, ): Promise; } @@ -742,7 +742,7 @@ export abstract class ClusterAdapterWithHeartbeat extends ClusterAdapter { heartbeatInterval: 5_000, heartbeatTimeout: 10_000, }, - opts + opts, ); this.cleanupTimer = setInterval(() => { const now = Date.now(); @@ -798,7 +798,7 @@ export abstract class ClusterAdapterWithHeartbeat extends ClusterAdapter { "[%s] new event of type %d from %s", this.uid, message.type, - message.uid + message.uid, ); switch (message.type) { @@ -846,7 +846,7 @@ export abstract class ClusterAdapterWithHeartbeat extends ClusterAdapter { debug( '[%s] waiting for %d responses to "serverSideEmit" request', this.uid, - expectedResponseCount + expectedResponseCount, ); if (expectedResponseCount <= 0) { @@ -860,9 +860,9 @@ export abstract class ClusterAdapterWithHeartbeat extends ClusterAdapter { if (storedRequest) { ack( new Error( - `timeout reached: missing ${storedRequest.missingUids.size} responses` + `timeout reached: missing ${storedRequest.missingUids.size} responses`, ), - storedRequest.responses + storedRequest.responses, ); this.customRequests.delete(requestId); } @@ -911,8 +911,8 @@ export abstract class ClusterAdapterWithHeartbeat extends ClusterAdapter { if (storedRequest) { reject( new Error( - `timeout reached: missing ${storedRequest.missingUids.size} responses` - ) + `timeout reached: missing ${storedRequest.missingUids.size} responses`, + ), ); this.customRequests.delete(requestId); } @@ -944,7 +944,7 @@ export abstract class ClusterAdapterWithHeartbeat extends ClusterAdapter { "[%s] received response %s to request %s", this.uid, response.type, - requestId + requestId, ); switch (response.type) { @@ -956,7 +956,7 @@ export abstract class ClusterAdapterWithHeartbeat extends ClusterAdapter { } (response.data.sockets as any[]).forEach((socket) => - request.responses.push(socket) + request.responses.push(socket), ); request.missingUids.delete(response.uid); diff --git a/packages/socket.io-adapter/lib/contrib/yeast.ts b/packages/socket.io-adapter/lib/contrib/yeast.ts index 3fc0f905ac..37bb2b51e3 100644 --- a/packages/socket.io-adapter/lib/contrib/yeast.ts +++ b/packages/socket.io-adapter/lib/contrib/yeast.ts @@ -3,7 +3,7 @@ const alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_".split( - "" + "", ), length = 64, map = {}; diff --git a/packages/socket.io-adapter/lib/in-memory-adapter.ts b/packages/socket.io-adapter/lib/in-memory-adapter.ts index 82fbbc0fd1..2b78e8285e 100644 --- a/packages/socket.io-adapter/lib/in-memory-adapter.ts +++ b/packages/socket.io-adapter/lib/in-memory-adapter.ts @@ -198,7 +198,7 @@ export class Adapter extends EventEmitter { packet: any, opts: BroadcastOptions, clientCountCallback: (clientCount: number) => void, - ack: (...args: any[]) => void + ack: (...args: any[]) => void, ) { const flags = opts.flags || {}; const packetOpts = { @@ -375,7 +375,7 @@ export class Adapter extends EventEmitter { */ public serverSideEmit(packet: any[]): void { console.warn( - "this adapter does not support the serverSideEmit() functionality" + "this adapter does not support the serverSideEmit() functionality", ); } @@ -391,7 +391,7 @@ export class Adapter extends EventEmitter { */ public restoreSession( pid: PrivateSessionId, - offset: string + offset: string, ): Promise { return null; } @@ -444,7 +444,7 @@ export class SessionAwareAdapter extends Adapter { override restoreSession( pid: PrivateSessionId, - offset: string + offset: string, ): Promise { const session = this.sessions.get(pid); if (!session) { @@ -500,7 +500,7 @@ export class SessionAwareAdapter extends Adapter { function shouldIncludePacket( sessionRooms: Room[], - opts: BroadcastOptions + opts: BroadcastOptions, ): boolean { const included = opts.rooms.size === 0 || sessionRooms.some((room) => opts.rooms.has(room)); diff --git a/packages/socket.io-adapter/test/cluster-adapter.ts b/packages/socket.io-adapter/test/cluster-adapter.ts index 9205e5f9ca..fe727c5949 100644 --- a/packages/socket.io-adapter/test/cluster-adapter.ts +++ b/packages/socket.io-adapter/test/cluster-adapter.ts @@ -18,7 +18,7 @@ class EventEmitterAdapter extends ClusterAdapterWithHeartbeat { constructor( nsp, - readonly eventBus + readonly eventBus, ) { super(nsp, {}); this.eventBus.on("message", (message) => { @@ -33,7 +33,7 @@ class EventEmitterAdapter extends ClusterAdapterWithHeartbeat { protected doPublishResponse( requesterUid: string, - response: ClusterResponse + response: ClusterResponse, ): Promise { this.eventBus.emit("message", response); return Promise.resolve(); diff --git a/packages/socket.io-adapter/test/index.ts b/packages/socket.io-adapter/test/index.ts index e72a287197..285ae66f02 100644 --- a/packages/socket.io-adapter/test/index.ts +++ b/packages/socket.io-adapter/test/index.ts @@ -153,7 +153,7 @@ describe("socket.io-adapter", () => { expect(opts.wsPreEncodedFrame.length).to.eql(2); expect(opts.wsPreEncodedFrame[0]).to.eql(Buffer.from([129, 4])); expect(opts.wsPreEncodedFrame[1]).to.eql( - Buffer.from([52, 49, 50, 51]) + Buffer.from([52, 49, 50, 51]), ); }, }, @@ -352,7 +352,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(), except: new Set(), - } + }, ); const offset = packetData[1]; @@ -398,7 +398,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(), except: new Set(), - } + }, ); adapter.broadcast( @@ -410,7 +410,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(), except: new Set(), - } + }, ); adapter.broadcast( @@ -422,7 +422,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(["r1"]), except: new Set(), - } + }, ); adapter.broadcast( @@ -434,7 +434,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(), except: new Set(["r2"]), - } + }, ); adapter.broadcast( @@ -446,7 +446,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(), except: new Set(["r3"]), - } + }, ); adapter.broadcast( @@ -459,7 +459,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(), except: new Set(), - } + }, ); adapter.broadcast( @@ -471,7 +471,7 @@ describe("socket.io-adapter", () => { { rooms: new Set(), except: new Set(), - } + }, ); adapter.broadcast( @@ -486,7 +486,7 @@ describe("socket.io-adapter", () => { flags: { volatile: true, }, - } + }, ); const offset = packetData[1]; diff --git a/packages/socket.io-client/lib/index.ts b/packages/socket.io-client/lib/index.ts index 938ca86319..9ecc0b8005 100644 --- a/packages/socket.io-client/lib/index.ts +++ b/packages/socket.io-client/lib/index.ts @@ -25,11 +25,11 @@ const cache: Record = {}; function lookup(opts?: Partial): Socket; function lookup( uri: string, - opts?: Partial + opts?: Partial, ): Socket; function lookup( uri?: string | Partial, - opts?: Partial + opts?: Partial, ): Socket { if (typeof uri === "object") { opts = uri; diff --git a/packages/socket.io-client/lib/manager.ts b/packages/socket.io-client/lib/manager.ts index ed1e44c85a..8330af13ff 100644 --- a/packages/socket.io-client/lib/manager.ts +++ b/packages/socket.io-client/lib/manager.ts @@ -152,11 +152,11 @@ export class Manager< constructor(uri?: string, opts?: Partial); constructor( uri?: string | Partial, - opts?: Partial + opts?: Partial, ); constructor( uri?: string | Partial, - opts?: Partial + opts?: Partial, ) { super(); if (uri && "object" === typeof uri) { @@ -405,7 +405,7 @@ export class Manager< on(socket, "error", this.onerror.bind(this)), on(socket, "close", this.onclose.bind(this)), // @ts-ignore - on(this.decoder, "decoded", this.ondecoded.bind(this)) + on(this.decoder, "decoded", this.ondecoded.bind(this)), ); } diff --git a/packages/socket.io-client/lib/on.ts b/packages/socket.io-client/lib/on.ts index 50bc6fdc6d..fe879343cd 100644 --- a/packages/socket.io-client/lib/on.ts +++ b/packages/socket.io-client/lib/on.ts @@ -3,7 +3,7 @@ import { Emitter } from "@socket.io/component-emitter"; export function on( obj: Emitter, ev: string, - fn: (err?: any) => any + fn: (err?: any) => any, ): VoidFunction { obj.on(ev, fn); return function subDestroy(): void { diff --git a/packages/socket.io-client/lib/socket.ts b/packages/socket.io-client/lib/socket.ts index c4b5294611..1f4255d66c 100644 --- a/packages/socket.io-client/lib/socket.ts +++ b/packages/socket.io-client/lib/socket.ts @@ -116,7 +116,7 @@ interface SocketReservedEvents { connect_error: (err: Error) => void; disconnect: ( reason: Socket.DisconnectReason, - description?: DisconnectDescription + description?: DisconnectDescription, ) => void; } @@ -554,7 +554,7 @@ export class Socket< debug( "packet [%d] is discarded after %d tries", packet.id, - packet.tryCount + packet.tryCount, ); this._queue.shift(); if (ack) { @@ -591,7 +591,7 @@ export class Socket< if (packet.pending && !force) { debug( "packet [%d] has already been sent and is waiting for an ack", - packet.id + packet.id, ); return; } @@ -665,7 +665,7 @@ export class Socket< */ private onclose( reason: Socket.DisconnectReason, - description?: DisconnectDescription + description?: DisconnectDescription, ): void { debug("close (%s)", reason); this.connected = false; @@ -683,7 +683,7 @@ export class Socket< private _clearAcks() { Object.keys(this.acks).forEach((id) => { const isBuffered = this.sendBuffer.some( - (packet) => String(packet.id) === id + (packet) => String(packet.id) === id, ); if (!isBuffered) { // note: handlers that do not accept an error as first argument are ignored here @@ -716,8 +716,8 @@ export class Socket< this.emitReserved( "connect_error", new Error( - "It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)" - ) + "It seems you are trying to reach a Socket.IO server in v2.x with a v3.x client, but they are not compatible (more information here: https://socket.io/docs/v3/migrating-from-2-x-to-3-0/)", + ), ); } break; @@ -967,7 +967,7 @@ export class Socket< * @returns self */ public timeout( - timeout: number + timeout: number, ): Socket> { this.flags.timeout = timeout; return this; diff --git a/packages/socket.io-client/lib/url.ts b/packages/socket.io-client/lib/url.ts index 2561303223..c84bef16f4 100644 --- a/packages/socket.io-client/lib/url.ts +++ b/packages/socket.io-client/lib/url.ts @@ -39,7 +39,7 @@ type ParsedUrl = { export function url( uri: string | ParsedUrl, path: string = "", - loc?: Location + loc?: Location, ): ParsedUrl { let obj = uri as ParsedUrl; diff --git a/packages/socket.io-client/test/connection.ts b/packages/socket.io-client/test/connection.ts index 7b36c4f332..b8c90b794d 100644 --- a/packages/socket.io-client/test/connection.ts +++ b/packages/socket.io-client/test/connection.ts @@ -576,7 +576,7 @@ describe("connection", () => { reconnectionAttempts: 2, }); let delay = Math.floor( - manager.reconnectionDelay() * manager.randomizationFactor() * 0.5 + manager.reconnectionDelay() * manager.randomizationFactor() * 0.5, ); delay = Math.max(delay, 10); diff --git a/packages/socket.io-client/test/socket.ts b/packages/socket.io-client/test/socket.ts index 493920aa7a..a37331a519 100644 --- a/packages/socket.io-client/test/socket.ts +++ b/packages/socket.io-client/test/socket.ts @@ -336,7 +336,7 @@ describe("socket", () => { const socket = io(BASE_URL + "/no", { forceNew: true }); expect(() => socket.emit("disconnecting", "goodbye")).to.throwException( - /"disconnecting" is a reserved event name/ + /"disconnecting" is a reserved event name/, ); }); diff --git a/packages/socket.io-client/test/typed-events.test-d.ts b/packages/socket.io-client/test/typed-events.test-d.ts index 1cb30d6400..d7e56de46d 100644 --- a/packages/socket.io-client/test/typed-events.test-d.ts +++ b/packages/socket.io-client/test/typed-events.test-d.ts @@ -92,7 +92,7 @@ describe("typed events", () => { const value = await socket.emitWithAck( "ackFromClientSingleArg", "1", - 2 + 2, ); expectType(value); @@ -155,12 +155,12 @@ describe("typed events", () => { ackFromClient: ( a: string, b: number, - ack: (c: string, d: boolean) => void + ack: (c: string, d: boolean) => void, ) => void; ackFromClientSingleArg: ( a: string, b: number, - ack: (c: string) => void + ack: (c: string) => void, ) => void; ackFromClientNoArg: (ack: () => void) => void; } @@ -232,7 +232,7 @@ describe("typed events", () => { const value = await socket.emitWithAck( "ackFromClientSingleArg", "1", - 2 + 2, ); expectType(value); diff --git a/packages/socket.io-client/wdio.conf.js b/packages/socket.io-client/wdio.conf.js index 00cf312877..fc9d8f583b 100644 --- a/packages/socket.io-client/wdio.conf.js +++ b/packages/socket.io-client/wdio.conf.js @@ -79,7 +79,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, { @@ -92,7 +92,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, ]; diff --git a/packages/socket.io-cluster-engine/lib/engine.ts b/packages/socket.io-cluster-engine/lib/engine.ts index 90ce6762ec..4972f31881 100644 --- a/packages/socket.io-cluster-engine/lib/engine.ts +++ b/packages/socket.io-cluster-engine/lib/engine.ts @@ -107,7 +107,7 @@ type ClusterRequest = { function isClientLockable( client: Socket, transportName: string, - lockType: "read" | "write" + lockType: "read" | "write", ) { switch (transportName) { case "polling": @@ -166,7 +166,7 @@ export abstract class ClusterEngine extends Server { noopUpgradeInterval: 200, delayedConnectionTimeout: 300, }, - opts + opts, ); } @@ -188,7 +188,7 @@ export abstract class ClusterEngine extends Server { const success = isClientLockable( client, transportName, - message.data.type + message.data.type, ); this.publishMessage({ @@ -340,7 +340,7 @@ export abstract class ClusterEngine extends Server { private _forwardFlushWhenPolling( client: Socket, sid: SessionId, - senderId: NodeId + senderId: NodeId, ) { // @ts-expect-error req is private client.transport.req = true; @@ -370,7 +370,7 @@ export abstract class ClusterEngine extends Server { private _forwardFlushWhenWebSocket( client: Socket, sid: SessionId, - senderId: NodeId + senderId: NodeId, ) { client.transport.writable = true; client.transport.send = (packets) => { @@ -392,7 +392,7 @@ export abstract class ClusterEngine extends Server { override verify( req: IncomingMessage & { _query: Record }, upgrade: boolean, - fn: (errorCode?: number, context?: any) => void + fn: (errorCode?: number, context?: any) => void, ): void { super.verify(req, upgrade, (errorCode: number, errorContext: any) => { if (errorCode !== Server.errors.UNKNOWN_SID) { @@ -419,7 +419,7 @@ export abstract class ClusterEngine extends Server { }; this._acquireLock(sid, transportName, lockType, onSuccess, () => - fn(errorCode, errorContext) + fn(errorCode, errorContext), ); }); } @@ -429,7 +429,7 @@ export abstract class ClusterEngine extends Server { transportName: string, lockType: "read" | "write", onSuccess: (senderId: NodeId) => void, - onError: () => void + onError: () => void, ) { const requestId = ++this._requestCount as RequestId; @@ -460,27 +460,27 @@ export abstract class ClusterEngine extends Server { sid: SessionId, transport: Transport, lockType: "read" | "write", - senderId: NodeId + senderId: NodeId, ) { if (lockType === "read") { this._remoteTransports.set(sid, transport); } transport.on("packet", async (packet: Packet) => - this._onPacket(sid, senderId, packet) + this._onPacket(sid, senderId, packet), ); transport.once("error", () => - this._onClose(sid, senderId, "transport error") + this._onClose(sid, senderId, "transport error"), ); transport.once("close", () => - this._onClose(sid, senderId, "transport close") + this._onClose(sid, senderId, "transport close"), ); } private _tryUpgrade( transport: Transport, onSuccess: () => void, - onError: () => void + onError: () => void, ) { debug("starting upgrade process"); @@ -532,7 +532,7 @@ export abstract class ClusterEngine extends Server { private _onClose( sid: SessionId, senderId: NodeId, - reason: "transport error" | "transport close" + reason: "transport error" | "transport close", ) { this.publishMessage({ senderId: this._nodeId, @@ -563,7 +563,7 @@ export abstract class ClusterEngine extends Server { () => this._onUpgradeSuccess(sid, transport, req, senderId), () => { debug("upgrade failure"); - } + }, ); } @@ -571,7 +571,7 @@ export abstract class ClusterEngine extends Server { sid: SessionId, transport: Transport, req: any, - senderId: NodeId + senderId: NodeId, ) { debug("upgrade success"); this._hookTransport(sid, transport, "read", senderId); @@ -655,7 +655,7 @@ export abstract class ClusterEngine extends Server { socket[kDelayedTimer] = setTimeout( () => this._doConnect(socket), - this._opts.delayedConnectionTimeout + this._opts.delayedConnectionTimeout, ); } @@ -664,7 +664,7 @@ export abstract class ClusterEngine extends Server { return; } debug( - "the client has not upgraded yet, so the connection process is completed here" + "the client has not upgraded yet, so the connection process is completed here", ); socket[kDelayed] = false; socket.off("packet", socket[kPacketListener]); diff --git a/packages/socket.io-cluster-engine/lib/redis.ts b/packages/socket.io-cluster-engine/lib/redis.ts index 2123c307ee..8d25d6a378 100644 --- a/packages/socket.io-cluster-engine/lib/redis.ts +++ b/packages/socket.io-cluster-engine/lib/redis.ts @@ -31,7 +31,7 @@ function channelName(prefix: string, nodeId?: string) { export function setupPrimaryWithRedis( pubClient: any, subClient: any, - opts?: PrimaryWithRedisOptions + opts?: PrimaryWithRedisOptions, ) { const primaryId = randomUUID(); const prefix = opts?.channelPrefix || "engine.io"; @@ -81,7 +81,7 @@ export function setupPrimaryWithRedis( "message", ( sourceWorker, - message: Message & { _source?: string; _primaryId?: string } + message: Message & { _source?: string; _primaryId?: string }, ) => { if (message._source !== MESSAGE_SOURCE) { debug("ignore message from unknown source"); @@ -117,7 +117,7 @@ export function setupPrimaryWithRedis( debug("publish message to channel %s", channel); pubClient.publish(channel, encode(message)); - } + }, ); } @@ -179,14 +179,14 @@ const RETURN_BUFFERS = true; function SUBSCRIBE( redisClient: any, channels: string[], - listener: (message: Buffer) => void + listener: (message: Buffer) => void, ) { if (isRedisClient(redisClient)) { redisClient.subscribe(channels, listener, RETURN_BUFFERS); } else { redisClient.subscribe(channels); redisClient.on("messageBuffer", (_channel: Buffer, message: Buffer) => - listener(message) + listener(message), ); } } diff --git a/packages/socket.io-cluster-engine/test/in-memory.ts b/packages/socket.io-cluster-engine/test/in-memory.ts index d34e869ce7..8e64163778 100644 --- a/packages/socket.io-cluster-engine/test/in-memory.ts +++ b/packages/socket.io-cluster-engine/test/in-memory.ts @@ -9,7 +9,7 @@ import { url, handshake } from "./util"; class InMemoryEngine extends ClusterEngine { constructor( readonly eventBus: EventEmitter, - opts?: ServerOptions + opts?: ServerOptions, ) { super(opts); eventBus.on("message", (message) => this.onMessage(message)); @@ -293,7 +293,7 @@ describe("in-memory", () => { const sid = await handshake(3000); const socket = new WebSocket( - `ws://localhost:3001/engine.io/?EIO=4&transport=websocket&sid=${sid}` + `ws://localhost:3001/engine.io/?EIO=4&transport=websocket&sid=${sid}`, ); socket.onopen = () => { @@ -341,7 +341,7 @@ describe("in-memory", () => { expect(res.status).to.eql(200); const socket = new WebSocket( - `ws://localhost:3001/engine.io/?EIO=4&transport=websocket&sid=${sid}` + `ws://localhost:3001/engine.io/?EIO=4&transport=websocket&sid=${sid}`, ); socket.onopen = () => { diff --git a/packages/socket.io-parser/test/parser.js b/packages/socket.io-parser/test/parser.js index 1b7a415727..0bbc5716ea 100644 --- a/packages/socket.io-parser/test/parser.js +++ b/packages/socket.io-parser/test/parser.js @@ -110,7 +110,7 @@ describe("socket.io-parser", () => { it("throw an error upon parsing error", () => { const isInvalidPayload = (str) => expect(() => new Decoder().add(str)).to.throwException( - /^invalid payload$/ + /^invalid payload$/, ); isInvalidPayload('442["some","data"'); @@ -126,11 +126,11 @@ describe("socket.io-parser", () => { isInvalidPayload('2["disconnect","123"]'); expect(() => new Decoder().add("999")).to.throwException( - /^unknown packet type 9$/ + /^unknown packet type 9$/, ); expect(() => new Decoder().add(999)).to.throwException( - /^Unknown type: 999$/ + /^Unknown type: 999$/, ); }); @@ -154,7 +154,7 @@ describe("socket.io-parser", () => { isPacketValid({ type: 0, nsp: "/", - }) + }), ).to.eql(true); expect( @@ -162,7 +162,7 @@ describe("socket.io-parser", () => { type: 0, nsp: "/admin", data: "invalid", - }) + }), ).to.eql(false); expect( @@ -170,7 +170,7 @@ describe("socket.io-parser", () => { type: 0, nsp: "/", data: [], - }) + }), ).to.eql(false); expect( @@ -178,7 +178,7 @@ describe("socket.io-parser", () => { type: 1, nsp: "/admin", data: {}, - }) + }), ).to.eql(false); expect( @@ -186,7 +186,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/admin", data: "invalid", - }) + }), ).to.eql(false); expect( @@ -194,7 +194,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/admin", data: {}, - }) + }), ).to.eql(false); expect( @@ -202,7 +202,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: { toString: "foo" }, - }) + }), ).to.eql(false); expect( @@ -210,7 +210,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: [true, "foo"], - }) + }), ).to.eql(false); expect( @@ -218,7 +218,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: [null, "bar"], - }) + }), ).to.eql(false); expect( @@ -226,7 +226,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: ["connect"], - }) + }), ).to.eql(false); expect( @@ -234,7 +234,7 @@ describe("socket.io-parser", () => { type: 2, nsp: "/", data: ["disconnect", "123"], - }) + }), ).to.eql(false); }); }); diff --git a/packages/socket.io-parser/wdio.conf.js b/packages/socket.io-parser/wdio.conf.js index c8c592a4f6..b5dc800a96 100644 --- a/packages/socket.io-parser/wdio.conf.js +++ b/packages/socket.io-parser/wdio.conf.js @@ -72,7 +72,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, { @@ -85,7 +85,7 @@ if (process.env.CI === "true") { { appiumVersion: "2.0.0", }, - BASE_SAUCE_OPTIONS + BASE_SAUCE_OPTIONS, ), }, ]; diff --git a/packages/socket.io/lib/broadcast-operator.ts b/packages/socket.io/lib/broadcast-operator.ts index 48e295cb78..0553c027f0 100644 --- a/packages/socket.io/lib/broadcast-operator.ts +++ b/packages/socket.io/lib/broadcast-operator.ts @@ -23,7 +23,7 @@ export class BroadcastOperator private readonly exceptRooms: Set = new Set(), private readonly flags: BroadcastFlags & { expectSingleResponse?: boolean; - } = {} + } = {}, ) {} /** @@ -53,7 +53,7 @@ export class BroadcastOperator this.adapter, rooms, this.exceptRooms, - this.flags + this.flags, ); } @@ -98,7 +98,7 @@ export class BroadcastOperator this.adapter, this.rooms, exceptRooms, - this.flags + this.flags, ); } @@ -117,7 +117,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags + flags, ); } @@ -137,7 +137,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags + flags, ); } @@ -156,7 +156,7 @@ export class BroadcastOperator this.adapter, this.rooms, this.exceptRooms, - flags + flags, ); } @@ -276,7 +276,7 @@ export class BroadcastOperator // each client sends an acknowledgement responses.push(clientResponse); checkCompleteness(); - } + }, ); this.adapter.serverCount().then((serverCount) => { @@ -326,7 +326,7 @@ export class BroadcastOperator public allSockets(): Promise> { if (!this.adapter) { throw new Error( - "No adapter for this namespace, are you trying to get the list of clients of a dynamic namespace?" + "No adapter for this namespace, are you trying to get the list of clients of a dynamic namespace?", ); } return this.adapter.sockets(this.rooms); @@ -371,7 +371,7 @@ export class BroadcastOperator } else { return new RemoteSocket( this.adapter, - socket as SocketDetails + socket as SocketDetails, ); } }); @@ -400,7 +400,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - Array.isArray(room) ? room : [room] + Array.isArray(room) ? room : [room], ); } @@ -425,7 +425,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - Array.isArray(room) ? room : [room] + Array.isArray(room) ? room : [room], ); } @@ -450,7 +450,7 @@ export class BroadcastOperator except: this.exceptRooms, flags: this.flags, }, - close + close, ); } } @@ -489,7 +489,7 @@ export class RemoteSocket new Set(), { expectSingleResponse: true, // so that remoteSocket.emit() with acknowledgement behaves like socket.emit() - } + }, ); } @@ -517,7 +517,7 @@ export class RemoteSocket * @param timeout */ public timeout( - timeout: number + timeout: number, ): BroadcastOperator, SocketData> { return this.operator.timeout(timeout); } diff --git a/packages/socket.io/lib/client.ts b/packages/socket.io/lib/client.ts index 251dc25e52..6ca7b77818 100644 --- a/packages/socket.io/lib/client.ts +++ b/packages/socket.io/lib/client.ts @@ -61,7 +61,7 @@ export class Client< */ constructor( server: Server, - conn: any + conn: any, ) { this.server = server; this.conn = conn; @@ -126,7 +126,7 @@ export class Client< ( dynamicNspName: | Namespace - | false + | false, ) => { if (dynamicNspName) { this.doConnect(name, auth); @@ -140,7 +140,7 @@ export class Client< }, }); } - } + }, ); } @@ -185,7 +185,7 @@ export class Client< * @private */ _remove( - socket: Socket + socket: Socket, ): void { if (this.sockets.has(socket.id)) { const nsp = this.sockets.get(socket.id)!.nsp.name; @@ -229,11 +229,11 @@ export class Client< private writeToEngine( encodedPackets: Array, - opts: WriteOptions + opts: WriteOptions, ): void { if (opts.volatile && !this.conn.transport.writable) { debug( - "volatile packet is discarded since the transport is not currently writable" + "volatile packet is discarded since the transport is not currently writable", ); return; } @@ -316,7 +316,7 @@ export class Client< */ private onclose( reason: CloseReason | "forced server close", - description?: any + description?: any, ): void { debug("client close with reason %s", reason); diff --git a/packages/socket.io/lib/index.ts b/packages/socket.io/lib/index.ts index 13bf209d5e..5fa448d038 100644 --- a/packages/socket.io/lib/index.ts +++ b/packages/socket.io/lib/index.ts @@ -51,7 +51,7 @@ const dotMapRegex = /\.map/; type ParentNspNameMatchFn = ( name: string, auth: { [key: string]: any }, - fn: (err: Error | null, success: boolean) => void + fn: (err: Error | null, success: boolean) => void, ) => void; type AdapterConstructor = typeof Adapter | ((nsp: Namespace) => Adapter); @@ -218,7 +218,7 @@ export class Server< private _corsMiddleware: ( req: http.IncomingMessage, res: http.ServerResponse, - next: () => void + next: () => void, ) => void; /** @@ -231,11 +231,11 @@ export class Server< constructor(srv?: TServerInstance | number, opts?: Partial); constructor( srv: undefined | Partial | TServerInstance | number, - opts?: Partial + opts?: Partial, ); constructor( srv: undefined | Partial | TServerInstance | number, - opts: Partial = {} + opts: Partial = {}, ) { super(); if ( @@ -258,7 +258,7 @@ export class Server< maxDisconnectionDuration: 2 * 60 * 1000, skipMiddlewares: true, }, - opts.connectionStateRecovery + opts.connectionStateRecovery, ); this.adapter(opts.adapter || SessionAwareAdapter); } else { @@ -308,8 +308,8 @@ export class Server< fn: ( nsp: | Namespace - | false - ) => void + | false, + ) => void, ): void { if (this.parentNsps.size === 0) return fn(false); @@ -356,7 +356,7 @@ export class Server< this.clientPathRegex = new RegExp( "^" + escapedPath + - "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)" + "/socket\\.io(\\.msgpack|\\.esm)?(\\.min)?\\.js(\\.map)?(?:\\?|$)", ); return this; } @@ -383,7 +383,7 @@ export class Server< public adapter(): AdapterConstructor | undefined; public adapter(v: AdapterConstructor): this; public adapter( - v?: AdapterConstructor + v?: AdapterConstructor, ): AdapterConstructor | undefined | this { if (!arguments.length) return this._adapter; this._adapter = v; @@ -402,7 +402,7 @@ export class Server< */ public listen( srv: TServerInstance | number, - opts: Partial = {} + opts: Partial = {}, ): this { return this.attach(srv, opts); } @@ -416,7 +416,7 @@ export class Server< */ public attach( srv: TServerInstance | number, - opts: Partial = {} + opts: Partial = {}, ): this { if ("function" == typeof srv) { const msg = @@ -501,7 +501,7 @@ export class Server< res.writeHeader("cache-control", "public, max-age=0"); res.writeHeader( "content-type", - "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8", ); res.writeHeader("etag", expectedEtag); @@ -522,7 +522,7 @@ export class Server< */ private initEngine( srv: TServerInstance, - opts: EngineOptions & AttachOptions + opts: EngineOptions & AttachOptions, ): void { // initialize engine debug("creating engine.io instance with opts %j", opts); @@ -598,7 +598,7 @@ export class Server< res.setHeader("Cache-Control", "public, max-age=0"); res.setHeader( "Content-Type", - "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8" + "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8", ); res.setHeader("ETag", expectedEtag); @@ -614,10 +614,10 @@ export class Server< private static sendFile( filename: string, req: http.IncomingMessage, - res: http.ServerResponse + res: http.ServerResponse, ): void { const readStream = createReadStream( - path.join(__dirname, "../client-dist/", filename) + path.join(__dirname, "../client-dist/", filename), ); const encoding = accepts(req).encodings(["br", "gzip", "deflate"]); @@ -696,8 +696,8 @@ export class Server< public of( name: string | RegExp | ParentNspNameMatchFn, fn?: ( - socket: Socket - ) => void + socket: Socket, + ) => void, ): Namespace { if (typeof name === "function" || name instanceof RegExp) { const parentNsp = new ParentNamespace(this); @@ -707,7 +707,7 @@ export class Server< } else { this.parentNsps.set( (nsp, conn, next) => next(null, (name as RegExp).test(nsp)), - parentNsp + parentNsp, ); this.parentNamespacesFromRegExp.set(name, parentNsp); } @@ -754,7 +754,7 @@ export class Server< }); await nsp.adapter.close(); - }) + }), ); this.engine.close(); @@ -783,8 +783,8 @@ export class Server< public use( fn: ( socket: Socket, - next: (err?: ExtendedError) => void - ) => void + next: (err?: ExtendedError) => void, + ) => void, ): this { this.sockets.use(fn); return this; @@ -1096,7 +1096,7 @@ export class Server< const emitterMethods = Object.keys(EventEmitter.prototype).filter( function (key) { return typeof EventEmitter.prototype[key] === "function"; - } + }, ); emitterMethods.forEach(function (fn) { diff --git a/packages/socket.io/lib/namespace.ts b/packages/socket.io/lib/namespace.ts index 25a90a2ebe..023b1f7f6a 100644 --- a/packages/socket.io/lib/namespace.ts +++ b/packages/socket.io/lib/namespace.ts @@ -34,10 +34,10 @@ export interface NamespaceReservedEventsMap< SocketData, > { connect: ( - socket: Socket + socket: Socket, ) => void; connection: ( - socket: Socket + socket: Socket, ) => void; } @@ -53,7 +53,12 @@ export interface ServerReservedEventsMap< SocketData > { new_namespace: ( - namespace: Namespace + namespace: Namespace< + ListenEvents, + EmitEvents, + ServerSideEvents, + SocketData + >, ) => void; } @@ -149,7 +154,7 @@ export class Namespace< _fns: Array< ( socket: Socket, - next: (err?: ExtendedError) => void + next: (err?: ExtendedError) => void, ) => void > = []; @@ -164,7 +169,7 @@ export class Namespace< */ constructor( server: Server, - name: string + name: string, ) { super(); this.server = server; @@ -200,8 +205,8 @@ export class Namespace< public use( fn: ( socket: Socket, - next: (err?: ExtendedError) => void - ) => void + next: (err?: ExtendedError) => void, + ) => void, ): this { this._fns.push(fn); return this; @@ -216,7 +221,7 @@ export class Namespace< */ private run( socket: Socket, - fn: (err: ExtendedError | null) => void + fn: (err: ExtendedError | null) => void, ) { const fns = this._fns.slice(0); if (!fns.length) return fn(null); @@ -316,8 +321,8 @@ export class Namespace< client: Client, auth: Record, fn: ( - socket: Socket - ) => void + socket: Socket, + ) => void, ) { debug("adding socket to nsp %s", this.name); const socket = await this._createSocket(client, auth); @@ -359,7 +364,7 @@ export class Namespace< private async _createSocket( client: Client, - auth: Record + auth: Record, ) { const sessionId = auth.pid; const offset = auth.offset; @@ -386,8 +391,8 @@ export class Namespace< private _doConnect( socket: Socket, fn: ( - socket: Socket - ) => void + socket: Socket, + ) => void, ) { // track socket this.sockets.set(socket.id, socket); @@ -410,7 +415,7 @@ export class Namespace< * @private */ _remove( - socket: Socket + socket: Socket, ): void { if (this.sockets.has(socket.id)) { this.sockets.delete(socket.id); @@ -447,7 +452,7 @@ export class Namespace< ): boolean { return new BroadcastOperator(this.adapter).emit( ev, - ...args + ...args, ); } @@ -563,7 +568,7 @@ export class Namespace< }); this.serverSideEmit( ev, - ...(args as any[] as EventParams) + ...(args as any[] as EventParams), ); }); } @@ -587,7 +592,7 @@ export class Namespace< */ public allSockets(): Promise> { return new BroadcastOperator( - this.adapter + this.adapter, ).allSockets(); } @@ -697,7 +702,7 @@ export class Namespace< */ public fetchSockets() { return new BroadcastOperator( - this.adapter + this.adapter, ).fetchSockets(); } @@ -719,7 +724,7 @@ export class Namespace< */ public socketsJoin(room: Room | Room[]) { return new BroadcastOperator( - this.adapter + this.adapter, ).socketsJoin(room); } @@ -741,7 +746,7 @@ export class Namespace< */ public socketsLeave(room: Room | Room[]) { return new BroadcastOperator( - this.adapter + this.adapter, ).socketsLeave(room); } @@ -763,7 +768,7 @@ export class Namespace< */ public disconnectSockets(close: boolean = false) { return new BroadcastOperator( - this.adapter + this.adapter, ).disconnectSockets(close); } } diff --git a/packages/socket.io/lib/parent-namespace.ts b/packages/socket.io/lib/parent-namespace.ts index d75481aac6..9df17da279 100644 --- a/packages/socket.io/lib/parent-namespace.ts +++ b/packages/socket.io/lib/parent-namespace.ts @@ -39,7 +39,7 @@ export class ParentNamespace< > = new Set(); constructor( - server: Server + server: Server, ) { super(server, "/_" + ParentNamespace.count++); } @@ -63,16 +63,16 @@ export class ParentNamespace< } createChild( - name: string + name: string, ): Namespace { debug("creating child namespace %s", name); const namespace = new Namespace(this.server, name); namespace._fns = this._fns.slice(0); this.listeners("connect").forEach((listener) => - namespace.on("connect", listener) + namespace.on("connect", listener), ); this.listeners("connection").forEach((listener) => - namespace.on("connection", listener) + namespace.on("connection", listener), ); this.children.add(namespace); diff --git a/packages/socket.io/lib/socket.ts b/packages/socket.io/lib/socket.ts index a7e798e1db..0adc9fea79 100644 --- a/packages/socket.io/lib/socket.ts +++ b/packages/socket.io/lib/socket.ts @@ -66,11 +66,11 @@ export interface SocketReservedEventsMap { export interface EventEmitterReservedEventsMap { newListener: ( eventName: string | Symbol, - listener: (...args: any[]) => void + listener: (...args: any[]) => void, ) => void; removeListener: ( eventName: string | Symbol, - listener: (...args: any[]) => void + listener: (...args: any[]) => void, ) => void; } @@ -252,7 +252,7 @@ export class Socket< readonly nsp: Namespace, readonly client: Client, auth: Record, - previousSession?: Session + previousSession?: Session, ) { super(); this.server = nsp.server; @@ -529,7 +529,7 @@ export class Socket< */ private packet( packet: Omit & Partial>, - opts: any = {} + opts: any = {}, ): void { packet.nsp = this.nsp.name; opts.compress = false !== opts.compress; @@ -556,7 +556,7 @@ export class Socket< return this.adapter.addAll( this.id, - new Set(Array.isArray(rooms) ? rooms : [rooms]) + new Set(Array.isArray(rooms) ? rooms : [rooms]), ); } @@ -893,7 +893,7 @@ export class Socket< * @returns self */ public timeout( - timeout: number + timeout: number, ): Socket< ListenEvents, DecorateAcknowledgements, diff --git a/packages/socket.io/lib/typed-events.ts b/packages/socket.io/lib/typed-events.ts index 09108e854b..0a04e67577 100644 --- a/packages/socket.io/lib/typed-events.ts +++ b/packages/socket.io/lib/typed-events.ts @@ -158,7 +158,7 @@ export abstract class StrictEventEmitter< */ on>( ev: Ev, - listener: ReservedOrUserListener + listener: ReservedOrUserListener, ): this { return super.on(ev, listener); } @@ -171,7 +171,7 @@ export abstract class StrictEventEmitter< */ once>( ev: Ev, - listener: ReservedOrUserListener + listener: ReservedOrUserListener, ): this { return super.once(ev, listener); } @@ -226,7 +226,7 @@ export abstract class StrictEventEmitter< * @returns Array of listeners subscribed to `event` */ listeners>( - event: Ev + event: Ev, ): ReservedOrUserListener[] { return super.listeners(event) as ReservedOrUserListener< ReservedEvents, diff --git a/packages/socket.io/lib/uws.ts b/packages/socket.io/lib/uws.ts index 6e400c7f77..89a6bf7d33 100644 --- a/packages/socket.io/lib/uws.ts +++ b/packages/socket.io/lib/uws.ts @@ -76,7 +76,7 @@ export function patchAdapter(app /* : TemplatedApp */) { app.publish( topic, isBinary ? encodedPacket : "4" + encodedPacket, - isBinary + isBinary, ); }); @@ -93,7 +93,7 @@ function subscribe( namespaceName: string, socket: Socket, isNew: boolean, - rooms: Set + rooms: Set, ) { // @ts-ignore const sessionId = socket.conn.id; @@ -144,7 +144,7 @@ export function serveFile(res /* : HttpResponse */, filepath: string) { res.onWritable((offset) => { const [ok, done] = res.tryEnd( arrayBufferChunk.slice(offset - lastOffset), - size + size, ); if (!done && ok) { diff --git a/packages/socket.io/test/connection-state-recovery.ts b/packages/socket.io/test/connection-state-recovery.ts index e84cae6a04..c0dcbf0703 100644 --- a/packages/socket.io/test/connection-state-recovery.ts +++ b/packages/socket.io/test/connection-state-recovery.ts @@ -59,7 +59,7 @@ describe("connection state recovery", () => { await eioPush( httpServer, newSid, - `40{"pid":"${pid}","offset":"${offset}"}` + `40{"pid":"${pid}","offset":"${offset}"}`, ); const payload = await eioPoll(httpServer, newSid); diff --git a/packages/socket.io/test/handshake.ts b/packages/socket.io/test/handshake.ts index 27553eca01..fc38e29476 100644 --- a/packages/socket.io/test/handshake.ts +++ b/packages/socket.io/test/handshake.ts @@ -22,11 +22,11 @@ describe("handshake", () => { expect(res.status).to.be(204); expect(res.headers["access-control-allow-origin"]).to.be( - "http://localhost:54023" + "http://localhost:54023", ); expect(res.headers["access-control-allow-methods"]).to.be("GET,POST"); expect(res.headers["access-control-allow-headers"]).to.be( - "content-type" + "content-type", ); expect(res.headers["access-control-allow-credentials"]).to.be("true"); success(done, io); @@ -50,7 +50,7 @@ describe("handshake", () => { expect(res.status).to.be(200); expect(res.headers["access-control-allow-origin"]).to.be( - "http://localhost:54024" + "http://localhost:54024", ); expect(res.headers["access-control-allow-credentials"]).to.be("true"); success(done, io); diff --git a/packages/socket.io/test/messaging-many.ts b/packages/socket.io/test/messaging-many.ts index ce71062645..0a51815068 100644 --- a/packages/socket.io/test/messaging-many.ts +++ b/packages/socket.io/test/messaging-many.ts @@ -17,7 +17,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.on("a", (a) => { @@ -53,7 +53,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.on("bin", (a) => { @@ -142,7 +142,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2) + successFn(done, io, socket1, socket2), ); socket2.on("a", () => { @@ -178,7 +178,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.emit("join", "woot"); @@ -221,7 +221,7 @@ describe("messaging many", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.emit("join", "woot"); diff --git a/packages/socket.io/test/middleware.ts b/packages/socket.io/test/middleware.ts index 46455a73e1..5211c05a64 100644 --- a/packages/socket.io/test/middleware.ts +++ b/packages/socket.io/test/middleware.ts @@ -179,7 +179,7 @@ describe("middleware", () => { const partialDone = createPartialDone( 2, - successFn(done, io, socket1, socket2) + successFn(done, io, socket1, socket2), ); io.of("/chat").use((socket, next) => { diff --git a/packages/socket.io/test/namespaces.ts b/packages/socket.io/test/namespaces.ts index 621c589cef..a8b3f08fcf 100644 --- a/packages/socket.io/test/namespaces.ts +++ b/packages/socket.io/test/namespaces.ts @@ -389,7 +389,7 @@ describe("namespaces", () => { const io = new Server(); expect(() => io.emit("connect")).to.throwException( - /"connect" is a reserved event name/ + /"connect" is a reserved event name/, ); }); @@ -660,7 +660,9 @@ describe("namespaces", () => { c2.on("connect_error", () => { done( - new Error("Client got error when connecting to dynamic namespace") + new Error( + "Client got error when connecting to dynamic namespace", + ), ); }); }, 100); diff --git a/packages/socket.io/test/server-attachment.ts b/packages/socket.io/test/server-attachment.ts index 81da1acbcd..f653446c50 100644 --- a/packages/socket.io/test/server-attachment.ts +++ b/packages/socket.io/test/server-attachment.ts @@ -17,7 +17,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/javascript; charset=utf-8" + "application/javascript; charset=utf-8", ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); @@ -36,7 +36,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/json; charset=utf-8" + "application/json; charset=utf-8", ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.text).to.match(/engine\.io/); @@ -48,7 +48,7 @@ describe("server attachment", () => { it("should serve client", testSource("socket.io.js")); it( "should serve client with query string", - testSource("socket.io.js?buster=" + Date.now()) + testSource("socket.io.js?buster=" + Date.now()), ); it("should serve source map", testSourceMap("socket.io.js.map")); it("should serve client (min)", testSource("socket.io.min.js")); @@ -99,7 +99,7 @@ describe("server attachment", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["access-control-allow-origin"]).to.be( - "https://good-origin.com" + "https://good-origin.com", ); expect(res.status).to.be(200); done(); @@ -108,19 +108,19 @@ describe("server attachment", () => { it( "should serve bundle with msgpack parser", - testSource("socket.io.msgpack.min.js") + testSource("socket.io.msgpack.min.js"), ); it( "should serve source map for bundle with msgpack parser", - testSourceMap("socket.io.msgpack.min.js.map") + testSourceMap("socket.io.msgpack.min.js.map"), ); it("should serve the ESM bundle", testSource("socket.io.esm.min.js")); it( "should serve the source map for the ESM bundle", - testSourceMap("socket.io.esm.min.js.map") + testSourceMap("socket.io.esm.min.js.map"), ); it("should handle 304", (done) => { diff --git a/packages/socket.io/test/socket.io.test-d.ts b/packages/socket.io/test/socket.io.test-d.ts index a6cc51c1ff..5c6ef3b187 100644 --- a/packages/socket.io/test/socket.io.test-d.ts +++ b/packages/socket.io/test/socket.io.test-d.ts @@ -123,7 +123,7 @@ describe("server", () => { const value1 = await s.emitWithAck( "ackFromServerSingleArg", true, - "123" + "123", ); expectType(value1); }); @@ -158,7 +158,7 @@ describe("server", () => { it("does not accept arguments of wrong types", (done) => { const srv = createServer(); const sio = new Server( - srv + srv, ); // @ts-expect-error - shouldn't accept arguments of the wrong types sio.on("random", (a, b, c) => {}); @@ -192,7 +192,7 @@ describe("server", () => { ackFromClient: ( a: string, b: number, - ack: (c: string, d: number) => void + ack: (c: string, d: number) => void, ) => void; } @@ -202,12 +202,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (c: boolean, d: string) => void + ack: (c: boolean, d: string) => void, ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (c: string) => void + ack: (c: string) => void, ) => void; onlyCallback: (a: () => void) => void; } @@ -226,12 +226,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (err: Error, c: boolean, d: string) => void + ack: (err: Error, c: boolean, d: string) => void, ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (err: Error, c: string) => void + ack: (err: Error, c: string) => void, ) => void; onlyCallback: (a: (err: Error) => void) => void; } @@ -243,7 +243,7 @@ describe("server", () => { ackFromServerSingleArg: ( a: boolean, b: string, - ack: (c: string[]) => void + ack: (c: string[]) => void, ) => void; onlyCallback: (a: () => void) => void; } @@ -253,12 +253,12 @@ describe("server", () => { ackFromServer: ( a: boolean, b: string, - ack: (err: Error, c: boolean[]) => void + ack: (err: Error, c: boolean[]) => void, ) => void; ackFromServerSingleArg: ( a: boolean, b: string, - ack: (err: Error, c: string[]) => void + ack: (err: Error, c: string[]) => void, ) => void; onlyCallback: (a: (err: Error) => void) => void; } @@ -315,7 +315,7 @@ describe("server", () => { untyped.of("/").emit("random2", 2, "string", Server); expectType>(untyped.to("1").emitWithAck("random", "test")); expectType<(ev: string, ...args: any[]) => Promise>( - untyped.to("1").emitWithAck + untyped.to("1").emitWithAck, ); }); it("has the correct types", () => { @@ -326,25 +326,25 @@ describe("server", () => { const nio = sio.of("/"); for (const emitter of [sio, nio]) { expectType>( - emitter.to("1") + emitter.to("1"), ); expectType>( - emitter.in("1") + emitter.in("1"), ); expectType>( - emitter.except("1") + emitter.except("1"), ); expectType>( - emitter.except("1") + emitter.except("1"), ); expectType>( - emitter.compress(true) + emitter.compress(true), ); expectType>( - emitter.volatile + emitter.volatile, ); expectType>( - emitter.local + emitter.local, ); expectType< BroadcastOperator @@ -367,16 +367,16 @@ describe("server", () => { >(s.timeout(0).broadcast); // ensure that turning socket to a broadcast works correctly expectType>( - s.broadcast + s.broadcast, ); expectType>( - s.in("1") + s.in("1"), ); expectType>( - s.except("1") + s.except("1"), ); expectType>( - s.to("1") + s.to("1"), ); // Ensure that adding a timeout to a broadcast works after the fact expectType< @@ -391,7 +391,7 @@ describe("server", () => { it("has the correct types for `emit`", () => { const sio = new Server(); expectType>( - sio.timeout(0).emit<"noArgs"> + sio.timeout(0).emit<"noArgs">, ); expectType< ToEmit @@ -414,7 +414,7 @@ describe("server", () => { const sansTimeout = sio.in("1"); // Without timeout, `emitWithAck` shouldn't accept any events expectType( - undefined as Parameters<(typeof sansTimeout)["emitWithAck"]>[0] + undefined as Parameters<(typeof sansTimeout)["emitWithAck"]>[0], ); // @ts-expect-error - "noArgs" doesn't have a callback and is thus excluded sio.timeout(0).emitWithAck("noArgs"); @@ -441,33 +441,33 @@ describe("server", () => { const sio = new Server(); const nio = sio.of("/test"); expectType>( - sio.emit<"noArgs"> + sio.emit<"noArgs">, ); expectType>( - nio.emit<"noArgs"> + nio.emit<"noArgs">, ); expectType>( // These errors will dissapear once the TS version is updated from 4.7.4 // the TSD instance is using a newer version of TS than the workspace version // to enable the ability to compare against `any` - sio.emit<"helloFromServer"> + sio.emit<"helloFromServer">, ); expectType>( - nio.emit<"helloFromServer"> + nio.emit<"helloFromServer">, ); sio.on("connection", (s) => { expectType>(s.emit<"noArgs">); expectType>( - s.emit<"helloFromServer"> + s.emit<"helloFromServer">, ); expectType>( - s.emit<"ackFromServerSingleArg"> + s.emit<"ackFromServerSingleArg">, ); expectType>( - s.emit<"ackFromServer"> + s.emit<"ackFromServer">, ); expectType>( - s.emit<"onlyCallback"> + s.emit<"onlyCallback">, ); }); }); @@ -631,7 +631,7 @@ describe("server", () => { const value = await sio.serverSideEmitWithAck( "ackFromServerToServer", - "foo" + "foo", ); expectType(value); @@ -654,7 +654,7 @@ describe("server", () => { class MyCustomAdapter extends Adapter { constructor( nsp, - readonly opts + readonly opts, ) { super(nsp); } diff --git a/packages/socket.io/test/socket.ts b/packages/socket.io/test/socket.ts index f9c93ff00b..41882a7987 100644 --- a/packages/socket.io/test/socket.ts +++ b/packages/socket.io/test/socket.ts @@ -807,7 +807,7 @@ describe("socket", () => { io.on("connection", (s) => { s.conn.on("upgrade", () => { console.log( - "\u001b[96mNote: warning expected and normal in test.\u001b[39m" + "\u001b[96mNote: warning expected and normal in test.\u001b[39m", ); // @ts-ignore socket.io.engine.write("5woooot"); @@ -825,7 +825,7 @@ describe("socket", () => { io.on("connection", (s) => { s.conn.on("upgrade", () => { console.log( - "\u001b[96mNote: warning expected and normal in test.\u001b[39m" + "\u001b[96mNote: warning expected and normal in test.\u001b[39m", ); // @ts-ignore socket.io.engine.write('44["handle me please"]'); @@ -883,7 +883,7 @@ describe("socket", () => { const socket = createClient(io); io.on("connection", (s) => { expect(() => s.emit("connect_error")).to.throwException( - /"connect_error" is a reserved event name/ + /"connect_error" is a reserved event name/, ); socket.close(); success(done, io, socket); @@ -1112,7 +1112,7 @@ describe("socket", () => { const partialDone = createPartialDone( 3, - successFn(done, io, socket1, socket2, socket3) + successFn(done, io, socket1, socket2, socket3), ); socket1.on("disconnect", partialDone); diff --git a/packages/socket.io/test/support/util.ts b/packages/socket.io/test/support/util.ts index 7d04ce8644..1e59dd01ec 100644 --- a/packages/socket.io/test/support/util.ts +++ b/packages/socket.io/test/support/util.ts @@ -25,7 +25,7 @@ expect.Assertion.prototype.contain = function (...args) { }, function () { return "expected " + i(this.obj) + " to not contain " + i(obj); - } + }, ); }); return this; @@ -39,7 +39,7 @@ export function createClient< >( io: Server, nsp: string = "/", - opts?: Partial + opts?: Partial, ): ClientSocket { const port = (io.httpServer.address() as AddressInfo).port; return ioc(`http://localhost:${port}${nsp}`, opts); diff --git a/packages/socket.io/test/utility-methods.ts b/packages/socket.io/test/utility-methods.ts index efbc21c0b7..030edccfbf 100644 --- a/packages/socket.io/test/utility-methods.ts +++ b/packages/socket.io/test/utility-methods.ts @@ -47,7 +47,7 @@ describe("utility methods", () => { ioc(`http://localhost:${port}`, { // FIXME needed so that clients are properly closed transports: ["websocket"], - }) + }), ); } diff --git a/packages/socket.io/test/uws.ts b/packages/socket.io/test/uws.ts index 3a287e6468..52e5c32d75 100644 --- a/packages/socket.io/test/uws.ts +++ b/packages/socket.io/test/uws.ts @@ -212,7 +212,7 @@ describe("socket.io with uWebSocket.js-based engine", () => { .end((err, res) => { if (err) return done(err); expect(res.headers["content-type"]).to.be( - "application/javascript; charset=utf-8" + "application/javascript; charset=utf-8", ); expect(res.headers.etag).to.be('"' + clientVersion + '"'); expect(res.headers["x-sourcemap"]).to.be(undefined); diff --git a/packages/socket.io/test/v2-compatibility.ts b/packages/socket.io/test/v2-compatibility.ts index 20d3d4a76f..2f626d0db1 100644 --- a/packages/socket.io/test/v2-compatibility.ts +++ b/packages/socket.io/test/v2-compatibility.ts @@ -32,7 +32,7 @@ describe("v2 compatibility", () => { `http://localhost:${getPort(io)}/the-namespace`, { multiplex: false, - } + }, ); clientSocket.query = { test: "123" };