@rocicorp/zero 1.10.0-canary.0 → 1.10.0-canary.2

package/out/zero-client/src/client/zero.d.ts

@@ -125,9 +125,8 @@ export declare class Zero<const S extends BaseDefaultSchema = DefaultSchema, MD
     /**
      * Executes a query once and returns the results.
      *
-     * By default, waits for any pending data to sync before running the query.
-     * This ensures fresh results from the server. Use `{type: 'unknown'}` to
-     * run immediately with whatever data is available locally.
+     * By default, runs immediately with whatever data is available locally.
+     * Use `{type: 'complete'}` to wait for fresh results from the server.
      *
      * @param query - The query to execute
      * @param runOptions - Options controlling query execution
@@ -135,11 +134,11 @@ export declare class Zero<const S extends BaseDefaultSchema = DefaultSchema, MD
      *
      * @example
      * ```ts
-     * // Wait for server sync
+     * // Run with local data only
      * const users = await zero.run(userQuery);
      *
-     * // Run with local data only
-     * const cachedUsers = await zero.run(userQuery, {type: 'unknown'});
+     * // Wait for server sync
+     * const freshUsers = await zero.run(userQuery, {type: 'complete'});
      * ```
      */
     run<TTable extends keyof S['tables'] & string, TInput extends ReadonlyJSONValue | undefined, TOutput extends ReadonlyJSONValue | undefined, TReturn>(query: QueryOrQueryRequest<TTable, TInput, TOutput, S, TReturn, C>, runOptions?: RunOptions): Promise<HumanReadable<TReturn>>;
@@ -322,7 +321,7 @@ export declare class OnlineManager extends Subscribable<boolean> {
     setOnline(online: boolean): void;
     get online(): boolean;
 }
-export declare function createSocket(rep: ReplicacheImpl, queryManager: QueryManager, deleteClientsManager: DeleteClientsManager, socketOrigin: WSString, baseCookie: NullableVersion, clientID: string, clientGroupID: string, clientSchema: ClientSchema, userID: string | undefined, auth: string | undefined, lmid: number, wsid: string, debugPerf: boolean, lc: LogContext, userPushURL: string | undefined, userPushHeaders: Record<string, string> | undefined, userQueryURL: string | undefined, userQueryHeaders: Record<string, string> | undefined, additionalConnectParams: Record<string, string> | undefined, activeClientsManager: Pick<ActiveClientsManager, 'activeClients'>, maxHeaderLength?: number): Promise<[
+export declare function createSocket(rep: ReplicacheImpl, queryManager: QueryManager, deleteClientsManager: DeleteClientsManager, socketOrigin: WSString, baseCookie: NullableVersion, clientID: string, clientGroupID: string, clientSchema: ClientSchema, userID: string | undefined, auth: string | undefined, lmid: number, wsid: string, debugPerf: boolean, lc: LogContext, userPushURL: string | undefined, userPushHeaders: Record<string, string> | undefined, userQueryURL: string | undefined, userQueryHeaders: Record<string, string> | undefined, additionalConnectParams: Record<string, string> | undefined, activeClientsManager: Pick<ActiveClientsManager, 'activeClients'>, maxHeaderLength?: number, onEvent?: (event: string) => void): Promise<[
     WebSocket,
     Map<string, UpQueriesPatchOp> | undefined,
     DeleteClientsBody | undefined

package/out/zero-client/src/client/zero.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zero.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zero.d.ts","sourceRoot":"","sources":["../../../../../zero-client/src/client/zero.ts"],"names":[],"mappings":"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"}

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

@@ -37,7 +37,7 @@ import { isClientMetric } from "../../../zql/src/query/metrics-delegate.js";
 import { nanoid } from "../util/nanoid.js";
 import { ActiveClientsManager } from "./active-clients-manager.js";
 import { AbruptClose, CleanClose, ClientClosed, ConnectTimeout, Hidden, Internal, InvalidMessage as InvalidMessage$1, NoSocketOrigin, PingTimeout, PullTimeout, UnexpectedBaseCookie } from "./client-error-kind-enum.js";
-import { ClientError, NO_STATUS_TRANSITION, getBackoffParams, getErrorConnectionTransition, isAuthError, isClientError, isServerError } from "./error.js";
+import { ClientError, NO_STATUS_TRANSITION, getBackoffParams, getErrorConnectionTransition, isAuthError, isClientError, isServerError, isZeroError } from "./error.js";
 import { ConnectionManager, throwIfConnectionError } from "./connection-manager.js";
 import { ConnectionImpl } from "./connection.js";
 import { IVMSourceBranch } from "./ivm-branch.js";
@@ -61,6 +61,11 @@ import { PokeHandler } from "./zero-poke-handler.js";
 import { ZeroRep, fromReplicacheAuthToken, toReplicacheAuthToken } from "./zero-rep.js";
 import { resolver } from "@rocicorp/resolver";
 import { LogContext } from "@rocicorp/logger";
+function connectionReadyResolver() {
+	const ready = resolver();
+	ready.promise.catch(() => {});
+	return ready;
+}
 var RUN_LOOP_INTERVAL_MS = 5e3;
 /**
 * Default timeout for ping operations. Controls both:
@@ -85,10 +90,6 @@ var DEFAULT_DISCONNECT_TIMEOUT_MS = 60 * 1e3;
 */
 var CONNECT_TIMEOUT_MS = 1e4;
 var CHECK_CONNECTIVITY_ON_ERROR_FREQUENCY = 6;
-var NULL_LAST_MUTATION_ID_SENT = {
-	clientID: "",
-	id: -1
-};
 var DEFAULT_QUERY_CHANGE_THROTTLE_MS = 10;
 function convertOnUpdateNeededReason(reason) {
 	return { type: reason.type };
@@ -150,7 +151,30 @@ var Zero = class Zero {
 	* established.
 	*/
 	#deletedClients;
-	#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
+	/**
+	* The highest mutation ID we have sent on the current connection, for each
+	* client in our client group.
+	*
+	* The mutations we push are the client group's local commit chain, so they
+	* include mutations made by every tab in the group, not just this one. The
+	* order of that chain changes from one push to the next: when we persist our
+	* own mutations they move to the end of the chain, behind whatever the other
+	* tabs persisted in the meantime. So a mutation from another tab can end up
+	* in front of one we already sent, which means we cannot decide what to send
+	* next by remembering a single position in the chain. Remembering the last ID
+	* we sent for each client works no matter how the chain is ordered: we never
+	* skip a mutation, and we never leave a hole in a client's run of mutation
+	* IDs (the server rejects a hole as an invalid push).
+	*
+	* Cleared whenever the connection is established or torn down. The server
+	* does remember what it has processed, in a last mutation ID per client, and
+	* it ignores anything it has already applied. But we don't know which of our
+	* sends actually made it across before the socket died, so we start over and
+	* let the server drop the duplicates. The only mutations we don't resend are
+	* the ones the server has acknowledged in a poke, because those have already
+	* been rebased out of the commit chain.
+	*/
+	#lastMutationIDsSent = /* @__PURE__ */ new Map();
 	#onPong = () => void 0;
 	#onlineManager;
 	#onUpdateNeeded;
@@ -178,12 +202,8 @@ var Zero = class Zero {
 	#lastMutationIDReceived = 0;
 	#socket = void 0;
 	#socketResolver = resolver();
-	/**
-	* Utility promise that resolves when the socket transitions to connected.
-	* It rejects if we hit an error or timeout before the connected message.
-	* Used by push/pull helpers to queue work until the connection is usable.
-	*/
-	#connectResolver = resolver();
+	#connectionReadyResolver = connectionReadyResolver();
+	#currentConnectAttempt;
 	#closeAbortController = new AbortController();
 	#visibilityWatcher;
 	#connectionManager;
@@ -427,9 +447,8 @@ var Zero = class Zero {
 	/**
 	* Executes a query once and returns the results.
 	*
-	* By default, waits for any pending data to sync before running the query.
-	* This ensures fresh results from the server. Use `{type: 'unknown'}` to
-	* run immediately with whatever data is available locally.
+	* By default, runs immediately with whatever data is available locally.
+	* Use `{type: 'complete'}` to wait for fresh results from the server.
 	*
 	* @param query - The query to execute
 	* @param runOptions - Options controlling query execution
@@ -437,11 +456,11 @@ var Zero = class Zero {
 	*
 	* @example
 	* ```ts
-	* // Wait for server sync
+	* // Run with local data only
 	* const users = await zero.run(userQuery);
 	*
-	* // Run with local data only
-	* const cachedUsers = await zero.run(userQuery, {type: 'unknown'});
+	* // Wait for server sync
+	* const freshUsers = await zero.run(userQuery, {type: 'complete'});
 	* ```
 	*/
 	run(query, runOptions) {
@@ -713,7 +732,6 @@ var Zero = class Zero {
 					kind: InvalidMessage$1,
 					message: "A WebSocket message exceeded the server message size limit. This is usually caused by a mutation's args containing a large value such as a base64-encoded image. Consider uploading large files to object storage and storing only the URL in Zero." + (this.#recentSentMessages.length > 0 ? "\nRecent sent messages:\n" + JSON.stringify(this.#recentSentMessages, null, 2) : "")
 				});
-				this.#connectResolver.reject(messageTooLargeError);
 				this.#disconnect(lc, messageTooLargeError);
 				await this.#rep.disableClientGroup();
 				this.#onClientStateNotFound(InvalidMessage, messageTooLargeError.message);
@@ -725,7 +743,6 @@ var Zero = class Zero {
 					kind: AbruptClose,
 					message: "WebSocket connection closed abruptly"
 				});
-				this.#connectResolver.reject(closeError);
 				this.#disconnect(lc, closeError);
 			}
 		} catch (e) {
@@ -734,22 +751,19 @@ var Zero = class Zero {
 				kind: Internal,
 				message: getErrorMessage(e)
 			}, { cause: e });
-			this.#connectResolver.reject(internalError);
 			this.#disconnect(lc, internalError);
 		}
 	};
 	async #handleErrorMessage(lc, downMessage) {
 		const [, { kind, message }] = downMessage;
 		if (kind === "MutationRateLimited") {
-			this.#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
+			this.#lastMutationIDsSent.clear();
 			lc.error?.(kind, "Mutation rate limited", { message });
 			return;
 		}
 		lc.info?.(`${kind}: ${message}}`);
 		const error = new ProtocolError(downMessage[1]);
 		lc.error?.(`${error.kind}:\n\n${error.errorBody.message}`, error);
-		lc.debug?.("Rejecting connect resolver due to error", error);
-		this.#connectResolver.reject(error);
 		this.#disconnect(lc, error);
 		if (kind === "VersionNotSupported") this.#onUpdateNeeded({
 			type: kind,
@@ -770,9 +784,11 @@ var Zero = class Zero {
 		}
 	}
 	async #handleConnectedMessage(lc, connectedMessage) {
+		const attempt = must(this.#currentConnectAttempt, "Connected message received without an active connection attempt");
 		const now = Date.now();
 		const [, connectBody] = connectedMessage;
 		lc = addWebSocketIDToLogContext(connectBody.wsid, lc);
+		this.#addConnectEvent(lc, attempt, "processing the server acknowledgement");
 		if (this.#connectedCount === 0) this.#checkConnectivity("firstConnect");
 		else if (this.#connectErrorCount > 0) this.#checkConnectivity("connectAfterError");
 		this.#connectedCount++;
@@ -804,7 +820,7 @@ var Zero = class Zero {
 			connectedCount: this.#connectedCount,
 			proceedingConnectErrorCount
 		});
-		this.#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
+		this.#lastMutationIDsSent.clear();
 		lc.debug?.("Resolving connect resolver");
 		must(this.#socket);
 		const queriesPatch = await this.#rep.query((tx) => this.#queryManager.getQueriesPatch(tx, this.#initConnectionQueries));
@@ -838,29 +854,26 @@ var Zero = class Zero {
 		this.#initConnectionQueries = void 0;
 		maybeSendDeletedClients();
 		this.#connectionManager.connected();
-		this.#connectResolver.resolve();
+		attempt.connected.resolve();
 	}
 	/**
 	* Starts a new connection. This will create the WebSocket that does the HTTP
 	* request to the server.
 	*
-	* {@link #connect} will throw an assertion error if the
+	* {@link #connectAttempt} will throw an assertion error if the
 	* {@link #connectionManager} status is not {@link ConnectionManagerState.Disconnected}
 	* or {@link ConnectionManagerState.Connecting}.
 	* Callers MUST check the connection status before calling this method and log
 	* an error as needed.
 	*
-	* The function will resolve once the socket is connected. If you need to know
-	* when a connection has been established, as in we have received the
-	* {@link ConnectedMessage}, you should await the {@link #connectResolver}
-	* promise. The {@link #connectResolver} promise rejects if an error message
-	* is received before the connected message is received or if the connection
-	* attempt times out.
+	* The returned promise resolves after receiving the {@link ConnectedMessage}
+	* and rejects if setup, the socket, or the connection handshake fails.
 	*/
-	async #connect(lc, additionalConnectParams) {
+	async #connectAttempt(lc, additionalConnectParams, attempt) {
 		if (this.closed) return;
 		assert(this.#server, "No server provided");
-		assert(this.#connectionManager.is("disconnected") || this.#connectionManager.is("connecting"), "connect() called from invalid state: " + this.#connectionManager.state.name);
+		const socketOrigin = toWSString(this.#server);
+		assert(this.#connectionManager.is("disconnected") || this.#connectionManager.is("connecting"), "connectAttempt() called from invalid state: " + this.#connectionManager.state.name);
 		const wsid = nanoid();
 		lc = addWebSocketIDToLogContext(wsid, lc);
 		lc.info?.("Connecting...", { navigatorOnline: localNavigator?.onLine });
@@ -869,24 +882,24 @@ var Zero = class Zero {
 		const now = Date.now();
 		this.#connectStart = now;
 		if (this.#totalToConnectStart === void 0) this.#totalToConnectStart = now;
-		if (this.closed) return;
-		this.#connectCookie = parse(await this.#rep.cookie, nullableVersionSchema, "passthrough");
-		if (this.closed) return;
-		const timeoutID = setTimeout(() => {
-			lc.debug?.("Rejecting connect resolver due to timeout");
-			const timeoutError = new ClientError({
-				kind: ConnectTimeout,
-				message: `Connection attempt timed out after ${CONNECT_TIMEOUT_MS / 1e3} seconds`
-			});
-			this.#connectResolver.reject(timeoutError);
-			this.#disconnect(lc, timeoutError);
-		}, CONNECT_TIMEOUT_MS);
-		const abortHandler = () => {
-			clearTimeout(timeoutID);
-		};
-		this.#closeAbortController.signal.addEventListener("abort", abortHandler);
-		const [ws, initConnectionQueries, deletedClients] = await createSocket(this.#rep, this.#queryManager, this.#deleteClientsManager, toWSString(this.#server), this.#connectCookie, this.clientID, await this.clientGroupID, this.#clientSchema, this.userID, fromReplicacheAuthToken(this.#rep.auth), this.#lastMutationIDReceived, wsid, this.#options.logLevel === "debug", lc, this.#options.mutateURL, this.#options.mutateHeaders, this.#options.queryURL ?? this.#options.getQueriesURL, this.#options.queryHeaders, additionalConnectParams, await this.#activeClientsManager, this.#options.maxHeaderLength);
-		if (this.closed) return;
+		const { signal } = attempt.controller;
+		this.#addConnectEvent(lc, attempt, "reading the cookie");
+		const connectCookie = parse(await this.#rep.cookie, nullableVersionSchema, "passthrough");
+		this.#addConnectEvent(lc, attempt, "reading the client group ID");
+		const clientGroupID = await this.clientGroupID;
+		this.#addConnectEvent(lc, attempt, "initializing active clients");
+		const activeClientsManager = await this.#activeClientsManager;
+		if (signal.aborted) throw signal.reason;
+		const [ws, initConnectionQueries, deletedClients] = await createSocket(this.#rep, this.#queryManager, this.#deleteClientsManager, socketOrigin, connectCookie, this.clientID, clientGroupID, this.#clientSchema, this.userID, fromReplicacheAuthToken(this.#rep.auth), this.#lastMutationIDReceived, wsid, this.#options.logLevel === "debug", lc, this.#options.mutateURL, this.#options.mutateHeaders, this.#options.queryURL ?? this.#options.getQueriesURL, this.#options.queryHeaders, additionalConnectParams, activeClientsManager, this.#options.maxHeaderLength, (event) => this.#addConnectEvent(lc, attempt, event));
+		if (signal.aborted) {
+			ws.close();
+			throw signal.reason;
+		}
+		if (this.closed) {
+			ws.close();
+			return;
+		}
+		this.#connectCookie = connectCookie;
 		this.#initConnectionQueries = initConnectionQueries;
 		this.#deletedClients = deletedClients;
 		ws.addEventListener("message", this.#onMessage);
@@ -894,17 +907,19 @@ var Zero = class Zero {
 		ws.addEventListener("close", this.#onClose);
 		this.#socket = ws;
 		this.#socketResolver.resolve(ws);
-		try {
-			lc.debug?.("Waiting for connection to be acknowledged");
-			await this.#connectResolver.promise;
-			this.#mutationTracker.onConnected(this.#lastMutationIDReceived);
-			this.#rep.push().catch(() => {});
-		} finally {
-			clearTimeout(timeoutID);
-			this.#closeAbortController.signal.removeEventListener("abort", abortHandler);
-		}
+		this.#addConnectEvent(lc, attempt, "waiting for the server acknowledgement");
+		lc.debug?.("Waiting for connection to be acknowledged");
+		await attempt.connected.promise;
+		if (signal.aborted) throw signal.reason;
+		this.#mutationTracker.onConnected(this.#lastMutationIDReceived);
+		this.#rep.push().catch(() => {});
+	}
+	#addConnectEvent(lc, attempt, event) {
+		attempt.events.push([/* @__PURE__ */ new Date(), event]);
+		lc.debug?.("Connect event", event);
 	}
 	#disconnect(lc, reason, closeCode) {
+		this.#currentConnectAttempt?.controller.abort(reason);
 		if (shouldReportConnectError(reason)) {
 			this.#connectErrorCount++;
 			this.#metrics.lastConnectError.set(getLastConnectErrorValue(reason));
@@ -938,8 +953,6 @@ var Zero = class Zero {
 			default: unreachable(connectionStatus);
 		}
 		this.#socketResolver = resolver();
-		lc.debug?.("Creating new connect resolver");
-		this.#connectResolver = resolver();
 		this.#messageCount = 0;
 		this.#connectStart = void 0;
 		this.#connectedAt = 0;
@@ -948,7 +961,7 @@ var Zero = class Zero {
 		this.#socket?.removeEventListener("close", this.#onClose);
 		this.#socket?.close(closeCode);
 		this.#socket = void 0;
-		this.#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
+		this.#lastMutationIDsSent.clear();
 		this.#pokeHandler.handleDisconnect();
 		this.#queryManager.clearGotQueriesAuthoritative();
 		const transition = getErrorConnectionTransition(reason);
@@ -1010,16 +1023,15 @@ var Zero = class Zero {
 	}
 	async #pusher(req, requestID) {
 		assert(req.pushVersion === 1, "Expected pushVersion 1");
-		await this.#connectResolver.promise;
+		await this.#connectionReadyResolver.promise;
 		const lc = this.#lc.withContext("requestID", requestID);
 		lc.debug?.(`pushing ${req.mutations.length} mutations`);
 		assert(this.#socket, "Expected socket to be connected for push");
 		const isMutationRecoveryPush = req.clientGroupID !== await this.clientGroupID;
-		const start = isMutationRecoveryPush ? 0 : req.mutations.findIndex((m) => m.clientID === this.#lastMutationIDSent.clientID && m.id === this.#lastMutationIDSent.id) + 1;
-		lc.debug?.(isMutationRecoveryPush ? "pushing for recovery" : "pushing", req.mutations.length - start, "mutations of", req.mutations.length, "mutations.");
+		const toSend = isMutationRecoveryPush ? req.mutations : req.mutations.filter((m) => m.id > (this.#lastMutationIDsSent.get(m.clientID) ?? 0));
+		lc.debug?.(isMutationRecoveryPush ? "pushing for recovery" : "pushing", toSend.length, "mutations of", req.mutations.length, "mutations.");
 		const now = Date.now();
-		for (let i = start; i < req.mutations.length; i++) {
-			const m = req.mutations[i];
+		for (const m of toSend) {
 			const timestamp = now - Math.round(performance.now() - m.timestamp);
 			const zeroM = m.name === "_zero_crud" ? {
 				type: CRUD,
@@ -1045,10 +1057,7 @@ var Zero = class Zero {
 				traceparent: this.#options.getTraceparent?.()
 			}];
 			this.#send(msg);
-			if (!isMutationRecoveryPush) this.#lastMutationIDSent = {
-				clientID: m.clientID,
-				id: m.id
-			};
+			if (!isMutationRecoveryPush) this.#lastMutationIDsSent.set(m.clientID, m.id);
 		}
 		return { httpRequestInfo: {
 			errorMessage: "",
@@ -1098,8 +1107,45 @@ var Zero = class Zero {
 							break;
 						}
 						if (reloadScheduled()) break;
-						await this.#connect(lc, additionalConnectParams);
-						additionalConnectParams = void 0;
+						const ready = this.#connectionReadyResolver;
+						assert(this.#currentConnectAttempt === void 0, "Connection attempt already active");
+						const attempt = {
+							controller: new AbortController(),
+							connected: resolver(),
+							events: []
+						};
+						this.#currentConnectAttempt = attempt;
+						this.#addConnectEvent(lc, attempt, "starting the connection");
+						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]);
+							} catch (ex) {
+								const error = isZeroError(ex) ? ex : new ClientError({
+									kind: Internal,
+									message: getErrorMessage(ex)
+								}, { cause: ex });
+								if (!attempt.controller.signal.aborted) this.#disconnect(lc, error);
+								ready.reject(error);
+								if (this.#connectionReadyResolver === ready) this.#connectionReadyResolver = connectionReadyResolver();
+								throw error;
+							}
+							ready.resolve();
+							additionalConnectParams = void 0;
+						} finally {
+							clearTimeout(timeoutID);
+							attempt.controller.signal.removeEventListener("abort", abortHandler);
+							if (this.#currentConnectAttempt === attempt) this.#currentConnectAttempt = void 0;
+						}
 						throwIfConnectionError(this.#connectionManager.state);
 						assert(this.#socket, "Expected socket after reconnection");
 						lc = getLogContext();
@@ -1107,32 +1153,37 @@ var Zero = class Zero {
 						break;
 					}
 					case Connected: {
+						const ready = this.#connectionReadyResolver;
 						const controller = new AbortController();
 						this.#abortPingTimeout = () => controller.abort();
 						const [pingTimeoutPromise, pingTimeoutAborted] = sleepWithAbort(this.pingTimeoutMs, controller.signal);
-						const raceResult = await promiseRace({
-							waitForPing: pingTimeoutPromise,
-							waitForPingAborted: pingTimeoutAborted,
-							tabHidden: this.#visibilityWatcher.waitForHidden(),
-							stateChange: this.#connectionManager.waitForStateChange()
-						});
-						switch (raceResult.key) {
-							case "waitForPing":
-								await this.#ping(lc);
-								break;
-							case "waitForPingAborted": break;
-							case "tabHidden": {
-								const hiddenError = new ClientError({
-									kind: Hidden,
-									message: "Connection closed because tab was hidden"
-								});
-								this.#disconnect(lc, hiddenError);
-								break;
+						try {
+							const raceResult = await promiseRace({
+								waitForPing: pingTimeoutPromise,
+								waitForPingAborted: pingTimeoutAborted,
+								tabHidden: this.#visibilityWatcher.waitForHidden(),
+								stateChange: this.#connectionManager.waitForStateChange()
+							});
+							switch (raceResult.key) {
+								case "waitForPing":
+									await this.#ping(lc);
+									break;
+								case "waitForPingAborted": break;
+								case "tabHidden": {
+									const hiddenError = new ClientError({
+										kind: Hidden,
+										message: "Connection closed because tab was hidden"
+									});
+									this.#disconnect(lc, hiddenError);
+									break;
+								}
+								case "stateChange":
+									throwIfConnectionError(raceResult.result);
+									break;
+								default: unreachable(raceResult);
 							}
-							case "stateChange":
-								throwIfConnectionError(raceResult.result);
-								break;
-							default: unreachable(raceResult);
+						} finally {
+							if (!this.#connectionManager.is("connected") && this.#connectionReadyResolver === ready) this.#connectionReadyResolver = connectionReadyResolver();
 						}
 						break;
 					}
@@ -1213,7 +1264,7 @@ var Zero = class Zero {
 			errorMessage: "",
 			httpStatusCode: 200
 		} };
-		await this.#connectResolver.promise;
+		await this.#connectionReadyResolver.promise;
 		assert(this.#socket, "Expected socket to be connected for mutation recovery pull");
 		lc.debug?.("Pull is for mutation recovery");
 		const cookie = parse(req.cookie, nullableVersionSchema, "passthrough");
@@ -1340,7 +1391,7 @@ var Zero = class Zero {
 	*/
 	get inspector() {
 		BUNDLE_SIZE: return this.#inspector ??= new Inspector(this.#rep, this.#queryManager, this.#zeroContext, async () => {
-			await this.#connectResolver.promise;
+			await this.#connectionReadyResolver.promise;
 			return must(this.#socket);
 		});
 	}
@@ -1388,11 +1439,14 @@ var OnlineManager = class extends Subscribable {
 		return this.#online;
 	}
 };
-async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushURL, userPushHeaders, userQueryURL, userQueryHeaders, additionalConnectParams, activeClientsManager, maxHeaderLength = 1024 * 8) {
+async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushURL, userPushHeaders, userQueryURL, userQueryHeaders, additionalConnectParams, activeClientsManager, maxHeaderLength = 1024 * 8, onEvent) {
+	onEvent?.("reading the profile ID");
 	const url = await createConnectionURL(socketOrigin, clientID, clientGroupID, userID, baseCookie, lmid, wsid, rep, debugPerf, additionalConnectParams, lc);
 	const WS = mustGetBrowserGlobal("WebSocket");
 	const queriesPatchP = rep.query((tx) => queryManager.getQueriesPatch(tx));
+	onEvent?.("reading deleted clients");
 	let deletedClients = convertDeletedClientsToBody(await deleteClientsManager.getDeletedClients(), clientGroupID);
+	onEvent?.("reading desired queries");
 	let queriesPatch = await queriesPatchP;
 	const { activeClients } = activeClientsManager;
 	let secProtocol = encodeSecProtocols(["initConnection", {
@@ -1410,6 +1464,7 @@ async function createSocket(rep, queryManager, deleteClientsManager, socketOrigi
 		if (secProtocol.length > maxHeaderLength) lc.warn?.(`Encoded auth token length (${secProtocol.length}) exceeds ZeroOptions.maxHeaderLength (${maxHeaderLength}). This may cause connection failures.`);
 		queriesPatch = void 0;
 	} else deletedClients = void 0;
+	onEvent?.("creating the WebSocket");
 	return [
 		new WS(url.toString(), secProtocol),
 		queriesPatch,