diff --git a/src/adapters/realtime/live-poll-handoff-coordinator.ts b/src/adapters/realtime/live-poll-handoff-coordinator.ts index dcaab261..ceb4e769 100644 --- a/src/adapters/realtime/live-poll-handoff-coordinator.ts +++ b/src/adapters/realtime/live-poll-handoff-coordinator.ts @@ -133,8 +133,6 @@ type InternalProbe = { facade: LiveProbeLease; readonly buffer: BufferedValue[]; bufferedBytes: number; - acceptedEvents: number; - acceptedBytes: number; }; type QuiescenceOutcome = "QUIESCED" | "TIMER_FAILED" | "TIMED_OUT"; @@ -225,8 +223,6 @@ export function createLivePollHandoffCoordinator( lease, buffer: [], bufferedBytes: 0, - acceptedEvents: 0, - acceptedBytes: 0, facade: null as unknown as LiveProbeLease, }; selected.facade = Object.freeze({ @@ -264,11 +260,11 @@ export function createLivePollHandoffCoordinator( value: Value, wireBytes: number, ): RealtimeResult { + // Bounded by what is still buffered: activation drains the buffer while + // the probe keeps receiving. if ( - selected.acceptedEvents + 1 > - limits.maxProbeBufferedEvents || - selected.acceptedBytes + wireBytes > - limits.maxProbeBufferedBytes + selected.buffer.length + 1 > limits.maxProbeBufferedEvents || + selected.bufferedBytes + wireBytes > limits.maxProbeBufferedBytes ) { if (transitioning) { failClosed(); @@ -283,8 +279,6 @@ export function createLivePollHandoffCoordinator( } selected.buffer.push(Object.freeze({ value, wireBytes })); selected.bufferedBytes += wireBytes; - selected.acceptedEvents += 1; - selected.acceptedBytes += wireBytes; return realtimeSuccess( Object.freeze({ kind: "BUFFERED" as const, diff --git a/tests/unit/realtime/live-poll-handoff-coordinator.test.ts b/tests/unit/realtime/live-poll-handoff-coordinator.test.ts index c60d77ff..f3c1f9c5 100644 --- a/tests/unit/realtime/live-poll-handoff-coordinator.test.ts +++ b/tests/unit/realtime/live-poll-handoff-coordinator.test.ts @@ -426,6 +426,41 @@ describe("live/poll authoritative writer handoff", () => { }); }); + it("bounds the probe by what is still buffered, not by all it ever accepted", async () => { + const firstLive = deferred>(); + const order: string[] = []; + const harness = createHarness({ + initial: "POLL", + limits: { ...limits, maxProbeBufferedEvents: 2 }, + apply: vi.fn(async ({ value }) => { + order.push(value); + if (value === "live-1") await firstLive.promise; + return realtimeSuccess(undefined); + }), + }); + const live = expectProbe(harness.coordinator.beginLiveProbe()); + await live.write("live-1", 3); + await live.write("live-2", 3); + + const activation = live.activate(); + // live-1 left the buffer for the drain, so one slot is free again. + await vi.waitFor(() => expect(order).toEqual(["live-1"])); + await expect(live.write("live-3", 3)).resolves.toMatchObject({ + ok: true, + value: { kind: "BUFFERED" }, + }); + await expect(live.write("live-4", 3)).resolves.toMatchObject({ + ok: false, + error: { kind: "QUEUE_OVERFLOW" }, + }); + + // Overflow during activation still fails closed. + firstLive.resolve(realtimeSuccess(undefined)); + await expect(activation).resolves.toMatchObject({ ok: false }); + expect(harness.coordinator.inspect().state).toBe("CLOSED"); + expect(order).toEqual(["live-1"]); + }); + it("drops an overflowing probe without displacing poll and never reuses its generation", async () => { const harness = createHarness({ initial: "POLL",