@rocicorp/zero 0.22.2025072901 → 0.22.2025080100

package/out/{chunk-4OOERLIO.js → chunk-CV3OCOGM.js}

@@ -9,6 +9,7 @@ import {
   ENTITIES_KEY_PREFIX,
   GOT_QUERIES_KEY_PREFIX,
   Latest,
+  MUTATIONS_KEY_PREFIX,
   V6,
   V7,
   addDiffsForIndexes,
@@ -116,6 +117,7 @@ import {
   test,
   toDesiredQueriesKey,
   toGotQueriesKey,
+  toMutationResponseKey,
   toPrimaryKeyString,
   transformFilters,
   unreachable,
@@ -126,7 +128,7 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-P5M53J4D.js";
+} from "./chunk-LENWM5WE.js";
 import {
   __export
 } from "./chunk-424PT5DM.js";
@@ -6152,7 +6154,11 @@ var putOpSchema2 = valita_exports.object({
   op: valita_exports.literal("put"),
   mutation: mutationResponseSchema
 });
-var patchOpSchema2 = putOpSchema2;
+var delOpSchema2 = valita_exports.object({
+  op: valita_exports.literal("del"),
+  id: mutationIDSchema
+});
+var patchOpSchema2 = valita_exports.union(putOpSchema2, delOpSchema2);
 var mutationsPatchSchema = valita_exports.array(patchOpSchema2);
 
 // ../zero-protocol/src/row-patch.ts
@@ -6168,7 +6174,7 @@ var updateOpSchema2 = valita_exports.object({
   merge: jsonObjectSchema.optional(),
   constrain: valita_exports.array(valita_exports.string()).optional()
 });
-var delOpSchema2 = valita_exports.object({
+var delOpSchema3 = valita_exports.object({
   op: valita_exports.literal("del"),
   tableName: valita_exports.string(),
   id: primaryKeyValueRecordSchema
@@ -6179,7 +6185,7 @@ var clearOpSchema2 = valita_exports.object({
 var rowPatchOpSchema = valita_exports.union(
   putOpSchema3,
   updateOpSchema2,
-  delOpSchema2,
+  delOpSchema3,
   clearOpSchema2
 );
 var rowsPatchSchema = valita_exports.array(rowPatchOpSchema);
@@ -6282,7 +6288,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 24;
+var PROTOCOL_VERSION = 25;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 18;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -8574,7 +8580,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.22.2025072901";
+var version2 = "0.22.2025080100";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -8870,12 +8876,6 @@ var State = class {
 
 // ../zero-client/src/client/mutation-tracker.ts
 import { resolver as resolver8 } from "@rocicorp/resolver";
-var completeFailureTypes = [
-  // These should never actually be received as they cause the websocket
-  // connection to be closed.
-  "unsupportedPushVersion",
-  "unsupportedSchemaVersion"
-];
 var currentEphemeralID = 0;
 function nextEphemeralID() {
   return ++currentEphemeralID;
@@ -8885,11 +8885,6 @@ var MutationTracker = class {
   #ephemeralIDsByMutationID;
   #allMutationsAppliedListeners;
   #lc;
-  #limboMutations;
-  // This is only used in the new code path that processes
-  // mutation responses that arrive via the `poke` protocol.
-  // The old code path will be removed in the release after
-  // the one containing mutation-responses-via-poke.
   #ackMutations;
   #clientID;
   #largestOutstandingMutationID;
@@ -8899,13 +8894,22 @@ var MutationTracker = class {
     this.#outstandingMutations = /* @__PURE__ */ new Map();
     this.#ephemeralIDsByMutationID = /* @__PURE__ */ new Map();
     this.#allMutationsAppliedListeners = /* @__PURE__ */ new Set();
-    this.#limboMutations = /* @__PURE__ */ new Set();
     this.#largestOutstandingMutationID = 0;
     this.#currentMutationID = 0;
     this.#ackMutations = ackMutations;
   }
-  set clientID(clientID) {
+  setClientIDAndWatch(clientID, experimentalWatch) {
+    assert(this.#clientID === void 0, "clientID already set");
     this.#clientID = clientID;
+    experimentalWatch(
+      (diffs) => {
+        this.#processMutationResponses(diffs);
+      },
+      {
+        prefix: MUTATIONS_KEY_PREFIX + clientID + "/",
+        initialValuesInFirstDiff: true
+      }
+    );
   }
   trackMutation() {
     const id = nextEphemeralID();
@@ -8939,23 +8943,39 @@ var MutationTracker = class {
   /**
    * Used when zero-cache pokes down mutation results.
    */
-  processMutationResponses(patches) {
-    try {
-      for (const patch of patches) {
-        if (patch.mutation.id.clientID !== this.#clientID) {
-          continue;
-        }
-        if ("error" in patch.mutation.result) {
-          this.#processMutationError(patch.mutation.id, patch.mutation.result);
-        } else {
-          this.#processMutationOk(patch.mutation.id, patch.mutation.result);
+  #processMutationResponses(diffs) {
+    const clientID = must(this.#clientID);
+    let largestLmid = 0;
+    for (const diff3 of diffs) {
+      const mutationID = Number(
+        diff3.key.slice(MUTATIONS_KEY_PREFIX.length + clientID.length + 1)
+      );
+      assert(
+        !isNaN(mutationID),
+        `MutationTracker received a diff with an invalid mutation ID: ${diff3.key}`
+      );
+      largestLmid = Math.max(largestLmid, mutationID);
+      switch (diff3.op) {
+        case "add": {
+          const result = parse(diff3.newValue, mutationResultSchema);
+          if ("error" in result) {
+            this.#processMutationError(clientID, mutationID, result);
+          } else {
+            this.#processMutationOk(clientID, mutationID, result);
+          }
+          break;
         }
+        case "del":
+          break;
+        case "change":
+          throw new Error("MutationTracker does not expect change operations");
       }
-    } finally {
-      const last = patches[patches.length - 1];
-      if (last) {
-        this.#ackMutations(last.mutation.id);
-      }
+    }
+    if (largestLmid > 0) {
+      this.#ackMutations({
+        clientID: must(this.#clientID),
+        id: largestLmid
+      });
     }
   }
   processPushResponse(response) {
@@ -8964,12 +8984,14 @@ var MutationTracker = class {
         "Received an error response when pushing mutations",
         response
       );
-      this.#processPushError(response);
     } else {
       this.#processPushOk(response);
     }
   }
   /**
+   * DEPRECATED: to be removed when we switch to fully driving
+   * mutation resolution via poke.
+   *
    * When we reconnect to zero-cache, we resolve all outstanding mutations
    * whose ID is less than or equal to the lastMutationID.
    *
@@ -8988,47 +9010,14 @@ var MutationTracker = class {
    * to the DB while writing the LMID.
    */
   onConnected(lastMutationID) {
-    for (const [id, entry] of this.#outstandingMutations) {
-      if (!entry.mutationID) {
-        continue;
-      }
-      if (entry.mutationID <= lastMutationID) {
-        this.#settleMutation(id, entry, "resolve", emptyObject);
-      } else {
-        break;
-      }
-    }
-    for (const [id, entry] of this.#outstandingMutations) {
-      if (entry.mutationID && entry.mutationID > lastMutationID) {
-        this.#limboMutations.add(id);
-      }
-    }
     this.lmidAdvanced(lastMutationID);
   }
   /**
    * lmid advance will:
    * 1. notify "allMutationsApplied" listeners if the lastMutationID
    *    is greater than or equal to the largest outstanding mutation ID.
-   * 2. resolve all limbo mutations whose mutation ID is less than or equal to
+   * 2. resolve all mutations whose mutation ID is less than or equal to
    *    the lastMutationID.
-   *
-   * We only resolve "limbo mutations" since we want to give the mutation
-   * responses a chance to be received. `poke` and `pushResponse` are non transactional
-   * so they race.
-   *
-   * E.g., a `push` may call the api server which:
-   * writes to PG, replicates to zero-cache, then pokes the lmid down before the
-   * push response is sent.
-   *
-   * The only fix for this would be to have mutation responses be written to the database
-   * and sent down through the poke protocol.
-   *
-   * The artifact the user sees is that promise resolutions for mutations is not transactional
-   * with the update to synced data.
-   *
-   * It was a mistake to not just write the mutation responses to the database
-   * in the first place as this route ends up being more complicated
-   * and less reliable.
    */
   lmidAdvanced(lastMutationID) {
     assert(
@@ -9040,7 +9029,7 @@ var MutationTracker = class {
     }
     try {
       this.#currentMutationID = lastMutationID;
-      this.#resolveLimboMutations(lastMutationID);
+      this.#resolveMutations(lastMutationID);
     } finally {
       if (lastMutationID >= this.#largestOutstandingMutationID) {
         this.#notifyAllMutationsAppliedListeners();
@@ -9050,75 +9039,38 @@ var MutationTracker = class {
   get size() {
     return this.#outstandingMutations.size;
   }
-  /**
-   * Push errors fall into two categories:
-   * - Those where we know the mutations were not applied
-   * - Those where we do not know the state of the mutations.
-   *
-   * The first category includes errors like "unsupportedPushVersion"
-   * and "unsupportedSchemaVersion". The mutations were never applied in those cases.
-   *
-   * The second category includes errors like "http" errors. E.g., a 500 on the user's
-   * API server or a network error.
-   *
-   * The mutations may have been applied by the API server but we never
-   * received the response.
-   *
-   * In this latter case, we must mark the mutations as being in limbo.
-   * This allows us to resolve them when we receive the next
-   * lmid bump if their lmids are lesser.
-   */
-  #processPushError(error) {
-    if (completeFailureTypes.includes(error.error)) {
-      return;
-    }
-    const mids = error.mutationIDs;
-    if (!mids) {
-      return;
-    }
-    for (const mid of mids) {
-      const ephemeralID = this.#ephemeralIDsByMutationID.get(mid.id);
-      if (ephemeralID) {
-        if (mid.id <= this.#currentMutationID) {
-          const entry = this.#outstandingMutations.get(ephemeralID);
-          if (entry) {
-            this.#settleMutation(ephemeralID, entry, "resolve", emptyObject);
-          }
-          continue;
-        }
-        this.#limboMutations.add(ephemeralID);
-      }
-    }
-  }
-  #resolveLimboMutations(lastMutationID) {
-    for (const id of this.#limboMutations) {
-      const entry = this.#outstandingMutations.get(id);
-      if (!entry || !entry.mutationID) {
-        this.#limboMutations.delete(id);
-        continue;
-      }
-      if (entry.mutationID <= lastMutationID) {
-        this.#limboMutations.delete(id);
+  #resolveMutations(upTo) {
+    for (const [id, entry] of this.#outstandingMutations) {
+      if (entry.mutationID && entry.mutationID <= upTo) {
         this.#settleMutation(id, entry, "resolve", emptyObject);
+      } else {
+        break;
       }
     }
   }
   #processPushOk(ok) {
     for (const mutation of ok.mutations) {
       if ("error" in mutation.result) {
-        this.#processMutationError(mutation.id, mutation.result);
+        this.#processMutationError(
+          mutation.id.clientID,
+          mutation.id.id,
+          mutation.result
+        );
       } else {
-        this.#processMutationOk(mutation.id, mutation.result);
+        this.#processMutationOk(
+          mutation.id.clientID,
+          mutation.id.id,
+          mutation.result
+        );
       }
     }
   }
-  #processMutationError(mid, error) {
+  #processMutationError(clientID, mid, error) {
     assert(
-      mid.clientID === this.#clientID,
+      clientID === this.#clientID,
       "received mutation for the wrong client"
     );
-    this.#lc.error?.(`Mutation ${mid.id} returned an error`, error);
-    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid.id);
+    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid);
     if (!ephemeralID && error.error === "alreadyProcessed") {
       return;
     }
@@ -9127,21 +9079,21 @@ var MutationTracker = class {
       `ephemeral ID is missing for mutation error: ${error.error}.`
     );
     const entry = this.#outstandingMutations.get(ephemeralID);
-    assert(entry && entry.mutationID === mid.id);
+    assert(entry && entry.mutationID === mid);
     this.#settleMutation(ephemeralID, entry, "reject", error);
   }
-  #processMutationOk(mid, result) {
+  #processMutationOk(clientID, mid, result) {
     assert(
-      mid.clientID === this.#clientID,
+      clientID === this.#clientID,
       "received mutation for the wrong client"
     );
-    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid.id);
+    const ephemeralID = this.#ephemeralIDsByMutationID.get(mid);
     assert(
       ephemeralID,
       "ephemeral ID is missing. This can happen if a mutation response is received twice but it should be impossible to receive a success response twice for the same mutation."
     );
     const entry = this.#outstandingMutations.get(ephemeralID);
-    assert(entry && entry.mutationID === mid.id);
+    assert(entry && entry.mutationID === mid);
     this.#settleMutation(ephemeralID, entry, "resolve", result);
   }
   #settleMutation(ephemeralID, entry, type, result) {
@@ -9157,7 +9109,6 @@ var MutationTracker = class {
     if (entry.mutationID) {
       this.#ephemeralIDsByMutationID.delete(entry.mutationID);
     }
-    this.#limboMutations.delete(ephemeralID);
   }
   /**
    * Be notified when all mutations have been included in the server snapshot.
@@ -9773,9 +9724,6 @@ var PokeHandler = class {
         lc.debug?.("poking replicache");
         await this.#replicachePoke(merged);
         lc.debug?.("poking replicache took", performance.now() - start);
-        this.#mutationTracker.processMutationResponses(
-          merged.mutationResults ?? []
-        );
         if (!("error" in merged.pullResponse)) {
           const lmid = merged.pullResponse.lastMutationIDChanges[this.#clientID];
           if (lmid !== void 0) {
@@ -9858,7 +9806,9 @@ function mergePokes(pokeBuffer, schema, serverToClient2) {
         }
       }
       if (pokePart.mutationsPatch) {
-        mutationResults.push(...pokePart.mutationsPatch);
+        for (const op of pokePart.mutationsPatch) {
+          mergedPatch.push(mutationPatchOpToReplicachePatchOp(op));
+        }
       }
     }
   }
@@ -9894,6 +9844,21 @@ function queryPatchOpToReplicachePatchOp(op, toKey) {
       unreachable(op);
   }
 }
+function mutationPatchOpToReplicachePatchOp(op) {
+  switch (op.op) {
+    case "put":
+      return {
+        op: "put",
+        key: toMutationResponseKey(op.mutation.id),
+        value: op.mutation.result
+      };
+    case "del":
+      return {
+        op: "del",
+        key: toMutationResponseKey(op.id)
+      };
+  }
+}
 function rowsPatchOpToReplicachePatchOp(op, schema, serverToClient2) {
   if (op.op === "clear") {
     return op;
@@ -10000,6 +9965,38 @@ var ZeroRep = class {
   }
 };
 
+// ../shared/src/subscribable.ts
+var Subscribable = class {
+  _listeners = /* @__PURE__ */ new Set();
+  /**
+   * Subscribe to the subscribable.
+   *
+   * @param listener - The listener to subscribe to.
+   * @returns A function to unsubscribe from the subscribable.
+   */
+  subscribe = (listener) => {
+    this._listeners.add(listener);
+    return () => {
+      this._listeners.delete(listener);
+    };
+  };
+  /**
+   * Notify all listeners.
+   *
+   * @param update - The update to notify listeners with.
+   */
+  notify = (update) => {
+    this._listeners.forEach((listener) => listener(update));
+  };
+  hasListeners = () => this._listeners.size > 0;
+  /**
+   * Unsubscribe all listeners.
+   */
+  cleanup = () => {
+    this._listeners.clear();
+  };
+};
+
 // ../zero-client/src/client/zero.ts
 var onSetConnectionStateSymbol = Symbol();
 var exposedToTestingSymbol = Symbol();
@@ -10079,8 +10076,7 @@ var Zero = class _Zero {
   #deletedClients;
   #lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
   #onPong = () => void 0;
-  #online = false;
-  #onOnlineChange;
+  #onlineManager;
   #onUpdateNeeded;
   #onClientStateNotFound;
   // Last cookie used to initiate a connection
@@ -10180,7 +10176,10 @@ var Zero = class _Zero {
         "ZeroOptions.hiddenTabDisconnectDelay must not be negative."
       );
     }
-    this.#onOnlineChange = onOnlineChange;
+    this.#onlineManager = new OnlineManager();
+    if (onOnlineChange) {
+      this.#onlineManager.subscribe(onOnlineChange);
+    }
     this.#options = options;
     this.#logOptions = this.#createLogOptions({
       consoleLogLevel: options.logLevel ?? "warn",
@@ -10310,7 +10309,10 @@ var Zero = class _Zero {
     this.#server = server;
     this.userID = userID;
     this.#lc = lc.withContext("clientID", rep.clientID);
-    this.#mutationTracker.clientID = rep.clientID;
+    this.#mutationTracker.setClientIDAndWatch(
+      rep.clientID,
+      rep.experimentalWatch.bind(rep)
+    );
     this.#activeClientsManager = makeActiveClientsManager(
       rep.clientGroupID,
       this.clientID,
@@ -10550,6 +10552,7 @@ var Zero = class _Zero {
   async close() {
     const lc = this.#lc.withContext("close");
     lc.debug?.("Closing Zero instance. Stack:", new Error().stack);
+    this.#onlineManager.cleanup();
     if (this.#connectionState !== Disconnected) {
       this.#disconnect(
         lc,
@@ -11240,19 +11243,24 @@ var Zero = class _Zero {
     }
   }
   #setOnline(online) {
-    if (this.#online === online) {
-      return;
-    }
-    this.#online = online;
-    this.#onOnlineChange?.(online);
+    this.#onlineManager.setOnline(online);
   }
   /**
    * A rough heuristic for whether the client is currently online and
    * authenticated.
    */
   get online() {
-    return this.#online;
+    return this.#onlineManager.online;
   }
+  /**
+   * Subscribe to online status changes.
+   *
+   * This is useful when you want to update state based on the online status.
+   *
+   * @param listener - The listener to subscribe to.
+   * @returns A function to unsubscribe the listener.
+   */
+  onOnline = (listener) => this.#onlineManager.subscribe(listener);
   /**
    * Starts a ping and waits for a pong.
    *
@@ -11307,7 +11315,7 @@ var Zero = class _Zero {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-TFZBDN6K.js");
+      const m = await import("./inspector-AF3UI76B.js");
       return m.newInspector(this.#rep, this.#schema, async () => {
         await this.#connectResolver.promise;
         return this.#socket;
@@ -11315,6 +11323,19 @@ var Zero = class _Zero {
     }
   }
 };
+var OnlineManager = class extends Subscribable {
+  #online = false;
+  setOnline(online) {
+    if (this.#online === online) {
+      return;
+    }
+    this.#online = online;
+    this.notify(online);
+  }
+  get online() {
+    return this.#online;
+  }
+};
 async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushParams, userQueryParams, maxHeaderLength = 1024 * 8, additionalConnectParams, activeClientsManager) {
   const url = new URL(
     appendPath(socketOrigin, `/sync/v${PROTOCOL_VERSION}/connect`)
@@ -11447,4 +11468,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-4OOERLIO.js.map
+//# sourceMappingURL=chunk-CV3OCOGM.js.map