Skip to content

ship/fix native resolve all resume #7321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewevans merged 8 commits into from
Aug 13, 2026
Merged

ship/fix native resolve all resume #7321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c6aceb6
fix(native): settle resolve all and reconnect identity
matthewevans Aug 13, 2026
928547c
fix(native): validate reconnect transition frames
matthewevans Aug 13, 2026
5bc530e
fix(native): terminate rejected reconnect identities
matthewevans Aug 13, 2026
95b53ff
fix(test): use persistent stack insertion
matthewevans Aug 13, 2026
de56e5f
test(server): bound resolve all delivery waits
matthewevans Aug 13, 2026
e328235
test(server): make resolve-all snapshot assertion deterministic
matthewevans Aug 13, 2026
361b0c7
test(server): satisfy resolve all revision lint
matthewevans Aug 13, 2026
3c869d2
test(server): make resolve all transport fixture deterministic
matthewevans Aug 13, 2026
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
263 changes: 243 additions & 20 deletions client/src/adapter/__tests__/ws-adapter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,26 @@ describe("WebSocketAdapter", () => {
});

describe("native P2P pregame transport", () => {
const nativeReconnectAdapter = () => new WebSocketAdapter(
"native-engine",
"join",
{ main_deck: [], sideboard: [] },
undefined,
undefined,
undefined,
"Guest",
{
nativePregame: {
kind: "reconnect",
socketFactory: () => new MockWebSocket("native-engine") as unknown as PhaseSocketTransport,
gameCode: "NATIVE",
playerId: 1,
playerToken: "guest-token",
fullKey: { game_code: "NATIVE", generation: 1 },
},
},
);

it("rejects a native seat attachment without a Full session key", async () => {
const nativeAdapter = new WebSocketAdapter(
"native-engine",
Expand Down Expand Up @@ -683,25 +703,7 @@ describe("WebSocketAdapter", () => {
});

it("reconnects a persisted native viewer with its expected seat", async () => {
const nativeAdapter = new WebSocketAdapter(
"native-engine",
"join",
{ main_deck: [], sideboard: [] },
undefined,
undefined,
undefined,
"Guest",
{
nativePregame: {
kind: "reconnect",
socketFactory: () => new MockWebSocket("native-engine") as unknown as PhaseSocketTransport,
gameCode: "NATIVE",
playerId: 1,
playerToken: "guest-token",
fullKey: { game_code: "NATIVE", generation: 1 },
},
},
);
const nativeAdapter = nativeReconnectAdapter();

const attached = nativeAdapter.initializePregame();
const nativeSocket = await completeHandshake(nativeAdapter);
Expand All @@ -719,7 +721,13 @@ describe("WebSocketAdapter", () => {
"message",
JSON.stringify({
type: "GameStarted",
data: { state_revision: 7, state: createMockState(), your_player: 1 },
data: {
state_revision: 7,
state: createMockState(),
your_player: 1,
player_token: "guest-token",
full_key: { game_code: "NATIVE", generation: 1 },
},
}),
);
await expect(attached).resolves.toEqual({
Expand All @@ -730,6 +738,221 @@ describe("WebSocketAdapter", () => {
});
});

it("rejects a hostile GameCreated before it can replace native reconnect credentials", async () => {
const nativeAdapter = nativeReconnectAdapter();
const listener = vi.fn();
nativeAdapter.onEvent(listener);
const attached = nativeAdapter.initializePregame();
const nativeSocket = await completeHandshake(nativeAdapter);
listener.mockClear();

nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "GameCreated",
data: {
game_code: "ATTACK",
player_token: "attacker-token",
full_key: { game_code: "ATTACK", generation: 9 },
},
}),
);

await expect(attached).rejects.toThrow("Native reconnect attached game ATTACK, expected NATIVE");
await expect(nativeAdapter.getSnapshot()).rejects.toThrow("No game state available");
nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "StateUpdate",
data: {
state_revision: 8,
state: createMockState(),
events: [],
},
}),
);
await expect(nativeAdapter.getSnapshot()).rejects.toThrow("No game state available");
expect(nativeAdapter.nativeSession).toEqual({
gameCode: "NATIVE",
playerId: 1,
playerToken: "guest-token",
fullKey: { game_code: "NATIVE", generation: 1 },
});
expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith(expect.objectContaining({ type: "error" }));
expect(nativeSocket.close).toHaveBeenCalledTimes(1);
});

it("rejects a hostile SessionAttached before it can settle native reconnect", async () => {
const nativeAdapter = nativeReconnectAdapter();
const listener = vi.fn();
nativeAdapter.onEvent(listener);
const attached = nativeAdapter.initializePregame();
const nativeSocket = await completeHandshake(nativeAdapter);
listener.mockClear();

nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "SessionAttached",
data: {
game_code: "NATIVE",
player_id: 1,
player_token: "attacker-token",
full_key: { game_code: "NATIVE", generation: 1 },
},
}),
);

await expect(attached).rejects.toThrow("Native reconnect changed the player token");
await expect(nativeAdapter.getSnapshot()).rejects.toThrow("No game state available");
expect(nativeAdapter.nativeSession).toEqual({
gameCode: "NATIVE",
playerId: 1,
playerToken: "guest-token",
fullKey: { game_code: "NATIVE", generation: 1 },
});
expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith(expect.objectContaining({ type: "error" }));
});

it("seeds a native reconnect before direct initialize attaches the socket", async () => {
const nativeAdapter = nativeReconnectAdapter();
const initialized = nativeAdapter.initialize();
const nativeSocket = await completeHandshake(nativeAdapter);

nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "GameStarted",
data: {
state_revision: 7,
state: createMockState(),
your_player: 1,
full_key: { game_code: "NATIVE", generation: 1 },
},
}),
);

await expect(initialized).resolves.toBeUndefined();
expect(nativeAdapter.nativeSession).toEqual({
gameCode: "NATIVE",
playerId: 1,
playerToken: "guest-token",
fullKey: { game_code: "NATIVE", generation: 1 },
});
});

it("rejects a native reconnect GameStarted for a different player before caching it", async () => {
const nativeAdapter = nativeReconnectAdapter();
const listener = vi.fn();
nativeAdapter.onEvent(listener);
const attached = nativeAdapter.initializePregame();
const nativeSocket = await completeHandshake(nativeAdapter);
listener.mockClear();

nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "GameStarted",
data: {
state_revision: 7,
state: createMockState(),
your_player: 0,
full_key: { game_code: "NATIVE", generation: 1 },
},
}),
);

await expect(attached).rejects.toThrow("Native reconnect attached player 0, expected 1");
await expect(nativeAdapter.getSnapshot()).rejects.toThrow("No game state available");
expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith(expect.objectContaining({ type: "error" }));
});

it("rejects a native reconnect GameStarted with a changed Full session key before caching it", async () => {
const nativeAdapter = nativeReconnectAdapter();
const listener = vi.fn();
nativeAdapter.onEvent(listener);
const attached = nativeAdapter.initializePregame();
const nativeSocket = await completeHandshake(nativeAdapter);
listener.mockClear();

nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "GameStarted",
data: {
state_revision: 7,
state: createMockState(),
your_player: 1,
full_key: { game_code: "NATIVE", generation: 2 },
},
}),
);

await expect(attached).rejects.toThrow("Server changed the Full session identity");
await expect(nativeAdapter.getSnapshot()).rejects.toThrow("No game state available");
expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith(expect.objectContaining({ type: "error" }));
});

it("rejects a native reconnect GameStarted without a Full session key before caching it", async () => {
const nativeAdapter = nativeReconnectAdapter();
const listener = vi.fn();
nativeAdapter.onEvent(listener);
const attached = nativeAdapter.initializePregame();
const nativeSocket = await completeHandshake(nativeAdapter);
listener.mockClear();

nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "GameStarted",
data: { state_revision: 7, state: createMockState(), your_player: 1 },
}),
);

await expect(attached).rejects.toThrow("Server omitted a valid Full session identity");
await expect(nativeAdapter.getSnapshot()).rejects.toThrow("No game state available");
expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith(expect.objectContaining({ type: "error" }));
});

it("rejects a native reconnect GameStarted token before caching or attaching", async () => {
const nativeAdapter = nativeReconnectAdapter();
const listener = vi.fn();
nativeAdapter.onEvent(listener);
const attached = nativeAdapter.initializePregame();
const nativeSocket = await completeHandshake(nativeAdapter);
listener.mockClear();

nativeSocket.dispatchSynthetic(
"message",
JSON.stringify({
type: "GameStarted",
data: {
state_revision: 7,
state: createMockState(),
your_player: 1,
player_token: "attacker-token",
full_key: { game_code: "NATIVE", generation: 1 },
},
}),
);

await expect(attached).rejects.toThrow("Native reconnect changed the player token");
await expect(nativeAdapter.getSnapshot()).rejects.toThrow("No game state available");
expect(nativeAdapter.nativeSession).toEqual({
gameCode: "NATIVE",
playerId: 1,
playerToken: "guest-token",
fullKey: { game_code: "NATIVE", generation: 1 },
});
expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith(expect.objectContaining({ type: "error" }));
});

it("rejects native pregame attachment when the server returns an error", async () => {
const nativeAdapter = new WebSocketAdapter(
"native-engine",
Expand Down
Loading
Loading