@rocicorp/zero 0.25.0-canary.9 → 0.25.1

package/out/zero-cache/src/server/change-streamer.js

@@ -24,13 +24,7 @@ async function runWorker(parent, env, ...args) {
   const config = getNormalizedZeroConfig({ env, argv: args.slice(1) });
   const {
     taskID,
-    changeStreamer: {
-      port,
-      address,
-      protocol,
-      startupDelayMs,
-      startupDelayKeepalives
-    },
+    changeStreamer: { port, address, protocol, startupDelayMs },
     upstream,
     change,
     replica,
@@ -108,7 +102,7 @@ async function runWorker(parent, env, ...args) {
   const changeStreamerWebServer = new ChangeStreamerHttpServer(
     lc,
     config,
-    { port, startupDelayMs, startupDelayKeepalives },
+    { port, startupDelayMs },
     parent,
     changeStreamer,
     monitor instanceof BackupMonitor ? monitor : null

package/out/zero-cache/src/server/change-streamer.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-streamer.js","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {DatabaseInitError} from '../../../zqlite/src/db.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {warmupConnections} from '../db/warmup.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {initializeCustomChangeSource} from '../services/change-source/custom/change-source.ts';\nimport {initializePostgresChangeSource} from '../services/change-source/pg/change-source.ts';\nimport {BackupMonitor} from '../services/change-streamer/backup-monitor.ts';\nimport {ChangeStreamerHttpServer} from '../services/change-streamer/change-streamer-http.ts';\nimport {initializeStreamer} from '../services/change-streamer/change-streamer-service.ts';\nimport type {ChangeStreamerService} from '../services/change-streamer/change-streamer.ts';\nimport {ReplicaMonitor} from '../services/change-streamer/replica-monitor.ts';\nimport {AutoResetSignal} from '../services/change-streamer/schema/tables.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardConfig} from '../types/shards.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...args: string[]\n): Promise<void> {\n  assert(args.length > 0, `parent startMs not specified`);\n  const parentStartMs = parseInt(args[0]);\n\n  const config = getNormalizedZeroConfig({env, argv: args.slice(1)});\n  const {\n    taskID,\n    changeStreamer: {\n      port,\n      address,\n      protocol,\n      startupDelayMs,\n      startupDelayKeepalives,\n    },\n    upstream,\n    change,\n    replica,\n    initialSync,\n    litestream,\n  } = config;\n\n  startOtelAuto(createLogContext(config, {worker: 'change-streamer'}, false));\n  const lc = createLogContext(config, {worker: 'change-streamer'}, true);\n  initEventSink(lc, config);\n\n  // Kick off DB connection warmup in the background.\n  const changeDB = pgClient(lc, change.db, {\n    max: change.maxConns,\n    connection: {['application_name']: 'zero-change-streamer'},\n  });\n  void warmupConnections(lc, changeDB, 'change');\n\n  const {autoReset} = config;\n  const shard = getShardConfig(config);\n\n  let changeStreamer: ChangeStreamerService | undefined;\n\n  for (const first of [true, false]) {\n    try {\n      // Note: This performs initial sync of the replica if necessary.\n      const {changeSource, subscriptionState} =\n        upstream.type === 'pg'\n          ? await initializePostgresChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n              initialSync,\n            )\n          : await initializeCustomChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n            );\n\n      changeStreamer = await initializeStreamer(\n        lc,\n        shard,\n        taskID,\n        address,\n        protocol,\n        changeDB,\n        changeSource,\n        subscriptionState,\n        autoReset ?? false,\n      );\n      break;\n    } catch (e) {\n      if (first && e instanceof AutoResetSignal) {\n        lc.warn?.(`resetting replica ${replica.file}`, e);\n        // TODO: Make deleteLiteDB work with litestream. It will probably have to be\n        //       a semantic wipe instead of a file delete.\n        deleteLiteDB(replica.file);\n        continue; // execute again with a fresh initial-sync\n      }\n      if (e instanceof DatabaseInitError) {\n        throw new Error(\n          `Cannot open ZERO_REPLICA_FILE at \"${replica.file}\". Please check that the path is valid.`,\n          {cause: e},\n        );\n      }\n      throw e;\n    }\n  }\n  // impossible: upstream must have advanced in order for replication to be stuck.\n  assert(changeStreamer, `resetting replica did not advance replicaVersion`);\n\n  const {backupURL, port: metricsPort} = litestream;\n  const monitor = backupURL\n    ? new BackupMonitor(\n        lc,\n        backupURL,\n        `http://localhost:${metricsPort}/metrics`,\n        changeStreamer,\n        // The time between when the zero-cache was started to when the\n        // change-streamer is ready to start serves as the initial delay for\n        // watermark cleanup (as it either includes a similar replica\n        // restoration/preparation step, or an initial-sync, which\n        // generally takes longer).\n        //\n        // Consider: Also account for permanent volumes?\n        Date.now() - parentStartMs,\n      )\n    : new ReplicaMonitor(lc, replica.file, changeStreamer);\n\n  const changeStreamerWebServer = new ChangeStreamerHttpServer(\n    lc,\n    config,\n    {port, startupDelayMs, startupDelayKeepalives},\n    parent,\n    changeStreamer,\n    monitor instanceof BackupMonitor ? monitor : null,\n  );\n\n  parent.send(['ready', {ready: true}]);\n\n  // Note: The changeStreamer itself is not started here; it is started by the\n  //       changeStreamerWebServer.\n  return runUntilKilled(lc, parent, changeStreamerWebServer, monitor);\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AA0BA,eAA8B,UAC5B,QACA,QACG,MACY;AACf,SAAO,KAAK,SAAS,GAAG,8BAA8B;AACtD,QAAM,gBAAgB,SAAS,KAAK,CAAC,CAAC;AAEtC,QAAM,SAAS,wBAAwB,EAAC,KAAK,MAAM,KAAK,MAAM,CAAC,GAAE;AACjE,QAAM;AAAA,IACJ;AAAA,IACA,gBAAgB;AAAA,MACd;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,IAEF;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA,IACE;AAEJ,gBAAc,iBAAiB,QAAQ,EAAC,QAAQ,kBAAA,GAAoB,KAAK,CAAC;AAC1E,QAAM,KAAK,iBAAiB,QAAQ,EAAC,QAAQ,kBAAA,GAAoB,IAAI;AACrE,gBAAc,IAAI,MAAM;AAGxB,QAAM,WAAW,SAAS,IAAI,OAAO,IAAI;AAAA,IACvC,KAAK,OAAO;AAAA,IACZ,YAAY,EAAC,CAAC,kBAAkB,GAAG,uBAAA;AAAA,EAAsB,CAC1D;AACD,OAAK,kBAAkB,IAAI,UAAU,QAAQ;AAE7C,QAAM,EAAC,cAAa;AACpB,QAAM,QAAQ,eAAe,MAAM;AAEnC,MAAI;AAEJ,aAAW,SAAS,CAAC,MAAM,KAAK,GAAG;AACjC,QAAI;AAEF,YAAM,EAAC,cAAc,kBAAA,IACnB,SAAS,SAAS,OACd,MAAM;AAAA,QACJ;AAAA,QACA,SAAS;AAAA,QACT;AAAA,QACA,QAAQ;AAAA,QACR;AAAA,MAAA,IAEF,MAAM;AAAA,QACJ;AAAA,QACA,SAAS;AAAA,QACT;AAAA,QACA,QAAQ;AAAA,MAAA;AAGhB,uBAAiB,MAAM;AAAA,QACrB;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,aAAa;AAAA,MAAA;AAEf;AAAA,IACF,SAAS,GAAG;AACV,UAAI,SAAS,aAAa,iBAAiB;AACzC,WAAG,OAAO,qBAAqB,QAAQ,IAAI,IAAI,CAAC;AAGhD,qBAAa,QAAQ,IAAI;AACzB;AAAA,MACF;AACA,UAAI,aAAa,mBAAmB;AAClC,cAAM,IAAI;AAAA,UACR,qCAAqC,QAAQ,IAAI;AAAA,UACjD,EAAC,OAAO,EAAA;AAAA,QAAC;AAAA,MAEb;AACA,YAAM;AAAA,IACR;AAAA,EACF;AAEA,SAAO,gBAAgB,kDAAkD;AAEzE,QAAM,EAAC,WAAW,MAAM,YAAA,IAAe;AACvC,QAAM,UAAU,YACZ,IAAI;AAAA,IACF;AAAA,IACA;AAAA,IACA,oBAAoB,WAAW;AAAA,IAC/B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAQA,KAAK,QAAQ;AAAA,EAAA,IAEf,IAAI,eAAe,IAAI,QAAQ,MAAM,cAAc;AAEvD,QAAM,0BAA0B,IAAI;AAAA,IAClC;AAAA,IACA;AAAA,IACA,EAAC,MAAM,gBAAgB,uBAAA;AAAA,IACvB;AAAA,IACA;AAAA,IACA,mBAAmB,gBAAgB,UAAU;AAAA,EAAA;AAG/C,SAAO,KAAK,CAAC,SAAS,EAAC,OAAO,KAAA,CAAK,CAAC;AAIpC,SAAO,eAAe,IAAI,QAAQ,yBAAyB,OAAO;AACpE;AAGA,IAAI,CAAC,qBAAqB;AACxB,OAAK;AAAA,IAAU,MACb,UAAU,KAAK,YAAY,GAAG,QAAQ,KAAK,GAAG,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,EAAA;AAEvE;"}
+{"version":3,"file":"change-streamer.js","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {DatabaseInitError} from '../../../zqlite/src/db.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {warmupConnections} from '../db/warmup.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {initializeCustomChangeSource} from '../services/change-source/custom/change-source.ts';\nimport {initializePostgresChangeSource} from '../services/change-source/pg/change-source.ts';\nimport {BackupMonitor} from '../services/change-streamer/backup-monitor.ts';\nimport {ChangeStreamerHttpServer} from '../services/change-streamer/change-streamer-http.ts';\nimport {initializeStreamer} from '../services/change-streamer/change-streamer-service.ts';\nimport type {ChangeStreamerService} from '../services/change-streamer/change-streamer.ts';\nimport {ReplicaMonitor} from '../services/change-streamer/replica-monitor.ts';\nimport {AutoResetSignal} from '../services/change-streamer/schema/tables.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardConfig} from '../types/shards.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...args: string[]\n): Promise<void> {\n  assert(args.length > 0, `parent startMs not specified`);\n  const parentStartMs = parseInt(args[0]);\n\n  const config = getNormalizedZeroConfig({env, argv: args.slice(1)});\n  const {\n    taskID,\n    changeStreamer: {port, address, protocol, startupDelayMs},\n    upstream,\n    change,\n    replica,\n    initialSync,\n    litestream,\n  } = config;\n\n  startOtelAuto(createLogContext(config, {worker: 'change-streamer'}, false));\n  const lc = createLogContext(config, {worker: 'change-streamer'}, true);\n  initEventSink(lc, config);\n\n  // Kick off DB connection warmup in the background.\n  const changeDB = pgClient(lc, change.db, {\n    max: change.maxConns,\n    connection: {['application_name']: 'zero-change-streamer'},\n  });\n  void warmupConnections(lc, changeDB, 'change');\n\n  const {autoReset} = config;\n  const shard = getShardConfig(config);\n\n  let changeStreamer: ChangeStreamerService | undefined;\n\n  for (const first of [true, false]) {\n    try {\n      // Note: This performs initial sync of the replica if necessary.\n      const {changeSource, subscriptionState} =\n        upstream.type === 'pg'\n          ? await initializePostgresChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n              initialSync,\n            )\n          : await initializeCustomChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n            );\n\n      changeStreamer = await initializeStreamer(\n        lc,\n        shard,\n        taskID,\n        address,\n        protocol,\n        changeDB,\n        changeSource,\n        subscriptionState,\n        autoReset ?? false,\n      );\n      break;\n    } catch (e) {\n      if (first && e instanceof AutoResetSignal) {\n        lc.warn?.(`resetting replica ${replica.file}`, e);\n        // TODO: Make deleteLiteDB work with litestream. It will probably have to be\n        //       a semantic wipe instead of a file delete.\n        deleteLiteDB(replica.file);\n        continue; // execute again with a fresh initial-sync\n      }\n      if (e instanceof DatabaseInitError) {\n        throw new Error(\n          `Cannot open ZERO_REPLICA_FILE at \"${replica.file}\". Please check that the path is valid.`,\n          {cause: e},\n        );\n      }\n      throw e;\n    }\n  }\n  // impossible: upstream must have advanced in order for replication to be stuck.\n  assert(changeStreamer, `resetting replica did not advance replicaVersion`);\n\n  const {backupURL, port: metricsPort} = litestream;\n  const monitor = backupURL\n    ? new BackupMonitor(\n        lc,\n        backupURL,\n        `http://localhost:${metricsPort}/metrics`,\n        changeStreamer,\n        // The time between when the zero-cache was started to when the\n        // change-streamer is ready to start serves as the initial delay for\n        // watermark cleanup (as it either includes a similar replica\n        // restoration/preparation step, or an initial-sync, which\n        // generally takes longer).\n        //\n        // Consider: Also account for permanent volumes?\n        Date.now() - parentStartMs,\n      )\n    : new ReplicaMonitor(lc, replica.file, changeStreamer);\n\n  const changeStreamerWebServer = new ChangeStreamerHttpServer(\n    lc,\n    config,\n    {port, startupDelayMs},\n    parent,\n    changeStreamer,\n    monitor instanceof BackupMonitor ? monitor : null,\n  );\n\n  parent.send(['ready', {ready: true}]);\n\n  // Note: The changeStreamer itself is not started here; it is started by the\n  //       changeStreamerWebServer.\n  return runUntilKilled(lc, parent, changeStreamerWebServer, monitor);\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AA0BA,eAA8B,UAC5B,QACA,QACG,MACY;AACf,SAAO,KAAK,SAAS,GAAG,8BAA8B;AACtD,QAAM,gBAAgB,SAAS,KAAK,CAAC,CAAC;AAEtC,QAAM,SAAS,wBAAwB,EAAC,KAAK,MAAM,KAAK,MAAM,CAAC,GAAE;AACjE,QAAM;AAAA,IACJ;AAAA,IACA,gBAAgB,EAAC,MAAM,SAAS,UAAU,eAAA;AAAA,IAC1C;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA,IACE;AAEJ,gBAAc,iBAAiB,QAAQ,EAAC,QAAQ,kBAAA,GAAoB,KAAK,CAAC;AAC1E,QAAM,KAAK,iBAAiB,QAAQ,EAAC,QAAQ,kBAAA,GAAoB,IAAI;AACrE,gBAAc,IAAI,MAAM;AAGxB,QAAM,WAAW,SAAS,IAAI,OAAO,IAAI;AAAA,IACvC,KAAK,OAAO;AAAA,IACZ,YAAY,EAAC,CAAC,kBAAkB,GAAG,uBAAA;AAAA,EAAsB,CAC1D;AACD,OAAK,kBAAkB,IAAI,UAAU,QAAQ;AAE7C,QAAM,EAAC,cAAa;AACpB,QAAM,QAAQ,eAAe,MAAM;AAEnC,MAAI;AAEJ,aAAW,SAAS,CAAC,MAAM,KAAK,GAAG;AACjC,QAAI;AAEF,YAAM,EAAC,cAAc,kBAAA,IACnB,SAAS,SAAS,OACd,MAAM;AAAA,QACJ;AAAA,QACA,SAAS;AAAA,QACT;AAAA,QACA,QAAQ;AAAA,QACR;AAAA,MAAA,IAEF,MAAM;AAAA,QACJ;AAAA,QACA,SAAS;AAAA,QACT;AAAA,QACA,QAAQ;AAAA,MAAA;AAGhB,uBAAiB,MAAM;AAAA,QACrB;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,aAAa;AAAA,MAAA;AAEf;AAAA,IACF,SAAS,GAAG;AACV,UAAI,SAAS,aAAa,iBAAiB;AACzC,WAAG,OAAO,qBAAqB,QAAQ,IAAI,IAAI,CAAC;AAGhD,qBAAa,QAAQ,IAAI;AACzB;AAAA,MACF;AACA,UAAI,aAAa,mBAAmB;AAClC,cAAM,IAAI;AAAA,UACR,qCAAqC,QAAQ,IAAI;AAAA,UACjD,EAAC,OAAO,EAAA;AAAA,QAAC;AAAA,MAEb;AACA,YAAM;AAAA,IACR;AAAA,EACF;AAEA,SAAO,gBAAgB,kDAAkD;AAEzE,QAAM,EAAC,WAAW,MAAM,YAAA,IAAe;AACvC,QAAM,UAAU,YACZ,IAAI;AAAA,IACF;AAAA,IACA;AAAA,IACA,oBAAoB,WAAW;AAAA,IAC/B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAQA,KAAK,QAAQ;AAAA,EAAA,IAEf,IAAI,eAAe,IAAI,QAAQ,MAAM,cAAc;AAEvD,QAAM,0BAA0B,IAAI;AAAA,IAClC;AAAA,IACA;AAAA,IACA,EAAC,MAAM,eAAA;AAAA,IACP;AAAA,IACA;AAAA,IACA,mBAAmB,gBAAgB,UAAU;AAAA,EAAA;AAG/C,SAAO,KAAK,CAAC,SAAS,EAAC,OAAO,KAAA,CAAK,CAAC;AAIpC,SAAO,eAAe,IAAI,QAAQ,yBAAyB,OAAO;AACpE;AAGA,IAAI,CAAC,qBAAqB;AACxB,OAAK;AAAA,IAAU,MACb,UAAU,KAAK,YAAY,GAAG,QAAQ,KAAK,GAAG,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,EAAA;AAEvE;"}

package/out/zero-cache/src/server/otel-diag-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel-diag-logger.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-diag-logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AA6BjD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,EAAE,CAAC,EAAE,UAAU,EACf,KAAK,UAAQ,GACZ,OAAO,CAiCT;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}
+{"version":3,"file":"otel-diag-logger.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-diag-logger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AA6BjD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,EAAE,CAAC,EAAE,UAAU,EACf,KAAK,UAAQ,GACZ,OAAO,CA8BT;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}

package/out/zero-cache/src/server/otel-diag-logger.js

@@ -37,13 +37,7 @@ function setupOtelDiagnosticLogger(lc, force = false) {
       debug: (msg, ...args) => log.debug?.(msg, ...args),
       info: (msg, ...args) => log.info?.(msg, ...args),
       warn: (msg, ...args) => log.warn?.(msg, ...args),
-      error: (msg, ...args) => {
-        if (shouldWarnForOtelError(msg)) {
-          log.warn?.(msg, ...args);
-        } else {
-          log.error?.(msg, ...args);
-        }
-      }
+      error: (msg, ...args) => log.warn?.(msg, ...args)
     },
     {
       logLevel: getOtelLogLevel(process.env.OTEL_LOG_LEVEL) ?? DiagLogLevel.ERROR,
@@ -53,20 +47,6 @@ function setupOtelDiagnosticLogger(lc, force = false) {
   diagLoggerConfigured = true;
   return true;
 }
-const NON_CRITICAL_OTEL_ERRORS = [
-  "request timeout",
-  "unexpected server response: 502",
-  "export failed with retryable status",
-  "metrics export failed",
-  "method not allowed",
-  "socket hang up"
-];
-function shouldWarnForOtelError(msg) {
-  const errorMessage = String(msg ?? "").toLowerCase();
-  return NON_CRITICAL_OTEL_ERRORS.some(
-    (pattern) => errorMessage.includes(pattern)
-  );
-}
 export {
   setupOtelDiagnosticLogger
 };

package/out/zero-cache/src/server/otel-diag-logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel-diag-logger.js","sources":["../../../../../zero-cache/src/server/otel-diag-logger.ts"],"sourcesContent":["import {diag, DiagLogLevel} from '@opentelemetry/api';\nimport type {LogContext} from '@rocicorp/logger';\n\nfunction getOtelLogLevel(level: string | undefined): DiagLogLevel | undefined {\n  if (!level) return undefined;\n\n  const normalizedLevel = level.toLowerCase();\n  switch (normalizedLevel) {\n    case 'none':\n      return DiagLogLevel.NONE;\n    case 'error':\n      return DiagLogLevel.ERROR;\n    case 'warn':\n    case 'warning':\n      return DiagLogLevel.WARN;\n    case 'info':\n      return DiagLogLevel.INFO;\n    case 'debug':\n      return DiagLogLevel.DEBUG;\n    case 'verbose':\n      return DiagLogLevel.VERBOSE;\n    case 'all':\n      return DiagLogLevel.ALL;\n    default:\n      return undefined;\n  }\n}\n\nlet diagLoggerConfigured = false;\n\n/**\n * Sets up the OpenTelemetry diagnostic logger with custom error handling and suppression.\n * This function can be called multiple times safely - it will only configure the logger once per LogContext.\n *\n * @param lc LogContext for routing OTEL diagnostic messages to the application logger\n * @param force If true, will reconfigure even if already configured (useful after NodeSDK setup)\n * @returns true if the logger was configured, false if it was already configured and not forced\n */\nexport function setupOtelDiagnosticLogger(\n  lc?: LogContext,\n  force = false,\n): boolean {\n  if (!lc) {\n    return false;\n  }\n\n  if (!force && diagLoggerConfigured) {\n    return false;\n  }\n\n  const log = lc.withContext('component', 'otel');\n  diag.setLogger(\n    {\n      verbose: (msg: string, ...args: unknown[]) => log.debug?.(msg, ...args),\n      debug: (msg: string, ...args: unknown[]) => log.debug?.(msg, ...args),\n      info: (msg: string, ...args: unknown[]) => log.info?.(msg, ...args),\n      warn: (msg: string, ...args: unknown[]) => log.warn?.(msg, ...args),\n      error: (msg: string, ...args: unknown[]) => {\n        if (shouldWarnForOtelError(msg)) {\n          log.warn?.(msg, ...args);\n        } else {\n          log.error?.(msg, ...args);\n        }\n      },\n    },\n    {\n      logLevel:\n        getOtelLogLevel(process.env.OTEL_LOG_LEVEL) ?? DiagLogLevel.ERROR,\n      suppressOverrideMessage: true,\n    },\n  );\n\n  diagLoggerConfigured = true;\n  return true;\n}\n\n/**\n * Reset the diagnostic logger configuration state.\n * This is primarily useful for testing scenarios.\n */\nexport function resetOtelDiagnosticLogger(): void {\n  diagLoggerConfigured = false;\n}\n\nconst NON_CRITICAL_OTEL_ERRORS = [\n  'request timeout',\n  'unexpected server response: 502',\n  'export failed with retryable status',\n  'metrics export failed',\n  'method not allowed',\n  'socket hang up',\n];\n\nfunction shouldWarnForOtelError(msg: string): boolean {\n  const errorMessage = String(msg ?? '').toLowerCase();\n  return NON_CRITICAL_OTEL_ERRORS.some(pattern =>\n    errorMessage.includes(pattern),\n  );\n}\n"],"names":[],"mappings":";AAGA,SAAS,gBAAgB,OAAqD;AAC5E,MAAI,CAAC,MAAO,QAAO;AAEnB,QAAM,kBAAkB,MAAM,YAAA;AAC9B,UAAQ,iBAAA;AAAA,IACN,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AAAA,IACL,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB;AACE,aAAO;AAAA,EAAA;AAEb;AAEA,IAAI,uBAAuB;AAUpB,SAAS,0BACd,IACA,QAAQ,OACC;AACT,MAAI,CAAC,IAAI;AACP,WAAO;AAAA,EACT;AAEA,MAAI,CAAC,SAAS,sBAAsB;AAClC,WAAO;AAAA,EACT;AAEA,QAAM,MAAM,GAAG,YAAY,aAAa,MAAM;AAC9C,OAAK;AAAA,IACH;AAAA,MACE,SAAS,CAAC,QAAgB,SAAoB,IAAI,QAAQ,KAAK,GAAG,IAAI;AAAA,MACtE,OAAO,CAAC,QAAgB,SAAoB,IAAI,QAAQ,KAAK,GAAG,IAAI;AAAA,MACpE,MAAM,CAAC,QAAgB,SAAoB,IAAI,OAAO,KAAK,GAAG,IAAI;AAAA,MAClE,MAAM,CAAC,QAAgB,SAAoB,IAAI,OAAO,KAAK,GAAG,IAAI;AAAA,MAClE,OAAO,CAAC,QAAgB,SAAoB;AAC1C,YAAI,uBAAuB,GAAG,GAAG;AAC/B,cAAI,OAAO,KAAK,GAAG,IAAI;AAAA,QACzB,OAAO;AACL,cAAI,QAAQ,KAAK,GAAG,IAAI;AAAA,QAC1B;AAAA,MACF;AAAA,IAAA;AAAA,IAEF;AAAA,MACE,UACE,gBAAgB,QAAQ,IAAI,cAAc,KAAK,aAAa;AAAA,MAC9D,yBAAyB;AAAA,IAAA;AAAA,EAC3B;AAGF,yBAAuB;AACvB,SAAO;AACT;AAUA,MAAM,2BAA2B;AAAA,EAC/B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEA,SAAS,uBAAuB,KAAsB;AACpD,QAAM,eAAe,OAAO,OAAO,EAAE,EAAE,YAAA;AACvC,SAAO,yBAAyB;AAAA,IAAK,CAAA,YACnC,aAAa,SAAS,OAAO;AAAA,EAAA;AAEjC;"}
+{"version":3,"file":"otel-diag-logger.js","sources":["../../../../../zero-cache/src/server/otel-diag-logger.ts"],"sourcesContent":["import {diag, DiagLogLevel} from '@opentelemetry/api';\nimport type {LogContext} from '@rocicorp/logger';\n\nfunction getOtelLogLevel(level: string | undefined): DiagLogLevel | undefined {\n  if (!level) return undefined;\n\n  const normalizedLevel = level.toLowerCase();\n  switch (normalizedLevel) {\n    case 'none':\n      return DiagLogLevel.NONE;\n    case 'error':\n      return DiagLogLevel.ERROR;\n    case 'warn':\n    case 'warning':\n      return DiagLogLevel.WARN;\n    case 'info':\n      return DiagLogLevel.INFO;\n    case 'debug':\n      return DiagLogLevel.DEBUG;\n    case 'verbose':\n      return DiagLogLevel.VERBOSE;\n    case 'all':\n      return DiagLogLevel.ALL;\n    default:\n      return undefined;\n  }\n}\n\nlet diagLoggerConfigured = false;\n\n/**\n * Sets up the OpenTelemetry diagnostic logger with custom error handling and suppression.\n * This function can be called multiple times safely - it will only configure the logger once per LogContext.\n *\n * @param lc LogContext for routing OTEL diagnostic messages to the application logger\n * @param force If true, will reconfigure even if already configured (useful after NodeSDK setup)\n * @returns true if the logger was configured, false if it was already configured and not forced\n */\nexport function setupOtelDiagnosticLogger(\n  lc?: LogContext,\n  force = false,\n): boolean {\n  if (!lc) {\n    return false;\n  }\n\n  if (!force && diagLoggerConfigured) {\n    return false;\n  }\n\n  const log = lc.withContext('component', 'otel');\n\n  // Log level ERROR is reserved for unforced application errors. Since otel\n  // errors do not affect application functionality, they are limited to WARN.\n  diag.setLogger(\n    {\n      verbose: (msg: string, ...args: unknown[]) => log.debug?.(msg, ...args),\n      debug: (msg: string, ...args: unknown[]) => log.debug?.(msg, ...args),\n      info: (msg: string, ...args: unknown[]) => log.info?.(msg, ...args),\n      warn: (msg: string, ...args: unknown[]) => log.warn?.(msg, ...args),\n      error: (msg: string, ...args: unknown[]) => log.warn?.(msg, ...args),\n    },\n    {\n      logLevel:\n        getOtelLogLevel(process.env.OTEL_LOG_LEVEL) ?? DiagLogLevel.ERROR,\n      suppressOverrideMessage: true,\n    },\n  );\n\n  diagLoggerConfigured = true;\n  return true;\n}\n\n/**\n * Reset the diagnostic logger configuration state.\n * This is primarily useful for testing scenarios.\n */\nexport function resetOtelDiagnosticLogger(): void {\n  diagLoggerConfigured = false;\n}\n"],"names":[],"mappings":";AAGA,SAAS,gBAAgB,OAAqD;AAC5E,MAAI,CAAC,MAAO,QAAO;AAEnB,QAAM,kBAAkB,MAAM,YAAA;AAC9B,UAAQ,iBAAA;AAAA,IACN,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AAAA,IACL,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB,KAAK;AACH,aAAO,aAAa;AAAA,IACtB;AACE,aAAO;AAAA,EAAA;AAEb;AAEA,IAAI,uBAAuB;AAUpB,SAAS,0BACd,IACA,QAAQ,OACC;AACT,MAAI,CAAC,IAAI;AACP,WAAO;AAAA,EACT;AAEA,MAAI,CAAC,SAAS,sBAAsB;AAClC,WAAO;AAAA,EACT;AAEA,QAAM,MAAM,GAAG,YAAY,aAAa,MAAM;AAI9C,OAAK;AAAA,IACH;AAAA,MACE,SAAS,CAAC,QAAgB,SAAoB,IAAI,QAAQ,KAAK,GAAG,IAAI;AAAA,MACtE,OAAO,CAAC,QAAgB,SAAoB,IAAI,QAAQ,KAAK,GAAG,IAAI;AAAA,MACpE,MAAM,CAAC,QAAgB,SAAoB,IAAI,OAAO,KAAK,GAAG,IAAI;AAAA,MAClE,MAAM,CAAC,QAAgB,SAAoB,IAAI,OAAO,KAAK,GAAG,IAAI;AAAA,MAClE,OAAO,CAAC,QAAgB,SAAoB,IAAI,OAAO,KAAK,GAAG,IAAI;AAAA,IAAA;AAAA,IAErE;AAAA,MACE,UACE,gBAAgB,QAAQ,IAAI,cAAc,KAAK,aAAa;AAAA,MAC9D,yBAAyB;AAAA,IAAA;AAAA,EAC3B;AAGF,yBAAuB;AACvB,SAAO;AACT;"}

package/out/zero-cache/src/server/otel-start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel-start.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAiFjD,eAAO,MAAM,aAAa,GAAI,KAAK,UAAU,SACA,CAAC"}
+{"version":3,"file":"otel-start.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AA6EjD,eAAO,MAAM,aAAa,GAAI,KAAK,UAAU,SACA,CAAC"}

package/out/zero-cache/src/server/otel-start.js

@@ -8,7 +8,6 @@ import { setupOtelDiagnosticLogger } from "./otel-diag-logger.js";
 class OtelManager {
   static #instance;
   #started = false;
-  #autoInstrumentations = null;
   constructor() {
   }
   static getInstance() {
@@ -28,9 +27,6 @@ class OtelManager {
     const resource = resourceFromAttributes({
       [ATTR_SERVICE_VERSION]: process.env.ZERO_SERVER_VERSION ?? "unknown"
     });
-    if (!this.#autoInstrumentations) {
-      this.#autoInstrumentations = getNodeAutoInstrumentations();
-    }
     process.env.OTEL_EXPORTER_OTLP_PROTOCOL ??= "http/json";
     process.env.OTEL_METRICS_EXPORTER ??= otelMetricsEnabled() ? "otlp" : "none";
     process.env.OTEL_TRACES_EXPORTER ??= otelTracesEnabled() ? "otlp" : "none";
@@ -38,7 +34,7 @@ class OtelManager {
     const sdk = new NodeSDK({
       resource,
       autoDetectResources: true,
-      instrumentations: this.#autoInstrumentations ? [this.#autoInstrumentations] : []
+      instrumentations: process.env.OTEL_NODE_ENABLED_INSTRUMENTATIONS || process.env.OTEL_NODE_DISABLED_INSTRUMENTATIONS ? [getNodeAutoInstrumentations()] : []
     });
     try {
       sdk.start();

package/out/zero-cache/src/server/otel-start.js.map

@@ -1 +1 @@
-{"version":3,"file":"otel-start.js","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"sourcesContent":["import {logs} from '@opentelemetry/api-logs';\nimport {getNodeAutoInstrumentations} from '@opentelemetry/auto-instrumentations-node';\nimport type {Instrumentation} from '@opentelemetry/instrumentation';\nimport {resourceFromAttributes} from '@opentelemetry/resources';\nimport {NodeSDK} from '@opentelemetry/sdk-node';\nimport {ATTR_SERVICE_VERSION} from '@opentelemetry/semantic-conventions';\nimport type {LogContext} from '@rocicorp/logger';\nimport {\n  otelEnabled,\n  otelLogsEnabled,\n  otelMetricsEnabled,\n  otelTracesEnabled,\n} from '../../../otel/src/enabled.ts';\nimport {setupOtelDiagnosticLogger} from './otel-diag-logger.js';\n\nclass OtelManager {\n  static #instance: OtelManager;\n  #started = false;\n  #autoInstrumentations: Instrumentation[] | null = null;\n\n  private constructor() {}\n\n  static getInstance(): OtelManager {\n    if (!OtelManager.#instance) {\n      OtelManager.#instance = new OtelManager();\n    }\n    return OtelManager.#instance;\n  }\n\n  startOtelAuto(lc?: LogContext) {\n    if (this.#started || !otelEnabled()) {\n      return;\n    }\n    this.#started = true;\n\n    // Store and temporarily remove OTEL_LOG_LEVEL to prevent NodeSDK from setting its own logger\n    const otelLogLevel = process.env.OTEL_LOG_LEVEL;\n    delete process.env.OTEL_LOG_LEVEL;\n\n    // Use exponential histograms by default to reduce cardinality from auto-instrumentation\n    // This affects HTTP server/client and other auto-instrumented histogram metrics\n    // Exponential histograms automatically adjust bucket boundaries and use fewer buckets\n    process.env.OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION ??=\n      'base2_exponential_bucket_histogram';\n\n    const resource = resourceFromAttributes({\n      [ATTR_SERVICE_VERSION]: process.env.ZERO_SERVER_VERSION ?? 'unknown',\n    });\n\n    // Lazy load the auto-instrumentations module\n    // avoid MODULE_NOT_FOUND errors in environments where it's not being used\n    if (!this.#autoInstrumentations) {\n      this.#autoInstrumentations = getNodeAutoInstrumentations();\n    }\n    // Set defaults to be backwards compatible with the previously\n    // hard-coded exporters\n    process.env.OTEL_EXPORTER_OTLP_PROTOCOL ??= 'http/json';\n    process.env.OTEL_METRICS_EXPORTER ??= otelMetricsEnabled()\n      ? 'otlp'\n      : 'none';\n    process.env.OTEL_TRACES_EXPORTER ??= otelTracesEnabled() ? 'otlp' : 'none';\n    process.env.OTEL_LOGS_EXPORTER ??= otelLogsEnabled() ? 'otlp' : 'none';\n\n    const sdk = new NodeSDK({\n      resource,\n      autoDetectResources: true,\n      instrumentations: this.#autoInstrumentations\n        ? [this.#autoInstrumentations]\n        : [],\n    });\n\n    try {\n      sdk.start();\n    } finally {\n      if (otelLogLevel) {\n        process.env.OTEL_LOG_LEVEL = otelLogLevel;\n      }\n    }\n    setupOtelDiagnosticLogger(lc, true);\n\n    logs.getLogger('zero-cache').emit({\n      severityText: 'INFO',\n      body: 'OpenTelemetry SDK started successfully',\n    });\n  }\n}\n\nexport const startOtelAuto = (lc?: LogContext) =>\n  OtelManager.getInstance().startOtelAuto(lc);\n"],"names":[],"mappings":";;;;;;;AAeA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,EACP,WAAW;AAAA,EACX,wBAAkD;AAAA,EAE1C,cAAc;AAAA,EAAC;AAAA,EAEvB,OAAO,cAA2B;AAChC,QAAI,CAAC,YAAY,WAAW;AAC1B,kBAAY,YAAY,IAAI,YAAA;AAAA,IAC9B;AACA,WAAO,YAAY;AAAA,EACrB;AAAA,EAEA,cAAc,IAAiB;AAC7B,QAAI,KAAK,YAAY,CAAC,eAAe;AACnC;AAAA,IACF;AACA,SAAK,WAAW;AAGhB,UAAM,eAAe,QAAQ,IAAI;AACjC,WAAO,QAAQ,IAAI;AAKnB,YAAQ,IAAI,6DACV;AAEF,UAAM,WAAW,uBAAuB;AAAA,MACtC,CAAC,oBAAoB,GAAG,QAAQ,IAAI,uBAAuB;AAAA,IAAA,CAC5D;AAID,QAAI,CAAC,KAAK,uBAAuB;AAC/B,WAAK,wBAAwB,4BAAA;AAAA,IAC/B;AAGA,YAAQ,IAAI,gCAAgC;AAC5C,YAAQ,IAAI,0BAA0B,mBAAA,IAClC,SACA;AACJ,YAAQ,IAAI,yBAAyB,kBAAA,IAAsB,SAAS;AACpE,YAAQ,IAAI,uBAAuB,gBAAA,IAAoB,SAAS;AAEhE,UAAM,MAAM,IAAI,QAAQ;AAAA,MACtB;AAAA,MACA,qBAAqB;AAAA,MACrB,kBAAkB,KAAK,wBACnB,CAAC,KAAK,qBAAqB,IAC3B,CAAA;AAAA,IAAC,CACN;AAED,QAAI;AACF,UAAI,MAAA;AAAA,IACN,UAAA;AACE,UAAI,cAAc;AAChB,gBAAQ,IAAI,iBAAiB;AAAA,MAC/B;AAAA,IACF;AACA,8BAA0B,IAAI,IAAI;AAElC,SAAK,UAAU,YAAY,EAAE,KAAK;AAAA,MAChC,cAAc;AAAA,MACd,MAAM;AAAA,IAAA,CACP;AAAA,EACH;AACF;AAEO,MAAM,gBAAgB,CAAC,OAC5B,YAAY,YAAA,EAAc,cAAc,EAAE;"}
+{"version":3,"file":"otel-start.js","sources":["../../../../../zero-cache/src/server/otel-start.ts"],"sourcesContent":["import {logs} from '@opentelemetry/api-logs';\nimport {getNodeAutoInstrumentations} from '@opentelemetry/auto-instrumentations-node';\nimport {resourceFromAttributes} from '@opentelemetry/resources';\nimport {NodeSDK} from '@opentelemetry/sdk-node';\nimport {ATTR_SERVICE_VERSION} from '@opentelemetry/semantic-conventions';\nimport type {LogContext} from '@rocicorp/logger';\nimport {\n  otelEnabled,\n  otelLogsEnabled,\n  otelMetricsEnabled,\n  otelTracesEnabled,\n} from '../../../otel/src/enabled.ts';\nimport {setupOtelDiagnosticLogger} from './otel-diag-logger.js';\n\nclass OtelManager {\n  static #instance: OtelManager;\n  #started = false;\n\n  private constructor() {}\n\n  static getInstance(): OtelManager {\n    if (!OtelManager.#instance) {\n      OtelManager.#instance = new OtelManager();\n    }\n    return OtelManager.#instance;\n  }\n\n  startOtelAuto(lc?: LogContext) {\n    if (this.#started || !otelEnabled()) {\n      return;\n    }\n    this.#started = true;\n\n    // Store and temporarily remove OTEL_LOG_LEVEL to prevent NodeSDK from setting its own logger\n    const otelLogLevel = process.env.OTEL_LOG_LEVEL;\n    delete process.env.OTEL_LOG_LEVEL;\n\n    // Use exponential histograms by default to reduce cardinality from auto-instrumentation\n    // This affects HTTP server/client and other auto-instrumented histogram metrics\n    // Exponential histograms automatically adjust bucket boundaries and use fewer buckets\n    process.env.OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION ??=\n      'base2_exponential_bucket_histogram';\n\n    const resource = resourceFromAttributes({\n      [ATTR_SERVICE_VERSION]: process.env.ZERO_SERVER_VERSION ?? 'unknown',\n    });\n\n    // Set defaults to be backwards compatible with the previously\n    // hard-coded exporters\n    process.env.OTEL_EXPORTER_OTLP_PROTOCOL ??= 'http/json';\n    process.env.OTEL_METRICS_EXPORTER ??= otelMetricsEnabled()\n      ? 'otlp'\n      : 'none';\n    process.env.OTEL_TRACES_EXPORTER ??= otelTracesEnabled() ? 'otlp' : 'none';\n    process.env.OTEL_LOGS_EXPORTER ??= otelLogsEnabled() ? 'otlp' : 'none';\n\n    const sdk = new NodeSDK({\n      resource,\n      autoDetectResources: true,\n      instrumentations:\n        process.env.OTEL_NODE_ENABLED_INSTRUMENTATIONS ||\n        process.env.OTEL_NODE_DISABLED_INSTRUMENTATIONS\n          ? [getNodeAutoInstrumentations()]\n          : [],\n    });\n\n    try {\n      sdk.start();\n    } finally {\n      if (otelLogLevel) {\n        process.env.OTEL_LOG_LEVEL = otelLogLevel;\n      }\n    }\n    setupOtelDiagnosticLogger(lc, true);\n\n    logs.getLogger('zero-cache').emit({\n      severityText: 'INFO',\n      body: 'OpenTelemetry SDK started successfully',\n    });\n  }\n}\n\nexport const startOtelAuto = (lc?: LogContext) =>\n  OtelManager.getInstance().startOtelAuto(lc);\n"],"names":[],"mappings":";;;;;;;AAcA,MAAM,YAAY;AAAA,EAChB,OAAO;AAAA,EACP,WAAW;AAAA,EAEH,cAAc;AAAA,EAAC;AAAA,EAEvB,OAAO,cAA2B;AAChC,QAAI,CAAC,YAAY,WAAW;AAC1B,kBAAY,YAAY,IAAI,YAAA;AAAA,IAC9B;AACA,WAAO,YAAY;AAAA,EACrB;AAAA,EAEA,cAAc,IAAiB;AAC7B,QAAI,KAAK,YAAY,CAAC,eAAe;AACnC;AAAA,IACF;AACA,SAAK,WAAW;AAGhB,UAAM,eAAe,QAAQ,IAAI;AACjC,WAAO,QAAQ,IAAI;AAKnB,YAAQ,IAAI,6DACV;AAEF,UAAM,WAAW,uBAAuB;AAAA,MACtC,CAAC,oBAAoB,GAAG,QAAQ,IAAI,uBAAuB;AAAA,IAAA,CAC5D;AAID,YAAQ,IAAI,gCAAgC;AAC5C,YAAQ,IAAI,0BAA0B,mBAAA,IAClC,SACA;AACJ,YAAQ,IAAI,yBAAyB,kBAAA,IAAsB,SAAS;AACpE,YAAQ,IAAI,uBAAuB,gBAAA,IAAoB,SAAS;AAEhE,UAAM,MAAM,IAAI,QAAQ;AAAA,MACtB;AAAA,MACA,qBAAqB;AAAA,MACrB,kBACE,QAAQ,IAAI,sCACZ,QAAQ,IAAI,sCACR,CAAC,4BAAA,CAA6B,IAC9B,CAAA;AAAA,IAAC,CACR;AAED,QAAI;AACF,UAAI,MAAA;AAAA,IACN,UAAA;AACE,UAAI,cAAc;AAChB,gBAAQ,IAAI,iBAAiB;AAAA,MAC/B;AAAA,IACF;AACA,8BAA0B,IAAI,IAAI;AAElC,SAAK,UAAU,YAAY,EAAE,KAAK;AAAA,MAChC,cAAc;AAAA,MACd,MAAM;AAAA,IAAA,CACP;AAAA,EACH;AACF;AAEO,MAAM,gBAAgB,CAAC,OAC5B,YAAY,YAAA,EAAc,cAAc,EAAE;"}

package/out/zero-cache/src/server/syncer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAuBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AA6B/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAsIf"}
+{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AAuBA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AA6B/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA4If"}

package/out/zero-cache/src/server/syncer.js

@@ -92,11 +92,17 @@ function runWorker(parent, env, ...args) {
       new PipelineDriver(
         logger,
         config.log,
-        new Snapshotter(logger, replicaFile, shard),
+        new Snapshotter(
+          logger,
+          replicaFile,
+          shard,
+          config.replica.pageCacheSizeKib
+        ),
         shard,
         operatorStorage.createClientGroupStorage(id),
         id,
         inspectorDelegate,
+        config.yieldThresholdMs,
         config.enableQueryPlanner
       ),
       sub,

package/out/zero-cache/src/server/syncer.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncer.js","sources":["../../../../../zero-cache/src/server/syncer.ts"],"sourcesContent":["import {randomUUID} from 'node:crypto';\nimport {tmpdir} from 'node:os';\nimport path from 'node:path';\nimport {pid} from 'node:process';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {randInt} from '../../../shared/src/rand.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {DatabaseStorage} from '../../../zqlite/src/database-storage.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {CustomQueryTransformer} from '../custom-queries/transform-query.ts';\nimport {warmupConnections} from '../db/warmup.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {MutagenService} from '../services/mutagen/mutagen.ts';\nimport {PusherService} from '../services/mutagen/pusher.ts';\nimport type {ReplicaState} from '../services/replicator/replicator.ts';\nimport type {DrainCoordinator} from '../services/view-syncer/drain-coordinator.ts';\nimport {PipelineDriver} from '../services/view-syncer/pipeline-driver.ts';\nimport {Snapshotter} from '../services/view-syncer/snapshotter.ts';\nimport {ViewSyncerService} from '../services/view-syncer/view-syncer.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardID} from '../types/shards.ts';\nimport type {Subscription} from '../types/subscription.ts';\nimport {replicaFileModeSchema, replicaFileName} from '../workers/replicator.ts';\nimport {Syncer} from '../workers/syncer.ts';\nimport {startAnonymousTelemetry} from './anonymous-otel-start.ts';\nimport {InspectorDelegate} from './inspector-delegate.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nfunction randomID() {\n  return randInt(1, Number.MAX_SAFE_INTEGER).toString(36);\n}\n\nfunction getCustomQueryConfig(\n  config: Pick<NormalizedZeroConfig, 'query' | 'getQueries'>,\n) {\n  const queryConfig = config.query?.url ? config.query : config.getQueries;\n\n  if (!queryConfig?.url) {\n    return undefined;\n  }\n\n  return {\n    url: queryConfig.url,\n    forwardCookies: queryConfig.forwardCookies ?? false,\n  };\n}\n\nexport default function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...args: string[]\n): Promise<void> {\n  const config = getNormalizedZeroConfig({env, argv: args.slice(1)});\n\n  startOtelAuto(createLogContext(config, {worker: 'syncer'}, false));\n  const lc = createLogContext(config, {worker: 'syncer'}, true);\n  initEventSink(lc, config);\n\n  assert(args.length > 0, `replicator mode not specified`);\n  const fileMode = v.parse(args[0], replicaFileModeSchema);\n\n  const {cvr, upstream} = config;\n  assert(cvr.maxConnsPerWorker, 'cvr.maxConnsPerWorker must be set');\n  assert(upstream.maxConnsPerWorker, 'upstream.maxConnsPerWorker must be set');\n\n  const replicaFile = replicaFileName(config.replica.file, fileMode);\n  lc.debug?.(`running view-syncer on ${replicaFile}`);\n\n  const cvrDB = pgClient(lc, cvr.db, {\n    max: cvr.maxConnsPerWorker,\n    connection: {['application_name']: `zero-sync-worker-${pid}-cvr`},\n  });\n\n  const upstreamDB = pgClient(lc, upstream.db, {\n    max: upstream.maxConnsPerWorker,\n    connection: {['application_name']: `zero-sync-worker-${pid}-upstream`},\n  });\n\n  const dbWarmup = Promise.allSettled([\n    warmupConnections(lc, cvrDB, 'cvr'),\n    warmupConnections(lc, upstreamDB, 'upstream'),\n  ]);\n\n  const tmpDir = config.storageDBTmpDir ?? tmpdir();\n  const operatorStorage = DatabaseStorage.create(\n    lc,\n    path.join(tmpDir, `sync-worker-${randomUUID()}`),\n  );\n  const writeAuthzStorage = DatabaseStorage.create(\n    lc,\n    path.join(tmpDir, `mutagen-${randomUUID()}`),\n  );\n\n  const shard = getShardID(config);\n\n  const viewSyncerFactory = (\n    id: string,\n    sub: Subscription<ReplicaState>,\n    drainCoordinator: DrainCoordinator,\n  ) => {\n    const logger = lc\n      .withContext('component', 'view-syncer')\n      .withContext('clientGroupID', id)\n      .withContext('instance', randomID());\n    lc.debug?.(\n      `creating view syncer. Query Planner Enabled: ${config.enableQueryPlanner}`,\n    );\n\n    // Create the custom query transformer if configured\n    const customQueryConfig = getCustomQueryConfig(config);\n    const customQueryTransformer =\n      customQueryConfig &&\n      new CustomQueryTransformer(logger, customQueryConfig, shard);\n\n    const inspectorDelegate = new InspectorDelegate(customQueryTransformer);\n\n    return new ViewSyncerService(\n      config,\n      logger,\n      shard,\n      config.taskID,\n      id,\n      cvrDB,\n      config.upstream.type === 'pg' ? upstreamDB : undefined,\n      new PipelineDriver(\n        logger,\n        config.log,\n        new Snapshotter(logger, replicaFile, shard),\n        shard,\n        operatorStorage.createClientGroupStorage(id),\n        id,\n        inspectorDelegate,\n        config.enableQueryPlanner,\n      ),\n      sub,\n      drainCoordinator,\n      config.log.slowHydrateThreshold,\n      inspectorDelegate,\n      customQueryTransformer,\n    );\n  };\n\n  const mutagenFactory = (id: string) =>\n    new MutagenService(\n      lc.withContext('component', 'mutagen').withContext('clientGroupID', id),\n      shard,\n      id,\n      upstreamDB,\n      config,\n      writeAuthzStorage,\n    );\n\n  const pusherFactory =\n    config.push.url === undefined && config.mutate.url === undefined\n      ? undefined\n      : (id: string) =>\n          new PusherService(\n            upstreamDB,\n            config,\n            {\n              ...config.push,\n              ...config.mutate,\n              url: must(\n                config.push.url ?? config.mutate.url,\n                'No push or mutate URL configured',\n              ),\n            },\n            lc.withContext('clientGroupID', id),\n            id,\n          );\n\n  const syncer = new Syncer(\n    lc,\n    config,\n    viewSyncerFactory,\n    mutagenFactory,\n    pusherFactory,\n    parent,\n  );\n\n  startAnonymousTelemetry(lc, config);\n\n  void dbWarmup.then(() => parent.send(['ready', {ready: true}]));\n\n  return runUntilKilled(lc, parent, syncer);\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"names":["v.parse"],"mappings":"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"}
+{"version":3,"file":"syncer.js","sources":["../../../../../zero-cache/src/server/syncer.ts"],"sourcesContent":["import {randomUUID} from 'node:crypto';\nimport {tmpdir} from 'node:os';\nimport path from 'node:path';\nimport {pid} from 'node:process';\nimport {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {randInt} from '../../../shared/src/rand.ts';\nimport * as v from '../../../shared/src/valita.ts';\nimport {DatabaseStorage} from '../../../zqlite/src/database-storage.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {CustomQueryTransformer} from '../custom-queries/transform-query.ts';\nimport {warmupConnections} from '../db/warmup.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {MutagenService} from '../services/mutagen/mutagen.ts';\nimport {PusherService} from '../services/mutagen/pusher.ts';\nimport type {ReplicaState} from '../services/replicator/replicator.ts';\nimport type {DrainCoordinator} from '../services/view-syncer/drain-coordinator.ts';\nimport {PipelineDriver} from '../services/view-syncer/pipeline-driver.ts';\nimport {Snapshotter} from '../services/view-syncer/snapshotter.ts';\nimport {ViewSyncerService} from '../services/view-syncer/view-syncer.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardID} from '../types/shards.ts';\nimport type {Subscription} from '../types/subscription.ts';\nimport {replicaFileModeSchema, replicaFileName} from '../workers/replicator.ts';\nimport {Syncer} from '../workers/syncer.ts';\nimport {startAnonymousTelemetry} from './anonymous-otel-start.ts';\nimport {InspectorDelegate} from './inspector-delegate.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nfunction randomID() {\n  return randInt(1, Number.MAX_SAFE_INTEGER).toString(36);\n}\n\nfunction getCustomQueryConfig(\n  config: Pick<NormalizedZeroConfig, 'query' | 'getQueries'>,\n) {\n  const queryConfig = config.query?.url ? config.query : config.getQueries;\n\n  if (!queryConfig?.url) {\n    return undefined;\n  }\n\n  return {\n    url: queryConfig.url,\n    forwardCookies: queryConfig.forwardCookies ?? false,\n  };\n}\n\nexport default function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...args: string[]\n): Promise<void> {\n  const config = getNormalizedZeroConfig({env, argv: args.slice(1)});\n\n  startOtelAuto(createLogContext(config, {worker: 'syncer'}, false));\n  const lc = createLogContext(config, {worker: 'syncer'}, true);\n  initEventSink(lc, config);\n\n  assert(args.length > 0, `replicator mode not specified`);\n  const fileMode = v.parse(args[0], replicaFileModeSchema);\n\n  const {cvr, upstream} = config;\n  assert(cvr.maxConnsPerWorker, 'cvr.maxConnsPerWorker must be set');\n  assert(upstream.maxConnsPerWorker, 'upstream.maxConnsPerWorker must be set');\n\n  const replicaFile = replicaFileName(config.replica.file, fileMode);\n  lc.debug?.(`running view-syncer on ${replicaFile}`);\n\n  const cvrDB = pgClient(lc, cvr.db, {\n    max: cvr.maxConnsPerWorker,\n    connection: {['application_name']: `zero-sync-worker-${pid}-cvr`},\n  });\n\n  const upstreamDB = pgClient(lc, upstream.db, {\n    max: upstream.maxConnsPerWorker,\n    connection: {['application_name']: `zero-sync-worker-${pid}-upstream`},\n  });\n\n  const dbWarmup = Promise.allSettled([\n    warmupConnections(lc, cvrDB, 'cvr'),\n    warmupConnections(lc, upstreamDB, 'upstream'),\n  ]);\n\n  const tmpDir = config.storageDBTmpDir ?? tmpdir();\n  const operatorStorage = DatabaseStorage.create(\n    lc,\n    path.join(tmpDir, `sync-worker-${randomUUID()}`),\n  );\n  const writeAuthzStorage = DatabaseStorage.create(\n    lc,\n    path.join(tmpDir, `mutagen-${randomUUID()}`),\n  );\n\n  const shard = getShardID(config);\n\n  const viewSyncerFactory = (\n    id: string,\n    sub: Subscription<ReplicaState>,\n    drainCoordinator: DrainCoordinator,\n  ) => {\n    const logger = lc\n      .withContext('component', 'view-syncer')\n      .withContext('clientGroupID', id)\n      .withContext('instance', randomID());\n    lc.debug?.(\n      `creating view syncer. Query Planner Enabled: ${config.enableQueryPlanner}`,\n    );\n\n    // Create the custom query transformer if configured\n    const customQueryConfig = getCustomQueryConfig(config);\n    const customQueryTransformer =\n      customQueryConfig &&\n      new CustomQueryTransformer(logger, customQueryConfig, shard);\n\n    const inspectorDelegate = new InspectorDelegate(customQueryTransformer);\n\n    return new ViewSyncerService(\n      config,\n      logger,\n      shard,\n      config.taskID,\n      id,\n      cvrDB,\n      config.upstream.type === 'pg' ? upstreamDB : undefined,\n      new PipelineDriver(\n        logger,\n        config.log,\n        new Snapshotter(\n          logger,\n          replicaFile,\n          shard,\n          config.replica.pageCacheSizeKib,\n        ),\n        shard,\n        operatorStorage.createClientGroupStorage(id),\n        id,\n        inspectorDelegate,\n        config.yieldThresholdMs,\n        config.enableQueryPlanner,\n      ),\n      sub,\n      drainCoordinator,\n      config.log.slowHydrateThreshold,\n      inspectorDelegate,\n      customQueryTransformer,\n    );\n  };\n\n  const mutagenFactory = (id: string) =>\n    new MutagenService(\n      lc.withContext('component', 'mutagen').withContext('clientGroupID', id),\n      shard,\n      id,\n      upstreamDB,\n      config,\n      writeAuthzStorage,\n    );\n\n  const pusherFactory =\n    config.push.url === undefined && config.mutate.url === undefined\n      ? undefined\n      : (id: string) =>\n          new PusherService(\n            upstreamDB,\n            config,\n            {\n              ...config.push,\n              ...config.mutate,\n              url: must(\n                config.push.url ?? config.mutate.url,\n                'No push or mutate URL configured',\n              ),\n            },\n            lc.withContext('clientGroupID', id),\n            id,\n          );\n\n  const syncer = new Syncer(\n    lc,\n    config,\n    viewSyncerFactory,\n    mutagenFactory,\n    pusherFactory,\n    parent,\n  );\n\n  startAnonymousTelemetry(lc, config);\n\n  void dbWarmup.then(() => parent.send(['ready', {ready: true}]));\n\n  return runUntilKilled(lc, parent, syncer);\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"names":["v.parse"],"mappings":"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"}

package/out/zero-cache/src/services/analyze.d.ts

@@ -3,7 +3,7 @@ import type { AnalyzeQueryResult } from '../../../zero-protocol/src/analyze-quer
 import type { AST } from '../../../zero-protocol/src/ast.ts';
 import type { PermissionsConfig } from '../../../zero-schema/src/compiled-permissions.ts';
 import type { NormalizedZeroConfig } from '../config/normalize.ts';
-import type { TokenData } from './view-syncer/view-syncer.ts';
+import { type TokenData } from './view-syncer/view-syncer.ts';
 import type { ClientSchema } from '../../../zero-protocol/src/client-schema.ts';
-export declare function analyzeQuery(lc: LogContext, config: NormalizedZeroConfig, clientSchema: ClientSchema, ast: AST, syncedRows?: boolean, vendedRows?: boolean, permissions?: PermissionsConfig, authData?: TokenData, plannerDebug?: boolean): Promise<AnalyzeQueryResult>;
+export declare function analyzeQuery(lc: LogContext, config: NormalizedZeroConfig, clientSchema: ClientSchema, ast: AST, syncedRows?: boolean, vendedRows?: boolean, permissions?: PermissionsConfig, authData?: TokenData, joinPlans?: boolean): Promise<AnalyzeQueryResult>;
 //# sourceMappingURL=analyze.d.ts.map

package/out/zero-cache/src/services/analyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oDAAoD,CAAC;AAC3F,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kDAAkD,CAAC;AAWxF,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAIjE,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAE9E,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,oBAAoB,EAC5B,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,UAAU,UAAO,EACjB,UAAU,UAAQ,EAClB,WAAW,CAAC,EAAE,iBAAiB,EAC/B,QAAQ,CAAC,EAAE,SAAS,EACpB,YAAY,UAAQ,GACnB,OAAO,CAAC,kBAAkB,CAAC,CA6D7B"}
+{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/services/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oDAAoD,CAAC;AAC3F,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,kDAAkD,CAAC;AAWxF,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAIjE,OAAO,EAAiB,KAAK,SAAS,EAAC,MAAM,8BAA8B,CAAC;AAC5E,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAI9E,wBAAsB,YAAY,CAChC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,oBAAoB,EAC5B,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,GAAG,EACR,UAAU,UAAO,EACjB,UAAU,UAAQ,EAClB,WAAW,CAAC,EAAE,iBAAiB,EAC/B,QAAQ,CAAC,EAAE,SAAS,EACpB,SAAS,UAAQ,GAChB,OAAO,CAAC,kBAAkB,CAAC,CAwE7B"}

package/out/zero-cache/src/services/analyze.js

@@ -52,7 +52,9 @@ import { createSQLiteCostModel } from "../../../zqlite/src/sqlite-cost-model.js"
 import { TableSource } from "../../../zqlite/src/table-source.js";
 import { computeZqlSpecs, mustGetTableSpec } from "../db/lite-tables.js";
 import { runAst } from "./run-ast.js";
-async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, vendedRows = false, permissions, authData, plannerDebug = false) {
+import { TimeSliceTimer } from "./view-syncer/view-syncer.js";
+const TIME_SLICE_LAP_THRESHOLD_MS = 200;
+async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, vendedRows = false, permissions, authData, joinPlans = false) {
   var _stack = [];
   try {
     const db = __using(_stack, new Database(lc, config.replica.file));
@@ -60,49 +62,60 @@ async function analyzeQuery(lc, config, clientSchema, ast, syncedRows = true, ve
     const tableSpecs = /* @__PURE__ */ new Map();
     const tables = /* @__PURE__ */ new Map();
     computeZqlSpecs(lc, db, tableSpecs, fullTables);
-    const planDebugger = plannerDebug ? new AccumulatorDebugger() : void 0;
-    const costModel = plannerDebug ? createSQLiteCostModel(db, tableSpecs) : void 0;
-    const result = await runAst(lc, clientSchema, ast, true, {
-      applyPermissions: permissions !== void 0,
-      syncedRows,
-      vendedRows,
-      authData,
-      permissions,
-      costModel,
-      planDebugger,
-      host: {
-        debug: new Debug(),
-        getSource(tableName) {
-          let source = tables.get(tableName);
-          if (source) {
+    const planDebugger = joinPlans ? new AccumulatorDebugger() : void 0;
+    const costModel = joinPlans ? createSQLiteCostModel(db, tableSpecs) : void 0;
+    const timer = await new TimeSliceTimer().start();
+    const shouldYield = () => timer.elapsedLap() > TIME_SLICE_LAP_THRESHOLD_MS;
+    const yieldProcess = () => timer.yieldProcess();
+    const result = await runAst(
+      lc,
+      clientSchema,
+      ast,
+      true,
+      {
+        applyPermissions: permissions !== void 0,
+        syncedRows,
+        vendedRows,
+        authData,
+        permissions,
+        costModel,
+        planDebugger,
+        host: {
+          debug: new Debug(),
+          getSource(tableName) {
+            let source = tables.get(tableName);
+            if (source) {
+              return source;
+            }
+            const tableSpec = mustGetTableSpec(tableSpecs, tableName);
+            const { primaryKey } = tableSpec.tableSpec;
+            source = new TableSource(
+              lc,
+              config.log,
+              db,
+              tableName,
+              tableSpec.zqlSpec,
+              primaryKey,
+              shouldYield
+            );
+            tables.set(tableName, source);
             return source;
-          }
-          const tableSpec = mustGetTableSpec(tableSpecs, tableName);
-          const { primaryKey } = tableSpec.tableSpec;
-          source = new TableSource(
-            lc,
-            config.log,
-            db,
-            tableName,
-            tableSpec.zqlSpec,
-            primaryKey
-          );
-          tables.set(tableName, source);
-          return source;
-        },
-        createStorage() {
-          return new MemoryStorage();
-        },
-        decorateSourceInput: (input) => input,
-        decorateInput: (input) => input,
-        addEdge() {
-        },
-        decorateFilterInput: (input) => input
-      }
-    });
-    result.plans = explainQueries(result.readRowCountsByQuery ?? {}, db);
+          },
+          createStorage() {
+            return new MemoryStorage();
+          },
+          decorateSourceInput: (input) => input,
+          decorateInput: (input) => input,
+          addEdge() {
+          },
+          decorateFilterInput: (input) => input
+        }
+      },
+      yieldProcess
+    );
+    result.sqlitePlans = explainQueries(result.readRowCountsByQuery ?? {}, db);
     if (planDebugger) {
-      result.plannerEvents = serializePlanDebugEvents(planDebugger.events);
+      result.joinPlans = serializePlanDebugEvents(planDebugger.events);
     }
     return result;
   } catch (_) {

package/out/zero-cache/src/services/analyze.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyze.js","sources":["../../../../../zero-cache/src/services/analyze.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {Debug} from '../../../zql/src/builder/debug-delegate.ts';\nimport {MemoryStorage} from '../../../zql/src/ivm/memory-storage.ts';\nimport {\n  AccumulatorDebugger,\n  serializePlanDebugEvents,\n} from '../../../zql/src/planner/planner-debug.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport {explainQueries} from '../../../zqlite/src/explain-queries.ts';\nimport {createSQLiteCostModel} from '../../../zqlite/src/sqlite-cost-model.ts';\nimport {TableSource} from '../../../zqlite/src/table-source.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {computeZqlSpecs, mustGetTableSpec} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec, LiteTableSpec} from '../db/specs.ts';\nimport {runAst} from './run-ast.ts';\nimport type {TokenData} from './view-syncer/view-syncer.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\n\nexport async function analyzeQuery(\n  lc: LogContext,\n  config: NormalizedZeroConfig,\n  clientSchema: ClientSchema,\n  ast: AST,\n  syncedRows = true,\n  vendedRows = false,\n  permissions?: PermissionsConfig,\n  authData?: TokenData,\n  plannerDebug = false,\n): Promise<AnalyzeQueryResult> {\n  using db = new Database(lc, config.replica.file);\n  const fullTables = new Map<string, LiteTableSpec>();\n  const tableSpecs = new Map<string, LiteAndZqlSpec>();\n  const tables = new Map<string, TableSource>();\n\n  computeZqlSpecs(lc, db, tableSpecs, fullTables);\n\n  const planDebugger = plannerDebug ? new AccumulatorDebugger() : undefined;\n  const costModel = plannerDebug\n    ? createSQLiteCostModel(db, tableSpecs)\n    : undefined;\n  const result = await runAst(lc, clientSchema, ast, true, {\n    applyPermissions: permissions !== undefined,\n    syncedRows,\n    vendedRows,\n    authData,\n    db,\n    tableSpecs,\n    permissions,\n    costModel,\n    planDebugger,\n    host: {\n      debug: new Debug(),\n      getSource(tableName: string) {\n        let source = tables.get(tableName);\n        if (source) {\n          return source;\n        }\n\n        const tableSpec = mustGetTableSpec(tableSpecs, tableName);\n        const {primaryKey} = tableSpec.tableSpec;\n\n        source = new TableSource(\n          lc,\n          config.log,\n          db,\n          tableName,\n          tableSpec.zqlSpec,\n          primaryKey,\n        );\n        tables.set(tableName, source);\n        return source;\n      },\n      createStorage() {\n        return new MemoryStorage();\n      },\n      decorateSourceInput: input => input,\n      decorateInput: input => input,\n      addEdge() {},\n      decorateFilterInput: input => input,\n    },\n  });\n\n  result.plans = explainQueries(result.readRowCountsByQuery ?? {}, db);\n\n  if (planDebugger) {\n    result.plannerEvents = serializePlanDebugEvents(planDebugger.events);\n  }\n\n  return result;\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,eAAsB,aACpB,IACA,QACA,cACA,KACA,aAAa,MACb,aAAa,OACb,aACA,UACA,eAAe,OACc;AAC7B;AAAA;AAAA,UAAM,KAAK,oBAAI,SAAS,IAAI,OAAO,QAAQ,IAAI;AAC/C,UAAM,iCAAiB,IAAA;AACvB,UAAM,iCAAiB,IAAA;AACvB,UAAM,6BAAa,IAAA;AAEnB,oBAAgB,IAAI,IAAI,YAAY,UAAU;AAE9C,UAAM,eAAe,eAAe,IAAI,oBAAA,IAAwB;AAChE,UAAM,YAAY,eACd,sBAAsB,IAAI,UAAU,IACpC;AACJ,UAAM,SAAS,MAAM,OAAO,IAAI,cAAc,KAAK,MAAM;AAAA,MACvD,kBAAkB,gBAAgB;AAAA,MAClC;AAAA,MACA;AAAA,MACA;AAAA,MAGA;AAAA,MACA;AAAA,MACA;AAAA,MACA,MAAM;AAAA,QACJ,OAAO,IAAI,MAAA;AAAA,QACX,UAAU,WAAmB;AAC3B,cAAI,SAAS,OAAO,IAAI,SAAS;AACjC,cAAI,QAAQ;AACV,mBAAO;AAAA,UACT;AAEA,gBAAM,YAAY,iBAAiB,YAAY,SAAS;AACxD,gBAAM,EAAC,eAAc,UAAU;AAE/B,mBAAS,IAAI;AAAA,YACX;AAAA,YACA,OAAO;AAAA,YACP;AAAA,YACA;AAAA,YACA,UAAU;AAAA,YACV;AAAA,UAAA;AAEF,iBAAO,IAAI,WAAW,MAAM;AAC5B,iBAAO;AAAA,QACT;AAAA,QACA,gBAAgB;AACd,iBAAO,IAAI,cAAA;AAAA,QACb;AAAA,QACA,qBAAqB,CAAA,UAAS;AAAA,QAC9B,eAAe,CAAA,UAAS;AAAA,QACxB,UAAU;AAAA,QAAC;AAAA,QACX,qBAAqB,CAAA,UAAS;AAAA,MAAA;AAAA,IAChC,CACD;AAED,WAAO,QAAQ,eAAe,OAAO,wBAAwB,CAAA,GAAI,EAAE;AAEnE,QAAI,cAAc;AAChB,aAAO,gBAAgB,yBAAyB,aAAa,MAAM;AAAA,IACrE;AAEA,WAAO;AAAA,WA3DP;AAAA;AAAA;AAAA;AAAA;AA4DF;"}
+{"version":3,"file":"analyze.js","sources":["../../../../../zero-cache/src/services/analyze.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {AnalyzeQueryResult} from '../../../zero-protocol/src/analyze-query-result.ts';\nimport type {AST} from '../../../zero-protocol/src/ast.ts';\nimport type {PermissionsConfig} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {Debug} from '../../../zql/src/builder/debug-delegate.ts';\nimport {MemoryStorage} from '../../../zql/src/ivm/memory-storage.ts';\nimport {\n  AccumulatorDebugger,\n  serializePlanDebugEvents,\n} from '../../../zql/src/planner/planner-debug.ts';\nimport {Database} from '../../../zqlite/src/db.ts';\nimport {explainQueries} from '../../../zqlite/src/explain-queries.ts';\nimport {createSQLiteCostModel} from '../../../zqlite/src/sqlite-cost-model.ts';\nimport {TableSource} from '../../../zqlite/src/table-source.ts';\nimport type {NormalizedZeroConfig} from '../config/normalize.ts';\nimport {computeZqlSpecs, mustGetTableSpec} from '../db/lite-tables.ts';\nimport type {LiteAndZqlSpec, LiteTableSpec} from '../db/specs.ts';\nimport {runAst} from './run-ast.ts';\nimport {TimeSliceTimer, type TokenData} from './view-syncer/view-syncer.ts';\nimport type {ClientSchema} from '../../../zero-protocol/src/client-schema.ts';\n\nconst TIME_SLICE_LAP_THRESHOLD_MS = 200;\n\nexport async function analyzeQuery(\n  lc: LogContext,\n  config: NormalizedZeroConfig,\n  clientSchema: ClientSchema,\n  ast: AST,\n  syncedRows = true,\n  vendedRows = false,\n  permissions?: PermissionsConfig,\n  authData?: TokenData,\n  joinPlans = false,\n): Promise<AnalyzeQueryResult> {\n  using db = new Database(lc, config.replica.file);\n  const fullTables = new Map<string, LiteTableSpec>();\n  const tableSpecs = new Map<string, LiteAndZqlSpec>();\n  const tables = new Map<string, TableSource>();\n\n  computeZqlSpecs(lc, db, tableSpecs, fullTables);\n\n  const planDebugger = joinPlans ? new AccumulatorDebugger() : undefined;\n  const costModel = joinPlans\n    ? createSQLiteCostModel(db, tableSpecs)\n    : undefined;\n  const timer = await new TimeSliceTimer().start();\n  const shouldYield = () => timer.elapsedLap() > TIME_SLICE_LAP_THRESHOLD_MS;\n  const yieldProcess = () => timer.yieldProcess();\n  const result = await runAst(\n    lc,\n    clientSchema,\n    ast,\n    true,\n    {\n      applyPermissions: permissions !== undefined,\n      syncedRows,\n      vendedRows,\n      authData,\n      db,\n      tableSpecs,\n      permissions,\n      costModel,\n      planDebugger,\n      host: {\n        debug: new Debug(),\n        getSource(tableName: string) {\n          let source = tables.get(tableName);\n          if (source) {\n            return source;\n          }\n\n          const tableSpec = mustGetTableSpec(tableSpecs, tableName);\n          const {primaryKey} = tableSpec.tableSpec;\n\n          source = new TableSource(\n            lc,\n            config.log,\n            db,\n            tableName,\n            tableSpec.zqlSpec,\n            primaryKey,\n            shouldYield,\n          );\n          tables.set(tableName, source);\n          return source;\n        },\n        createStorage() {\n          return new MemoryStorage();\n        },\n        decorateSourceInput: input => input,\n        decorateInput: input => input,\n        addEdge() {},\n        decorateFilterInput: input => input,\n      },\n    },\n    yieldProcess,\n  );\n\n  result.sqlitePlans = explainQueries(result.readRowCountsByQuery ?? {}, db);\n\n  if (planDebugger) {\n    result.joinPlans = serializePlanDebugEvents(planDebugger.events);\n  }\n\n  return result;\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,MAAM,8BAA8B;AAEpC,eAAsB,aACpB,IACA,QACA,cACA,KACA,aAAa,MACb,aAAa,OACb,aACA,UACA,YAAY,OACiB;AAC7B;AAAA;AAAA,UAAM,KAAK,oBAAI,SAAS,IAAI,OAAO,QAAQ,IAAI;AAC/C,UAAM,iCAAiB,IAAA;AACvB,UAAM,iCAAiB,IAAA;AACvB,UAAM,6BAAa,IAAA;AAEnB,oBAAgB,IAAI,IAAI,YAAY,UAAU;AAE9C,UAAM,eAAe,YAAY,IAAI,oBAAA,IAAwB;AAC7D,UAAM,YAAY,YACd,sBAAsB,IAAI,UAAU,IACpC;AACJ,UAAM,QAAQ,MAAM,IAAI,eAAA,EAAiB,MAAA;AACzC,UAAM,cAAc,MAAM,MAAM,WAAA,IAAe;AAC/C,UAAM,eAAe,MAAM,MAAM,aAAA;AACjC,UAAM,SAAS,MAAM;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,QACE,kBAAkB,gBAAgB;AAAA,QAClC;AAAA,QACA;AAAA,QACA;AAAA,QAGA;AAAA,QACA;AAAA,QACA;AAAA,QACA,MAAM;AAAA,UACJ,OAAO,IAAI,MAAA;AAAA,UACX,UAAU,WAAmB;AAC3B,gBAAI,SAAS,OAAO,IAAI,SAAS;AACjC,gBAAI,QAAQ;AACV,qBAAO;AAAA,YACT;AAEA,kBAAM,YAAY,iBAAiB,YAAY,SAAS;AACxD,kBAAM,EAAC,eAAc,UAAU;AAE/B,qBAAS,IAAI;AAAA,cACX;AAAA,cACA,OAAO;AAAA,cACP;AAAA,cACA;AAAA,cACA,UAAU;AAAA,cACV;AAAA,cACA;AAAA,YAAA;AAEF,mBAAO,IAAI,WAAW,MAAM;AAC5B,mBAAO;AAAA,UACT;AAAA,UACA,gBAAgB;AACd,mBAAO,IAAI,cAAA;AAAA,UACb;AAAA,UACA,qBAAqB,CAAA,UAAS;AAAA,UAC9B,eAAe,CAAA,UAAS;AAAA,UACxB,UAAU;AAAA,UAAC;AAAA,UACX,qBAAqB,CAAA,UAAS;AAAA,QAAA;AAAA,MAChC;AAAA,MAEF;AAAA,IAAA;AAGF,WAAO,cAAc,eAAe,OAAO,wBAAwB,CAAA,GAAI,EAAE;AAEzE,QAAI,cAAc;AAChB,aAAO,YAAY,yBAAyB,aAAa,MAAM;AAAA,IACjE;AAEA,WAAO;AAAA,WAtEP;AAAA;AAAA;AAAA;AAAA;AAuEF;"}

package/out/zero-cache/src/services/change-source/pg/change-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-source.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAgBjD,OAAO,KAAK,EAEV,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAEL,KAAK,WAAW,EAEjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAC;AAEpD,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,8CAA8C,CAAC;AAWtD,OAAO,EAAC,KAAK,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAGV,eAAe,IAAI,gBAAgB,EACpC,MAAM,yCAAyC,CAAC;AAoBjD;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;IAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAoC7E;AA6PD,qBAAa,KAAK;;gBAIJ,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;IAI9B,SAAS;IAiBT,GAAG,CAAC,SAAS,EAAE,WAAW;CAa3B;AA0bD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,gBAAgB,WAwB3E"}
+{"version":3,"file":"change-source.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAgBjD,OAAO,KAAK,EAEV,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAEL,KAAK,WAAW,EAEjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,2BAA2B,CAAC;AAEpD,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,8CAA8C,CAAC;AAYtD,OAAO,EAAC,KAAK,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAGV,eAAe,IAAI,gBAAgB,EACpC,MAAM,yCAAyC,CAAC;AAoBjD;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;IAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAoC7E;AA6PD,qBAAa,KAAK;;gBAIJ,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;IAI9B,SAAS;IAiBT,GAAG,CAAC,SAAS,EAAE,WAAW;CAa3B;AAycD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,gBAAgB,WAwB3E"}

package/out/zero-cache/src/services/change-source/pg/change-source.js

@@ -288,9 +288,17 @@ class ChangeMaker {
     } catch (err) {
       this.#error = { lsn, msg, err, lastLogTime: 0 };
       this.#logError(this.#error);
+      const message = `Unable to continue replication from LSN ${fromBigInt(lsn)}`;
+      const errorDetails = { error: message };
+      if (err instanceof UnsupportedSchemaChangeError) {
+        errorDetails.reason = err.description;
+        errorDetails.context = err.ddlUpdate.context;
+      } else {
+        errorDetails.reason = String(err);
+      }
       return [
         ["rollback", { tag: "rollback" }],
-        ["control", { tag: "reset-required" }]
+        ["control", { tag: "reset-required", message, errorDetails }]
       ];
     }
   }
@@ -302,8 +310,10 @@ class ChangeMaker {
         `Unable to continue replication from LSN ${fromBigInt(lsn)}: ${String(
           err
         )}`,
-        // 'content' can be a large byte Buffer. Exclude it from logging output.
-        { ...msg, content: void 0 }
+        err instanceof UnsupportedSchemaChangeError ? err.ddlUpdate.context : (
+          // 'content' can be a large byte Buffer. Exclude it from logging output.
+          { ...msg, content: void 0 }
+        )
       );
       error.lastLogTime = now;
     }
@@ -432,37 +442,44 @@ class ChangeMaker {
    * the type of a column that's indexed.
    */
   #makeSchemaChanges(preSchema, update) {
-    const [prevTbl, prevIdx] = specsByID(preSchema);
-    const [nextTbl, nextIdx] = specsByID(update.schema);
-    const changes = [];
-    for (const table of nextTbl.values()) {
-      validate(this.#lc, table, update.schema.indexes);
-    }
-    const [droppedIdx, createdIdx] = symmetricDifferences(prevIdx, nextIdx);
-    for (const id of droppedIdx) {
-      const { schema, name } = must(prevIdx.get(id));
-      changes.push({ tag: "drop-index", id: { schema, name } });
-    }
-    const [droppedTbl, createdTbl] = symmetricDifferences(prevTbl, nextTbl);
-    for (const id of droppedTbl) {
-      const { schema, name } = must(prevTbl.get(id));
-      changes.push({ tag: "drop-table", id: { schema, name } });
-    }
-    const tables = intersection(prevTbl, nextTbl);
-    for (const id of tables) {
-      changes.push(
-        ...this.#getTableChanges(must(prevTbl.get(id)), must(nextTbl.get(id)))
-      );
-    }
-    for (const id of createdTbl) {
-      const spec = must(nextTbl.get(id));
-      changes.push({ tag: "create-table", spec });
-    }
-    for (const id of createdIdx) {
-      const spec = must(nextIdx.get(id));
-      changes.push({ tag: "create-index", spec });
+    try {
+      const [prevTbl, prevIdx] = specsByID(preSchema);
+      const [nextTbl, nextIdx] = specsByID(update.schema);
+      const changes = [];
+      for (const table of nextTbl.values()) {
+        validate(this.#lc, table, update.schema.indexes);
+      }
+      const [droppedIdx, createdIdx] = symmetricDifferences(prevIdx, nextIdx);
+      for (const id of droppedIdx) {
+        const { schema, name } = must(prevIdx.get(id));
+        changes.push({ tag: "drop-index", id: { schema, name } });
+      }
+      const [droppedTbl, createdTbl] = symmetricDifferences(prevTbl, nextTbl);
+      for (const id of droppedTbl) {
+        const { schema, name } = must(prevTbl.get(id));
+        changes.push({ tag: "drop-table", id: { schema, name } });
+      }
+      const tables = intersection(prevTbl, nextTbl);
+      for (const id of tables) {
+        changes.push(
+          ...this.#getTableChanges(
+            must(prevTbl.get(id)),
+            must(nextTbl.get(id))
+          )
+        );
+      }
+      for (const id of createdTbl) {
+        const spec = must(nextTbl.get(id));
+        changes.push({ tag: "create-table", spec });
+      }
+      for (const id of createdIdx) {
+        const spec = must(nextIdx.get(id));
+        changes.push({ tag: "create-index", spec });
+      }
+      return changes;
+    } catch (e) {
+      throw new UnsupportedSchemaChangeError(String(e), update, { cause: e });
     }
-    return changes;
   }
   #getTableChanges(oldTable, newTable) {
     const changes = [];
@@ -497,11 +514,7 @@ class ChangeMaker {
     for (const id of added) {
       const { name, ...spec } = must(newColumns.get(id));
       const column = { name, spec };
-      try {
-        mapPostgresToLiteColumn(table.name, column);
-      } catch (cause) {
-        throw new UnsupportedSchemaChangeError(String(cause), { cause });
-      }
+      mapPostgresToLiteColumn(table.name, column);
       changes.push({ tag: "add-column", table, column });
     }
     return changes;
@@ -642,12 +655,19 @@ function withoutColumns(relation) {
 }
 class UnsupportedSchemaChangeError extends Error {
   name = "UnsupportedSchemaChangeError";
-  // Schema changes cannot be reliably replicated without event trigger support.
-  constructor(msg, options) {
-    super(`Replication halted. Resync the replica to recover: ${msg}`, options);
+  description;
+  ddlUpdate;
+  constructor(description, ddlUpdate, options) {
+    super(
+      `Replication halted. Resync the replica to recover: ${description}`,
+      options
+    );
+    this.description = description;
+    this.ddlUpdate = ddlUpdate;
   }
 }
-class MissingEventTriggerSupport extends UnsupportedSchemaChangeError {
+class MissingEventTriggerSupport extends Error {
+  name = "MissingEventTriggerSupport";
   constructor(msg) {
     super(
       `${msg}. Schema changes cannot be reliably replicated without event trigger support.`