Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions packages/socket.io-adapter/lib/in-memory-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,14 @@ export class Adapter extends EventEmitter {
const encodedPackets = this._encode(packet, packetOpts);

let clientCount = 0;
const sockets: any[] = [];

this.apply(opts, (socket) => {
// track the total number of acknowledgements that are expected
clientCount++;
// call the ack callback for each client response
socket.acks.set(packet.id, ack);
sockets.push(socket);

if (typeof socket.notifyOutgoingListeners === "function") {
socket.notifyOutgoingListeners(packet);
Expand All @@ -229,6 +231,16 @@ export class Adapter extends EventEmitter {
});

clientCountCallback(clientCount);

// clean up socket.acks entries after the timeout to prevent memory leaks
// when clients do not respond with an acknowledgement
if (flags.timeout !== undefined) {
setTimeout(() => {
for (const socket of sockets) {
socket.acks.delete(packet.id);
}
}, flags.timeout);
}
}

private _encode(packet: unknown, packetOpts: Record<string, unknown>) {
Expand Down
114 changes: 114 additions & 0 deletions packages/socket.io-adapter/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,120 @@ describe("socket.io-adapter", () => {
});
});

describe("broadcastWithAck", () => {
it("should clean up socket.acks after timeout", (done) => {
const acks1 = new Map();
const acks2 = new Map();
let _ids = 0;

function socket(id, acks) {
return [
id,
{
id,
acks,
client: {
writeToEngine() {},
},
},
];
}

const nsp = {
_ids,
name: "/",
server: {
encoder: {
encode() {
return ["123"];
},
},
},
// @ts-ignore
sockets: new Map([socket("s1", acks1), socket("s2", acks2)]),
};

const adapter = new Adapter(nsp);
adapter.addAll("s1", new Set(["r1"]));
adapter.addAll("s2", new Set(["r1"]));

const ackFn = () => {};

adapter.broadcastWithAck(
{ type: 2, data: ["test", ackFn] },
{
rooms: new Set(["r1"]),
except: new Set(),
flags: { timeout: 50 },
},
() => {},
ackFn,
);

// acks should be set immediately
expect(acks1.size).to.be(1);
expect(acks2.size).to.be(1);

// acks should be cleaned up after timeout
setTimeout(() => {
expect(acks1.size).to.be(0);
expect(acks2.size).to.be(0);
done();
}, 100);
});

it("should not set cleanup timer when no timeout is specified", () => {
const acks1 = new Map();
let _ids = 0;

function socket(id, acks) {
return [
id,
{
id,
acks,
client: {
writeToEngine() {},
},
},
];
}

const nsp = {
_ids,
name: "/",
server: {
encoder: {
encode() {
return ["123"];
},
},
},
// @ts-ignore
sockets: new Map([socket("s1", acks1)]),
};

const adapter = new Adapter(nsp);
adapter.addAll("s1", new Set(["r1"]));

const ackFn = () => {};

adapter.broadcastWithAck(
{ type: 2, data: ["test", ackFn] },
{
rooms: new Set(["r1"]),
except: new Set(),
flags: {},
},
() => {},
ackFn,
);

// acks should be set
expect(acks1.size).to.be(1);
});
});

describe("connection state recovery", () => {
it("should persist and restore session", async () => {
const adapter = new SessionAwareAdapter({
Expand Down