diff --git a/packages/socket.io-adapter/lib/cluster-adapter.ts b/packages/socket.io-adapter/lib/cluster-adapter.ts index 64604b99..c53a48b4 100644 --- a/packages/socket.io-adapter/lib/cluster-adapter.ts +++ b/packages/socket.io-adapter/lib/cluster-adapter.ts @@ -508,7 +508,7 @@ export abstract class ClusterAdapter extends Adapter { }, opts.flags!.timeout); } - return super.broadcastWithAck(packet, opts, clientCountCallback, ack); + super.broadcastWithAck(packet, opts, clientCountCallback, ack); } override async addSockets(opts: BroadcastOptions, rooms: Room[]) { diff --git a/packages/socket.io-adapter/lib/in-memory-adapter.ts b/packages/socket.io-adapter/lib/in-memory-adapter.ts index 9ba553cf..cf178170 100644 --- a/packages/socket.io-adapter/lib/in-memory-adapter.ts +++ b/packages/socket.io-adapter/lib/in-memory-adapter.ts @@ -229,14 +229,6 @@ export class Adapter extends EventEmitter { }); clientCountCallback(clientCount); - - return { - cleanup: () => { - this.apply(opts, (socket) => { - socket.acks.delete(packet.id); - }); - }, - }; } private _encode(packet: unknown, packetOpts: Record) { diff --git a/packages/socket.io/lib/broadcast-operator.ts b/packages/socket.io/lib/broadcast-operator.ts index 10d8a360..6a229dae 100644 --- a/packages/socket.io/lib/broadcast-operator.ts +++ b/packages/socket.io/lib/broadcast-operator.ts @@ -232,11 +232,9 @@ export class BroadcastOperator const ack = data.pop() as (...args: any[]) => void; let timedOut = false; let responses: any[] = []; - let cleanupPendingAcks: (() => void) | undefined; const timer = setTimeout(() => { timedOut = true; - cleanupPendingAcks?.(); ack.apply(this, [ new Error("operation has timed out"), this.flags.expectSingleResponse ? null : responses, @@ -261,7 +259,7 @@ export class BroadcastOperator } }; - const result = this.adapter.broadcastWithAck( + this.adapter.broadcastWithAck( packet, { rooms: this.rooms, @@ -281,10 +279,6 @@ export class BroadcastOperator }, ); - if (result && typeof result.cleanup === "function") { - cleanupPendingAcks = result.cleanup; - } - this.adapter.serverCount().then((serverCount) => { expectedServerCount = serverCount; checkCompleteness(); diff --git a/packages/socket.io/test/messaging-many.ts b/packages/socket.io/test/messaging-many.ts index 87407a2f..0a518150 100644 --- a/packages/socket.io/test/messaging-many.ts +++ b/packages/socket.io/test/messaging-many.ts @@ -534,11 +534,6 @@ describe("messaging many", () => { // @ts-ignore expect(err.responses).to.contain(1, 2); - for (const [, serverSocket] of io.of("/").sockets) { - // @ts-ignore accessing private acks map to verify cleanup - expect(serverSocket.acks.size).to.be(0); - } - success(done, io, socket1, socket2, socket3); } });