@rocicorp/zero 1.6.0-canary.12 → 1.6.0-canary.13

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

@@ -10,7 +10,7 @@ import { IDBDatabasesStore } from "../../../replicache/src/persist/idb-databases
 import { dropDatabase } from "../../../replicache/src/persist/collect-idb-databases.js";
 import { getErrorMessage } from "../../../shared/src/error.js";
 import { must } from "../../../shared/src/must.js";
-import { ClientNotFound, InvalidMessage } from "../../../zero-protocol/src/error-kind-enum.js";
+import { ClientNotFound } from "../../../zero-protocol/src/error-kind-enum.js";
 import { ProtocolError } from "../../../zero-protocol/src/error.js";
 import { h64 } from "../../../shared/src/hash.js";
 import "../../../zero-protocol/src/client-schema.js";
@@ -35,8 +35,9 @@ import { downstreamSchema } from "../../../zero-protocol/src/down.js";
 import "../../../zero-protocol/src/protocol-version.js";
 import { isClientMetric } from "../../../zql/src/query/metrics-delegate.js";
 import { nanoid } from "../util/nanoid.js";
+import { send } from "../util/socket.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 { AbruptClose, CleanClose, ClientClosed, ConnectTimeout, Hidden, Internal, InvalidMessage, NoSocketOrigin, PingTimeout, PullTimeout, UnexpectedBaseCookie } from "./client-error-kind-enum.js";
 import { ClientError, NO_STATUS_TRANSITION, getBackoffParams, getErrorConnectionTransition, isAuthError, isClientError, isServerError } from "./error.js";
 import { ConnectionManager, throwIfConnectionError } from "./connection-manager.js";
 import { ConnectionImpl } from "./connection.js";
@@ -162,7 +163,6 @@ var Zero = class Zero {
 	#connectErrorCount = 0;
 	#abortPingTimeout = () => {};
 	#forceEnableRefresh = false;
-	#recentSentMessages = [];
 	/**
 	* The timeout in milliseconds for ping operations. Controls both:
 	* - How long to wait in idle before sending a ping
@@ -246,7 +246,7 @@ var Zero = class Zero {
 		this.#connectionManager.subscribe(syncConnectionState);
 		const sink = logOptions.logSink;
 		const lc = new LogContext(logOptions.logLevel, {}, sink);
-		this.#mutationTracker = new MutationTracker(lc, (upTo) => this.#sendIfConnected(["ackMutationResponses", upTo]), (error) => this.#disconnect(lc, error));
+		this.#mutationTracker = new MutationTracker(lc, (upTo) => this.#send(["ackMutationResponses", upTo]), (error) => this.#disconnect(lc, error));
 		this.#ivmMain = new IVMSourceBranch(schema.tables);
 		const { enableLegacyQueries = false } = schema;
 		const replicacheMutators = makeReplicacheMutators(schema, options.mutators, this.context, lc);
@@ -335,12 +335,12 @@ var Zero = class Zero {
 				...msg[1],
 				traceparent: this.#options.getTraceparent?.()
 			};
-			this.#sendIfConnected([msg[0], body]);
+			this.#send([msg[0], body]);
 		}, rep.experimentalWatch.bind(rep), maxRecentQueries, options.queryChangeThrottleMs ?? DEFAULT_QUERY_CHANGE_THROTTLE_MS, slowMaterializeThreshold, (error) => {
 			this.#disconnect(lc, error);
 		});
 		this.#clientToServer = clientToServer(schema.tables);
-		this.#deleteClientsManager = new DeleteClientsManager((msg) => this.#sendIfConnected(msg), rep.perdag, this.#lc, this.#rep.clientGroupID, rep.clientID);
+		this.#deleteClientsManager = new DeleteClientsManager((msg) => this.#send(msg), rep.perdag, this.#lc, this.#rep.clientGroupID, rep.clientID);
 		reportReloadReason(this.#lc);
 		this.#metrics = new MetricManager({
 			reportIntervalMs: REPORT_INTERVAL_MS,
@@ -380,23 +380,8 @@ var Zero = class Zero {
 			if (Object.entries(g.__zero).length === 1) g.__zero = Object.values(g.__zero)[0];
 		}
 	}
-	#sendIfConnected(msg) {
-		if (this.#connectionManager.is("connected")) this.#send(msg);
-	}
 	#send(msg) {
-		if (this.#socket) {
-			const json = JSON.stringify(msg);
-			if (msg[0] !== "ping") {
-				const history = this.#recentSentMessages;
-				if (history.length >= 5) history.shift();
-				history.push({
-					type: msg[0],
-					size: json.length,
-					snippet: json.slice(0, 200)
-				});
-			}
-			this.#socket.send(json);
-		}
+		if (this.#socket && this.#connectionManager.is("connected")) send(this.#socket, msg);
 	}
 	#createLogOptions(options) {
 		return createLogOptions(options);
@@ -630,7 +615,7 @@ var Zero = class Zero {
 			downMessage = parse(JSON.parse(data), downstreamSchema, "passthrough");
 		} catch (e) {
 			const invalidMessageError = new ClientError({
-				kind: InvalidMessage$1,
+				kind: InvalidMessage,
 				message: `Invalid message received from server: ${getErrorMessage(e)}${data}`
 			}, { cause: e });
 			this.#disconnect(lc, invalidMessageError);
@@ -689,7 +674,7 @@ var Zero = class Zero {
 			}, { cause: e }));
 		}
 	};
-	#onClose = async (e) => {
+	#onClose = (e) => {
 		let lc = this.#lc;
 		try {
 			assert(this.#socket, "Socket is not set before onClose");
@@ -705,26 +690,15 @@ var Zero = class Zero {
 				reason,
 				wasClean
 			});
-			if (code === 1009) {
-				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) : "")
-				});
-				this.#connectResolver.reject(messageTooLargeError);
-				this.#disconnect(lc, messageTooLargeError);
-				await this.#rep.disableClientGroup();
-				this.#onClientStateNotFound(InvalidMessage, messageTooLargeError.message);
-			} else {
-				const closeError = new ClientError(wasClean ? {
-					kind: CleanClose,
-					message: "WebSocket connection closed cleanly"
-				} : {
-					kind: AbruptClose,
-					message: "WebSocket connection closed abruptly"
-				});
-				this.#connectResolver.reject(closeError);
-				this.#disconnect(lc, closeError);
-			}
+			const closeError = new ClientError(wasClean ? {
+				kind: CleanClose,
+				message: "WebSocket connection closed cleanly"
+			} : {
+				kind: AbruptClose,
+				message: "WebSocket connection closed abruptly"
+			});
+			this.#connectResolver.reject(closeError);
+			this.#disconnect(lc, closeError);
 		} catch (e) {
 			lc.error?.("Unhandled error in onClose", e);
 			const internalError = new ClientError({
@@ -803,24 +777,24 @@ var Zero = class Zero {
 		});
 		this.#lastMutationIDSent = NULL_LAST_MUTATION_ID_SENT;
 		lc.debug?.("Resolving connect resolver");
-		must(this.#socket);
+		const socket = must(this.#socket);
 		const queriesPatch = await this.#rep.query((tx) => this.#queryManager.getQueriesPatch(tx, this.#initConnectionQueries));
 		const hasDeletedClients = () => skipEmptyArray(this.#deletedClients?.clientIDs) || skipEmptyArray(this.#deletedClients?.clientGroupIDs);
 		const maybeSendDeletedClients = () => {
 			if (hasDeletedClients()) {
-				this.#send(["deleteClients", this.#deletedClients]);
+				send(socket, ["deleteClients", this.#deletedClients]);
 				this.#deletedClients = void 0;
 			}
 		};
 		if (queriesPatch.size > 0 && this.#initConnectionQueries !== void 0) {
 			maybeSendDeletedClients();
-			this.#send(["changeDesiredQueries", {
+			send(socket, ["changeDesiredQueries", {
 				desiredQueriesPatch: [...queriesPatch.values()],
 				traceparent: this.#options.getTraceparent?.()
 			}]);
 		} else if (this.#initConnectionQueries === void 0) {
 			const clientSchema = this.#clientSchema;
-			this.#send(["initConnection", {
+			send(socket, ["initConnection", {
 				desiredQueriesPatch: [...queriesPatch.values()],
 				deleted: skipEmptyDeletedClients(this.#deletedClients),
 				...this.#connectCookie === null ? { clientSchema } : {},
@@ -1009,7 +983,8 @@ var Zero = class Zero {
 		await this.#connectResolver.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 socket = this.#socket;
+		assert(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.");
@@ -1032,15 +1007,14 @@ var Zero = class Zero {
 				name: m.name,
 				args: [m.args]
 			};
-			const msg = ["push", {
+			send(socket, ["push", {
 				timestamp: now,
 				clientGroupID: req.clientGroupID,
 				mutations: [zeroM],
 				pushVersion: req.pushVersion,
 				requestID,
 				traceparent: this.#options.getTraceparent?.()
-			}];
-			this.#send(msg);
+			}]);
 			if (!isMutationRecoveryPush) this.#lastMutationIDSent = {
 				clientID: m.clientID,
 				id: m.id
@@ -1210,15 +1184,15 @@ var Zero = class Zero {
 			httpStatusCode: 200
 		} };
 		await this.#connectResolver.promise;
-		assert(this.#socket, "Expected socket to be connected for mutation recovery pull");
+		const socket = this.#socket;
+		assert(socket, "Expected socket to be connected for mutation recovery pull");
 		lc.debug?.("Pull is for mutation recovery");
 		const cookie = parse(req.cookie, nullableVersionSchema, "passthrough");
-		const pullRequestMessage = ["pull", {
+		send(socket, ["pull", {
 			clientGroupID: req.clientGroupID,
 			cookie,
 			requestID
-		}];
-		this.#send(pullRequestMessage);
+		}]);
 		const pullResponseResolver = resolver();
 		this.#pendingPullsByRequestID.set(requestID, pullResponseResolver);
 		try {
@@ -1266,7 +1240,7 @@ var Zero = class Zero {
 	#setAuth(auth) {
 		this.#checkAuthValid(this.userID, auth);
 		this.#rep.auth = toReplicacheAuthToken(auth);
-		if (auth) this.#sendIfConnected(["updateAuth", { auth }]);
+		if (auth) this.#send(["updateAuth", { auth }]);
 	}
 	/**
 	* A rough heuristic for whether the client is currently online and
@@ -1298,7 +1272,7 @@ var Zero = class Zero {
 		const pingMessage = ["ping", {}];
 		const t0 = performance.now();
 		assert(this.#socket, "Expected socket to be connected for ping");
-		this.#send(pingMessage);
+		send(this.#socket, pingMessage);
 		const raceResult = await promiseRace({
 			waitForPong: promise,
 			pingTimeout: sleep(this.pingTimeoutMs),