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

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

@@ -0,0 +1,78 @@
+import { assert } from "../../../../shared/src/asserts.js";
+//#region ../zero-cache/src/services/view-syncer/hydration-circuit-breaker.ts
+/**
+* How long a tripped query stays rejected before a retry is allowed.
+*
+* A query that blows the timeout is almost always slow because of the shape
+* of its data rather than because of transient load, so retrying it on every
+* reconnect would burn a full timeout each time. The cooldown keeps that cost
+* to at most one timeout per cooldown period per query.
+*/
+var DEFAULT_CIRCUIT_BREAKER_OPEN_MS = 5 * 6e4;
+/**
+* A per-query circuit breaker for view-syncer hydration.
+*
+* Hydration of a single query is aborted once its processing time exceeds
+* {@link timeoutMs}. Callers check {@link exceeded} at the yield points of a
+* hydration, so a query is only ever aborted between time slices.
+*
+* Once a query has been aborted the breaker is "open" for its transformation
+* hash: {@link isOpen} reports true for {@link openMs}, and callers reject the
+* query up front instead of hydrating it again. After that the breaker is
+* implicitly half-open: the next hydration attempt runs, and either succeeds
+* or trips the breaker again.
+*
+* The breaker is keyed by transformation hash rather than query hash because
+* the transformation (permissions, auth context) determines the pipeline that
+* runs, and a different transformation of the same query may well be fast.
+*/
+var HydrationCircuitBreaker = class {
+	timeoutMs;
+	openMs;
+	#now;
+	#openedAt = /* @__PURE__ */ new Map();
+	constructor(timeoutMs, openMs = DEFAULT_CIRCUIT_BREAKER_OPEN_MS, now = performance.now.bind(performance)) {
+		assert(Number.isSafeInteger(timeoutMs) && timeoutMs >= 0, "Hydration timeout must be a nonnegative integer");
+		assert(openMs >= 0, "Circuit breaker open duration must be nonnegative");
+		this.timeoutMs = timeoutMs;
+		this.openMs = openMs;
+		this.#now = now;
+	}
+	/** Whether the breaker does anything at all. */
+	get enabled() {
+		return this.timeoutMs > 0;
+	}
+	/**
+	* Whether a hydration that has consumed `elapsedMs` of processing time must
+	* be aborted. Always false when the breaker is disabled.
+	*/
+	exceeded(elapsedMs) {
+		return this.enabled && elapsedMs >= this.timeoutMs;
+	}
+	/**
+	* Records that hydrating `transformationHash` was aborted.
+	*
+	* Trips are rare, so this is also when expired entries are swept, which
+	* keeps the map bounded by the number of hashes tripped within one cooldown
+	* rather than by every hash ever tripped.
+	*/
+	trip(transformationHash) {
+		const now = this.#now();
+		for (const [hash, openedAt] of this.#openedAt) if (now - openedAt >= this.openMs) this.#openedAt.delete(hash);
+		this.#openedAt.set(transformationHash, now);
+	}
+	/** Whether `transformationHash` is currently rejected. */
+	isOpen(transformationHash) {
+		const openedAt = this.#openedAt.get(transformationHash);
+		if (openedAt === void 0) return false;
+		if (this.#now() - openedAt >= this.openMs) {
+			this.#openedAt.delete(transformationHash);
+			return false;
+		}
+		return true;
+	}
+};
+//#endregion
+export { HydrationCircuitBreaker };
+
+//# sourceMappingURL=hydration-circuit-breaker.js.map

package/out/zero-cache/src/services/view-syncer/hydration-circuit-breaker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hydration-circuit-breaker.js","names":["#now","#openedAt"],"sources":["../../../../../../zero-cache/src/services/view-syncer/hydration-circuit-breaker.ts"],"sourcesContent":["import {assert} from '../../../../shared/src/asserts.ts';\nimport type {MonotonicClock} from './hydration-budget.ts';\n\n/**\n * How long a tripped query stays rejected before a retry is allowed.\n *\n * A query that blows the timeout is almost always slow because of the shape\n * of its data rather than because of transient load, so retrying it on every\n * reconnect would burn a full timeout each time. The cooldown keeps that cost\n * to at most one timeout per cooldown period per query.\n */\nexport const DEFAULT_CIRCUIT_BREAKER_OPEN_MS = 5 * 60_000;\n\n/**\n * A per-query circuit breaker for view-syncer hydration.\n *\n * Hydration of a single query is aborted once its processing time exceeds\n * {@link timeoutMs}. Callers check {@link exceeded} at the yield points of a\n * hydration, so a query is only ever aborted between time slices.\n *\n * Once a query has been aborted the breaker is \"open\" for its transformation\n * hash: {@link isOpen} reports true for {@link openMs}, and callers reject the\n * query up front instead of hydrating it again. After that the breaker is\n * implicitly half-open: the next hydration attempt runs, and either succeeds\n * or trips the breaker again.\n *\n * The breaker is keyed by transformation hash rather than query hash because\n * the transformation (permissions, auth context) determines the pipeline that\n * runs, and a different transformation of the same query may well be fast.\n */\nexport class HydrationCircuitBreaker {\n  readonly timeoutMs: number;\n  readonly openMs: number;\n  readonly #now: MonotonicClock;\n  readonly #openedAt = new Map<string, number>();\n\n  constructor(\n    timeoutMs: number,\n    openMs: number = DEFAULT_CIRCUIT_BREAKER_OPEN_MS,\n    now: MonotonicClock = performance.now.bind(performance),\n  ) {\n    assert(\n      Number.isSafeInteger(timeoutMs) && timeoutMs >= 0,\n      'Hydration timeout must be a nonnegative integer',\n    );\n    assert(openMs >= 0, 'Circuit breaker open duration must be nonnegative');\n    this.timeoutMs = timeoutMs;\n    this.openMs = openMs;\n    this.#now = now;\n  }\n\n  /** Whether the breaker does anything at all. */\n  get enabled(): boolean {\n    return this.timeoutMs > 0;\n  }\n\n  /**\n   * Whether a hydration that has consumed `elapsedMs` of processing time must\n   * be aborted. Always false when the breaker is disabled.\n   */\n  exceeded(elapsedMs: number): boolean {\n    return this.enabled && elapsedMs >= this.timeoutMs;\n  }\n\n  /**\n   * Records that hydrating `transformationHash` was aborted.\n   *\n   * Trips are rare, so this is also when expired entries are swept, which\n   * keeps the map bounded by the number of hashes tripped within one cooldown\n   * rather than by every hash ever tripped.\n   */\n  trip(transformationHash: string): void {\n    const now = this.#now();\n    for (const [hash, openedAt] of this.#openedAt) {\n      if (now - openedAt >= this.openMs) {\n        this.#openedAt.delete(hash);\n      }\n    }\n    this.#openedAt.set(transformationHash, now);\n  }\n\n  /** Whether `transformationHash` is currently rejected. */\n  isOpen(transformationHash: string): boolean {\n    const openedAt = this.#openedAt.get(transformationHash);\n    if (openedAt === undefined) {\n      return false;\n    }\n    if (this.#now() - openedAt >= this.openMs) {\n      this.#openedAt.delete(transformationHash);\n      return false;\n    }\n    return true;\n  }\n}\n"],"mappings":";;;;;;;;;;AAWA,IAAa,kCAAkC,IAAI;;;;;;;;;;;;;;;;;;AAmBnD,IAAa,0BAAb,MAAqC;CACnC;CACA;CACA;CACA,4BAAqB,IAAI,IAAoB;CAE7C,YACE,WACA,SAAiB,iCACjB,MAAsB,YAAY,IAAI,KAAK,WAAW,GACtD;EACA,OACE,OAAO,cAAc,SAAS,KAAK,aAAa,GAChD,iDACF;EACA,OAAO,UAAU,GAAG,mDAAmD;EACvE,KAAK,YAAY;EACjB,KAAK,SAAS;EACd,KAAKA,OAAO;CACd;;CAGA,IAAI,UAAmB;EACrB,OAAO,KAAK,YAAY;CAC1B;;;;;CAMA,SAAS,WAA4B;EACnC,OAAO,KAAK,WAAW,aAAa,KAAK;CAC3C;;;;;;;;CASA,KAAK,oBAAkC;EACrC,MAAM,MAAM,KAAKA,KAAK;EACtB,KAAK,MAAM,CAAC,MAAM,aAAa,KAAKC,WAClC,IAAI,MAAM,YAAY,KAAK,QACzB,KAAKA,UAAU,OAAO,IAAI;EAG9B,KAAKA,UAAU,IAAI,oBAAoB,GAAG;CAC5C;;CAGA,OAAO,oBAAqC;EAC1C,MAAM,WAAW,KAAKA,UAAU,IAAI,kBAAkB;EACtD,IAAI,aAAa,KAAA,GACf,OAAO;EAET,IAAI,KAAKD,KAAK,IAAI,YAAY,KAAK,QAAQ;GACzC,KAAKC,UAAU,OAAO,kBAAkB;GACxC,OAAO;EACT;EACA,OAAO;CACT;AACF"}

package/out/zero-cache/src/services/view-syncer/inspect-handler.d.ts

@@ -7,7 +7,7 @@ import type { ClientHandler } from './client-handler.ts';
 import type { ConnectionContext } from './connection-context-manager.ts';
 import type { CVRStore } from './cvr-store.ts';
 import type { CVRSnapshot } from './cvr.ts';
-export declare function handleInspect(lc: LogContext, body: UnparsedInspectUpBody, cvr: CVRSnapshot, client: ClientHandler, inspectorDelegate: InspectorDelegate, clientGroupID: string, cvrStore: CVRStore, config: NormalizedZeroConfig, ctx: ConnectionContext): Promise<void>;
+export declare function handleInspect(lc: LogContext, body: UnparsedInspectUpBody, cvr: CVRSnapshot, client: ClientHandler, inspectorDelegate: InspectorDelegate, clientGroupID: string, authOwner: object, cvrStore: CVRStore, config: NormalizedZeroConfig, ctx: ConnectionContext): Promise<void>;
 /**
  * Converts per-query server metrics to the appropriate wire format based on the
  * client's protocol version.

package/out/zero-cache/src/services/view-syncer/inspect-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspect-handler.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/inspect-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAKjD,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,6CAA6C,CAAC;AAGrD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAMpE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,oCAAoC,CAAC;AAE1E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAE1C,wBAAsB,aAAa,CACjC,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,qBAAqB,EAC3B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,aAAa,EACrB,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,IAAI,CAAC,CAiJf;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,kBAAkB,GAAG,IAAI,EAClC,eAAe,EAAE,MAAM,GACtB,kBAAkB,GAAG,IAAI,CAmB3B"}
+{"version":3,"file":"inspect-handler.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/inspect-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAKjD,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,6CAA6C,CAAC;AAGrD,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAMpE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,oCAAoC,CAAC;AAE1E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,UAAU,CAAC;AAE1C,wBAAsB,aAAa,CACjC,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,qBAAqB,EAC3B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,aAAa,EACrB,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,MAAM,EAGrB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,iBAAiB,GACrB,OAAO,CAAC,IAAI,CAAC,CAiJf;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,kBAAkB,GAAG,IAAI,EAClC,eAAe,EAAE,MAAM,GACtB,kBAAkB,GAAG,IAAI,CAmB3B"}

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

@@ -10,7 +10,7 @@ import { inspectAnalyzeQueryUpSchema } from "../../../../zero-protocol/src/inspe
 import { _usingCtx } from "../../../../_virtual/_@oxc-project_runtime@0.130.0/helpers/usingCtx.js";
 import { analyzeQuery } from "../analyze.js";
 //#region ../zero-cache/src/services/view-syncer/inspect-handler.ts
-async function handleInspect(lc, body, cvr, client, inspectorDelegate, clientGroupID, cvrStore, config, ctx) {
+async function handleInspect(lc, body, cvr, client, inspectorDelegate, clientGroupID, authOwner, cvrStore, config, ctx) {
 	if (body.op !== "authenticate" && !inspectorDelegate.isAuthenticated(clientGroupID)) {
 		lc.info?.("Client not authenticated to access the inspector protocol. Sending authentication challenge");
 		client.sendInspectResponse(lc, {
@@ -52,7 +52,7 @@ async function handleInspect(lc, body, cvr, client, inspectorDelegate, clientGro
 			case "authenticate": {
 				const password = body.value;
 				const ok = isAdminPasswordValid(lc, config, password);
-				if (ok) inspectorDelegate.setAuthenticated(clientGroupID);
+				if (ok) inspectorDelegate.setAuthenticated(clientGroupID, authOwner);
 				else inspectorDelegate.clearAuthenticated(clientGroupID);
 				client.sendInspectResponse(lc, {
 					op: "authenticated",

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

@@ -1 +1 @@
-{"version":3,"file":"inspect-handler.js","names":[],"sources":["../../../../../../zero-cache/src/services/view-syncer/inspect-handler.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {unreachable} from '../../../../shared/src/asserts.ts';\nimport {must} from '../../../../shared/src/must.ts';\nimport {TDigest} from '../../../../shared/src/tdigest.ts';\nimport * as v from '../../../../shared/src/valita.ts';\nimport type {\n  QueryServerMetrics,\n  ServerMetrics,\n} from '../../../../zero-protocol/src/inspect-down.ts';\nimport {\n  inspectAnalyzeQueryUpSchema,\n  type UnparsedInspectUpBody,\n} from '../../../../zero-protocol/src/inspect-up.ts';\nimport {Database} from '../../../../zqlite/src/db.ts';\nimport {loadPermissions} from '../../auth/load-permissions.ts';\nimport type {NormalizedZeroConfig} from '../../config/normalize.ts';\nimport {\n  getServerVersion,\n  isAdminPasswordValid,\n} from '../../config/zero-config.ts';\nimport {StatementRunner} from '../../db/statements.ts';\nimport type {InspectorDelegate} from '../../server/inspector-delegate.ts';\nimport {analyzeQuery} from '../analyze.ts';\nimport type {ClientHandler} from './client-handler.ts';\nimport type {ConnectionContext} from './connection-context-manager.ts';\nimport type {CVRStore} from './cvr-store.ts';\nimport type {CVRSnapshot} from './cvr.ts';\n\nexport async function handleInspect(\n  lc: LogContext,\n  body: UnparsedInspectUpBody,\n  cvr: CVRSnapshot,\n  client: ClientHandler,\n  inspectorDelegate: InspectorDelegate,\n  clientGroupID: string,\n  cvrStore: CVRStore,\n  config: NormalizedZeroConfig,\n  ctx: ConnectionContext,\n): Promise<void> {\n  // Check if the client is already authenticated. We only authenticate the clientGroup\n  // once per \"worker\".\n  if (\n    body.op !== 'authenticate' &&\n    !inspectorDelegate.isAuthenticated(clientGroupID)\n  ) {\n    lc.info?.(\n      'Client not authenticated to access the inspector protocol. Sending authentication challenge',\n    );\n    client.sendInspectResponse(lc, {\n      op: 'authenticated',\n      id: body.id,\n      value: false,\n    });\n    return;\n  }\n\n  try {\n    switch (body.op) {\n      case 'queries': {\n        const queryRows = await cvrStore.inspectQueries(\n          lc,\n          cvr.ttlClock,\n          body.clientID,\n        );\n\n        // Enhance query rows with server-side materialization metrics\n        const enhancedRows = queryRows.map(row => ({\n          ...row,\n          ast: row.ast ?? inspectorDelegate.getASTForQuery(row.queryID) ?? null,\n          metrics: metricsForProtocol(\n            inspectorDelegate.getMetricsJSONForQuery(row.queryID),\n            ctx.protocolVersion,\n          ),\n        }));\n\n        client.sendInspectResponse(lc, {\n          op: 'queries',\n          id: body.id,\n          value: enhancedRows,\n        });\n        break;\n      }\n\n      case 'metrics': {\n        client.sendInspectResponse(lc, {\n          op: 'metrics',\n          id: body.id,\n          value: inspectorDelegate.getMetricsJSON(),\n        });\n        break;\n      }\n\n      case 'version':\n        client.sendInspectResponse(lc, {\n          op: 'version',\n          id: body.id,\n          value: getServerVersion(config),\n        });\n        break;\n\n      case 'authenticate': {\n        const password = body.value;\n        const ok = isAdminPasswordValid(lc, config, password);\n        if (ok) {\n          inspectorDelegate.setAuthenticated(clientGroupID);\n        } else {\n          inspectorDelegate.clearAuthenticated(clientGroupID);\n        }\n\n        client.sendInspectResponse(lc, {\n          op: 'authenticated',\n          id: body.id,\n          value: ok,\n        });\n\n        break;\n      }\n\n      case 'analyze-query': {\n        const parsedBody = v.parse(body, inspectAnalyzeQueryUpSchema);\n        let ast = parsedBody.ast ?? parsedBody.value;\n        let legacyQuery = true;\n\n        if (parsedBody.name && parsedBody.args) {\n          // Get the AST from the API server by transforming the named query\n          ast = await inspectorDelegate.transformCustomQuery(\n            parsedBody.name,\n            parsedBody.args,\n            ctx,\n          );\n          legacyQuery = false;\n        }\n\n        if (ast === undefined) {\n          throw new Error(\n            'AST is required for analyze-query operation. Either provide an AST directly or ensure custom query transformation is configured.',\n          );\n        }\n\n        let permissions;\n        if (legacyQuery) {\n          using db = new Database(lc, config.replica.file);\n          const dbRunner = new StatementRunner(db);\n          const loaded = loadPermissions(lc, dbRunner, config.app.id, config);\n          if (loaded.permissions) {\n            permissions = loaded.permissions;\n          } else {\n            lc.info?.(\n              'No permissions loaded; analyze-query will run without applying permissions.',\n            );\n          }\n        }\n\n        const result = await analyzeQuery(\n          lc,\n          config,\n          must(cvr.clientSchema),\n          ast,\n          parsedBody.options?.syncedRows,\n          parsedBody.options?.vendedRows,\n          permissions,\n          ctx.auth?.type === 'jwt' ? ctx.auth : undefined,\n          parsedBody.options?.joinPlans,\n        );\n        client.sendInspectResponse(lc, {\n          op: 'analyze-query',\n          id: body.id,\n          value: result,\n        });\n        break;\n      }\n\n      default:\n        unreachable(body);\n    }\n  } catch (e) {\n    lc.warn?.('Error handling inspect message', e);\n    client.sendInspectResponse(lc, {\n      op: 'error',\n      id: body.id,\n      value: (e as Error).message,\n    });\n  }\n}\n\n/**\n * Converts per-query server metrics to the appropriate wire format based on the\n * client's protocol version.\n *\n * Protocol >= 51: new format — `query-hydration-server-ms` (plain number) +\n *   `query-update-server` (TDigest).\n * Protocol < 51: old format — `query-materialization-server` (TDigest) +\n *   `query-update-server` (TDigest). The scalar hydration time is wrapped into a\n *   one-point TDigest for backward compatibility.\n *\n * @visibleForTesting\n */\nexport function metricsForProtocol(\n  metrics: QueryServerMetrics | null,\n  protocolVersion: number,\n): QueryServerMetrics | null {\n  if (protocolVersion >= 51 || metrics === null) {\n    return metrics;\n  }\n  // Backward compat: wrap the scalar hydration ms into a one-point TDigest\n  // under the old field name so that 1.5 clients can parse the response.\n  const hydrateDigest = new TDigest();\n  const hydrateMs = metrics['query-hydration-server-ms'];\n  if (hydrateMs !== undefined) {\n    hydrateDigest.add(hydrateMs);\n  }\n  const legacyMetrics: ServerMetrics = {\n    'query-materialization-server': hydrateDigest.toJSON(),\n    'query-update-server': metrics['query-update-server'],\n  };\n  // Cast to QueryServerMetrics: this is intentional — for old-protocol clients\n  // we send the legacy ServerMetrics wire shape under the QueryServerMetrics type\n  // to satisfy TypeScript while preserving backward compatibility.\n  return legacyMetrics as unknown as QueryServerMetrics;\n}\n"],"mappings":"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"}
+{"version":3,"file":"inspect-handler.js","names":[],"sources":["../../../../../../zero-cache/src/services/view-syncer/inspect-handler.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {unreachable} from '../../../../shared/src/asserts.ts';\nimport {must} from '../../../../shared/src/must.ts';\nimport {TDigest} from '../../../../shared/src/tdigest.ts';\nimport * as v from '../../../../shared/src/valita.ts';\nimport type {\n  QueryServerMetrics,\n  ServerMetrics,\n} from '../../../../zero-protocol/src/inspect-down.ts';\nimport {\n  inspectAnalyzeQueryUpSchema,\n  type UnparsedInspectUpBody,\n} from '../../../../zero-protocol/src/inspect-up.ts';\nimport {Database} from '../../../../zqlite/src/db.ts';\nimport {loadPermissions} from '../../auth/load-permissions.ts';\nimport type {NormalizedZeroConfig} from '../../config/normalize.ts';\nimport {\n  getServerVersion,\n  isAdminPasswordValid,\n} from '../../config/zero-config.ts';\nimport {StatementRunner} from '../../db/statements.ts';\nimport type {InspectorDelegate} from '../../server/inspector-delegate.ts';\nimport {analyzeQuery} from '../analyze.ts';\nimport type {ClientHandler} from './client-handler.ts';\nimport type {ConnectionContext} from './connection-context-manager.ts';\nimport type {CVRStore} from './cvr-store.ts';\nimport type {CVRSnapshot} from './cvr.ts';\n\nexport async function handleInspect(\n  lc: LogContext,\n  body: UnparsedInspectUpBody,\n  cvr: CVRSnapshot,\n  client: ClientHandler,\n  inspectorDelegate: InspectorDelegate,\n  clientGroupID: string,\n  // The service handling the request, on whose behalf authentication is\n  // recorded (see InspectorDelegate.clearAuthenticated).\n  authOwner: object,\n  cvrStore: CVRStore,\n  config: NormalizedZeroConfig,\n  ctx: ConnectionContext,\n): Promise<void> {\n  // Check if the client is already authenticated. We only authenticate the clientGroup\n  // once per \"worker\".\n  if (\n    body.op !== 'authenticate' &&\n    !inspectorDelegate.isAuthenticated(clientGroupID)\n  ) {\n    lc.info?.(\n      'Client not authenticated to access the inspector protocol. Sending authentication challenge',\n    );\n    client.sendInspectResponse(lc, {\n      op: 'authenticated',\n      id: body.id,\n      value: false,\n    });\n    return;\n  }\n\n  try {\n    switch (body.op) {\n      case 'queries': {\n        const queryRows = await cvrStore.inspectQueries(\n          lc,\n          cvr.ttlClock,\n          body.clientID,\n        );\n\n        // Enhance query rows with server-side materialization metrics\n        const enhancedRows = queryRows.map(row => ({\n          ...row,\n          ast: row.ast ?? inspectorDelegate.getASTForQuery(row.queryID) ?? null,\n          metrics: metricsForProtocol(\n            inspectorDelegate.getMetricsJSONForQuery(row.queryID),\n            ctx.protocolVersion,\n          ),\n        }));\n\n        client.sendInspectResponse(lc, {\n          op: 'queries',\n          id: body.id,\n          value: enhancedRows,\n        });\n        break;\n      }\n\n      case 'metrics': {\n        client.sendInspectResponse(lc, {\n          op: 'metrics',\n          id: body.id,\n          value: inspectorDelegate.getMetricsJSON(),\n        });\n        break;\n      }\n\n      case 'version':\n        client.sendInspectResponse(lc, {\n          op: 'version',\n          id: body.id,\n          value: getServerVersion(config),\n        });\n        break;\n\n      case 'authenticate': {\n        const password = body.value;\n        const ok = isAdminPasswordValid(lc, config, password);\n        if (ok) {\n          inspectorDelegate.setAuthenticated(clientGroupID, authOwner);\n        } else {\n          inspectorDelegate.clearAuthenticated(clientGroupID);\n        }\n\n        client.sendInspectResponse(lc, {\n          op: 'authenticated',\n          id: body.id,\n          value: ok,\n        });\n\n        break;\n      }\n\n      case 'analyze-query': {\n        const parsedBody = v.parse(body, inspectAnalyzeQueryUpSchema);\n        let ast = parsedBody.ast ?? parsedBody.value;\n        let legacyQuery = true;\n\n        if (parsedBody.name && parsedBody.args) {\n          // Get the AST from the API server by transforming the named query\n          ast = await inspectorDelegate.transformCustomQuery(\n            parsedBody.name,\n            parsedBody.args,\n            ctx,\n          );\n          legacyQuery = false;\n        }\n\n        if (ast === undefined) {\n          throw new Error(\n            'AST is required for analyze-query operation. Either provide an AST directly or ensure custom query transformation is configured.',\n          );\n        }\n\n        let permissions;\n        if (legacyQuery) {\n          using db = new Database(lc, config.replica.file);\n          const dbRunner = new StatementRunner(db);\n          const loaded = loadPermissions(lc, dbRunner, config.app.id, config);\n          if (loaded.permissions) {\n            permissions = loaded.permissions;\n          } else {\n            lc.info?.(\n              'No permissions loaded; analyze-query will run without applying permissions.',\n            );\n          }\n        }\n\n        const result = await analyzeQuery(\n          lc,\n          config,\n          must(cvr.clientSchema),\n          ast,\n          parsedBody.options?.syncedRows,\n          parsedBody.options?.vendedRows,\n          permissions,\n          ctx.auth?.type === 'jwt' ? ctx.auth : undefined,\n          parsedBody.options?.joinPlans,\n        );\n        client.sendInspectResponse(lc, {\n          op: 'analyze-query',\n          id: body.id,\n          value: result,\n        });\n        break;\n      }\n\n      default:\n        unreachable(body);\n    }\n  } catch (e) {\n    lc.warn?.('Error handling inspect message', e);\n    client.sendInspectResponse(lc, {\n      op: 'error',\n      id: body.id,\n      value: (e as Error).message,\n    });\n  }\n}\n\n/**\n * Converts per-query server metrics to the appropriate wire format based on the\n * client's protocol version.\n *\n * Protocol >= 51: new format — `query-hydration-server-ms` (plain number) +\n *   `query-update-server` (TDigest).\n * Protocol < 51: old format — `query-materialization-server` (TDigest) +\n *   `query-update-server` (TDigest). The scalar hydration time is wrapped into a\n *   one-point TDigest for backward compatibility.\n *\n * @visibleForTesting\n */\nexport function metricsForProtocol(\n  metrics: QueryServerMetrics | null,\n  protocolVersion: number,\n): QueryServerMetrics | null {\n  if (protocolVersion >= 51 || metrics === null) {\n    return metrics;\n  }\n  // Backward compat: wrap the scalar hydration ms into a one-point TDigest\n  // under the old field name so that 1.5 clients can parse the response.\n  const hydrateDigest = new TDigest();\n  const hydrateMs = metrics['query-hydration-server-ms'];\n  if (hydrateMs !== undefined) {\n    hydrateDigest.add(hydrateMs);\n  }\n  const legacyMetrics: ServerMetrics = {\n    'query-materialization-server': hydrateDigest.toJSON(),\n    'query-update-server': metrics['query-update-server'],\n  };\n  // Cast to QueryServerMetrics: this is intentional — for old-protocol clients\n  // we send the legacy ServerMetrics wire shape under the QueryServerMetrics type\n  // to satisfy TypeScript while preserving backward compatibility.\n  return legacyMetrics as unknown as QueryServerMetrics;\n}\n"],"mappings":"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"}

package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts

@@ -24,8 +24,9 @@ export type RowAdd = RowOp<ChangeType.ADD>;
 export type RowRemove = RowOp<ChangeType.REMOVE>;
 export type RowEdit = RowOp<ChangeType.EDIT>;
 export type RowChange = RowAdd | RowRemove | RowEdit;
-type QueryInfo = {
+export type QueryInfo = {
     readonly transformedAst: AST;
+    readonly originalAst?: AST | undefined;
     readonly transformationHash: string;
     readonly queryName?: string | undefined;
 };

package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts.map

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

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

@@ -196,6 +196,7 @@ var PipelineDriver = class {
 			this.#pipelines.delete(queryID);
 			this.#destroyPipeline(queryID, pipeline, "destroy");
 		}
+		this.#tables.clear();
 		this.#rowSetSignatures.clear();
 		this.#storage.destroy();
 		this.#snapshotter.destroy();
@@ -244,20 +245,25 @@ var PipelineDriver = class {
 				addEdge() {},
 				decorateFilterInput: (input) => input
 			}, "scalar-subquery");
+			companionInputs.push(input);
 			let node;
 			for (const n of skipYields(input.fetch({}))) node ??= n;
-			if (!node) {
-				companionInputs.push(input);
-				return;
-			}
+			if (!node) return;
 			companionRows.push({
 				table: subqueryAST.table,
 				row: node.row
 			});
-			companionInputs.push(input);
 			return node.row[childField] ?? null;
 		};
-		const { ast: resolved, companions, ignoredScalarHints } = resolveSimpleScalarSubqueries(ast, this.#tableSpecs, executor);
+		let resolved;
+		let companions;
+		let ignoredScalarHints;
+		try {
+			({ast: resolved, companions, ignoredScalarHints} = resolveSimpleScalarSubqueries(ast, this.#tableSpecs, executor));
+		} catch (e) {
+			for (const input of companionInputs) input.destroy();
+			throw e;
+		}
 		return {
 			ast: resolved,
 			companionRows,
@@ -296,15 +302,17 @@ var PipelineDriver = class {
 			queryName,
 			hydrationReason
 		});
-		const debugDelegate = runtimeDebugFlags.trackRowsVended ? new Debug() : void 0;
+		const debugDelegate = runtimeDebugFlags.trackRowsVended ? new Debug(true) : void 0;
 		const costModel = this.#ensureCostModelExistsIfEnabled(this.#snapshotter.current().db.db);
 		assert(this.#advanceContext === null, "Cannot hydrate while advance is in progress");
 		this.#hydrateContext = { timer };
 		let hydrationFinished = false;
 		let hydrationFailed = false;
 		let hydrationRowCount = 0;
+		let builtInputs = [];
 		try {
 			const { ast: resolvedQuery, companionRows, companions: companionMeta, companionInputs, ignoredScalarHints } = this.#resolveScalarSubqueries(query);
+			builtInputs = [...companionInputs];
 			this.#warnIgnoredScalarHints(queryID, ignoredScalarHints);
 			const input = buildPipeline(resolvedQuery, {
 				debug: debugDelegate,
@@ -316,6 +324,7 @@ var PipelineDriver = class {
 				addEdge() {},
 				decorateFilterInput: (input) => input
 			}, queryID, costModel);
+			builtInputs.push(input);
 			const schema = input.getSchema();
 			input.setOutput({ push: (change) => {
 				const streamer = this.#streamer;
@@ -391,6 +400,7 @@ var PipelineDriver = class {
 				pipelineRunID,
 				pipelineReadyAtMs,
 				transformedAst: resolvedQuery,
+				originalAst: query,
 				transformationHash,
 				...queryName !== void 0 && { queryName },
 				companions: liveCompanions
@@ -435,6 +445,11 @@ var PipelineDriver = class {
 				hydrationTimeMs: timer.totalElapsed(),
 				hydrationRowCount
 			});
+			if (!hydrationFinished) {
+				for (const input of builtInputs) input.destroy();
+				this.#pruneUnusedTables();
+				this.#rowSetSignatures.delete(queryID);
+			}
 			this.#hydrateContext = null;
 		}
 	}
@@ -447,9 +462,13 @@ var PipelineDriver = class {
 		if (pipeline) {
 			this.#pipelines.delete(queryID);
 			this.#destroyPipeline(queryID, pipeline, stopReason);
+			this.#pruneUnusedTables();
 		}
 		this.#rowSetSignatures.delete(queryID);
 	}
+	#pruneUnusedTables() {
+		for (const [table, source] of this.#tables.entries()) if (!source.hasConnections()) this.#tables.delete(table);
+	}
 	#destroyPipeline(queryID, pipeline, stopReason) {
 		this.#logQueryPipelineLifecycle({
 			zeroEvent: "query-pipeline-stop",
@@ -516,7 +535,7 @@ var PipelineDriver = class {
 	*/
 	advance(timer) {
 		assert(this.initialized(), "Pipeline driver must be initialized before advancing");
-		const diff = this.#snapshotter.advance(this.#tableSpecs, this.#allTableNames);
+		const diff = this.#snapshotter.advance(this.#tableSpecs, this.#allTableNames, this.#tables);
 		const { prev, curr, changes } = diff;
 		this.#lc.debug?.(`advance ${prev.version} => ${curr.version}: ${changes} changes`);
 		return {
@@ -542,7 +561,6 @@ var PipelineDriver = class {
 				const start = timer.totalElapsed();
 				const advanceContext = must(this.#advanceContext);
 				advanceContext.currentChangeStartMs = start;
-				let type;
 				try {
 					try {
 						const tableSource = this.#tables.get(table);
@@ -564,10 +582,7 @@ var PipelineDriver = class {
 					advanceContext.currentChangeStartMs = void 0;
 				}
 				const elapsed = timer.totalElapsed() - start;
-				this.#advanceTime.recordMs(elapsed, {
-					table,
-					type
-				});
+				this.#advanceTime.recordMs(elapsed, { table });
 			}
 			const { curr } = diff;
 			for (const table of this.#tables.values()) table.setDB(curr.db.db);
@@ -813,13 +828,13 @@ function getRowKey(cols, row) {
 * function for reuse by the analyze-query RPC path so that analysis hydrates
 * queries the same way the view-syncer does in production.
 */
-function* hydrate(input, hash, clientSchema, tableSpecs) {
+function hydrate(input, hash, clientSchema, tableSpecs) {
 	const res = input.fetch({});
-	yield* new Streamer(buildPrimaryKeys(clientSchema), tableSpecs).accumulate(hash, input.getSchema(), toAdds(res)).stream();
+	return new Streamer(buildPrimaryKeys(clientSchema), tableSpecs).accumulate(hash, input.getSchema(), toAdds(res)).stream();
 }
-function* hydrateInternal(input, hash, primaryKeys, tableSpecs) {
+function hydrateInternal(input, hash, primaryKeys, tableSpecs) {
 	const res = input.fetch({});
-	yield* new Streamer(primaryKeys, tableSpecs).accumulate(hash, input.getSchema(), toAdds(res)).stream();
+	return new Streamer(primaryKeys, tableSpecs).accumulate(hash, input.getSchema(), toAdds(res)).stream();
 }
 function buildPrimaryKeys(clientSchema, primaryKeys = /* @__PURE__ */ new Map()) {
 	for (const [tableName, { primaryKey }] of Object.entries(clientSchema.tables)) primaryKeys.set(tableName, primaryKey);
@@ -828,7 +843,7 @@ function buildPrimaryKeys(clientSchema, primaryKeys = /* @__PURE__ */ new Map())
 function mustGetPrimaryKey(primaryKeys, table) {
 	const pKeys = must(primaryKeys, "primaryKey map must be non-null");
 	const rv = pKeys.get(table);
-	assert(rv, () => `table '${table}' is not one of: ${[...pKeys.keys()].sort()}. Check the spelling and ensure that the table has a primary key.`);
+	assert(rv, () => `table '${table}' is not one of: ${JSON.stringify([...pKeys.keys()].sort())}. Check the spelling and ensure that the table has a primary key.`);
 	return rv;
 }
 /**