@rocicorp/zero 1.11.0-canary.1 → 1.11.0-canary.3

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

@@ -90,6 +90,11 @@ var DEFAULT_DISCONNECT_TIMEOUT_MS = 60 * 1e3;
 * consider it timed out.
 */
 var CONNECT_TIMEOUT_MS = 1e4;
+/**
+* Setting up active-client tracking blocks the first connect attempt. Above
+* this, say so.
+*/
+var SLOW_ACTIVE_CLIENTS_THRESHOLD_MS = 50;
 var CHECK_CONNECTIVITY_ON_ERROR_FREQUENCY = 6;
 var DEFAULT_QUERY_CHANGE_THROTTLE_MS = 10;
 function convertOnUpdateNeededReason(reason) {
@@ -302,6 +307,7 @@ var Zero = class Zero {
 		}, (ast, customQueryID, ttl, gotCallback) => this.#queryManager.addCustom(ast, customQueryID, ttl, gotCallback), (ast, ttl) => {
 			if (enableLegacyQueries) this.#queryManager.updateLegacy(ast, ttl);
 		}, (customQueryID, ttl) => this.#queryManager.updateCustom(customQueryID, ttl), () => this.#queryManager.flushBatch(), batchViewUpdates, this.#addMetric, assertValidRunOptions);
+		this.#zeroContext.deferPipelines();
 		this.query = createRunnableBuilder(this.#zeroContext, schema);
 		const rep = new ReplicacheImpl(replicacheOptions, {
 			enableClientGroupForking: false,
@@ -321,7 +327,7 @@ var Zero = class Zero {
 		this.#activeClientsManager = makeActiveClientsManager(rep.clientGroupID, this.clientID, this.#closeAbortController.signal, (clientID, clientGroupID) => this.#deleteClientsManager.onClientsDeleted([{
 			clientGroupID,
 			clientID
-		}]));
+		}]), this.#lc);
 		const onUpdateNeededCallback = (reason) => {
 			if (onUpdateNeeded) onUpdateNeeded(reason);
 			else reloadWithReason(this.#lc, this.#reload, reason.type, updateNeededReloadReasonMessage(reason));
@@ -933,11 +939,42 @@ var Zero = class Zero {
 		this.#socketResolver.resolve(ws);
 		this.#addConnectEvent(lc, attempt, "waiting for the server acknowledgement");
 		lc.debug?.("Waiting for connection to be acknowledged");
+		attempt.clearTimeout?.();
+		attempt.clearTimeout = this.#armConnectTimeout(lc, attempt, "ack");
 		await attempt.connected.promise;
 		if (signal.aborted) throw signal.reason;
 		this.#mutationTracker.onConnected(this.#lastMutationIDReceived);
 		this.#rep.push().catch(() => {});
 	}
+	/**
+	* Starts the deadline for one phase of a connection attempt, and returns a
+	* function that cancels it.
+	*
+	* The two phases are measured separately because they fail for unrelated
+	* reasons. `setup` covers local work — reading the cookie, the client group
+	* ID and the active clients from IDB, then preparing and opening the socket
+	* — whose duration says nothing about whether the server is reachable.
+	* `ack` covers the wait for the server's response. Running them on one
+	* budget meant a slow cold boot spent the server's time before the socket
+	* existed, and reported a healthy server as unreachable.
+	*/
+	#armConnectTimeout(lc, attempt, phase) {
+		const { signal } = attempt.controller;
+		if (signal.aborted) return () => {};
+		const timeoutID = setTimeout(() => {
+			lc.debug?.("Connection attempt timed out");
+			this.#disconnect(lc, new ClientError({
+				kind: ConnectTimeout,
+				message: (phase === "setup" ? `Connection setup timed out after ${CONNECT_TIMEOUT_MS / 1e3} seconds. ` : `Server did not acknowledge the connection within ${CONNECT_TIMEOUT_MS / 1e3} seconds. `) + `Connect events: ${JSON.stringify(attempt.events)}`
+			}));
+		}, CONNECT_TIMEOUT_MS);
+		const clear = () => {
+			clearTimeout(timeoutID);
+			signal.removeEventListener("abort", clear);
+		};
+		signal.addEventListener("abort", clear, { once: true });
+		return clear;
+	}
 	#addConnectEvent(lc, attempt, event) {
 		attempt.events.push([/* @__PURE__ */ new Date(), event]);
 		lc.debug?.("Connect event", event);
@@ -1146,16 +1183,10 @@ var Zero = class Zero {
 						};
 						this.#currentConnectAttempt = attempt;
 						this.#addConnectEvent(lc, attempt, "starting the connection");
+						attempt.clearTimeout = this.#armConnectTimeout(lc, attempt, "setup");
 						const canceled = resolver();
 						const abortHandler = () => canceled.reject(attempt.controller.signal.reason);
 						attempt.controller.signal.addEventListener("abort", abortHandler, { once: true });
-						const timeoutID = setTimeout(() => {
-							lc.debug?.("Connection attempt timed out");
-							this.#disconnect(lc, new ClientError({
-								kind: ConnectTimeout,
-								message: `Connection attempt timed out after ${CONNECT_TIMEOUT_MS / 1e3} seconds. Connect events: ${JSON.stringify(attempt.events)}`
-							}));
-						}, CONNECT_TIMEOUT_MS);
 						try {
 							try {
 								await Promise.race([this.#connectAttempt(lc, additionalConnectParams, attempt), canceled.promise]);
@@ -1172,7 +1203,7 @@ var Zero = class Zero {
 							ready.resolve();
 							additionalConnectParams = void 0;
 						} finally {
-							clearTimeout(timeoutID);
+							attempt.clearTimeout?.();
 							attempt.controller.signal.removeEventListener("abort", abortHandler);
 							if (this.#currentConnectAttempt === attempt) this.#currentConnectAttempt = void 0;
 						}
@@ -1549,8 +1580,14 @@ function addWebSocketIDToLogContext(wsid, lc) {
 	return lc.withContext("wsid", wsid);
 }
 function assertValidRunOptions(_options) {}
-async function makeActiveClientsManager(clientGroupID, clientID, signal, onDelete) {
-	const manager = await ActiveClientsManager.create(await clientGroupID, clientID, signal);
+async function makeActiveClientsManager(clientGroupID, clientID, signal, onDelete, lc) {
+	const groupID = await clientGroupID;
+	const start = performance.now();
+	const manager = await ActiveClientsManager.create(groupID, clientID, signal);
+	const elapsed = performance.now() - start;
+	const locks = getBrowserGlobal("navigator")?.locks ? "native" : "fallback";
+	if (elapsed > SLOW_ACTIVE_CLIENTS_THRESHOLD_MS) lc.warn?.(`Initializing active clients took ${Math.round(elapsed)}ms`, { locks });
+	else lc.debug?.("Initialized active clients in", Math.round(elapsed), "ms", { locks });
 	manager.onDelete = onDelete;
 	return manager;
 }