From e6e71c79243bb4d92abae3301d7eb50736763771 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Sun, 25 Oct 2026 15:11:30 -0700 Subject: [PATCH] fix(json): resync snapshots after legacy missing groups Treat NotFound from a failed group read as a gap, as older Lite SUBSCRIBE_DROP reports it. Keep terminal track refusals and malformed JSON fatal. Co-Authored-By: GPT-6 --- js/json/src/snapshot/consumer.loss.test.ts | 56 ++++++++++++++++++++++ js/json/src/snapshot/consumer.ts | 3 ++ 2 files changed, 59 insertions(+) create mode 100644 js/json/src/snapshot/consumer.loss.test.ts diff --git a/js/json/src/snapshot/consumer.loss.test.ts b/js/json/src/snapshot/consumer.loss.test.ts new file mode 100644 index 00000000000..dc816d8e6f1 --- /dev/null +++ b/js/json/src/snapshot/consumer.loss.test.ts @@ -0,0 +1,56 @@ +import { expect, test } from "bun:test"; +import { Error as NetError, StreamCode, Track } from "@moq/net"; +import { Consumer } from "./consumer.ts"; + +const frame = (json: string) => ({ + payload: new TextEncoder().encode(json), +}); + +for (const method of ["next", "latest"] as const) { + test(`snapshot ${method} resumes after an established group is missing`, async () => { + const track = new Track.Producer("catalog.json"); + const consumer = new Consumer<{ value: number }>({ track: track.subscribe() }); + const first = track.appendGroup(); + first.writeFrame(frame('{"value":1}')); + expect((await consumer[method]())?.value).toEqual({ value: 1 }); + + const pending = consumer[method](); + // Before lite-07, SUBSCRIBE_DROP reports a missing group as NotFound. + first.close(new NetError.Stream(StreamCode.NotFound, { message: "dropped" })); + const replacement = track.appendGroup(); + replacement.writeFrame(frame('{"value":2}')); + replacement.close(); + track.close(); + + expect((await pending)?.value).toEqual({ value: 2 }); + }); + + for (const established of [false, true]) { + test(`snapshot ${method} reports terminal track NotFound (${established ? "established" : "missing"})`, async () => { + const track = new Track.Producer("catalog.json"); + const consumer = new Consumer<{ value: number }>({ track: track.subscribe() }); + if (established) { + track.appendGroup().writeFrame(frame('{"value":1}')); + expect((await consumer[method]())?.value).toEqual({ value: 1 }); + } + + const pending = consumer[method](); + const failure = new NetError.Stream(StreamCode.NotFound); + track.close(failure); + await expect(pending).rejects.toBe(failure); + }); + } + + test(`snapshot ${method} refuses malformed JSON after a good value`, async () => { + const track = new Track.Producer("catalog.json"); + const consumer = new Consumer<{ value: number }>({ track: track.subscribe() }); + const group = track.appendGroup(); + group.writeFrame(frame('{"value":1}')); + expect((await consumer[method]())?.value).toEqual({ value: 1 }); + + group.writeFrame(frame('{"value":')); + group.close(); + track.close(); + await expect(consumer[method]()).rejects.toBeInstanceOf(SyntaxError); + }); +} diff --git a/js/json/src/snapshot/consumer.ts b/js/json/src/snapshot/consumer.ts index 240508c214b..303fedaf30c 100644 --- a/js/json/src/snapshot/consumer.ts +++ b/js/json/src/snapshot/consumer.ts @@ -5,6 +5,9 @@ import { Decoder } from "./decoder.ts"; import type { Config as CodecConfig } from "./encoder.ts"; const GAPS: Moq.StreamCode[] = [ + // Before lite-07, SUBSCRIBE_DROP reports a missing group as NotFound. + // This only handles a failed group read; a track refusal still propagates. + Moq.StreamCode.NotFound, Moq.StreamCode.TooFarBehind, Moq.StreamCode.Old, Moq.StreamCode.Evicted,