@rocicorp/zero 0.11.2025012200 → 0.12.2025012401

package/out/{chunk-5OVHF6ZM.js → chunk-BHEGTSLF.js}

@@ -7151,14 +7151,8 @@ function getSessionID() {
 }
 var REQUEST_COUNTERS = /* @__PURE__ */ new Map();
 function newRequestID(clientID) {
-  let counter = REQUEST_COUNTERS.get(clientID);
-  if (!counter) {
-    REQUEST_COUNTERS.set(clientID, 0);
-    counter = 0;
-  } else {
-    counter++;
-    REQUEST_COUNTERS.set(clientID, counter);
-  }
+  const counter = REQUEST_COUNTERS.get(clientID) ?? 0;
+  REQUEST_COUNTERS.set(clientID, counter + 1);
   return `${clientID}-${getSessionID()}-${counter}`;
 }
 
@@ -8565,8 +8559,13 @@ var columnReferenceSchema = readonlyObject({
 });
 var parameterReferenceSchema = readonlyObject({
   type: valita_exports.literal("static"),
+  // The "namespace" of the injected parameter.
+  // Write authorization will send the value of a row
+  // prior to the mutation being run (preMutationRow).
+  // Read and write authorization will both send the
+  // current authentication data (authData).
   anchor: valita_exports.union(valita_exports.literal("authData"), valita_exports.literal("preMutationRow")),
-  field: valita_exports.string()
+  field: valita_exports.union(valita_exports.string(), valita_exports.array(valita_exports.string()))
 });
 var conditionValueSchema = valita_exports.union(
   literalReferenceSchema,
@@ -11486,6 +11485,8 @@ var InvalidMessage = "InvalidMessage";
 var InvalidPush = "InvalidPush";
 var MutationFailed = "MutationFailed";
 var MutationRateLimited = "MutationRateLimited";
+var Rebalance = "Rebalance";
+var Rehome = "Rehome";
 var Unauthorized = "Unauthorized";
 var VersionNotSupported = "VersionNotSupported";
 var SchemaVersionNotSupported = "SchemaVersionNotSupported";
@@ -11557,7 +11558,7 @@ function encodeSecProtocols(initConnectionMessage, authToken) {
 }
 
 // ../zero-protocol/src/error.ts
-var errorKindSchema = valita_exports.union(
+var basicErrorKindSchema = valita_exports.union(
   valita_exports.literal(AuthInvalidated),
   valita_exports.literal(ClientNotFound),
   valita_exports.literal(InvalidConnectionRequest),
@@ -11574,18 +11575,29 @@ var errorKindSchema = valita_exports.union(
   valita_exports.literal(Internal)
 );
 var basicErrorBodySchema = valita_exports.object({
-  kind: errorKindSchema,
+  kind: basicErrorKindSchema,
   message: valita_exports.string()
 });
-var serverOverloadedBodySchema = valita_exports.object({
-  kind: valita_exports.literal(ServerOverloaded),
+var backoffErrorKindSchema = valita_exports.union(
+  valita_exports.literal(Rebalance),
+  valita_exports.literal(Rehome),
+  valita_exports.literal(ServerOverloaded)
+);
+var backoffBodySchema = valita_exports.object({
+  kind: backoffErrorKindSchema,
   message: valita_exports.string(),
-  minBackoffMs: valita_exports.number().optional()
+  minBackoffMs: valita_exports.number().optional(),
+  maxBackoffMs: valita_exports.number().optional(),
+  // Query parameters to send in the next reconnect. In the event of
+  // a conflict, these will be overridden by the parameters used by
+  // the client; it is the responsibility of the server to avoid
+  // parameter name conflicts.
+  //
+  // The parameters will only be added to the immediately following
+  // reconnect, and not after that.
+  reconnectParams: valita_exports.record(valita_exports.string()).optional()
 });
-var errorBodySchema = valita_exports.union(
-  basicErrorBodySchema,
-  serverOverloadedBodySchema
-);
+var errorBodySchema = valita_exports.union(basicErrorBodySchema, backoffBodySchema);
 var errorMessageSchema = valita_exports.tuple([
   valita_exports.literal("error"),
   errorBodySchema
@@ -11827,7 +11839,7 @@ var upstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 3;
+var PROTOCOL_VERSION = 4;
 var MIN_SERVER_SUPPORTED_PROTOCOL_VERSION = 2;
 assert(MIN_SERVER_SUPPORTED_PROTOCOL_VERSION < PROTOCOL_VERSION);
 
@@ -13412,7 +13424,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.11.2025012200+592c81";
+var version2 = "0.12.2025012401+a73306";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -13966,8 +13978,16 @@ function isAuthError(ex) {
 function isAuthErrorKind(kind) {
   return kind === AuthInvalidated || kind === Unauthorized;
 }
-function isServerOverloadedError(ex) {
-  return isServerError(ex) && ex.errorBody.kind === ServerOverloaded ? ex.errorBody : void 0;
+function isBackoffError(ex) {
+  if (isServerError(ex)) {
+    switch (ex.errorBody.kind) {
+      case Rebalance:
+      case Rehome:
+      case ServerOverloaded:
+        return ex.errorBody;
+    }
+  }
+  return void 0;
 }
 
 // ../zero-client/src/client/server-option.ts
@@ -14875,7 +14895,7 @@ var Zero = class {
    * is received before the connected message is received or if the connection
    * attempt times out.
    */
-  async #connect(l) {
+  async #connect(l, additionalConnectParams) {
     assert(this.#server);
     assert(this.#connectionState === Disconnected);
     const wsid = nanoid();
@@ -14923,7 +14943,8 @@ var Zero = class {
       wsid,
       this.#options.logLevel === "debug",
       l,
-      this.#options.maxHeaderLength
+      this.#options.maxHeaderLength,
+      additionalConnectParams
     );
     if (this.closed) {
       return;
@@ -15134,6 +15155,7 @@ var Zero = class {
     let needsReauth = false;
     let gotError = false;
     let backoffMs = RUN_LOOP_INTERVAL_MS;
+    let additionalConnectParams;
     while (!this.closed) {
       runLoopCounter++;
       let lc = getLogContext();
@@ -15152,7 +15174,8 @@ var Zero = class {
             if (reloadScheduled()) {
               break;
             }
-            await this.#connect(lc);
+            await this.#connect(lc, additionalConnectParams);
+            additionalConnectParams = void 0;
             if (this.closed) {
               break;
             }
@@ -15234,9 +15257,15 @@ var Zero = class {
         if (isServerError(ex) || ex instanceof TimedOutError || ex instanceof CloseError) {
           gotError = true;
         }
-        const overloaded = isServerOverloadedError(ex);
-        if (overloaded && overloaded.minBackoffMs) {
-          backoffMs = Math.max(backoffMs, overloaded.minBackoffMs);
+        const backoffError = isBackoffError(ex);
+        if (backoffError) {
+          if (backoffError.minBackoffMs !== void 0) {
+            backoffMs = Math.max(backoffMs, backoffError.minBackoffMs);
+          }
+          if (backoffError.maxBackoffMs !== void 0) {
+            backoffMs = Math.min(backoffMs, backoffError.maxBackoffMs);
+          }
+          additionalConnectParams = backoffError.reconnectParams;
         }
       }
       if (gotError) {
@@ -15376,7 +15405,7 @@ var Zero = class {
     return rv;
   }
 };
-async function createSocket(rep, queryManager, socketOrigin, baseCookie, clientID, clientGroupID, schemaVersion, userID, auth, lmid, wsid, debugPerf, lc, maxHeaderLength = 1024 * 8) {
+async function createSocket(rep, queryManager, socketOrigin, baseCookie, clientID, clientGroupID, schemaVersion, userID, auth, lmid, wsid, debugPerf, lc, maxHeaderLength = 1024 * 8, additionalConnectParams) {
   const url = new URL(
     appendPath(socketOrigin, `/sync/v${PROTOCOL_VERSION}/connect`)
   );
@@ -15392,6 +15421,15 @@ async function createSocket(rep, queryManager, socketOrigin, baseCookie, clientI
   if (debugPerf) {
     searchParams.set("debugPerf", true.toString());
   }
+  if (additionalConnectParams) {
+    for (const k in additionalConnectParams) {
+      if (searchParams.has(k)) {
+        lc.warn?.(`skipping conflicting parameter ${k}`);
+      } else {
+        searchParams.set(k, additionalConnectParams[k]);
+      }
+    }
+  }
   lc.info?.("Connecting to", url.toString());
   const WS = mustGetBrowserGlobal("WebSocket");
   let queriesPatch = await rep.query(
@@ -15453,4 +15491,4 @@ export {
   escapeLike,
   Zero
 };
-//# sourceMappingURL=chunk-5OVHF6ZM.js.map
+//# sourceMappingURL=chunk-BHEGTSLF.js.map