@rocicorp/zero 1.12.0-canary.1 → 1.12.0-canary.11

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

@@ -1,5 +1,6 @@
 import { assert, unreachable } from "../../../shared/src/asserts.js";
 import { getBrowserGlobal, mustGetBrowserGlobal } from "../../../shared/src/browser-env.js";
+import { resolver } from "../../../shared/src/resolver.js";
 import { AbortError } from "../../../shared/src/abort-error.js";
 import { sleep, sleepWithAbort } from "../../../shared/src/sleep.js";
 import { parse } from "../../../shared/src/valita.js";
@@ -21,7 +22,7 @@ import { Closed, Connected, Connecting, Disconnected, Error as Error$1, Initiali
 import { getDocumentVisibilityWatcher } from "../../../shared/src/document-visible.js";
 import { ReplicacheImpl } from "../../../replicache/src/replicache-impl.js";
 import "../../../replicache/src/impl.js";
-import { localNavigator } from "../../../shared/src/navigator.js";
+import { navigator as localNavigator } from "../../../shared/src/navigator.js";
 import { promiseRace } from "../../../shared/src/promise-race.js";
 import { emptyFunction } from "../../../shared/src/sentinels.js";
 import { Subscribable } from "../../../shared/src/subscribable.js";
@@ -58,8 +59,10 @@ import { reloadScheduled, reloadWithReason, reportReloadReason, resetBackoff } f
 import { getServer } from "./server-option.js";
 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";
+//#region ../zero-client/src/client/zero.ts
+var exposedToTestingSymbol = Symbol();
+var createLogOptionsSymbol = Symbol();
 function connectionReadyResolver() {
 	const ready = resolver();
 	ready.promise.catch(() => {});
@@ -77,12 +80,12 @@ var DEFAULT_PING_TIMEOUT_MS = 5e3;
 * request timed out.
 */
 var PULL_TIMEOUT_MS = 5e3;
-var DEFAULT_DISCONNECT_HIDDEN_DELAY_MS = 300 * 1e3;
+var DEFAULT_DISCONNECT_HIDDEN_DELAY_MS = 3e5;
 /**
 * The amount of time we allow for continuous connecting attempts before
 * transitioning to disconnected state.
 */
-var DEFAULT_DISCONNECT_TIMEOUT_MS = 60 * 1e3;
+var DEFAULT_DISCONNECT_TIMEOUT_MS = 6e4;
 /**
 * The amount of time we wait for a connection to be established before we
 * consider it timed out.
@@ -95,6 +98,7 @@ var CONNECT_TIMEOUT_MS = 1e4;
 var SLOW_ACTIVE_CLIENTS_THRESHOLD_MS = 50;
 var CHECK_CONNECTIVITY_ON_ERROR_FREQUENCY = 6;
 var DEFAULT_QUERY_CHANGE_THROTTLE_MS = 10;
+var LOGGED_OUT_STORAGE_USER_ID = "__anonymous__";
 function convertOnUpdateNeededReason(reason) {
 	return { type: reason.type };
 }
@@ -236,7 +240,8 @@ var Zero = class Zero {
 			message: "ZeroOptions.userID should not be empty. Omit it entirely for logged-out clients."
 		});
 		this.#checkAuthValid(userID ?? void 0, options.auth);
-		const server = getServer(options.cacheURL ?? options.server);
+		const cacheURL = options.cacheURL ?? options.server;
+		const server = getServer(cacheURL);
 		this.#enableAnalytics = shouldEnableAnalytics(server, false);
 		let { kvStore = "idb" } = options;
 		if (kvStore === "idb") {
@@ -277,11 +282,12 @@ var Zero = class Zero {
 		this.storageKey = storageKey ?? "";
 		const { clientSchema, hash } = clientSchemaFrom(schema);
 		this.#clientSchema = clientSchema;
-		const hashedKey = h64(JSON.stringify({
+		const nameKey = JSON.stringify({
 			storageKey: this.storageKey,
 			mutateUrl: options.mutateURL ?? "",
 			queryUrl: options.queryURL ?? options.getQueriesURL ?? ""
-		})).toString(36);
+		});
+		const hashedKey = h64(nameKey).toString(36);
 		const storageScopedUserID = userID ?? "__anonymous__";
 		const replicacheOptions = {
 			schemaVersion: `52.${hash}`,
@@ -307,14 +313,15 @@ var Zero = class Zero {
 			if (enableLegacyQueries) this.#queryManager.updateLegacy(ast, ttl);
 		}, (customQueryID, ttl) => this.#queryManager.updateCustom(customQueryID, ttl), () => this.#queryManager.flushBatch(), batchViewUpdates, this.#addMetric, assertValidRunOptions, this.#visibilityWatcher);
 		this.query = createRunnableBuilder(this.#zeroContext, schema);
-		const rep = new ReplicacheImpl(replicacheOptions, {
+		const replicacheImplOptions = {
 			enableClientGroupForking: false,
 			enableMutationRecovery: false,
 			enablePullAndPushInOpen: false,
 			enableRefresh: () => this.#enableRefresh(),
 			onClientsDeleted: (deletedClients) => this.#deleteClientsManager.onClientsDeleted(deletedClients),
 			zero: new ZeroRep(this.#zeroContext, this.#ivmMain, options.mutators !== void 0, this.#mutationTracker)
-		});
+		};
+		const rep = new ReplicacheImpl(replicacheOptions, replicacheImplOptions);
 		this.#rep = rep;
 		this.#server = server;
 		this.userID = userID ?? void 0;
@@ -772,9 +779,10 @@ var Zero = class Zero {
 				wasClean
 			});
 			if (code === 1009) {
+				const recentMessagesInfo = this.#recentSentMessages.length > 0 ? "\nRecent sent messages:\n" + JSON.stringify(this.#recentSentMessages, null, 2) : "";
 				const messageTooLargeError = new ClientError({
 					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) : "")
+					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." + recentMessagesInfo
 				});
 				this.#disconnect(lc, messageTooLargeError);
 				await this.#rep.disableClientGroup();
@@ -1538,7 +1546,7 @@ 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, onEvent) {
+async function createSocket(rep, queryManager, deleteClientsManager, socketOrigin, baseCookie, clientID, clientGroupID, clientSchema, userID, auth, lmid, wsid, debugPerf, lc, userPushURL, userPushHeaders, userQueryURL, userQueryHeaders, additionalConnectParams, activeClientsManager, maxHeaderLength = 8192, 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");
@@ -1573,7 +1581,7 @@ async function createSocket(rep, queryManager, deleteClientsManager, socketOrigi
 	];
 }
 async function createConnectionURL(socketOrigin, clientID, clientGroupID, userID, baseCookie, lmid, wsid, rep, debugPerf, additionalConnectParams, lc) {
-	const url = new URL(appendPath(socketOrigin, `/sync/v53/connect`));
+	const url = new URL(appendPath(socketOrigin, `/sync/v57/connect`));
 	const { searchParams } = url;
 	searchParams.set("clientID", clientID);
 	searchParams.set("clientGroupID", clientGroupID);
@@ -1630,6 +1638,6 @@ async function makeActiveClientsManager(clientGroupID, clientID, signal, onDelet
 	return manager;
 }
 //#endregion
-export { Zero };
+export { CONNECT_TIMEOUT_MS, DEFAULT_DISCONNECT_HIDDEN_DELAY_MS, DEFAULT_DISCONNECT_TIMEOUT_MS, DEFAULT_PING_TIMEOUT_MS, LOGGED_OUT_STORAGE_USER_ID, OnlineManager, PULL_TIMEOUT_MS, RUN_LOOP_INTERVAL_MS, Zero, createConnectionURL, createLogOptionsSymbol, createSocket, exposedToTestingSymbol };
 
 //# sourceMappingURL=zero.js.map