@rocicorp/zero 0.18.2025032101 → 0.18.2025032400

package/out/{chunk-AX7YNDMI.js → chunk-YAABAEJV.js}

@@ -112,7 +112,7 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-KRZMF5WQ.js";
+} from "./chunk-DSUPSGE4.js";
 import {
   compareTTL,
   hasOwn,
@@ -5980,7 +5980,7 @@ function escapeLike(val) {
 
 // ../zero-client/src/client/zero.ts
 import { LogContext as LogContext4 } from "@rocicorp/logger";
-import { resolver as resolver7 } from "@rocicorp/resolver";
+import { resolver as resolver8 } from "@rocicorp/resolver";
 
 // ../zero-protocol/src/delete-clients.ts
 var deleteClientsBodySchema = valita_exports.union(
@@ -6212,34 +6212,10 @@ var pullResponseMessageSchema = valita_exports.tuple([
   pullResponseBodySchema
 ]);
 
-// ../zero-protocol/src/warm.ts
-var warmBodySchema = valita_exports.object({
-  payload: valita_exports.string()
-});
-var warmMessageSchema = valita_exports.tuple([valita_exports.literal("warm"), warmBodySchema]);
-
-// ../zero-protocol/src/down.ts
-var downstreamSchema = valita_exports.union(
-  connectedMessageSchema,
-  warmMessageSchema,
-  errorMessageSchema,
-  pongMessageSchema,
-  pokeStartMessageSchema,
-  pokePartMessageSchema,
-  pokeEndMessageSchema,
-  pullResponseMessageSchema,
-  deleteClientsMessageSchema
-);
-
 // ../zero-protocol/src/mutation-type-enum.ts
 var CRUD = "crud";
 var Custom = "custom";
 
-// ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 8;
-var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 6;
-assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
-
 // ../zero-protocol/src/push.ts
 var CRUD_MUTATION_NAME = "_zero_crud";
 var insertOpSchema = valita_exports.object({
@@ -6312,14 +6288,22 @@ var mutationIDSchema = valita_exports.object({
   clientID: valita_exports.string()
 });
 var appErrorSchema = valita_exports.object({
-  error: valita_exports.literal("app"),
-  details: valita_exports.string()
+  error: valita_exports.literal("app")
+  // the user can add any additional fields in their API server
 });
 var zeroErrorSchema = valita_exports.object({
   error: valita_exports.literal("ooo-mutation")
 });
+var tokenErrorSchema = valita_exports.object({
+  error: valita_exports.literal("token")
+  // the user can add any additional fields in their API server
+});
 var mutationOkSchema = valita_exports.object({});
-var mutationErrorSchema = valita_exports.union(appErrorSchema, zeroErrorSchema);
+var mutationErrorSchema = valita_exports.union(
+  appErrorSchema,
+  zeroErrorSchema,
+  tokenErrorSchema
+);
 var mutationResultSchema = valita_exports.union(mutationOkSchema, mutationErrorSchema);
 var mutationResponseSchema = valita_exports.object({
   id: mutationIDSchema,
@@ -6342,11 +6326,28 @@ var unsupportedSchemaVersionSchema = valita_exports.object({
   // were not processed by the server.
   mutationIDs: valita_exports.array(mutationIDSchema).optional()
 });
+var httpErrorSchema = valita_exports.object({
+  error: valita_exports.literal("http"),
+  status: valita_exports.number(),
+  details: valita_exports.string(),
+  mutationIDs: valita_exports.array(mutationIDSchema).optional()
+});
+var zeroPusherErrorSchema = valita_exports.object({
+  error: valita_exports.literal("zero-pusher"),
+  details: valita_exports.string(),
+  mutationIDs: valita_exports.array(mutationIDSchema).optional()
+});
 var pushErrorSchema = valita_exports.union(
   unsupportedPushVersionSchema,
-  unsupportedSchemaVersionSchema
+  unsupportedSchemaVersionSchema,
+  httpErrorSchema,
+  zeroPusherErrorSchema
 );
 var pushResponseSchema = valita_exports.union(pushOkSchema, pushErrorSchema);
+var pushResponseMessageSchema = valita_exports.tuple([
+  valita_exports.literal("push-response"),
+  pushResponseSchema
+]);
 function mapCRUD(arg, map) {
   return {
     ops: arg.ops.map(
@@ -6362,6 +6363,31 @@ function mapCRUD(arg, map) {
   };
 }
 
+// ../zero-protocol/src/warm.ts
+var warmBodySchema = valita_exports.object({
+  payload: valita_exports.string()
+});
+var warmMessageSchema = valita_exports.tuple([valita_exports.literal("warm"), warmBodySchema]);
+
+// ../zero-protocol/src/down.ts
+var downstreamSchema = valita_exports.union(
+  connectedMessageSchema,
+  warmMessageSchema,
+  errorMessageSchema,
+  pongMessageSchema,
+  pokeStartMessageSchema,
+  pokePartMessageSchema,
+  pokeEndMessageSchema,
+  pullResponseMessageSchema,
+  deleteClientsMessageSchema,
+  pushResponseMessageSchema
+);
+
+// ../zero-protocol/src/protocol-version.ts
+var PROTOCOL_VERSION = 9;
+var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 6;
+assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
+
 // ../zql/src/mutate/custom.ts
 function customMutatorKey(namespace, name) {
   assert(!namespace.includes("|"), "mutator namespaces must not include a |");
@@ -7924,10 +7950,15 @@ var TransactionImpl = class {
   query;
   token;
 };
-function makeReplicacheMutator(lc, mutator, schema, slowMaterializeThreshold) {
+function makeReplicacheMutator(lc, mutationTracker, mutator, schema, slowMaterializeThreshold) {
   return (repTx, args) => {
     const tx = new TransactionImpl(lc, repTx, schema, slowMaterializeThreshold);
-    return mutator(tx, args);
+    const clientPromise = mutator(tx, args);
+    if (repTx.reason === "initial") {
+      const serverPromise = mutationTracker.trackMutation(repTx.mutationID);
+      clientPromise.server = serverPromise;
+    }
+    return clientPromise;
   };
 }
 function makeSchemaCRUD(schema, tx, ivmBranch) {
@@ -8298,7 +8329,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.18.2025032101";
+var version2 = "0.18.2025032400";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -9272,6 +9303,84 @@ var ZeroRep = class {
   };
 };
 
+// ../zero-client/src/client/mutation-tracker.ts
+import { resolver as resolver7 } from "@rocicorp/resolver";
+var MutationTracker = class {
+  #outstandingMutations;
+  #clientID;
+  constructor() {
+    this.#outstandingMutations = /* @__PURE__ */ new Map();
+  }
+  set clientID(clientID) {
+    this.#clientID = clientID;
+  }
+  trackMutation(id) {
+    assert(!this.#outstandingMutations.has(id));
+    const mutationResolver = resolver7();
+    this.#outstandingMutations.set(id, mutationResolver);
+    return mutationResolver.promise;
+  }
+  /**
+   * Called if the mutation is never able to be sent to the server
+   * and abandoned before persisted.
+   * In that case, we have no `pushResponse` to process.
+   */
+  rejectMutation(id, e) {
+    const resolver9 = this.#outstandingMutations.get(id);
+    assert(resolver9);
+    resolver9.reject(e);
+    this.#outstandingMutations.delete(id);
+  }
+  processPushResponse(response) {
+    if ("error" in response) {
+      this.#processPushError(response);
+    } else {
+      this.#processPushOk(response);
+    }
+  }
+  get size() {
+    return this.#outstandingMutations.size;
+  }
+  #processPushError(error) {
+    const mids = error.mutationIDs;
+    if (!mids) {
+      return;
+    }
+    for (const mid of mids) {
+      this.#processMutationError(mid, error);
+    }
+  }
+  #processPushOk(ok) {
+    for (const mutation of ok.mutations) {
+      if ("error" in mutation.result) {
+        this.#processMutationError(mutation.id, mutation.result);
+      } else {
+        this.#processMutationOk(mutation.result, mutation.id);
+      }
+    }
+  }
+  #processMutationError(mid, error) {
+    assert(
+      mid.clientID === this.#clientID,
+      "received mutation for the wrong client"
+    );
+    const resolver9 = this.#outstandingMutations.get(mid.id);
+    assert(resolver9);
+    resolver9.reject(error);
+    this.#outstandingMutations.delete(mid.id);
+  }
+  #processMutationOk(result, mid) {
+    assert(
+      mid.clientID === this.#clientID,
+      "received mutation for the wrong client"
+    );
+    const resolver9 = this.#outstandingMutations.get(mid.id);
+    assert(resolver9);
+    resolver9.resolve(result);
+    this.#outstandingMutations.delete(mid.id);
+  }
+};
+
 // ../zero-client/src/client/zero.ts
 var onSetConnectionStateSymbol = Symbol();
 var exposedToTestingSymbol = Symbol();
@@ -9332,6 +9441,7 @@ var Zero = class {
   #ivmMain;
   #clientToServer;
   #deleteClientsManager;
+  #mutationTracker;
   /**
    * The queries we sent when inside the sec-protocol header when establishing a connection.
    * More queries could be registered while we're waiting for the 'connected' message
@@ -9368,12 +9478,12 @@ var Zero = class {
   #abortPingTimeout = () => {
   };
   #zeroContext;
-  #connectResolver = resolver7();
+  #connectResolver = resolver8();
   #pendingPullsByRequestID = /* @__PURE__ */ new Map();
   #lastMutationIDReceived = 0;
   #socket = void 0;
-  #socketResolver = resolver7();
-  #connectionStateChangeResolver = resolver7();
+  #socketResolver = resolver8();
+  #connectionStateChangeResolver = resolver8();
   /**
    * This resolver is only used for rejections. It is awaited in the connected
    * state (including when waiting for a pong). It is rejected when we get an
@@ -9390,7 +9500,7 @@ var Zero = class {
     }
     this.#connectionState = state;
     this.#connectionStateChangeResolver.resolve(state);
-    this.#connectionStateChangeResolver = resolver7();
+    this.#connectionStateChangeResolver = resolver8();
     if (false) {
       asTestZero(this)[onSetConnectionStateSymbol]?.(state);
     }
@@ -9470,6 +9580,7 @@ var Zero = class {
       );
     }
     const lc = new LogContext4(logOptions.logLevel, {}, logOptions.logSink);
+    this.#mutationTracker = new MutationTracker();
     if (options.mutators) {
       for (const [namespaceOrKey, mutatorOrMutators] of Object.entries(
         options.mutators
@@ -9479,6 +9590,7 @@ var Zero = class {
           assertUnique(key);
           replicacheMutators[key] = makeReplicacheMutator(
             lc,
+            this.#mutationTracker,
             mutatorOrMutators,
             schema,
             slowMaterializeThreshold
@@ -9494,6 +9606,7 @@ var Zero = class {
             assertUnique(key);
             replicacheMutators[key] = makeReplicacheMutator(
               lc,
+              this.#mutationTracker,
               mutator,
               schema,
               slowMaterializeThreshold
@@ -9552,6 +9665,7 @@ var Zero = class {
     this.#server = server;
     this.userID = userID;
     this.#lc = lc.withContext("clientID", rep.clientID);
+    this.#mutationTracker.clientID = rep.clientID;
     const onUpdateNeededCallback = onUpdateNeeded ?? ((reason, serverErrorMsg) => {
       reloadWithReason(
         this.#lc,
@@ -9828,6 +9942,8 @@ var Zero = class {
         return this.#deleteClientsManager.clientsDeletedOnServer(
           downMessage[1]
         );
+      case "push-response":
+        return this.#mutationTracker.processPushResponse(downMessage[1]);
       default:
         msgType;
         rejectInvalidMessage();
@@ -10105,9 +10221,9 @@ var Zero = class {
         l.error?.("disconnect() called while disconnected");
         break;
     }
-    this.#socketResolver = resolver7();
+    this.#socketResolver = resolver8();
     l.debug?.("Creating new connect resolver");
-    this.#connectResolver = resolver7();
+    this.#connectResolver = resolver8();
     this.#setConnectionState(Disconnected);
     this.#messageCount = 0;
     this.#connectStart = void 0;
@@ -10158,12 +10274,12 @@ var Zero = class {
     const body = pullResponseMessage[1];
     lc = lc.withContext("requestID", body.requestID);
     lc.debug?.("Handling pull response", body);
-    const resolver8 = this.#pendingPullsByRequestID.get(body.requestID);
-    if (!resolver8) {
+    const resolver9 = this.#pendingPullsByRequestID.get(body.requestID);
+    if (!resolver9) {
       lc.debug?.("No resolver found");
       return;
     }
-    resolver8.resolve(pullResponseMessage[1]);
+    resolver9.resolve(pullResponseMessage[1]);
   }
   async #pusher(req, requestID) {
     assert(req.pushVersion === 1);
@@ -10294,7 +10410,7 @@ var Zero = class {
               PING_INTERVAL_MS,
               controller.signal
             );
-            this.#rejectMessageError = resolver7();
+            this.#rejectMessageError = resolver8();
             const PING = 0;
             const HIDDEN = 2;
             const raceResult = await promiseRace([
@@ -10402,7 +10518,7 @@ var Zero = class {
       }
     ];
     send(socket, pullRequestMessage);
-    const pullResponseResolver = resolver7();
+    const pullResponseResolver = resolver8();
     this.#pendingPullsByRequestID.set(requestID, pullResponseResolver);
     try {
       const TIMEOUT = 0;
@@ -10460,7 +10576,7 @@ var Zero = class {
    */
   async #ping(l, messageErrorRejectionPromise) {
     l.debug?.("pinging");
-    const { promise, resolve } = resolver7();
+    const { promise, resolve } = resolver8();
     this.#onPong = resolve;
     const pingMessage = ["ping", {}];
     const t0 = performance.now();
@@ -10506,7 +10622,7 @@ var Zero = class {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-SVHRQAQN.js");
+      const m = await import("./inspector-ROITQB3J.js");
       return m.newInspector(this.#rep, this.#schema);
     }
   }
@@ -10625,4 +10741,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-AX7YNDMI.js.map
+//# sourceMappingURL=chunk-YAABAEJV.js.map