@rocicorp/zero 0.25.0-canary.18 → 0.25.0-canary.21

package/out/zero-client/src/client/zero.js

@@ -34,7 +34,6 @@ import "../../../zero-protocol/src/ast.js";
 import { nanoid } from "../util/nanoid.js";
 import { send } from "../util/socket.js";
 import { ActiveClientsManager } from "./active-clients-manager.js";
-import { registerZeroDelegate } from "./bindings.js";
 import { Internal, ClientClosed, InvalidMessage, CleanClose, AbruptClose, ConnectTimeout, UnexpectedBaseCookie, NoSocketOrigin, Hidden, PullTimeout, PingTimeout } from "./client-error-kind-enum.js";
 import { ConnectionManager, throwIfConnectionError } from "./connection-manager.js";
 import { Connected, Closed, Disconnected, Connecting, Error as Error$1, NeedsAuth } from "./connection-status-enum.js";
@@ -329,7 +328,6 @@ class Zero {
       this.#addMetric,
       assertValidRunOptions
     );
-    registerZeroDelegate(this, this.#zeroContext);
     this.query = createRunnableBuilder(this.#zeroContext, schema);
     const replicacheImplOptions = {
       enableClientGroupForking: false,
@@ -443,7 +441,8 @@ class Zero {
       (msg) => this.#send(msg),
       rep.perdag,
       this.#lc,
-      this.#rep.clientGroupID
+      this.#rep.clientGroupID,
+      rep.clientID
     );
     reportReloadReason(this.#lc);
     this.#metrics = new MetricManager({
@@ -1645,30 +1644,19 @@ class OnlineManager extends Subscribable {
   }
 }
 async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushURL, userQueryURL, additionalConnectParams, activeClientsManager, maxHeaderLength = 1024 * 8) {
-  const url = new URL(
-    appendPath(socketOrigin, `/sync/v${PROTOCOL_VERSION}/connect`)
+  const url = await createConnectionURL(
+    socketOrigin,
+    clientID,
+    clientGroupID,
+    userID,
+    baseCookie,
+    lmid,
+    wsid,
+    rep,
+    debugPerf,
+    additionalConnectParams,
+    lc
   );
-  const { searchParams } = url;
-  searchParams.set("clientID", clientID);
-  searchParams.set("clientGroupID", clientGroupID);
-  searchParams.set("userID", userID);
-  searchParams.set("baseCookie", baseCookie === null ? "" : String(baseCookie));
-  searchParams.set("ts", String(performance.now()));
-  searchParams.set("lmid", String(lmid));
-  searchParams.set("wsid", wsid);
-  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");
   const queriesPatchP = rep.query((tx) => queryManager.getQueriesPatch(tx));
   const deletedClientsArray = await deleteClientsManager.getDeletedClients();
@@ -1712,6 +1700,34 @@ async function createSocket(rep, queryManager, deleteClientsManager, socketOrigi
     skipEmptyDeletedClients(deletedClients)
   ];
 }
+async function createConnectionURL(socketOrigin, clientID, clientGroupID, userID, baseCookie, lmid, wsid, rep, debugPerf, additionalConnectParams, lc) {
+  const url = new URL(
+    appendPath(socketOrigin, `/sync/v${PROTOCOL_VERSION}/connect`)
+  );
+  const { searchParams } = url;
+  searchParams.set("clientID", clientID);
+  searchParams.set("clientGroupID", clientGroupID);
+  searchParams.set("userID", userID);
+  searchParams.set("baseCookie", baseCookie === null ? "" : String(baseCookie));
+  searchParams.set("ts", String(performance.now()));
+  searchParams.set("lmid", String(lmid));
+  searchParams.set("wsid", wsid);
+  searchParams.set("profileID", await rep.profileID);
+  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());
+  return url;
+}
 function skipEmptyArray(arr) {
   return arr && arr.length > 0 ? arr : void 0;
 }
@@ -1765,6 +1781,7 @@ export {
   PULL_TIMEOUT_MS,
   RUN_LOOP_INTERVAL_MS,
   Zero,
+  createConnectionURL,
   createSocket
 };
 //# sourceMappingURL=zero.js.map