@rocicorp/zero 0.5.2024110200 → 0.6.2024111700

package/out/zero-cache/src/db/short-lived-client.js

@@ -0,0 +1,50 @@
+import { pgClient } from '../types/pg.js';
+/**
+ * Manages on-demand short-lived connections to a DB, shutting down after
+ * an idle delay.
+ */
+export class ShortLivedClient {
+    #lc;
+    #dbConnStr;
+    #appName;
+    #idleDelay;
+    #db = null;
+    #dbTimeout = {};
+    constructor(lc, dbConnStr, appName, idleDelay = 10_000) {
+        this.#lc = lc;
+        this.#dbConnStr = dbConnStr;
+        this.#appName = appName;
+        this.#idleDelay = idleDelay;
+    }
+    /**
+     * Get (or refresh) an upstream DB client that automatically closes
+     * after being idle for 10 seconds.
+     */
+    get db() {
+        try {
+            if (this.#db) {
+                clearTimeout(this.#dbTimeout.id); // reset in finally
+            }
+            else {
+                this.#db = pgClient(this.#lc, this.#dbConnStr, {
+                    connection: { ['application_name']: this.#appName },
+                });
+            }
+            return this.#db;
+        }
+        finally {
+            const timeout = {
+                id: setTimeout(() => {
+                    // Only close the connection if the #dbTimeout has not been reset.
+                    if (this.#dbTimeout === timeout) {
+                        this.#lc.debug?.(`closing idle upstream connection`);
+                        void this.#db?.end();
+                        this.#db = null;
+                    }
+                }, this.#idleDelay),
+            };
+            this.#dbTimeout = timeout;
+        }
+    }
+}
+//# sourceMappingURL=short-lived-client.js.map

package/out/zero-cache/src/db/short-lived-client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"short-lived-client.js","sourceRoot":"","sources":["../../../../../zero-cache/src/db/short-lived-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAEzD;;;GAGG;AACH,MAAM,OAAO,gBAAgB;IAClB,GAAG,CAAa;IAChB,UAAU,CAAS;IACnB,QAAQ,CAAS;IACjB,UAAU,CAAS;IAE5B,GAAG,GAAsB,IAAI,CAAC;IAC9B,UAAU,GAAgB,EAAE,CAAC;IAE7B,YACE,EAAc,EACd,SAAiB,EACjB,OAAe,EACf,SAAS,GAAG,MAAM;QAElB,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,IAAI,EAAE;QACJ,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBACb,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB;YACvD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE;oBAC7C,UAAU,EAAE,EAAC,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAC;iBAClD,CAAC,CAAC;YACL,CAAC;YACD,OAAO,IAAI,CAAC,GAAG,CAAC;QAClB,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,GAAG;gBACd,EAAE,EAAE,UAAU,CAAC,GAAG,EAAE;oBAClB,kEAAkE;oBAClE,IAAI,IAAI,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;wBAChC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,kCAAkC,CAAC,CAAC;wBACrD,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;wBACrB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;oBAClB,CAAC;gBACH,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC;aACpB,CAAC;YACF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAC5B,CAAC;IACH,CAAC;CACF"}

package/out/zero-cache/src/db/specs.d.ts

@@ -32,7 +32,7 @@ export declare const tableSpec: v.ObjectType<Omit<{
 }, "schema"> & {
     schema: v.Type<string>;
 }, undefined>;
-export declare const filteredTableSpec: v.ObjectType<Omit<Omit<{
+export declare const publishedTableSpec: v.ObjectType<Omit<Omit<{
     name: v.Type<string>;
     columns: v.Type<Record<string, {
         characterMaximumLength?: number | null | undefined;
@@ -44,14 +44,23 @@ export declare const filteredTableSpec: v.ObjectType<Omit<Omit<{
     primaryKey: v.ArrayType<v.Type<string>>;
 }, "schema"> & {
     schema: v.Type<string>;
-}, "publications"> & {
+}, "publications" | "columns" | "oid"> & {
+    oid: v.Type<number>;
+    columns: v.Type<Record<string, {
+        characterMaximumLength?: number | null | undefined;
+        notNull?: boolean | null | undefined;
+        dflt?: string | null | undefined;
+        pos: number;
+        dataType: string;
+        typeOID: number;
+    }>>;
     publications: v.Type<Record<string, {
         rowFilter: string | null;
     }>>;
 }, undefined>;
 export type LiteTableSpec = Readonly<v.Infer<typeof liteTableSpec>>;
 export type TableSpec = Readonly<v.Infer<typeof tableSpec>>;
-export type FilteredTableSpec = Readonly<v.Infer<typeof filteredTableSpec>>;
+export type PublishedTableSpec = Readonly<v.Infer<typeof publishedTableSpec>>;
 export declare const directionSchema: v.UnionType<[v.Type<"ASC">, v.Type<"DESC">]>;
 export declare const liteIndexSpec: v.ObjectType<{
     name: v.Type<string>;

package/out/zero-cache/src/db/specs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specs.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/specs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAEnD,eAAO,MAAM,UAAU;;;;;;aAMrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;AAE9D,eAAO,MAAM,aAAa;;;;;;;;;;aAIxB,CAAC;AAEH,eAAO,MAAM,SAAS;;;;;;;;;;;;aAEpB,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;aAE5B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;AAE5D,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC;AAE5E,eAAO,MAAM,eAAe,8CAA+C,CAAC;AAE5E,eAAO,MAAM,aAAa;;;;;aAKxB,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEjE,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAE3D,eAAO,MAAM,SAAS;;;;;;;aAEpB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC"}
+{"version":3,"file":"specs.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/db/specs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAEnD,eAAO,MAAM,UAAU;;;;;;aAMrB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;AAM9D,eAAO,MAAM,aAAa;;;;;;;;;;aAIxB,CAAC;AAEH,eAAO,MAAM,SAAS;;;;;;;;;;;;aAEpB,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;aAI7B,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC;AAEpE,MAAM,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;AAE5D,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC,CAAC;AAE9E,eAAO,MAAM,eAAe,8CAA+C,CAAC;AAE5E,eAAO,MAAM,aAAa;;;;;aAKxB,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAEjE,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAE3D,eAAO,MAAM,SAAS;;;;;;;aAEpB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC"}

package/out/zero-cache/src/db/specs.js

@@ -6,6 +6,9 @@ export const columnSpec = v.object({
     notNull: v.boolean().nullable().optional(),
     dflt: v.string().nullable().optional(),
 });
+const publishedColumnSpec = columnSpec.extend({
+    typeOID: v.number(),
+});
 export const liteTableSpec = v.object({
     name: v.string(),
     columns: v.record(columnSpec),
@@ -14,7 +17,9 @@ export const liteTableSpec = v.object({
 export const tableSpec = liteTableSpec.extend({
     schema: v.string(),
 });
-export const filteredTableSpec = tableSpec.extend({
+export const publishedTableSpec = tableSpec.extend({
+    oid: v.number(),
+    columns: v.record(publishedColumnSpec),
     publications: v.record(v.object({ rowFilter: v.string().nullable() })),
 });
 export const directionSchema = v.union(v.literal('ASC'), v.literal('DESC'));

package/out/zero-cache/src/db/specs.js.map

@@ -1 +1 @@
-{"version":3,"file":"specs.js","sourceRoot":"","sources":["../../../../../zero-cache/src/db/specs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACxD,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;IAC7B,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC;IAChD,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAC,CAAC,CAAC;CACrE,CAAC,CAAC;AAQH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;CACnC,CAAC,CAAC;AAMH,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;CACnB,CAAC,CAAC"}
+{"version":3,"file":"specs.js","sourceRoot":"","sources":["../../../../../zero-cache/src/db/specs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IACxD,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAIH,MAAM,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;IAC7B,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC,MAAM,CAAC;IACjD,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC;IACtC,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAC,CAAC,CAAC;CACrE,CAAC,CAAC;AAQH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAE5E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;IACnB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;CACnC,CAAC,CAAC;AAMH,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;CACnB,CAAC,CAAC"}

package/out/zero-cache/src/db/transaction-pool.d.ts

@@ -85,9 +85,14 @@ export declare class TransactionPool {
     done(): Promise<void>;
     process(task: Task): void;
     processReadTask<T>(readTask: ReadTask<T>): Promise<T>;
+    /**
+     * Ends all workers with a ROLLBACK. Throws if the pool is already done
+     * or aborted.
+     */
+    abort(): void;
     /**
      * Signals to all workers to end their transaction once all pending tasks have
-     * been completed.
+     * been completed. Throws if the pool is already done or aborted.
      */
     setDone(): void;
     /**
@@ -173,7 +178,7 @@ export declare function importSnapshot(snapshotID: string): {
  * will result in lowering the log level from `error` to `debug`.
  */
 export declare class ControlFlowError extends Error {
-    constructor(err: unknown);
+    constructor(cause?: unknown);
 }
 type TimeoutTask = {
     timeoutMs: number;
@@ -183,5 +188,6 @@ type TimeoutTasks = {
     forInitialWorkers: TimeoutTask;
     forExtraWorkers: TimeoutTask;
 };
+export declare const TIMEOUT_TASKS: TimeoutTasks;
 export {};
 //# sourceMappingURL=transaction-pool.d.ts.map

package/out/zero-cache/src/db/transaction-pool.d.ts.map

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

package/out/zero-cache/src/db/transaction-pool.js

@@ -186,12 +186,25 @@ export class TransactionPool {
                 return Promise.all(pending);
             }
             catch (e) {
-                lc.error?.('error from worker', e);
-                this.fail(e); // A failure in any worker should fail the pool.
+                if (e !== this.#failure) {
+                    lc.error?.('error from worker', e);
+                    this.fail(e); // A failure in any worker should fail the pool.
+                }
                 throw e;
             }
         };
-        this.#workers.push(db.begin(this.#mode, worker).finally(() => this.#numWorkers--));
+        this.#workers.push(db
+            .begin(this.#mode, worker)
+            .catch(e => {
+            if (e instanceof RollbackSignal) {
+                // A RollbackSignal is used to gracefully rollback the postgres.js
+                // transaction block. It should not be thrown up to the application.
+            }
+            else {
+                throw e;
+            }
+        })
+            .finally(() => this.#numWorkers--));
         // After adding the worker, enqueue a terminal signal if we are in either of the
         // terminal states (both of which prevent more tasks from being enqueued), to ensure
         // that the added worker eventually exits.
@@ -230,14 +243,21 @@ export class TransactionPool {
         });
         return r.promise;
     }
+    /**
+     * Ends all workers with a ROLLBACK. Throws if the pool is already done
+     * or aborted.
+     */
+    abort() {
+        this.fail(new RollbackSignal());
+    }
     /**
      * Signals to all workers to end their transaction once all pending tasks have
-     * been completed.
+     * been completed. Throws if the pool is already done or aborted.
      */
     setDone() {
         assert(!this.#done, 'already set done');
         this.#done = true;
-        for (let i = 0; i < this.#workers.length; i++) {
+        for (let i = 0; i < this.#numWorkers; i++) {
             void this.#tasks.enqueue('done');
         }
     }
@@ -288,7 +308,7 @@ export class TransactionPool {
             else {
                 this.#lc.error?.(this.#failure);
             }
-            for (let i = 0; i < this.#workers.length; i++) {
+            for (let i = 0; i < this.#numWorkers; i++) {
                 // Enqueue the Error to terminate any workers waiting for tasks.
                 void this.#tasks.enqueue(this.#failure);
             }
@@ -396,11 +416,25 @@ export function importSnapshot(snapshotID) {
  * will result in lowering the log level from `error` to `debug`.
  */
 export class ControlFlowError extends Error {
-    constructor(err) {
+    constructor(cause) {
         super();
-        this.cause = err;
+        this.cause = cause;
     }
 }
+/**
+ * Internal error used to rollback the worker transaction. This is used
+ * instead of executing a `ROLLBACK` statement because the postgres.js
+ * library will otherwise try to execute an extraneous `COMMIT`, which
+ * results in outputting a "no transaction in progress" warning to the
+ * database logs.
+ *
+ * Throwing an exception, on the other hand, executes the postgres.js
+ * codepath that calls `ROLLBACK` instead.
+ */
+class RollbackSignal extends ControlFlowError {
+    name = 'RollbackSignal';
+    message = 'rolling back transaction';
+}
 function ensureError(err) {
     if (err instanceof Error) {
         return err;
@@ -432,7 +466,7 @@ const IDLE_TIMEOUT_MS = 5_000;
 const KEEPALIVE_TIMEOUT_MS = 60_000;
 const KEEPALIVE_TASK = tx => [tx `SELECT 1`.simple()];
 // Production timeout tasks. Overridden in tests.
-const TIMEOUT_TASKS = {
+export const TIMEOUT_TASKS = {
     forInitialWorkers: {
         timeoutMs: KEEPALIVE_TIMEOUT_MS,
         task: KEEPALIVE_TASK,

package/out/zero-cache/src/db/transaction-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-pool.js","sourceRoot":"","sources":["../../../../../zero-cache/src/db/transaction-pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction-pool.js","sourceRoot":"","sources":["../../../../../zero-cache/src/db/transaction-pool.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAMA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAM/B,wBAA8B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqCrE"}
+{"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAI/B,wBAA8B,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiErE"}

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

@@ -1,25 +1,50 @@
+import { assert } from '../../../shared/src/asserts.js';
 import { must } from '../../../shared/src/must.js';
 import { getZeroConfig } from '../config/zero-config.js';
+import { deleteLiteDB } from '../db/delete-lite-db.js';
 import { ChangeStreamerHttpServer } from '../services/change-streamer/change-streamer-http.js';
 import { initializeStreamer } from '../services/change-streamer/change-streamer-service.js';
 import { initializeChangeSource } from '../services/change-streamer/pg/change-source.js';
+import { AutoResetSignal } from '../services/change-streamer/schema/tables.js';
 import { pgClient } from '../types/pg.js';
 import { parentWorker, singleProcessMode, } from '../types/processes.js';
 import { exitAfter, runUntilKilled } from './life-cycle.js';
 import { createLogContext } from './logging.js';
-const MAX_CHANGE_DB_CONNECTIONS = 5;
 export default async function runWorker(parent) {
-    const config = await getZeroConfig();
+    const config = getZeroConfig();
+    const port = config.changeStreamerPort ?? config.port + 1;
     const lc = createLogContext(config.log, { worker: 'change-streamer' });
     // Kick off DB connection warmup in the background.
-    const changeDB = pgClient(lc, config.changeDBConnStr, {
-        max: MAX_CHANGE_DB_CONNECTIONS,
+    const changeDB = pgClient(lc, config.change.db, {
+        max: config.change.maxConns,
+        connection: { ['application_name']: 'zero-change-streamer' },
     });
-    void Promise.allSettled(Array.from({ length: MAX_CHANGE_DB_CONNECTIONS }, () => changeDB `SELECT 1`.simple().execute()));
-    // Note: This performs initial sync of the replica if necessary.
-    const { changeSource, replicationConfig } = await initializeChangeSource(lc, config.upstreamDBConnStr, config.shard, config.replicaDBFile);
-    const changeStreamer = await initializeStreamer(lc, changeDB, changeSource, replicationConfig);
-    const changeStreamerWebServer = new ChangeStreamerHttpServer(lc, changeStreamer);
+    void Promise.allSettled(Array.from({ length: config.change.maxConns }, () => changeDB `SELECT 1`.simple().execute()));
+    let { autoReset } = config;
+    if (autoReset && config.litestream) {
+        lc.warn?.('--auto-reset is incompatible with --litestream. Disabling --auto-reset.');
+        autoReset = false;
+    }
+    let changeStreamer;
+    for (const first of [true, false]) {
+        // Note: This performs initial sync of the replica if necessary.
+        const { changeSource, replicationConfig } = await initializeChangeSource(lc, config.upstream.db, config.shard, config.replicaFile);
+        try {
+            changeStreamer = await initializeStreamer(lc, changeDB, changeSource, replicationConfig, autoReset ?? false);
+            break;
+        }
+        catch (e) {
+            if (first && e instanceof AutoResetSignal) {
+                lc.warn?.(`auto-reset: resetting replica ${config.replicaFile}`);
+                deleteLiteDB(config.replicaFile);
+                continue; // execute again with a fresh initial-sync
+            }
+            throw e;
+        }
+    }
+    // impossible: upstream must have advanced in order for replication to be stuck.
+    assert(changeStreamer, `resetting replica did not advance replicaVersion`);
+    const changeStreamerWebServer = new ChangeStreamerHttpServer(lc, changeStreamer, { port });
     parent.send(['ready', { ready: true }]);
     return runUntilKilled(lc, parent, changeStreamer, changeStreamerWebServer);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"change-streamer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAC,wBAAwB,EAAC,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAC,kBAAkB,EAAC,MAAM,wDAAwD,CAAC;AAC1F,OAAO,EAAC,sBAAsB,EAAC,MAAM,iDAAiD,CAAC;AACvF,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EACL,YAAY,EACZ,iBAAiB,GAElB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAEpC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,SAAS,CAAC,MAAc;IACpD,MAAM,MAAM,GAAG,MAAM,aAAa,EAAE,CAAC;IACrC,MAAM,EAAE,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,iBAAiB,EAAC,CAAC,CAAC;IAErE,mDAAmD;IACnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC,eAAe,EAAE;QACpD,GAAG,EAAE,yBAAyB;KAC/B,CAAC,CAAC;IACH,KAAK,OAAO,CAAC,UAAU,CACrB,KAAK,CAAC,IAAI,CAAC,EAAC,MAAM,EAAE,yBAAyB,EAAC,EAAE,GAAG,EAAE,CACnD,QAAQ,CAAA,UAAU,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CACtC,CACF,CAAC;IAEF,gEAAgE;IAChE,MAAM,EAAC,YAAY,EAAE,iBAAiB,EAAC,GAAG,MAAM,sBAAsB,CACpE,EAAE,EACF,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,aAAa,CACrB,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAC7C,EAAE,EACF,QAAQ,EACR,YAAY,EACZ,iBAAiB,CAClB,CAAC;IAEF,MAAM,uBAAuB,GAAG,IAAI,wBAAwB,CAC1D,EAAE,EACF,cAAc,CACf,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;IAEtC,OAAO,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,uBAAuB,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS;AACT,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;IACzB,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"change-streamer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/server/life-cycle.d.ts

@@ -49,7 +49,7 @@ export declare function exitAfter(run: () => Promise<void>): Promise<void>;
  */
 export declare class HeartbeatMonitor extends HttpService {
     #private;
-    constructor(lc: LogContext, opts?: Options, stopInterval?: number);
+    constructor(lc: LogContext, opts: Options, stopInterval?: number);
     stop(): Promise<void>;
 }
 //# sourceMappingURL=life-cycle.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,YAAY,CAAC;AAEtD,eAAO,MAAM,iBAAiB,gCAAiC,CAAC;AAChE,eAAO,MAAM,iBAAiB,sBAAuB,CAAC;AAEtD;;GAEG;AACH,qBAAa,UAAU;;gBASnB,EAAE,EAAE,UAAU,EAEd,IAAI,GAAE,YAAsB,EAC5B,IAAI,UAAU,MAAM,UAAuB;IA4C7C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM;IAgBnD,eAAe,CAAC,GAAG,EAAE,OAAO;CAoE7B;AAED;;;;;;GAMG;AAEH,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,EAC/B,GAAG,QAAQ,EAAE,gBAAgB,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,iBASvD;AAKD;;;;;;;;;;GAUG;AACH,qBAAa,gBAAiB,SAAQ,WAAW;;gBAO7C,EAAE,EAAE,UAAU,EACd,IAAI,GAAE,OAAgD,EACtD,YAAY,SAA2B;IAmCnC,IAAI;CAIX"}
+{"version":3,"file":"life-cycle.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAC,WAAW,EAAE,KAAK,OAAO,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,UAAU,GAAG,aAAa,GAAG,YAAY,CAAC;AAEtD,eAAO,MAAM,iBAAiB,gCAAiC,CAAC;AAChE,eAAO,MAAM,iBAAiB,sBAAuB,CAAC;AAEtD;;GAEG;AACH,qBAAa,UAAU;;gBASnB,EAAE,EAAE,UAAU,EAEd,IAAI,GAAE,YAAsB,EAC5B,IAAI,UAAU,MAAM,UAAuB;IA4C7C,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM;IAgBnD,eAAe,CAAC,GAAG,EAAE,OAAO;CAoE7B;AAED;;;;;;GAMG;AAEH,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,EAC/B,GAAG,QAAQ,EAAE,gBAAgB,EAAE,GAC9B,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,iBASvD;AAID;;;;;;;;;;GAUG;AACH,qBAAa,gBAAiB,SAAQ,WAAW;;gBAO7C,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,OAAO,EACb,YAAY,SAA2B;IAmCnC,IAAI;CAIX"}

package/out/zero-cache/src/server/life-cycle.js

@@ -51,7 +51,7 @@ export class Terminator {
             this.#userFacing.add(worker);
         }
         this.#all.add(worker);
-        worker.on('error', err => this.#lc.warn?.(`error from worker ${worker.pid}`, err));
+        worker.on('error', err => this.#lc.error?.(`error from worker ${worker.pid}`, err));
         worker.on('close', (code, signal) => this.#onExit(code, signal, null, type, worker));
         return worker;
     }
@@ -149,7 +149,6 @@ export async function exitAfter(run) {
     }
 }
 const DEFAULT_STOP_INTERVAL_MS = 15_000;
-const DEFAULT_HEARTBEAT_MONITOR_PORT = 4850;
 /**
  * The HeartbeatMonitor listens on a dedicated port to monitor the cadence
  * of "heartbeat" requests (e.g. health checks) that signal that the server
@@ -165,7 +164,7 @@ export class HeartbeatMonitor extends HttpService {
     #stopInterval;
     #timer;
     #lastHeartbeat = 0;
-    constructor(lc, opts = { port: DEFAULT_HEARTBEAT_MONITOR_PORT }, stopInterval = DEFAULT_STOP_INTERVAL_MS) {
+    constructor(lc, opts, stopInterval = DEFAULT_STOP_INTERVAL_MS) {
         super('heartbeat-monitor', lc, opts, fastify => {
             fastify.get('/', (_req, res) => {
                 this.#onHeartbeat();

package/out/zero-cache/src/server/life-cycle.js.map

@@ -1 +1 @@
-{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"life-cycle.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/life-cycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAE5B,OAAO,EAAC,WAAW,EAAe,MAAM,6BAA6B,CAAC;AAkBtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAU,CAAC;AAChE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,SAAS,CAAU,CAAC;AAEtD;;GAEG;AACH,MAAM,OAAO,UAAU;IACZ,GAAG,CAAa;IAChB,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IACzB,SAAS,CAA0B;IAE5C,WAAW,GAAG,CAAC,CAAC;IAEhB,YACE,EAAc;IACd,gBAAgB;IAChB,OAAqB,OAAO,EAC5B,OAAO,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QAE3C,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QAErD,+DAA+D;QAC/D,8DAA8D;QAC9D,oDAAoD;QACpD,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,uEAAuE;QACvE,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CACrB,IAAI,CAAC,KAAK,CACR,IAAI,CAAC,IAAI,EACT,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CACzD,CACF,CAAC;QAEF,sEAAsE;QACtE,mEAAmE;QACnE,gEAAgE;QAChE,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE,CAAC;YACvC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,WAAW,CAAC,SAA+B,SAAS;QAClD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,qBAAqB,MAAM,GAAG,CAAC,CAAC;QAChD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,IAAgB;QACxC,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;YAC3B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEtB,MAAM,CAAC,EAAE,CACP,OAAO,EACP,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,qBAAqB,MAAM,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAChE,CAAC;QACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAClC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAC/C,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,GAAY;QAC1B,0DAA0D;QAC1D,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,CACL,IAAY,EACZ,GAA0B,EAC1B,GAAmB,EACnB,IAAgB,EAChB,MAA0B;QAE1B,8EAA8E;QAC9E,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;QAEvC,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YAC1B,sDAAsD;YACtD,qDAAqD;YACrD,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YACzE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CACb,GAAG,IAAI,WAAW,GAAG,sBAAsB,IAAI,GAAG,EAClD,GAAG,IAAI,EAAE,CACV,CAAC;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QACtD,IAAI,GAAG,EAAE,CAAC;YACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,WAAW,GAAG,iBAAiB,GAAG,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC;aAAM,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CACb,GAAG,IAAI,WAAW,GAAG,sBAAsB,IAAI,GAAG,EAClD,GAAG,IAAI,EAAE,CACV,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,WAAW,GAAG,sBAAsB,IAAI,GAAG,CAAC,CAAC;QACtE,CAAC;QAED,wEAAwE;QACxE,yEAAyE;QACzE,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QAED,wCAAwC;QACxC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAChC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CACb,oCAAoC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,MAAM,CACxE,CAAC;YACF,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,OAAyB,EAAE,MAAsB;QACrD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED;;;;;;GAMG;AAEH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,EAAc,EACd,MAA+B,EAC/B,GAAG,QAA4B;IAE/B,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,iBAAiB,EAAE,GAAG,iBAAiB,CAAC,EAAE,CAAC;QAClE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE;YACvB,MAAM,gBAAgB,GAAG,iBAA8C,CAAC;YAExE,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;gBAC3B,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;oBACnD,EAAE,CAAC,IAAI,EAAE,CAAC,YAAY,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,KAAK,MAAM,GAAG,CAAC,CAAC;oBACpE,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;gBACpB,CAAC;gBACD,EAAE,CAAC,IAAI,EAAE,CAAC,YAAY,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE,KAAK,MAAM,GAAG,CAAC,CAAC;gBACpE,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,uDAAuD;QACvD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAC5B,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAC/C,CAAC;QACF,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,EAAE,CAAC,KAAK,EAAE,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAwB;IACtD,IAAI,CAAC;QACH,MAAM,GAAG,EAAE,CAAC;QACZ,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,qBAAqB,EAAE,CAAC,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAExC;;;;;;;;;;GAUG;AACH,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IACtC,aAAa,CAAS;IAE/B,MAAM,CAA6B;IACnC,cAAc,GAAG,CAAC,CAAC;IAEnB,YACE,EAAc,EACd,IAAa,EACb,YAAY,GAAG,wBAAwB;QAEvC,KAAK,CAAC,mBAAmB,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE;YAC7C,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACpC,CAAC;IAED,YAAY;QACV,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CACb,iCACE,IAAI,CAAC,aAAa,GAAG,IACvB,kBAAkB,CACnB,CAAC;YACF,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,eAAe,GAAG,GAAG,EAAE;QACrB,MAAM,sBAAsB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC;QAChE,IAAI,sBAAsB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACjD,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CACb,2BACE,sBAAsB,GAAG,IAC3B,yBAAyB,CAC1B,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC;IACH,CAAC,CAAC;IAEF,KAAK,CAAC,IAAI;QACR,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;CACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAMX,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAqBxD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GACxB,UAAU,CAGZ"}
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,0BAA0B,CAAC;AAOxD,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,GACxB,UAAU,CAGZ"}

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

@@ -1,22 +1,9 @@
-import { LogContext, TeeLogSink, consoleLogSink, } from '@rocicorp/logger';
+import { LogContext, consoleLogSink, } from '@rocicorp/logger';
 import { pid } from 'node:process';
-import { DatadogLogSink } from '../../../datadog/src/mod.js';
 import {} from '../config/zero-config.js';
 import { stringify } from '../types/bigint-json.js';
-const DATADOG_SOURCE = 'zeroWorker';
 function createLogSink(config) {
-    const logSink = config.format === 'json' ? consoleJsonLogSink : consoleLogSink;
-    if (config.datadogLogsApiKey === undefined) {
-        return logSink;
-    }
-    return new TeeLogSink([
-        new DatadogLogSink({
-            apiKey: config.datadogLogsApiKey,
-            service: config.datadogServiceLabel ?? '',
-            source: DATADOG_SOURCE,
-        }),
-        logSink,
-    ]);
+    return config.format === 'json' ? consoleJsonLogSink : consoleLogSink;
 }
 export function createLogContext(config, context) {
     const ctx = { ...context, pid };

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

@@ -1 +1 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,UAAU,EACV,cAAc,GAIf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAgB,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAElD,MAAM,cAAc,GAAG,YAAY,CAAC;AAEpC,SAAS,aAAa,CAAC,MAAiB;IACtC,MAAM,OAAO,GACX,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC;IACjE,IAAI,MAAM,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,UAAU,CAAC;QACpB,IAAI,cAAc,CAAC;YACjB,MAAM,EAAE,MAAM,CAAC,iBAAiB;YAChC,OAAO,EAAE,MAAM,CAAC,mBAAmB,IAAI,EAAE;YACzC,MAAM,EAAE,cAAc;SACvB,CAAC;QACF,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAiB,EACjB,OAAyB;IAEzB,MAAM,GAAG,GAAG,EAAC,GAAG,OAAO,EAAE,GAAG,EAAC,CAAC;IAC9B,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,kBAAkB,GAAY;IAClC,GAAG,CAAC,KAAe,EAAE,OAA4B,EAAE,GAAG,IAAe;QACnE,mFAAmF;QACnF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM;YACzB,CAAC,CAAC;gBACE,OAAO,EAAE,IAAI;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;qBACpD,IAAI,CAAC,GAAG,CAAC;aACb;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO,CAAC,KAAK,CAAC,CACZ,SAAS,CAAC;YACR,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;YAC1B,GAAG,OAAO;YACV,GAAG,OAAO;YACV,GAAG,OAAO;SACX,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,aAAa,CAAC,CAAU;IAC/B,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO;YACL,GAAG,CAAC,EAAE,wDAAwD;YAC9D,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,QAAQ,EAAE,CAAC,CAAC,OAAO;YACnB,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SAC3D,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,cAAc,GAIf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AACjC,OAAO,EAAgB,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAElD,SAAS,aAAa,CAAC,MAAiB;IACtC,OAAO,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAiB,EACjB,OAAyB;IAEzB,MAAM,GAAG,GAAG,EAAC,GAAG,OAAO,EAAE,GAAG,EAAC,CAAC;IAC9B,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,kBAAkB,GAAY;IAClC,GAAG,CAAC,KAAe,EAAE,OAA4B,EAAE,GAAG,IAAe;QACnE,mFAAmF;QACnF,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM;YACzB,CAAC,CAAC;gBACE,OAAO,EAAE,IAAI;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;qBACpD,IAAI,CAAC,GAAG,CAAC;aACb;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO,CAAC,KAAK,CAAC,CACZ,SAAS,CAAC;YACR,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;YAC1B,GAAG,OAAO;YACV,GAAG,OAAO;YACV,GAAG,OAAO;SACX,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,SAAS,aAAa,CAAC,CAAU;IAC/B,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO;YACL,GAAG,CAAC,EAAE,wDAAwD;YAC9D,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,QAAQ,EAAE,CAAC,CAAC,OAAO;YACnB,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,EAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SAC3D,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

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

@@ -12,17 +12,35 @@ import { createNotifierFrom, handleSubscriptionsFrom, subscribeTo, } from '../wo
 import { HeartbeatMonitor, runUntilKilled, Terminator, } from './life-cycle.js';
 import { createLogContext } from './logging.js';
 const startMs = Date.now();
-const config = await getZeroConfig();
+const config = getZeroConfig();
 const lc = createLogContext(config.log, { worker: 'dispatcher' });
 const terminator = new Terminator(lc);
 const ready = [];
+const numSyncers = config.numSyncWorkers !== undefined
+    ? config.numSyncWorkers
+    : // Reserve 1 core for the replicator. The change-streamer is not CPU heavy.
+        Math.max(1, availableParallelism() - 1);
+if (config.upstream.maxConns < numSyncers) {
+    throw new Error(`insufficient upstream connections (${config.upstream.maxConns}) for ${numSyncers} syncers`);
+}
+if (config.cvr.maxConns < numSyncers) {
+    throw new Error(`insufficient cvr connections (${config.cvr.maxConns}) for ${numSyncers} syncers`);
+}
+const internalFlags = numSyncers === 0
+    ? []
+    : [
+        '--upstream-max-conns-per-worker',
+        String(Math.floor(config.upstream.maxConns / numSyncers)),
+        '--cvr-max-conns-per-worker',
+        String(Math.floor(config.cvr.maxConns / numSyncers)),
+    ];
 function loadWorker(modulePath, type, id, ...args) {
     // modulePath is relative to this file
     const ext = path.extname(import.meta.url);
     // modulePath is .ts. If we have been compiled, it should be changed to .js
     modulePath = modulePath.replace(/\.ts$/, ext);
     const absModulePath = new URL(modulePath, import.meta.url).pathname;
-    const worker = childWorker(absModulePath, ...args);
+    const worker = childWorker(absModulePath, ...args, ...internalFlags);
     const name = path.basename(absModulePath, ext) + (id ? ` (${id})` : '');
     const { promise, resolve } = resolver();
     ready.push(promise);
@@ -32,18 +50,14 @@ function loadWorker(modulePath, type, id, ...args) {
     });
 }
 const { promise: changeStreamerReady, resolve } = resolver();
-const changeStreamer = config.changeStreamerConnStr
+const changeStreamer = config.changeStreamerURI
     ? resolve()
     : loadWorker('./change-streamer.ts', 'supporting').once('message', resolve);
-const numSyncers = config.numSyncWorkers !== undefined
-    ? config.numSyncWorkers
-    : // Reserve 1 core for the replicator. The change-streamer is not CPU heavy.
-        Math.max(1, availableParallelism() - 1);
 if (numSyncers) {
     // Technically, setting up the CVR DB schema is the responsibility of the Syncer,
     // but it is done here in the main thread because it is wasteful to have all of
     // the Syncers attempt the migration in parallel.
-    const cvrDB = pgClient(lc, config.cvrDBConnStr);
+    const cvrDB = pgClient(lc, config.cvr.db);
     await initViewSyncerSchema(lc, cvrDB);
     void cvrDB.end();
 }
@@ -75,10 +89,14 @@ if ((await orTimeout(Promise.all(ready), 30_000)) === 'timed-out') {
 else {
     lc.info?.(`all workers ready (${Date.now() - startMs} ms)`);
 }
-const mainServices = [new HeartbeatMonitor(lc)];
+const { port } = config;
+const heartbeatMonitorPort = config.heartbeatMonitorPort ?? port + 2;
+const mainServices = [
+    new HeartbeatMonitor(lc, { port: heartbeatMonitorPort }),
+];
 if (numSyncers) {
     const workers = { syncers };
-    mainServices.push(new Dispatcher(lc, () => workers));
+    mainServices.push(new Dispatcher(lc, () => workers, { port }));
 }
 try {
     await runUntilKilled(lc, process, ...mainServices);