@rocicorp/zero 1.9.1-canary.1 → 1.9.1-canary.2

package/out/analyze-query/src/analyze-cli.js

@@ -9,7 +9,7 @@ import { parseOptions } from "../../shared/src/options.js";
 import { ZERO_ENV_VAR_PREFIX } from "../../zero-cache/src/config/zero-config.js";
 import { Console } from "node:console";
 import { styleText } from "node:util";
-import { WebSocket as WebSocket$1 } from "ws";
+import { WebSocket } from "ws";
 //#region ../analyze-query/src/analyze-cli.ts
 var options = {
 	zeroCacheURL: {
@@ -223,7 +223,7 @@ function resolveHandshakeHeaders(config) {
 	return headers;
 }
 function installWebSocketHeaderShim(headers) {
-	class HeaderInjectingWebSocket extends WebSocket$1 {
+	class HeaderInjectingWebSocket extends WebSocket {
 		constructor(url, protocols) {
 			super(url, protocols, { headers });
 		}

package/out/analyze-query/src/analyze-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze-cli.js","names":[],"sources":["../../../../analyze-query/src/analyze-cli.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport {Console} from 'node:console';\nimport {styleText} from 'node:util';\nimport type {LogSink} from '@rocicorp/logger';\nimport {WebSocket as NodeWebSocket} from 'ws';\nimport {logLevel, logOptions} from '../../otel/src/log-options.ts';\nimport {colorConsole} from '../../shared/src/logging.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {ZERO_ENV_VAR_PREFIX} from '../../zero-cache/src/config/zero-config.ts';\nimport {Zero} from '../../zero-client/src/client/zero.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {formatPlannerEvents} from '../../zql/src/planner/planner-debug.ts';\nimport {createBuilder} from '../../zql/src/query/create-builder.ts';\nimport type {AnyQuery} from '../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../zql/src/query/schema-query.ts';\n\nexport type AnalyzeCLIOptions = {\n  schema: Schema;\n  /** Defaults to `process.argv.slice(2)`. */\n  argv?: readonly string[] | undefined;\n};\n\nconst options = {\n  zeroCacheURL: {\n    type: v.string().optional(),\n    desc: [\n      'URL of the remote zero-cache to analyze against.',\n      'Accepts http(s):// or ws(s):// (ws(s) is the transport actually used).',\n    ],\n  },\n  adminPassword: {\n    type: v.string().optional(),\n    desc: [\n      'Admin password for zero-cache.',\n      'Required when the server is configured with one; ignored in dev mode.',\n    ],\n  },\n  authToken: {\n    type: v.string().optional(),\n    desc: [\n      'Raw JWT forwarded to zero-cache.',\n      'Used server-side to fill permission variables for the query.',\n    ],\n  },\n  cookie: {\n    type: v.string().optional(),\n    desc: [\n      'Cookie header value sent on the WebSocket upgrade request,',\n      'e.g. `session=abc; foo=bar`. Use this when zero-cache is behind',\n      'a proxy that resolves auth via cookies. Merged with --headers-json',\n      '(--cookie wins on conflict).',\n    ],\n  },\n  headersJson: {\n    type: v.string().optional(),\n    desc: [\n      'JSON object of arbitrary headers to send on the WebSocket upgrade',\n      'request, e.g. `{\"x-api-key\":\"...\"}`. Escape hatch for exotic auth',\n      'schemes; prefer --auth-token or --cookie when possible.',\n    ],\n  },\n  userId: {\n    type: v.string().optional(),\n    desc: [\n      'Optional userID to report to zero-cache.',\n      'Omit for anonymous analysis.',\n    ],\n  },\n  ast: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded AST. Exactly one of --ast / --query / --query-name is required.',\n      'The AST is sent to the server verbatim — provide it in server (post-mapping) form.',\n    ],\n  },\n  query: {\n    type: v.string().optional(),\n    desc: [\n      'ZQL query in chain form, e.g. `issue.related(\"comments\").limit(10)`.',\n      'Evaluated against the schema you pass to runAnalyzeCLI.',\n    ],\n  },\n  queryName: {\n    type: v.string().optional(),\n    desc: [\n      'Name of a server-registered custom (named) query.',\n      'The server resolves the name + args via its registered query handler.',\n    ],\n  },\n  queryArgs: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded array of arguments for --query-name. Defaults to `[]`.',\n    ],\n  },\n  outputVendedRows: {\n    type: v.boolean().default(false),\n    desc: [\n      'Include the rows read from the replica to execute the query.',\n      'Each row appears once per read.',\n    ],\n  },\n  outputSyncedRows: {\n    type: v.boolean().default(false),\n    desc: ['Include the rows that would be synced to the client.'],\n  },\n  joinPlans: {\n    type: v.boolean().default(false),\n    desc: ['Include join planner diagnostics.'],\n  },\n  log: {\n    ...logOptions,\n    level: logLevel.default('error'),\n  },\n};\n\ntype QueryPlan =\n  | {kind: 'ast'; ast: AST}\n  | {kind: 'zql'; text: string}\n  | {kind: 'named'; name: string; args: ReadonlyArray<unknown>};\n\n// Route all Zero client log output to stderr so stdout contains only the\n// analyze result. Shell redirection (`2>/dev/null`) can then cleanly silence\n// logs without affecting output.\nconst stderrConsole = new Console({\n  stdout: process.stderr,\n  stderr: process.stderr,\n});\nconst stderrLogSink: LogSink = {\n  log(level, context, ...args) {\n    const ctx = context\n      ? Object.entries(context).map(([k, v]) =>\n          v === undefined ? k : `${k}=${v}`,\n        )\n      : [];\n    stderrConsole[level](...ctx, ...args);\n  },\n};\n\n/**\n * Entry point for a user's `cli.ts`. Parses argv, connects to a remote\n * zero-cache by standing up an in-process Zero client (in-memory storage,\n * no subscriptions), calls the inspector's `analyze-query` RPC, and\n * renders the result. Intended to be called as:\n *\n * ```ts\n * import {schema} from './schema.ts';\n * import {runAnalyzeCLI} from '@rocicorp/zero/analyze';\n * await runAnalyzeCLI({schema});\n * ```\n *\n * Exits the process with code 1 on error.\n */\nexport async function runAnalyzeCLI(opts: AnalyzeCLIOptions): Promise<void> {\n  const argv = (opts.argv ?? process.argv.slice(2)).map(s =>\n    s.replaceAll('\\n', ' '),\n  );\n\n  const config = parseOptions(options, {\n    argv,\n    envNamePrefix: ZERO_ENV_VAR_PREFIX,\n    description: [\n      {\n        header: 'analyze-query (remote)',\n        content: `Analyze a ZQL query against a remote zero-cache.\n\n  Connects to zero-cache's inspector protocol and reports the server-observed\n  row scans, SQLite query plans, and timings.`,\n      },\n      {\n        header: 'Examples',\n        content: `  node cli.ts --zero-cache-url=https://zero.example.com \\\\\n    --admin-password=\"$ZERO_ADMIN_PASSWORD\" \\\\\n    --query='issue.related(\"comments\").limit(10)'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --ast='\\\\{\"table\": \"issue\", \"limit\": 5\\\\}'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --query-name=issueList --query-args='[]'`,\n      },\n    ],\n  });\n\n  if (!config.zeroCacheURL) {\n    colorConsole.error('--zero-cache-url is required. See --help for usage.');\n    process.exit(1);\n  }\n\n  const plan = buildQueryPlan(config);\n\n  const handshakeHeaders = resolveHandshakeHeaders(config);\n  if (Object.keys(handshakeHeaders).length > 0) {\n    installWebSocketHeaderShim(handshakeHeaders);\n  }\n\n  // zero-client and replicache reference a build-time `TESTING` global that\n  // bundlers replace with a boolean literal; under node there's no replacement,\n  // so provide a runtime default.\n  (globalThis as {TESTING?: boolean}).TESTING ??= false;\n\n  const z = new Zero({\n    schema: opts.schema,\n    server: config.zeroCacheURL,\n    auth: config.authToken,\n    userID: config.userId,\n    kvStore: 'mem',\n    logLevel: config.log.level,\n    logSink: stderrLogSink,\n  });\n\n  let result: AnalyzeQueryResult;\n  try {\n    const authOk = await z.inspector.authenticate(config.adminPassword ?? '');\n    if (!authOk) {\n      throw new Error(\n        'admin password rejected (or --admin-password is required)',\n      );\n    }\n\n    const rpcOptions = {\n      vendedRows: config.outputVendedRows,\n      syncedRows: config.outputSyncedRows,\n      joinPlans: config.joinPlans,\n    };\n\n    if (plan.kind === 'ast') {\n      result = await z.inspector.analyzeServerAST(plan.ast, rpcOptions);\n    } else if (plan.kind === 'named') {\n      result = await z.inspector.analyzeNamedQuery(\n        plan.name,\n        plan.args as ReadonlyArray<never>,\n        rpcOptions,\n      );\n    } else {\n      const built = buildZqlQuery(plan.text, createBuilder(opts.schema));\n      result = await z.inspector.analyzeQuery(built, rpcOptions);\n    }\n  } catch (e) {\n    colorConsole.error(e instanceof Error ? e.message : String(e));\n    await z.close().catch(() => {});\n    process.exit(1);\n  }\n\n  renderResult(result, {\n    outputSyncedRows: config.outputSyncedRows,\n    outputVendedRows: config.outputVendedRows,\n  });\n\n  await z.close();\n}\n\nfunction buildQueryPlan(config: {\n  ast?: string | undefined;\n  query?: string | undefined;\n  queryName?: string | undefined;\n  queryArgs?: string | undefined;\n}): QueryPlan {\n  const selectors = [\n    config.ast !== undefined && 'ast',\n    config.query !== undefined && 'query',\n    config.queryName !== undefined && 'queryName',\n  ].filter(Boolean) as string[];\n\n  if (selectors.length === 0) {\n    colorConsole.error(\n      'Exactly one of --ast / --query / --query-name is required.',\n    );\n    process.exit(1);\n  }\n  if (selectors.length > 1) {\n    colorConsole.error(\n      `Only one of --ast / --query / --query-name may be provided; got: ${selectors.join(', ')}`,\n    );\n    process.exit(1);\n  }\n\n  if (config.ast !== undefined) {\n    return {kind: 'ast', ast: JSON.parse(config.ast) as AST};\n  }\n  if (config.query !== undefined) {\n    return {kind: 'zql', text: config.query};\n  }\n  const args = config.queryArgs\n    ? (JSON.parse(config.queryArgs) as ReadonlyArray<unknown>)\n    : [];\n  return {kind: 'named', name: config.queryName as string, args};\n}\n\nfunction buildZqlQuery(\n  queryString: string,\n  builder: SchemaQuery<Schema>,\n): AnyQuery {\n  const f = new Function('builder', `return builder.${queryString};`);\n  return f(builder) as AnyQuery;\n}\n\nfunction resolveHandshakeHeaders(config: {\n  cookie?: string | undefined;\n  headersJson?: string | undefined;\n}): Record<string, string> {\n  const headers: Record<string, string> = {};\n  if (config.headersJson !== undefined) {\n    let parsed: unknown;\n    try {\n      parsed = JSON.parse(config.headersJson);\n    } catch (e) {\n      colorConsole.error(\n        `--headers-json is not valid JSON: ${e instanceof Error ? e.message : String(e)}`,\n      );\n      process.exit(1);\n    }\n    if (\n      parsed === null ||\n      typeof parsed !== 'object' ||\n      Array.isArray(parsed)\n    ) {\n      colorConsole.error('--headers-json must be a JSON object.');\n      process.exit(1);\n    }\n    for (const [k, val] of Object.entries(parsed)) {\n      if (typeof val !== 'string') {\n        colorConsole.error(\n          `--headers-json values must be strings; got ${typeof val} for \"${k}\".`,\n        );\n        process.exit(1);\n      }\n      headers[k] = val;\n    }\n  }\n  if (config.cookie !== undefined) {\n    headers.cookie = config.cookie;\n  }\n  return headers;\n}\n\nfunction installWebSocketHeaderShim(headers: Record<string, string>): void {\n  class HeaderInjectingWebSocket extends NodeWebSocket {\n    constructor(url: string | URL, protocols?: string | string[]) {\n      super(url, protocols, {headers});\n    }\n  }\n  (globalThis as {WebSocket?: unknown}).WebSocket = HeaderInjectingWebSocket;\n}\n\nfunction renderResult(\n  result: AnalyzeQueryResult,\n  opts: {outputSyncedRows: boolean; outputVendedRows: boolean},\n) {\n  if (opts.outputSyncedRows) {\n    colorConsole.log(styleText(['blue', 'bold'], '=== Synced Rows: ===\\n'));\n    for (const [table, rows] of Object.entries(result.syncedRows ?? {})) {\n      colorConsole.log(styleText('bold', table + ':'), rows);\n    }\n  }\n\n  colorConsole.log(styleText(['blue', 'bold'], '=== Query Stats: ===\\n'));\n  colorConsole.log(\n    styleText('bold', 'total synced rows:'),\n    result.syncedRowCount,\n  );\n\n  const readRowCountsByQuery = result.readRowCountsByQuery ?? {};\n  let totalRowsRead = 0;\n  for (const table of Object.keys(readRowCountsByQuery).sort()) {\n    const counts = readRowCountsByQuery[table];\n    for (const n of Object.values(counts)) {\n      totalRowsRead += n;\n    }\n    colorConsole.log(styleText('bold', `${table} vended:`), counts);\n  }\n  colorConsole.log(\n    styleText('bold', 'Rows Read (into JS):'),\n    colorRowsConsidered(totalRowsRead),\n  );\n  const duration = result.elapsed ?? result.end - result.start;\n  colorConsole.log(styleText('bold', 'time:'), colorTime(duration), 'ms');\n\n  if (opts.outputVendedRows) {\n    colorConsole.log(\n      styleText(['blue', 'bold'], '=== JS Row Scan Values: ===\\n'),\n    );\n    for (const [table, rows] of Object.entries(result.readRows ?? {})) {\n      colorConsole.log(styleText('bold', `${table}:`), rows);\n    }\n  }\n\n  colorConsole.log(\n    styleText(['blue', 'bold'], '\\n=== Rows Scanned (by SQLite): ===\\n'),\n  );\n  const dbScansByQuery = result.dbScansByQuery ?? {};\n  let totalNVisit = 0;\n  for (const [table, queries] of Object.entries(dbScansByQuery)) {\n    colorConsole.log(styleText('bold', `${table}:`), queries);\n    for (const count of Object.values(queries)) {\n      totalNVisit += count;\n    }\n  }\n  colorConsole.log(\n    styleText('bold', 'total rows scanned:'),\n    colorRowsConsidered(totalNVisit),\n  );\n\n  colorConsole.log(styleText(['blue', 'bold'], '\\n\\n=== Query Plans: ===\\n'));\n  const plans = result.sqlitePlans ?? {};\n  for (const [query, plan] of Object.entries(plans)) {\n    colorConsole.log(styleText('bold', 'query'), query);\n    colorConsole.log(plan.map((row, i) => colorPlanRow(row, i)).join('\\n'));\n    colorConsole.log('\\n');\n  }\n\n  if (result.warnings.length > 0) {\n    colorConsole.log(styleText(['yellow', 'bold'], '=== Warnings: ===\\n'));\n    for (const w of result.warnings) {\n      colorConsole.log(styleText('yellow', w));\n    }\n  }\n\n  if (result.joinPlans && result.joinPlans.length > 0) {\n    colorConsole.log(styleText(['blue', 'bold'], '\\n=== Join Plans: ===\\n'));\n    colorConsole.log(formatPlannerEvents(result.joinPlans));\n  }\n}\n\nfunction colorTime(duration: number) {\n  if (duration < 100) {\n    return styleText('green', duration.toFixed(2) + 'ms');\n  } else if (duration < 1000) {\n    return styleText('yellow', duration.toFixed(2) + 'ms');\n  }\n  return styleText('red', duration.toFixed(2) + 'ms');\n}\n\nfunction colorRowsConsidered(n: number) {\n  if (n < 1000) {\n    return styleText('green', n.toString());\n  } else if (n < 10000) {\n    return styleText('yellow', n.toString());\n  }\n  return styleText('red', n.toString());\n}\n\nfunction colorPlanRow(row: string, i: number) {\n  if (row.includes('SCAN')) {\n    if (i === 0) {\n      return styleText('yellow', row);\n    }\n    return styleText('red', row);\n  }\n  return styleText('green', row);\n}\n"],"mappings":"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"}
+{"version":3,"file":"analyze-cli.js","names":[],"sources":["../../../../analyze-query/src/analyze-cli.ts"],"sourcesContent":["import '../../shared/src/dotenv.ts';\n\nimport {Console} from 'node:console';\nimport {styleText} from 'node:util';\nimport type {LogSink} from '@rocicorp/logger';\nimport {WebSocket as NodeWebSocket} from 'ws';\nimport {logLevel, logOptions} from '../../otel/src/log-options.ts';\nimport {colorConsole} from '../../shared/src/logging.ts';\nimport {parseOptions} from '../../shared/src/options.ts';\nimport * as v from '../../shared/src/valita.ts';\nimport {ZERO_ENV_VAR_PREFIX} from '../../zero-cache/src/config/zero-config.ts';\nimport {Zero} from '../../zero-client/src/client/zero.ts';\nimport type {AnalyzeQueryResult} from '../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../zero-protocol/src/ast.ts';\nimport type {Schema} from '../../zero-types/src/schema.ts';\nimport {formatPlannerEvents} from '../../zql/src/planner/planner-debug.ts';\nimport {createBuilder} from '../../zql/src/query/create-builder.ts';\nimport type {AnyQuery} from '../../zql/src/query/query.ts';\nimport type {SchemaQuery} from '../../zql/src/query/schema-query.ts';\n\nexport type AnalyzeCLIOptions = {\n  schema: Schema;\n  /** Defaults to `process.argv.slice(2)`. */\n  argv?: readonly string[] | undefined;\n};\n\nconst options = {\n  zeroCacheURL: {\n    type: v.string().optional(),\n    desc: [\n      'URL of the remote zero-cache to analyze against.',\n      'Accepts http(s):// or ws(s):// (ws(s) is the transport actually used).',\n    ],\n  },\n  adminPassword: {\n    type: v.string().optional(),\n    desc: [\n      'Admin password for zero-cache.',\n      'Required when the server is configured with one; ignored in dev mode.',\n    ],\n  },\n  authToken: {\n    type: v.string().optional(),\n    desc: [\n      'Raw JWT forwarded to zero-cache.',\n      'Used server-side to fill permission variables for the query.',\n    ],\n  },\n  cookie: {\n    type: v.string().optional(),\n    desc: [\n      'Cookie header value sent on the WebSocket upgrade request,',\n      'e.g. `session=abc; foo=bar`. Use this when zero-cache is behind',\n      'a proxy that resolves auth via cookies. Merged with --headers-json',\n      '(--cookie wins on conflict).',\n    ],\n  },\n  headersJson: {\n    type: v.string().optional(),\n    desc: [\n      'JSON object of arbitrary headers to send on the WebSocket upgrade',\n      'request, e.g. `{\"x-api-key\":\"...\"}`. Escape hatch for exotic auth',\n      'schemes; prefer --auth-token or --cookie when possible.',\n    ],\n  },\n  userId: {\n    type: v.string().optional(),\n    desc: [\n      'Optional userID to report to zero-cache.',\n      'Omit for anonymous analysis.',\n    ],\n  },\n  ast: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded AST. Exactly one of --ast / --query / --query-name is required.',\n      'The AST is sent to the server verbatim — provide it in server (post-mapping) form.',\n    ],\n  },\n  query: {\n    type: v.string().optional(),\n    desc: [\n      'ZQL query in chain form, e.g. `issue.related(\"comments\").limit(10)`.',\n      'Evaluated against the schema you pass to runAnalyzeCLI.',\n    ],\n  },\n  queryName: {\n    type: v.string().optional(),\n    desc: [\n      'Name of a server-registered custom (named) query.',\n      'The server resolves the name + args via its registered query handler.',\n    ],\n  },\n  queryArgs: {\n    type: v.string().optional(),\n    desc: [\n      'JSON-encoded array of arguments for --query-name. Defaults to `[]`.',\n    ],\n  },\n  outputVendedRows: {\n    type: v.boolean().default(false),\n    desc: [\n      'Include the rows read from the replica to execute the query.',\n      'Each row appears once per read.',\n    ],\n  },\n  outputSyncedRows: {\n    type: v.boolean().default(false),\n    desc: ['Include the rows that would be synced to the client.'],\n  },\n  joinPlans: {\n    type: v.boolean().default(false),\n    desc: ['Include join planner diagnostics.'],\n  },\n  log: {\n    ...logOptions,\n    level: logLevel.default('error'),\n  },\n};\n\ntype QueryPlan =\n  | {kind: 'ast'; ast: AST}\n  | {kind: 'zql'; text: string}\n  | {kind: 'named'; name: string; args: ReadonlyArray<unknown>};\n\n// Route all Zero client log output to stderr so stdout contains only the\n// analyze result. Shell redirection (`2>/dev/null`) can then cleanly silence\n// logs without affecting output.\nconst stderrConsole = new Console({\n  stdout: process.stderr,\n  stderr: process.stderr,\n});\nconst stderrLogSink: LogSink = {\n  log(level, context, ...args) {\n    const ctx = context\n      ? Object.entries(context).map(([k, v]) =>\n          v === undefined ? k : `${k}=${v}`,\n        )\n      : [];\n    stderrConsole[level](...ctx, ...args);\n  },\n};\n\n/**\n * Entry point for a user's `cli.ts`. Parses argv, connects to a remote\n * zero-cache by standing up an in-process Zero client (in-memory storage,\n * no subscriptions), calls the inspector's `analyze-query` RPC, and\n * renders the result. Intended to be called as:\n *\n * ```ts\n * import {schema} from './schema.ts';\n * import {runAnalyzeCLI} from '@rocicorp/zero/analyze';\n * await runAnalyzeCLI({schema});\n * ```\n *\n * Exits the process with code 1 on error.\n */\nexport async function runAnalyzeCLI(opts: AnalyzeCLIOptions): Promise<void> {\n  const argv = (opts.argv ?? process.argv.slice(2)).map(s =>\n    s.replaceAll('\\n', ' '),\n  );\n\n  const config = parseOptions(options, {\n    argv,\n    envNamePrefix: ZERO_ENV_VAR_PREFIX,\n    description: [\n      {\n        header: 'analyze-query (remote)',\n        content: `Analyze a ZQL query against a remote zero-cache.\n\n  Connects to zero-cache's inspector protocol and reports the server-observed\n  row scans, SQLite query plans, and timings.`,\n      },\n      {\n        header: 'Examples',\n        content: `  node cli.ts --zero-cache-url=https://zero.example.com \\\\\n    --admin-password=\"$ZERO_ADMIN_PASSWORD\" \\\\\n    --query='issue.related(\"comments\").limit(10)'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --ast='\\\\{\"table\": \"issue\", \"limit\": 5\\\\}'\n\n  node cli.ts --zero-cache-url=http://localhost:4848 \\\\\n    --query-name=issueList --query-args='[]'`,\n      },\n    ],\n  });\n\n  if (!config.zeroCacheURL) {\n    colorConsole.error('--zero-cache-url is required. See --help for usage.');\n    process.exit(1);\n  }\n\n  const plan = buildQueryPlan(config);\n\n  const handshakeHeaders = resolveHandshakeHeaders(config);\n  if (Object.keys(handshakeHeaders).length > 0) {\n    installWebSocketHeaderShim(handshakeHeaders);\n  }\n\n  // zero-client and replicache reference a build-time `TESTING` global that\n  // bundlers replace with a boolean literal; under node there's no replacement,\n  // so provide a runtime default.\n  (globalThis as {TESTING?: boolean}).TESTING ??= false;\n\n  const z = new Zero({\n    schema: opts.schema,\n    server: config.zeroCacheURL,\n    auth: config.authToken,\n    userID: config.userId,\n    kvStore: 'mem',\n    logLevel: config.log.level,\n    logSink: stderrLogSink,\n  });\n\n  let result: AnalyzeQueryResult;\n  try {\n    const authOk = await z.inspector.authenticate(config.adminPassword ?? '');\n    if (!authOk) {\n      throw new Error(\n        'admin password rejected (or --admin-password is required)',\n      );\n    }\n\n    const rpcOptions = {\n      vendedRows: config.outputVendedRows,\n      syncedRows: config.outputSyncedRows,\n      joinPlans: config.joinPlans,\n    };\n\n    if (plan.kind === 'ast') {\n      result = await z.inspector.analyzeServerAST(plan.ast, rpcOptions);\n    } else if (plan.kind === 'named') {\n      result = await z.inspector.analyzeNamedQuery(\n        plan.name,\n        plan.args as ReadonlyArray<never>,\n        rpcOptions,\n      );\n    } else {\n      const built = buildZqlQuery(plan.text, createBuilder(opts.schema));\n      result = await z.inspector.analyzeQuery(built, rpcOptions);\n    }\n  } catch (e) {\n    colorConsole.error(e instanceof Error ? e.message : String(e));\n    await z.close().catch(() => {});\n    process.exit(1);\n  }\n\n  renderResult(result, {\n    outputSyncedRows: config.outputSyncedRows,\n    outputVendedRows: config.outputVendedRows,\n  });\n\n  await z.close();\n}\n\nfunction buildQueryPlan(config: {\n  ast?: string | undefined;\n  query?: string | undefined;\n  queryName?: string | undefined;\n  queryArgs?: string | undefined;\n}): QueryPlan {\n  const selectors = [\n    config.ast !== undefined && 'ast',\n    config.query !== undefined && 'query',\n    config.queryName !== undefined && 'queryName',\n  ].filter(Boolean) as string[];\n\n  if (selectors.length === 0) {\n    colorConsole.error(\n      'Exactly one of --ast / --query / --query-name is required.',\n    );\n    process.exit(1);\n  }\n  if (selectors.length > 1) {\n    colorConsole.error(\n      `Only one of --ast / --query / --query-name may be provided; got: ${selectors.join(', ')}`,\n    );\n    process.exit(1);\n  }\n\n  if (config.ast !== undefined) {\n    return {kind: 'ast', ast: JSON.parse(config.ast) as AST};\n  }\n  if (config.query !== undefined) {\n    return {kind: 'zql', text: config.query};\n  }\n  const args = config.queryArgs\n    ? (JSON.parse(config.queryArgs) as ReadonlyArray<unknown>)\n    : [];\n  return {kind: 'named', name: config.queryName as string, args};\n}\n\nfunction buildZqlQuery(\n  queryString: string,\n  builder: SchemaQuery<Schema>,\n): AnyQuery {\n  const f = new Function('builder', `return builder.${queryString};`);\n  return f(builder) as AnyQuery;\n}\n\nfunction resolveHandshakeHeaders(config: {\n  cookie?: string | undefined;\n  headersJson?: string | undefined;\n}): Record<string, string> {\n  const headers: Record<string, string> = {};\n  if (config.headersJson !== undefined) {\n    let parsed: unknown;\n    try {\n      parsed = JSON.parse(config.headersJson);\n    } catch (e) {\n      colorConsole.error(\n        `--headers-json is not valid JSON: ${e instanceof Error ? e.message : String(e)}`,\n      );\n      process.exit(1);\n    }\n    if (\n      parsed === null ||\n      typeof parsed !== 'object' ||\n      Array.isArray(parsed)\n    ) {\n      colorConsole.error('--headers-json must be a JSON object.');\n      process.exit(1);\n    }\n    for (const [k, val] of Object.entries(parsed)) {\n      if (typeof val !== 'string') {\n        colorConsole.error(\n          `--headers-json values must be strings; got ${typeof val} for \"${k}\".`,\n        );\n        process.exit(1);\n      }\n      headers[k] = val;\n    }\n  }\n  if (config.cookie !== undefined) {\n    headers.cookie = config.cookie;\n  }\n  return headers;\n}\n\nfunction installWebSocketHeaderShim(headers: Record<string, string>): void {\n  class HeaderInjectingWebSocket extends NodeWebSocket {\n    constructor(url: string | URL, protocols?: string | string[]) {\n      super(url, protocols, {headers});\n    }\n  }\n  (globalThis as {WebSocket?: unknown}).WebSocket = HeaderInjectingWebSocket;\n}\n\nfunction renderResult(\n  result: AnalyzeQueryResult,\n  opts: {outputSyncedRows: boolean; outputVendedRows: boolean},\n) {\n  if (opts.outputSyncedRows) {\n    colorConsole.log(styleText(['blue', 'bold'], '=== Synced Rows: ===\\n'));\n    for (const [table, rows] of Object.entries(result.syncedRows ?? {})) {\n      colorConsole.log(styleText('bold', table + ':'), rows);\n    }\n  }\n\n  colorConsole.log(styleText(['blue', 'bold'], '=== Query Stats: ===\\n'));\n  colorConsole.log(\n    styleText('bold', 'total synced rows:'),\n    result.syncedRowCount,\n  );\n\n  const readRowCountsByQuery = result.readRowCountsByQuery ?? {};\n  let totalRowsRead = 0;\n  for (const table of Object.keys(readRowCountsByQuery).sort()) {\n    const counts = readRowCountsByQuery[table];\n    for (const n of Object.values(counts)) {\n      totalRowsRead += n;\n    }\n    colorConsole.log(styleText('bold', `${table} vended:`), counts);\n  }\n  colorConsole.log(\n    styleText('bold', 'Rows Read (into JS):'),\n    colorRowsConsidered(totalRowsRead),\n  );\n  const duration = result.elapsed ?? result.end - result.start;\n  colorConsole.log(styleText('bold', 'time:'), colorTime(duration), 'ms');\n\n  if (opts.outputVendedRows) {\n    colorConsole.log(\n      styleText(['blue', 'bold'], '=== JS Row Scan Values: ===\\n'),\n    );\n    for (const [table, rows] of Object.entries(result.readRows ?? {})) {\n      colorConsole.log(styleText('bold', `${table}:`), rows);\n    }\n  }\n\n  colorConsole.log(\n    styleText(['blue', 'bold'], '\\n=== Rows Scanned (by SQLite): ===\\n'),\n  );\n  const dbScansByQuery = result.dbScansByQuery ?? {};\n  let totalNVisit = 0;\n  for (const [table, queries] of Object.entries(dbScansByQuery)) {\n    colorConsole.log(styleText('bold', `${table}:`), queries);\n    for (const count of Object.values(queries)) {\n      totalNVisit += count;\n    }\n  }\n  colorConsole.log(\n    styleText('bold', 'total rows scanned:'),\n    colorRowsConsidered(totalNVisit),\n  );\n\n  colorConsole.log(styleText(['blue', 'bold'], '\\n\\n=== Query Plans: ===\\n'));\n  const plans = result.sqlitePlans ?? {};\n  for (const [query, plan] of Object.entries(plans)) {\n    colorConsole.log(styleText('bold', 'query'), query);\n    colorConsole.log(plan.map((row, i) => colorPlanRow(row, i)).join('\\n'));\n    colorConsole.log('\\n');\n  }\n\n  if (result.warnings.length > 0) {\n    colorConsole.log(styleText(['yellow', 'bold'], '=== Warnings: ===\\n'));\n    for (const w of result.warnings) {\n      colorConsole.log(styleText('yellow', w));\n    }\n  }\n\n  if (result.joinPlans && result.joinPlans.length > 0) {\n    colorConsole.log(styleText(['blue', 'bold'], '\\n=== Join Plans: ===\\n'));\n    colorConsole.log(formatPlannerEvents(result.joinPlans));\n  }\n}\n\nfunction colorTime(duration: number) {\n  if (duration < 100) {\n    return styleText('green', duration.toFixed(2) + 'ms');\n  } else if (duration < 1000) {\n    return styleText('yellow', duration.toFixed(2) + 'ms');\n  }\n  return styleText('red', duration.toFixed(2) + 'ms');\n}\n\nfunction colorRowsConsidered(n: number) {\n  if (n < 1000) {\n    return styleText('green', n.toString());\n  } else if (n < 10000) {\n    return styleText('yellow', n.toString());\n  }\n  return styleText('red', n.toString());\n}\n\nfunction colorPlanRow(row: string, i: number) {\n  if (row.includes('SCAN')) {\n    if (i === 0) {\n      return styleText('yellow', row);\n    }\n    return styleText('red', row);\n  }\n  return styleText('green', row);\n}\n"],"mappings":"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"}

package/out/shared/src/promise-race.d.ts

@@ -13,5 +13,19 @@ type PromiseRaceResult<T extends Record<string, PromiseLike<unknown>>> = {
  * @throws An error if the record is empty or if a promise is rejected.
  */
 export declare function promiseRace<T extends Record<string, PromiseLike<unknown>>>(promises: T): Promise<PromiseRaceResult<T> & {}>;
+/**
+ * A memory-safe way to race a short-lived `Promise` with one or more
+ * long-leved `AbortSignal`s. This works around the unsafe practice
+ * of racing a short-lived promise (e.g. in a loop) with a long-lived one,
+ * which results in accumulating memory via `then` callbacks on the latter:
+ *
+ * https://github.com/nodejs/node/issues/17469
+ *
+ * The safe way to race a short-lived, expected-to-complete Promise against a
+ * long-lived termination signal is to control the latter via an
+ * {@link AbortController} and race the former against the signal of the
+ * latter.
+ */
+export declare function promiseOrAbort<T>(shortLived: Promise<T>, ...longLived: AbortSignal[]): Promise<T>;
 export {};
 //# sourceMappingURL=promise-race.d.ts.map

package/out/shared/src/promise-race.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"promise-race.d.ts","sourceRoot":"","sources":["../../../../shared/src/promise-race.ts"],"names":[],"mappings":"AAAA,KAAK,iBAAiB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI;KACtE,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG;QAC/B,GAAG,EAAE,CAAC,CAAC;QACP,MAAM,EAAE,WAAW,CAAC;QACpB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACvB;CACF,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAc5B;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,EAC9C,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAYjD"}
+{"version":3,"file":"promise-race.d.ts","sourceRoot":"","sources":["../../../../shared/src/promise-race.ts"],"names":[],"mappings":"AAEA,KAAK,iBAAiB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI;KACtE,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG;QAC/B,GAAG,EAAE,CAAC,CAAC;QACP,MAAM,EAAE,WAAW,CAAC;QACpB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACvB;CACF,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAc5B;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,EAC9C,QAAQ,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAYjD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,cAAc,CAAC,CAAC,EACpC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EACtB,GAAG,SAAS,EAAE,WAAW,EAAE,GAC1B,OAAO,CAAC,CAAC,CAAC,CAoBZ"}

package/out/shared/src/promise-race.js

@@ -1,3 +1,4 @@
+import { resolver } from "@rocicorp/resolver";
 //#region ../shared/src/promise-race.ts
 var NO_PROMISES_MESSAGE = "No promises to race";
 var wrapPromise = (key, promise) => Promise.resolve(promise).then((result) => ({
@@ -18,7 +19,37 @@ async function promiseRace(promises) {
 	const wrapped = keys.map((key) => wrapPromise(key, promises[key]));
 	return await Promise.race(wrapped);
 }
+/**
+* A memory-safe way to race a short-lived `Promise` with one or more
+* long-leved `AbortSignal`s. This works around the unsafe practice
+* of racing a short-lived promise (e.g. in a loop) with a long-lived one,
+* which results in accumulating memory via `then` callbacks on the latter:
+*
+* https://github.com/nodejs/node/issues/17469
+*
+* The safe way to race a short-lived, expected-to-complete Promise against a
+* long-lived termination signal is to control the latter via an
+* {@link AbortController} and race the former against the signal of the
+* latter.
+*/
+async function promiseOrAbort(shortLived, ...longLived) {
+	const promises = [];
+	const cleanup = [];
+	for (const signal of longLived) if (signal.aborted) promises.push(Promise.reject(signal.reason));
+	else {
+		const { promise, reject } = resolver();
+		const handler = () => reject(signal.reason);
+		signal.addEventListener("abort", handler);
+		cleanup.push(() => signal.removeEventListener("abort", handler));
+		promises.push(promise);
+	}
+	try {
+		return await Promise.race([shortLived, ...promises]);
+	} finally {
+		cleanup.forEach((fn) => fn());
+	}
+}
 //#endregion
-export { promiseRace };
+export { promiseOrAbort, promiseRace };
 
 //# sourceMappingURL=promise-race.js.map

package/out/shared/src/promise-race.js.map

@@ -1 +1 @@
-{"version":3,"file":"promise-race.js","names":[],"sources":["../../../../shared/src/promise-race.ts"],"sourcesContent":["type PromiseRaceResult<T extends Record<string, PromiseLike<unknown>>> = {\n  [K in Extract<keyof T, string>]: {\n    key: K;\n    status: 'fulfilled';\n    result: Awaited<T[K]>;\n  };\n}[Extract<keyof T, string>];\n\nconst NO_PROMISES_MESSAGE = 'No promises to race';\n\nconst wrapPromise = <K extends string, V>(\n  key: K,\n  promise: PromiseLike<V>,\n): Promise<{key: K; status: 'fulfilled'; result: V}> =>\n  Promise.resolve(promise).then(result => ({\n    key,\n    status: 'fulfilled' as const,\n    result,\n  }));\n\n/**\n * Race a record of promises and resolve with the first resolved entry.\n *\n * @param promises Record of promises to race.\n * @returns Promise resolving to a discriminated union of key/result pairs.\n * @throws An error if the record is empty or if a promise is rejected.\n */\nexport async function promiseRace<\n  T extends Record<string, PromiseLike<unknown>>,\n>(promises: T): Promise<PromiseRaceResult<T> & {}> {\n  const keys = Object.keys(promises) as Array<Extract<keyof T, string>>;\n\n  if (keys.length === 0) {\n    throw new Error(NO_PROMISES_MESSAGE);\n  }\n\n  const wrapped = keys.map(key =>\n    wrapPromise(key, promises[key] as PromiseLike<Awaited<T[typeof key]>>),\n  );\n\n  return await Promise.race(wrapped);\n}\n"],"mappings":";AAQA,IAAM,sBAAsB;AAE5B,IAAM,eACJ,KACA,YAEA,QAAQ,QAAQ,OAAO,EAAE,MAAK,YAAW;CACvC;CACA,QAAQ;CACR;AACF,EAAE;;;;;;;;AASJ,eAAsB,YAEpB,UAAiD;CACjD,MAAM,OAAO,OAAO,KAAK,QAAQ;CAEjC,IAAI,KAAK,WAAW,GAClB,MAAM,IAAI,MAAM,mBAAmB;CAGrC,MAAM,UAAU,KAAK,KAAI,QACvB,YAAY,KAAK,SAAS,IAA2C,CACvE;CAEA,OAAO,MAAM,QAAQ,KAAK,OAAO;AACnC"}
+{"version":3,"file":"promise-race.js","names":[],"sources":["../../../../shared/src/promise-race.ts"],"sourcesContent":["import {resolver} from '@rocicorp/resolver';\n\ntype PromiseRaceResult<T extends Record<string, PromiseLike<unknown>>> = {\n  [K in Extract<keyof T, string>]: {\n    key: K;\n    status: 'fulfilled';\n    result: Awaited<T[K]>;\n  };\n}[Extract<keyof T, string>];\n\nconst NO_PROMISES_MESSAGE = 'No promises to race';\n\nconst wrapPromise = <K extends string, V>(\n  key: K,\n  promise: PromiseLike<V>,\n): Promise<{key: K; status: 'fulfilled'; result: V}> =>\n  Promise.resolve(promise).then(result => ({\n    key,\n    status: 'fulfilled' as const,\n    result,\n  }));\n\n/**\n * Race a record of promises and resolve with the first resolved entry.\n *\n * @param promises Record of promises to race.\n * @returns Promise resolving to a discriminated union of key/result pairs.\n * @throws An error if the record is empty or if a promise is rejected.\n */\nexport async function promiseRace<\n  T extends Record<string, PromiseLike<unknown>>,\n>(promises: T): Promise<PromiseRaceResult<T> & {}> {\n  const keys = Object.keys(promises) as Array<Extract<keyof T, string>>;\n\n  if (keys.length === 0) {\n    throw new Error(NO_PROMISES_MESSAGE);\n  }\n\n  const wrapped = keys.map(key =>\n    wrapPromise(key, promises[key] as PromiseLike<Awaited<T[typeof key]>>),\n  );\n\n  return await Promise.race(wrapped);\n}\n\n/**\n * A memory-safe way to race a short-lived `Promise` with one or more\n * long-leved `AbortSignal`s. This works around the unsafe practice\n * of racing a short-lived promise (e.g. in a loop) with a long-lived one,\n * which results in accumulating memory via `then` callbacks on the latter:\n *\n * https://github.com/nodejs/node/issues/17469\n *\n * The safe way to race a short-lived, expected-to-complete Promise against a\n * long-lived termination signal is to control the latter via an\n * {@link AbortController} and race the former against the signal of the\n * latter.\n */\nexport async function promiseOrAbort<T>(\n  shortLived: Promise<T>,\n  ...longLived: AbortSignal[]\n): Promise<T> {\n  const promises: Promise<T>[] = [];\n  const cleanup: (() => void)[] = [];\n  for (const signal of longLived) {\n    if (signal.aborted) {\n      promises.push(Promise.reject(signal.reason));\n    } else {\n      const {promise, reject} = resolver<T>();\n      const handler = () => reject(signal.reason);\n      signal.addEventListener('abort', handler);\n      cleanup.push(() => signal.removeEventListener('abort', handler));\n      promises.push(promise);\n    }\n  }\n\n  try {\n    return await Promise.race([shortLived, ...promises]);\n  } finally {\n    cleanup.forEach(fn => fn());\n  }\n}\n"],"mappings":";;AAUA,IAAM,sBAAsB;AAE5B,IAAM,eACJ,KACA,YAEA,QAAQ,QAAQ,OAAO,EAAE,MAAK,YAAW;CACvC;CACA,QAAQ;CACR;AACF,EAAE;;;;;;;;AASJ,eAAsB,YAEpB,UAAiD;CACjD,MAAM,OAAO,OAAO,KAAK,QAAQ;CAEjC,IAAI,KAAK,WAAW,GAClB,MAAM,IAAI,MAAM,mBAAmB;CAGrC,MAAM,UAAU,KAAK,KAAI,QACvB,YAAY,KAAK,SAAS,IAA2C,CACvE;CAEA,OAAO,MAAM,QAAQ,KAAK,OAAO;AACnC;;;;;;;;;;;;;;AAeA,eAAsB,eACpB,YACA,GAAG,WACS;CACZ,MAAM,WAAyB,CAAC;CAChC,MAAM,UAA0B,CAAC;CACjC,KAAK,MAAM,UAAU,WACnB,IAAI,OAAO,SACT,SAAS,KAAK,QAAQ,OAAO,OAAO,MAAM,CAAC;MACtC;EACL,MAAM,EAAC,SAAS,WAAU,SAAY;EACtC,MAAM,gBAAgB,OAAO,OAAO,MAAM;EAC1C,OAAO,iBAAiB,SAAS,OAAO;EACxC,QAAQ,WAAW,OAAO,oBAAoB,SAAS,OAAO,CAAC;EAC/D,SAAS,KAAK,OAAO;CACvB;CAGF,IAAI;EACF,OAAO,MAAM,QAAQ,KAAK,CAAC,YAAY,GAAG,QAAQ,CAAC;CACrD,UAAU;EACR,QAAQ,SAAQ,OAAM,GAAG,CAAC;CAC5B;AACF"}

package/out/zero/package.js

@@ -1,6 +1,6 @@
 var package_default = {
 	name: "@rocicorp/zero",
-	version: "1.9.1-canary.1",
+	version: "1.9.1-canary.2",
 	description: "Zero is a web framework for serverless web development.",
 	homepage: "https://zero.rocicorp.dev",
 	bugs: { "url": "https://bugs.rocicorp.dev" },

package/out/zero/package.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.js","names":[],"sources":["../../package.json"],"sourcesContent":["{\n  \"name\": \"@rocicorp/zero\",\n  \"version\": \"1.9.1-canary.1\",\n  \"description\": \"Zero is a web framework for serverless web development.\",\n  \"homepage\": \"https://zero.rocicorp.dev\",\n  \"bugs\": {\n    \"url\": \"https://bugs.rocicorp.dev\"\n  },\n  \"license\": \"Apache-2.0\",\n  \"author\": \"Rocicorp, Inc.\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git+https://github.com/rocicorp/mono.git\",\n    \"directory\": \"packages/zero\"\n  },\n  \"bin\": {\n    \"analyze-query\": \"./out/zero/src/analyze-query.js\",\n    \"ast-to-zql\": \"./out/zero/src/ast-to-zql.js\",\n    \"transform-query\": \"./out/zero/src/transform-query.js\",\n    \"zero-build-schema\": \"./out/zero/src/build-schema.js\",\n    \"zero-cache\": \"./out/zero/src/cli.js\",\n    \"zero-cache-dev\": \"./out/zero/src/zero-cache-dev.js\",\n    \"zero-deploy-permissions\": \"./out/zero/src/deploy-permissions.js\",\n    \"zero-out\": \"./out/zero/src/zero-out.js\"\n  },\n  \"files\": [\n    \"out\",\n    \"!*.tsbuildinfo\"\n  ],\n  \"type\": \"module\",\n  \"main\": \"out/zero/src/zero.js\",\n  \"module\": \"out/zero/src/zero.js\",\n  \"types\": \"out/zero/src/zero.d.ts\",\n  \"exports\": {\n    \".\": {\n      \"types\": \"./out/zero/src/zero.d.ts\",\n      \"default\": \"./out/zero/src/zero.js\"\n    },\n    \"./analyze\": {\n      \"types\": \"./out/zero/src/analyze.d.ts\",\n      \"default\": \"./out/zero/src/analyze.js\"\n    },\n    \"./bindings\": {\n      \"types\": \"./out/zero/src/bindings.d.ts\",\n      \"default\": \"./out/zero/src/bindings.js\"\n    },\n    \"./change-protocol/v0\": {\n      \"types\": \"./out/zero/src/change-protocol/v0.d.ts\",\n      \"default\": \"./out/zero/src/change-protocol/v0.js\"\n    },\n    \"./expo-sqlite\": {\n      \"types\": \"./out/zero/src/expo-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/expo-sqlite.js\"\n    },\n    \"./op-sqlite\": {\n      \"types\": \"./out/zero/src/op-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/op-sqlite.js\"\n    },\n    \"./pg\": {\n      \"types\": \"./out/zero/src/pg.d.ts\",\n      \"default\": \"./out/zero/src/pg.js\"\n    },\n    \"./react\": {\n      \"types\": \"./out/zero/src/react.d.ts\",\n      \"default\": \"./out/zero/src/react.js\"\n    },\n    \"./react-native\": {\n      \"types\": \"./out/zero/src/react-native.d.ts\",\n      \"default\": \"./out/zero/src/react-native.js\"\n    },\n    \"./server\": {\n      \"types\": \"./out/zero/src/server.d.ts\",\n      \"default\": \"./out/zero/src/server.js\"\n    },\n    \"./server/adapters/drizzle\": {\n      \"types\": \"./out/zero/src/adapters/drizzle.d.ts\",\n      \"default\": \"./out/zero/src/adapters/drizzle.js\"\n    },\n    \"./server/adapters/kysely\": {\n      \"types\": \"./out/zero/src/adapters/kysely.d.ts\",\n      \"default\": \"./out/zero/src/adapters/kysely.js\"\n    },\n    \"./server/adapters/prisma\": {\n      \"types\": \"./out/zero/src/adapters/prisma.d.ts\",\n      \"default\": \"./out/zero/src/adapters/prisma.js\"\n    },\n    \"./server/adapters/pg\": {\n      \"types\": \"./out/zero/src/adapters/pg.d.ts\",\n      \"default\": \"./out/zero/src/adapters/pg.js\"\n    },\n    \"./server/adapters/postgresjs\": {\n      \"types\": \"./out/zero/src/adapters/postgresjs.d.ts\",\n      \"default\": \"./out/zero/src/adapters/postgresjs.js\"\n    },\n    \"./solid\": {\n      \"types\": \"./out/zero/src/solid.d.ts\",\n      \"default\": \"./out/zero/src/solid.js\"\n    },\n    \"./sqlite\": {\n      \"types\": \"./out/zero/src/sqlite.d.ts\",\n      \"default\": \"./out/zero/src/sqlite.js\"\n    },\n    \"./zqlite\": {\n      \"types\": \"./out/zero/src/zqlite.d.ts\",\n      \"default\": \"./out/zero/src/zqlite.js\"\n    }\n  },\n  \"scripts\": {\n    \"build\": \"node --experimental-strip-types --no-warnings tool/build.ts\",\n    \"build:watch\": \"node --experimental-strip-types --no-warnings tool/build.ts --watch\",\n    \"check-types\": \"tsc -p tsconfig.client.json && tsc -p tsconfig.server.json\",\n    \"check-types:client:watch\": \"tsc -p tsconfig.client.json --watch\",\n    \"check-types:server:watch\": \"tsc -p tsconfig.server.json --watch\",\n    \"format\": \"oxfmt .\",\n    \"check-format\": \"oxfmt --check .\",\n    \"lint\": \"oxlint --quiet --config ../../oxlint.config.ts src/\",\n    \"docs\": \"node --experimental-strip-types --no-warnings tool/generate-docs.ts\",\n    \"docs:server\": \"node --watch --experimental-strip-types --no-warnings tool/generate-docs.ts --server\",\n    \"fmt\": \"oxfmt .\",\n    \"check-fmt\": \"oxfmt --check .\"\n  },\n  \"dependencies\": {\n    \"@badrap/valita\": \"0.3.11\",\n    \"@databases/escape-identifier\": \"^1.0.3\",\n    \"@databases/sql\": \"^3.3.0\",\n    \"@dotenvx/dotenvx\": \"^1.39.0\",\n    \"@drdgvhbh/postgres-error-codes\": \"^0.0.6\",\n    \"@fastify/cors\": \"^10.0.0\",\n    \"@fastify/websocket\": \"^11.0.0\",\n    \"@google-cloud/precise-date\": \"^4.0.0\",\n    \"@opentelemetry/api\": \"^1.9.0\",\n    \"@opentelemetry/api-logs\": \"^0.218.0\",\n    \"@opentelemetry/auto-instrumentations-node\": \"^0.76.0\",\n    \"@opentelemetry/exporter-metrics-otlp-http\": \"^0.218.0\",\n    \"@opentelemetry/resources\": \"^2.7.1\",\n    \"@opentelemetry/sdk-metrics\": \"^2.7.1\",\n    \"@opentelemetry/sdk-node\": \"^0.218.0\",\n    \"@opentelemetry/sdk-trace-node\": \"^2.7.1\",\n    \"@opentelemetry/semantic-conventions\": \"^1.41.1\",\n    \"@postgresql-typed/oids\": \"^0.2.0\",\n    \"@rocicorp/lock\": \"^1.0.4\",\n    \"@rocicorp/logger\": \"^6.1.0\",\n    \"@rocicorp/resolver\": \"^1.0.2\",\n    \"@rocicorp/zero-sqlite3\": \"^1.1.4\",\n    \"@standard-schema/spec\": \"^1.0.0\",\n    \"@types/basic-auth\": \"^1.1.8\",\n    \"@types/ws\": \"^8.5.12\",\n    \"basic-auth\": \"^2.0.1\",\n    \"chalk-template\": \"^1.1.0\",\n    \"chokidar\": \"^4.0.1\",\n    \"cloudevents\": \"^10.0.0\",\n    \"command-line-args\": \"^6.0.1\",\n    \"command-line-usage\": \"^7.0.3\",\n    \"compare-utf8\": \"^0.2.0\",\n    \"defu\": \"^6.1.4\",\n    \"eventemitter3\": \"^5.0.1\",\n    \"fastify\": \"^5.0.0\",\n    \"is-in-subnet\": \"^4.0.1\",\n    \"jose\": \"^5.9.3\",\n    \"js-xxhash\": \"^4.0.0\",\n    \"json-custom-numbers\": \"^3.1.1\",\n    \"kasi\": \"^1.1.0\",\n    \"nanoid\": \"^5.1.2\",\n    \"oxfmt\": \"^0.45.0\",\n    \"parse-prometheus-text-format\": \"^1.1.1\",\n    \"pg-format\": \"npm:pg-format-fix@^1.0.5\",\n    \"postgres\": \"3.4.7\",\n    \"semver\": \"^7.5.4\",\n    \"url-pattern\": \"^1.0.3\",\n    \"urlpattern-polyfill\": \"^10.1.0\",\n    \"ws\": \"^8.18.1\"\n  },\n  \"devDependencies\": {\n    \"@op-engineering/op-sqlite\": \">=15\",\n    \"@vitest/runner\": \"^4.1.6\",\n    \"analyze-query\": \"workspace:*\",\n    \"ast-to-zql\": \"workspace:*\",\n    \"expo-sqlite\": \">=15\",\n    \"oxc-parser\": \"^0.129.0\",\n    \"replicache\": \"workspace:*\",\n    \"shared\": \"workspace:*\",\n    \"syncpack\": \"^14.3.0\",\n    \"typedoc\": \"^0.28.17\",\n    \"typedoc-plugin-markdown\": \"^4.10.0\",\n    \"typescript\": \"~6.0.2\",\n    \"vite\": \"^8.0.13\",\n    \"vitest\": \"^4.1.6\",\n    \"zero-cache\": \"workspace:*\",\n    \"zero-client\": \"workspace:*\",\n    \"zero-pg\": \"workspace:*\",\n    \"zero-react\": \"workspace:*\",\n    \"zero-server\": \"workspace:*\",\n    \"zero-solid\": \"workspace:*\",\n    \"zqlite\": \"workspace:*\"\n  },\n  \"engines\": {\n    \"node\": \">=22\"\n  },\n  \"packageManager\": \"pnpm@11.5.3\"\n}\n"],"mappings":""}
+{"version":3,"file":"package.js","names":[],"sources":["../../package.json"],"sourcesContent":["{\n  \"name\": \"@rocicorp/zero\",\n  \"version\": \"1.9.1-canary.2\",\n  \"description\": \"Zero is a web framework for serverless web development.\",\n  \"homepage\": \"https://zero.rocicorp.dev\",\n  \"bugs\": {\n    \"url\": \"https://bugs.rocicorp.dev\"\n  },\n  \"license\": \"Apache-2.0\",\n  \"author\": \"Rocicorp, Inc.\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git+https://github.com/rocicorp/mono.git\",\n    \"directory\": \"packages/zero\"\n  },\n  \"bin\": {\n    \"analyze-query\": \"./out/zero/src/analyze-query.js\",\n    \"ast-to-zql\": \"./out/zero/src/ast-to-zql.js\",\n    \"transform-query\": \"./out/zero/src/transform-query.js\",\n    \"zero-build-schema\": \"./out/zero/src/build-schema.js\",\n    \"zero-cache\": \"./out/zero/src/cli.js\",\n    \"zero-cache-dev\": \"./out/zero/src/zero-cache-dev.js\",\n    \"zero-deploy-permissions\": \"./out/zero/src/deploy-permissions.js\",\n    \"zero-out\": \"./out/zero/src/zero-out.js\"\n  },\n  \"files\": [\n    \"out\",\n    \"!*.tsbuildinfo\"\n  ],\n  \"type\": \"module\",\n  \"main\": \"out/zero/src/zero.js\",\n  \"module\": \"out/zero/src/zero.js\",\n  \"types\": \"out/zero/src/zero.d.ts\",\n  \"exports\": {\n    \".\": {\n      \"types\": \"./out/zero/src/zero.d.ts\",\n      \"default\": \"./out/zero/src/zero.js\"\n    },\n    \"./analyze\": {\n      \"types\": \"./out/zero/src/analyze.d.ts\",\n      \"default\": \"./out/zero/src/analyze.js\"\n    },\n    \"./bindings\": {\n      \"types\": \"./out/zero/src/bindings.d.ts\",\n      \"default\": \"./out/zero/src/bindings.js\"\n    },\n    \"./change-protocol/v0\": {\n      \"types\": \"./out/zero/src/change-protocol/v0.d.ts\",\n      \"default\": \"./out/zero/src/change-protocol/v0.js\"\n    },\n    \"./expo-sqlite\": {\n      \"types\": \"./out/zero/src/expo-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/expo-sqlite.js\"\n    },\n    \"./op-sqlite\": {\n      \"types\": \"./out/zero/src/op-sqlite.d.ts\",\n      \"default\": \"./out/zero/src/op-sqlite.js\"\n    },\n    \"./pg\": {\n      \"types\": \"./out/zero/src/pg.d.ts\",\n      \"default\": \"./out/zero/src/pg.js\"\n    },\n    \"./react\": {\n      \"types\": \"./out/zero/src/react.d.ts\",\n      \"default\": \"./out/zero/src/react.js\"\n    },\n    \"./react-native\": {\n      \"types\": \"./out/zero/src/react-native.d.ts\",\n      \"default\": \"./out/zero/src/react-native.js\"\n    },\n    \"./server\": {\n      \"types\": \"./out/zero/src/server.d.ts\",\n      \"default\": \"./out/zero/src/server.js\"\n    },\n    \"./server/adapters/drizzle\": {\n      \"types\": \"./out/zero/src/adapters/drizzle.d.ts\",\n      \"default\": \"./out/zero/src/adapters/drizzle.js\"\n    },\n    \"./server/adapters/kysely\": {\n      \"types\": \"./out/zero/src/adapters/kysely.d.ts\",\n      \"default\": \"./out/zero/src/adapters/kysely.js\"\n    },\n    \"./server/adapters/prisma\": {\n      \"types\": \"./out/zero/src/adapters/prisma.d.ts\",\n      \"default\": \"./out/zero/src/adapters/prisma.js\"\n    },\n    \"./server/adapters/pg\": {\n      \"types\": \"./out/zero/src/adapters/pg.d.ts\",\n      \"default\": \"./out/zero/src/adapters/pg.js\"\n    },\n    \"./server/adapters/postgresjs\": {\n      \"types\": \"./out/zero/src/adapters/postgresjs.d.ts\",\n      \"default\": \"./out/zero/src/adapters/postgresjs.js\"\n    },\n    \"./solid\": {\n      \"types\": \"./out/zero/src/solid.d.ts\",\n      \"default\": \"./out/zero/src/solid.js\"\n    },\n    \"./sqlite\": {\n      \"types\": \"./out/zero/src/sqlite.d.ts\",\n      \"default\": \"./out/zero/src/sqlite.js\"\n    },\n    \"./zqlite\": {\n      \"types\": \"./out/zero/src/zqlite.d.ts\",\n      \"default\": \"./out/zero/src/zqlite.js\"\n    }\n  },\n  \"scripts\": {\n    \"build\": \"node --experimental-strip-types --no-warnings tool/build.ts\",\n    \"build:watch\": \"node --experimental-strip-types --no-warnings tool/build.ts --watch\",\n    \"check-types\": \"tsc -p tsconfig.client.json && tsc -p tsconfig.server.json\",\n    \"check-types:client:watch\": \"tsc -p tsconfig.client.json --watch\",\n    \"check-types:server:watch\": \"tsc -p tsconfig.server.json --watch\",\n    \"format\": \"oxfmt .\",\n    \"check-format\": \"oxfmt --check .\",\n    \"lint\": \"oxlint --quiet --config ../../oxlint.config.ts src/\",\n    \"docs\": \"node --experimental-strip-types --no-warnings tool/generate-docs.ts\",\n    \"docs:server\": \"node --watch --experimental-strip-types --no-warnings tool/generate-docs.ts --server\",\n    \"fmt\": \"oxfmt .\",\n    \"check-fmt\": \"oxfmt --check .\"\n  },\n  \"dependencies\": {\n    \"@badrap/valita\": \"0.3.11\",\n    \"@databases/escape-identifier\": \"^1.0.3\",\n    \"@databases/sql\": \"^3.3.0\",\n    \"@dotenvx/dotenvx\": \"^1.39.0\",\n    \"@drdgvhbh/postgres-error-codes\": \"^0.0.6\",\n    \"@fastify/cors\": \"^10.0.0\",\n    \"@fastify/websocket\": \"^11.0.0\",\n    \"@google-cloud/precise-date\": \"^4.0.0\",\n    \"@opentelemetry/api\": \"^1.9.0\",\n    \"@opentelemetry/api-logs\": \"^0.218.0\",\n    \"@opentelemetry/auto-instrumentations-node\": \"^0.76.0\",\n    \"@opentelemetry/exporter-metrics-otlp-http\": \"^0.218.0\",\n    \"@opentelemetry/resources\": \"^2.7.1\",\n    \"@opentelemetry/sdk-metrics\": \"^2.7.1\",\n    \"@opentelemetry/sdk-node\": \"^0.218.0\",\n    \"@opentelemetry/sdk-trace-node\": \"^2.7.1\",\n    \"@opentelemetry/semantic-conventions\": \"^1.41.1\",\n    \"@postgresql-typed/oids\": \"^0.2.0\",\n    \"@rocicorp/lock\": \"^1.0.4\",\n    \"@rocicorp/logger\": \"^6.1.0\",\n    \"@rocicorp/resolver\": \"^1.0.2\",\n    \"@rocicorp/zero-sqlite3\": \"^1.1.4\",\n    \"@standard-schema/spec\": \"^1.0.0\",\n    \"@types/basic-auth\": \"^1.1.8\",\n    \"@types/ws\": \"^8.5.12\",\n    \"basic-auth\": \"^2.0.1\",\n    \"chalk-template\": \"^1.1.0\",\n    \"chokidar\": \"^4.0.1\",\n    \"cloudevents\": \"^10.0.0\",\n    \"command-line-args\": \"^6.0.1\",\n    \"command-line-usage\": \"^7.0.3\",\n    \"compare-utf8\": \"^0.2.0\",\n    \"defu\": \"^6.1.4\",\n    \"eventemitter3\": \"^5.0.1\",\n    \"fastify\": \"^5.0.0\",\n    \"is-in-subnet\": \"^4.0.1\",\n    \"jose\": \"^5.9.3\",\n    \"js-xxhash\": \"^4.0.0\",\n    \"json-custom-numbers\": \"^3.1.1\",\n    \"kasi\": \"^1.1.0\",\n    \"nanoid\": \"^5.1.2\",\n    \"oxfmt\": \"^0.45.0\",\n    \"parse-prometheus-text-format\": \"^1.1.1\",\n    \"pg-format\": \"npm:pg-format-fix@^1.0.5\",\n    \"postgres\": \"3.4.7\",\n    \"semver\": \"^7.5.4\",\n    \"url-pattern\": \"^1.0.3\",\n    \"urlpattern-polyfill\": \"^10.1.0\",\n    \"ws\": \"^8.18.1\"\n  },\n  \"devDependencies\": {\n    \"@op-engineering/op-sqlite\": \">=15\",\n    \"@vitest/runner\": \"^4.1.6\",\n    \"analyze-query\": \"workspace:*\",\n    \"ast-to-zql\": \"workspace:*\",\n    \"expo-sqlite\": \">=15\",\n    \"oxc-parser\": \"^0.129.0\",\n    \"replicache\": \"workspace:*\",\n    \"shared\": \"workspace:*\",\n    \"syncpack\": \"^14.3.0\",\n    \"typedoc\": \"^0.28.17\",\n    \"typedoc-plugin-markdown\": \"^4.10.0\",\n    \"typescript\": \"~6.0.2\",\n    \"vite\": \"^8.0.13\",\n    \"vitest\": \"^4.1.6\",\n    \"zero-cache\": \"workspace:*\",\n    \"zero-client\": \"workspace:*\",\n    \"zero-pg\": \"workspace:*\",\n    \"zero-react\": \"workspace:*\",\n    \"zero-server\": \"workspace:*\",\n    \"zero-solid\": \"workspace:*\",\n    \"zqlite\": \"workspace:*\"\n  },\n  \"engines\": {\n    \"node\": \">=22\"\n  },\n  \"packageManager\": \"pnpm@11.5.3\"\n}\n"],"mappings":""}

package/out/zero-cache/src/config/zero-config.d.ts

@@ -428,7 +428,11 @@ export declare const zeroOptions: {
             type: v.Type<number>;
             desc: string[];
         };
-        flowControlConsensusPaddingSeconds: {
+        flowControlConsensusTimeoutProportion: {
+            type: v.Type<number>;
+            desc: string[];
+        };
+        flowControlSlowSubscriberGracePeriodSeconds: {
             type: v.Type<number>;
             desc: string[];
         };

package/out/zero-cache/src/config/zero-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAUnD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAC,SAAS,EAAC,MAAM,kCAAkC,CAAC;AAEhE,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAE3C,eAAO,MAAM,UAAU;;;;;;;;;CA+CtB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;CAwBxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;CAmBnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;CAczB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE5D,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DhB,CAAC;AA0HF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAEpD,+DAA+D;AAC/D,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,UAAU,EACV,KAAK,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,CACrD,CAAC;AAKF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4EtB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAoPhB,kBAAkB;;;;;;QASlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAycpB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgEnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAIpD,wBAAgB,aAAa,CAC3B,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,UAAU,CAaZ;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,oBAAoB,CAItB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,SAAS,GACpD,MAAM,CAER;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EACnD,QAAQ,EAAE,MAAM,GAAG,SAAS,WAwC7B;AAYD,wBAAgB,kBAAkB,SAEjC"}
+{"version":3,"file":"zero-config.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/config/zero-config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,YAAY,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAUnD,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAC,SAAS,EAAC,MAAM,kCAAkC,CAAC;AAEhE,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAE3C,eAAO,MAAM,UAAU;;;;;;;;;CA+CtB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;CAwBxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;CAmBnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;CAczB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE5D,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8DhB,CAAC;AA0HF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAEpD,+DAA+D;AAC/D,MAAM,MAAM,mBAAmB,GAAG,IAAI,CACpC,UAAU,EACV,KAAK,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,CACrD,CAAC;AAKF,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4EtB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAoPhB,kBAAkB;;;;;;QASlB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8epB,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgEnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,WAAW,CAAC,CAAC;AAIpD,wBAAgB,aAAa,CAC3B,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,UAAU,CAaZ;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,GAAE,IAAI,CAAC,YAAY,EAAE,eAAe,CAAM,GAC7C,oBAAoB,CAItB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,GAAG,SAAS,GACpD,MAAM,CAER;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EACnD,QAAQ,EAAE,MAAM,GAAG,SAAS,WAwC7B;AAYD,wBAAgB,kBAAkB,SAEjC"}

package/out/zero-cache/src/config/zero-config.js

@@ -422,12 +422,12 @@ var zeroOptions = {
 			]
 		},
 		statementTimeoutMs: {
-			type: valita_exports.number().default(2e4),
+			type: valita_exports.number().default(3e4),
 			desc: [
-				`Fail change-log transactions if a statement response from postgres is not received within`,
-				`the specified timeout. This differs from a postgres {bold statement_timeout} in that`,
-				`it is implemented to handle a pathological case in which Postgres does not return a`,
-				`response but otherwise believes the transaction to be idle.`
+				`Fail change-log db operations that make no progress within the specified timeout. This`,
+				`differs from a postgres {bold statement_timeout} in that it is implemented to handle a`,
+				`pathological case in which Postgres does not return a response but otherwise believes the`,
+				`connection to be idle (e.g. a half-open connection).`
 			],
 			hidden: true
 		},
@@ -562,22 +562,58 @@ var zeroOptions = {
 				`throughput.`
 			]
 		},
-		flowControlConsensusPaddingSeconds: {
-			type: valita_exports.number().default(1),
+		flowControlConsensusTimeoutProportion: {
+			type: valita_exports.number().default(2),
 			desc: [
-				`During periodic flow control checks (every 64kb), the amount of time to wait after the`,
-				`majority of subscribers have acked, after which replication will continue even if`,
-				`some subscribers have yet to ack. (Note that this is not a timeout for the {italic entire} send,`,
-				`but a timeout that starts {italic after} the majority of receivers have acked.)`,
+				`During periodic flow control checks (every 64kb), the amount of time to wait after the majority`,
+				`of subscribers have acked, proportional to that interval, after which replication will continue`,
+				`even if some subscribers have yet to ack.`,
 				``,
 				`This allows a bounded amount of time for backlogged subscribers to catch up on each flush`,
 				`without forcing all subscribers to wait for the entire backlog to be processed. It is also`,
 				`useful for mitigating the effect of unresponsive subscribers due to severed websocket`,
-				`connections (until liveness checks disconnect them).`,
+				`connections or pathological zombie situations (until liveness checks or laggard detection`,
+				`disconnects them).`,
+				``,
+				`For example, if the majority of subscribers ack a message in 2.5ms, a padding proportion of`,
+				`1.0 instructs replication to continue after an additional 2.5ms; for a proportion of 2.0, an`,
+				`additional 5.0ms, etc. The default value of 2.0 allows for a subscriber to be 3x slower than the`,
+				`majority in the steady state, while similarly bounding the extent to which a temporarily lagging`,
+				`subscriber (e.g. due to catchup) slows down the fleet.`,
+				``,
+				`Note that subscribers that continually exceed the timeout will eventually be disconnected and`,
+				`instructed to shutdown in order to protect the healthy subscribers. It is thus important that`,
+				`the proportion account for expected variance in processing speed across subscribers.`,
 				``,
 				`Set this to a negative number to disable early flow control releases. (Not recommended, but`,
 				`available as an emergency measure.)`
 			]
+		},
+		flowControlSlowSubscriberGracePeriodSeconds: {
+			type: valita_exports.number().default(30),
+			desc: [
+				`The period of time after which a lagging subscriber is disconnected and instructed to`,
+				`restart. A subscriber is considered lagging if it {italic continuously} (1) exceeds the`,
+				`consensus timeout and (2) fails to exceed the change rate of healthy subscribers. These`,
+				`conditions distinguish expected, temporary periods of slowness from pathological`,
+				`scenarios, such as zombie tasks, in which the subscriber is unlikely to recover.`,
+				``,
+				`In particular, the second condition excludes subscribers that are performing initial`,
+				`catchup, as the rate of change for catchup must eventually exceed the rate of upstream`,
+				`changes. Note, however, that catchup rate can be legitimately slow during (rare) expensive`,
+				`operations such as index creation.`,
+				``,
+				`Thus, this grace period caps the amount of time that a lagging subscriber degrades overall`,
+				`throughput, but should be long enough to allow for legitimate intervals of slowness.`,
+				``,
+				`Note that in the pathological case where a catchup operation exceeds this grace period,`,
+				`the system will eventually recover after the next backup/restore cycle, as the expensive`,
+				`operation (e.g. index creation) will have been applied to the restored replica and no longer`,
+				`executed during catchup.`,
+				``,
+				`Set this to 0 or a negative number to disable laggard detection. (Not recommended, but`,
+				`available as an emergency measure.)`
+			]
 		}
 	},
 	taskID: {