@rocicorp/zero 1.12.0-canary.0 → 1.12.0-canary.10

package/out/zero-cache/src/services/view-syncer/view-syncer.js

@@ -1,4 +1,5 @@
 import { assert, unreachable } from "../../../../shared/src/asserts.js";
+import { resolver } from "../../../../shared/src/resolver.js";
 import { getOrInsertComputed } from "../../../../shared/src/map.js";
 import { newArray } from "../../../../shared/src/arrays.js";
 import { must } from "../../../../shared/src/must.js";
@@ -9,23 +10,23 @@ import { ProtocolError, isProtocolError } from "../../../../zero-protocol/src/er
 import { normalizeClientSchema } from "../../../../zero-protocol/src/client-schema.js";
 import { MAX_TTL_MS, clampTTL } from "../../../../zql/src/query/ttl.js";
 import { manualSpan, startAsyncSpan, startSpan } from "../../../../otel/src/span.js";
-import { ZERO_VERSION_COLUMN_NAME } from "../replicator/schema/constants.js";
 import { transformAndHashQuery } from "../../auth/read-authorizer.js";
 import { randInt } from "../../../../shared/src/rand.js";
-import { LogThrottle } from "../../observability/log-throttle.js";
 import { getOrCreateCounter, getOrCreateLatencyHistogram, getOrCreateNativeHistogram, getOrCreateUpDownCounter, getOrCreateValueHistogram } from "../../observability/metrics.js";
+import { ZERO_VERSION_COLUMN_NAME } from "../replicator/schema/constants.js";
 import { rowIDString } from "../../types/row-key.js";
 import "../replicator/schema/replication-state.js";
-import { planWarningMessage } from "./plan-warnings.js";
-import { shouldCutOffPush } from "./push-cutoff.js";
-import { queryShape } from "./query-shape.js";
-import { ResetPipelinesSignal } from "./snapshotter.js";
+import { ProtocolErrorWithLevel, getLogLevel, wrapWithProtocolError } from "../../types/error-with-level.js";
 import { Subscription } from "../../types/subscription.js";
 import { CustomKeyMap } from "../../../../shared/src/custom-key-map.js";
 import { ttlClockAsNumber, ttlClockFromNumber } from "./ttl-clock.js";
 import { EMPTY_CVR_VERSION, cmpVersions, versionFromString, versionString, versionToCookie } from "./schema/types.js";
-import { ProtocolErrorWithLevel, getLogLevel, wrapWithProtocolError } from "../../types/error-with-level.js";
 import { isAuthErrorBody } from "../../auth/auth.js";
+import { LogThrottle } from "../../observability/log-throttle.js";
+import { planWarningMessage } from "./plan-warnings.js";
+import { shouldCutOffPush } from "./push-cutoff.js";
+import { queryShape } from "./query-shape.js";
+import { ResetPipelinesSignal } from "./snapshotter.js";
 import { AdvancementMetrics } from "./advancement-metrics.js";
 import { ClientHandler, startPoke } from "./client-handler.js";
 import { tracer } from "./tracer.js";
@@ -36,7 +37,6 @@ import { HydrationBudget } from "./hydration-budget.js";
 import { HydrationCircuitBreaker } from "./hydration-circuit-breaker.js";
 import { handleInspect } from "./inspect-handler.js";
 import { QueryCoveringIndex } from "./query-covering.js";
-import { resolver } from "@rocicorp/resolver";
 import { Lock } from "@rocicorp/lock";
 //#region ../zero-cache/src/services/view-syncer/view-syncer.ts
 var PROTOCOL_VERSION_ATTR = "protocol.version";
@@ -62,7 +62,7 @@ var TTL_CLOCK_INTERVAL = 6e4;
 * slow hydrations are logged at most once per query shape per this window,
 * per process. See {@link LogThrottle}.
 */
-var SLOW_HYDRATION_LOG_WINDOW_MS = 5 * 6e4;
+var SLOW_HYDRATION_LOG_WINDOW_MS = 3e5;
 /** See `ViewSyncerService.#logRebuilds()`. */
 var REBUILD_LOG_INTERVAL_MS = 6e4;
 var REBUILD_LOG_MIN_MS = 1e3;
@@ -537,6 +537,9 @@ var ViewSyncerService = class {
 	get queryCount() {
 		return this.#pipelines.initialized() ? this.#pipelines.queries().size : 0;
 	}
+	get hydrationTimeMs() {
+		return this.#totalHydrationTimeMs();
+	}
 	pipelineHashes() {
 		if (!this.#pipelines.initialized()) return [];
 		const cvrQueries = this.#cvr?.queries;
@@ -632,11 +635,12 @@ var ViewSyncerService = class {
 		return this.#clients.size === 0;
 	}
 	#deleteClientDueToDisconnect(clientID, client) {
-		this.connContextManager.closeConnection({
+		const c = this.#clients.get(clientID);
+		if (c === client || c?.wsID !== client.wsID) this.connContextManager.closeConnection({
 			clientID,
 			wsID: client.wsID
 		});
-		if (this.#clients.get(clientID) === client) {
+		if (c === client) {
 			this.#clients.delete(clientID);
 			if (this.#clients.size === 0) {
 				if (this.#ttlClock !== void 0) this.#updateTTLClockInCVRWithoutLock(this.#lc);
@@ -719,22 +723,24 @@ var ViewSyncerService = class {
 				this.#deleteClientDueToDisconnect(connCtx.clientID, newClient);
 				this.#activeClients.add(-1, { [PROTOCOL_VERSION_ATTR]: connCtx.protocolVersion });
 			} });
+			const newClient = new ClientHandler(lc, this.id, connCtx.clientID, connCtx.wsID, this.#shard, connCtx.baseCookie, downstream);
 			this.#activeClients.add(1, { [PROTOCOL_VERSION_ATTR]: connCtx.protocolVersion });
 			if (this.#clients.size === 0) {
 				const now = Date.now();
 				this.#ttlClockBase = now;
 			}
-			const newClient = new ClientHandler(lc, this.id, connCtx.clientID, connCtx.wsID, this.#shard, connCtx.baseCookie, downstream);
-			this.#clients.get(connCtx.clientID)?.close(`replaced by wsID: ${connCtx.wsID}`);
+			const replaced = this.#clients.get(connCtx.clientID);
 			this.#clients.set(connCtx.clientID, newClient);
+			replaced?.close(`replaced by wsID: ${connCtx.wsID}`);
 			startAsyncSpan(tracer, "vs.initConnection.async", () => this.#runInLockForClient(connCtx, initConnectionMessage, async (lc, clientID, msg, cvr) => {
 				if (cvr.clientSchema === null && !msg.clientSchema) throw new ProtocolErrorWithLevel({
 					kind: InvalidConnectionRequest,
 					message: "The initConnection message for a new client group must include client schema.",
 					origin: ZeroCache
 				}, "warn");
-				if (!await this.#validateConnection(connCtx)) return;
-				await this.#handleConfigUpdate(lc, clientID, msg, cvr, "all", connCtx.profileID ?? `cg${this.id}`, connCtx);
+				const validatedConnCtx = await this.#validateCurrentConnection(connCtx);
+				if (!validatedConnCtx) return;
+				await this.#handleConfigUpdate(lc, clientID, msg, cvr, "all", validatedConnCtx.profileID ?? `cg${this.id}`, validatedConnCtx);
 				this.#initialized.resolve("initialized");
 			}, newClient)).catch((e) => newClient.fail(e));
 			return downstream;
@@ -826,8 +832,14 @@ var ViewSyncerService = class {
 	}
 	async #updateCVRConfig(lc, cvr, clientID, customQueryTransformMode, connCtx, fn) {
 		const updater = new CVRConfigDrivenUpdater(this.#cvrStore, cvr, this.#shard);
-		updater.ensureClient(clientID);
-		const patches = fn(updater);
+		let patches;
+		try {
+			updater.ensureClient(clientID);
+			patches = fn(updater);
+		} catch (e) {
+			this.#cvrStore.discardPending();
+			throw e;
+		}
 		this.#cvr = await this.#flushUpdater(lc, updater);
 		if (cmpVersions(cvr.version, this.#cvr.version) < 0) {
 			const newCVR = this.#cvr;
@@ -861,15 +873,13 @@ var ViewSyncerService = class {
 					lc = lc.withContext("clientID", clientID).withContext("wsID", wsID).withContext("cmd", cmd);
 					lc.debug?.("acquired lock for cvr");
 					client = this.#clients.get(clientID);
-					if (client?.wsID !== wsID) {
-						lc.debug?.("mismatched wsID", client?.wsID, wsID);
+					if (client?.wsID !== wsID || newClient && client !== newClient) {
+						lc.debug?.("mismatched or superseded client", client?.wsID, wsID);
 						return;
 					}
 					connCtx = this.connContextManager.getConnectionContext(selector);
-					if (newClient) {
-						assert(newClient === client, "newClient must match existing client");
-						checkClientAndCVRVersions(client.version(), cvr.version);
-					} else if (!this.#clients.has(clientID)) lc.warn?.(`Processing ${cmd} before initConnection was received`);
+					if (newClient) checkClientAndCVRVersions(client.version(), cvr.version);
+					else if (!this.#clients.has(clientID)) lc.warn?.(`Processing ${cmd} before initConnection was received`);
 					lc.debug?.(cmd, body);
 					result = await fn(lc, clientID, body, cvr);
 				});
@@ -902,9 +912,7 @@ var ViewSyncerService = class {
 				case "del":
 					patches.push(...updater.markDesiredQueriesAsInactive(clientID, [patch.hash], ttlClock));
 					break;
-				case "clear":
-					patches.push(...updater.clearDesiredQueries(clientID));
-					break;
+				case "clear": patches.push(...updater.clearDesiredQueries(clientID));
 			}
 			const clientIDsToDelete = /* @__PURE__ */ new Set();
 			if (activeClients) {
@@ -1266,7 +1274,7 @@ var ViewSyncerService = class {
 				name: origQuery.type === "custom" ? origQuery.name : void 0
 			}));
 			if (circuitBrokenQueries.length > 0) this.#rejectCircuitBrokenQueries(lc, cvr, circuitBrokenQueries);
-			const removeQueriesQueryIds = new Set([
+			const removeQueriesQueryIds = /* @__PURE__ */ new Set([
 				...naturallyExpiredQueryIDs,
 				...erroredQueryIDs,
 				...circuitBrokenQueries.map(({ id }) => id)
@@ -2103,6 +2111,22 @@ var ViewSyncerService = class {
 			throw e;
 		}
 	}
+	/**
+	* Validates the connection's credential as it stands once validation ends.
+	* An `updateAuth` handled while a validation is in flight moves the
+	* connection to a newer revision, which makes a failure of the older one
+	* stale, as is its success; the newer credential is then validated in its
+	* place, so the `initConnection` waiting on it is not dropped.
+	*/
+	async #validateCurrentConnection(selector) {
+		let connCtx = this.connContextManager.getConnectionContext(selector);
+		while (connCtx) {
+			const valid = await this.#validateConnection(connCtx);
+			const current = this.connContextManager.getConnectionContext(selector);
+			if (current?.revision === connCtx.revision) return valid ? connCtx : void 0;
+			connCtx = current;
+		}
+	}
 	#failMaintenanceConnection(connCtx, error) {
 		if (!this.connContextManager.failConnection(connCtx, connCtx.revision)) return;
 		const wrapped = wrapWithProtocolError(error);
@@ -2267,6 +2291,6 @@ var TimeSliceTimer = class {
 	}
 };
 //#endregion
-export { TimeSliceTimer, ViewSyncerService };
+export { TTL_CLOCK_INTERVAL, TimeSliceTimer, ViewSyncerService, expired };
 
 //# sourceMappingURL=view-syncer.js.map