@spooky-sync/core 0.0.1-canary.246 → 0.0.1-canary.248

package/dist/index.js

@@ -1073,8 +1073,8 @@ function selfAllowlistedVariant(flag, userId) {
 
 //#endregion
 //#region src/modules/devtools/index.ts
-const CORE_VERSION = "0.0.1-canary.246";
-const WASM_VERSION = "0.0.1-canary.246";
+const CORE_VERSION = "0.0.1-canary.248";
+const WASM_VERSION = "0.0.1-canary.248";
 const SURREAL_VERSION = "3.0.3";
 var DevToolsService = class DevToolsService {
 	eventsHistory = [];
@@ -5098,9 +5098,16 @@ function* liveInvalidate() {
 }
 /** One or more edges of these queries changed on the server. */
 function* liveChange(env, hashes, rows) {
-	const [known, role] = yield fx.state.read((s) => [hashes.filter((h) => s.queries.has(h)), s.tabRole]);
+	const [known, role, streak] = yield fx.state.read((s) => [
+		hashes.filter((h) => s.queries.has(h)),
+		s.tabRole,
+		s.sync.pollIdleStreak
+	]);
 	if (known.length === 0) return;
-	yield fx.state.update(patchSync({ pollIdleStreak: 0 }));
+	if (streak > 0) {
+		yield fx.state.update(patchSync({ pollIdleStreak: 0 }));
+		yield fx.timer.set("poll", env.pollBaseMs, { type: "PollTick" });
+	}
 	if (rows && rows.length > 0) yield* landInlineRows(env, rows);
 	yield* markMembershipDirty(known);
 	if (role === "leader") yield fx.emit({
@@ -12509,7 +12516,7 @@ function createTabsCoordinator(config, s, host) {
 	return new TabsCoordinator({
 		tabId: s.tabId,
 		fingerprint: computeTabsFingerprint({
-			coreVersion: "0.0.1-canary.246",
+			coreVersion: "0.0.1-canary.248",
 			schemaHash: hash53(config.schemaSurql),
 			endpoint: config.database.endpoint ?? "",
 			namespace: config.database.namespace,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spooky-sync/core",
-  "version": "0.0.1-canary.246",
+  "version": "0.0.1-canary.248",
   "type": "module",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -63,8 +63,8 @@
     }
   },
   "dependencies": {
-    "@spooky-sync/query-builder": "0.0.1-canary.246",
-    "@spooky-sync/ssp-wasm": "0.0.1-canary.246",
+    "@spooky-sync/query-builder": "0.0.1-canary.248",
+    "@spooky-sync/ssp-wasm": "0.0.1-canary.248",
     "@sqlite.org/sqlite-wasm": "3.53.0-build1",
     "@surrealdb/wasm": "^3.0.3",
     "blurhash": "^2.0.5",

package/src/sync/live.saga.test.ts

@@ -68,6 +68,28 @@ describe('liveChange', () => {
     const none = await runPure(liveChange(env, ['zz']), { state: s });
     expect(none.timers.size).toBe(0);
   });
+
+  it('pulls a backed-off poll back to the base cadence, and leaves an already-base one alone', async () => {
+    const entry = buildEntry({ def: { hash: 'a' } });
+    // Coasted up to the cap: the armed timer is the reason a change the poll
+    // has to catch could wait 5s, so the event has to re-arm it, not just zero
+    // the streak the next tick would read.
+    const backedOff = R.patchSync({ pollIdleStreak: 4 })(buildState([entry]));
+    const out = await runPure(liveChange(env, ['a']), { state: backedOff });
+    expect(out.timers.get('poll')).toEqual({ ms: env.pollBaseMs, event: { type: 'PollTick' } });
+
+    // Already at base: re-arming here would push the poll out by another
+    // `pollBaseMs` on every notification and starve it under sustained LIVE.
+    const atBase = R.patchSync({ pollIdleStreak: 0 })(buildState([entry]));
+    const quiet = await runPure(liveChange(env, ['a']), { state: atBase });
+    expect(quiet.timers.has('poll')).toBe(false);
+    expect(quiet.state.membershipDirty.has('a')).toBe(true);
+
+    // An unknown hash is not activity: nothing is touched.
+    const unknown = await runPure(liveChange(env, ['zz']), { state: backedOff });
+    expect(unknown.timers.has('poll')).toBe(false);
+    expect(unknown.state.sync.pollIdleStreak).toBe(4);
+  });
 });
 
 describe('rowOfEdge', () => {
@@ -120,6 +142,25 @@ describe('liveChange with the body joined on', () => {
     expect([...out.state.membershipDirty]).toEqual(['a']);
   });
 
+  it('leaves a failed inline body for the fetch path without advancing its version', async () => {
+    const s = buildState([buildEntry({ def: { hash: 'a' } })]);
+    const out = await runPure(liveChange(env, ['a'], [row(7)]), {
+      state: s,
+      handlers: {
+        'local.execute': () => { throw new Error('stale local epoch'); },
+      },
+    });
+    expect(out.state.versions.has('game:g1')).toBe(false);
+    expect([...out.state.membershipDirty]).toEqual(['a']);
+    expect(out.log.filter((e) => e.kind === 'ssp.ingest')).toHaveLength(0);
+    expect(out.emitted).toContainEqual({
+      type: 'log',
+      level: 'debug',
+      message: 'inline live body not landed; the fetch path will pull it',
+      data: { ids: ['game:g1'] },
+    });
+  });
+
   it('writes one copy when the same row arrives for several views', async () => {
     const s = buildState([buildEntry({ def: { hash: 'a' } })]);
     const out = await runPure(liveChange(env, ['a'], [row(7), row(7), row(8)]), { state: s, handlers });

package/src/sync/live.saga.ts

@@ -47,9 +47,29 @@ export function* liveInvalidate(): Saga<void> {
 
 /** One or more edges of these queries changed on the server. */
 export function* liveChange(env: SagaEnv, hashes: QueryHash[], rows?: InlineRow[]): Saga<void> {
-  const [known, role] = (yield fx.state.read((s) => [hashes.filter((h) => s.queries.has(h)), s.tabRole])) as [QueryHash[], ClientState['tabRole']];
+  const [known, role, streak] = (yield fx.state.read((s) => [hashes.filter((h) => s.queries.has(h)), s.tabRole, s.sync.pollIdleStreak])) as [
+    QueryHash[],
+    ClientState['tabRole'],
+    number,
+  ];
   if (known.length === 0) return;
-  yield fx.state.update(R.patchSync({ pollIdleStreak: 0 }));
+  // Zeroing the streak only decides the delay the NEXT tick picks: `pollTick`
+  // arms its timer at the end of a tick, so a page that had coasted up to the
+  // 5s cap still waited out that armed timer. When the poll is the thing that
+  // catches a change (a notification the server dropped, a row LIVE never
+  // carried) that made the worst case 5s even though LIVE had just proved the
+  // page was active. Re-arm at the base cadence too, so the safety net is back
+  // under us immediately.
+  //
+  // Only when the poll had actually backed off. A `set` on the same key
+  // replaces the pending timer, so re-arming on every event while LIVE is
+  // delivering faster than `pollBaseMs` would push the poll out forever and
+  // starve the full-membership reconciliation it exists to provide. A streak
+  // of 0 means the cadence is already base and there is nothing to correct.
+  if (streak > 0) {
+    yield fx.state.update(R.patchSync({ pollIdleStreak: 0 }));
+    yield fx.timer.set('poll', env.pollBaseMs, { type: 'PollTick' });
+  }
   // Before marking membership dirty: recording the version here is what makes
   // the re-read's `planFetch` find nothing left to pull for this row.
   if (rows && rows.length > 0) yield* landInlineRows(env, rows);