on-zero 0.6.2 → 0.6.4

package/dist/esm/helpers/recoverZeroClient.native.js

@@ -1,28 +1,101 @@
+function _instanceof(left, right) {
+  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+    return !!right[Symbol.hasInstance](left);
+  } else {
+    return left instanceof right;
+  }
+}
 function _type_of(obj) {
   "@swc/helpers - typeof";
 
   return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 var RECOVER_GUARD_MS = 6e4;
+var RELOAD_LATCH_TIMEOUT_MS = 15e3;
 var LOCAL_STORE_LOST = "Expected IndexedDB not found";
+var SQLITE_ERROR_NAME = "SqliteError";
+var SQLITE_STATEMENT_FINALIZED = "This statement has been finalized";
+var STORE_CLOSED = "Store is closed";
+var STORE_CLOSED_REPEAT_MIN_MS = 2e3;
+var STORE_CLOSED_REPEAT_MAX_MS = 6e4;
 var reloadScheduled = false;
+var reloadInProgress = false;
+var reloadLatchTimer;
 var pendingDeletes = [];
-function recoveryGuardOpen(reasonKey) {
+var inMemoryGuard = /* @__PURE__ */new Map();
+function defaultGuardStorage() {
   try {
-    var key = `on-zero-recover-${reasonKey}`;
-    var last = Number(window.sessionStorage.getItem(key) || 0);
-    if (Date.now() - last < RECOVER_GUARD_MS) return false;
-    window.sessionStorage.setItem(key, String(Date.now()));
-  } catch (e) {}
+    if (typeof window === "undefined" || !window.sessionStorage) return void 0;
+    return window.sessionStorage;
+  } catch (e) {
+    return void 0;
+  }
+}
+function recoveryGuardOpen(reasonKey, guardStorage) {
+  var key = `on-zero-recover-${reasonKey}`;
+  var now = Date.now();
+  var _inMemoryGuard_get;
+  var memLast = (_inMemoryGuard_get = inMemoryGuard.get(key)) !== null && _inMemoryGuard_get !== void 0 ? _inMemoryGuard_get : 0;
+  if (memLast > 0 && now - memLast < RECOVER_GUARD_MS) return false;
+  var storage = guardStorage !== null && guardStorage !== void 0 ? guardStorage : defaultGuardStorage();
+  if (storage) {
+    try {
+      var rawLast = storage.getItem(key);
+      var last = rawLast ? Number(rawLast) : 0;
+      if (last > 0 && now - last < RECOVER_GUARD_MS) return false;
+      storage.setItem(key, String(now));
+    } catch (e) {}
+  }
+  inMemoryGuard.set(key, now);
   return true;
 }
+var lastStoreClosedAtMs = 0;
+function armReloadLatchTimeout() {
+  if (typeof setTimeout !== "function") return;
+  if (reloadLatchTimer) clearTimeout(reloadLatchTimer);
+  reloadLatchTimer = setTimeout(function () {
+    reloadLatchTimer = void 0;
+    reloadScheduled = false;
+  }, RELOAD_LATCH_TIMEOUT_MS);
+  if (reloadLatchTimer && (typeof reloadLatchTimer === "undefined" ? "undefined" : _type_of(reloadLatchTimer)) === "object" && "unref" in reloadLatchTimer) {
+    reloadLatchTimer.unref();
+  }
+}
+function disarmReloadLatchTimeout() {
+  if (reloadLatchTimer) {
+    clearTimeout(reloadLatchTimer);
+    reloadLatchTimer = void 0;
+  }
+}
+function performReload(deps) {
+  if (reloadInProgress) return Promise.resolve();
+  reloadInProgress = true;
+  disarmReloadLatchTimeout();
+  var _deps_reload;
+  var doReload = (_deps_reload = deps.reload) !== null && _deps_reload !== void 0 ? _deps_reload : function () {
+    var _globalThis_location_reload, _globalThis_location;
+    return (_globalThis_location = globalThis.location) === null || _globalThis_location === void 0 ? void 0 : (_globalThis_location_reload = _globalThis_location.reload) === null || _globalThis_location_reload === void 0 ? void 0 : _globalThis_location_reload.call(_globalThis_location);
+  };
+  return Promise.resolve().then(function () {
+    return Promise.allSettled(pendingDeletes.splice(0).map(function (run) {
+      return run();
+    }));
+  }).then(function () {
+    var _deps_beforeReload;
+    return (_deps_beforeReload = deps.beforeReload) === null || _deps_beforeReload === void 0 ? void 0 : _deps_beforeReload.call(deps);
+  }).catch(function () {}).then(function () {
+    doReload();
+  });
+}
 function recover(deps, reasonKey, message, dropLocalState) {
   if (typeof window === "undefined") return;
   if (dropLocalState) {
-    pendingDeletes.push(Promise.resolve().then(deps.deleteLocalState).catch(function () {}));
+    pendingDeletes.push(function () {
+      return Promise.resolve().then(deps.deleteLocalState);
+    });
   }
   if (reloadScheduled) return;
-  if (!recoveryGuardOpen(reasonKey)) {
+  if (!recoveryGuardOpen(reasonKey, deps.guardStorage)) {
     console.error(`[on-zero] ${message} \u2014 already recovered once, not reloading`);
     deps.zeroEvents.emit({
       type: "fatal",
@@ -31,22 +104,25 @@ function recover(deps, reasonKey, message, dropLocalState) {
     return;
   }
   reloadScheduled = true;
+  armReloadLatchTimeout();
   console.warn(`[on-zero] ${message} \u2014 recovering`);
   deps.zeroEvents.emit({
     type: "recovering",
     reason: message
   });
-  var _deps_reload;
-  var doReload = (_deps_reload = deps.reload) !== null && _deps_reload !== void 0 ? _deps_reload : function () {
-    var _globalThis_location_reload, _globalThis_location;
-    return (_globalThis_location = globalThis.location) === null || _globalThis_location === void 0 ? void 0 : (_globalThis_location_reload = _globalThis_location.reload) === null || _globalThis_location_reload === void 0 ? void 0 : _globalThis_location_reload.call(_globalThis_location);
+  var runReload = function () {
+    return performReload(deps);
   };
-  Promise.resolve().then(function () {
-    return Promise.allSettled(pendingDeletes);
-  }).then(function () {
-    var _deps_beforeReload;
-    return (_deps_beforeReload = deps.beforeReload) === null || _deps_beforeReload === void 0 ? void 0 : _deps_beforeReload.call(deps);
-  }).catch(function () {}).finally(doReload);
+  if (deps.scheduleReload) {
+    deps.scheduleReload({
+      reason: message,
+      reasonKey,
+      dropLocalState,
+      performReload: runReload
+    });
+  } else {
+    void runReload();
+  }
 }
 function makeZeroRecovery(deps) {
   return {
@@ -70,6 +146,114 @@ function logToConsole(level, context) {
   var method = level === "debug" ? "debug" : level;
   console[method](...(prefix ? [prefix] : []), ...args);
 }
+function logArgText(arg) {
+  if (typeof arg === "string") return arg;
+  if (_instanceof(arg, Error)) return `${arg.name} ${arg.message} ${arg.stack || ""}`;
+  if (arg && (typeof arg === "undefined" ? "undefined" : _type_of(arg)) === "object") {
+    var message = "message" in arg ? arg.message : void 0;
+    var name = "name" in arg ? arg.name : void 0;
+    if (typeof message === "string") return `${typeof name === "string" ? name : ""} ${message}`;
+  }
+  return "";
+}
+function isBenignStoreClosedLog(text) {
+  if (/Mutator\s+".*"\s+error on server/i.test(text)) return true;
+  if (/Mutator\s+".*"\s+app error on client/i.test(text)) return true;
+  return false;
+}
+function classifyMutationDesync(text) {
+  if (text.includes("sent mutation ID") && text.includes("but expected")) {
+    return {
+      reason: "mutation-desync",
+      reasonKey: "mutation-desync",
+      message: "mutation id desync"
+    };
+  }
+  if (text.includes("oooMutation") || text.includes("Server reported an out-of-order mutation")) {
+    return {
+      reason: "mutation-desync",
+      reasonKey: "mutation-desync",
+      message: "out-of-order mutation"
+    };
+  }
+  if (text.includes("already processed")) {
+    return {
+      reason: "mutation-desync",
+      reasonKey: "mutation-desync",
+      message: "mutation already processed"
+    };
+  }
+  if (text.includes("InvalidConnectionRequestLastMutationID")) {
+    return {
+      reason: "mutation-desync",
+      reasonKey: "mutation-desync",
+      message: "invalid connection last mutation id"
+    };
+  }
+  if (text.includes("InvalidConnectionRequestBaseCookie")) {
+    return {
+      reason: "connection-cookie-invalid",
+      reasonKey: "connection-cookie-invalid",
+      message: "invalid connection base cookie"
+    };
+  }
+  if (text.includes("ClientNotFound") || text.includes("Client not found")) {
+    return {
+      reason: "client-not-found",
+      reasonKey: "client-not-found",
+      message: "client not found"
+    };
+  }
+  if (text.includes("connection userID mismatch")) {
+    return {
+      reason: "connection-userid-mismatch",
+      reasonKey: "connection-userid-mismatch",
+      message: "connection user id mismatch"
+    };
+  }
+  return void 0;
+}
+function classifyZeroRecoveryLog(level, args) {
+  var nowMs = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : Date.now();
+  if (level !== "error") return void 0;
+  var text = args.map(logArgText).join(" ");
+  if (text.includes(LOCAL_STORE_LOST)) {
+    return {
+      reason: "indexeddb-not-found",
+      reasonKey: "local-store",
+      message: "local store lost",
+      dropLocalState: true
+    };
+  }
+  if (text.includes(SQLITE_ERROR_NAME) && text.includes(SQLITE_STATEMENT_FINALIZED)) {
+    return {
+      reason: "sqlite-statement-finalized",
+      reasonKey: "sqlite-statement-finalized",
+      message: "sqlite statement finalized",
+      dropLocalState: true
+    };
+  }
+  var desync = classifyMutationDesync(text);
+  if (desync) {
+    return {
+      ...desync,
+      dropLocalState: true
+    };
+  }
+  if (text.includes(STORE_CLOSED) && !isBenignStoreClosedLog(text)) {
+    var prevMs = lastStoreClosedAtMs;
+    lastStoreClosedAtMs = nowMs;
+    if (prevMs > 0 && nowMs - prevMs >= STORE_CLOSED_REPEAT_MIN_MS && nowMs - prevMs <= STORE_CLOSED_REPEAT_MAX_MS) {
+      return {
+        reason: "store-closed-repeat",
+        reasonKey: "store-closed-repeat",
+        message: "local store closed repeatedly",
+        dropLocalState: true
+      };
+    }
+  }
+  return void 0;
+}
 function composeRecoveryLogSink(deps, consumerLogSink) {
   var consumerFlush = consumerLogSink === null || consumerLogSink === void 0 ? void 0 : consumerLogSink.flush;
   return {
@@ -78,13 +262,13 @@ function composeRecoveryLogSink(deps, consumerLogSink) {
         args[_key - 2] = arguments[_key];
       }
       if (consumerLogSink) consumerLogSink.log(level, context, ...args);else logToConsole(level, context, ...args);
-      if (level !== "error") return;
-      var text = args.map(function (arg) {
-        return typeof arg === "string" ? arg : arg && (typeof arg === "undefined" ? "undefined" : _type_of(arg)) === "object" && "message" in arg ? String(arg.message) : "";
-      }).join(" ");
-      if (text.includes(LOCAL_STORE_LOST)) {
-        recover(deps, "local-store", "local store lost", true);
+      var recovery = classifyZeroRecoveryLog(level, args);
+      if (!recovery) return;
+      if (deps.benignLogFilter) {
+        var text = args.map(logArgText).join(" ");
+        if (deps.benignLogFilter(text)) return;
       }
+      recover(deps, recovery.reasonKey, recovery.message, recovery.dropLocalState);
     },
     // call through the consumer sink so a class-based sink keeps its `this`,
     // rather than handing Zero a detached method reference.
@@ -93,9 +277,19 @@ function composeRecoveryLogSink(deps, consumerLogSink) {
     } : void 0
   };
 }
+function isRecoverableZeroStalePokeMessage(message) {
+  return message.includes("Server returned unexpected base cookie during sync") || message.includes("Received cookie") && message.includes("is < than last snapshot cookie") && message.includes("ignoring client view");
+}
 function resetRecoveryStateForTests() {
   reloadScheduled = false;
+  reloadInProgress = false;
+  if (reloadLatchTimer) {
+    clearTimeout(reloadLatchTimer);
+    reloadLatchTimer = void 0;
+  }
   pendingDeletes.length = 0;
+  lastStoreClosedAtMs = 0;
+  inMemoryGuard.clear();
 }
-export { composeRecoveryLogSink, makeZeroRecovery, resetRecoveryStateForTests };
+export { classifyZeroRecoveryLog, composeRecoveryLogSink, isRecoverableZeroStalePokeMessage, makeZeroRecovery, resetRecoveryStateForTests };
 //# sourceMappingURL=recoverZeroClient.native.js.map

package/dist/esm/helpers/recoverZeroClient.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["_type_of","obj","Symbol","constructor","RECOVER_GUARD_MS","LOCAL_STORE_LOST","reloadScheduled","pendingDeletes","recoveryGuardOpen","reasonKey","key","last","Number","window","sessionStorage","getItem","Date","now","setItem","String","e","recover","deps","message","dropLocalState","push","Promise","resolve","then","deleteLocalState","catch","console","error","zeroEvents","emit","type","reason","warn","_deps_reload","doReload","reload","_globalThis_location_reload","_globalThis_location","globalThis","location","call","allSettled","_deps_beforeReload","beforeReload","finally","makeZeroRecovery","onUpdateNeeded","onClientStateNotFound","logToConsole","level","context","_len","arguments","length","args","Array","_key","prefix","Object","entries","map","param","value","join","method","composeRecoveryLogSink","consumerLogSink","consumerFlush","flush"],"sources":["../../../src/helpers/recoverZeroClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_instanceof","left","right","Symbol","hasInstance","_type_of","obj","constructor","RECOVER_GUARD_MS","RELOAD_LATCH_TIMEOUT_MS","LOCAL_STORE_LOST","SQLITE_ERROR_NAME","SQLITE_STATEMENT_FINALIZED","STORE_CLOSED","STORE_CLOSED_REPEAT_MIN_MS","STORE_CLOSED_REPEAT_MAX_MS","reloadScheduled","reloadInProgress","reloadLatchTimer","pendingDeletes","inMemoryGuard","Map","defaultGuardStorage","window","sessionStorage","e","recoveryGuardOpen","reasonKey","guardStorage","key","now","Date","_inMemoryGuard_get","memLast","get","storage","rawLast","getItem","last","Number","setItem","String","set","lastStoreClosedAtMs","armReloadLatchTimeout","setTimeout","clearTimeout","unref","disarmReloadLatchTimeout","performReload","deps","Promise","resolve","_deps_reload","doReload","reload","_globalThis_location_reload","_globalThis_location","globalThis","location","call","then","allSettled","splice","map","run","_deps_beforeReload","beforeReload","catch","recover","message","dropLocalState","push","deleteLocalState","console","error","zeroEvents","emit","type","reason","warn","runReload","scheduleReload","makeZeroRecovery","onUpdateNeeded","onClientStateNotFound","logToConsole","level","context","_len","arguments","length","args","Array","_key","prefix","Object","entries","param","value","join","method","logArgText","arg","Error","name","stack","isBenignStoreClosedLog","text","test","classifyMutationDesync","includes","classifyZeroRecoveryLog","nowMs","desync","prevMs"],"sources":["../../../src/helpers/recoverZeroClient.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/helpers/recoverZeroClient.test.mjs

@@ -1,7 +1,7 @@
 import { createEmitter } from "@take-out/helpers";
 import { UpdateNeededReasonType } from "@rocicorp/zero";
 import { beforeEach, describe, expect, test, vi } from "vitest";
-import { composeRecoveryLogSink, makeZeroRecovery, resetRecoveryStateForTests } from "./recoverZeroClient.mjs";
+import { classifyZeroRecoveryLog, composeRecoveryLogSink, isRecoverableZeroStalePokeMessage, makeZeroRecovery, resetRecoveryStateForTests } from "./recoverZeroClient.mjs";
 let emitterSeq = 0;
 function setup() {
   const events = [];
@@ -150,6 +150,45 @@ describe("zero recovery", () => {
     expect(deleteLocalState).toHaveBeenCalledTimes(1);
     expect(reload).toHaveBeenCalledTimes(1);
   });
+  test("logSink recovers on native sqlite finalized-statement local-store loss", async () => {
+    const {
+      deps,
+      deleteLocalState,
+      reload
+    } = setup();
+    const sqliteError = new Error("This statement has been finalized");
+    sqliteError.name = "SqliteError";
+    const sink = composeRecoveryLogSink(deps);
+    sink.log("error", {
+      bgIntervalProcess: "Heartbeat"
+    }, "Error running.", sqliteError);
+    await flush();
+    expect(deleteLocalState).toHaveBeenCalledTimes(1);
+    expect(reload).toHaveBeenCalledTimes(1);
+  });
+  test("logSink recovers on repeated store-closed local-store loss", async () => {
+    const nowSpy = vi.spyOn(Date, "now");
+    const {
+      deps,
+      deleteLocalState,
+      reload
+    } = setup();
+    try {
+      const sink = composeRecoveryLogSink(deps);
+      nowSpy.mockReturnValue(1e4);
+      sink.log("error", void 0, "Failed to connect.", new Error("Store is closed"));
+      await flush();
+      expect(deleteLocalState).not.toHaveBeenCalled();
+      expect(reload).not.toHaveBeenCalled();
+      nowSpy.mockReturnValue(13e3);
+      sink.log("error", void 0, "Failed to connect.", new Error("Store is closed"));
+      await flush();
+      expect(deleteLocalState).toHaveBeenCalledTimes(1);
+      expect(reload).toHaveBeenCalledTimes(1);
+    } finally {
+      nowSpy.mockRestore();
+    }
+  });
   test("logSink with no consumer preserves console output and still watches", async () => {
     const {
       deps,
@@ -198,6 +237,27 @@ describe("zero recovery", () => {
     expect(deleteLocalState).not.toHaveBeenCalled();
     expect(reload).not.toHaveBeenCalled();
   });
+  test("recovery log classification is narrow", () => {
+    const sqliteError = new Error("This statement has been finalized");
+    sqliteError.name = "SqliteError";
+    expect(classifyZeroRecoveryLog("error", ["Error running.", sqliteError])).toMatchObject({
+      reason: "sqlite-statement-finalized",
+      dropLocalState: true
+    });
+    expect(classifyZeroRecoveryLog("error", [{
+      name: "SqliteError",
+      message: "database is locked"
+    }])).toBeUndefined();
+    expect(classifyZeroRecoveryLog("warn", ["Expected IndexedDB not found"])).toBeUndefined();
+    expect(classifyZeroRecoveryLog("error", ["Store is closed"], 1e4)).toBeUndefined();
+    expect(classifyZeroRecoveryLog("error", ["Store is closed"], 11e3)).toBeUndefined();
+    expect(classifyZeroRecoveryLog("error", ["Store is closed"], 14e3)).toMatchObject({
+      reason: "store-closed-repeat",
+      dropLocalState: true
+    });
+    resetRecoveryStateForTests();
+    expect(classifyZeroRecoveryLog("error", ['Mutator "send" error on server', "Store is closed"], 2e4)).toBeUndefined();
+  });
   test("default reload path is a safe no-op when location is absent", async () => {
     const events = [];
     const zeroEvents = createEmitter(`test-recover-${emitterSeq++}`, null);
@@ -229,5 +289,186 @@ describe("zero recovery", () => {
       reason: "client state not found"
     });
   });
+  test("scheduleReload defers the reload AND the store delete until performReload runs", async () => {
+    const {
+      deps,
+      deleteLocalState,
+      reload
+    } = setup();
+    let captured;
+    deps.scheduleReload = ctx => {
+      captured = ctx;
+    };
+    makeZeroRecovery(deps).onClientStateNotFound();
+    await flush();
+    expect(reload).not.toHaveBeenCalled();
+    expect(deleteLocalState).not.toHaveBeenCalled();
+    expect(captured).toMatchObject({
+      reasonKey: "client-state-not-found",
+      dropLocalState: true
+    });
+    await captured.performReload();
+    await flush();
+    expect(deleteLocalState).toHaveBeenCalledTimes(1);
+    expect(reload).toHaveBeenCalledTimes(1);
+  });
+  test("scheduleReload that reloads directly skips the delete and beforeReload", async () => {
+    const {
+      deps,
+      deleteLocalState,
+      reload
+    } = setup();
+    const nativeReload = vi.fn();
+    const beforeReload = vi.fn(async () => {});
+    deps.beforeReload = beforeReload;
+    deps.scheduleReload = () => {
+      nativeReload();
+    };
+    makeZeroRecovery(deps).onClientStateNotFound();
+    await flush();
+    expect(nativeReload).toHaveBeenCalledTimes(1);
+    expect(deleteLocalState).not.toHaveBeenCalled();
+    expect(beforeReload).not.toHaveBeenCalled();
+    expect(reload).not.toHaveBeenCalled();
+  });
+  test("scheduleReload performReload is idempotent (one reload even if called twice)", async () => {
+    const {
+      deps,
+      deleteLocalState,
+      reload
+    } = setup();
+    let captured;
+    deps.scheduleReload = ctx => {
+      captured = ctx;
+    };
+    makeZeroRecovery(deps).onClientStateNotFound();
+    await flush();
+    await captured.performReload();
+    await captured.performReload();
+    await flush();
+    expect(deleteLocalState).toHaveBeenCalledTimes(1);
+    expect(reload).toHaveBeenCalledTimes(1);
+  });
+  test("scheduleReload deferred PAST the latch timeout still deletes and reloads exactly once", async () => {
+    vi.useFakeTimers();
+    try {
+      const {
+        deps,
+        deleteLocalState,
+        reload
+      } = setup();
+      let captured;
+      deps.scheduleReload = ctx => {
+        captured = ctx;
+      };
+      makeZeroRecovery(deps).onClientStateNotFound();
+      expect(captured).toBeDefined();
+      await vi.advanceTimersByTimeAsync(2e4);
+      expect(deleteLocalState).not.toHaveBeenCalled();
+      expect(reload).not.toHaveBeenCalled();
+      await captured.performReload();
+      expect(deleteLocalState).toHaveBeenCalledTimes(1);
+      expect(reload).toHaveBeenCalledTimes(1);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+  test("a slow beforeReload holds the latch through the timeout window (no double reload)", async () => {
+    vi.useFakeTimers();
+    try {
+      const {
+        deps,
+        reload
+      } = setup();
+      let releaseBeforeReload = () => {};
+      deps.beforeReload = () => new Promise(resolve => {
+        releaseBeforeReload = resolve;
+      });
+      const recovery = makeZeroRecovery(deps);
+      recovery.onClientStateNotFound();
+      await vi.advanceTimersByTimeAsync(2e4);
+      recovery.onClientStateNotFound();
+      await vi.advanceTimersByTimeAsync(0);
+      expect(reload).not.toHaveBeenCalled();
+      releaseBeforeReload();
+      await vi.advanceTimersByTimeAsync(0);
+      expect(reload).toHaveBeenCalledTimes(1);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+  test("injectable guardStorage gives cross-reload loop protection (Hermes has no sessionStorage)", async () => {
+    const store = /* @__PURE__ */new Map();
+    const {
+      deps,
+      reload,
+      events
+    } = setup();
+    deps.guardStorage = {
+      getItem: key => store.get(key) ?? null,
+      setItem: (key, value) => {
+        store.set(key, value);
+      }
+    };
+    const recovery = makeZeroRecovery(deps);
+    recovery.onClientStateNotFound();
+    await flush();
+    expect(reload).toHaveBeenCalledTimes(1);
+    resetRecoveryStateForTests();
+    recovery.onClientStateNotFound();
+    await flush();
+    expect(reload).toHaveBeenCalledTimes(1);
+    expect(events.some(event => event.type === "fatal")).toBe(true);
+  });
+  test("a guardStorage that throws never crashes recovery (in-memory is the floor)", async () => {
+    const {
+      deps,
+      reload
+    } = setup();
+    deps.guardStorage = {
+      getItem: () => {
+        throw new Error("no storage on this platform");
+      },
+      setItem: () => {
+        throw new Error("no storage on this platform");
+      }
+    };
+    makeZeroRecovery(deps).onClientStateNotFound();
+    await flush();
+    expect(reload).toHaveBeenCalledTimes(1);
+  });
+  test("classifier recognizes the mutation / connection desync class", () => {
+    const cases = [[["sent mutation ID 5 but expected 4"], "mutation-desync"], [["oooMutation detected"], "mutation-desync"], [["Server reported an out-of-order mutation"], "mutation-desync"], [["Ignoring mutation 3, already processed. Expected: 4"], "mutation-desync"], [["InvalidConnectionRequestLastMutationID"], "mutation-desync"], [["InvalidConnectionRequestBaseCookie"], "connection-cookie-invalid"], [["ClientNotFound: client gone"], "client-not-found"], [["connection userID mismatch"], "connection-userid-mismatch"]];
+    for (const [args, reason] of cases) {
+      expect(classifyZeroRecoveryLog("error", args)).toMatchObject({
+        reason,
+        dropLocalState: true
+      });
+    }
+    expect(classifyZeroRecoveryLog("error", ["consecutive server-ack timeouts"])).toBeUndefined();
+    expect(classifyZeroRecoveryLog("error", ["Connection attempt timed out after 10 seconds"])).toBeUndefined();
+    expect(classifyZeroRecoveryLog("warn", ["ClientNotFound"])).toBeUndefined();
+  });
+  test("benignLogFilter suppresses recovery for a matching classified log", async () => {
+    const {
+      deps,
+      deleteLocalState,
+      reload
+    } = setup();
+    deps.benignLogFilter = message => message.includes("ClientNotFound");
+    const sink = composeRecoveryLogSink(deps);
+    sink.log("error", void 0, "ClientNotFound: gone");
+    await flush();
+    expect(deleteLocalState).not.toHaveBeenCalled();
+    expect(reload).not.toHaveBeenCalled();
+    sink.log("error", void 0, "sent mutation ID 5 but expected 4");
+    await flush();
+    expect(reload).toHaveBeenCalledTimes(1);
+  });
+  test("isRecoverableZeroStalePokeMessage matches only the stale-cookie signatures", () => {
+    expect(isRecoverableZeroStalePokeMessage("Server returned unexpected base cookie during sync")).toBe(true);
+    expect(isRecoverableZeroStalePokeMessage("Received cookie 5 is < than last snapshot cookie 9, ignoring client view")).toBe(true);
+    expect(isRecoverableZeroStalePokeMessage("client state not found")).toBe(false);
+  });
 });
 //# sourceMappingURL=recoverZeroClient.test.mjs.map