@voltro/sql-postgres 0.54.0 → 0.56.0

package/dist/index.js

@@ -1,16 +1,16 @@
 import { PgClient as e, PgClient as t } from "@effect/sql-pg";
 import { Config as n, Duration as r, Effect as i, Fiber as a, Layer as o, ManagedRuntime as s, Metric as c, Option as l, Redacted as u, Schedule as d, Stream as f } from "effect";
 import p from "pg";
-import { DEFAULT_ACQUIRE_TIMEOUT_MS as m, EagerCardinalityError as h, attachEagerLoads as g, attributionFields as ee, attributionKey as te, beginLocalWrite as ne, bulkInsertLimitsFor as re, chunkRowsForInsert as ie, compileEagerJson as ae, compilePredicate as _, compileRawFragment as oe, compileSelect as se, encodeRowForSchema as v, endLocalWrite as ce, externalChangeEvent as le, hasEagerLoads as ue, isTableReactive as y, makeEagerFallbackReporter as de, observeDbOp as b, raiseChangeListenerCeiling as fe, recordsTable as x, registerPendingAttribution as S, requireTable as C, resolveEchoAttribution as w, runRetryingTransaction as pe, runStoreTransaction as T, runWriteRecorders as me, stampGeneratedId as E, stampGeneratedIds as he, withCapturedAttribution as D } from "@voltro/database";
-import { EventEmitter as ge } from "node:events";
-import { createLogger as _e } from "@voltro/logger";
-import { SqlClient as O, TransactionConnection as k } from "@effect/sql/SqlClient";
+import { DEFAULT_ACQUIRE_TIMEOUT_MS as m, EagerCardinalityError as h, attachEagerLoads as g, attributionFields as ee, attributionKey as te, beginLocalWrite as ne, bulkInsertLimitsFor as re, chunkRowsForInsert as ie, compileEagerJson as ae, compilePredicate as _, compileRawFragment as oe, compileSelect as se, encodeRowForSchema as v, endLocalWrite as ce, externalChangeEvent as le, hasEagerLoads as ue, isTableReactive as y, makeEagerFallbackReporter as de, observeDbOp as b, raiseChangeListenerCeiling as fe, recordsTable as x, registerPendingAttribution as pe, requireTable as me, resolveEchoAttribution as he, runRetryingTransaction as ge, runStoreTransaction as S, runWriteRecorders as _e, stampGeneratedId as C, stampGeneratedIds as ve, withCapturedAttribution as w } from "@voltro/database";
+import { EventEmitter as ye } from "node:events";
+import { createLogger as be } from "@voltro/logger";
+import { SqlClient as T, TransactionConnection as E } from "@effect/sql/SqlClient";
 //#region src/sqlLayer.ts
-var A = (e) => {
+var D = (e) => {
 	let t = e.acquireTimeoutMs ?? m;
 	return t > 0 ? t : void 0;
-}, j = (e) => e ? { rejectUnauthorized: !1 } : !1, M = /^[A-Za-z_][A-Za-z0-9_]*$/, N = (e) => {
-	let t = A(e);
+}, O = (e) => e ? { rejectUnauthorized: !1 } : !1, k = /^[A-Za-z_][A-Za-z0-9_]*$/, xe = (e) => {
+	let t = D(e);
 	return {
 		host: n.succeed(e.host),
 		port: n.succeed(e.port),
@@ -18,30 +18,30 @@ var A = (e) => {
 		password: n.succeed(u.make(e.password)),
 		database: n.succeed(e.database),
 		...e.maxConnections === void 0 ? {} : { maxConnections: n.succeed(e.maxConnections) },
-		...e.ssl === void 0 ? {} : { ssl: n.succeed(j(e.ssl)) },
+		...e.ssl === void 0 ? {} : { ssl: n.succeed(O(e.ssl)) },
 		...t === void 0 ? {} : { connectTimeout: n.succeed(r.millis(t)) }
 	};
-}, P = (t) => {
-	if (t.schema === void 0 && t.statementTimeoutMs === void 0) return e.layerConfig(N(t));
+}, A = (t) => {
+	if (t.schema === void 0 && t.statementTimeoutMs === void 0) return e.layerConfig(xe(t));
 	let n = {};
 	if (t.schema !== void 0) {
-		if (!M.test(t.schema)) throw Error(`DB_SCHEMA '${t.schema}' is not a valid postgres identifier (expected ${M}).`);
+		if (!k.test(t.schema)) throw Error(`DB_SCHEMA '${t.schema}' is not a valid postgres identifier (expected ${k}).`);
 		n = { options: `-c search_path="${t.schema}"` };
 	}
-	let r = A(t), a = i.acquireRelease(i.sync(() => new p.Pool({
+	let r = D(t), a = i.acquireRelease(i.sync(() => new p.Pool({
 		host: t.host,
 		port: t.port,
 		user: t.username,
 		password: t.password,
 		database: t.database,
 		...t.maxConnections === void 0 ? {} : { max: t.maxConnections },
-		...t.ssl === void 0 ? {} : { ssl: j(t.ssl) },
+		...t.ssl === void 0 ? {} : { ssl: O(t.ssl) },
 		...t.statementTimeoutMs === void 0 ? {} : { statement_timeout: t.statementTimeoutMs },
 		...r === void 0 ? {} : { connectionTimeoutMillis: r },
 		...n
 	})), (e) => i.promise(() => e.end()));
 	return e.layerFromPool({ acquire: a });
-}, F = (e) => {
+}, Se = (e) => {
 	let t = e.get("sslmode");
 	if (t !== null) {
 		if (t === "require") return !0;
@@ -54,10 +54,10 @@ var A = (e) => {
 		if (n === "false" || n === "0") return !1;
 		throw Error(`DB_URL '?ssl=${n}' is not supported by the postgres dialect — use 'true'/'1' or 'false'/'0'.`);
 	}
-}, I = (e) => {
+}, j = (e) => {
 	let t = e.schema === void 0 ? {} : { schema: e.schema }, n = e.acquireTimeoutMs === void 0 ? {} : { acquireTimeoutMs: e.acquireTimeoutMs };
 	if (e.url) {
-		let r = new URL(e.url), i = e.ssl ?? F(r.searchParams);
+		let r = new URL(e.url), i = e.ssl ?? Se(r.searchParams);
 		return {
 			host: r.hostname || "localhost",
 			port: r.port ? Number(r.port) : 5432,
@@ -83,7 +83,21 @@ var A = (e) => {
 		...n,
 		...t
 	};
-}, L = (e) => P(I(e)), R = /* @__PURE__ */ new Set(["40001", "40P01"]), ve = (e) => {
+}, M = (e) => A(j(e)), N = {
+	idleMs: 2e4,
+	timeoutMs: 1e4
+}, P = (e, t, n = N) => e.probeSentAtMs === null ? t - e.lastHeardAtMs >= n.idleMs ? "probe" : "healthy" : e.lastHeardAtMs > e.probeSentAtMs ? "healthy" : t - e.probeSentAtMs >= n.timeoutMs ? "reconnect" : "healthy", F = "__voltro_cdc_heartbeat", I = (e) => JSON.stringify({ [F]: e }), Ce = (e) => typeof e == "object" && !!e && "__voltro_cdc_heartbeat" in e, L = (e) => Math.min(250 * 2 ** Math.min(e - 1, 6), 1e4), R = (e = process.env, t = {}) => {
+	let n = (t, n) => {
+		let r = e[t];
+		if (r === void 0) return n;
+		let i = Number(r);
+		return Number.isFinite(i) && i > 0 ? i : n;
+	};
+	return {
+		idleMs: t.idleMs ?? n("VOLTRO_CDC_HEARTBEAT_MS", N.idleMs),
+		timeoutMs: t.timeoutMs ?? n("VOLTRO_CDC_HEARTBEAT_TIMEOUT_MS", N.timeoutMs)
+	};
+}, we = /* @__PURE__ */ new Set(["40001", "40P01"]), Te = (e) => {
 	let t = e;
 	for (let e = 0; e < 5 && typeof t == "object" && t; e++) {
 		let e = t.code;
@@ -91,15 +105,15 @@ var A = (e) => {
 		t = t.cause;
 	}
 }, z = (e) => {
-	let t = ve(e);
-	return t !== void 0 && R.has(t);
-}, B = (e) => z(e) ? "retry" : "noRetry", V = c.counter("voltro_cdc_oversized_total", { description: "Change events whose row images exceeded the postgres NOTIFY payload cap, by what re-hydration recovered (rehydrated = row re-read · tombstone = delete, primary key only · unrecovered = content lost to taps)." }), ye = {
+	let t = Te(e);
+	return t !== void 0 && we.has(t);
+}, B = (e) => z(e) ? "retry" : "noRetry", V = c.counter("voltro_cdc_oversized_total", { description: "Change events whose row images exceeded the postgres NOTIFY payload cap, by what re-hydration recovered (rehydrated = row re-read · tombstone = delete, primary key only · unrecovered = content lost to taps)." }), Ee = {
 	rehydrated: c.tagged(V, "outcome", "rehydrated"),
 	tombstone: c.tagged(V, "outcome", "tombstone"),
 	unrecovered: c.tagged(V, "outcome", "unrecovered")
 }, H = (e) => {
-	i.runSync(c.increment(ye[e]));
-}, be = {
+	i.runSync(c.increment(Ee[e]));
+}, De = {
 	rehydrateTimeoutMs: 5e3,
 	rehydrateRetries: 2
 }, U = (e) => {
@@ -108,12 +122,12 @@ var A = (e) => {
 	let n = Number(t);
 	return Number.isFinite(n) && n >= 0 ? n : void 0;
 }, W = (e) => {
-	let t = be, n = e ?? {};
+	let t = De, n = e ?? {};
 	return {
 		rehydrateTimeoutMs: Math.max(1, n.rehydrateTimeoutMs ?? U("VOLTRO_CDC_REHYDRATE_TIMEOUT_MS") ?? t.rehydrateTimeoutMs),
 		rehydrateRetries: Math.max(0, n.rehydrateRetries ?? U("VOLTRO_CDC_REHYDRATE_RETRIES") ?? t.rehydrateRetries)
 	};
-}, xe = (e) => i.suspend(() => {
+}, Oe = (e) => i.suspend(() => {
 	let t = e.notification, n = t.id, a = {
 		table: t.table,
 		op: t.op
@@ -155,7 +169,7 @@ var A = (e) => {
 		},
 		outcome: "rehydrated"
 	})), i.catchAllCause(() => (H("unrecovered"), i.succeed(o("read-failed")))));
-}), Se = (e) => {
+}), ke = (e) => {
 	let t = /* @__PURE__ */ new Set();
 	return (n, r) => {
 		if (r.outcome === "unrecovered") {
@@ -173,25 +187,33 @@ var A = (e) => {
 			note: r.outcome === "tombstone" ? "a delete of an oversized row delivers the primary key only — the pre-image is unrecoverable" : "the re-read returns the row as it is NOW, not the image at commit"
 		}));
 	};
-}, G = ["json"], K = _e({ scope: "voltro:postgres" }), q = async (e) => {
-	let t = e.tracerLayer ? o.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, n = s.make(t), r = await n.runPromise(O), i = e.changeStrategy ?? "inline", a = new Ce(r, n, i, e.cdcChannel ?? "framework_changes", W({
+}, G = ["json"], K = be({ scope: "voltro:postgres" }), q = async (e) => {
+	let t = e.tracerLayer ? o.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, n = s.make(t), r = await n.runPromise(T), i = e.changeStrategy ?? "inline", a = new Ae(r, n, i, e.cdcChannel ?? "framework_changes", W({
 		...e.cdcRehydrateTimeoutMs === void 0 ? {} : { rehydrateTimeoutMs: e.cdcRehydrateTimeoutMs },
 		...e.cdcRehydrateRetries === void 0 ? {} : { rehydrateRetries: e.cdcRehydrateRetries }
 	}));
 	return i === "cdc" && await a.startCdcConsumer(), a;
-}, Ce = class {
+}, Ae = class {
 	sql;
 	runtime;
 	changeStrategy;
 	cdcChannel;
 	cdcRehydrate;
-	emitter = new ge();
+	cdcLiveness;
+	emitter = new ye();
 	cdcFiber = null;
+	cdcWatchdog = null;
+	cdcLastHeardAt = 0;
+	cdcHeardCount = 0;
+	cdcProbeSentAt = null;
+	cdcReconnecting = !1;
+	cdcStopped = !1;
+	cdcGapListeners = /* @__PURE__ */ new Set();
 	inflightTxns = 0;
-	reportOversized = Se(K);
+	reportOversized = ke(K);
 	reportEagerFallback = de(K);
-	constructor(e, t, n, r, i = W()) {
-		this.sql = e, this.runtime = t, this.changeStrategy = n, this.cdcChannel = r, this.cdcRehydrate = i, fe(this.emitter);
+	constructor(e, t, n, r, i = W(), a = R()) {
+		this.sql = e, this.runtime = t, this.changeStrategy = n, this.cdcChannel = r, this.cdcRehydrate = i, this.cdcLiveness = a, fe(this.emitter);
 	}
 	txnSpec(e, t, n) {
 		return {
@@ -210,15 +232,15 @@ var A = (e) => {
 		};
 	}
 	withNamespace(e) {
-		return e === null ? this : new we(this, e);
+		return e === null ? this : new je(this, e);
 	}
 	async runInNamespace(e, t) {
 		let n = this.sql;
 		this.inflightTxns++;
 		try {
-			return await T({
+			return await S({
 				...this.txnSpec("PostgresDataStore.runInNamespace", "store.namespace", "namespace.transaction"),
-				prepare: (t) => i.provideService(n`SET LOCAL search_path TO ${n(e)}`, k, t),
+				prepare: (t) => i.provideService(n`SET LOCAL search_path TO ${n(e)}`, E, t),
 				work: t,
 				makeView: (e, t) => new J(this, e, t)
 			});
@@ -228,12 +250,12 @@ var A = (e) => {
 	}
 	__postgresReplicationFriend = { runEffect: (e) => this.runtime.runPromise(e) };
 	async executeQuery(e, t, n = null) {
-		let r = se(e, this.sql, n), a = t ? i.provideService(r, k, t) : r;
+		let r = se(e, this.sql, n), a = t ? i.provideService(r, E, t) : r;
 		return b("postgres", "select", () => this.runtime.runPromise(a));
 	}
 	async executeInsert(e, t, n, r, a) {
-		t = E(e, t);
-		let o = this.sql, s = o`INSERT INTO ${o(e)} ${o.insert(v(t, e, G))} RETURNING *`, c = n ? i.provideService(s, k, n) : s, l = (await this.runtime.runPromise(c))[0];
+		t = C(e, t);
+		let o = this.sql, s = o`INSERT INTO ${o(e)} ${o.insert(v(t, e, G))} RETURNING *`, c = n ? i.provideService(s, E, n) : s, l = (await this.runtime.runPromise(c))[0];
 		if (!l) throw Error(`PostgresDataStore.insert: no row returned for table '${e}'`);
 		return await this.routeEvent({
 			table: e,
@@ -243,7 +265,7 @@ var A = (e) => {
 		}, r, n, a), l;
 	}
 	async executeUpdate(e, t, n, r, a, o) {
-		let s = this.sql, c = s`UPDATE ${s(e)} SET ${s.update(v(n, e, G))} WHERE ${s("id")} = ${t} RETURNING *`, l = r ? i.provideService(c, k, r) : c, u = (await this.runtime.runPromise(l))[0];
+		let s = this.sql, c = s`UPDATE ${s(e)} SET ${s.update(v(n, e, G))} WHERE ${s("id")} = ${t} RETURNING *`, l = r ? i.provideService(c, E, r) : c, u = (await this.runtime.runPromise(l))[0];
 		return u ? (await this.routeEvent({
 			table: e,
 			op: "update",
@@ -252,17 +274,17 @@ var A = (e) => {
 		}, a, r, o), u) : null;
 	}
 	async executeUpsert(e, t, n, r, a, o) {
-		t = E(e, t);
+		t = C(e, t);
 		let s = this.sql;
 		if (typeof n.update == "function") {
 			let o = n.update, c = n.conflictColumns.map((e) => s`${s(e)} = ${t[e]}`), l = (n) => {
 				let r = s`SELECT * FROM ${s(e)} WHERE ${s.and(c)} LIMIT 1 FOR UPDATE`;
-				return this.runtime.runPromise(i.flatMap(i.provideService(r, k, n), (r) => i.promise(() => r[0] ? this.executeUpdate(e, r[0].id, o(r[0]), n, a).then((e) => e) : this.executeInsert(e, t, n, a))));
+				return this.runtime.runPromise(i.flatMap(i.provideService(r, E, n), (r) => i.promise(() => r[0] ? this.executeUpdate(e, r[0].id, o(r[0]), n, a).then((e) => e) : this.executeInsert(e, t, n, a))));
 			};
 			if (r) return l(r);
 			this.inflightTxns++;
 			try {
-				return await pe({
+				return await ge({
 					...this.txnSpec("PostgresDataStore.upsert", "store.upsert", "upsert.transaction"),
 					body: (e) => l(e)
 				});
@@ -270,7 +292,7 @@ var A = (e) => {
 				this.inflightTxns--;
 			}
 		}
-		let c = n.conflictColumns.map((e) => s`${s(e)}`), l = Object.keys(t).filter((e) => t[e] !== void 0), u = n.update === void 0 ? l.filter((e) => e !== "id" && !n.conflictColumns.includes(e)) : n.update, d = u.length > 0 ? s.csv(u.map((e) => s`${s(e)} = EXCLUDED.${s(e)}`)) : s`${s(n.conflictColumns[0])} = EXCLUDED.${s(n.conflictColumns[0])}`, f = s`INSERT INTO ${s(e)} ${s.insert(v(t, e, G))} ON CONFLICT (${s.csv(c)}) DO UPDATE SET ${d} RETURNING *`, p = r ? i.provideService(f, k, r) : f, m = (await this.runtime.runPromise(p))[0];
+		let c = n.conflictColumns.map((e) => s`${s(e)}`), l = Object.keys(t).filter((e) => t[e] !== void 0), u = n.update === void 0 ? l.filter((e) => e !== "id" && !n.conflictColumns.includes(e)) : n.update, d = u.length > 0 ? s.csv(u.map((e) => s`${s(e)} = EXCLUDED.${s(e)}`)) : s`${s(n.conflictColumns[0])} = EXCLUDED.${s(n.conflictColumns[0])}`, f = s`INSERT INTO ${s(e)} ${s.insert(v(t, e, G))} ON CONFLICT (${s.csv(c)}) DO UPDATE SET ${d} RETURNING *`, p = r ? i.provideService(f, E, r) : f, m = (await this.runtime.runPromise(p))[0];
 		if (!m) throw Error(`PostgresDataStore.upsert: no row returned for table '${e}'`);
 		{
 			let n = t.id !== void 0 && t.id === m.id ? "insert" : "update";
@@ -284,27 +306,27 @@ var A = (e) => {
 		return m;
 	}
 	async executeInsertIgnore(e, t, n, r, a, o) {
-		t = E(e, t);
-		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(e)}`), l = s`INSERT INTO ${s(e)} ${s.insert(v(t, e, G))} ON CONFLICT (${s.csv(c)}) DO NOTHING RETURNING *`, u = r ? i.provideService(l, k, r) : l, d = (await this.runtime.runPromise(u))[0];
+		t = C(e, t);
+		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(e)}`), l = s`INSERT INTO ${s(e)} ${s.insert(v(t, e, G))} ON CONFLICT (${s.csv(c)}) DO NOTHING RETURNING *`, u = r ? i.provideService(l, E, r) : l, d = (await this.runtime.runPromise(u))[0];
 		if (d) return await this.routeEvent({
 			table: e,
 			op: "insert",
 			old: null,
 			new: d
 		}, a, r, o), d;
-		let f = n.conflictColumns.map((e) => s`${s(e)} = ${t[e]}`), p = s`SELECT * FROM ${s(e)} WHERE ${s.and(f)} LIMIT 1`, m = r ? i.provideService(p, k, r) : p, h = await this.runtime.runPromise(m);
+		let f = n.conflictColumns.map((e) => s`${s(e)} = ${t[e]}`), p = s`SELECT * FROM ${s(e)} WHERE ${s.and(f)} LIMIT 1`, m = r ? i.provideService(p, E, r) : p, h = await this.runtime.runPromise(m);
 		if (!h[0]) throw Error(`PostgresDataStore.insertIgnore: the insert was skipped as a conflict, but no existing row matches conflictColumns [${n.conflictColumns.join(", ")}] on '${e}'. A DIFFERENT unique constraint fired — a second unique index, or the primary key when you named something else. insertIgnore models ONE conflict target: name the columns of the constraint that actually collides, or handle the unique violation yourself.`);
 		return h[0];
 	}
 	async executeInsertMany(e, t, n, r, a) {
-		if (t = he(e, t), t.length === 0) return [];
+		if (t = ve(e, t), t.length === 0) return [];
 		let o = this.sql, s = t.map((t) => v(t, e, G)), c = ie(s, re("postgres")), l = (t) => o`INSERT INTO ${o(e)} ${o.insert(t)} RETURNING *`, u;
 		if (c.length === 1) {
-			let e = l(c[0]), t = n ? i.provideService(e, k, n) : e;
+			let e = l(c[0]), t = n ? i.provideService(e, E, n) : e;
 			u = await this.runtime.runPromise(t);
 		} else if (n) {
 			let e = [];
-			for (let t of c) e.push(...await this.runtime.runPromise(i.provideService(l(t), k, n)));
+			for (let t of c) e.push(...await this.runtime.runPromise(i.provideService(l(t), E, n)));
 			u = e;
 		} else u = await this.runtime.runPromise(o.withTransaction(i.map(i.forEach(c, l, { concurrency: 1 }), (e) => e.flat())));
 		for (let t of u) await this.routeEvent({
@@ -316,7 +338,7 @@ var A = (e) => {
 		return u;
 	}
 	async executePatchJson(e, t, n, r, a, o, s) {
-		let c = this.sql, l = n.split("."), u = l[0], d = l.slice(1), f = JSON.stringify(r ?? null), p = d.length === 0 ? c`${c(u)} = COALESCE(${c(u)}, '{}'::jsonb) || ${f}::jsonb` : c`${c(u)} = jsonb_set(COALESCE(${c(u)}, '{}'::jsonb), ${`{${d.join(",")}}`}, ${f}::jsonb, true)`, m = c`UPDATE ${c(e)} SET ${p} WHERE ${c("id")} = ${t} RETURNING *`, h = a ? i.provideService(m, k, a) : m, g = (await this.runtime.runPromise(h))[0];
+		let c = this.sql, l = n.split("."), u = l[0], d = l.slice(1), f = JSON.stringify(r ?? null), p = d.length === 0 ? c`${c(u)} = COALESCE(${c(u)}, '{}'::jsonb) || ${f}::jsonb` : c`${c(u)} = jsonb_set(COALESCE(${c(u)}, '{}'::jsonb), ${`{${d.join(",")}}`}, ${f}::jsonb, true)`, m = c`UPDATE ${c(e)} SET ${p} WHERE ${c("id")} = ${t} RETURNING *`, h = a ? i.provideService(m, E, a) : m, g = (await this.runtime.runPromise(h))[0];
 		return g ? (await this.routeEvent({
 			table: e,
 			op: "update",
@@ -325,7 +347,7 @@ var A = (e) => {
 		}, o, a, s), g) : null;
 	}
 	async executeDelete(e, t, n, r, a) {
-		let o = this.sql, s = o`DELETE FROM ${o(e)} WHERE ${o("id")} = ${t} RETURNING *`, c = n ? i.provideService(s, k, n) : s, l = (await this.runtime.runPromise(c))[0];
+		let o = this.sql, s = o`DELETE FROM ${o(e)} WHERE ${o("id")} = ${t} RETURNING *`, c = n ? i.provideService(s, E, n) : s, l = (await this.runtime.runPromise(c))[0];
 		return l ? (await this.routeEvent({
 			table: e,
 			op: "delete",
@@ -335,17 +357,17 @@ var A = (e) => {
 	}
 	async appendInTxn(e, t, n) {
 		let r = this.sql, a = r`INSERT INTO ${r(e)} ${r.insert(v(t, e, G))}`;
-		await this.runtime.runPromise(n ? i.provideService(a, k, n) : a);
+		await this.runtime.runPromise(n ? i.provideService(a, E, n) : a);
 	}
 	async maxInTxn(e, t, n, r) {
-		let a = this.sql, o = Object.entries(n).map(([e, t]) => a`${a(e)} = ${t}`), s = a`SELECT MAX(${a(t)}) AS ${a("m")} FROM ${a(e)} WHERE ${a.and(o)}`, c = (await this.runtime.runPromise(r ? i.provideService(s, k, r) : s))[0]?.m;
+		let a = this.sql, o = Object.entries(n).map(([e, t]) => a`${a(e)} = ${t}`), s = a`SELECT MAX(${a(t)}) AS ${a("m")} FROM ${a(e)} WHERE ${a.and(o)}`, c = (await this.runtime.runPromise(r ? i.provideService(s, E, r) : s))[0]?.m;
 		return c == null ? null : Number(c);
 	}
 	async routeEvent(e, t, n = null, r) {
 		if (e = {
 			...ee(r),
 			...e
-		}, x(e.table) && await me({
+		}, x(e.table) && await _e({
 			append: (e, t) => this.appendInTxn(e, t, n),
 			maxOf: (e, t, r) => this.maxInTxn(e, t, r, n)
 		}, {
@@ -358,7 +380,7 @@ var A = (e) => {
 		}), y(e.table)) {
 			if (this.changeStrategy === "cdc") {
 				let t = (e.op === "delete" ? e.old : e.new)?.id;
-				t != null && S(te(e.table, e.op, t), {
+				t != null && pe(te(e.table, e.op, t), {
 					...e.traceId === void 0 ? {} : { traceId: e.traceId },
 					...e.subjectId === void 0 ? {} : { subjectId: e.subjectId }
 				});
@@ -378,7 +400,7 @@ var A = (e) => {
 		if (!ue(e)) return this.executeQuery(e, t, n);
 		let r = n === null ? ae(e, this.sql, "postgres") : null;
 		if (r !== null) try {
-			let e = t ? i.provideService(r.fragment, k, t) : r.fragment, n = await b("postgres", "select", () => this.runtime.runPromise(e));
+			let e = t ? i.provideService(r.fragment, E, t) : r.fragment, n = await b("postgres", "select", () => this.runtime.runPromise(e));
 			return r.decode(n);
 		} catch (t) {
 			if (t instanceof h) throw t;
@@ -395,7 +417,7 @@ var A = (e) => {
 			reason: "not-compilable"
 		});
 		let a = await this.executeQuery(e, t, n);
-		return g(a, e.eager, e.sourceTable ?? C(e.table), (e) => this.executeQuery(e, t, n));
+		return g(a, e.eager, e.sourceTable ?? me(e.table), (e) => this.executeQuery(e, t, n));
 	}
 	getInternalRunWithEager() {
 		return (e, t) => this.runWithEager(e, t);
@@ -404,7 +426,7 @@ var A = (e) => {
 		return this.runWithEager(t, null, e);
 	}
 	async writeWithRecorders(e, t) {
-		let n = [], r = this.sql, a = await this.runtime.runPromise(r.withTransaction(i.flatMap(i.serviceOption(k), (r) => l.isNone(r) ? i.fail(/* @__PURE__ */ Error("PostgresDataStore.write: TransactionConnection missing.")) : i.tryPromise({
+		let n = [], r = this.sql, a = await this.runtime.runPromise(r.withTransaction(i.flatMap(i.serviceOption(E), (r) => l.isNone(r) ? i.fail(/* @__PURE__ */ Error("PostgresDataStore.write: TransactionConnection missing.")) : i.tryPromise({
 			try: () => e(t, r.value, n),
 			catch: (e) => e
 		}))));
@@ -414,10 +436,10 @@ var A = (e) => {
 	async localWrite(e, t, n) {
 		let r = (e) => x(t) ? this.writeWithRecorders(n, e) : n(e, null, null);
 		return b("postgres", e, async () => {
-			if (this.changeStrategy !== "cdc") return D(r);
+			if (this.changeStrategy !== "cdc") return w(r);
 			ne(t);
 			try {
-				return await D(r);
+				return await w(r);
 			} finally {
 				ce(t);
 			}
@@ -445,7 +467,7 @@ var A = (e) => {
 		return this.localWrite("delete", e, (n, r, i) => this.executeDeleteMany(e, t, r, i, n));
 	}
 	async executeUpdateMany(e, t, n, r, a, o) {
-		let s = this.sql, c = _(n.where, s), l = s`UPDATE ${s(e)} SET ${s.update(v(t, e, G))} WHERE ${c} RETURNING *`, u = r ? i.provideService(l, k, r) : l, d = await this.runtime.runPromise(u);
+		let s = this.sql, c = _(n.where, s), l = s`UPDATE ${s(e)} SET ${s.update(v(t, e, G))} WHERE ${c} RETURNING *`, u = r ? i.provideService(l, E, r) : l, d = await this.runtime.runPromise(u);
 		for (let t of d) await this.routeEvent({
 			table: e,
 			op: "update",
@@ -455,7 +477,7 @@ var A = (e) => {
 		return d.length;
 	}
 	async executeDeleteMany(e, t, n, r, a) {
-		let o = this.sql, s = _(t.where, o), c = o`DELETE FROM ${o(e)} WHERE ${s} RETURNING *`, l = n ? i.provideService(c, k, n) : c, u = await this.runtime.runPromise(l);
+		let o = this.sql, s = _(t.where, o), c = o`DELETE FROM ${o(e)} WHERE ${s} RETURNING *`, l = n ? i.provideService(c, E, n) : c, u = await this.runtime.runPromise(l);
 		for (let t of u) await this.routeEvent({
 			table: e,
 			op: "delete",
@@ -525,17 +547,17 @@ var A = (e) => {
 		}));
 	}
 	runStatementOnTransaction(e, t) {
-		return this.runtime.runPromise(i.provideService(this.sql.unsafe(e), k, t));
+		return this.runtime.runPromise(i.provideService(this.sql.unsafe(e), E, t));
 	}
 	async emptyTablesOn(e, t) {
 		if (e.length === 0) return;
-		let n = this.sql, r = i.forEach(e, (e) => n`DELETE FROM ${n(e)}`, { discard: !0 }), a = t === null ? n.withTransaction(r) : i.provideService(r, k, t);
+		let n = this.sql, r = i.forEach(e, (e) => n`DELETE FROM ${n(e)}`, { discard: !0 }), a = t === null ? n.withTransaction(r) : i.provideService(r, E, t);
 		await this.runtime.runPromise(a);
 	}
 	async transactional(e) {
 		this.inflightTxns++;
 		try {
-			return await T({
+			return await S({
 				...this.txnSpec("PostgresDataStore.transactional", "store.transactional", "transaction"),
 				work: e,
 				makeView: (e, t) => new J(this, e, t)
@@ -555,7 +577,7 @@ var A = (e) => {
 	injectExternalChange(e) {
 		if (!y(e.table)) return;
 		let t = (e.op === "delete" ? e.old : e.new)?.id;
-		w(e.table, e.op, t, (t) => {
+		he(e.table, e.op, t, (t) => {
 			this.emitter.emit("change", le(e, t));
 		});
 	}
@@ -571,7 +593,7 @@ var A = (e) => {
 				inflight: this.inflightTxns
 			});
 		}
-		this.cdcFiber &&= (await this.runtime.runPromise(a.interrupt(this.cdcFiber)), null), await this.runtime.dispose();
+		this.cdcStopped = !0, this.cdcWatchdog !== null && (clearInterval(this.cdcWatchdog), this.cdcWatchdog = null), this.cdcFiber &&= (await this.runtime.runPromise(a.interrupt(this.cdcFiber)), null), await this.runtime.dispose();
 	}
 	async ping() {
 		await this.runtime.runPromise(this.sql`SELECT 1`);
@@ -586,13 +608,43 @@ var A = (e) => {
 		}));
 	}
 	async startCdcConsumer() {
+		await this.attachCdcStream(), await this.proveCdcListening(1e4) || K.warn("cdc: the consumer could not prove it is listening yet — the watchdog will keep trying. Changes written on other replicas may not arrive until it does.", { channel: this.cdcChannel }), this.startCdcWatchdog();
+	}
+	async proveCdcListening(e) {
+		let t = Date.now() + e;
+		for (; Date.now() < t && !this.cdcStopped;) {
+			let e = this.cdcHeardCount;
+			try {
+				await this.runtime.runPromise(this.sql`SELECT pg_notify(${this.cdcChannel}, ${I(String(process.pid))})`);
+			} catch {}
+			let t = Date.now() + 500;
+			for (; this.cdcHeardCount === e && Date.now() < t;) await new Promise((e) => setTimeout(e, 10));
+			if (this.cdcHeardCount > e) return !0;
+		}
+		return !1;
+	}
+	onChangeStreamGap(e) {
+		return this.cdcGapListeners.add(e), () => {
+			this.cdcGapListeners.delete(e);
+		};
+	}
+	emitCdcGap(e) {
+		for (let t of this.cdcGapListeners) try {
+			t(e);
+		} catch (e) {
+			K.warn("cdc: gap listener threw", {}, e instanceof Error ? e : void 0);
+		}
+	}
+	async attachCdcStream() {
 		let e = (await this.runtime.runPromise(t.PgClient)).listen(this.cdcChannel), n = (e) => i.suspend(() => {
+			this.cdcLastHeardAt = Date.now(), this.cdcHeardCount += 1;
 			let t;
 			try {
 				t = JSON.parse(e);
 			} catch (e) {
 				return K.warn("cdc: bad payload", { channel: this.cdcChannel }, e), i.void;
 			}
+			if (Ce(t)) return i.void;
 			if (t.oversized !== !0) {
 				let e = {
 					table: t.table,
@@ -604,7 +656,7 @@ var A = (e) => {
 					this.injectExternalChange(e);
 				});
 			}
-			return y(t.table) ? xe({
+			return y(t.table) ? Oe({
 				notification: t,
 				fetchRow: ({ schema: e, table: t, key: n }) => this.readRowAsCdcJson(e, t, n),
 				tunables: this.cdcRehydrate
@@ -612,7 +664,66 @@ var A = (e) => {
 				this.reportOversized(t, e), this.injectExternalChange(e.event);
 			})) : i.void;
 		});
-		this.cdcFiber = this.runtime.runFork(e.pipe(f.runForEach(n)));
+		this.cdcLastHeardAt = Date.now(), this.cdcProbeSentAt = null, this.cdcFiber = this.runtime.runFork(e.pipe(f.runForEach(n)));
+	}
+	startCdcWatchdog() {
+		if (this.cdcWatchdog !== null) return;
+		let e = this.cdcLiveness, t = Math.max(1e3, Math.floor(e.idleMs / 4)), n = setInterval(() => {
+			this.cdcWatchdogTick(e);
+		}, t);
+		n.unref?.(), this.cdcWatchdog = n;
+	}
+	async cdcWatchdogTick(e) {
+		if (this.cdcStopped || this.cdcReconnecting) return;
+		let t = P({
+			lastHeardAtMs: this.cdcLastHeardAt,
+			probeSentAtMs: this.cdcProbeSentAt
+		}, Date.now(), e);
+		if (t === "healthy") {
+			this.cdcProbeSentAt !== null && this.cdcLastHeardAt > this.cdcProbeSentAt && (this.cdcProbeSentAt = null);
+			return;
+		}
+		if (t === "probe") {
+			let e = Date.now();
+			try {
+				await this.runtime.runPromise(this.sql`SELECT pg_notify(${this.cdcChannel}, ${I(String(process.pid))})`), this.cdcProbeSentAt = e;
+			} catch (e) {
+				K.debug("cdc: heartbeat could not be sent — treating the database as unreachable, not the consumer as dead", {
+					channel: this.cdcChannel,
+					error: e instanceof Error ? e.message : String(e)
+				}), this.cdcProbeSentAt = null;
+			}
+			return;
+		}
+		await this.reconnectCdc(`no notification on '${this.cdcChannel}' for ${Math.round((Date.now() - this.cdcLastHeardAt) / 1e3)}s and a heartbeat went unanswered — the LISTEN connection is dead`);
+	}
+	async reconnectCdc(e) {
+		if (this.cdcReconnecting || this.cdcStopped) return;
+		this.cdcReconnecting = !0;
+		let t = this.cdcLastHeardAt;
+		K.warn(`cdc: reconnecting — ${e}`, { channel: this.cdcChannel });
+		try {
+			for (let n = 1; !this.cdcStopped; n++) try {
+				if (this.cdcFiber &&= (await this.runtime.runPromise(a.interrupt(this.cdcFiber)), null), await this.attachCdcStream(), !await this.proveCdcListening(5e3)) throw Error("the re-opened consumer never echoed its own heartbeat");
+				let r = Date.now() - t;
+				K.info("cdc: reconnected — refreshing live state, which is safe because a query is idempotent", {
+					channel: this.cdcChannel,
+					attempt: n,
+					downForMs: r
+				}), this.emitCdcGap({
+					reason: e,
+					downForMs: r
+				});
+				return;
+			} catch (e) {
+				K.warn("cdc: reconnect attempt failed", {
+					channel: this.cdcChannel,
+					attempt: n
+				}, e instanceof Error ? e : void 0), await new Promise((e) => setTimeout(e, L(n)));
+			}
+		} finally {
+			this.cdcReconnecting = !1;
+		}
 	}
 }, J = class {
 	parent;
@@ -683,7 +794,7 @@ var A = (e) => {
 			this.events.length = 0;
 		}
 	}
-}, we = class {
+}, je = class {
 	parent;
 	namespace;
 	constructor(e, t) {
@@ -737,17 +848,17 @@ var A = (e) => {
 			return r === void 0 ? Promise.reject(/* @__PURE__ */ Error("PostgresNamespaceView.raw: underlying store has no raw()")) : r(e, t);
 		});
 	}
-}, Y = (e) => e.__postgresReplicationFriend ?? null, Te = (e, t) => {
+}, Y = (e) => e.__postgresReplicationFriend ?? null, Me = (e, t) => {
 	let [n, r] = e.split("/"), [i, a] = t.split("/");
 	if (!n || !r || !i || !a) throw Error(`postgres LSN compare: invalid format (${e} vs ${t})`);
 	let o = parseInt(n, 16), s = parseInt(r, 16), c = parseInt(i, 16);
 	return o === c ? s - parseInt(a, 16) : o - c;
-}, Ee = () => ({
+}, Ne = () => ({
 	async capturePrimaryPosition(e) {
 		let t = Y(e);
 		if (t === null) throw Error("postgresReplicationAdapter: primary is not a PostgresDataStore (missing __postgresReplicationFriend). Pass the postgres store directly.");
 		return t.runEffect(i.gen(function* () {
-			let e = (yield* (yield* O)`SELECT pg_current_wal_lsn()::text AS lsn`)[0]?.lsn;
+			let e = (yield* (yield* T)`SELECT pg_current_wal_lsn()::text AS lsn`)[0]?.lsn;
 			return typeof e == "string" ? e : yield* i.die("postgres did not return a WAL LSN");
 		}));
 	},
@@ -755,23 +866,23 @@ var A = (e) => {
 		let t = Y(e);
 		if (t === null) throw Error("postgresReplicationAdapter: replica is not a PostgresDataStore.");
 		return t.runEffect(i.gen(function* () {
-			let e = (yield* (yield* O)`
+			let e = (yield* (yield* T)`
           SELECT COALESCE(pg_last_wal_replay_lsn()::text, pg_current_wal_lsn()::text) AS lsn
         `)[0]?.lsn;
 			return typeof e == "string" ? e : yield* i.die("postgres did not return a replay LSN");
 		}));
 	},
 	compare(e, t) {
-		return Te(t, e) >= 0 ? "caught-up" : "behind";
+		return Me(t, e) >= 0 ? "caught-up" : "behind";
 	}
-}), X = (e) => `"${e.replace(/"/g, "\"\"")}"`, De = (e) => e.replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\v/g, "\\v").replace(/\f/g, "\\f").replace(/[\b]/g, "\\b"), Oe = (e) => {
+}), X = (e) => `"${e.replace(/"/g, "\"\"")}"`, Pe = (e) => e.replace(/\\/g, "\\\\").replace(/\t/g, "\\t").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\v/g, "\\v").replace(/\f/g, "\\f").replace(/[\b]/g, "\\b"), Fe = (e) => {
 	let t = "";
 	for (let n of e) t += n.toString(16).padStart(2, "0");
 	return t;
-}, Z = (e) => `{${e.map((e) => e == null ? "NULL" : Array.isArray(e) ? Z(e) : typeof e == "number" || typeof e == "bigint" ? String(e) : typeof e == "boolean" ? e ? "t" : "f" : `"${(e instanceof Date ? e.toISOString() : String(e)).replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`).join(",")}}`, Q = (e, t) => e == null ? null : typeof e == "string" ? e : typeof e == "number" || typeof e == "bigint" ? String(e) : typeof e == "boolean" ? e ? "t" : "f" : e instanceof Date ? e.toISOString() : e instanceof Uint8Array ? `\\x${Oe(e)}` : Array.isArray(e) && t === "array" ? Z(e) : JSON.stringify(e), $ = (e, t, n = {}) => t.map((t) => {
+}, Z = (e) => `{${e.map((e) => e == null ? "NULL" : Array.isArray(e) ? Z(e) : typeof e == "number" || typeof e == "bigint" ? String(e) : typeof e == "boolean" ? e ? "t" : "f" : `"${(e instanceof Date ? e.toISOString() : String(e)).replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`).join(",")}}`, Q = (e, t) => e == null ? null : typeof e == "string" ? e : typeof e == "number" || typeof e == "bigint" ? String(e) : typeof e == "boolean" ? e ? "t" : "f" : e instanceof Date ? e.toISOString() : e instanceof Uint8Array ? `\\x${Fe(e)}` : Array.isArray(e) && t === "array" ? Z(e) : JSON.stringify(e), $ = (e, t, n = {}) => t.map((t) => {
 	let r = Q(e[t], n[t]);
-	return r === null ? "\\N" : De(r);
-}).join("	"), ke = class {
+	return r === null ? "\\N" : Pe(r);
+}).join("	"), Ie = class {
 	text;
 	chunks;
 	done;
@@ -802,7 +913,7 @@ var A = (e) => {
 	handleReadyForQuery() {
 		this.settle(void 0);
 	}
-}, Ae = (e) => ({
+}, Le = (e) => ({
 	...e.url ? { connectionString: e.url } : {
 		host: e.host ?? "localhost",
 		port: e.port ?? 5432,
@@ -811,9 +922,9 @@ var A = (e) => {
 		database: e.database ?? "postgres"
 	},
 	...e.ssl === !0 ? { ssl: { rejectUnauthorized: !1 } } : {}
-}), je = 65536, Me = (e) => {
+}), Re = 65536, ze = (e) => {
 	let t, n, r = () => t ? Promise.resolve(t) : (n ??= (async () => {
-		let n = new p.Client(Ae(e));
+		let n = new p.Client(Le(e));
 		return await n.connect(), t = n, n;
 	})(), n);
 	return {
@@ -821,9 +932,9 @@ var A = (e) => {
 		copyInto: async ({ table: e, columns: t, columnTypes: n, rows: i }) => {
 			if (i.length === 0) return 0;
 			let a = await r(), o = `COPY ${X(e)} (${t.map(X).join(", ")}) FROM STDIN`, s = [], c = "";
-			for (let e of i) c += $(e, t, n ?? {}), c += "\n", c.length >= je && (s.push(Buffer.from(c, "utf8")), c = "");
+			for (let e of i) c += $(e, t, n ?? {}), c += "\n", c.length >= Re && (s.push(Buffer.from(c, "utf8")), c = "");
 			return c.length > 0 && s.push(Buffer.from(c, "utf8")), await new Promise((e, t) => {
-				let n = new ke(o, s, (n, r) => {
+				let n = new Ie(o, s, (n, r) => {
 					n ? t(n) : e(r);
 				});
 				a.query(n);
@@ -834,12 +945,12 @@ var A = (e) => {
 			t = void 0, n = void 0, e && await e.end().catch(() => void 0);
 		}
 	};
-}, Ne = {
+}, Be = {
 	id: "postgres",
-	makeSqlLayer: (e) => L(e),
+	makeSqlLayer: (e) => M(e),
 	makeStore: (e) => q(e),
 	compileContains: (e, t, n) => n`${e} ILIKE ${`%${t.replace(/[\\%_]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
 	retryFilter: B
 };
 //#endregion
-export { e as PgClient, I as connectionFromConfig, $ as encodeCopyRow, Q as encodeCopyValue, Me as makePgCopySession, q as makePostgresDataStore, P as makePostgresSqlLayer, L as makePostgresSqlLayerFromConfig, Ne as postgresDialect, Ee as postgresReplicationAdapter, B as postgresRetryFilter };
+export { F as CDC_HEARTBEAT_MARKER, N as DEFAULT_CDC_LIVENESS, e as PgClient, P as cdcLivenessVerdict, L as cdcReconnectDelayMs, j as connectionFromConfig, $ as encodeCopyRow, Q as encodeCopyValue, ze as makePgCopySession, q as makePostgresDataStore, A as makePostgresSqlLayer, M as makePostgresSqlLayerFromConfig, Be as postgresDialect, Ne as postgresReplicationAdapter, B as postgresRetryFilter, R as resolveCdcLiveness };