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

package/out/zero-cache/src/types/downstream.d.ts

@@ -0,0 +1,11 @@
+import type { Downstream } from '../../../zero-protocol/src/down.ts';
+/**
+ * A logical view-syncer message and, when already available, its serialized
+ * wire representation. Keeping them together lets the connection reuse the
+ * view-syncer's serialization instead of stringifying large poke parts again.
+ */
+export type ViewSyncerDownstream = {
+    readonly message: Downstream;
+    readonly serialized: string | undefined;
+};
+//# sourceMappingURL=downstream.d.ts.map

package/out/zero-cache/src/types/downstream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"downstream.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/downstream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,oCAAoC,CAAC;AAEnE;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CACzC,CAAC"}

package/out/zero-cache/src/types/pg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAehC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,QAAQ,EAAE,EAAc,KAAK,YAAY,EAAC,MAAM,UAAU,CAAC;AAClE,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,oCAAoC,CAAC;AAmB9E,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAmD7D;AAED,iBAAS,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAuBhD;AAcD,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAoBvE;AAOD,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA8ErE;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,UAAU,CAAC;AAEvD,MAAM,MAAM,WAAW,GAAG;IACxB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,uBAAoB,WAAgB;;;;;;;;;;;;;;;;;;2BAwBlD,OAAO;;;;;;2BAOP,OAAO;;;;;;2BAQP,MAAM,GAAG,IAAI;;;;;;2BAUb,MAAM;uBACV,MAAM,GAAG,MAAM;;;CAG9B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,cAAc,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAmBH,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,UAAU,EACd,SAAS,SAA+B,IAEhC,SAAS,oBAAoB,KAAG,MAAM,CAkD/C;AAED,wBAAgB,QAAQ,CACtB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM,EAGrB,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC;IACzB,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC/B,CAAC,EACF,IAAI,CAAC,EAAE,WAAW,GACjB,UAAU,CA8DZ;AAED,wBAAsB,eAAe,CACnC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,GACnC,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,QAE/D;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOhD,CAAC;AAEF,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,WAE1E;AA8BD,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,OAAO,WAiB/C"}
+{"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAehC,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,QAAQ,EAAE,EAAc,KAAK,YAAY,EAAC,MAAM,UAAU,CAAC;AAClE,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,oCAAoC,CAAC;AAmB9E,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAmD7D;AAED,iBAAS,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAuBhD;AAcD,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAoBvE;AAOD,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CA8ErE;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,UAAU,CAAC;AAEvD,MAAM,MAAM,WAAW,GAAG;IACxB;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,uBAAoB,WAAgB;;;;;;;;;;;;;;;;;;2BAwBlD,OAAO;;;;;;2BAOP,OAAO;;;;;;2BAQP,MAAM,GAAG,IAAI;;;;;;2BAUb,MAAM;uBACV,MAAM,GAAG,MAAM;;;CAG9B,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,cAAc,CAAC;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,SAAS,CAAC;CACjB,CAAC,CAAC;AAkBH,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,UAAU,EACd,SAAS,SAA+B,IAEhC,SAAS,oBAAoB,KAAG,MAAM,CAkD/C;AAED,wBAAgB,QAAQ,CACtB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM,EAGrB,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC;IACzB,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC/B,CAAC,EACF,IAAI,CAAC,EAAE,WAAW,GACjB,UAAU,CA6EZ;AAED,wBAAsB,eAAe,CACnC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,GACnC,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,mBAAmB,QAE/D;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAOhD,CAAC;AAEF,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,WAE1E;AA8BD,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,OAAO,WAiB/C"}

package/out/zero-cache/src/types/pg.js

@@ -193,19 +193,29 @@ function inactivityTimeoutSocket(lc, timeoutMs = SOCKET_INACTIVITY_TIMEOUT_MS) {
 }
 function pgClient(lc, connectionURI, applicationName, options, opts) {
 	applicationName = `zero-${applicationName}`;
+	const safeNotice = (n) => ({
+		severity: n.severity,
+		code: n.code,
+		message: n.message,
+		schema: n.schema_name,
+		table: n.table_name,
+		column: n.column_name,
+		constraint: n.constraint_name,
+		routine: n.routine
+	});
 	const onnotice = (n) => {
 		switch (n.severity) {
 			case "NOTICE": return;
 			case "DEBUG":
-				lc.debug?.(n);
+				lc.debug?.("pg notice", safeNotice(n));
 				return;
 			case "WARNING":
-				lc.warn?.(n);
+				lc.warn?.("pg notice", safeNotice(n));
 				return;
 			case "EXCEPTION":
-				lc.error?.(n);
+				lc.error?.("pg notice", safeNotice(n));
 				return;
-			default: lc.info?.(n);
+			default: lc.info?.("pg notice", safeNotice(n));
 		}
 	};
 	const url = new URL(connectionURI);

package/out/zero-cache/src/types/pg.js.map

@@ -1 +1 @@
-{"version":3,"file":"pg.js","names":[],"sources":["../../../../../zero-cache/src/types/pg.ts"],"sourcesContent":["import {Socket} from 'node:net';\nimport {\n  PG_CONFIGURATION_LIMIT_EXCEEDED,\n  PG_CONNECTION_DOES_NOT_EXIST,\n  PG_CONNECTION_EXCEPTION,\n  PG_CONNECTION_FAILURE,\n  PG_INSUFFICIENT_PRIVILEGE,\n  PG_INVALID_AUTHORIZATION_SPECIFICATION,\n  PG_INVALID_CATALOG_NAME,\n  PG_INVALID_PASSWORD,\n  PG_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION,\n  PG_TOO_MANY_CONNECTIONS,\n} from '@drdgvhbh/postgres-error-codes';\nimport {PreciseDate} from '@google-cloud/precise-date';\nimport {OID} from '@postgresql-typed/oids';\nimport type {LogContext} from '@rocicorp/logger';\nimport postgres, {type Notice, type PostgresType} from 'postgres';\nimport {BigIntJSON, type JSONValue} from '../../../shared/src/bigint-json.ts';\nimport {randInt} from '../../../shared/src/rand.ts';\nimport {ConfigurationError} from './configuration-error.ts';\nimport {\n  DATE,\n  JSON,\n  JSONB,\n  NUMERIC,\n  TIME,\n  TIMESTAMP,\n  TIMESTAMPTZ,\n  TIMETZ,\n} from './pg-types.ts';\n\n// Matches: YEAR-MM-DD HH:MM:SS[.fraction][+-TZ[:MM]][ BC]\nconst pgTimestampRe =\n  /^(\\d+)-(\\d{2}-\\d{2}) (\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?)([+-]\\d{1,2}(?::\\d{2})?)?(?: BC)?$/;\n\n// exported for testing.\nexport function timestampToFpMillis(timestamp: string): number {\n  if (timestamp === 'infinity') return Infinity;\n  if (timestamp === '-infinity') return -Infinity;\n  const match = timestamp.match(pgTimestampRe);\n  if (!match) {\n    throw new Error(`Error parsing ${timestamp}`);\n  }\n\n  const [, yearStr, monthDay, time, tz] = match;\n  const bc = timestamp.endsWith(' BC');\n\n  let year = Number(yearStr);\n  if (bc) {\n    // Postgres: 1 BC = JS year 0, 2 BC = JS year -1, N BC = -(N-1)\n    year = -(year - 1);\n  }\n\n  // Format year as ISO 8601 expanded year if needed.\n  // https://tc39.es/ecma262/#sec-expanded-years\n  let isoYear: string;\n  if (year >= 0 && year <= 9999) {\n    isoYear = String(year).padStart(4, '0');\n  } else if (year >= 0) {\n    isoYear = '+' + String(year).padStart(6, '0');\n  } else {\n    isoYear = '-' + String(Math.abs(year)).padStart(6, '0');\n  }\n\n  // Build a UTC ISO string so PreciseDate returns microsecond precision.\n  const utcString = `${isoYear}-${monthDay}T${time}Z`;\n\n  try {\n    const fullTime = new PreciseDate(utcString).getFullTime();\n    const millis = Number(fullTime / 1_000_000n);\n    const nanos = Number(fullTime % 1_000_000n);\n    const ret = millis + nanos * 1e-6; // floating point milliseconds\n\n    // Add back in the timezone offset. We passed local time as UTC,\n    // so a positive offset means we need to subtract, and vice versa.\n    if (tz) {\n      const positiveOffset = tz.startsWith('+');\n      const [hours, minutes] = tz.split(':');\n      const offset =\n        Math.abs(Number(hours)) * 60 + (minutes ? Number(minutes) : 0);\n      const offsetMillis = offset * 60 * 1_000;\n      return positiveOffset ? ret - offsetMillis : ret + offsetMillis;\n    }\n    return ret;\n  } catch (e) {\n    throw new Error(`Error parsing ${timestamp}`, {cause: e});\n  }\n}\n\nfunction serializeTimestamp(val: unknown): string {\n  switch (typeof val) {\n    case 'string':\n      return val; // Let Postgres parse it\n    case 'number': {\n      if (Number.isInteger(val)) {\n        return new PreciseDate(val).toISOString();\n      }\n      // Convert floating point to bigint nanoseconds.\n      const nanoseconds =\n        1_000_000n * BigInt(Math.trunc(val)) +\n        BigInt(Math.trunc((val % 1) * 1e6));\n      return new PreciseDate(nanoseconds).toISOString();\n    }\n    // Note: Don't support bigint inputs until we decide what the semantics are (e.g. micros vs nanos)\n    // case 'bigint':\n    //   return new PreciseDate(val).toISOString();\n    default:\n      if (val instanceof Date) {\n        return val.toISOString();\n      }\n  }\n  throw new Error(`Unsupported type \"${typeof val}\" for timestamp: ${val}`);\n}\n\nconst MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;\n\nfunction serializeTime(x: unknown, type: 'time' | 'timetz'): string {\n  switch (typeof x) {\n    case 'string':\n      return x; // Let Postgres parse it\n    case 'number':\n      return millisecondsToPostgresTime(x);\n  }\n  throw new Error(`Unsupported type \"${typeof x}\" for ${type}: ${x}`);\n}\n\nexport function millisecondsToPostgresTime(milliseconds: number): string {\n  if (milliseconds < 0) {\n    throw new Error('Milliseconds cannot be negative');\n  }\n\n  if (milliseconds >= MILLISECONDS_PER_DAY) {\n    throw new Error(\n      `Milliseconds cannot exceed 24 hours (${MILLISECONDS_PER_DAY}ms)`,\n    );\n  }\n\n  milliseconds = Math.floor(milliseconds); // Ensure it's an integer\n\n  const totalSeconds = Math.floor(milliseconds / 1000);\n  const hours = Math.floor(totalSeconds / 3600);\n  const minutes = Math.floor((totalSeconds % 3600) / 60);\n  const seconds = totalSeconds % 60;\n  const ms = milliseconds % 1000;\n\n  return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}.${ms.toString().padStart(3, '0')}+00`;\n}\n\n// Regular expression to match HH:MM:SS, HH:MM:SS.mmm, or HH:MM:SS+00 / HH:MM:SS.mmm+00\n// Supports optional timezone offset\nconst timeRegex =\n  /^(\\d{1,2}):(\\d{2}):(\\d{2})(?:\\.(\\d{1,6}))?(?:([+-])(\\d{1,2})(?::(\\d{2}))?)?$/;\n\nexport function postgresTimeToMilliseconds(timeString: string): number {\n  // Validate basic format\n  if (!timeString || typeof timeString !== 'string') {\n    throw new Error('Invalid time string: must be a non-empty string');\n  }\n\n  const match = timeString.match(timeRegex);\n\n  if (!match) {\n    throw new Error(\n      `Invalid time format: \"${timeString}\". Expected HH:MM:SS[.mmm][+|-HH[:MM]]`,\n    );\n  }\n\n  // Extract components\n  const hours = parseInt(match[1], 10);\n  const minutes = parseInt(match[2], 10);\n  const seconds = parseInt(match[3], 10);\n  // Handle optional milliseconds, pad right with zeros if needed\n  let milliseconds = 0;\n  if (match[4]) {\n    // Pad microseconds to 6 digits\n    const msString = match[4].padEnd(6, '0');\n    // slice milliseconds out of the microseconds\n    // e.g. 123456 -> 123, 1234 -> 123,\n    milliseconds = parseInt(msString.slice(0, 3), 10);\n  }\n\n  // Validate ranges\n  if (hours < 0 || hours > 24) {\n    throw new Error(\n      `Invalid hours: ${hours}. Must be between 0 and 24 (24 means end of day)`,\n    );\n  }\n\n  if (minutes < 0 || minutes >= 60) {\n    throw new Error(`Invalid minutes: ${minutes}. Must be between 0 and 59`);\n  }\n\n  if (seconds < 0 || seconds >= 60) {\n    throw new Error(`Invalid seconds: ${seconds}. Must be between 0 and 59`);\n  }\n\n  if (milliseconds < 0 || milliseconds >= 1000) {\n    throw new Error(\n      `Invalid milliseconds: ${milliseconds}. Must be between 0 and 999`,\n    );\n  }\n\n  // Special case: PostgreSQL allows 24:00:00 to represent end of day\n  if (hours === 24 && (minutes !== 0 || seconds !== 0 || milliseconds !== 0)) {\n    throw new Error(\n      'Invalid time: when hours is 24, minutes, seconds, and milliseconds must be 0',\n    );\n  }\n\n  // Calculate total milliseconds\n  let totalMs =\n    hours * 3600000 + minutes * 60000 + seconds * 1000 + milliseconds;\n\n  // Timezone Offset\n  if (match[5]) {\n    const sign = match[5] === '+' ? 1 : -1;\n    const tzHours = parseInt(match[6], 10);\n    const tzMinutes = match[7] ? parseInt(match[7], 10) : 0;\n    const offsetMs = sign * (tzHours * 3600000 + tzMinutes * 60000);\n    totalMs -= offsetMs;\n  }\n\n  // Normalize to 0-24h only if outside valid range\n  if (totalMs > MILLISECONDS_PER_DAY || totalMs < 0) {\n    return (\n      ((totalMs % MILLISECONDS_PER_DAY) + MILLISECONDS_PER_DAY) %\n      MILLISECONDS_PER_DAY\n    );\n  }\n\n  return totalMs;\n}\n\nfunction dateToUTCMidnight(date: string): number {\n  if (date === 'infinity') return Infinity;\n  if (date === '-infinity') return -Infinity;\n  const d = new Date(date);\n  return Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());\n}\n\n/**\n * The (javascript) types of objects that can be returned by our configured\n * Postgres clients. For initial-sync, these comes from the postgres.js client:\n *\n * https://github.com/porsager/postgres/blob/master/src/types.js\n *\n * and for the replication stream these come from the the node-postgres client:\n *\n * https://github.com/brianc/node-pg-types/blob/master/lib/textParsers.js\n */\nexport type PostgresValueType = JSONValue | Uint8Array;\n\nexport type TypeOptions = {\n  /**\n   * Sends strings directly as JSON values (i.e. without JSON stringification).\n   * The application is responsible for ensuring that string inputs for JSON\n   * columns are already stringified. Other data types (e.g. objects) will\n   * still be stringified by the pg client.\n   */\n  sendStringAsJson?: boolean;\n};\n\n/**\n * Configures types for the Postgres.js client library (`postgres`).\n *\n * @param jsonAsString Keep JSON / JSONB values as strings instead of parsing.\n */\nexport const postgresTypeConfig = ({sendStringAsJson}: TypeOptions = {}) => ({\n  // Type the type IDs as `number` so that Typescript doesn't complain about\n  // referencing external types during type inference.\n  types: {\n    bigint: postgres.BigInt,\n    json: {\n      to: JSON,\n      from: [JSON, JSONB],\n      serialize: sendStringAsJson\n        ? (x: unknown) => (typeof x === 'string' ? x : BigIntJSON.stringify(x))\n        : BigIntJSON.stringify,\n      parse: BigIntJSON.parse,\n    },\n    // Timestamps are converted to PreciseDate objects.\n    timestamp: {\n      to: TIMESTAMP,\n      from: [TIMESTAMP, TIMESTAMPTZ],\n      serialize: serializeTimestamp,\n      parse: timestampToFpMillis,\n    },\n    // Times are converted as strings\n    time: {\n      to: TIME,\n      from: [TIME, TIMETZ],\n      serialize: (x: unknown) => serializeTime(x, 'time'),\n      parse: postgresTimeToMilliseconds,\n    },\n\n    timetz: {\n      to: TIMETZ,\n      from: [TIME, TIMETZ],\n      serialize: (x: unknown) => serializeTime(x, 'timetz'),\n      parse: postgresTimeToMilliseconds,\n    },\n\n    // The DATE type is stored directly as the PG normalized date string.\n    date: {\n      to: DATE,\n      from: [DATE],\n      serialize: (x: string | Date) =>\n        (x instanceof Date ? x : new Date(x)).toISOString(),\n      parse: dateToUTCMidnight,\n    },\n    // Returns a `js` number which can lose precision for large numbers.\n    // JS number is 53 bits so this should generally not occur.\n    // An API will be provided for users to override this type.\n    numeric: {\n      to: NUMERIC,\n      from: [NUMERIC],\n      serialize: (x: number) => String(x), // pg expects a string\n      parse: (x: string | number) => Number(x),\n    },\n  },\n});\n\nexport type PostgresDB = postgres.Sql<{\n  bigint: bigint;\n  json: JSONValue;\n}>;\n\nexport type PostgresTransaction = postgres.TransactionSql<{\n  bigint: bigint;\n  json: JSONValue;\n}>;\n\n// Guards against half-open TCP connections, which otherwise hang the pool\n// indefinitely: a proxy can keep the client-facing socket alive (ACKing TCP\n// keepalives) after its backend is gone, so no 'close' or 'error' event ever\n// fires and statements like BEGIN / COMMIT — which are not covered by the\n// TransactionPool's statementResponseTimeout — await forever.\n// See https://github.com/porsager/postgres/issues/1089.\n//\n// If no bytes are read or written for this long, the socket is reset, which\n// rejects all in-flight queries and lets the pool recover. Wire activity\n// resets the timer, so streaming operations (e.g. COPY) are safe, but\n// statements that legitimately compute silently for longer (e.g. index\n// builds in migrations) must raise this. Settable as an emergency measure\n// (0 disables); deliberately not exposed as a server option.\nconst SOCKET_INACTIVITY_TIMEOUT_MS = parseInt(\n  process.env.ZERO_PG_SOCKET_INACTIVITY_TIMEOUT ?? '120000',\n);\n\ntype SocketFactoryOptions = {\n  host: string[];\n  port: number[];\n  path?: string | false;\n};\n\n/**\n * Creates the custom socket factory passed to postgres.js via its (untyped)\n * `socket` option. postgres.js does not call `connect()` on custom sockets,\n * and its TLS upgrade reads `socket.host` for the SNI servername, so the\n * factory must handle both itself.\n *\n * Note: unlike postgres.js's internal socket, reconnects do not rotate\n * through multiple hosts; multi-host URIs are not used by the zero-cache.\n *\n * Exported for testing.\n */\nexport function inactivityTimeoutSocket(\n  lc: LogContext,\n  timeoutMs = SOCKET_INACTIVITY_TIMEOUT_MS,\n) {\n  return (options: SocketFactoryOptions): Socket => {\n    const socket = new Socket();\n    const target = options.path\n      ? options.path\n      : `${options.host[0]}:${options.port[0]}`;\n    if (timeoutMs > 0) {\n      // socket.setTimeout() cannot be used here: it registers its callback\n      // as a 'timeout' event listener, and postgres.js removes all listeners\n      // from the raw socket when upgrading it to TLS (removeAllListeners()\n      // in secure()), which would silently disarm the watchdog on every TLS\n      // connection. An interval is not a socket listener, so it survives the\n      // upgrade, and encrypted traffic still flows through this raw socket,\n      // advancing its byte counters.\n      //\n      // The counters are sampled once per timeout period, so a half-open\n      // socket is reset after one to two timeout periods of inactivity.\n      let lastActivity = -1;\n      const watchdog = setInterval(() => {\n        if (socket.destroyed) {\n          clearInterval(watchdog);\n          return;\n        }\n        const activity = socket.bytesRead + socket.bytesWritten;\n        if (activity === lastActivity) {\n          lc.warn?.(\n            `resetting connection to ${target} after ${timeoutMs} ms of inactivity ` +\n              `(likely half-open); in-flight queries will be rejected`,\n          );\n          clearInterval(watchdog);\n          socket.resetAndDestroy();\n        } else {\n          lastActivity = activity;\n        }\n      }, timeoutMs);\n      watchdog.unref();\n      // Best-effort cleanup; removed on TLS upgrade, in which case the\n      // destroyed check above clears the (unref'ed) interval instead.\n      socket.once('close', () => clearInterval(watchdog));\n    }\n    if (options.path) {\n      socket.connect(options.path);\n    } else {\n      const [host] = options.host;\n      const [port] = options.port;\n      socket.connect(port, host);\n      // Read by postgres.js for the TLS SNI servername.\n      Object.assign(socket, {host, port});\n    }\n    return socket;\n  };\n}\n\nexport function pgClient(\n  lc: LogContext,\n  connectionURI: string,\n  // A descriptive name for the code that is making the connection, so that we\n  // can debug things like deadlocks.\n  applicationName: string,\n  options?: postgres.Options<{\n    bigint: PostgresType<bigint>;\n    json: PostgresType<JSONValue>;\n  }>,\n  opts?: TypeOptions,\n): PostgresDB {\n  applicationName = `zero-${applicationName}`;\n\n  const onnotice = (n: Notice) => {\n    // https://www.postgresql.org/docs/current/plpgsql-errors-and-messages.html#PLPGSQL-STATEMENTS-RAISE\n    switch (n.severity) {\n      case 'NOTICE':\n        return; // silenced\n      case 'DEBUG':\n        lc.debug?.(n);\n        return;\n      case 'WARNING':\n        lc.warn?.(n);\n        return;\n      case 'EXCEPTION':\n        lc.error?.(n);\n        return;\n      case 'LOG':\n      case 'INFO':\n      default:\n        lc.info?.(n);\n    }\n  };\n  const url = new URL(connectionURI);\n  const sslFlag =\n    url.searchParams.get('ssl') ?? url.searchParams.get('sslmode') ?? 'prefer';\n\n  let ssl: boolean | 'prefer' | {rejectUnauthorized: boolean};\n  if (sslFlag === 'disable' || sslFlag === 'false') {\n    ssl = false;\n  } else if (sslFlag === 'no-verify') {\n    ssl = {rejectUnauthorized: false};\n  } else {\n    ssl = sslFlag as 'prefer';\n  }\n\n  // Set connections to expire between 5 and 10 minutes to free up state on PG.\n  const maxLifetimeSeconds = randInt(5 * 60, 10 * 60);\n  const providedConnection = options?.connection ?? {};\n\n  // postgres.js supports a custom socket factory via the `socket` option,\n  // but it is missing from its type declarations, hence the untyped spread.\n  const socketFactory = {\n    socket: inactivityTimeoutSocket(lc.withContext('appName', applicationName)),\n  };\n\n  return postgres(connectionURI, {\n    ...postgresTypeConfig(opts),\n    onnotice,\n    ['max_lifetime']: maxLifetimeSeconds,\n    // Close idle connections cleanly before the socket inactivity timer\n    // (which cannot distinguish an idle pool connection from a hung query)\n    // resets them.\n    ['idle_timeout']: 60,\n    ssl,\n    ...socketFactory,\n    ...options,\n    connection: {\n      ...providedConnection,\n      ['application_name']: applicationName,\n    },\n  });\n}\n\nexport async function connectPgClient(\n  ...args: Parameters<typeof pgClient>\n): Promise<PostgresDB> {\n  const db = pgClient(...args);\n  try {\n    await db`SELECT 1`.simple().execute();\n    return db;\n  } catch (e) {\n    if (isPostgresConfigError(e)) {\n      throw new ConfigurationError(\n        'Unable to connect to Postgres. Check your database configuration.',\n        {cause: e},\n      );\n    }\n    throw e;\n  }\n}\n\n/**\n * Disables any statement_timeout for the current transaction. By default,\n * Postgres does not impose a statement timeout, but some users and providers\n * set one at the database level (even though it is explicitly discouraged by\n * the Postgres documentation).\n *\n * Zero logic in particular often does not fit into the category of general\n * application logic; for potentially long-running operations like migrations\n * and background cleanup, the statement timeout should be disabled to prevent\n * these operations from timing out.\n */\nexport function disableStatementTimeout(sql: PostgresTransaction) {\n  void sql`SET LOCAL statement_timeout = 0;`.execute().catch(() => {});\n}\n\nexport const typeNameByOID: Record<number, string> = Object.freeze(\n  Object.fromEntries(\n    Object.entries(OID).map(([name, oid]) => [\n      oid,\n      name.startsWith('_') ? `${name.substring(1)}[]` : name,\n    ]),\n  ),\n);\n\nexport function isPostgresError(e: unknown, ...codes: [string, ...string[]]) {\n  return e instanceof postgres.PostgresError && codes.includes(e.code);\n}\n\nfunction isPostgresStartupConnectionError(e: unknown) {\n  if (!(e instanceof Error) || !('code' in e)) {\n    return false;\n  }\n  const {code} = e;\n  // postgres.js throws plain Error instances for connection failures that\n  // happen before Postgres can return a SQLSTATE. These are still startup\n  // configuration problems for Zero: wrong host/port, unreachable DB, DNS,\n  // TLS certificate mismatch, etc.\n  return (\n    typeof code === 'string' &&\n    [\n      'CONNECT_TIMEOUT',\n      'ECONNREFUSED',\n      'ECONNRESET',\n      'EHOSTUNREACH',\n      'ENETUNREACH',\n      'ENOTFOUND',\n      'EAI_AGAIN',\n      'ETIMEDOUT',\n      'ERR_TLS_CERT_ALTNAME_INVALID',\n      'SELF_SIGNED_CERT_IN_CHAIN',\n      'DEPTH_ZERO_SELF_SIGNED_CERT',\n      'UNABLE_TO_VERIFY_LEAF_SIGNATURE',\n    ].includes(code)\n  );\n}\n\nexport function isPostgresConfigError(e: unknown) {\n  return (\n    isPostgresStartupConnectionError(e) ||\n    isPostgresError(\n      e,\n      PG_CONNECTION_EXCEPTION,\n      PG_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION,\n      PG_CONNECTION_DOES_NOT_EXIST,\n      PG_CONNECTION_FAILURE,\n      PG_INVALID_AUTHORIZATION_SPECIFICATION,\n      PG_INVALID_PASSWORD,\n      PG_INVALID_CATALOG_NAME,\n      PG_INSUFFICIENT_PRIVILEGE,\n      PG_TOO_MANY_CONNECTIONS,\n      PG_CONFIGURATION_LIMIT_EXCEEDED,\n    )\n  );\n}\n"],"mappings":"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"}
+{"version":3,"file":"pg.js","names":[],"sources":["../../../../../zero-cache/src/types/pg.ts"],"sourcesContent":["import {Socket} from 'node:net';\nimport {\n  PG_CONFIGURATION_LIMIT_EXCEEDED,\n  PG_CONNECTION_DOES_NOT_EXIST,\n  PG_CONNECTION_EXCEPTION,\n  PG_CONNECTION_FAILURE,\n  PG_INSUFFICIENT_PRIVILEGE,\n  PG_INVALID_AUTHORIZATION_SPECIFICATION,\n  PG_INVALID_CATALOG_NAME,\n  PG_INVALID_PASSWORD,\n  PG_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION,\n  PG_TOO_MANY_CONNECTIONS,\n} from '@drdgvhbh/postgres-error-codes';\nimport {PreciseDate} from '@google-cloud/precise-date';\nimport {OID} from '@postgresql-typed/oids';\nimport type {LogContext} from '@rocicorp/logger';\nimport postgres, {type Notice, type PostgresType} from 'postgres';\nimport {BigIntJSON, type JSONValue} from '../../../shared/src/bigint-json.ts';\nimport {randInt} from '../../../shared/src/rand.ts';\nimport {ConfigurationError} from './configuration-error.ts';\nimport {\n  DATE,\n  JSON,\n  JSONB,\n  NUMERIC,\n  TIME,\n  TIMESTAMP,\n  TIMESTAMPTZ,\n  TIMETZ,\n} from './pg-types.ts';\n\n// Matches: YEAR-MM-DD HH:MM:SS[.fraction][+-TZ[:MM]][ BC]\nconst pgTimestampRe =\n  /^(\\d+)-(\\d{2}-\\d{2}) (\\d{2}:\\d{2}:\\d{2}(?:\\.\\d+)?)([+-]\\d{1,2}(?::\\d{2})?)?(?: BC)?$/;\n\n// exported for testing.\nexport function timestampToFpMillis(timestamp: string): number {\n  if (timestamp === 'infinity') return Infinity;\n  if (timestamp === '-infinity') return -Infinity;\n  const match = timestamp.match(pgTimestampRe);\n  if (!match) {\n    throw new Error(`Error parsing ${timestamp}`);\n  }\n\n  const [, yearStr, monthDay, time, tz] = match;\n  const bc = timestamp.endsWith(' BC');\n\n  let year = Number(yearStr);\n  if (bc) {\n    // Postgres: 1 BC = JS year 0, 2 BC = JS year -1, N BC = -(N-1)\n    year = -(year - 1);\n  }\n\n  // Format year as ISO 8601 expanded year if needed.\n  // https://tc39.es/ecma262/#sec-expanded-years\n  let isoYear: string;\n  if (year >= 0 && year <= 9999) {\n    isoYear = String(year).padStart(4, '0');\n  } else if (year >= 0) {\n    isoYear = '+' + String(year).padStart(6, '0');\n  } else {\n    isoYear = '-' + String(Math.abs(year)).padStart(6, '0');\n  }\n\n  // Build a UTC ISO string so PreciseDate returns microsecond precision.\n  const utcString = `${isoYear}-${monthDay}T${time}Z`;\n\n  try {\n    const fullTime = new PreciseDate(utcString).getFullTime();\n    const millis = Number(fullTime / 1_000_000n);\n    const nanos = Number(fullTime % 1_000_000n);\n    const ret = millis + nanos * 1e-6; // floating point milliseconds\n\n    // Add back in the timezone offset. We passed local time as UTC,\n    // so a positive offset means we need to subtract, and vice versa.\n    if (tz) {\n      const positiveOffset = tz.startsWith('+');\n      const [hours, minutes] = tz.split(':');\n      const offset =\n        Math.abs(Number(hours)) * 60 + (minutes ? Number(minutes) : 0);\n      const offsetMillis = offset * 60 * 1_000;\n      return positiveOffset ? ret - offsetMillis : ret + offsetMillis;\n    }\n    return ret;\n  } catch (e) {\n    throw new Error(`Error parsing ${timestamp}`, {cause: e});\n  }\n}\n\nfunction serializeTimestamp(val: unknown): string {\n  switch (typeof val) {\n    case 'string':\n      return val; // Let Postgres parse it\n    case 'number': {\n      if (Number.isInteger(val)) {\n        return new PreciseDate(val).toISOString();\n      }\n      // Convert floating point to bigint nanoseconds.\n      const nanoseconds =\n        1_000_000n * BigInt(Math.trunc(val)) +\n        BigInt(Math.trunc((val % 1) * 1e6));\n      return new PreciseDate(nanoseconds).toISOString();\n    }\n    // Note: Don't support bigint inputs until we decide what the semantics are (e.g. micros vs nanos)\n    // case 'bigint':\n    //   return new PreciseDate(val).toISOString();\n    default:\n      if (val instanceof Date) {\n        return val.toISOString();\n      }\n  }\n  throw new Error(`Unsupported type \"${typeof val}\" for timestamp: ${val}`);\n}\n\nconst MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;\n\nfunction serializeTime(x: unknown, type: 'time' | 'timetz'): string {\n  switch (typeof x) {\n    case 'string':\n      return x; // Let Postgres parse it\n    case 'number':\n      return millisecondsToPostgresTime(x);\n  }\n  throw new Error(`Unsupported type \"${typeof x}\" for ${type}: ${x}`);\n}\n\nexport function millisecondsToPostgresTime(milliseconds: number): string {\n  if (milliseconds < 0) {\n    throw new Error('Milliseconds cannot be negative');\n  }\n\n  if (milliseconds >= MILLISECONDS_PER_DAY) {\n    throw new Error(\n      `Milliseconds cannot exceed 24 hours (${MILLISECONDS_PER_DAY}ms)`,\n    );\n  }\n\n  milliseconds = Math.floor(milliseconds); // Ensure it's an integer\n\n  const totalSeconds = Math.floor(milliseconds / 1000);\n  const hours = Math.floor(totalSeconds / 3600);\n  const minutes = Math.floor((totalSeconds % 3600) / 60);\n  const seconds = totalSeconds % 60;\n  const ms = milliseconds % 1000;\n\n  return `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}.${ms.toString().padStart(3, '0')}+00`;\n}\n\n// Regular expression to match HH:MM:SS, HH:MM:SS.mmm, or HH:MM:SS+00 / HH:MM:SS.mmm+00\n// Supports optional timezone offset\nconst timeRegex =\n  /^(\\d{1,2}):(\\d{2}):(\\d{2})(?:\\.(\\d{1,6}))?(?:([+-])(\\d{1,2})(?::(\\d{2}))?)?$/;\n\nexport function postgresTimeToMilliseconds(timeString: string): number {\n  // Validate basic format\n  if (!timeString || typeof timeString !== 'string') {\n    throw new Error('Invalid time string: must be a non-empty string');\n  }\n\n  const match = timeString.match(timeRegex);\n\n  if (!match) {\n    throw new Error(\n      `Invalid time format: \"${timeString}\". Expected HH:MM:SS[.mmm][+|-HH[:MM]]`,\n    );\n  }\n\n  // Extract components\n  const hours = parseInt(match[1], 10);\n  const minutes = parseInt(match[2], 10);\n  const seconds = parseInt(match[3], 10);\n  // Handle optional milliseconds, pad right with zeros if needed\n  let milliseconds = 0;\n  if (match[4]) {\n    // Pad microseconds to 6 digits\n    const msString = match[4].padEnd(6, '0');\n    // slice milliseconds out of the microseconds\n    // e.g. 123456 -> 123, 1234 -> 123,\n    milliseconds = parseInt(msString.slice(0, 3), 10);\n  }\n\n  // Validate ranges\n  if (hours < 0 || hours > 24) {\n    throw new Error(\n      `Invalid hours: ${hours}. Must be between 0 and 24 (24 means end of day)`,\n    );\n  }\n\n  if (minutes < 0 || minutes >= 60) {\n    throw new Error(`Invalid minutes: ${minutes}. Must be between 0 and 59`);\n  }\n\n  if (seconds < 0 || seconds >= 60) {\n    throw new Error(`Invalid seconds: ${seconds}. Must be between 0 and 59`);\n  }\n\n  if (milliseconds < 0 || milliseconds >= 1000) {\n    throw new Error(\n      `Invalid milliseconds: ${milliseconds}. Must be between 0 and 999`,\n    );\n  }\n\n  // Special case: PostgreSQL allows 24:00:00 to represent end of day\n  if (hours === 24 && (minutes !== 0 || seconds !== 0 || milliseconds !== 0)) {\n    throw new Error(\n      'Invalid time: when hours is 24, minutes, seconds, and milliseconds must be 0',\n    );\n  }\n\n  // Calculate total milliseconds\n  let totalMs =\n    hours * 3600000 + minutes * 60000 + seconds * 1000 + milliseconds;\n\n  // Timezone Offset\n  if (match[5]) {\n    const sign = match[5] === '+' ? 1 : -1;\n    const tzHours = parseInt(match[6], 10);\n    const tzMinutes = match[7] ? parseInt(match[7], 10) : 0;\n    const offsetMs = sign * (tzHours * 3600000 + tzMinutes * 60000);\n    totalMs -= offsetMs;\n  }\n\n  // Normalize to 0-24h only if outside valid range\n  if (totalMs > MILLISECONDS_PER_DAY || totalMs < 0) {\n    return (\n      ((totalMs % MILLISECONDS_PER_DAY) + MILLISECONDS_PER_DAY) %\n      MILLISECONDS_PER_DAY\n    );\n  }\n\n  return totalMs;\n}\n\nfunction dateToUTCMidnight(date: string): number {\n  if (date === 'infinity') return Infinity;\n  if (date === '-infinity') return -Infinity;\n  const d = new Date(date);\n  return Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate());\n}\n\n/**\n * The (javascript) types of objects that can be returned by our configured\n * Postgres clients. For initial-sync, these comes from the postgres.js client:\n *\n * https://github.com/porsager/postgres/blob/master/src/types.js\n *\n * and for the replication stream these come from the the node-postgres client:\n *\n * https://github.com/brianc/node-pg-types/blob/master/lib/textParsers.js\n */\nexport type PostgresValueType = JSONValue | Uint8Array;\n\nexport type TypeOptions = {\n  /**\n   * Sends strings directly as JSON values (i.e. without JSON stringification).\n   * The application is responsible for ensuring that string inputs for JSON\n   * columns are already stringified. Other data types (e.g. objects) will\n   * still be stringified by the pg client.\n   */\n  sendStringAsJson?: boolean;\n};\n\n/**\n * Configures types for the Postgres.js client library (`postgres`).\n *\n * @param jsonAsString Keep JSON / JSONB values as strings instead of parsing.\n */\nexport const postgresTypeConfig = ({sendStringAsJson}: TypeOptions = {}) => ({\n  // Type the type IDs as `number` so that Typescript doesn't complain about\n  // referencing external types during type inference.\n  types: {\n    bigint: postgres.BigInt,\n    json: {\n      to: JSON,\n      from: [JSON, JSONB],\n      serialize: sendStringAsJson\n        ? (x: unknown) => (typeof x === 'string' ? x : BigIntJSON.stringify(x))\n        : BigIntJSON.stringify,\n      parse: BigIntJSON.parse,\n    },\n    // Timestamps are converted to PreciseDate objects.\n    timestamp: {\n      to: TIMESTAMP,\n      from: [TIMESTAMP, TIMESTAMPTZ],\n      serialize: serializeTimestamp,\n      parse: timestampToFpMillis,\n    },\n    // Times are converted as strings\n    time: {\n      to: TIME,\n      from: [TIME, TIMETZ],\n      serialize: (x: unknown) => serializeTime(x, 'time'),\n      parse: postgresTimeToMilliseconds,\n    },\n\n    timetz: {\n      to: TIMETZ,\n      from: [TIME, TIMETZ],\n      serialize: (x: unknown) => serializeTime(x, 'timetz'),\n      parse: postgresTimeToMilliseconds,\n    },\n\n    // The DATE type is stored directly as the PG normalized date string.\n    date: {\n      to: DATE,\n      from: [DATE],\n      serialize: (x: string | Date) =>\n        (x instanceof Date ? x : new Date(x)).toISOString(),\n      parse: dateToUTCMidnight,\n    },\n    // Returns a `js` number which can lose precision for large numbers.\n    // JS number is 53 bits so this should generally not occur.\n    // An API will be provided for users to override this type.\n    numeric: {\n      to: NUMERIC,\n      from: [NUMERIC],\n      serialize: (x: number) => String(x), // pg expects a string\n      parse: (x: string | number) => Number(x),\n    },\n  },\n});\n\nexport type PostgresDB = postgres.Sql<{\n  bigint: bigint;\n  json: JSONValue;\n}>;\n\nexport type PostgresTransaction = postgres.TransactionSql<{\n  bigint: bigint;\n  json: JSONValue;\n}>;\n\n// Guards against half-open TCP connections, which otherwise hang the pool\n// indefinitely: a proxy can keep the client-facing socket alive (ACKing TCP\n// keepalives) after its backend is gone, so no 'close' or 'error' event ever\n// fires and statements like BEGIN / COMMIT await forever.\n// See https://github.com/porsager/postgres/issues/1089.\n//\n// If no bytes are read or written for this long, the socket is reset, which\n// rejects all in-flight queries and lets the pool recover. Wire activity\n// resets the timer, so streaming operations (e.g. COPY) are safe, but\n// statements that legitimately compute silently for longer (e.g. index\n// builds in migrations) must raise this. Settable as an emergency measure\n// (0 disables); deliberately not exposed as a server option.\nconst SOCKET_INACTIVITY_TIMEOUT_MS = parseInt(\n  process.env.ZERO_PG_SOCKET_INACTIVITY_TIMEOUT ?? '120000',\n);\n\ntype SocketFactoryOptions = {\n  host: string[];\n  port: number[];\n  path?: string | false;\n};\n\n/**\n * Creates the custom socket factory passed to postgres.js via its (untyped)\n * `socket` option. postgres.js does not call `connect()` on custom sockets,\n * and its TLS upgrade reads `socket.host` for the SNI servername, so the\n * factory must handle both itself.\n *\n * Note: unlike postgres.js's internal socket, reconnects do not rotate\n * through multiple hosts; multi-host URIs are not used by the zero-cache.\n *\n * Exported for testing.\n */\nexport function inactivityTimeoutSocket(\n  lc: LogContext,\n  timeoutMs = SOCKET_INACTIVITY_TIMEOUT_MS,\n) {\n  return (options: SocketFactoryOptions): Socket => {\n    const socket = new Socket();\n    const target = options.path\n      ? options.path\n      : `${options.host[0]}:${options.port[0]}`;\n    if (timeoutMs > 0) {\n      // socket.setTimeout() cannot be used here: it registers its callback\n      // as a 'timeout' event listener, and postgres.js removes all listeners\n      // from the raw socket when upgrading it to TLS (removeAllListeners()\n      // in secure()), which would silently disarm the watchdog on every TLS\n      // connection. An interval is not a socket listener, so it survives the\n      // upgrade, and encrypted traffic still flows through this raw socket,\n      // advancing its byte counters.\n      //\n      // The counters are sampled once per timeout period, so a half-open\n      // socket is reset after one to two timeout periods of inactivity.\n      let lastActivity = -1;\n      const watchdog = setInterval(() => {\n        if (socket.destroyed) {\n          clearInterval(watchdog);\n          return;\n        }\n        const activity = socket.bytesRead + socket.bytesWritten;\n        if (activity === lastActivity) {\n          lc.warn?.(\n            `resetting connection to ${target} after ${timeoutMs} ms of inactivity ` +\n              `(likely half-open); in-flight queries will be rejected`,\n          );\n          clearInterval(watchdog);\n          socket.resetAndDestroy();\n        } else {\n          lastActivity = activity;\n        }\n      }, timeoutMs);\n      watchdog.unref();\n      // Best-effort cleanup; removed on TLS upgrade, in which case the\n      // destroyed check above clears the (unref'ed) interval instead.\n      socket.once('close', () => clearInterval(watchdog));\n    }\n    if (options.path) {\n      socket.connect(options.path);\n    } else {\n      const [host] = options.host;\n      const [port] = options.port;\n      socket.connect(port, host);\n      // Read by postgres.js for the TLS SNI servername.\n      Object.assign(socket, {host, port});\n    }\n    return socket;\n  };\n}\n\nexport function pgClient(\n  lc: LogContext,\n  connectionURI: string,\n  // A descriptive name for the code that is making the connection, so that we\n  // can debug things like deadlocks.\n  applicationName: string,\n  options?: postgres.Options<{\n    bigint: PostgresType<bigint>;\n    json: PostgresType<JSONValue>;\n  }>,\n  opts?: TypeOptions,\n): PostgresDB {\n  applicationName = `zero-${applicationName}`;\n\n  // Postgres carries row values in the `detail`, `hint`, `where` and\n  // `internal_query` fields -- e.g. a unique violation reports\n  // `Key (email)=(someone@example.com) already exists` in `detail`. Forward\n  // only the severity, SQLSTATE and schema location; never the Notice itself.\n  const safeNotice = (n: Notice) => ({\n    severity: n.severity,\n    code: n.code,\n    message: n.message,\n    schema: n.schema_name,\n    table: n.table_name,\n    column: n.column_name,\n    constraint: n.constraint_name,\n    routine: n.routine,\n  });\n\n  const onnotice = (n: Notice) => {\n    // https://www.postgresql.org/docs/current/plpgsql-errors-and-messages.html#PLPGSQL-STATEMENTS-RAISE\n    switch (n.severity) {\n      case 'NOTICE':\n        return; // silenced\n      case 'DEBUG':\n        lc.debug?.('pg notice', safeNotice(n));\n        return;\n      case 'WARNING':\n        lc.warn?.('pg notice', safeNotice(n));\n        return;\n      case 'EXCEPTION':\n        lc.error?.('pg notice', safeNotice(n));\n        return;\n      case 'LOG':\n      case 'INFO':\n      default:\n        lc.info?.('pg notice', safeNotice(n));\n    }\n  };\n  const url = new URL(connectionURI);\n  const sslFlag =\n    url.searchParams.get('ssl') ?? url.searchParams.get('sslmode') ?? 'prefer';\n\n  let ssl: boolean | 'prefer' | {rejectUnauthorized: boolean};\n  if (sslFlag === 'disable' || sslFlag === 'false') {\n    ssl = false;\n  } else if (sslFlag === 'no-verify') {\n    ssl = {rejectUnauthorized: false};\n  } else {\n    ssl = sslFlag as 'prefer';\n  }\n\n  // Set connections to expire between 5 and 10 minutes to free up state on PG.\n  const maxLifetimeSeconds = randInt(5 * 60, 10 * 60);\n  const providedConnection = options?.connection ?? {};\n\n  // postgres.js supports a custom socket factory via the `socket` option,\n  // but it is missing from its type declarations, hence the untyped spread.\n  const socketFactory = {\n    socket: inactivityTimeoutSocket(lc.withContext('appName', applicationName)),\n  };\n\n  return postgres(connectionURI, {\n    ...postgresTypeConfig(opts),\n    onnotice,\n    ['max_lifetime']: maxLifetimeSeconds,\n    // Close idle connections cleanly before the socket inactivity timer\n    // (which cannot distinguish an idle pool connection from a hung query)\n    // resets them.\n    ['idle_timeout']: 60,\n    ssl,\n    ...socketFactory,\n    ...options,\n    connection: {\n      ...providedConnection,\n      ['application_name']: applicationName,\n    },\n  });\n}\n\nexport async function connectPgClient(\n  ...args: Parameters<typeof pgClient>\n): Promise<PostgresDB> {\n  const db = pgClient(...args);\n  try {\n    await db`SELECT 1`.simple().execute();\n    return db;\n  } catch (e) {\n    if (isPostgresConfigError(e)) {\n      throw new ConfigurationError(\n        'Unable to connect to Postgres. Check your database configuration.',\n        {cause: e},\n      );\n    }\n    throw e;\n  }\n}\n\n/**\n * Disables any statement_timeout for the current transaction. By default,\n * Postgres does not impose a statement timeout, but some users and providers\n * set one at the database level (even though it is explicitly discouraged by\n * the Postgres documentation).\n *\n * Zero logic in particular often does not fit into the category of general\n * application logic; for potentially long-running operations like migrations\n * and background cleanup, the statement timeout should be disabled to prevent\n * these operations from timing out.\n */\nexport function disableStatementTimeout(sql: PostgresTransaction) {\n  void sql`SET LOCAL statement_timeout = 0;`.execute().catch(() => {});\n}\n\nexport const typeNameByOID: Record<number, string> = Object.freeze(\n  Object.fromEntries(\n    Object.entries(OID).map(([name, oid]) => [\n      oid,\n      name.startsWith('_') ? `${name.substring(1)}[]` : name,\n    ]),\n  ),\n);\n\nexport function isPostgresError(e: unknown, ...codes: [string, ...string[]]) {\n  return e instanceof postgres.PostgresError && codes.includes(e.code);\n}\n\nfunction isPostgresStartupConnectionError(e: unknown) {\n  if (!(e instanceof Error) || !('code' in e)) {\n    return false;\n  }\n  const {code} = e;\n  // postgres.js throws plain Error instances for connection failures that\n  // happen before Postgres can return a SQLSTATE. These are still startup\n  // configuration problems for Zero: wrong host/port, unreachable DB, DNS,\n  // TLS certificate mismatch, etc.\n  return (\n    typeof code === 'string' &&\n    [\n      'CONNECT_TIMEOUT',\n      'ECONNREFUSED',\n      'ECONNRESET',\n      'EHOSTUNREACH',\n      'ENETUNREACH',\n      'ENOTFOUND',\n      'EAI_AGAIN',\n      'ETIMEDOUT',\n      'ERR_TLS_CERT_ALTNAME_INVALID',\n      'SELF_SIGNED_CERT_IN_CHAIN',\n      'DEPTH_ZERO_SELF_SIGNED_CERT',\n      'UNABLE_TO_VERIFY_LEAF_SIGNATURE',\n    ].includes(code)\n  );\n}\n\nexport function isPostgresConfigError(e: unknown) {\n  return (\n    isPostgresStartupConnectionError(e) ||\n    isPostgresError(\n      e,\n      PG_CONNECTION_EXCEPTION,\n      PG_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION,\n      PG_CONNECTION_DOES_NOT_EXIST,\n      PG_CONNECTION_FAILURE,\n      PG_INVALID_AUTHORIZATION_SPECIFICATION,\n      PG_INVALID_PASSWORD,\n      PG_INVALID_CATALOG_NAME,\n      PG_INSUFFICIENT_PRIVILEGE,\n      PG_TOO_MANY_CONNECTIONS,\n      PG_CONFIGURATION_LIMIT_EXCEEDED,\n    )\n  );\n}\n"],"mappings":"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"}

package/out/zero-cache/src/types/poke-chunk.d.ts

@@ -0,0 +1,18 @@
+import { type PokeChunk } from '../../../zero-protocol/src/poke.ts';
+export declare const POKE_CHUNK_BYTES: number;
+export type EmitPokeChunk = (chunk: PokeChunk) => Promise<void>;
+/**
+ * Streams a JSON array into fixed-size UTF-8 chunks.
+ *
+ * The emitter must finish consuming a chunk before its promise resolves. This
+ * lets the encoder reuse one fixed-size buffer for the entire poke. Memory is
+ * therefore O(chunk size), independent of poke size.
+ */
+export declare class PokeChunkEncoder {
+    #private;
+    constructor(chunkBytes?: number);
+    addPatch(serializedPatch: string, emit: EmitPokeChunk): Promise<void>;
+    finish(emit: EmitPokeChunk): Promise<void>;
+    cancel(): void;
+}
+//# sourceMappingURL=poke-chunk.d.ts.map

package/out/zero-cache/src/types/poke-chunk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"poke-chunk.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/poke-chunk.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,SAAS,EACf,MAAM,oCAAoC,CAAC;AAE5C,eAAO,MAAM,gBAAgB,QAAc,CAAC;AAE5C,MAAM,MAAM,aAAa,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;;gBAOf,UAAU,SAAmB;IAQnC,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAMrE,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhD,MAAM,IAAI,IAAI;CA2Bf"}

package/out/zero-cache/src/types/poke-chunk.js

@@ -0,0 +1,57 @@
+import { assert } from "../../../shared/src/asserts.js";
+import "../../../zero-protocol/src/poke.js";
+//#region ../zero-cache/src/types/poke-chunk.ts
+var POKE_CHUNK_BYTES = 1024 * 1024;
+/**
+* Streams a JSON array into fixed-size UTF-8 chunks.
+*
+* The emitter must finish consuming a chunk before its promise resolves. This
+* lets the encoder reuse one fixed-size buffer for the entire poke. Memory is
+* therefore O(chunk size), independent of poke size.
+*/
+var PokeChunkEncoder = class {
+	#encoder = new TextEncoder();
+	#buffer;
+	#bufferedBytes = 1;
+	#patchCount = 0;
+	#finished = false;
+	constructor(chunkBytes = POKE_CHUNK_BYTES) {
+		assert(chunkBytes >= 5, "poke chunk size must be at least five bytes");
+		this.#buffer = new Uint8Array(chunkBytes);
+		this.#buffer[0] = 0;
+	}
+	async addPatch(serializedPatch, emit) {
+		assert(!this.#finished, "cannot add a patch to a finished poke");
+		await this.#write(this.#patchCount++ === 0 ? "[" : ",", emit);
+		await this.#write(serializedPatch, emit);
+	}
+	async finish(emit) {
+		assert(!this.#finished, "cannot finish a poke twice");
+		this.#finished = true;
+		await this.#write(this.#patchCount === 0 ? "[]" : "]", emit);
+		await this.#flush(emit);
+	}
+	cancel() {
+		this.#finished = true;
+		this.#bufferedBytes = 1;
+	}
+	async #write(value, emit) {
+		let read = 0;
+		while (read < value.length) {
+			const target = this.#buffer.subarray(this.#bufferedBytes);
+			const result = this.#encoder.encodeInto(value.slice(read), target);
+			read += result.read;
+			this.#bufferedBytes += result.written;
+			if (this.#bufferedBytes === this.#buffer.length || result.read === 0) await this.#flush(emit);
+		}
+	}
+	async #flush(emit) {
+		if (this.#bufferedBytes === 1) return;
+		await emit(this.#buffer.subarray(0, this.#bufferedBytes));
+		this.#bufferedBytes = 1;
+	}
+};
+//#endregion
+export { PokeChunkEncoder };
+
+//# sourceMappingURL=poke-chunk.js.map

package/out/zero-cache/src/types/poke-chunk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"poke-chunk.js","names":["#encoder","#buffer","#finished","#write","#patchCount","#flush","#bufferedBytes"],"sources":["../../../../../zero-cache/src/types/poke-chunk.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {\n  POKE_CHUNK_MESSAGE_TYPE,\n  type PokeChunk,\n} from '../../../zero-protocol/src/poke.ts';\n\nexport const POKE_CHUNK_BYTES = 1024 * 1024;\n\nexport type EmitPokeChunk = (chunk: PokeChunk) => Promise<void>;\n\n/**\n * Streams a JSON array into fixed-size UTF-8 chunks.\n *\n * The emitter must finish consuming a chunk before its promise resolves. This\n * lets the encoder reuse one fixed-size buffer for the entire poke. Memory is\n * therefore O(chunk size), independent of poke size.\n */\nexport class PokeChunkEncoder {\n  readonly #encoder = new TextEncoder();\n  readonly #buffer: Uint8Array;\n  #bufferedBytes = 1;\n  #patchCount = 0;\n  #finished = false;\n\n  constructor(chunkBytes = POKE_CHUNK_BYTES) {\n    // One byte tags the binary message and four bytes are required to encode\n    // the largest UTF-8 code point. A smaller buffer could prevent progress.\n    assert(chunkBytes >= 5, 'poke chunk size must be at least five bytes');\n    this.#buffer = new Uint8Array(chunkBytes);\n    this.#buffer[0] = POKE_CHUNK_MESSAGE_TYPE;\n  }\n\n  async addPatch(serializedPatch: string, emit: EmitPokeChunk): Promise<void> {\n    assert(!this.#finished, 'cannot add a patch to a finished poke');\n    await this.#write(this.#patchCount++ === 0 ? '[' : ',', emit);\n    await this.#write(serializedPatch, emit);\n  }\n\n  async finish(emit: EmitPokeChunk): Promise<void> {\n    assert(!this.#finished, 'cannot finish a poke twice');\n    this.#finished = true;\n    await this.#write(this.#patchCount === 0 ? '[]' : ']', emit);\n    await this.#flush(emit);\n  }\n\n  cancel(): void {\n    this.#finished = true;\n    this.#bufferedBytes = 1;\n  }\n\n  async #write(value: string, emit: EmitPokeChunk): Promise<void> {\n    let read = 0;\n    while (read < value.length) {\n      const target = this.#buffer.subarray(this.#bufferedBytes);\n      const result = this.#encoder.encodeInto(value.slice(read), target);\n      read += result.read;\n      this.#bufferedBytes += result.written;\n\n      // A multi-byte code point may not fit in the remaining space.\n      if (this.#bufferedBytes === this.#buffer.length || result.read === 0) {\n        await this.#flush(emit);\n      }\n    }\n  }\n\n  async #flush(emit: EmitPokeChunk): Promise<void> {\n    if (this.#bufferedBytes === 1) {\n      return;\n    }\n    await emit(this.#buffer.subarray(0, this.#bufferedBytes));\n    this.#bufferedBytes = 1;\n  }\n}\n"],"mappings":";;;AAMA,IAAa,mBAAmB,OAAO;;;;;;;;AAWvC,IAAa,mBAAb,MAA8B;CAC5B,WAAoB,IAAI,YAAY;CACpC;CACA,iBAAiB;CACjB,cAAc;CACd,YAAY;CAEZ,YAAY,aAAa,kBAAkB;EAGzC,OAAO,cAAc,GAAG,6CAA6C;EACrE,KAAKC,UAAU,IAAI,WAAW,UAAU;EACxC,KAAKA,QAAQ,KAAA;CACf;CAEA,MAAM,SAAS,iBAAyB,MAAoC;EAC1E,OAAO,CAAC,KAAKC,WAAW,uCAAuC;EAC/D,MAAM,KAAKC,OAAO,KAAKC,kBAAkB,IAAI,MAAM,KAAK,IAAI;EAC5D,MAAM,KAAKD,OAAO,iBAAiB,IAAI;CACzC;CAEA,MAAM,OAAO,MAAoC;EAC/C,OAAO,CAAC,KAAKD,WAAW,4BAA4B;EACpD,KAAKA,YAAY;EACjB,MAAM,KAAKC,OAAO,KAAKC,gBAAgB,IAAI,OAAO,KAAK,IAAI;EAC3D,MAAM,KAAKC,OAAO,IAAI;CACxB;CAEA,SAAe;EACb,KAAKH,YAAY;EACjB,KAAKI,iBAAiB;CACxB;CAEA,MAAMH,OAAO,OAAe,MAAoC;EAC9D,IAAI,OAAO;EACX,OAAO,OAAO,MAAM,QAAQ;GAC1B,MAAM,SAAS,KAAKF,QAAQ,SAAS,KAAKK,cAAc;GACxD,MAAM,SAAS,KAAKN,SAAS,WAAW,MAAM,MAAM,IAAI,GAAG,MAAM;GACjE,QAAQ,OAAO;GACf,KAAKM,kBAAkB,OAAO;GAG9B,IAAI,KAAKA,mBAAmB,KAAKL,QAAQ,UAAU,OAAO,SAAS,GACjE,MAAM,KAAKI,OAAO,IAAI;EAE1B;CACF;CAEA,MAAMA,OAAO,MAAoC;EAC/C,IAAI,KAAKC,mBAAmB,GAC1B;EAEF,MAAM,KAAK,KAAKL,QAAQ,SAAS,GAAG,KAAKK,cAAc,CAAC;EACxD,KAAKA,iBAAiB;CACxB;AACF"}

package/out/zero-cache/src/types/processes.d.ts

@@ -15,8 +15,7 @@ export declare const MESSAGE_TYPES: {
     readonly subscribe: "subscribe";
     readonly notify: "notify";
     readonly ready: "ready";
-    readonly backupWatermarkRequest: "backupWatermarkRequest";
-    readonly backupWatermarkResponse: "backupWatermarkResponse";
+    readonly backupWatermarkUpdate: "backupWatermakUpdate";
 };
 export type Message<Payload> = [keyof typeof MESSAGE_TYPES, Payload];
 export interface Sender {

package/out/zero-cache/src/types/processes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processes.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/processes.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,UAAU,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,YAAY,MAAM,aAAa,CAAC;AAIvC;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa;;;;;;;;CAQhB,CAAC;AAEX,MAAM,MAAM,OAAO,CAAC,OAAO,IAAI,CAAC,MAAM,OAAO,aAAa,EAAE,OAAO,CAAC,CAAC;AAwCrE,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,EAC7B,OAAO,EAAE,CAAC,EACV,UAAU,CAAC,EAAE,UAAU,EACvB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GACvC,OAAO,CAAC;IAEX,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,UAAW,SAAQ,MAAM,EAAE,YAAY;IACtD,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C;;;;OAIG;IACH,aAAa,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,EACtC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EACV,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,UAAU,KAAK,IAAI,GACpD,IAAI,CAAC;IAER;;;;OAIG;IACH,eAAe,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,EACxC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EACV,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,UAAU,KAAK,IAAI,GACpD,IAAI,CAAC;CACT;AAED,MAAM,WAAW,MAAO,SAAQ,UAAU,EAAE,QAAQ;CAAG;AAkCvD;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,GAAG,IAE5B,CAAC;AAIT,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,OAAc,GAAG,IAAI,CAElE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,mBAAmB,EAAE,OAAO,GAC3B,OAAO,CAET;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,GAAG,EACd,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,MAAM,CAoBR;AAED,wBAAgB,eAAe,CAC7B,SAAS,EAAE,GAAG,EACd,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,MAAM,CAER;AAuBD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CA+BhD"}
+{"version":3,"file":"processes.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/processes.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,UAAU,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,YAAY,MAAM,aAAa,CAAC;AAIvC;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa;;;;;;;CAOhB,CAAC;AAEX,MAAM,MAAM,OAAO,CAAC,OAAO,IAAI,CAAC,MAAM,OAAO,aAAa,EAAE,OAAO,CAAC,CAAC;AAwCrE,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,EAC7B,OAAO,EAAE,CAAC,EACV,UAAU,CAAC,EAAE,UAAU,EACvB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,GACvC,OAAO,CAAC;IAEX,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,UAAW,SAAQ,MAAM,EAAE,YAAY;IACtD,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C;;;;OAIG;IACH,aAAa,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,EACtC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EACV,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,UAAU,KAAK,IAAI,GACpD,IAAI,CAAC;IAER;;;;OAIG;IACH,eAAe,CAAC,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,EACxC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EACV,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,UAAU,KAAK,IAAI,GACpD,IAAI,CAAC;CACT;AAED,MAAM,WAAW,MAAO,SAAQ,UAAU,EAAE,QAAQ;CAAG;AAkCvD;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,GAAG,IAE5B,CAAC;AAIT,wBAAgB,iBAAiB,IAAI,OAAO,CAE3C;AAED,wBAAgB,oBAAoB,CAAC,OAAO,GAAE,OAAc,GAAG,IAAI,CAElE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,mBAAmB,EAAE,OAAO,GAC3B,OAAO,CAET;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,GAAG,EACd,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,MAAM,CAoBR;AAED,wBAAgB,eAAe,CAC7B,SAAS,EAAE,GAAG,EACd,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,EACvB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,MAAM,CAER;AAuBD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CA+BhD"}

package/out/zero-cache/src/types/processes.js

@@ -53,30 +53,6 @@ function singleProcessMode() {
 	return singleProcessOverride || (process.env[SINGLE_PROCESS] ?? "0") !== "0";
 }
 /**
-* Determines whether a module loaded as a worker process entry point should
-* start its worker.
-*
-* Most workers are launched via {@link childWorker}, which in single-process
-* mode runs them in-process (no real fork) by invoking their exported
-* `runWorker` directly; those entry points must therefore *not* self-start in
-* single-process mode, or they would run twice.
-*
-* A worker launched via {@link forkChildWorker}, however, is *always* a real
-* forked OS process — even in single-process mode — and it inherits the
-* parent's `SINGLE_PROCESS` env. So {@link singleProcessMode} alone would
-* wrongly suppress its startup, leaving the parent to spin re-forking a child
-* that immediately exits. Such a forked child has a non-null
-* {@link parentWorker} (`process.send` is defined), which is the signal to
-* start regardless. A standalone direct launch (no parent, not single-process)
-* also starts.
-*
-* @param parent The entry point's {@link parentWorker} (non-null iff forked).
-* @param isSingleProcessMode The result of {@link singleProcessMode}.
-*/
-function shouldStartWorker(parent, isSingleProcessMode) {
-	return parent !== null || !isSingleProcessMode;
-}
-/**
 *
 * @param modulePath Path to the module file, relative to zero-cache/src/, or an absolute file:// URL
 */
@@ -98,9 +74,6 @@ function childWorker(moduleUrl, env, ...args) {
 	}
 	return forkChildWorkerWithArgs(moduleUrl, env, args);
 }
-function forkChildWorker(moduleUrl, env, ...args) {
-	return forkChildWorkerWithArgs(moduleUrl, env, workerArgs(args));
-}
 function workerArgs(args) {
 	return [...args, ...process.argv.slice(2)];
 }
@@ -140,6 +113,6 @@ function inProcChannel() {
 	}))];
 }
 //#endregion
-export { childWorker, forkChildWorker, parentWorker, shouldStartWorker, singleProcessMode };
+export { childWorker, parentWorker, singleProcessMode };
 
 //# sourceMappingURL=processes.js.map

package/out/zero-cache/src/types/processes.js.map

@@ -1 +1 @@
-{"version":3,"file":"processes.js","names":[],"sources":["../../../../../zero-cache/src/types/processes.ts"],"sourcesContent":["import {\n  type ChildProcess,\n  fork,\n  type SendHandle,\n  type Serializable,\n} from 'node:child_process';\nimport EventEmitter from 'node:events';\nimport {platform} from 'node:os';\nimport {pid} from 'node:process';\n\n/**\n * Central registry of message type names, which are used to identify\n * the payload in {@link Message} objects sent between processes. The\n * payloads themselves are implementation specific and defined in each\n * component; only the type name is reserved here to avoid collisions.\n *\n * Receiving logic can call {@link getMessage()} with the name of\n * the message of interest to filter messages to those of interest.\n */\nexport const MESSAGE_TYPES = {\n  handoff: 'handoff',\n  status: 'status',\n  subscribe: 'subscribe',\n  notify: 'notify',\n  ready: 'ready',\n  backupWatermarkRequest: 'backupWatermarkRequest',\n  backupWatermarkResponse: 'backupWatermarkResponse',\n} as const;\n\nexport type Message<Payload> = [keyof typeof MESSAGE_TYPES, Payload];\n\nfunction getMessage<M extends Message<unknown>>(\n  type: M[0],\n  data: unknown,\n): M[1] | null {\n  if (Array.isArray(data) && data.length === 2 && data[0] === type) {\n    return data[1] as M[1];\n  }\n  return null;\n}\n\nfunction onMessageType<M extends Message<unknown>>(\n  e: EventEmitter,\n  type: M[0],\n  handler: (msg: M[1], sendHandle?: SendHandle) => void,\n) {\n  return e.on('message', (data, sendHandle) => {\n    const msg = getMessage(type, data);\n    if (msg) {\n      handler(msg, sendHandle);\n    }\n  });\n}\n\nfunction onceMessageType<M extends Message<unknown>>(\n  e: EventEmitter,\n  type: M[0],\n  handler: (msg: M[1], sendHandle?: SendHandle) => void,\n) {\n  const listener = (data: unknown, sendHandle: SendHandle) => {\n    const msg = getMessage(type, data);\n    if (msg) {\n      e.off('message', listener);\n      handler(msg, sendHandle);\n    }\n  };\n  return e.on('message', listener);\n}\n\nexport interface Sender {\n  send<M extends Message<unknown>>(\n    message: M,\n    sendHandle?: SendHandle,\n    callback?: (error: Error | null) => void,\n  ): boolean;\n\n  kill(signal?: NodeJS.Signals): void;\n}\n\nexport interface Subprocess extends Sender, EventEmitter {\n  pid?: number | undefined;\n}\n\nexport interface Receiver extends EventEmitter {\n  /**\n   * The receiving side of {@link Sender.send()} that is a wrapper around\n   * {@link on}('message', ...) that invokes the `handler` for messages of\n   * the specified `type`.\n   */\n  onMessageType<M extends Message<unknown>>(\n    type: M[0],\n    handler: (msg: M[1], sendHandle?: SendHandle) => void,\n  ): this;\n\n  /**\n   * The receiving side of {@link Sender.send()} that behaves like\n   * {@link once}('message', ...) that invokes the `handler` for the next\n   * message of the specified `type` and then unsubscribes.\n   */\n  onceMessageType<M extends Message<unknown>>(\n    type: M[0],\n    handler: (msg: M[1], sendHandle?: SendHandle) => void,\n  ): this;\n}\n\nexport interface Worker extends Subprocess, Receiver {}\n\n/**\n * Adds the {@link Receiver.onMessageType()} and {@link Receiver.onceMessageType()}\n * methods to convert the given `EventEmitter` to a `Receiver`.\n */\nfunction wrap<P extends EventEmitter>(proc: P): P & Receiver {\n  return new Proxy(proc, {\n    get(target: P, prop: string | symbol, receiver: unknown) {\n      switch (prop) {\n        case 'onMessageType':\n          return (\n            type: keyof typeof MESSAGE_TYPES,\n            handler: (msg: unknown, sendHandle?: SendHandle) => void,\n          ) => {\n            onMessageType(target, type, handler);\n            return receiver; // this\n          };\n        case 'onceMessageType':\n          return (\n            type: keyof typeof MESSAGE_TYPES,\n            handler: (msg: unknown, sendHandle?: SendHandle) => void,\n          ) => {\n            onceMessageType(target, type, handler);\n            return receiver; // this\n          };\n      }\n      return Reflect.get(target, prop, receiver);\n    },\n  }) as P & Receiver;\n}\n\ntype Proc = Pick<ChildProcess, 'send' | 'kill' | 'pid'> & EventEmitter;\n\n/**\n * The parentWorker for forked processes, or `null` if the process was not forked.\n * (Analogous to the `parentPort: MessagePort | null` of the `\"workers\"` library).\n */\nexport const parentWorker: Worker | null = process.send\n  ? wrap(process as Proc)\n  : null;\n\nconst SINGLE_PROCESS = 'SINGLE_PROCESS';\nlet singleProcessOverride = false;\nexport function singleProcessMode(): boolean {\n  return singleProcessOverride || (process.env[SINGLE_PROCESS] ?? '0') !== '0';\n}\n\nexport function setSingleProcessMode(enabled: boolean = true): void {\n  singleProcessOverride = enabled;\n}\n\n/**\n * Determines whether a module loaded as a worker process entry point should\n * start its worker.\n *\n * Most workers are launched via {@link childWorker}, which in single-process\n * mode runs them in-process (no real fork) by invoking their exported\n * `runWorker` directly; those entry points must therefore *not* self-start in\n * single-process mode, or they would run twice.\n *\n * A worker launched via {@link forkChildWorker}, however, is *always* a real\n * forked OS process — even in single-process mode — and it inherits the\n * parent's `SINGLE_PROCESS` env. So {@link singleProcessMode} alone would\n * wrongly suppress its startup, leaving the parent to spin re-forking a child\n * that immediately exits. Such a forked child has a non-null\n * {@link parentWorker} (`process.send` is defined), which is the signal to\n * start regardless. A standalone direct launch (no parent, not single-process)\n * also starts.\n *\n * @param parent The entry point's {@link parentWorker} (non-null iff forked).\n * @param isSingleProcessMode The result of {@link singleProcessMode}.\n */\nexport function shouldStartWorker(\n  parent: Worker | null,\n  isSingleProcessMode: boolean,\n): boolean {\n  return parent !== null || !isSingleProcessMode;\n}\n\n/**\n *\n * @param modulePath Path to the module file, relative to zero-cache/src/, or an absolute file:// URL\n */\nexport function childWorker(\n  moduleUrl: URL,\n  env?: NodeJS.ProcessEnv,\n  ...args: string[]\n): Worker {\n  args = workerArgs(args);\n\n  if (singleProcessMode()) {\n    const [parent, child] = inProcChannel();\n    import(moduleUrl.href)\n      .then(async ({default: runWorker}) => {\n        try {\n          await runWorker(parent, env ?? process.env, ...args);\n          child.emit('close', 0);\n          return;\n        } catch (err) {\n          child.emit('error', err);\n          child.emit('close', -1);\n        }\n      })\n      .catch(err => child.emit('error', err));\n    return child;\n  }\n  return forkChildWorkerWithArgs(moduleUrl, env, args);\n}\n\nexport function forkChildWorker(\n  moduleUrl: URL,\n  env?: NodeJS.ProcessEnv,\n  ...args: string[]\n): Worker {\n  return forkChildWorkerWithArgs(moduleUrl, env, workerArgs(args));\n}\n\nfunction workerArgs(args: string[]): string[] {\n  return [...args, ...process.argv.slice(2)];\n}\n\nfunction forkChildWorkerWithArgs(\n  moduleUrl: URL,\n  env: NodeJS.ProcessEnv | undefined,\n  args: string[],\n): Worker {\n  const child = fork(moduleUrl, args, {\n    // For production / non-windows, set `detached` to `true` so that SIGINT is\n    // not automatically propagated and graceful shutdown happens as intended.\n    // For Win32, detached: true causes all subprocesses to open in separate\n    // terminals and breaks inter-process kill signals, so set it to false.\n    detached: platform() !== 'win32',\n    serialization: 'advanced', // use structured clone for IPC\n    env,\n  });\n  return wrap(child);\n}\n\n/**\n * Creates two connected `Worker` instances such that messages sent to one\n * via the {@link Worker.send()} method are received by the other's\n * `on('message', ...)` handler.\n *\n * This is analogous to the two `MessagePort`s of a `MessageChannel`, and\n * is useful for executing code written for inter-process communication\n * in a single process.\n */\nexport function inProcChannel(): [Worker, Worker] {\n  const worker1 = new EventEmitter();\n  const worker2 = new EventEmitter();\n\n  const sendTo =\n    (dest: EventEmitter) =>\n    (\n      message: Serializable,\n      sendHandle?: SendHandle,\n      callback?: (error: Error | null) => void,\n    ) => {\n      dest.emit('message', message, sendHandle);\n      if (callback) {\n        callback(null);\n      }\n      return true;\n    };\n\n  const kill =\n    (dest: EventEmitter) =>\n    (signal: NodeJS.Signals = 'SIGTERM') =>\n      dest.emit(signal, signal);\n\n  return [\n    wrap(\n      Object.assign(worker1, {send: sendTo(worker2), kill: kill(worker2), pid}),\n    ),\n    wrap(\n      Object.assign(worker2, {send: sendTo(worker1), kill: kill(worker1), pid}),\n    ),\n  ];\n}\n"],"mappings":"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"}
+{"version":3,"file":"processes.js","names":[],"sources":["../../../../../zero-cache/src/types/processes.ts"],"sourcesContent":["import {\n  type ChildProcess,\n  fork,\n  type SendHandle,\n  type Serializable,\n} from 'node:child_process';\nimport EventEmitter from 'node:events';\nimport {platform} from 'node:os';\nimport {pid} from 'node:process';\n\n/**\n * Central registry of message type names, which are used to identify\n * the payload in {@link Message} objects sent between processes. The\n * payloads themselves are implementation specific and defined in each\n * component; only the type name is reserved here to avoid collisions.\n *\n * Receiving logic can call {@link getMessage()} with the name of\n * the message of interest to filter messages to those of interest.\n */\nexport const MESSAGE_TYPES = {\n  handoff: 'handoff',\n  status: 'status',\n  subscribe: 'subscribe',\n  notify: 'notify',\n  ready: 'ready',\n  backupWatermarkUpdate: 'backupWatermakUpdate',\n} as const;\n\nexport type Message<Payload> = [keyof typeof MESSAGE_TYPES, Payload];\n\nfunction getMessage<M extends Message<unknown>>(\n  type: M[0],\n  data: unknown,\n): M[1] | null {\n  if (Array.isArray(data) && data.length === 2 && data[0] === type) {\n    return data[1] as M[1];\n  }\n  return null;\n}\n\nfunction onMessageType<M extends Message<unknown>>(\n  e: EventEmitter,\n  type: M[0],\n  handler: (msg: M[1], sendHandle?: SendHandle) => void,\n) {\n  return e.on('message', (data, sendHandle) => {\n    const msg = getMessage(type, data);\n    if (msg) {\n      handler(msg, sendHandle);\n    }\n  });\n}\n\nfunction onceMessageType<M extends Message<unknown>>(\n  e: EventEmitter,\n  type: M[0],\n  handler: (msg: M[1], sendHandle?: SendHandle) => void,\n) {\n  const listener = (data: unknown, sendHandle: SendHandle) => {\n    const msg = getMessage(type, data);\n    if (msg) {\n      e.off('message', listener);\n      handler(msg, sendHandle);\n    }\n  };\n  return e.on('message', listener);\n}\n\nexport interface Sender {\n  send<M extends Message<unknown>>(\n    message: M,\n    sendHandle?: SendHandle,\n    callback?: (error: Error | null) => void,\n  ): boolean;\n\n  kill(signal?: NodeJS.Signals): void;\n}\n\nexport interface Subprocess extends Sender, EventEmitter {\n  pid?: number | undefined;\n}\n\nexport interface Receiver extends EventEmitter {\n  /**\n   * The receiving side of {@link Sender.send()} that is a wrapper around\n   * {@link on}('message', ...) that invokes the `handler` for messages of\n   * the specified `type`.\n   */\n  onMessageType<M extends Message<unknown>>(\n    type: M[0],\n    handler: (msg: M[1], sendHandle?: SendHandle) => void,\n  ): this;\n\n  /**\n   * The receiving side of {@link Sender.send()} that behaves like\n   * {@link once}('message', ...) that invokes the `handler` for the next\n   * message of the specified `type` and then unsubscribes.\n   */\n  onceMessageType<M extends Message<unknown>>(\n    type: M[0],\n    handler: (msg: M[1], sendHandle?: SendHandle) => void,\n  ): this;\n}\n\nexport interface Worker extends Subprocess, Receiver {}\n\n/**\n * Adds the {@link Receiver.onMessageType()} and {@link Receiver.onceMessageType()}\n * methods to convert the given `EventEmitter` to a `Receiver`.\n */\nfunction wrap<P extends EventEmitter>(proc: P): P & Receiver {\n  return new Proxy(proc, {\n    get(target: P, prop: string | symbol, receiver: unknown) {\n      switch (prop) {\n        case 'onMessageType':\n          return (\n            type: keyof typeof MESSAGE_TYPES,\n            handler: (msg: unknown, sendHandle?: SendHandle) => void,\n          ) => {\n            onMessageType(target, type, handler);\n            return receiver; // this\n          };\n        case 'onceMessageType':\n          return (\n            type: keyof typeof MESSAGE_TYPES,\n            handler: (msg: unknown, sendHandle?: SendHandle) => void,\n          ) => {\n            onceMessageType(target, type, handler);\n            return receiver; // this\n          };\n      }\n      return Reflect.get(target, prop, receiver);\n    },\n  }) as P & Receiver;\n}\n\ntype Proc = Pick<ChildProcess, 'send' | 'kill' | 'pid'> & EventEmitter;\n\n/**\n * The parentWorker for forked processes, or `null` if the process was not forked.\n * (Analogous to the `parentPort: MessagePort | null` of the `\"workers\"` library).\n */\nexport const parentWorker: Worker | null = process.send\n  ? wrap(process as Proc)\n  : null;\n\nconst SINGLE_PROCESS = 'SINGLE_PROCESS';\nlet singleProcessOverride = false;\nexport function singleProcessMode(): boolean {\n  return singleProcessOverride || (process.env[SINGLE_PROCESS] ?? '0') !== '0';\n}\n\nexport function setSingleProcessMode(enabled: boolean = true): void {\n  singleProcessOverride = enabled;\n}\n\n/**\n * Determines whether a module loaded as a worker process entry point should\n * start its worker.\n *\n * Most workers are launched via {@link childWorker}, which in single-process\n * mode runs them in-process (no real fork) by invoking their exported\n * `runWorker` directly; those entry points must therefore *not* self-start in\n * single-process mode, or they would run twice.\n *\n * A worker launched via {@link forkChildWorker}, however, is *always* a real\n * forked OS process — even in single-process mode — and it inherits the\n * parent's `SINGLE_PROCESS` env. So {@link singleProcessMode} alone would\n * wrongly suppress its startup, leaving the parent to spin re-forking a child\n * that immediately exits. Such a forked child has a non-null\n * {@link parentWorker} (`process.send` is defined), which is the signal to\n * start regardless. A standalone direct launch (no parent, not single-process)\n * also starts.\n *\n * @param parent The entry point's {@link parentWorker} (non-null iff forked).\n * @param isSingleProcessMode The result of {@link singleProcessMode}.\n */\nexport function shouldStartWorker(\n  parent: Worker | null,\n  isSingleProcessMode: boolean,\n): boolean {\n  return parent !== null || !isSingleProcessMode;\n}\n\n/**\n *\n * @param modulePath Path to the module file, relative to zero-cache/src/, or an absolute file:// URL\n */\nexport function childWorker(\n  moduleUrl: URL,\n  env?: NodeJS.ProcessEnv,\n  ...args: string[]\n): Worker {\n  args = workerArgs(args);\n\n  if (singleProcessMode()) {\n    const [parent, child] = inProcChannel();\n    import(moduleUrl.href)\n      .then(async ({default: runWorker}) => {\n        try {\n          await runWorker(parent, env ?? process.env, ...args);\n          child.emit('close', 0);\n          return;\n        } catch (err) {\n          child.emit('error', err);\n          child.emit('close', -1);\n        }\n      })\n      .catch(err => child.emit('error', err));\n    return child;\n  }\n  return forkChildWorkerWithArgs(moduleUrl, env, args);\n}\n\nexport function forkChildWorker(\n  moduleUrl: URL,\n  env?: NodeJS.ProcessEnv,\n  ...args: string[]\n): Worker {\n  return forkChildWorkerWithArgs(moduleUrl, env, workerArgs(args));\n}\n\nfunction workerArgs(args: string[]): string[] {\n  return [...args, ...process.argv.slice(2)];\n}\n\nfunction forkChildWorkerWithArgs(\n  moduleUrl: URL,\n  env: NodeJS.ProcessEnv | undefined,\n  args: string[],\n): Worker {\n  const child = fork(moduleUrl, args, {\n    // For production / non-windows, set `detached` to `true` so that SIGINT is\n    // not automatically propagated and graceful shutdown happens as intended.\n    // For Win32, detached: true causes all subprocesses to open in separate\n    // terminals and breaks inter-process kill signals, so set it to false.\n    detached: platform() !== 'win32',\n    serialization: 'advanced', // use structured clone for IPC\n    env,\n  });\n  return wrap(child);\n}\n\n/**\n * Creates two connected `Worker` instances such that messages sent to one\n * via the {@link Worker.send()} method are received by the other's\n * `on('message', ...)` handler.\n *\n * This is analogous to the two `MessagePort`s of a `MessageChannel`, and\n * is useful for executing code written for inter-process communication\n * in a single process.\n */\nexport function inProcChannel(): [Worker, Worker] {\n  const worker1 = new EventEmitter();\n  const worker2 = new EventEmitter();\n\n  const sendTo =\n    (dest: EventEmitter) =>\n    (\n      message: Serializable,\n      sendHandle?: SendHandle,\n      callback?: (error: Error | null) => void,\n    ) => {\n      dest.emit('message', message, sendHandle);\n      if (callback) {\n        callback(null);\n      }\n      return true;\n    };\n\n  const kill =\n    (dest: EventEmitter) =>\n    (signal: NodeJS.Signals = 'SIGTERM') =>\n      dest.emit(signal, signal);\n\n  return [\n    wrap(\n      Object.assign(worker1, {send: sendTo(worker2), kill: kill(worker2), pid}),\n    ),\n    wrap(\n      Object.assign(worker2, {send: sendTo(worker1), kill: kill(worker1), pid}),\n    ),\n  ];\n}\n"],"mappings":";;;;;AA8BA,SAAS,WACP,MACA,MACa;CACb,IAAI,MAAM,QAAQ,IAAI,KAAK,KAAK,WAAW,KAAK,KAAK,OAAO,MAC1D,OAAO,KAAK;CAEd,OAAO;AACT;AAEA,SAAS,cACP,GACA,MACA,SACA;CACA,OAAO,EAAE,GAAG,YAAY,MAAM,eAAe;EAC3C,MAAM,MAAM,WAAW,MAAM,IAAI;EACjC,IAAI,KACF,QAAQ,KAAK,UAAU;CAE3B,CAAC;AACH;AAEA,SAAS,gBACP,GACA,MACA,SACA;CACA,MAAM,YAAY,MAAe,eAA2B;EAC1D,MAAM,MAAM,WAAW,MAAM,IAAI;EACjC,IAAI,KAAK;GACP,EAAE,IAAI,WAAW,QAAQ;GACzB,QAAQ,KAAK,UAAU;EACzB;CACF;CACA,OAAO,EAAE,GAAG,WAAW,QAAQ;AACjC;;;;;AA4CA,SAAS,KAA6B,MAAuB;CAC3D,OAAO,IAAI,MAAM,MAAM,EACrB,IAAI,QAAW,MAAuB,UAAmB;EACvD,QAAQ,MAAR;GACE,KAAK,iBACH,QACE,MACA,YACG;IACH,cAAc,QAAQ,MAAM,OAAO;IACnC,OAAO;GACT;GACF,KAAK,mBACH,QACE,MACA,YACG;IACH,gBAAgB,QAAQ,MAAM,OAAO;IACrC,OAAO;GACT;EACJ;EACA,OAAO,QAAQ,IAAI,QAAQ,MAAM,QAAQ;CAC3C,EACF,CAAC;AACH;;;;;AAQA,IAAa,eAA8B,QAAQ,OAC/C,KAAK,OAAe,IACpB;AAEJ,IAAM,iBAAiB;AACvB,IAAI,wBAAwB;AAC5B,SAAgB,oBAA6B;CAC3C,OAAO,0BAA0B,QAAQ,IAAI,mBAAmB,SAAS;AAC3E;;;;;AAsCA,SAAgB,YACd,WACA,KACA,GAAG,MACK;CACR,OAAO,WAAW,IAAI;CAEtB,IAAI,kBAAkB,GAAG;EACvB,MAAM,CAAC,QAAQ,SAAS,cAAc;EACtC,OAAO,UAAU,MACd,KAAK,OAAO,EAAC,SAAS,gBAAe;GACpC,IAAI;IACF,MAAM,UAAU,QAAQ,OAAO,QAAQ,KAAK,GAAG,IAAI;IACnD,MAAM,KAAK,SAAS,CAAC;IACrB;GACF,SAAS,KAAK;IACZ,MAAM,KAAK,SAAS,GAAG;IACvB,MAAM,KAAK,SAAS,EAAE;GACxB;EACF,CAAC,EACA,OAAM,QAAO,MAAM,KAAK,SAAS,GAAG,CAAC;EACxC,OAAO;CACT;CACA,OAAO,wBAAwB,WAAW,KAAK,IAAI;AACrD;AAUA,SAAS,WAAW,MAA0B;CAC5C,OAAO,CAAC,GAAG,MAAM,GAAG,QAAQ,KAAK,MAAM,CAAC,CAAC;AAC3C;AAEA,SAAS,wBACP,WACA,KACA,MACQ;CAUR,OAAO,KATO,KAAK,WAAW,MAAM;EAKlC,UAAU,SAAS,MAAM;EACzB,eAAe;EACf;CACF,CACY,CAAK;AACnB;;;;;;;;;;AAWA,SAAgB,gBAAkC;CAChD,MAAM,UAAU,IAAI,aAAa;CACjC,MAAM,UAAU,IAAI,aAAa;CAEjC,MAAM,UACH,UAEC,SACA,YACA,aACG;EACH,KAAK,KAAK,WAAW,SAAS,UAAU;EACxC,IAAI,UACF,SAAS,IAAI;EAEf,OAAO;CACT;CAEF,MAAM,QACH,UACA,SAAyB,cACxB,KAAK,KAAK,QAAQ,MAAM;CAE5B,OAAO,CACL,KACE,OAAO,OAAO,SAAS;EAAC,MAAM,OAAO,OAAO;EAAG,MAAM,KAAK,OAAO;EAAG;CAAG,CAAC,CAC1E,GACA,KACE,OAAO,OAAO,SAAS;EAAC,MAAM,OAAO,OAAO;EAAG,MAAM,KAAK,OAAO;EAAG;CAAG,CAAC,CAC1E,CACF;AACF"}

package/out/zero-cache/src/types/streams.d.ts

@@ -13,6 +13,12 @@ export type Source<T> = AsyncIterable<T> & {
      * @param err Terminate the iteration by throwing the `err` instead.
      */
     cancel: (err?: Error) => void;
+    /**
+     * An AbortSignal that can be used to listen for termination or
+     * race a short-lived promise against the termination of the iterable
+     * (via `promiseOrAbort()`)
+     */
+    readonly signal: AbortSignal;
     /**
      * The presence of a `pipeline` iterable allows the usual "consumed-on-iterate" semantics
      * to be overridden.
@@ -47,11 +53,21 @@ type PipeOptions<T> = {
     bufferMessages?: number;
 };
 export declare function pipe<T>({ source, sink, parse, bufferMessages }: PipeOptions<T>): void;
+/** A parsed JSON value paired with the exact source text it was parsed from. */
+export type ParsedJSON<T> = {
+    data: T;
+    json: string;
+};
 export declare function streamOut<T extends JSONValue>(lc: LogContext, source: Source<T>, sink: WebSocket): Promise<void>;
 /**
  * Streams out a `Source` for which messages are already stringified JSON.
  */
 export declare function streamOutStringified(lc: LogContext, source: Source<string>, sink: WebSocket): Promise<void>;
 export declare function streamIn<T extends JSONValue>(lc: LogContext, source: WebSocket, schema: v.Type<T>): Promise<Source<T>>;
+/**
+ * Streams in messages sent by {@link streamOutStringified}, preserving the
+ * exact application-level JSON alongside its parsed and validated value.
+ */
+export declare function streamInStringified<T extends JSONValue>(lc: LogContext, source: WebSocket, schema: v.Type<T>): Promise<Source<ParsedJSON<T>>>;
 export {};
 //# sourceMappingURL=streams.d.ts.map

package/out/zero-cache/src/types/streams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streams.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/streams.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,KAAK,aAAa,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,IAAI,CAAC;AAEZ,OAAO,EAAa,KAAK,SAAS,EAAC,MAAM,oCAAoC,CAAC;AAE9E,OAAO,KAAK,CAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,YAAY,EAAE,KAAK,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAW7D,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG;IACzC;;;;;;OAMG;IACH,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;IAE9B;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,EAAE,aAAa,CAAC;QAAC,KAAK,EAAE,CAAC,CAAC;QAAC,QAAQ,EAAE,MAAM,IAAI,CAAA;KAAC,CAAC,GAAG,SAAS,CAAC;CACxE,CAAC;AAEF,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI;IACpB,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC;CACxB,CAAC;AAEF;;;GAGG;AAIH,wBAAgB,MAAM,CAAC,EAAE,SAAS,SAAS,EAAE,GAAG,SAAS,SAAS,EAChE,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,SAAS,EACb,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EACpB,UAAU,GAAE,OAAO,CAAC,GAAG,CAAM,EAC7B,SAAS,GAAE,OAAO,CAAC,EAAE,CAAM,EAC3B,aAAa,GAAE,aAAkB,GAChC;IAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;CAAC,CAwE9C;AAED,KAAK,WAAW,CAAC,CAAC,IAAI;IACpB,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;IACtB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,IAAI,CAAC,CAAC,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAC,EAAE,WAAW,CAAC,CAAC,CAAC,QAsD5E;AAkBD,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,EAC3C,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EACtB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,IAAI,CAAC,CAEf;AAmED,wBAAsB,QAAQ,CAAC,CAAC,SAAS,SAAS,EAChD,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAqCpB"}
+{"version":3,"file":"streams.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/types/streams.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/types/streams.js

@@ -154,7 +154,20 @@ async function streamOutInternal(lc, source, sink, stringify) {
 		closer.close(e);
 	}
 }
-async function streamIn(lc, source, schema) {
+function streamIn(lc, source, schema) {
+	return streamInInternal(lc, source, schema, (data) => data);
+}
+/**
+* Streams in messages sent by {@link streamOutStringified}, preserving the
+* exact application-level JSON alongside its parsed and validated value.
+*/
+function streamInStringified(lc, source, schema) {
+	return streamInInternal(lc, source, schema, (data, frame, id) => ({
+		data,
+		json: extractStringifiedMessage(frame, id)
+	}));
+}
+async function streamInInternal(lc, source, schema, transform) {
 	expectPingsForLiveness(lc, source, PING_INTERVAL_MS);
 	const streamedSchema = valita_exports.object({
 		msg: schema,
@@ -163,7 +176,7 @@ async function streamIn(lc, source, schema) {
 	const sink = new Subscription({
 		consumed: ({ id }) => source.send(JSON.stringify({ ack: id })),
 		cleanup: () => closer.close()
-	}, ({ msg }) => msg);
+	}, ({ data }) => data);
 	const closer = WebSocketCloser.forSink(lc, source, sink, handleMessage);
 	function handleMessage(event) {
 		const data = event.data.toString();
@@ -173,7 +186,10 @@ async function streamIn(lc, source, schema) {
 		}
 		try {
 			const msg = parse(BigIntJSON.parse(data), streamedSchema, "passthrough");
-			sink.push(msg);
+			sink.push({
+				id: msg.id,
+				data: transform(msg.msg, data, msg.id)
+			});
 		} catch (e) {
 			closer.close(e);
 		}
@@ -181,6 +197,11 @@ async function streamIn(lc, source, schema) {
 	await closer.connected;
 	return sink;
 }
+function extractStringifiedMessage(frame, id) {
+	const prefix = `{"id":${id},"msg":`;
+	assert(frame.startsWith(prefix) && frame.endsWith("}"), `invalid streamed message frame`);
+	return frame.slice(prefix.length, -1);
+}
 var WebSocketCloser = class WebSocketCloser {
 	#lc;
 	#ws;
@@ -246,6 +267,6 @@ var WebSocketCloser = class WebSocketCloser {
 	}
 };
 //#endregion
-export { pipe, stream, streamIn, streamOut, streamOutStringified };
+export { pipe, stream, streamIn, streamInStringified, streamOut, streamOutStringified };
 
 //# sourceMappingURL=streams.js.map