Skip to content
Merged
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
14 changes: 8 additions & 6 deletions lib/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,14 @@ class RedisStreamsAdapter extends ClusterAdapterWithHeartbeat {

for (const entry of entries) {
if (entry.message.nsp === this.nsp.name && entry.message.type === "3") {
const message = RedisStreamsAdapter.decode(entry.message);

// @ts-ignore
if (shouldIncludePacket(session.rooms, message.data.opts)) {
// @ts-ignore
session.missedPackets.push(message.data.packet.data);
const message = RedisStreamsAdapter.decode(entry.message) as {
data: any;
};
const { packet, opts } = message.data;

if (shouldIncludePacket(session.rooms, opts)) {
packet.data.push(entry.id);
session.missedPackets.push(packet.data);
}
}
offset = entry.id;
Expand Down
12 changes: 10 additions & 2 deletions test/connection-state-recovery.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Server } from "socket.io";
import { io as ioc } from "socket.io-client";
import { setup, sleep } from "./util";
import { setup } from "./util";
import expect = require("expect.js");

describe("connection state recovery", () => {
let servers: Server[], ports: number[], cleanup;
let servers: Server[], ports: number[], cleanup: () => void;

beforeEach(async () => {
const testContext = await setup({
Expand Down Expand Up @@ -82,10 +82,14 @@ describe("connection state recovery", () => {
socket.io.engine.close();

socket.on("connect", () => {
// @ts-expect-error _lastOffset is private
offsets.add(socket._lastOffset);

expect(socket.recovered).to.eql(true);

setTimeout(() => {
expect(events).to.eql([1, 2, 3]);
expect(offsets.size).to.eql(4);

socket.disconnect();
done();
Expand All @@ -94,9 +98,13 @@ describe("connection state recovery", () => {
});

const events: number[] = [];
const offsets = new Set<string>();

socket.on("myEvent", (val) => {
events.push(val);
// note: the offset is updated after the callback execution
// @ts-expect-error _lastOffset is private
offsets.add(socket._lastOffset);
});
});

Expand Down