@rocicorp/zero 0.22.2025063000 → 0.22.2025070200

package/out/{chunk-WOYR3FAT.js → chunk-HTNKB2W7.js}

@@ -126,7 +126,7 @@ import {
   withWrite,
   withWriteNoImplicitCommit,
   wrapIterable
-} from "./chunk-CESYRWV4.js";
+} from "./chunk-43L7S6AU.js";
 import {
   __export
 } from "./chunk-424PT5DM.js";
@@ -5841,7 +5841,7 @@ var SchemaVersionNotSupported2 = "SchemaVersionNotSupported";
 
 // ../zero-client/src/client/zero.ts
 import "@rocicorp/logger";
-import { resolver as resolver8 } from "@rocicorp/resolver";
+import { resolver as resolver9 } from "@rocicorp/resolver";
 
 // ../zero-protocol/src/delete-clients.ts
 var deleteClientsBodySchema = valita_exports.union(
@@ -5900,7 +5900,14 @@ var initConnectionBodySchema = valita_exports.object({
   desiredQueriesPatch: upQueriesPatchSchema,
   clientSchema: clientSchemaSchema.optional(),
   deleted: deleteClientsBodySchema.optional(),
-  userPushParams: userPushParamsSchema.optional()
+  userPushParams: userPushParamsSchema.optional(),
+  /**
+   * `activeClients` is an optional array of client IDs that are currently active
+   * in the client group. This is used to inform the server about the clients
+   * that are currently active (aka running, aka alive), so it can inactive
+   * queries from inactive clients.
+   */
+  activeClients: valita_exports.array(valita_exports.string()).optional()
 });
 var initConnectionMessageSchema = valita_exports.tuple([
   valita_exports.literal("initConnection"),
@@ -6241,7 +6248,7 @@ var downstreamSchema = valita_exports.union(
 );
 
 // ../zero-protocol/src/protocol-version.ts
-var PROTOCOL_VERSION = 18;
+var PROTOCOL_VERSION = 20;
 var MIN_SERVER_SUPPORTED_SYNC_PROTOCOL = 6;
 assert(MIN_SERVER_SUPPORTED_SYNC_PROTOCOL < PROTOCOL_VERSION);
 
@@ -6338,6 +6345,201 @@ function send(ws, data) {
   ws.send(JSON.stringify(data));
 }
 
+// ../zero-client/src/client/active-clients-manager.ts
+import { resolver as resolver7 } from "@rocicorp/resolver";
+var keyPrefix = "zero-active";
+function toLockName(clientGroupID, clientID) {
+  return `${keyPrefix}/${clientGroupID}/${clientID}`;
+}
+function toBroadcastChannelName(clientGroupID) {
+  return `${keyPrefix}/${clientGroupID}`;
+}
+function fromLockName(lockKey) {
+  if (!lockKey || !lockKey.startsWith(keyPrefix)) {
+    return void 0;
+  }
+  const parts = lockKey.slice(keyPrefix.length).split("/");
+  if (parts.length !== 3) {
+    return void 0;
+  }
+  return {
+    clientGroupID: parts[1],
+    clientID: parts[2]
+  };
+}
+function ignoreAbortError(e) {
+  if (e instanceof Error && e.name === "AbortError") {
+    return;
+  }
+  throw e;
+}
+var ActiveClientsManager = class _ActiveClientsManager {
+  clientGroupID;
+  clientID;
+  #resolver = resolver7();
+  #lockManager;
+  #activeClients = /* @__PURE__ */ new Set();
+  /**
+   * A callback that is called when a client is added to the client group.
+   * It receives the client ID of the added client.
+   */
+  onAdd;
+  /**
+   * A callback that is called when a client is deleted from the client group.
+   * It receives the client ID of the deleted client.
+   */
+  onDelete;
+  /**
+   * Creates an instance of `ActiveClientsManager` for the specified client
+   * group and client ID. It will return a promise that resolves when the
+   * instance is ready to use, which means that it has successfully acquired the
+   * exclusive lock for the client and has retrieved the list of active clients.
+   */
+  static async create(clientGroupID, clientID, signal) {
+    const instance = new _ActiveClientsManager(clientGroupID, clientID, signal);
+    await instance.#init(clientGroupID, clientID, signal);
+    return instance;
+  }
+  constructor(clientGroupID, clientID, signal) {
+    this.clientGroupID = clientGroupID;
+    this.clientID = clientID;
+    this.#lockManager = getClientLockManager(signal);
+    this.#activeClients.add(clientID);
+  }
+  async #init(clientGroupID, clientID, signal) {
+    const name = toLockName(clientGroupID, clientID);
+    const channel = new bc(toBroadcastChannelName(clientGroupID));
+    channel.addEventListener(
+      "message",
+      (e) => {
+        const client = fromLockName(e.data);
+        if (client?.clientGroupID === this.clientGroupID) {
+          this.#addClient(client.clientID);
+        }
+      },
+      { signal }
+    );
+    this.#lockManager.request(name, "exclusive", () => this.#resolver.promise).catch(ignoreAbortError);
+    signal.addEventListener(
+      "abort",
+      () => {
+        this.#lockManager.release(name, () => this.#resolver.resolve());
+        channel.close();
+      },
+      { once: true }
+    );
+    for (const clientID2 of await this.#getActiveClients()) {
+      if (clientID2 !== this.clientID) {
+        this.#addClient(clientID2);
+      }
+    }
+    if (!signal.aborted) {
+      channel.postMessage(name);
+    }
+  }
+  get activeClients() {
+    return this.#activeClients;
+  }
+  async #getActiveClients() {
+    const activeClients = /* @__PURE__ */ new Set();
+    for await (const lockName of this.#lockManager.queryExclusive()) {
+      const client = fromLockName(lockName);
+      if (client?.clientGroupID === this.clientGroupID) {
+        activeClients.add(client.clientID);
+      }
+    }
+    return activeClients;
+  }
+  /**
+   * This gets called when a new client is added to the client group.
+   *
+   * It will request a shared lock for the client, and when the exclusive lock
+   * is released, it will notify that the client has been deactivated.
+   */
+  #addSharedLockForOtherClient(clientID) {
+    const name = toLockName(this.clientGroupID, clientID);
+    this.#lockManager.request(name, "shared", () => this.#removeClient(clientID)).catch(ignoreAbortError);
+  }
+  #addClient(clientID) {
+    if (!this.#activeClients.has(clientID)) {
+      this.#activeClients.add(clientID);
+      this.#addSharedLockForOtherClient(clientID);
+      this.onAdd?.(clientID);
+    }
+  }
+  #removeClient(clientID) {
+    if (this.#activeClients.delete(clientID)) {
+      this.onDelete?.(clientID);
+    }
+  }
+};
+function getClientLockManager(signal) {
+  const locks = getBrowserGlobal("navigator")?.locks;
+  if (locks) {
+    return new NativeClientLockManager(locks, signal);
+  }
+  return new MockClientLockManager();
+}
+var NativeClientLockManager = class {
+  #locks;
+  #signal;
+  constructor(locks, signal) {
+    this.#locks = locks;
+    this.#signal = signal;
+  }
+  request(name, mode, fn) {
+    return this.#locks.request(name, { mode, signal: this.#signal }, fn);
+  }
+  release(_name, fn) {
+    fn();
+  }
+  async *queryExclusive() {
+    const snapshot = await this.#locks.query();
+    for (const lock of [
+      ...snapshot.held ?? [],
+      ...snapshot.pending ?? []
+    ]) {
+      if (lock.mode === "exclusive" && lock.name) {
+        yield lock.name;
+      }
+    }
+  }
+};
+var mockLockNames = /* @__PURE__ */ new Set();
+var mockListeners = /* @__PURE__ */ new Set();
+var MockClientLockManager = class {
+  #listeners = /* @__PURE__ */ new Set();
+  request(name, mode, fn) {
+    if (mode === "exclusive") {
+      mockLockNames.add(name);
+    } else {
+      mode;
+      const listener = (removed) => {
+        if (removed === name) {
+          mockListeners.delete(listener);
+          return fn();
+        }
+      };
+      mockListeners.add(listener);
+      this.#listeners.add(listener);
+    }
+    return Promise.resolve();
+  }
+  release(name, fn) {
+    mockLockNames.delete(name);
+    for (const listener of mockListeners) {
+      listener(name);
+    }
+    for (const listener of this.#listeners) {
+      mockListeners.delete(listener);
+    }
+    fn();
+  }
+  async *queryExclusive() {
+    yield* mockLockNames;
+  }
+};
+
 // ../zero-client/src/client/connection-state-enum.ts
 var Disconnected = 0;
 var Connecting = 1;
@@ -8331,7 +8533,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.22.2025063000";
+var version2 = "0.22.2025070200";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -8626,7 +8828,7 @@ var State = class {
 };
 
 // ../zero-client/src/client/mutation-tracker.ts
-import { resolver as resolver7 } from "@rocicorp/resolver";
+import { resolver as resolver8 } from "@rocicorp/resolver";
 var transientPushErrorTypes = [
   "zeroPusher",
   "http",
@@ -8656,7 +8858,7 @@ var MutationTracker = class {
   }
   trackMutation() {
     const id = nextEphemeralID();
-    const mutationResolver = resolver7();
+    const mutationResolver = resolver8();
     this.#outstandingMutations.set(id, {
       resolver: mutationResolver
     });
@@ -9684,12 +9886,12 @@ var Zero = class _Zero {
   };
   #zeroContext;
   queryDelegate;
-  #connectResolver = resolver8();
+  #connectResolver = resolver9();
   #pendingPullsByRequestID = /* @__PURE__ */ new Map();
   #lastMutationIDReceived = 0;
   #socket = void 0;
-  #socketResolver = resolver8();
-  #connectionStateChangeResolver = resolver8();
+  #socketResolver = resolver9();
+  #connectionStateChangeResolver = resolver9();
   /**
    * 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
@@ -9700,13 +9902,14 @@ var Zero = class _Zero {
   #visibilityWatcher;
   // We use an accessor pair to allow the subclass to override the setter.
   #connectionState = Disconnected;
+  #activeClientsManager;
   #setConnectionState(state) {
     if (state === this.#connectionState) {
       return;
     }
     this.#connectionState = state;
     this.#connectionStateChangeResolver.resolve(state);
-    this.#connectionStateChangeResolver = resolver8();
+    this.#connectionStateChangeResolver = resolver9();
     if (false) {
       asTestZero(this)[onSetConnectionStateSymbol]?.(state);
     }
@@ -9893,6 +10096,12 @@ var Zero = class _Zero {
     this.userID = userID;
     this.#lc = lc.withContext("clientID", rep.clientID);
     this.#mutationTracker.clientID = rep.clientID;
+    this.#activeClientsManager = makeActiveClientsManager(
+      rep.clientGroupID,
+      this.clientID,
+      this.#closeAbortController.signal,
+      (clientID) => this.#deleteClientsManager.onClientsDeleted([clientID], [])
+    );
     const onUpdateNeededCallback = (reason, serverErrorMsg) => {
       if (onUpdateNeeded) {
         onUpdateNeeded(reason);
@@ -10124,21 +10333,12 @@ var Zero = class _Zero {
     const lc = this.#lc.withContext("close");
     lc.debug?.("Closing Zero instance. Stack:", new Error().stack);
     if (this.#connectionState !== Disconnected) {
-      let closeReason = JSON.stringify([
-        "closeConnection",
-        []
-      ]);
-      if (closeReason.length > 123) {
-        lc.warn?.("Close reason is too long. Removing it.");
-        closeReason = "";
-      }
       this.#disconnect(
         lc,
         {
           client: "ClientClosed"
         },
-        CLOSE_CODE_NORMAL,
-        closeReason
+        CLOSE_CODE_NORMAL
       );
     }
     lc.debug?.("Aborting closeAbortController due to close()");
@@ -10148,15 +10348,6 @@ var Zero = class _Zero {
     this.#unexpose();
     return ret;
   }
-  #onPageHide = (e) => {
-    if (e.persisted) {
-      this.#lc.debug?.("Ignoring pagehide event because it was persisted");
-    } else {
-      this.#lc.debug?.("Closing client because we got a clean close");
-      this.close().catch(() => {
-      });
-    }
-  };
   #onMessage = (e) => {
     const lc = this.#lc;
     lc.debug?.("received message", e.data);
@@ -10417,7 +10608,8 @@ var Zero = class _Zero {
       lc,
       this.#options.push,
       this.#options.maxHeaderLength,
-      additionalConnectParams
+      additionalConnectParams,
+      await this.#activeClientsManager
     );
     if (this.closed) {
       return;
@@ -10429,10 +10621,6 @@ var Zero = class _Zero {
     ws.addEventListener("close", this.#onClose);
     this.#socket = ws;
     this.#socketResolver.resolve(ws);
-    getBrowserGlobal("window")?.addEventListener?.(
-      "pagehide",
-      this.#onPageHide
-    );
     try {
       lc.debug?.("Waiting for connection to be acknowledged");
       await this.#connectResolver.promise;
@@ -10447,7 +10635,7 @@ var Zero = class _Zero {
       );
     }
   }
-  #disconnect(lc, reason, closeCode, closeReason) {
+  #disconnect(lc, reason, closeCode) {
     if (this.#connectionState === Connecting) {
       this.#connectErrorCount++;
     }
@@ -10491,9 +10679,9 @@ var Zero = class _Zero {
         lc.error?.("disconnect() called while disconnected");
         break;
     }
-    this.#socketResolver = resolver8();
+    this.#socketResolver = resolver9();
     lc.debug?.("Creating new connect resolver");
-    this.#connectResolver = resolver8();
+    this.#connectResolver = resolver9();
     this.#setConnectionState(Disconnected);
     this.#messageCount = 0;
     this.#connectStart = void 0;
@@ -10501,14 +10689,10 @@ var Zero = class _Zero {
     this.#socket?.removeEventListener("message", this.#onMessage);
     this.#socket?.removeEventListener("open", this.#onOpen);
     this.#socket?.removeEventListener("close", this.#onClose);
-    this.#socket?.close(closeCode, closeReason);
+    this.#socket?.close(closeCode);
     this.#socket = void 0;
     this.#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
     this.#pokeHandler.handleDisconnect();
-    getBrowserGlobal("window")?.removeEventListener?.(
-      "pagehide",
-      this.#onPageHide
-    );
   }
   #handlePokeStart(_lc, pokeMessage) {
     this.#abortPingTimeout();
@@ -10544,12 +10728,12 @@ var Zero = class _Zero {
     const body = pullResponseMessage[1];
     lc = lc.withContext("requestID", body.requestID);
     lc.debug?.("Handling pull response", body);
-    const resolver9 = this.#pendingPullsByRequestID.get(body.requestID);
-    if (!resolver9) {
+    const resolver10 = this.#pendingPullsByRequestID.get(body.requestID);
+    if (!resolver10) {
       lc.debug?.("No resolver found");
       return;
     }
-    resolver9.resolve(pullResponseMessage[1]);
+    resolver10.resolve(pullResponseMessage[1]);
   }
   async #pusher(req, requestID) {
     assert(req.pushVersion === 1);
@@ -10680,7 +10864,7 @@ var Zero = class _Zero {
               PING_INTERVAL_MS,
               controller.signal
             );
-            this.#rejectMessageError = resolver8();
+            this.#rejectMessageError = resolver9();
             const PING = 0;
             const HIDDEN = 2;
             const raceResult = await promiseRace([
@@ -10790,7 +10974,7 @@ var Zero = class _Zero {
       }
     ];
     send(socket, pullRequestMessage);
-    const pullResponseResolver = resolver8();
+    const pullResponseResolver = resolver9();
     this.#pendingPullsByRequestID.set(requestID, pullResponseResolver);
     try {
       const TIMEOUT = 0;
@@ -10848,7 +11032,7 @@ var Zero = class _Zero {
    */
   async #ping(lc, messageErrorRejectionPromise) {
     lc.debug?.("pinging");
-    const { promise, resolve } = resolver8();
+    const { promise, resolve } = resolver9();
     this.#onPong = resolve;
     const pingMessage = ["ping", {}];
     const t0 = performance.now();
@@ -10894,7 +11078,7 @@ var Zero = class _Zero {
    */
   async inspect() {
     BUNDLE_SIZE: {
-      const m = await import("./inspector-LF6RTN44.js");
+      const m = await import("./inspector-WSEHHWA3.js");
       return m.newInspector(this.#rep, this.#schema, async () => {
         await this.#connectResolver.promise;
         return this.#socket;
@@ -10902,7 +11086,7 @@ var Zero = class _Zero {
     }
   }
 };
-async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushParams, maxHeaderLength = 1024 * 8, additionalConnectParams) {
+async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushParams, maxHeaderLength = 1024 * 8, additionalConnectParams, activeClientsManager) {
   const url = new URL(
     appendPath(socketOrigin, `/sync/v${PROTOCOL_VERSION}/connect`)
   );
@@ -10931,6 +11115,7 @@ async function createSocket(rep, queryManager, deleteClientsManager, socketOrigi
   const queriesPatchP = rep.query((tx) => queryManager.getQueriesPatch(tx));
   let deletedClients = await deleteClientsManager.getDeletedClients();
   let queriesPatch = await queriesPatchP;
+  const { activeClients } = activeClientsManager;
   let secProtocol = encodeSecProtocols(
     [
       "initConnection",
@@ -10940,7 +11125,8 @@ async function createSocket(rep, queryManager, deleteClientsManager, socketOrigi
         // The clientSchema only needs to be sent for the very first request.
         // Henceforth it is stored with the CVR and verified automatically.
         ...baseCookie === null ? { clientSchema } : {},
-        userPushParams
+        userPushParams,
+        activeClients: [...activeClients]
       }
     ],
     auth
@@ -11001,6 +11187,15 @@ var CloseError = class extends Error {
 };
 function assertValidRunOptions2(_options) {
 }
+async function makeActiveClientsManager(clientGroupID, clientID, signal, onDelete) {
+  const manager = await ActiveClientsManager.create(
+    await clientGroupID,
+    clientID,
+    signal
+  );
+  manager.onDelete = onDelete;
+  return manager;
+}
 
 export {
   getDefaultPuller,
@@ -11021,4 +11216,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-WOYR3FAT.js.map
+//# sourceMappingURL=chunk-HTNKB2W7.js.map