@rocicorp/zero 1.4.0-canary.1 → 1.4.0-canary.3

package/out/zero-cache/src/db/pg-to-lite.js

@@ -30,19 +30,19 @@ function zeroVersionColumnSpec(defaultVersion) {
 function warnIfDataTypeSupported(lc, liteTypeString, table, column) {
 	if (liteTypeToZqlValueType(liteTypeString) === void 0) lc.warn?.(`\n\nWARNING: zero does not yet support the "${upstreamDataType(liteTypeString)}" data type.\nThe "${table}"."${column}" column will not be synced to clients.\n\n`);
 }
-var SIMPLE_TOKEN_EXPRESSION_REGEX = /^[^'()]+$/;
-var UNSUPPORTED_TOKENS = /\b(current_time|current_date|current_timestamp)\b/i;
-var STRING_EXPRESSION_REGEX = /^('.*')::[^']+$/;
-function mapPostgresToLiteDefault(table, column, dataType, defaultExpression) {
+var NUMERIC_LITERAL_REGEX = /^-?\d+(\.\d+)?$/;
+var BOOLEAN_LITERAL_REGEX = /^(true|false)$/;
+var QUOTED_STRING_WITH_CAST_REGEX = /^('.*')::(\w+)$/;
+var EMPTY_ARRAY_CONSTRUCTOR_REGEX = /^ARRAY\s*\[\s*\]::\w+\[\]$/i;
+var EMPTY_ARRAY_LITERAL_REGEX = /^'\{\}'::\w+\[\]$/;
+function mapPostgresToLiteDefault(table, column, defaultExpression) {
 	if (!defaultExpression) return null;
-	if (UNSUPPORTED_TOKENS.test(defaultExpression)) throw new UnsupportedColumnDefaultError(`Cannot ADD a column with CURRENT_TIME, CURRENT_DATE, or CURRENT_TIMESTAMP`);
-	if (SIMPLE_TOKEN_EXPRESSION_REGEX.test(defaultExpression)) {
-		if (liteTypeToZqlValueType(dataType) === "boolean") return defaultExpression === "true" ? "1" : "0";
-		return defaultExpression;
-	}
-	const match = STRING_EXPRESSION_REGEX.exec(defaultExpression);
-	if (!match) throw new UnsupportedColumnDefaultError(`Unsupported default value for ${table}.${column}: ${defaultExpression}`);
-	return match[1];
+	if (NUMERIC_LITERAL_REGEX.test(defaultExpression)) return defaultExpression;
+	if (BOOLEAN_LITERAL_REGEX.test(defaultExpression)) return defaultExpression === "true" ? "1" : "0";
+	const match = QUOTED_STRING_WITH_CAST_REGEX.exec(defaultExpression);
+	if (match) return match[1];
+	if (EMPTY_ARRAY_CONSTRUCTOR_REGEX.test(defaultExpression) || EMPTY_ARRAY_LITERAL_REGEX.test(defaultExpression)) return "'[]'";
+	throw new UnsupportedColumnDefaultError(`Unsupported default value for ${table}.${column}: ${defaultExpression}`);
 }
 function mapPostgresToLiteColumn(table, column, ignoreDefault) {
 	const { pos, dataType, notNull, dflt, elemPgTypeClass = null } = column.spec;
@@ -51,7 +51,7 @@ function mapPostgresToLiteColumn(table, column, ignoreDefault) {
 		dataType: liteTypeString(dataType, notNull, isEnumColumn(column.spec), isArrayColumn(column.spec)),
 		characterMaximumLength: null,
 		notNull: false,
-		dflt: ignoreDefault === "ignore-default" ? null : mapPostgresToLiteDefault(table, column.name, dataType, dflt),
+		dflt: ignoreDefault === "ignore-default" ? null : mapPostgresToLiteDefault(table, column.name, dflt),
 		elemPgTypeClass
 	};
 }

package/out/zero-cache/src/db/pg-to-lite.js.map

@@ -1 +1 @@
-{"version":3,"file":"pg-to-lite.js","names":[],"sources":["../../../../../zero-cache/src/db/pg-to-lite.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {ZERO_VERSION_COLUMN_NAME} from '../services/replicator/schema/constants.ts';\nimport {\n  liteTypeString,\n  liteTypeToZqlValueType,\n  upstreamDataType,\n  type LiteTypeString,\n} from '../types/lite.ts';\nimport {liteTableName} from '../types/names.ts';\nimport * as PostgresTypeClass from './postgres-type-class-enum.ts';\nimport {\n  type ColumnSpec,\n  type IndexSpec,\n  type LiteIndexSpec,\n  type LiteTableSpec,\n  type TableSpec,\n} from './specs.ts';\n\n/**\n * Determines if a PostgreSQL column is an enum type.\n * This checks both the element type class (for arrays of enums) and the main type class.\n */\nexport function isEnumColumn(\n  spec: Pick<ColumnSpec, 'pgTypeClass' | 'elemPgTypeClass'>,\n): boolean {\n  return (spec.elemPgTypeClass ?? spec.pgTypeClass) === PostgresTypeClass.Enum;\n}\n\n/**\n * Determines if a PostgreSQL column is an array type.\n * In PostgreSQL's system, array columns have a non-null elemPgTypeClass.\n */\nexport function isArrayColumn(\n  spec: Pick<ColumnSpec, 'elemPgTypeClass'>,\n): boolean {\n  return spec.elemPgTypeClass !== null && spec.elemPgTypeClass !== undefined;\n}\n\nfunction zeroVersionColumnSpec(defaultVersion: string | undefined): ColumnSpec {\n  return {\n    pos: Number.MAX_SAFE_INTEGER, // i.e. last\n    characterMaximumLength: null,\n    dataType: 'text',\n    notNull: false,\n    dflt: !defaultVersion ? null : `'${defaultVersion}'`,\n    elemPgTypeClass: null,\n  };\n}\n\nexport function warnIfDataTypeSupported(\n  lc: LogContext,\n  liteTypeString: LiteTypeString,\n  table: string,\n  column: string,\n) {\n  if (liteTypeToZqlValueType(liteTypeString) === undefined) {\n    lc.warn?.(\n      `\\n\\nWARNING: zero does not yet support the \"${upstreamDataType(\n        liteTypeString,\n      )}\" data type.\\n` +\n        `The \"${table}\".\"${column}\" column will not be synced to clients.\\n\\n`,\n    );\n  }\n}\n\n// As per https://www.sqlite.org/lang_altertable.html#altertabaddcol,\n// expressions with parentheses are disallowed ...\nconst SIMPLE_TOKEN_EXPRESSION_REGEX = /^[^'()]+$/; // e.g. true, false, 1234, 1234.5678\n\n// as well as current_time, current_date, and current_timestamp ...\nconst UNSUPPORTED_TOKENS = /\\b(current_time|current_date|current_timestamp)\\b/i;\n\n// For strings and certain incarnations of primitives (e.g. integers greater\n// than 2^31-1, Postgres' nodeToString() represents the values as type-casted\n// 'string' values, e.g. `'2147483648'::bigint`, `'foo'::text`.\n//\n// These type-qualifiers must be removed, as SQLite doesn't understand or\n// care about them.\nconst STRING_EXPRESSION_REGEX = /^('.*')::[^']+$/;\n\n// Exported for testing.\nexport function mapPostgresToLiteDefault(\n  table: string,\n  column: string,\n  dataType: string,\n  defaultExpression: string | null | undefined,\n) {\n  if (!defaultExpression) {\n    return null;\n  }\n  if (UNSUPPORTED_TOKENS.test(defaultExpression)) {\n    throw new UnsupportedColumnDefaultError(\n      `Cannot ADD a column with CURRENT_TIME, CURRENT_DATE, or CURRENT_TIMESTAMP`,\n    );\n  }\n  if (SIMPLE_TOKEN_EXPRESSION_REGEX.test(defaultExpression)) {\n    if (liteTypeToZqlValueType(dataType) === 'boolean') {\n      return defaultExpression === 'true' ? '1' : '0';\n    }\n    return defaultExpression;\n  }\n  const match = STRING_EXPRESSION_REGEX.exec(defaultExpression);\n  if (!match) {\n    throw new UnsupportedColumnDefaultError(\n      `Unsupported default value for ${table}.${column}: ${defaultExpression}`,\n    );\n  }\n  return match[1];\n}\n\nexport function mapPostgresToLiteColumn(\n  table: string,\n  column: {name: string; spec: ColumnSpec},\n  ignoreDefault?: 'ignore-default',\n): ColumnSpec {\n  const {pos, dataType, notNull, dflt, elemPgTypeClass = null} = column.spec;\n\n  // PostgreSQL includes [] in dataType for array types (e.g., 'int4[]',\n  // 'int4[][]'). liteTypeString() appends attributes:\n  // \"varchar[]|NOT_NULL|TEXT_ARRAY\", \"my_enum[][]|TEXT_ENUM|TEXT_ARRAY\"\n  const liteType = liteTypeString(\n    dataType,\n    notNull,\n    isEnumColumn(column.spec),\n    isArrayColumn(column.spec),\n  );\n\n  return {\n    pos,\n    dataType: liteType,\n    characterMaximumLength: null,\n    // Note: NOT NULL constraints are always ignored for SQLite (replica) tables.\n    // 1. They are enforced by the replication stream.\n    // 2. We need nullability for columns with defaults to support\n    // write permissions on the \"proposed mutation\" state. Proposed\n    // mutations are written to SQLite in a `BEGIN CONCURRENT` transaction in mutagen.\n    // Permission policies are run against that state (to get their ruling) then the\n    // transaction is rolled back.\n    notNull: false,\n    // Note: DEFAULT constraints are ignored when creating new tables, but are\n    //       necessary for adding columns to tables with existing rows.\n    dflt:\n      ignoreDefault === 'ignore-default'\n        ? null\n        : mapPostgresToLiteDefault(table, column.name, dataType, dflt),\n    elemPgTypeClass,\n  };\n}\n\nexport function mapPostgresToLite(\n  t: TableSpec,\n  defaultVersion?: string,\n): LiteTableSpec {\n  // PRIMARY KEYS are not written to the replica. Instead, we rely\n  // UNIQUE indexes, including those created for upstream PRIMARY KEYs.\n  const {schema: _, primaryKey: _dropped, ...liteSpec} = t;\n  const name = liteTableName(t);\n  return {\n    ...liteSpec,\n    name,\n    columns: {\n      ...Object.fromEntries(\n        Object.entries(t.columns).map(([col, spec]) => [\n          col,\n          // `ignore-default` for create table statements because\n          // there are no rows to set the default for.\n          mapPostgresToLiteColumn(name, {name: col, spec}, 'ignore-default'),\n        ]),\n      ),\n      [ZERO_VERSION_COLUMN_NAME]: zeroVersionColumnSpec(defaultVersion),\n    },\n  };\n}\n\nexport function mapPostgresToLiteIndex(index: IndexSpec): LiteIndexSpec {\n  const {schema, tableName, name, ...liteIndex} = index;\n  return {\n    tableName: liteTableName({schema, name: tableName}),\n    name: liteTableName({schema, name}),\n    ...liteIndex,\n  };\n}\n\nexport class UnsupportedColumnDefaultError extends Error {\n  readonly name = 'UnsupportedColumnDefaultError';\n}\n"],"mappings":";;;;;;;;;AAsBA,SAAgB,aACd,MACS;AACT,SAAQ,KAAK,mBAAmB,KAAK,iBAAiB;;;;;;AAOxD,SAAgB,cACd,MACS;AACT,QAAO,KAAK,oBAAoB,QAAQ,KAAK,oBAAoB,KAAA;;AAGnE,SAAS,sBAAsB,gBAAgD;AAC7E,QAAO;EACL,KAAK,OAAO;EACZ,wBAAwB;EACxB,UAAU;EACV,SAAS;EACT,MAAM,CAAC,iBAAiB,OAAO,IAAI,eAAe;EAClD,iBAAiB;EAClB;;AAGH,SAAgB,wBACd,IACA,gBACA,OACA,QACA;AACA,KAAI,uBAAuB,eAAe,KAAK,KAAA,EAC7C,IAAG,OACD,+CAA+C,iBAC7C,eACD,CAAC,qBACQ,MAAM,KAAK,OAAO,6CAC7B;;AAML,IAAM,gCAAgC;AAGtC,IAAM,qBAAqB;AAQ3B,IAAM,0BAA0B;AAGhC,SAAgB,yBACd,OACA,QACA,UACA,mBACA;AACA,KAAI,CAAC,kBACH,QAAO;AAET,KAAI,mBAAmB,KAAK,kBAAkB,CAC5C,OAAM,IAAI,8BACR,4EACD;AAEH,KAAI,8BAA8B,KAAK,kBAAkB,EAAE;AACzD,MAAI,uBAAuB,SAAS,KAAK,UACvC,QAAO,sBAAsB,SAAS,MAAM;AAE9C,SAAO;;CAET,MAAM,QAAQ,wBAAwB,KAAK,kBAAkB;AAC7D,KAAI,CAAC,MACH,OAAM,IAAI,8BACR,iCAAiC,MAAM,GAAG,OAAO,IAAI,oBACtD;AAEH,QAAO,MAAM;;AAGf,SAAgB,wBACd,OACA,QACA,eACY;CACZ,MAAM,EAAC,KAAK,UAAU,SAAS,MAAM,kBAAkB,SAAQ,OAAO;AAYtE,QAAO;EACL;EACA,UATe,eACf,UACA,SACA,aAAa,OAAO,KAAK,EACzB,cAAc,OAAO,KAAK,CAC3B;EAKC,wBAAwB;EAQxB,SAAS;EAGT,MACE,kBAAkB,mBACd,OACA,yBAAyB,OAAO,OAAO,MAAM,UAAU,KAAK;EAClE;EACD;;AAGH,SAAgB,kBACd,GACA,gBACe;CAGf,MAAM,EAAC,QAAQ,GAAG,YAAY,UAAU,GAAG,aAAY;CACvD,MAAM,OAAO,cAAc,EAAE;AAC7B,QAAO;EACL,GAAG;EACH;EACA,SAAS;GACP,GAAG,OAAO,YACR,OAAO,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,UAAU,CAC7C,KAGA,wBAAwB,MAAM;IAAC,MAAM;IAAK;IAAK,EAAE,iBAAiB,CACnE,CAAC,CACH;IACA,2BAA2B,sBAAsB,eAAe;GAClE;EACF;;AAGH,SAAgB,uBAAuB,OAAiC;CACtE,MAAM,EAAC,QAAQ,WAAW,MAAM,GAAG,cAAa;AAChD,QAAO;EACL,WAAW,cAAc;GAAC;GAAQ,MAAM;GAAU,CAAC;EACnD,MAAM,cAAc;GAAC;GAAQ;GAAK,CAAC;EACnC,GAAG;EACJ;;AAGH,IAAa,gCAAb,cAAmD,MAAM;CACvD,OAAgB"}
+{"version":3,"file":"pg-to-lite.js","names":[],"sources":["../../../../../zero-cache/src/db/pg-to-lite.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {ZERO_VERSION_COLUMN_NAME} from '../services/replicator/schema/constants.ts';\nimport {\n  liteTypeString,\n  liteTypeToZqlValueType,\n  upstreamDataType,\n  type LiteTypeString,\n} from '../types/lite.ts';\nimport {liteTableName} from '../types/names.ts';\nimport * as PostgresTypeClass from './postgres-type-class-enum.ts';\nimport {\n  type ColumnSpec,\n  type IndexSpec,\n  type LiteIndexSpec,\n  type LiteTableSpec,\n  type TableSpec,\n} from './specs.ts';\n\n/**\n * Determines if a PostgreSQL column is an enum type.\n * This checks both the element type class (for arrays of enums) and the main type class.\n */\nexport function isEnumColumn(\n  spec: Pick<ColumnSpec, 'pgTypeClass' | 'elemPgTypeClass'>,\n): boolean {\n  return (spec.elemPgTypeClass ?? spec.pgTypeClass) === PostgresTypeClass.Enum;\n}\n\n/**\n * Determines if a PostgreSQL column is an array type.\n * In PostgreSQL's system, array columns have a non-null elemPgTypeClass.\n */\nexport function isArrayColumn(\n  spec: Pick<ColumnSpec, 'elemPgTypeClass'>,\n): boolean {\n  return spec.elemPgTypeClass !== null && spec.elemPgTypeClass !== undefined;\n}\n\nfunction zeroVersionColumnSpec(defaultVersion: string | undefined): ColumnSpec {\n  return {\n    pos: Number.MAX_SAFE_INTEGER, // i.e. last\n    characterMaximumLength: null,\n    dataType: 'text',\n    notNull: false,\n    dflt: !defaultVersion ? null : `'${defaultVersion}'`,\n    elemPgTypeClass: null,\n  };\n}\n\nexport function warnIfDataTypeSupported(\n  lc: LogContext,\n  liteTypeString: LiteTypeString,\n  table: string,\n  column: string,\n) {\n  if (liteTypeToZqlValueType(liteTypeString) === undefined) {\n    lc.warn?.(\n      `\\n\\nWARNING: zero does not yet support the \"${upstreamDataType(\n        liteTypeString,\n      )}\" data type.\\n` +\n        `The \"${table}\".\"${column}\" column will not be synced to clients.\\n\\n`,\n    );\n  }\n}\n\n// Numeric literals: integers and decimals, optionally negative\nconst NUMERIC_LITERAL_REGEX = /^-?\\d+(\\.\\d+)?$/;\n\n// Boolean literals (PG emits lowercase)\nconst BOOLEAN_LITERAL_REGEX = /^(true|false)$/;\n\n// Quoted string with type cast to a simple scalar type: 'value'::typename\n// For strings and certain incarnations of primitives (e.g. integers greater\n// than 2^31-1, Postgres' nodeToString() represents the values as type-casted\n// 'string' values, e.g. `'2147483648'::bigint`, `'foo'::text`.\n// Only matches simple type names (word characters) - array types like\n// `::text[]` won't match and will trigger backfill.\nconst QUOTED_STRING_WITH_CAST_REGEX = /^('.*')::(\\w+)$/;\n\n// Empty array constructor syntax: ARRAY[]::text[], ARRAY[]::integer[], etc.\n// Maps to '[]' (JSON empty array) in SQLite.\nconst EMPTY_ARRAY_CONSTRUCTOR_REGEX = /^ARRAY\\s*\\[\\s*\\]::\\w+\\[\\]$/i;\n\n// Empty array literal syntax: '{}'::text[], '{}'::integer[], etc.\n// Maps to '[]' (JSON empty array) in SQLite.\nconst EMPTY_ARRAY_LITERAL_REGEX = /^'\\{\\}'::\\w+\\[\\]$/;\n\n// Conservative allowlist approach for SQLite ADD COLUMN defaults.\n// We only allow patterns we know are safe. Everything else triggers\n// backfill from PostgreSQL, which correctly handles complex defaults.\n//\n// Note: We don't validate that the default value matches the column type\n// (e.g., that a numeric literal is used with a numeric column). PostgreSQL\n// already enforces this at schema definition time - you can't define\n// `ALTER TABLE foo ADD bar TEXT DEFAULT 123` in PG. So we trust that any\n// default we receive from the replication stream is type-compatible with\n// whatever we map the type to in SQLite.\n//\n// Example: `true`/`false` literals can only appear as defaults for boolean\n// columns in PG, so we don't need to check the column type before converting\n// to 1/0.\n//\n// See: https://www.sqlite.org/lang_altertable.html#altertabaddcol\n//\n// Exported for testing.\nexport function mapPostgresToLiteDefault(\n  table: string,\n  column: string,\n  defaultExpression: string | null | undefined,\n): string | null {\n  if (!defaultExpression) {\n    return null;\n  }\n\n  // Numeric literals pass through unchanged\n  if (NUMERIC_LITERAL_REGEX.test(defaultExpression)) {\n    return defaultExpression;\n  }\n\n  // Boolean literals convert to SQLite's 1/0\n  if (BOOLEAN_LITERAL_REGEX.test(defaultExpression)) {\n    return defaultExpression === 'true' ? '1' : '0';\n  }\n\n  // Quoted strings with type casts: extract just the quoted part\n  const match = QUOTED_STRING_WITH_CAST_REGEX.exec(defaultExpression);\n  if (match) {\n    return match[1];\n  }\n\n  // Empty arrays: ARRAY[]::type[] or '{}'::type[] → '[]'\n  if (\n    EMPTY_ARRAY_CONSTRUCTOR_REGEX.test(defaultExpression) ||\n    EMPTY_ARRAY_LITERAL_REGEX.test(defaultExpression)\n  ) {\n    return \"'[]'\";\n  }\n\n  // Everything else triggers backfill\n  throw new UnsupportedColumnDefaultError(\n    `Unsupported default value for ${table}.${column}: ${defaultExpression}`,\n  );\n}\n\nexport function mapPostgresToLiteColumn(\n  table: string,\n  column: {name: string; spec: ColumnSpec},\n  ignoreDefault?: 'ignore-default',\n): ColumnSpec {\n  const {pos, dataType, notNull, dflt, elemPgTypeClass = null} = column.spec;\n\n  // PostgreSQL includes [] in dataType for array types (e.g., 'int4[]',\n  // 'int4[][]'). liteTypeString() appends attributes:\n  // \"varchar[]|NOT_NULL|TEXT_ARRAY\", \"my_enum[][]|TEXT_ENUM|TEXT_ARRAY\"\n  const liteType = liteTypeString(\n    dataType,\n    notNull,\n    isEnumColumn(column.spec),\n    isArrayColumn(column.spec),\n  );\n\n  return {\n    pos,\n    dataType: liteType,\n    characterMaximumLength: null,\n    // Note: NOT NULL constraints are always ignored for SQLite (replica) tables.\n    // 1. They are enforced by the replication stream.\n    // 2. We need nullability for columns with defaults to support\n    // write permissions on the \"proposed mutation\" state. Proposed\n    // mutations are written to SQLite in a `BEGIN CONCURRENT` transaction in mutagen.\n    // Permission policies are run against that state (to get their ruling) then the\n    // transaction is rolled back.\n    notNull: false,\n    // Note: DEFAULT constraints are ignored when creating new tables, but are\n    //       necessary for adding columns to tables with existing rows.\n    dflt:\n      ignoreDefault === 'ignore-default'\n        ? null\n        : mapPostgresToLiteDefault(table, column.name, dflt),\n    elemPgTypeClass,\n  };\n}\n\nexport function mapPostgresToLite(\n  t: TableSpec,\n  defaultVersion?: string,\n): LiteTableSpec {\n  // PRIMARY KEYS are not written to the replica. Instead, we rely\n  // UNIQUE indexes, including those created for upstream PRIMARY KEYs.\n  const {schema: _, primaryKey: _dropped, ...liteSpec} = t;\n  const name = liteTableName(t);\n  return {\n    ...liteSpec,\n    name,\n    columns: {\n      ...Object.fromEntries(\n        Object.entries(t.columns).map(([col, spec]) => [\n          col,\n          // `ignore-default` for create table statements because\n          // there are no rows to set the default for.\n          mapPostgresToLiteColumn(name, {name: col, spec}, 'ignore-default'),\n        ]),\n      ),\n      [ZERO_VERSION_COLUMN_NAME]: zeroVersionColumnSpec(defaultVersion),\n    },\n  };\n}\n\nexport function mapPostgresToLiteIndex(index: IndexSpec): LiteIndexSpec {\n  const {schema, tableName, name, ...liteIndex} = index;\n  return {\n    tableName: liteTableName({schema, name: tableName}),\n    name: liteTableName({schema, name}),\n    ...liteIndex,\n  };\n}\n\nexport class UnsupportedColumnDefaultError extends Error {\n  readonly name = 'UnsupportedColumnDefaultError';\n}\n"],"mappings":";;;;;;;;;AAsBA,SAAgB,aACd,MACS;AACT,SAAQ,KAAK,mBAAmB,KAAK,iBAAiB;;;;;;AAOxD,SAAgB,cACd,MACS;AACT,QAAO,KAAK,oBAAoB,QAAQ,KAAK,oBAAoB,KAAA;;AAGnE,SAAS,sBAAsB,gBAAgD;AAC7E,QAAO;EACL,KAAK,OAAO;EACZ,wBAAwB;EACxB,UAAU;EACV,SAAS;EACT,MAAM,CAAC,iBAAiB,OAAO,IAAI,eAAe;EAClD,iBAAiB;EAClB;;AAGH,SAAgB,wBACd,IACA,gBACA,OACA,QACA;AACA,KAAI,uBAAuB,eAAe,KAAK,KAAA,EAC7C,IAAG,OACD,+CAA+C,iBAC7C,eACD,CAAC,qBACQ,MAAM,KAAK,OAAO,6CAC7B;;AAKL,IAAM,wBAAwB;AAG9B,IAAM,wBAAwB;AAQ9B,IAAM,gCAAgC;AAItC,IAAM,gCAAgC;AAItC,IAAM,4BAA4B;AAoBlC,SAAgB,yBACd,OACA,QACA,mBACe;AACf,KAAI,CAAC,kBACH,QAAO;AAIT,KAAI,sBAAsB,KAAK,kBAAkB,CAC/C,QAAO;AAIT,KAAI,sBAAsB,KAAK,kBAAkB,CAC/C,QAAO,sBAAsB,SAAS,MAAM;CAI9C,MAAM,QAAQ,8BAA8B,KAAK,kBAAkB;AACnE,KAAI,MACF,QAAO,MAAM;AAIf,KACE,8BAA8B,KAAK,kBAAkB,IACrD,0BAA0B,KAAK,kBAAkB,CAEjD,QAAO;AAIT,OAAM,IAAI,8BACR,iCAAiC,MAAM,GAAG,OAAO,IAAI,oBACtD;;AAGH,SAAgB,wBACd,OACA,QACA,eACY;CACZ,MAAM,EAAC,KAAK,UAAU,SAAS,MAAM,kBAAkB,SAAQ,OAAO;AAYtE,QAAO;EACL;EACA,UATe,eACf,UACA,SACA,aAAa,OAAO,KAAK,EACzB,cAAc,OAAO,KAAK,CAC3B;EAKC,wBAAwB;EAQxB,SAAS;EAGT,MACE,kBAAkB,mBACd,OACA,yBAAyB,OAAO,OAAO,MAAM,KAAK;EACxD;EACD;;AAGH,SAAgB,kBACd,GACA,gBACe;CAGf,MAAM,EAAC,QAAQ,GAAG,YAAY,UAAU,GAAG,aAAY;CACvD,MAAM,OAAO,cAAc,EAAE;AAC7B,QAAO;EACL,GAAG;EACH;EACA,SAAS;GACP,GAAG,OAAO,YACR,OAAO,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,UAAU,CAC7C,KAGA,wBAAwB,MAAM;IAAC,MAAM;IAAK;IAAK,EAAE,iBAAiB,CACnE,CAAC,CACH;IACA,2BAA2B,sBAAsB,eAAe;GAClE;EACF;;AAGH,SAAgB,uBAAuB,OAAiC;CACtE,MAAM,EAAC,QAAQ,WAAW,MAAM,GAAG,cAAa;AAChD,QAAO;EACL,WAAW,cAAc;GAAC;GAAQ,MAAM;GAAU,CAAC;EACnD,MAAM,cAAc;GAAC;GAAQ;GAAK,CAAC;EACnC,GAAG;EACJ;;AAGH,IAAa,gCAAb,cAAmD,MAAM;CACvD,OAAgB"}

package/out/zero-cache/src/observability/metrics.d.ts

@@ -3,14 +3,44 @@ export type Category = 'replication' | 'replica' | 'sync' | 'mutation' | 'server
 type Options = MetricOptions & {
     description: string;
 };
-type OptionsWithUnit = MetricOptions & {
-    description: string;
-    unit: string;
-};
 export declare function getOrCreateUpDownCounter(category: Category, name: string, description: string): UpDownCounter;
 export declare function getOrCreateUpDownCounter(category: Category, name: string, opts: Options): UpDownCounter;
-export declare function getOrCreateHistogram(category: Category, name: string, description: string): Histogram;
-export declare function getOrCreateHistogram(category: Category, name: string, options: OptionsWithUnit): Histogram;
+/**
+ * A latency histogram whose {@link recordMs} method accepts raw millisecond
+ * durations and converts them to seconds internally.
+ *
+ * Use {@link getOrCreateLatencyHistogram} to create one — the unit (`'s'`),
+ * bucket boundaries, and ms→s conversion are all baked in
+ */
+export type LatencyHistogram = {
+    /**
+     * Record a duration. Pass the raw elapsed milliseconds — the conversion to
+     * seconds (required by the `unit: 's'` OTel histogram) is handled internally.
+     *
+     * @param durationMs  Elapsed time in **milliseconds** (do NOT pre-divide).
+     * @param attributes  Optional OTel attributes to attach to the observation.
+     */
+    recordMs(durationMs: number, attributes?: Parameters<Histogram['record']>[1]): void;
+};
+/**
+ * Creates (or retrieves) a latency histogram for the given metric.
+ *
+ * - `unit` is always `'s'` (seconds), matching the OTel convention.
+ * - Bucket boundaries are pre-set for zero's typical operation range
+ *   (1 ms – 5 s); see {@link LATENCY_HISTOGRAM_BOUNDARIES_S}.
+ * - The returned {@link LatencyHistogram} accepts **milliseconds** via
+ *   `recordMs()`, so callers never need to divide by 1000.
+ *
+ * @example
+ * ```ts
+ * readonly #hydrationTime = getOrCreateLatencyHistogram(
+ *   'sync', 'hydration-time', 'Time to hydrate a query.',
+ * );
+ * // ...
+ * this.#hydrationTime.recordMs(performance.now() - start);
+ * ```
+ */
+export declare function getOrCreateLatencyHistogram(category: Category, name: string, description: string): LatencyHistogram;
 export declare function getOrCreateCounter(category: Category, name: string, description: string): Counter;
 export declare function getOrCreateCounter(category: Category, name: string, opts: Options): Counter;
 export declare function getOrCreateGauge(category: Category, name: string, description: string): ObservableGauge;

package/out/zero-cache/src/observability/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/observability/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EAET,aAAa,EACb,eAAe,EACf,aAAa,EACd,MAAM,oBAAoB,CAAC;AAK5B,MAAM,MAAM,QAAQ,GAChB,aAAa,GACb,SAAS,GACT,MAAM,GACN,UAAU,GACV,QAAQ,CAAC;AAIb,KAAK,OAAO,GAAG,aAAa,GAAG;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,CAAC;AACrD,KAAK,eAAe,GAAG,aAAa,GAAG;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC;AA4B3E,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,aAAa,CAAC;AACjB,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,aAAa,CAAC;AAgBjB,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,SAAS,CAAC;AACb,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,eAAe,GACvB,SAAS,CAAC;AAqBb,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;AACX,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC;AAgBX,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,eAAe,CAAC;AACnB,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,eAAe,CAAC"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/observability/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EAET,aAAa,EACb,eAAe,EACf,aAAa,EACd,MAAM,oBAAoB,CAAC;AAK5B,MAAM,MAAM,QAAQ,GAChB,aAAa,GACb,SAAS,GACT,MAAM,GACN,UAAU,GACV,QAAQ,CAAC;AAIb,KAAK,OAAO,GAAG,aAAa,GAAG;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,CAAC;AA4BrD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,aAAa,CAAC;AACjB,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,aAAa,CAAC;AAcjB;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;OAMG;IACH,QAAQ,CACN,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,GAC9C,IAAI,CAAC;CACT,CAAC;AAoBF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,gBAAgB,CAclB;AAID,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;AACX,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC;AAgBX,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,GAClB,eAAe,CAAC;AACnB,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,eAAe,CAAC"}

package/out/zero-cache/src/observability/metrics.js

@@ -19,15 +19,60 @@ var upDownCounters = cache();
 function getOrCreateUpDownCounter(category, name, opts) {
 	return upDownCounters(name, (name) => getMeter().createUpDownCounter(`zero.${category}.${name}`, typeof opts === "string" ? { description: opts } : opts));
 }
-var histograms = cache();
-function getOrCreateHistogram(category, name, opts) {
-	return histograms(name, (name) => {
-		const options = typeof opts === "string" ? {
-			description: opts,
-			unit: "milliseconds"
-		} : opts;
-		return getMeter().createHistogram(`zero.${category}.${name}`, options);
-	});
+/**
+* Bucket boundaries (in seconds) for zero's latency histograms.
+*
+* The operational range is 1 ms – 5,000 ms (including customers actively
+* tuning queries). ~2× logarithmic steps give proportionally consistent
+* `histogram_quantile` accuracy regardless of where values cluster within
+* that range. 10,000 ms and 30,000 ms are overflow catchers for truly broken
+* states.
+*
+*   1 ms, 2 ms, 5 ms, 10 ms, 20 ms, 50 ms, 100 ms, 200 ms, 500 ms,
+*   1 s, 2 s, 5 s, 10 s, 30 s
+*/
+var LATENCY_HISTOGRAM_BOUNDARIES_S = [
+	.001,
+	.002,
+	.005,
+	.01,
+	.02,
+	.05,
+	.1,
+	.2,
+	.5,
+	1,
+	2,
+	5,
+	10,
+	30
+];
+var latencyHistograms = cache();
+/**
+* Creates (or retrieves) a latency histogram for the given metric.
+*
+* - `unit` is always `'s'` (seconds), matching the OTel convention.
+* - Bucket boundaries are pre-set for zero's typical operation range
+*   (1 ms – 5 s); see {@link LATENCY_HISTOGRAM_BOUNDARIES_S}.
+* - The returned {@link LatencyHistogram} accepts **milliseconds** via
+*   `recordMs()`, so callers never need to divide by 1000.
+*
+* @example
+* ```ts
+* readonly #hydrationTime = getOrCreateLatencyHistogram(
+*   'sync', 'hydration-time', 'Time to hydrate a query.',
+* );
+* // ...
+* this.#hydrationTime.recordMs(performance.now() - start);
+* ```
+*/
+function getOrCreateLatencyHistogram(category, name, description) {
+	const h = latencyHistograms(name, (name) => getMeter().createHistogram(`zero.${category}.${name}`, {
+		description,
+		unit: "s",
+		advice: { explicitBucketBoundaries: LATENCY_HISTOGRAM_BOUNDARIES_S }
+	}));
+	return { recordMs: (durationMs, attributes) => h.record(durationMs / 1e3, attributes) };
 }
 var counters = cache();
 function getOrCreateCounter(category, name, opts) {
@@ -38,6 +83,6 @@ function getOrCreateGauge(category, name, opts) {
 	return gauges(name, (name) => getMeter().createObservableGauge(`zero.${category}.${name}`, typeof opts === "string" ? { description: opts } : opts));
 }
 //#endregion
-export { getOrCreateCounter, getOrCreateGauge, getOrCreateHistogram, getOrCreateUpDownCounter };
+export { getOrCreateCounter, getOrCreateGauge, getOrCreateLatencyHistogram, getOrCreateUpDownCounter };
 
 //# sourceMappingURL=metrics.js.map

package/out/zero-cache/src/observability/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","names":[],"sources":["../../../../../zero-cache/src/observability/metrics.ts"],"sourcesContent":["import type {\n  Counter,\n  Histogram,\n  Meter,\n  MetricOptions,\n  ObservableGauge,\n  UpDownCounter,\n} from '@opentelemetry/api';\nimport {metrics} from '@opentelemetry/api';\n\n// intentional lazy initialization so it is not started before the SDK is started.\n\nexport type Category =\n  | 'replication' // postgres to replica\n  | 'replica' // health of replica and litestream backup\n  | 'sync' // replica to client\n  | 'mutation'\n  | 'server';\n\nlet meter: Meter | undefined;\n\ntype Options = MetricOptions & {description: string};\ntype OptionsWithUnit = MetricOptions & {description: string; unit: string};\n\nfunction getMeter() {\n  if (!meter) {\n    meter = metrics.getMeter('zero');\n  }\n  return meter;\n}\n\nfunction cache<TRet>(): (\n  name: string,\n  creator: (name: string) => TRet,\n) => TRet {\n  const instruments = new Map<string, TRet>();\n  return (name: string, creator: (name: string) => TRet) => {\n    const existing = instruments.get(name);\n    if (existing) {\n      return existing;\n    }\n\n    const ret = creator(name);\n    instruments.set(name, ret);\n    return ret;\n  };\n}\n\nconst upDownCounters = cache<UpDownCounter>();\n\nexport function getOrCreateUpDownCounter(\n  category: Category,\n  name: string,\n  description: string,\n): UpDownCounter;\nexport function getOrCreateUpDownCounter(\n  category: Category,\n  name: string,\n  opts: Options,\n): UpDownCounter;\nexport function getOrCreateUpDownCounter(\n  category: Category,\n  name: string,\n  opts: string | Options,\n): UpDownCounter {\n  return upDownCounters(name, name =>\n    getMeter().createUpDownCounter(\n      `zero.${category}.${name}`,\n      typeof opts === 'string' ? {description: opts} : opts,\n    ),\n  );\n}\n\nconst histograms = cache<Histogram>();\n\nexport function getOrCreateHistogram(\n  category: Category,\n  name: string,\n  description: string,\n): Histogram;\nexport function getOrCreateHistogram(\n  category: Category,\n  name: string,\n  options: OptionsWithUnit,\n): Histogram;\nexport function getOrCreateHistogram(\n  category: Category,\n  name: string,\n  opts: string | OptionsWithUnit,\n): Histogram {\n  return histograms(name, name => {\n    const options: {description: string; unit: string; boundaries?: number[]} =\n      typeof opts === 'string'\n        ? {\n            description: opts,\n            unit: 'milliseconds',\n          }\n        : opts;\n\n    return getMeter().createHistogram(`zero.${category}.${name}`, options);\n  });\n}\n\nconst counters = cache<Counter>();\n\nexport function getOrCreateCounter(\n  category: Category,\n  name: string,\n  description: string,\n): Counter;\nexport function getOrCreateCounter(\n  category: Category,\n  name: string,\n  opts: Options,\n): Counter;\nexport function getOrCreateCounter(\n  category: Category,\n  name: string,\n  opts: string | Options,\n): Counter {\n  return counters(name, name =>\n    getMeter().createCounter(\n      `zero.${category}.${name}`,\n      typeof opts === 'string' ? {description: opts} : opts,\n    ),\n  );\n}\n\nconst gauges = cache<ObservableGauge>();\n\nexport function getOrCreateGauge(\n  category: Category,\n  name: string,\n  description: string,\n): ObservableGauge;\nexport function getOrCreateGauge(\n  category: Category,\n  name: string,\n  opts: Options,\n): ObservableGauge;\nexport function getOrCreateGauge(\n  category: Category,\n  name: string,\n  opts: string | Options,\n): ObservableGauge {\n  return gauges(name, name =>\n    getMeter().createObservableGauge(\n      `zero.${category}.${name}`,\n      typeof opts === 'string' ? {description: opts} : opts,\n    ),\n  );\n}\n"],"mappings":";;AAmBA,IAAI;AAKJ,SAAS,WAAW;AAClB,KAAI,CAAC,MACH,SAAQ,QAAQ,SAAS,OAAO;AAElC,QAAO;;AAGT,SAAS,QAGC;CACR,MAAM,8BAAc,IAAI,KAAmB;AAC3C,SAAQ,MAAc,YAAoC;EACxD,MAAM,WAAW,YAAY,IAAI,KAAK;AACtC,MAAI,SACF,QAAO;EAGT,MAAM,MAAM,QAAQ,KAAK;AACzB,cAAY,IAAI,MAAM,IAAI;AAC1B,SAAO;;;AAIX,IAAM,iBAAiB,OAAsB;AAY7C,SAAgB,yBACd,UACA,MACA,MACe;AACf,QAAO,eAAe,OAAM,SAC1B,UAAU,CAAC,oBACT,QAAQ,SAAS,GAAG,QACpB,OAAO,SAAS,WAAW,EAAC,aAAa,MAAK,GAAG,KAClD,CACF;;AAGH,IAAM,aAAa,OAAkB;AAYrC,SAAgB,qBACd,UACA,MACA,MACW;AACX,QAAO,WAAW,OAAM,SAAQ;EAC9B,MAAM,UACJ,OAAO,SAAS,WACZ;GACE,aAAa;GACb,MAAM;GACP,GACD;AAEN,SAAO,UAAU,CAAC,gBAAgB,QAAQ,SAAS,GAAG,QAAQ,QAAQ;GACtE;;AAGJ,IAAM,WAAW,OAAgB;AAYjC,SAAgB,mBACd,UACA,MACA,MACS;AACT,QAAO,SAAS,OAAM,SACpB,UAAU,CAAC,cACT,QAAQ,SAAS,GAAG,QACpB,OAAO,SAAS,WAAW,EAAC,aAAa,MAAK,GAAG,KAClD,CACF;;AAGH,IAAM,SAAS,OAAwB;AAYvC,SAAgB,iBACd,UACA,MACA,MACiB;AACjB,QAAO,OAAO,OAAM,SAClB,UAAU,CAAC,sBACT,QAAQ,SAAS,GAAG,QACpB,OAAO,SAAS,WAAW,EAAC,aAAa,MAAK,GAAG,KAClD,CACF"}
+{"version":3,"file":"metrics.js","names":[],"sources":["../../../../../zero-cache/src/observability/metrics.ts"],"sourcesContent":["import type {\n  Counter,\n  Histogram,\n  Meter,\n  MetricOptions,\n  ObservableGauge,\n  UpDownCounter,\n} from '@opentelemetry/api';\nimport {metrics} from '@opentelemetry/api';\n\n// intentional lazy initialization so it is not started before the SDK is started.\n\nexport type Category =\n  | 'replication' // postgres to replica\n  | 'replica' // health of replica and litestream backup\n  | 'sync' // replica to client\n  | 'mutation'\n  | 'server';\n\nlet meter: Meter | undefined;\n\ntype Options = MetricOptions & {description: string};\n\nfunction getMeter() {\n  if (!meter) {\n    meter = metrics.getMeter('zero');\n  }\n  return meter;\n}\n\nfunction cache<TRet>(): (\n  name: string,\n  creator: (name: string) => TRet,\n) => TRet {\n  const instruments = new Map<string, TRet>();\n  return (name: string, creator: (name: string) => TRet) => {\n    const existing = instruments.get(name);\n    if (existing) {\n      return existing;\n    }\n\n    const ret = creator(name);\n    instruments.set(name, ret);\n    return ret;\n  };\n}\n\nconst upDownCounters = cache<UpDownCounter>();\n\nexport function getOrCreateUpDownCounter(\n  category: Category,\n  name: string,\n  description: string,\n): UpDownCounter;\nexport function getOrCreateUpDownCounter(\n  category: Category,\n  name: string,\n  opts: Options,\n): UpDownCounter;\nexport function getOrCreateUpDownCounter(\n  category: Category,\n  name: string,\n  opts: string | Options,\n): UpDownCounter {\n  return upDownCounters(name, name =>\n    getMeter().createUpDownCounter(\n      `zero.${category}.${name}`,\n      typeof opts === 'string' ? {description: opts} : opts,\n    ),\n  );\n}\n\n/**\n * A latency histogram whose {@link recordMs} method accepts raw millisecond\n * durations and converts them to seconds internally.\n *\n * Use {@link getOrCreateLatencyHistogram} to create one — the unit (`'s'`),\n * bucket boundaries, and ms→s conversion are all baked in\n */\nexport type LatencyHistogram = {\n  /**\n   * Record a duration. Pass the raw elapsed milliseconds — the conversion to\n   * seconds (required by the `unit: 's'` OTel histogram) is handled internally.\n   *\n   * @param durationMs  Elapsed time in **milliseconds** (do NOT pre-divide).\n   * @param attributes  Optional OTel attributes to attach to the observation.\n   */\n  recordMs(\n    durationMs: number,\n    attributes?: Parameters<Histogram['record']>[1],\n  ): void;\n};\n\n/**\n * Bucket boundaries (in seconds) for zero's latency histograms.\n *\n * The operational range is 1 ms – 5,000 ms (including customers actively\n * tuning queries). ~2× logarithmic steps give proportionally consistent\n * `histogram_quantile` accuracy regardless of where values cluster within\n * that range. 10,000 ms and 30,000 ms are overflow catchers for truly broken\n * states.\n *\n *   1 ms, 2 ms, 5 ms, 10 ms, 20 ms, 50 ms, 100 ms, 200 ms, 500 ms,\n *   1 s, 2 s, 5 s, 10 s, 30 s\n */\nconst LATENCY_HISTOGRAM_BOUNDARIES_S = [\n  0.001, 0.002, 0.005, 0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 30,\n];\n\nconst latencyHistograms = cache<Histogram>();\n\n/**\n * Creates (or retrieves) a latency histogram for the given metric.\n *\n * - `unit` is always `'s'` (seconds), matching the OTel convention.\n * - Bucket boundaries are pre-set for zero's typical operation range\n *   (1 ms – 5 s); see {@link LATENCY_HISTOGRAM_BOUNDARIES_S}.\n * - The returned {@link LatencyHistogram} accepts **milliseconds** via\n *   `recordMs()`, so callers never need to divide by 1000.\n *\n * @example\n * ```ts\n * readonly #hydrationTime = getOrCreateLatencyHistogram(\n *   'sync', 'hydration-time', 'Time to hydrate a query.',\n * );\n * // ...\n * this.#hydrationTime.recordMs(performance.now() - start);\n * ```\n */\nexport function getOrCreateLatencyHistogram(\n  category: Category,\n  name: string,\n  description: string,\n): LatencyHistogram {\n  const h = latencyHistograms(name, name =>\n    getMeter().createHistogram(`zero.${category}.${name}`, {\n      description,\n      unit: 's',\n      advice: {\n        explicitBucketBoundaries: LATENCY_HISTOGRAM_BOUNDARIES_S,\n      },\n    }),\n  );\n  return {\n    recordMs: (durationMs, attributes) =>\n      h.record(durationMs / 1000, attributes),\n  };\n}\n\nconst counters = cache<Counter>();\n\nexport function getOrCreateCounter(\n  category: Category,\n  name: string,\n  description: string,\n): Counter;\nexport function getOrCreateCounter(\n  category: Category,\n  name: string,\n  opts: Options,\n): Counter;\nexport function getOrCreateCounter(\n  category: Category,\n  name: string,\n  opts: string | Options,\n): Counter {\n  return counters(name, name =>\n    getMeter().createCounter(\n      `zero.${category}.${name}`,\n      typeof opts === 'string' ? {description: opts} : opts,\n    ),\n  );\n}\n\nconst gauges = cache<ObservableGauge>();\n\nexport function getOrCreateGauge(\n  category: Category,\n  name: string,\n  description: string,\n): ObservableGauge;\nexport function getOrCreateGauge(\n  category: Category,\n  name: string,\n  opts: Options,\n): ObservableGauge;\nexport function getOrCreateGauge(\n  category: Category,\n  name: string,\n  opts: string | Options,\n): ObservableGauge {\n  return gauges(name, name =>\n    getMeter().createObservableGauge(\n      `zero.${category}.${name}`,\n      typeof opts === 'string' ? {description: opts} : opts,\n    ),\n  );\n}\n"],"mappings":";;AAmBA,IAAI;AAIJ,SAAS,WAAW;AAClB,KAAI,CAAC,MACH,SAAQ,QAAQ,SAAS,OAAO;AAElC,QAAO;;AAGT,SAAS,QAGC;CACR,MAAM,8BAAc,IAAI,KAAmB;AAC3C,SAAQ,MAAc,YAAoC;EACxD,MAAM,WAAW,YAAY,IAAI,KAAK;AACtC,MAAI,SACF,QAAO;EAGT,MAAM,MAAM,QAAQ,KAAK;AACzB,cAAY,IAAI,MAAM,IAAI;AAC1B,SAAO;;;AAIX,IAAM,iBAAiB,OAAsB;AAY7C,SAAgB,yBACd,UACA,MACA,MACe;AACf,QAAO,eAAe,OAAM,SAC1B,UAAU,CAAC,oBACT,QAAQ,SAAS,GAAG,QACpB,OAAO,SAAS,WAAW,EAAC,aAAa,MAAK,GAAG,KAClD,CACF;;;;;;;;;;;;;;AAoCH,IAAM,iCAAiC;CACrC;CAAO;CAAO;CAAO;CAAM;CAAM;CAAM;CAAK;CAAK;CAAK;CAAG;CAAG;CAAG;CAAI;CACpE;AAED,IAAM,oBAAoB,OAAkB;;;;;;;;;;;;;;;;;;;AAoB5C,SAAgB,4BACd,UACA,MACA,aACkB;CAClB,MAAM,IAAI,kBAAkB,OAAM,SAChC,UAAU,CAAC,gBAAgB,QAAQ,SAAS,GAAG,QAAQ;EACrD;EACA,MAAM;EACN,QAAQ,EACN,0BAA0B,gCAC3B;EACF,CAAC,CACH;AACD,QAAO,EACL,WAAW,YAAY,eACrB,EAAE,OAAO,aAAa,KAAM,WAAW,EAC1C;;AAGH,IAAM,WAAW,OAAgB;AAYjC,SAAgB,mBACd,UACA,MACA,MACS;AACT,QAAO,SAAS,OAAM,SACpB,UAAU,CAAC,cACT,QAAQ,SAAS,GAAG,QACpB,OAAO,SAAS,WAAW,EAAC,aAAa,MAAK,GAAG,KAClD,CACF;;AAGH,IAAM,SAAS,OAAwB;AAYvC,SAAgB,iBACd,UACA,MACA,MACiB;AACjB,QAAO,OAAO,OAAM,SAClB,UAAU,CAAC,sBACT,QAAQ,SAAS,GAAG,QACpB,OAAO,SAAS,WAAW,EAAC,aAAa,MAAK,GAAG,KAClD,CACF"}

package/out/zero-cache/src/scripts/decommission.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decommission.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/scripts/decommission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAO3D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuB/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEpE,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,kBAAkB,iBA0BxB"}
+{"version":3,"file":"decommission.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/scripts/decommission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAO3D,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuB/B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEpE,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,UAAU,EACd,GAAG,EAAE,kBAAkB,iBA8BxB"}

package/out/zero-cache/src/scripts/decommission.js

@@ -24,17 +24,17 @@ async function decommissionZero(lc, cfg) {
 	const shardID = getShardID(cfg);
 	lc.info?.(`Decommissioning app "${app.id}"`);
 	if (cfg.upstream.type === "pg") {
-		const upstream = pgClient(lc, cfg.upstream.db);
+		const upstream = pgClient(lc, cfg.upstream.db, "decommission-upstream");
 		await decommissionShard(lc, upstream, app.id, shard.num);
 		lc.debug?.(`Cleaning up upstream metadata from ${hostPort(upstream)}`);
 		await upstream.unsafe(`DROP SCHEMA IF EXISTS ${id(app.id)} CASCADE`);
 		await upstream.end();
 	}
-	const cvr = pgClient(lc, cfg.cvr.db ?? cfg.upstream.db);
+	const cvr = pgClient(lc, cfg.cvr.db ?? cfg.upstream.db, "decommission-cvr");
 	lc.debug?.(`Cleaning up cvc data from ${hostPort(cvr)}`);
 	await cvr.unsafe(`DROP SCHEMA IF EXISTS ${id(cvrSchema(shardID))} CASCADE`);
 	await cvr.end();
-	const cdc = pgClient(lc, cfg.change.db ?? cfg.upstream.db);
+	const cdc = pgClient(lc, cfg.change.db ?? cfg.upstream.db, "decommission-cdc");
 	lc.debug?.(`Cleaning up cdc data from ${hostPort(cdc)}`);
 	await cdc.unsafe(`DROP SCHEMA IF EXISTS ${id(cdcSchema(shardID))} CASCADE`);
 	await cdc.end();

package/out/zero-cache/src/scripts/decommission.js.map

@@ -1 +1 @@
-{"version":3,"file":"decommission.js","names":[],"sources":["../../../../../zero-cache/src/scripts/decommission.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {logOptions} from '../../../otel/src/log-options.ts';\nimport type {Config} from '../../../shared/src/options.ts';\nimport {appOptions, shardOptions, zeroOptions} from '../config/zero-config.ts';\nimport {decommissionShard} from '../services/change-source/pg/decommission.ts';\nimport {pgClient, type PostgresDB} from '../types/pg.ts';\nimport {cdcSchema, cvrSchema, getShardID} from '../types/shards.ts';\nimport {id} from '../types/sql.ts';\n\nexport const decommissionOptions = {\n  app: {\n    id: appOptions.id,\n  },\n\n  shard: {\n    num: shardOptions.num,\n  },\n\n  upstream: {\n    db: zeroOptions.upstream.db,\n    type: zeroOptions.upstream.type,\n  },\n\n  cvr: {\n    db: zeroOptions.cvr.db,\n  },\n\n  change: {\n    db: zeroOptions.change.db,\n  },\n\n  log: {level: logOptions.level, format: logOptions.format},\n};\n\nexport type DecommissionConfig = Config<typeof decommissionOptions>;\n\nexport async function decommissionZero(\n  lc: LogContext,\n  cfg: DecommissionConfig,\n) {\n  const {app, shard} = cfg;\n  const shardID = getShardID(cfg);\n  lc.info?.(`Decommissioning app \"${app.id}\"`);\n\n  if (cfg.upstream.type === 'pg') {\n    const upstream = pgClient(lc, cfg.upstream.db);\n    await decommissionShard(lc, upstream, app.id, shard.num);\n\n    lc.debug?.(`Cleaning up upstream metadata from ${hostPort(upstream)}`);\n    await upstream.unsafe(`DROP SCHEMA IF EXISTS ${id(app.id)} CASCADE`);\n    await upstream.end();\n  }\n\n  const cvr = pgClient(lc, cfg.cvr.db ?? cfg.upstream.db);\n  lc.debug?.(`Cleaning up cvc data from ${hostPort(cvr)}`);\n  await cvr.unsafe(`DROP SCHEMA IF EXISTS ${id(cvrSchema(shardID))} CASCADE`);\n  await cvr.end();\n\n  const cdc = pgClient(lc, cfg.change.db ?? cfg.upstream.db);\n  lc.debug?.(`Cleaning up cdc data from ${hostPort(cdc)}`);\n  await cdc.unsafe(`DROP SCHEMA IF EXISTS ${id(cdcSchema(shardID))} CASCADE`);\n  await cdc.end();\n\n  lc.info?.(`App \"${app.id}\" decommissioned`);\n}\n\nfunction hostPort(db: PostgresDB) {\n  const {host, port} = db.options;\n  return `${host.join(',')}:${port?.at(0) ?? 5432}`;\n}\n"],"mappings":";;;;;;;AASA,IAAa,sBAAsB;CACjC,KAAK,EACH,IAAI,WAAW,IAChB;CAED,OAAO,EACL,KAAK,aAAa,KACnB;CAED,UAAU;EACR,IAAI,YAAY,SAAS;EACzB,MAAM,YAAY,SAAS;EAC5B;CAED,KAAK,EACH,IAAI,YAAY,IAAI,IACrB;CAED,QAAQ,EACN,IAAI,YAAY,OAAO,IACxB;CAED,KAAK;EAAC,OAAO,WAAW;EAAO,QAAQ,WAAW;EAAO;CAC1D;AAID,eAAsB,iBACpB,IACA,KACA;CACA,MAAM,EAAC,KAAK,UAAS;CACrB,MAAM,UAAU,WAAW,IAAI;AAC/B,IAAG,OAAO,wBAAwB,IAAI,GAAG,GAAG;AAE5C,KAAI,IAAI,SAAS,SAAS,MAAM;EAC9B,MAAM,WAAW,SAAS,IAAI,IAAI,SAAS,GAAG;AAC9C,QAAM,kBAAkB,IAAI,UAAU,IAAI,IAAI,MAAM,IAAI;AAExD,KAAG,QAAQ,sCAAsC,SAAS,SAAS,GAAG;AACtE,QAAM,SAAS,OAAO,yBAAyB,GAAG,IAAI,GAAG,CAAC,UAAU;AACpE,QAAM,SAAS,KAAK;;CAGtB,MAAM,MAAM,SAAS,IAAI,IAAI,IAAI,MAAM,IAAI,SAAS,GAAG;AACvD,IAAG,QAAQ,6BAA6B,SAAS,IAAI,GAAG;AACxD,OAAM,IAAI,OAAO,yBAAyB,GAAG,UAAU,QAAQ,CAAC,CAAC,UAAU;AAC3E,OAAM,IAAI,KAAK;CAEf,MAAM,MAAM,SAAS,IAAI,IAAI,OAAO,MAAM,IAAI,SAAS,GAAG;AAC1D,IAAG,QAAQ,6BAA6B,SAAS,IAAI,GAAG;AACxD,OAAM,IAAI,OAAO,yBAAyB,GAAG,UAAU,QAAQ,CAAC,CAAC,UAAU;AAC3E,OAAM,IAAI,KAAK;AAEf,IAAG,OAAO,QAAQ,IAAI,GAAG,kBAAkB;;AAG7C,SAAS,SAAS,IAAgB;CAChC,MAAM,EAAC,MAAM,SAAQ,GAAG;AACxB,QAAO,GAAG,KAAK,KAAK,IAAI,CAAC,GAAG,MAAM,GAAG,EAAE,IAAI"}
+{"version":3,"file":"decommission.js","names":[],"sources":["../../../../../zero-cache/src/scripts/decommission.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {logOptions} from '../../../otel/src/log-options.ts';\nimport type {Config} from '../../../shared/src/options.ts';\nimport {appOptions, shardOptions, zeroOptions} from '../config/zero-config.ts';\nimport {decommissionShard} from '../services/change-source/pg/decommission.ts';\nimport {pgClient, type PostgresDB} from '../types/pg.ts';\nimport {cdcSchema, cvrSchema, getShardID} from '../types/shards.ts';\nimport {id} from '../types/sql.ts';\n\nexport const decommissionOptions = {\n  app: {\n    id: appOptions.id,\n  },\n\n  shard: {\n    num: shardOptions.num,\n  },\n\n  upstream: {\n    db: zeroOptions.upstream.db,\n    type: zeroOptions.upstream.type,\n  },\n\n  cvr: {\n    db: zeroOptions.cvr.db,\n  },\n\n  change: {\n    db: zeroOptions.change.db,\n  },\n\n  log: {level: logOptions.level, format: logOptions.format},\n};\n\nexport type DecommissionConfig = Config<typeof decommissionOptions>;\n\nexport async function decommissionZero(\n  lc: LogContext,\n  cfg: DecommissionConfig,\n) {\n  const {app, shard} = cfg;\n  const shardID = getShardID(cfg);\n  lc.info?.(`Decommissioning app \"${app.id}\"`);\n\n  if (cfg.upstream.type === 'pg') {\n    const upstream = pgClient(lc, cfg.upstream.db, 'decommission-upstream');\n    await decommissionShard(lc, upstream, app.id, shard.num);\n\n    lc.debug?.(`Cleaning up upstream metadata from ${hostPort(upstream)}`);\n    await upstream.unsafe(`DROP SCHEMA IF EXISTS ${id(app.id)} CASCADE`);\n    await upstream.end();\n  }\n\n  const cvr = pgClient(lc, cfg.cvr.db ?? cfg.upstream.db, 'decommission-cvr');\n  lc.debug?.(`Cleaning up cvc data from ${hostPort(cvr)}`);\n  await cvr.unsafe(`DROP SCHEMA IF EXISTS ${id(cvrSchema(shardID))} CASCADE`);\n  await cvr.end();\n\n  const cdc = pgClient(\n    lc,\n    cfg.change.db ?? cfg.upstream.db,\n    'decommission-cdc',\n  );\n  lc.debug?.(`Cleaning up cdc data from ${hostPort(cdc)}`);\n  await cdc.unsafe(`DROP SCHEMA IF EXISTS ${id(cdcSchema(shardID))} CASCADE`);\n  await cdc.end();\n\n  lc.info?.(`App \"${app.id}\" decommissioned`);\n}\n\nfunction hostPort(db: PostgresDB) {\n  const {host, port} = db.options;\n  return `${host.join(',')}:${port?.at(0) ?? 5432}`;\n}\n"],"mappings":";;;;;;;AASA,IAAa,sBAAsB;CACjC,KAAK,EACH,IAAI,WAAW,IAChB;CAED,OAAO,EACL,KAAK,aAAa,KACnB;CAED,UAAU;EACR,IAAI,YAAY,SAAS;EACzB,MAAM,YAAY,SAAS;EAC5B;CAED,KAAK,EACH,IAAI,YAAY,IAAI,IACrB;CAED,QAAQ,EACN,IAAI,YAAY,OAAO,IACxB;CAED,KAAK;EAAC,OAAO,WAAW;EAAO,QAAQ,WAAW;EAAO;CAC1D;AAID,eAAsB,iBACpB,IACA,KACA;CACA,MAAM,EAAC,KAAK,UAAS;CACrB,MAAM,UAAU,WAAW,IAAI;AAC/B,IAAG,OAAO,wBAAwB,IAAI,GAAG,GAAG;AAE5C,KAAI,IAAI,SAAS,SAAS,MAAM;EAC9B,MAAM,WAAW,SAAS,IAAI,IAAI,SAAS,IAAI,wBAAwB;AACvE,QAAM,kBAAkB,IAAI,UAAU,IAAI,IAAI,MAAM,IAAI;AAExD,KAAG,QAAQ,sCAAsC,SAAS,SAAS,GAAG;AACtE,QAAM,SAAS,OAAO,yBAAyB,GAAG,IAAI,GAAG,CAAC,UAAU;AACpE,QAAM,SAAS,KAAK;;CAGtB,MAAM,MAAM,SAAS,IAAI,IAAI,IAAI,MAAM,IAAI,SAAS,IAAI,mBAAmB;AAC3E,IAAG,QAAQ,6BAA6B,SAAS,IAAI,GAAG;AACxD,OAAM,IAAI,OAAO,yBAAyB,GAAG,UAAU,QAAQ,CAAC,CAAC,UAAU;AAC3E,OAAM,IAAI,KAAK;CAEf,MAAM,MAAM,SACV,IACA,IAAI,OAAO,MAAM,IAAI,SAAS,IAC9B,mBACD;AACD,IAAG,QAAQ,6BAA6B,SAAS,IAAI,GAAG;AACxD,OAAM,IAAI,OAAO,yBAAyB,GAAG,UAAU,QAAQ,CAAC,CAAC,UAAU;AAC3E,OAAM,IAAI,KAAK;AAEf,IAAG,OAAO,QAAQ,IAAI,GAAG,kBAAkB;;AAG7C,SAAS,SAAS,IAAgB;CAChC,MAAM,EAAC,MAAM,SAAQ,GAAG;AACxB,QAAO,GAAG,KAAK,KAAK,IAAI,CAAC,GAAG,MAAM,GAAG,EAAE,IAAI"}

package/out/zero-cache/src/scripts/deploy-permissions.js

@@ -74,7 +74,7 @@ function failWithMessage(msg) {
 	process.exit(-1);
 }
 async function deployPermissions(upstreamURI, permissions, force) {
-	const db = pgClient(lc, upstreamURI);
+	const db = pgClient(lc, upstreamURI, "deploy-permissions");
 	const { host, port } = db.options;
 	colorConsole.debug(`Connecting to upstream@${host}:${port}`);
 	try {

package/out/zero-cache/src/scripts/deploy-permissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-permissions.js","names":[],"sources":["../../../../../zero-cache/src/scripts/deploy-permissions.ts"],"sourcesContent":["import '../../../shared/src/dotenv.ts';\n\nimport {writeFile} from 'node:fs/promises';\nimport {ident as id, literal} from 'pg-format';\nimport {colorConsole, createLogContext} from '../../../shared/src/logging.ts';\nimport {parseOptions} from '../../../shared/src/options.ts';\nimport {difference} from '../../../shared/src/set-utils.ts';\nimport {mapCondition} from '../../../zero-protocol/src/ast.ts';\nimport {\n  type AssetPermissions,\n  type PermissionsConfig,\n  type Rule,\n} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {validator} from '../../../zero-schema/src/name-mapper.ts';\nimport {ZERO_ENV_VAR_PREFIX} from '../config/zero-config.ts';\nimport {runTx} from '../db/run-transaction.ts';\nimport {getPublicationInfo} from '../services/change-source/pg/schema/published.ts';\nimport {\n  ensureGlobalTables,\n  SHARD_CONFIG_TABLE,\n} from '../services/change-source/pg/schema/shard.ts';\nimport {liteTableName} from '../types/names.ts';\nimport {pgClient, type PostgresDB} from '../types/pg.ts';\nimport {appSchema, getShardID, upstreamSchema} from '../types/shards.ts';\nimport {\n  deployPermissionsOptions,\n  loadSchemaAndPermissions,\n} from './permissions.ts';\n\nconst config = parseOptions(deployPermissionsOptions, {\n  argv: process.argv.slice(2),\n  envNamePrefix: ZERO_ENV_VAR_PREFIX,\n});\n\nconst shard = getShardID(config);\nconst app = appSchema(shard);\n\nconst lc = createLogContext(config);\n\nasync function validatePermissions(\n  db: PostgresDB,\n  permissions: PermissionsConfig,\n) {\n  const schema = upstreamSchema(shard);\n\n  // Check if the shardConfig table has been initialized.\n  const result = await db`\n    SELECT relname FROM pg_class\n      JOIN pg_namespace ON relnamespace = pg_namespace.oid\n      WHERE nspname = ${schema} AND relname = ${SHARD_CONFIG_TABLE}`;\n  if (result.length === 0) {\n    colorConsole.warn(\n      `zero-cache has not yet initialized the upstream database.\\n` +\n        `Deploying ${app} permissions without validating against published tables/columns.`,\n    );\n    return;\n  }\n\n  // Get the publications for the shard\n  const config = await db<{publications: string[]}[]>`\n    SELECT publications FROM ${db(schema + '.' + SHARD_CONFIG_TABLE)}\n  `;\n  if (config.length === 0) {\n    colorConsole.warn(\n      `zero-cache has not yet initialized the upstream database.\\n` +\n        `Deploying ${app} permissions without validating against published tables/columns.`,\n    );\n    return;\n  }\n  colorConsole.info(\n    `Validating permissions against tables and columns published for \"${app}\".`,\n  );\n\n  const [{publications: shardPublications}] = config;\n  const {tables, publications} = await getPublicationInfo(\n    db,\n    shardPublications,\n  );\n  const pubnames = publications.map(p => p.pubname);\n  const missing = difference(new Set(shardPublications), new Set(pubnames));\n  if (missing.size) {\n    colorConsole.warn(\n      `Upstream is missing expected publications \"${[...missing]}\".\\n` +\n        `You may need to re-initialize your replica.\\n` +\n        `Deploying ${app} permissions without validating against published tables/columns.`,\n    );\n    return;\n  }\n  const tablesToColumns = new Map(\n    tables.map(t => [liteTableName(t), Object.keys(t.columns)]),\n  );\n  const validate = validator(tablesToColumns);\n  try {\n    for (const [table, perms] of Object.entries(permissions?.tables ?? {})) {\n      const validateRule = ([_, cond]: Rule) => {\n        mapCondition(cond, table, validate);\n      };\n      const validateAsset = (asset: AssetPermissions | undefined) => {\n        asset?.select?.forEach(validateRule);\n        asset?.delete?.forEach(validateRule);\n        asset?.insert?.forEach(validateRule);\n        asset?.update?.preMutation?.forEach(validateRule);\n        asset?.update?.postMutation?.forEach(validateRule);\n      };\n      validateAsset(perms.row);\n      if (perms.cell) {\n        Object.values(perms.cell).forEach(validateAsset);\n      }\n    }\n  } catch (e) {\n    failWithMessage(String(e));\n  }\n}\n\nfunction failWithMessage(msg: string) {\n  colorConsole.error(msg);\n  colorConsole.info('\\nUse --force to deploy at your own risk.\\n');\n  process.exit(-1);\n}\n\nasync function deployPermissions(\n  upstreamURI: string,\n  permissions: PermissionsConfig,\n  force: boolean,\n) {\n  const db = pgClient(lc, upstreamURI);\n  const {host, port} = db.options;\n  colorConsole.debug(`Connecting to upstream@${host}:${port}`);\n  try {\n    await ensureGlobalTables(db, shard);\n\n    const {hash, changed} = await runTx(db, async tx => {\n      if (force) {\n        colorConsole.warn(`--force specified. Skipping validation.`);\n      } else {\n        await validatePermissions(tx, permissions);\n      }\n\n      const {appID} = shard;\n      colorConsole.info(\n        `Deploying permissions for --app-id \"${appID}\" to upstream@${db.options.host}`,\n      );\n      const [{hash: beforeHash}] = await tx<{hash: string}[]>`\n        SELECT hash from ${tx(app)}.permissions`;\n      const [{hash}] = await tx<{hash: string}[]>`\n        UPDATE ${tx(app)}.permissions SET ${db({permissions})} RETURNING hash`;\n\n      return {hash: hash.substring(0, 7), changed: beforeHash !== hash};\n    });\n    if (changed) {\n      colorConsole.info(`Deployed new permissions (hash=${hash})`);\n    } else {\n      colorConsole.info(`Permissions unchanged (hash=${hash})`);\n    }\n  } finally {\n    await db.end();\n  }\n}\n\nasync function writePermissionsFile(\n  perms: PermissionsConfig,\n  file: string,\n  format: 'sql' | 'json' | 'pretty',\n) {\n  const contents =\n    format === 'sql'\n      ? `UPDATE ${id(app)}.permissions SET permissions = ${literal(\n          JSON.stringify(perms),\n        )};`\n      : JSON.stringify(perms, null, format === 'pretty' ? 2 : 0);\n  await writeFile(file, contents);\n  colorConsole.info(`Wrote ${format} permissions to ${config.output.file}`);\n}\n\nconst ret = await loadSchemaAndPermissions(config.schema.path, true);\nif (!ret || Object.keys(ret?.permissions ?? {}).length === 0) {\n  colorConsole.warn(\n    `No permissions found at ${config.schema.path}, so could not deploy ` +\n      `permissions. Replicating data, but no tables will be syncable. ` +\n      `Create a schema file with permissions to be able to sync data.`,\n  );\n} else {\n  colorConsole.warn(\n    `Permissions are deprecated and will be removed in an upcoming release. See: https://zero.rocicorp.dev/docs/auth.`,\n  );\n\n  const {permissions} = ret;\n  if (config.output.file) {\n    await writePermissionsFile(\n      permissions,\n      config.output.file,\n      config.output.format,\n    );\n  } else if (config.upstream.type !== 'pg') {\n    colorConsole.warn(\n      `Permissions deployment is not supported for ${config.upstream.type} upstreams`,\n    );\n    process.exit(-1);\n  } else if (config.upstream.db) {\n    await deployPermissions(config.upstream.db, permissions, config.force);\n  } else {\n    colorConsole.error(`No --output-file or --upstream-db specified`);\n    // Shows the usage text.\n    parseOptions(deployPermissionsOptions, {\n      argv: ['--help'],\n      envNamePrefix: ZERO_ENV_VAR_PREFIX,\n    });\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"deploy-permissions.js","names":[],"sources":["../../../../../zero-cache/src/scripts/deploy-permissions.ts"],"sourcesContent":["import '../../../shared/src/dotenv.ts';\n\nimport {writeFile} from 'node:fs/promises';\nimport {ident as id, literal} from 'pg-format';\nimport {colorConsole, createLogContext} from '../../../shared/src/logging.ts';\nimport {parseOptions} from '../../../shared/src/options.ts';\nimport {difference} from '../../../shared/src/set-utils.ts';\nimport {mapCondition} from '../../../zero-protocol/src/ast.ts';\nimport {\n  type AssetPermissions,\n  type PermissionsConfig,\n  type Rule,\n} from '../../../zero-schema/src/compiled-permissions.ts';\nimport {validator} from '../../../zero-schema/src/name-mapper.ts';\nimport {ZERO_ENV_VAR_PREFIX} from '../config/zero-config.ts';\nimport {runTx} from '../db/run-transaction.ts';\nimport {getPublicationInfo} from '../services/change-source/pg/schema/published.ts';\nimport {\n  ensureGlobalTables,\n  SHARD_CONFIG_TABLE,\n} from '../services/change-source/pg/schema/shard.ts';\nimport {liteTableName} from '../types/names.ts';\nimport {pgClient, type PostgresDB} from '../types/pg.ts';\nimport {appSchema, getShardID, upstreamSchema} from '../types/shards.ts';\nimport {\n  deployPermissionsOptions,\n  loadSchemaAndPermissions,\n} from './permissions.ts';\n\nconst config = parseOptions(deployPermissionsOptions, {\n  argv: process.argv.slice(2),\n  envNamePrefix: ZERO_ENV_VAR_PREFIX,\n});\n\nconst shard = getShardID(config);\nconst app = appSchema(shard);\n\nconst lc = createLogContext(config);\n\nasync function validatePermissions(\n  db: PostgresDB,\n  permissions: PermissionsConfig,\n) {\n  const schema = upstreamSchema(shard);\n\n  // Check if the shardConfig table has been initialized.\n  const result = await db`\n    SELECT relname FROM pg_class\n      JOIN pg_namespace ON relnamespace = pg_namespace.oid\n      WHERE nspname = ${schema} AND relname = ${SHARD_CONFIG_TABLE}`;\n  if (result.length === 0) {\n    colorConsole.warn(\n      `zero-cache has not yet initialized the upstream database.\\n` +\n        `Deploying ${app} permissions without validating against published tables/columns.`,\n    );\n    return;\n  }\n\n  // Get the publications for the shard\n  const config = await db<{publications: string[]}[]>`\n    SELECT publications FROM ${db(schema + '.' + SHARD_CONFIG_TABLE)}\n  `;\n  if (config.length === 0) {\n    colorConsole.warn(\n      `zero-cache has not yet initialized the upstream database.\\n` +\n        `Deploying ${app} permissions without validating against published tables/columns.`,\n    );\n    return;\n  }\n  colorConsole.info(\n    `Validating permissions against tables and columns published for \"${app}\".`,\n  );\n\n  const [{publications: shardPublications}] = config;\n  const {tables, publications} = await getPublicationInfo(\n    db,\n    shardPublications,\n  );\n  const pubnames = publications.map(p => p.pubname);\n  const missing = difference(new Set(shardPublications), new Set(pubnames));\n  if (missing.size) {\n    colorConsole.warn(\n      `Upstream is missing expected publications \"${[...missing]}\".\\n` +\n        `You may need to re-initialize your replica.\\n` +\n        `Deploying ${app} permissions without validating against published tables/columns.`,\n    );\n    return;\n  }\n  const tablesToColumns = new Map(\n    tables.map(t => [liteTableName(t), Object.keys(t.columns)]),\n  );\n  const validate = validator(tablesToColumns);\n  try {\n    for (const [table, perms] of Object.entries(permissions?.tables ?? {})) {\n      const validateRule = ([_, cond]: Rule) => {\n        mapCondition(cond, table, validate);\n      };\n      const validateAsset = (asset: AssetPermissions | undefined) => {\n        asset?.select?.forEach(validateRule);\n        asset?.delete?.forEach(validateRule);\n        asset?.insert?.forEach(validateRule);\n        asset?.update?.preMutation?.forEach(validateRule);\n        asset?.update?.postMutation?.forEach(validateRule);\n      };\n      validateAsset(perms.row);\n      if (perms.cell) {\n        Object.values(perms.cell).forEach(validateAsset);\n      }\n    }\n  } catch (e) {\n    failWithMessage(String(e));\n  }\n}\n\nfunction failWithMessage(msg: string) {\n  colorConsole.error(msg);\n  colorConsole.info('\\nUse --force to deploy at your own risk.\\n');\n  process.exit(-1);\n}\n\nasync function deployPermissions(\n  upstreamURI: string,\n  permissions: PermissionsConfig,\n  force: boolean,\n) {\n  const db = pgClient(lc, upstreamURI, 'deploy-permissions');\n  const {host, port} = db.options;\n  colorConsole.debug(`Connecting to upstream@${host}:${port}`);\n  try {\n    await ensureGlobalTables(db, shard);\n\n    const {hash, changed} = await runTx(db, async tx => {\n      if (force) {\n        colorConsole.warn(`--force specified. Skipping validation.`);\n      } else {\n        await validatePermissions(tx, permissions);\n      }\n\n      const {appID} = shard;\n      colorConsole.info(\n        `Deploying permissions for --app-id \"${appID}\" to upstream@${db.options.host}`,\n      );\n      const [{hash: beforeHash}] = await tx<{hash: string}[]>`\n        SELECT hash from ${tx(app)}.permissions`;\n      const [{hash}] = await tx<{hash: string}[]>`\n        UPDATE ${tx(app)}.permissions SET ${db({permissions})} RETURNING hash`;\n\n      return {hash: hash.substring(0, 7), changed: beforeHash !== hash};\n    });\n    if (changed) {\n      colorConsole.info(`Deployed new permissions (hash=${hash})`);\n    } else {\n      colorConsole.info(`Permissions unchanged (hash=${hash})`);\n    }\n  } finally {\n    await db.end();\n  }\n}\n\nasync function writePermissionsFile(\n  perms: PermissionsConfig,\n  file: string,\n  format: 'sql' | 'json' | 'pretty',\n) {\n  const contents =\n    format === 'sql'\n      ? `UPDATE ${id(app)}.permissions SET permissions = ${literal(\n          JSON.stringify(perms),\n        )};`\n      : JSON.stringify(perms, null, format === 'pretty' ? 2 : 0);\n  await writeFile(file, contents);\n  colorConsole.info(`Wrote ${format} permissions to ${config.output.file}`);\n}\n\nconst ret = await loadSchemaAndPermissions(config.schema.path, true);\nif (!ret || Object.keys(ret?.permissions ?? {}).length === 0) {\n  colorConsole.warn(\n    `No permissions found at ${config.schema.path}, so could not deploy ` +\n      `permissions. Replicating data, but no tables will be syncable. ` +\n      `Create a schema file with permissions to be able to sync data.`,\n  );\n} else {\n  colorConsole.warn(\n    `Permissions are deprecated and will be removed in an upcoming release. See: https://zero.rocicorp.dev/docs/auth.`,\n  );\n\n  const {permissions} = ret;\n  if (config.output.file) {\n    await writePermissionsFile(\n      permissions,\n      config.output.file,\n      config.output.format,\n    );\n  } else if (config.upstream.type !== 'pg') {\n    colorConsole.warn(\n      `Permissions deployment is not supported for ${config.upstream.type} upstreams`,\n    );\n    process.exit(-1);\n  } else if (config.upstream.db) {\n    await deployPermissions(config.upstream.db, permissions, config.force);\n  } else {\n    colorConsole.error(`No --output-file or --upstream-db specified`);\n    // Shows the usage text.\n    parseOptions(deployPermissionsOptions, {\n      argv: ['--help'],\n      envNamePrefix: ZERO_ENV_VAR_PREFIX,\n    });\n  }\n}\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AAgCA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAK/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA0Lf"}
+{"version":3,"file":"change-streamer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"names":[],"mappings":"AA6BA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAK/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAuMf"}

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

@@ -11,7 +11,7 @@ import { getServerContext } from "../config/server-context.js";
 import { deleteLiteDB } from "../db/delete-lite-db.js";
 import { warmupConnections } from "../db/warmup.js";
 import { initEventSink, publishCriticalEvent } from "../observability/events.js";
-import { AutoResetSignal, CHANGE_STREAMER_APP_NAME } from "../services/change-streamer/schema/tables.js";
+import { AutoResetSignal } from "../services/change-streamer/schema/tables.js";
 import { upgradeReplica } from "../services/change-source/common/replica-schema.js";
 import { ReplicationStatusPublisher, replicationStatusError } from "../services/replicator/replication-status.js";
 import { initializeCustomChangeSource } from "../services/change-source/custom/change-source.js";
@@ -35,10 +35,7 @@ async function runWorker(parent, env, ...argv) {
 	startOtelAuto(createLogContext(config, "change-streamer", 0, false), "change-streamer", 0);
 	const lc = createLogContext(config, "change-streamer");
 	initEventSink(lc, config);
-	const changeDB = pgClient(lc, change.db, {
-		max: change.maxConns,
-		connection: { ["application_name"]: CHANGE_STREAMER_APP_NAME }
-	}, { sendStringAsJson: true });
+	const changeDB = pgClient(lc, change.db, "change-streamer", { max: change.maxConns }, { sendStringAsJson: true });
 	warmupConnections(lc, changeDB, "change").catch(() => {});
 	const { autoReset, replicationLag } = config;
 	const shard = getShardConfig(config);
@@ -68,6 +65,8 @@ async function runWorker(parent, env, ...argv) {
 		if (first && e instanceof AutoResetSignal) {
 			lc.warn?.(`resetting replica ${replica.file}`, e);
 			deleteLiteDB(replica.file);
+			await purgeLock?.release();
+			purgeLock = null;
 			continue;
 		}
 		await publishCriticalEvent(lc, replicationStatusError(lc, "Initializing", e));

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

@@ -1 +1 @@
-{"version":3,"file":"change-streamer.js","names":[],"sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {DatabaseInitError} from '../../../zqlite/src/db.ts';\nimport {getServerContext} from '../config/server-context.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {warmupConnections} from '../db/warmup.ts';\nimport {initEventSink, publishCriticalEvent} from '../observability/events.ts';\nimport {upgradeReplica} from '../services/change-source/common/replica-schema.ts';\nimport {initializeCustomChangeSource} from '../services/change-source/custom/change-source.ts';\nimport {initializePostgresChangeSource} from '../services/change-source/pg/change-source.ts';\nimport {BackupMonitor} from '../services/change-streamer/backup-monitor.ts';\nimport {ChangeStreamerHttpServer} from '../services/change-streamer/change-streamer-http.ts';\nimport {initializeStreamer} from '../services/change-streamer/change-streamer-service.ts';\nimport type {ChangeStreamerService} from '../services/change-streamer/change-streamer.ts';\nimport {ReplicaMonitor} from '../services/change-streamer/replica-monitor.ts';\nimport {initChangeStreamerSchema} from '../services/change-streamer/schema/init.ts';\nimport {\n  AutoResetSignal,\n  CHANGE_STREAMER_APP_NAME,\n} from '../services/change-streamer/schema/tables.ts';\nimport {PurgeLocker} from '../services/change-streamer/storer.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {\n  BackupNotFoundException,\n  restoreReplica,\n} from '../services/litestream/commands.ts';\nimport {\n  replicationStatusError,\n  ReplicationStatusPublisher,\n} from '../services/replicator/replication-status.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardConfig} from '../types/shards.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...argv: string[]\n): Promise<void> {\n  const workerStartTime = Date.now();\n  const config = getNormalizedZeroConfig({env, argv});\n  const {\n    taskID,\n    changeStreamer: {\n      port,\n      address,\n      protocol,\n      startupDelayMs,\n      backPressureLimitHeapProportion,\n      flowControlConsensusPaddingSeconds,\n    },\n    upstream,\n    change,\n    replica,\n    initialSync,\n    litestream,\n  } = config;\n\n  startOtelAuto(\n    createLogContext(config, 'change-streamer', 0, false),\n    'change-streamer',\n    0,\n  );\n  const lc = createLogContext(config, 'change-streamer');\n  initEventSink(lc, config);\n\n  // Kick off DB connection warmup in the background.\n  const changeDB = pgClient(\n    lc,\n    change.db,\n    {\n      max: change.maxConns,\n      connection: {['application_name']: CHANGE_STREAMER_APP_NAME},\n    },\n    {sendStringAsJson: true},\n  );\n  void warmupConnections(lc, changeDB, 'change').catch(() => {});\n\n  const {autoReset, replicationLag} = config;\n  const shard = getShardConfig(config);\n\n  // Ensure the change DB schema is initialized/up-to-date, then acquire\n  // a lock to prevent change-lock purges. This ensures that (this)\n  // change-streamer will be able to resume from the backup.\n  await initChangeStreamerSchema(lc, changeDB, shard);\n  let purgeLock = await new PurgeLocker(lc, shard, changeDB).acquire();\n\n  // Restore from litestream if the change-log has entries.\n  if (purgeLock) {\n    try {\n      await restoreReplica(lc, config, purgeLock);\n    } catch (e) {\n      // If the restore failed, e.g. due to a corrupt or missing backup, the\n      // replication-manager recovers by re-syncing.\n      const log = e instanceof BackupNotFoundException ? 'warn' : 'error';\n      lc[log]?.(\n        `error restoring backup. resyncing the replica: ${String(e)}`,\n        e,\n      );\n\n      // The purgeLock must be released if the backup could not be restored,\n      // or it will otherwise prevent the change-db update after the resync\n      // completes.\n      await purgeLock.release();\n      purgeLock = null;\n    }\n  }\n\n  let changeStreamer: ChangeStreamerService | undefined;\n\n  const context = getServerContext(config);\n\n  for (const first of [true, false]) {\n    try {\n      // Note: This performs initial sync of the replica if necessary.\n      const {changeSource, subscriptionState} =\n        upstream.type === 'pg'\n          ? await initializePostgresChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n              {\n                ...initialSync,\n                replicationSlotFailover: upstream.pgReplicationSlotFailover,\n              },\n              context,\n              replicationLag.reportIntervalMs,\n            )\n          : await initializeCustomChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n              context,\n            );\n\n      const replicationStatusPublisher =\n        ReplicationStatusPublisher.forReplicaFile(replica.file);\n\n      changeStreamer = await initializeStreamer(\n        lc,\n        shard,\n        taskID,\n        address,\n        protocol,\n        changeDB,\n        changeSource,\n        replicationStatusPublisher,\n        subscriptionState,\n        purgeLock,\n        autoReset ?? false,\n        {\n          backPressureLimitHeapProportion,\n          flowControlConsensusPaddingSeconds,\n          statementTimeoutMs: change.statementTimeoutMs,\n        },\n        setTimeout,\n      );\n      break;\n    } catch (e) {\n      if (first && e instanceof AutoResetSignal) {\n        lc.warn?.(`resetting replica ${replica.file}`, e);\n        // TODO: Make deleteLiteDB work with litestream. It will probably have to be\n        //       a semantic wipe instead of a file delete.\n        deleteLiteDB(replica.file);\n        continue; // execute again with a fresh initial-sync\n      }\n      await publishCriticalEvent(\n        lc,\n        replicationStatusError(lc, 'Initializing', e),\n      );\n      if (e instanceof DatabaseInitError) {\n        throw new Error(\n          `Cannot open ZERO_REPLICA_FILE at \"${replica.file}\". Please check that the path is valid.`,\n          {cause: e},\n        );\n      }\n      throw e;\n    }\n  }\n  // impossible: upstream must have advanced in order for replication to be stuck.\n  assert(changeStreamer, `resetting replica did not advance replicaVersion`);\n\n  // Perform any upgrades to the replica in case it was restored from an\n  // earlier version. Note that this upgrade is done by the replicator worker\n  // as well (in both the replication-manager and the view-syncer), but the\n  // change-streamer independently reads the replica, and it is fine run the\n  // upgrade logic redundantly since it is idempotent.\n  await upgradeReplica(lc, 'change-streamer-init', replica.file);\n\n  const {backupURL, port: metricsPort} = litestream;\n  const monitor = backupURL\n    ? new BackupMonitor(\n        lc,\n        replica.file,\n        backupURL,\n        `http://localhost:${metricsPort}/metrics`,\n        changeStreamer,\n        // The time between when the zero-cache was started to when the\n        // change-streamer is ready to start serves as the initial delay for\n        // watermark cleanup (as it either includes a similar replica\n        // restoration/preparation step, or an initial-sync, which\n        // generally takes longer).\n        //\n        // Consider: Also account for permanent volumes?\n        Date.now() - workerStartTime,\n      )\n    : new ReplicaMonitor(lc, replica.file, changeStreamer);\n\n  const changeStreamerWebServer = new ChangeStreamerHttpServer(\n    lc,\n    config,\n    {port, startupDelayMs},\n    parent,\n    changeStreamer,\n    monitor instanceof BackupMonitor ? monitor : null,\n  );\n\n  parent.send(['ready', {ready: true}]);\n\n  // Note: The changeStreamer itself is not started here; it is started by the\n  //       changeStreamerWebServer.\n  return runUntilKilled(lc, parent, changeStreamerWebServer, monitor);\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAyCA,eAA8B,UAC5B,QACA,KACA,GAAG,MACY;CACf,MAAM,kBAAkB,KAAK,KAAK;CAClC,MAAM,SAAS,wBAAwB;EAAC;EAAK;EAAK,CAAC;CACnD,MAAM,EACJ,QACA,gBAAgB,EACd,MACA,SACA,UACA,gBACA,iCACA,sCAEF,UACA,QACA,SACA,aACA,eACE;AAEJ,eACE,iBAAiB,QAAQ,mBAAmB,GAAG,MAAM,EACrD,mBACA,EACD;CACD,MAAM,KAAK,iBAAiB,QAAQ,kBAAkB;AACtD,eAAc,IAAI,OAAO;CAGzB,MAAM,WAAW,SACf,IACA,OAAO,IACP;EACE,KAAK,OAAO;EACZ,YAAY,GAAE,qBAAqB,0BAAyB;EAC7D,EACD,EAAC,kBAAkB,MAAK,CACzB;AACI,mBAAkB,IAAI,UAAU,SAAS,CAAC,YAAY,GAAG;CAE9D,MAAM,EAAC,WAAW,mBAAkB;CACpC,MAAM,QAAQ,eAAe,OAAO;AAKpC,OAAM,yBAAyB,IAAI,UAAU,MAAM;CACnD,IAAI,YAAY,MAAM,IAAI,YAAY,IAAI,OAAO,SAAS,CAAC,SAAS;AAGpE,KAAI,UACF,KAAI;AACF,QAAM,eAAe,IAAI,QAAQ,UAAU;UACpC,GAAG;AAIV,KADY,aAAa,0BAA0B,SAAS,WAE1D,kDAAkD,OAAO,EAAE,IAC3D,EACD;AAKD,QAAM,UAAU,SAAS;AACzB,cAAY;;CAIhB,IAAI;CAEJ,MAAM,UAAU,iBAAiB,OAAO;AAExC,MAAK,MAAM,SAAS,CAAC,MAAM,MAAM,CAC/B,KAAI;EAEF,MAAM,EAAC,cAAc,sBACnB,SAAS,SAAS,OACd,MAAM,+BACJ,IACA,SAAS,IACT,OACA,QAAQ,MACR;GACE,GAAG;GACH,yBAAyB,SAAS;GACnC,EACD,SACA,eAAe,iBAChB,GACD,MAAM,6BACJ,IACA,SAAS,IACT,OACA,QAAQ,MACR,QACD;AAKP,mBAAiB,MAAM,mBACrB,IACA,OACA,QACA,SACA,UACA,UACA,cATA,2BAA2B,eAAe,QAAQ,KAAK,EAWvD,mBACA,WACA,aAAa,OACb;GACE;GACA;GACA,oBAAoB,OAAO;GAC5B,EACD,WACD;AACD;UACO,GAAG;AACV,MAAI,SAAS,aAAa,iBAAiB;AACzC,MAAG,OAAO,qBAAqB,QAAQ,QAAQ,EAAE;AAGjD,gBAAa,QAAQ,KAAK;AAC1B;;AAEF,QAAM,qBACJ,IACA,uBAAuB,IAAI,gBAAgB,EAAE,CAC9C;AACD,MAAI,aAAa,kBACf,OAAM,IAAI,MACR,qCAAqC,QAAQ,KAAK,0CAClD,EAAC,OAAO,GAAE,CACX;AAEH,QAAM;;AAIV,QAAO,gBAAgB,mDAAmD;AAO1E,OAAM,eAAe,IAAI,wBAAwB,QAAQ,KAAK;CAE9D,MAAM,EAAC,WAAW,MAAM,gBAAe;CACvC,MAAM,UAAU,YACZ,IAAI,cACF,IACA,QAAQ,MACR,WACA,oBAAoB,YAAY,WAChC,gBAQA,KAAK,KAAK,GAAG,gBACd,GACD,IAAI,eAAe,IAAI,QAAQ,MAAM,eAAe;CAExD,MAAM,0BAA0B,IAAI,yBAClC,IACA,QACA;EAAC;EAAM;EAAe,EACtB,QACA,gBACA,mBAAmB,gBAAgB,UAAU,KAC9C;AAED,QAAO,KAAK,CAAC,SAAS,EAAC,OAAO,MAAK,CAAC,CAAC;AAIrC,QAAO,eAAe,IAAI,QAAQ,yBAAyB,QAAQ;;AAIrE,IAAI,CAAC,mBAAmB,CACjB,iBACH,UAAU,KAAK,aAAa,EAAE,QAAQ,KAAK,GAAG,QAAQ,KAAK,MAAM,EAAE,CAAC,CACrE"}
+{"version":3,"file":"change-streamer.js","names":[],"sources":["../../../../../zero-cache/src/server/change-streamer.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport {must} from '../../../shared/src/must.ts';\nimport {DatabaseInitError} from '../../../zqlite/src/db.ts';\nimport {getServerContext} from '../config/server-context.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {deleteLiteDB} from '../db/delete-lite-db.ts';\nimport {warmupConnections} from '../db/warmup.ts';\nimport {initEventSink, publishCriticalEvent} from '../observability/events.ts';\nimport {upgradeReplica} from '../services/change-source/common/replica-schema.ts';\nimport {initializeCustomChangeSource} from '../services/change-source/custom/change-source.ts';\nimport {initializePostgresChangeSource} from '../services/change-source/pg/change-source.ts';\nimport {BackupMonitor} from '../services/change-streamer/backup-monitor.ts';\nimport {ChangeStreamerHttpServer} from '../services/change-streamer/change-streamer-http.ts';\nimport {initializeStreamer} from '../services/change-streamer/change-streamer-service.ts';\nimport type {ChangeStreamerService} from '../services/change-streamer/change-streamer.ts';\nimport {ReplicaMonitor} from '../services/change-streamer/replica-monitor.ts';\nimport {initChangeStreamerSchema} from '../services/change-streamer/schema/init.ts';\nimport {AutoResetSignal} from '../services/change-streamer/schema/tables.ts';\nimport {PurgeLocker} from '../services/change-streamer/storer.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {\n  BackupNotFoundException,\n  restoreReplica,\n} from '../services/litestream/commands.ts';\nimport {\n  replicationStatusError,\n  ReplicationStatusPublisher,\n} from '../services/replicator/replication-status.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardConfig} from '../types/shards.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...argv: string[]\n): Promise<void> {\n  const workerStartTime = Date.now();\n  const config = getNormalizedZeroConfig({env, argv});\n  const {\n    taskID,\n    changeStreamer: {\n      port,\n      address,\n      protocol,\n      startupDelayMs,\n      backPressureLimitHeapProportion,\n      flowControlConsensusPaddingSeconds,\n    },\n    upstream,\n    change,\n    replica,\n    initialSync,\n    litestream,\n  } = config;\n\n  startOtelAuto(\n    createLogContext(config, 'change-streamer', 0, false),\n    'change-streamer',\n    0,\n  );\n  const lc = createLogContext(config, 'change-streamer');\n  initEventSink(lc, config);\n\n  // Kick off DB connection warmup in the background.\n  const changeDB = pgClient(\n    lc,\n    change.db,\n    'change-streamer',\n    {\n      max: change.maxConns,\n    },\n    {sendStringAsJson: true},\n  );\n  void warmupConnections(lc, changeDB, 'change').catch(() => {});\n\n  const {autoReset, replicationLag} = config;\n  const shard = getShardConfig(config);\n\n  // Ensure the change DB schema is initialized/up-to-date, then acquire\n  // a lock to prevent change-lock purges. This ensures that (this)\n  // change-streamer will be able to resume from the backup.\n  await initChangeStreamerSchema(lc, changeDB, shard);\n  let purgeLock = await new PurgeLocker(lc, shard, changeDB).acquire();\n\n  // Restore from litestream if the change-log has entries.\n  if (purgeLock) {\n    try {\n      await restoreReplica(lc, config, purgeLock);\n    } catch (e) {\n      // If the restore failed, e.g. due to a corrupt or missing backup, the\n      // replication-manager recovers by re-syncing.\n      const log = e instanceof BackupNotFoundException ? 'warn' : 'error';\n      lc[log]?.(\n        `error restoring backup. resyncing the replica: ${String(e)}`,\n        e,\n      );\n\n      // The purgeLock must be released if the backup could not be restored,\n      // or it will otherwise prevent the change-db update after the resync\n      // completes.\n      await purgeLock.release();\n      purgeLock = null;\n    }\n  }\n\n  let changeStreamer: ChangeStreamerService | undefined;\n\n  const context = getServerContext(config);\n\n  for (const first of [true, false]) {\n    try {\n      // Note: This performs initial sync of the replica if necessary.\n      const {changeSource, subscriptionState} =\n        upstream.type === 'pg'\n          ? await initializePostgresChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n              {\n                ...initialSync,\n                replicationSlotFailover: upstream.pgReplicationSlotFailover,\n              },\n              context,\n              replicationLag.reportIntervalMs,\n            )\n          : await initializeCustomChangeSource(\n              lc,\n              upstream.db,\n              shard,\n              replica.file,\n              context,\n            );\n\n      const replicationStatusPublisher =\n        ReplicationStatusPublisher.forReplicaFile(replica.file);\n\n      changeStreamer = await initializeStreamer(\n        lc,\n        shard,\n        taskID,\n        address,\n        protocol,\n        changeDB,\n        changeSource,\n        replicationStatusPublisher,\n        subscriptionState,\n        purgeLock,\n        autoReset ?? false,\n        {\n          backPressureLimitHeapProportion,\n          flowControlConsensusPaddingSeconds,\n          statementTimeoutMs: change.statementTimeoutMs,\n        },\n        setTimeout,\n      );\n      break;\n    } catch (e) {\n      if (first && e instanceof AutoResetSignal) {\n        lc.warn?.(`resetting replica ${replica.file}`, e);\n        // TODO: Make deleteLiteDB work with litestream. It will probably have to be\n        //       a semantic wipe instead of a file delete.\n        deleteLiteDB(replica.file);\n        // Release the purge lock before retrying. This is safe because the\n        // purge lock exists to preserve change-log entries so the new\n        // change-streamer can resume from the backup replica's watermark.\n        // An AutoResetSignal means we cant resume from the backup replica\n        // (e.g. its replication slot is gone), so the change-log entries the lock\n        // was protecting are no longer needed. The retry performs a fresh\n        // initial sync with a new replication slot, independent of the old\n        // change-log. Releasing is also necessary to avoid a\n        // self-deadlock when CHANGE_DB == UPSTREAM_DB:\n        // CREATE_REPLICATION_SLOT waits for all older transactions to\n        // finish, including this lock's open transaction.\n        await purgeLock?.release();\n        purgeLock = null;\n        continue; // execute again with a fresh initial-sync\n      }\n      await publishCriticalEvent(\n        lc,\n        replicationStatusError(lc, 'Initializing', e),\n      );\n      if (e instanceof DatabaseInitError) {\n        throw new Error(\n          `Cannot open ZERO_REPLICA_FILE at \"${replica.file}\". Please check that the path is valid.`,\n          {cause: e},\n        );\n      }\n      throw e;\n    }\n  }\n  // impossible: upstream must have advanced in order for replication to be stuck.\n  assert(changeStreamer, `resetting replica did not advance replicaVersion`);\n\n  // Perform any upgrades to the replica in case it was restored from an\n  // earlier version. Note that this upgrade is done by the replicator worker\n  // as well (in both the replication-manager and the view-syncer), but the\n  // change-streamer independently reads the replica, and it is fine run the\n  // upgrade logic redundantly since it is idempotent.\n  await upgradeReplica(lc, 'change-streamer-init', replica.file);\n\n  const {backupURL, port: metricsPort} = litestream;\n  const monitor = backupURL\n    ? new BackupMonitor(\n        lc,\n        replica.file,\n        backupURL,\n        `http://localhost:${metricsPort}/metrics`,\n        changeStreamer,\n        // The time between when the zero-cache was started to when the\n        // change-streamer is ready to start serves as the initial delay for\n        // watermark cleanup (as it either includes a similar replica\n        // restoration/preparation step, or an initial-sync, which\n        // generally takes longer).\n        //\n        // Consider: Also account for permanent volumes?\n        Date.now() - workerStartTime,\n      )\n    : new ReplicaMonitor(lc, replica.file, changeStreamer);\n\n  const changeStreamerWebServer = new ChangeStreamerHttpServer(\n    lc,\n    config,\n    {port, startupDelayMs},\n    parent,\n    changeStreamer,\n    monitor instanceof BackupMonitor ? monitor : null,\n  );\n\n  parent.send(['ready', {ready: true}]);\n\n  // Note: The changeStreamer itself is not started here; it is started by the\n  //       changeStreamerWebServer.\n  return runUntilKilled(lc, parent, changeStreamerWebServer, monitor);\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAsCA,eAA8B,UAC5B,QACA,KACA,GAAG,MACY;CACf,MAAM,kBAAkB,KAAK,KAAK;CAClC,MAAM,SAAS,wBAAwB;EAAC;EAAK;EAAK,CAAC;CACnD,MAAM,EACJ,QACA,gBAAgB,EACd,MACA,SACA,UACA,gBACA,iCACA,sCAEF,UACA,QACA,SACA,aACA,eACE;AAEJ,eACE,iBAAiB,QAAQ,mBAAmB,GAAG,MAAM,EACrD,mBACA,EACD;CACD,MAAM,KAAK,iBAAiB,QAAQ,kBAAkB;AACtD,eAAc,IAAI,OAAO;CAGzB,MAAM,WAAW,SACf,IACA,OAAO,IACP,mBACA,EACE,KAAK,OAAO,UACb,EACD,EAAC,kBAAkB,MAAK,CACzB;AACI,mBAAkB,IAAI,UAAU,SAAS,CAAC,YAAY,GAAG;CAE9D,MAAM,EAAC,WAAW,mBAAkB;CACpC,MAAM,QAAQ,eAAe,OAAO;AAKpC,OAAM,yBAAyB,IAAI,UAAU,MAAM;CACnD,IAAI,YAAY,MAAM,IAAI,YAAY,IAAI,OAAO,SAAS,CAAC,SAAS;AAGpE,KAAI,UACF,KAAI;AACF,QAAM,eAAe,IAAI,QAAQ,UAAU;UACpC,GAAG;AAIV,KADY,aAAa,0BAA0B,SAAS,WAE1D,kDAAkD,OAAO,EAAE,IAC3D,EACD;AAKD,QAAM,UAAU,SAAS;AACzB,cAAY;;CAIhB,IAAI;CAEJ,MAAM,UAAU,iBAAiB,OAAO;AAExC,MAAK,MAAM,SAAS,CAAC,MAAM,MAAM,CAC/B,KAAI;EAEF,MAAM,EAAC,cAAc,sBACnB,SAAS,SAAS,OACd,MAAM,+BACJ,IACA,SAAS,IACT,OACA,QAAQ,MACR;GACE,GAAG;GACH,yBAAyB,SAAS;GACnC,EACD,SACA,eAAe,iBAChB,GACD,MAAM,6BACJ,IACA,SAAS,IACT,OACA,QAAQ,MACR,QACD;AAKP,mBAAiB,MAAM,mBACrB,IACA,OACA,QACA,SACA,UACA,UACA,cATA,2BAA2B,eAAe,QAAQ,KAAK,EAWvD,mBACA,WACA,aAAa,OACb;GACE;GACA;GACA,oBAAoB,OAAO;GAC5B,EACD,WACD;AACD;UACO,GAAG;AACV,MAAI,SAAS,aAAa,iBAAiB;AACzC,MAAG,OAAO,qBAAqB,QAAQ,QAAQ,EAAE;AAGjD,gBAAa,QAAQ,KAAK;AAY1B,SAAM,WAAW,SAAS;AAC1B,eAAY;AACZ;;AAEF,QAAM,qBACJ,IACA,uBAAuB,IAAI,gBAAgB,EAAE,CAC9C;AACD,MAAI,aAAa,kBACf,OAAM,IAAI,MACR,qCAAqC,QAAQ,KAAK,0CAClD,EAAC,OAAO,GAAE,CACX;AAEH,QAAM;;AAIV,QAAO,gBAAgB,mDAAmD;AAO1E,OAAM,eAAe,IAAI,wBAAwB,QAAQ,KAAK;CAE9D,MAAM,EAAC,WAAW,MAAM,gBAAe;CACvC,MAAM,UAAU,YACZ,IAAI,cACF,IACA,QAAQ,MACR,WACA,oBAAoB,YAAY,WAChC,gBAQA,KAAK,KAAK,GAAG,gBACd,GACD,IAAI,eAAe,IAAI,QAAQ,MAAM,eAAe;CAExD,MAAM,0BAA0B,IAAI,yBAClC,IACA,QACA;EAAC;EAAM;EAAe,EACtB,QACA,gBACA,mBAAmB,gBAAgB,UAAU,KAC9C;AAED,QAAO,KAAK,CAAC,SAAS,EAAC,OAAO,MAAK,CAAC,CAAC;AAIrC,QAAO,eAAe,IAAI,QAAQ,yBAAyB,QAAQ;;AAIrE,IAAI,CAAC,mBAAmB,CACjB,iBACH,UAAU,KAAK,aAAa,EAAE,QAAQ,KAAK,GAAG,QAAQ,KAAK,MAAM,EAAE,CAAC,CACrE"}

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAeA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAoB/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CAoKf"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"AAeA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAqB/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA6Kf"}

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

@@ -3,7 +3,7 @@ import { childWorker, parentWorker, singleProcessMode } from "../types/processes
 import { getNormalizedZeroConfig } from "../config/zero-config.js";
 import { ProcessManager, exitAfter, runUntilKilled } from "../services/life-cycle.js";
 import { createLogContext } from "./logging.js";
-import { CHANGE_STREAMER_URL, REAPER_URL, REPLICATOR_URL, SYNCER_URL } from "./worker-urls.js";
+import { CHANGE_STREAMER_URL, REAPER_URL, REPLICATOR_URL, SHADOW_SYNCER_URL, SYNCER_URL } from "./worker-urls.js";
 import { initEventSink } from "../observability/events.js";
 import { restoreReplica, startReplicaBackupProcess } from "../services/litestream/commands.js";
 import { startOtelAuto } from "./otel-start.js";
@@ -58,6 +58,11 @@ async function runWorker(parent, env) {
 		loadWorker(REAPER_URL, "supporting").once("message", reaperStarted);
 		await reaperReady;
 	}
+	if (config.shadowSync.enabled && runChangeStreamer) {
+		const { promise: shadowReady, resolve: shadowStarted } = resolver();
+		loadWorker(SHADOW_SYNCER_URL, "supporting").once("message", shadowStarted);
+		await shadowReady;
+	}
 	const syncers = [];
 	if (numSyncers) {
 		const mode = runChangeStreamer && litestream.backupURL ? "serving-copy" : "serving";

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

@@ -1 +1 @@
-{"version":3,"file":"main.js","names":[],"sources":["../../../../../zero-cache/src/server/main.ts"],"sourcesContent":["import path from 'node:path';\nimport {resolver} from '@rocicorp/resolver';\nimport {must} from '../../../shared/src/must.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {\n  exitAfter,\n  ProcessManager,\n  runUntilKilled,\n  type WorkerType,\n} from '../services/life-cycle.ts';\nimport {\n  restoreReplica,\n  startReplicaBackupProcess,\n} from '../services/litestream/commands.ts';\nimport {\n  childWorker,\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {\n  createNotifierFrom,\n  handleSubscriptionsFrom,\n  type ReplicaFileMode,\n  subscribeTo,\n} from '../workers/replicator.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\nimport {WorkerDispatcher} from './worker-dispatcher.ts';\nimport {\n  CHANGE_STREAMER_URL,\n  MUTATOR_URL,\n  REAPER_URL,\n  REPLICATOR_URL,\n  SYNCER_URL,\n} from './worker-urls.ts';\n\nconst clientConnectionBifurcated = false;\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n): Promise<void> {\n  const startMs = Date.now();\n  const config = getNormalizedZeroConfig({env});\n\n  startOtelAuto(\n    createLogContext(config, 'dispatcher', 0, false),\n    'dispatcher',\n    0,\n  );\n  const lc = createLogContext(config, 'dispatcher');\n  initEventSink(lc, config);\n\n  const processes = new ProcessManager(lc, parent);\n\n  const {numSyncWorkers: numSyncers} = config;\n  if (config.enableCrudMutations && config.upstream.maxConns < numSyncers) {\n    throw new Error(\n      `Insufficient upstream connections (${config.upstream.maxConns}) for ${numSyncers} syncers.` +\n        `Increase ZERO_UPSTREAM_MAX_CONNS or decrease ZERO_NUM_SYNC_WORKERS (which defaults to available cores).`,\n    );\n  }\n  if (config.cvr.maxConns < numSyncers) {\n    throw new Error(\n      `Insufficient cvr connections (${config.cvr.maxConns}) for ${numSyncers} syncers.` +\n        `Increase ZERO_CVR_MAX_CONNS or decrease ZERO_NUM_SYNC_WORKERS (which defaults to available cores).`,\n    );\n  }\n\n  const internalFlags: string[] =\n    numSyncers === 0\n      ? []\n      : [\n          '--upstream-max-conns-per-worker',\n          String(Math.floor(config.upstream.maxConns / numSyncers)),\n          '--cvr-max-conns-per-worker',\n          String(Math.floor(config.cvr.maxConns / numSyncers)),\n        ];\n\n  function loadWorker(\n    moduleUrl: URL,\n    type: WorkerType,\n    id?: string | number,\n    ...args: string[]\n  ): Worker {\n    const worker = childWorker(moduleUrl, env, ...args, ...internalFlags);\n    const name = path.basename(moduleUrl.pathname) + (id ? ` (${id})` : '');\n    return processes.addWorker(worker, type, name);\n  }\n\n  const {\n    taskID,\n    changeStreamer: {mode: changeStreamerMode, uri: changeStreamerURI},\n    litestream,\n  } = config;\n  const runChangeStreamer =\n    changeStreamerMode === 'dedicated' && changeStreamerURI === undefined;\n\n  let changeStreamer: Worker | undefined;\n\n  if (!runChangeStreamer) {\n    changeStreamer = undefined;\n    if (litestream.executable) {\n      // For view-syncers, the backup is restored here. For the replication-manager,\n      // the backup is restored in the change-streamer worker.\n      await restoreReplica(lc, config, null);\n    }\n  } else {\n    const {promise: changeStreamerReady, resolve: changeStreamerStarted} =\n      resolver();\n    changeStreamer = loadWorker(CHANGE_STREAMER_URL, 'supporting').once(\n      'message',\n      changeStreamerStarted,\n    );\n\n    // Wait for the change-streamer to be ready to guarantee that a replica\n    // file is present.\n    await changeStreamerReady;\n\n    if (litestream.backupURL) {\n      // Start a backup replicator and corresponding litestream backup process.\n      const {promise: backupReady, resolve} = resolver();\n      const mode: ReplicaFileMode = 'backup';\n      loadWorker(REPLICATOR_URL, 'supporting', mode, mode).once(\n        // Wait for the Replicator's first message (i.e. \"ready\") before starting\n        // litestream backup in order to avoid contending on the lock when the\n        // replicator first prepares the db file.\n        'message',\n        () => {\n          processes.addSubprocess(\n            startReplicaBackupProcess(lc, config),\n            'supporting',\n            'litestream',\n          );\n          resolve();\n        },\n      );\n      await backupReady;\n    }\n  }\n\n  if (numSyncers > 0) {\n    const {promise: reaperReady, resolve: reaperStarted} = resolver();\n    loadWorker(REAPER_URL, 'supporting').once('message', reaperStarted);\n    // Before starting the view-syncers, ensure that the reaper has started\n    // up, indicating that any CVR db migrations have been performed.\n    await reaperReady;\n  }\n\n  const syncers: Worker[] = [];\n  if (numSyncers) {\n    const mode: ReplicaFileMode =\n      runChangeStreamer && litestream.backupURL ? 'serving-copy' : 'serving';\n    const {promise: replicaReady, resolve} = resolver();\n    const replicator = loadWorker(\n      REPLICATOR_URL,\n      'supporting',\n      mode,\n      mode,\n    ).once('message', () => {\n      subscribeTo(lc, replicator);\n      resolve();\n    });\n    await replicaReady;\n\n    const notifier = createNotifierFrom(lc, replicator);\n    for (let i = 0; i < numSyncers; i++) {\n      syncers.push(loadWorker(SYNCER_URL, 'user-facing', i, mode, String(i)));\n    }\n    syncers.forEach(syncer => handleSubscriptionsFrom(lc, syncer, notifier));\n  }\n  let mutator: Worker | undefined;\n  if (clientConnectionBifurcated) {\n    mutator = loadWorker(MUTATOR_URL, 'supporting', 'mutator');\n  }\n\n  lc.info?.('waiting for workers to be ready ...');\n  const logWaiting = setInterval(\n    () => lc.info?.(`still waiting for ${processes.initializing().join(', ')}`),\n    10_000,\n  );\n  await processes.allWorkersReady();\n  clearInterval(logWaiting);\n  lc.info?.(`all workers ready (${Date.now() - startMs} ms)`);\n\n  parent.send(['ready', {ready: true}]);\n\n  try {\n    await runUntilKilled(\n      lc,\n      parent,\n      new WorkerDispatcher(\n        lc,\n        taskID,\n        parent,\n        syncers,\n        mutator,\n        changeStreamer,\n      ),\n    );\n  } catch (err) {\n    processes.logErrorAndExit(err, 'dispatcher');\n  }\n\n  await processes.done();\n}\n\nif (!singleProcessMode()) {\n  void exitAfter(() => runWorker(must(parentWorker), process.env));\n}\n"],"mappings":";;;;;;;;;;;;;;AAwCA,eAA8B,UAC5B,QACA,KACe;CACf,MAAM,UAAU,KAAK,KAAK;CAC1B,MAAM,SAAS,wBAAwB,EAAC,KAAI,CAAC;AAE7C,eACE,iBAAiB,QAAQ,cAAc,GAAG,MAAM,EAChD,cACA,EACD;CACD,MAAM,KAAK,iBAAiB,QAAQ,aAAa;AACjD,eAAc,IAAI,OAAO;CAEzB,MAAM,YAAY,IAAI,eAAe,IAAI,OAAO;CAEhD,MAAM,EAAC,gBAAgB,eAAc;AACrC,KAAI,OAAO,uBAAuB,OAAO,SAAS,WAAW,WAC3D,OAAM,IAAI,MACR,sCAAsC,OAAO,SAAS,SAAS,QAAQ,WAAW,kHAEnF;AAEH,KAAI,OAAO,IAAI,WAAW,WACxB,OAAM,IAAI,MACR,iCAAiC,OAAO,IAAI,SAAS,QAAQ,WAAW,6GAEzE;CAGH,MAAM,gBACJ,eAAe,IACX,EAAE,GACF;EACE;EACA,OAAO,KAAK,MAAM,OAAO,SAAS,WAAW,WAAW,CAAC;EACzD;EACA,OAAO,KAAK,MAAM,OAAO,IAAI,WAAW,WAAW,CAAC;EACrD;CAEP,SAAS,WACP,WACA,MACA,IACA,GAAG,MACK;EACR,MAAM,SAAS,YAAY,WAAW,KAAK,GAAG,MAAM,GAAG,cAAc;EACrE,MAAM,OAAO,KAAK,SAAS,UAAU,SAAS,IAAI,KAAK,KAAK,GAAG,KAAK;AACpE,SAAO,UAAU,UAAU,QAAQ,MAAM,KAAK;;CAGhD,MAAM,EACJ,QACA,gBAAgB,EAAC,MAAM,oBAAoB,KAAK,qBAChD,eACE;CACJ,MAAM,oBACJ,uBAAuB,eAAe,sBAAsB,KAAA;CAE9D,IAAI;AAEJ,KAAI,CAAC,mBAAmB;AACtB,mBAAiB,KAAA;AACjB,MAAI,WAAW,WAGb,OAAM,eAAe,IAAI,QAAQ,KAAK;QAEnC;EACL,MAAM,EAAC,SAAS,qBAAqB,SAAS,0BAC5C,UAAU;AACZ,mBAAiB,WAAW,qBAAqB,aAAa,CAAC,KAC7D,WACA,sBACD;AAID,QAAM;AAEN,MAAI,WAAW,WAAW;GAExB,MAAM,EAAC,SAAS,aAAa,YAAW,UAAU;GAClD,MAAM,OAAwB;AAC9B,cAAW,gBAAgB,cAAc,MAAM,KAAK,CAAC,KAInD,iBACM;AACJ,cAAU,cACR,0BAA0B,IAAI,OAAO,EACrC,cACA,aACD;AACD,aAAS;KAEZ;AACD,SAAM;;;AAIV,KAAI,aAAa,GAAG;EAClB,MAAM,EAAC,SAAS,aAAa,SAAS,kBAAiB,UAAU;AACjE,aAAW,YAAY,aAAa,CAAC,KAAK,WAAW,cAAc;AAGnE,QAAM;;CAGR,MAAM,UAAoB,EAAE;AAC5B,KAAI,YAAY;EACd,MAAM,OACJ,qBAAqB,WAAW,YAAY,iBAAiB;EAC/D,MAAM,EAAC,SAAS,cAAc,YAAW,UAAU;EACnD,MAAM,aAAa,WACjB,gBACA,cACA,MACA,KACD,CAAC,KAAK,iBAAiB;AACtB,eAAY,IAAI,WAAW;AAC3B,YAAS;IACT;AACF,QAAM;EAEN,MAAM,WAAW,mBAAmB,IAAI,WAAW;AACnD,OAAK,IAAI,IAAI,GAAG,IAAI,YAAY,IAC9B,SAAQ,KAAK,WAAW,YAAY,eAAe,GAAG,MAAM,OAAO,EAAE,CAAC,CAAC;AAEzE,UAAQ,SAAQ,WAAU,wBAAwB,IAAI,QAAQ,SAAS,CAAC;;CAE1E,IAAI;AAKJ,IAAG,OAAO,sCAAsC;CAChD,MAAM,aAAa,kBACX,GAAG,OAAO,qBAAqB,UAAU,cAAc,CAAC,KAAK,KAAK,GAAG,EAC3E,IACD;AACD,OAAM,UAAU,iBAAiB;AACjC,eAAc,WAAW;AACzB,IAAG,OAAO,sBAAsB,KAAK,KAAK,GAAG,QAAQ,MAAM;AAE3D,QAAO,KAAK,CAAC,SAAS,EAAC,OAAO,MAAK,CAAC,CAAC;AAErC,KAAI;AACF,QAAM,eACJ,IACA,QACA,IAAI,iBACF,IACA,QACA,QACA,SACA,SACA,eACD,CACF;UACM,KAAK;AACZ,YAAU,gBAAgB,KAAK,aAAa;;AAG9C,OAAM,UAAU,MAAM;;AAGxB,IAAI,CAAC,mBAAmB,CACjB,iBAAgB,UAAU,KAAK,aAAa,EAAE,QAAQ,IAAI,CAAC"}
+{"version":3,"file":"main.js","names":[],"sources":["../../../../../zero-cache/src/server/main.ts"],"sourcesContent":["import path from 'node:path';\nimport {resolver} from '@rocicorp/resolver';\nimport {must} from '../../../shared/src/must.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {\n  exitAfter,\n  ProcessManager,\n  runUntilKilled,\n  type WorkerType,\n} from '../services/life-cycle.ts';\nimport {\n  restoreReplica,\n  startReplicaBackupProcess,\n} from '../services/litestream/commands.ts';\nimport {\n  childWorker,\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {\n  createNotifierFrom,\n  handleSubscriptionsFrom,\n  type ReplicaFileMode,\n  subscribeTo,\n} from '../workers/replicator.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\nimport {WorkerDispatcher} from './worker-dispatcher.ts';\nimport {\n  CHANGE_STREAMER_URL,\n  MUTATOR_URL,\n  REAPER_URL,\n  REPLICATOR_URL,\n  SHADOW_SYNCER_URL,\n  SYNCER_URL,\n} from './worker-urls.ts';\n\nconst clientConnectionBifurcated = false;\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n): Promise<void> {\n  const startMs = Date.now();\n  const config = getNormalizedZeroConfig({env});\n\n  startOtelAuto(\n    createLogContext(config, 'dispatcher', 0, false),\n    'dispatcher',\n    0,\n  );\n  const lc = createLogContext(config, 'dispatcher');\n  initEventSink(lc, config);\n\n  const processes = new ProcessManager(lc, parent);\n\n  const {numSyncWorkers: numSyncers} = config;\n  if (config.enableCrudMutations && config.upstream.maxConns < numSyncers) {\n    throw new Error(\n      `Insufficient upstream connections (${config.upstream.maxConns}) for ${numSyncers} syncers.` +\n        `Increase ZERO_UPSTREAM_MAX_CONNS or decrease ZERO_NUM_SYNC_WORKERS (which defaults to available cores).`,\n    );\n  }\n  if (config.cvr.maxConns < numSyncers) {\n    throw new Error(\n      `Insufficient cvr connections (${config.cvr.maxConns}) for ${numSyncers} syncers.` +\n        `Increase ZERO_CVR_MAX_CONNS or decrease ZERO_NUM_SYNC_WORKERS (which defaults to available cores).`,\n    );\n  }\n\n  const internalFlags: string[] =\n    numSyncers === 0\n      ? []\n      : [\n          '--upstream-max-conns-per-worker',\n          String(Math.floor(config.upstream.maxConns / numSyncers)),\n          '--cvr-max-conns-per-worker',\n          String(Math.floor(config.cvr.maxConns / numSyncers)),\n        ];\n\n  function loadWorker(\n    moduleUrl: URL,\n    type: WorkerType,\n    id?: string | number,\n    ...args: string[]\n  ): Worker {\n    const worker = childWorker(moduleUrl, env, ...args, ...internalFlags);\n    const name = path.basename(moduleUrl.pathname) + (id ? ` (${id})` : '');\n    return processes.addWorker(worker, type, name);\n  }\n\n  const {\n    taskID,\n    changeStreamer: {mode: changeStreamerMode, uri: changeStreamerURI},\n    litestream,\n  } = config;\n  const runChangeStreamer =\n    changeStreamerMode === 'dedicated' && changeStreamerURI === undefined;\n\n  let changeStreamer: Worker | undefined;\n\n  if (!runChangeStreamer) {\n    changeStreamer = undefined;\n    if (litestream.executable) {\n      // For view-syncers, the backup is restored here. For the replication-manager,\n      // the backup is restored in the change-streamer worker.\n      await restoreReplica(lc, config, null);\n    }\n  } else {\n    const {promise: changeStreamerReady, resolve: changeStreamerStarted} =\n      resolver();\n    changeStreamer = loadWorker(CHANGE_STREAMER_URL, 'supporting').once(\n      'message',\n      changeStreamerStarted,\n    );\n\n    // Wait for the change-streamer to be ready to guarantee that a replica\n    // file is present.\n    await changeStreamerReady;\n\n    if (litestream.backupURL) {\n      // Start a backup replicator and corresponding litestream backup process.\n      const {promise: backupReady, resolve} = resolver();\n      const mode: ReplicaFileMode = 'backup';\n      loadWorker(REPLICATOR_URL, 'supporting', mode, mode).once(\n        // Wait for the Replicator's first message (i.e. \"ready\") before starting\n        // litestream backup in order to avoid contending on the lock when the\n        // replicator first prepares the db file.\n        'message',\n        () => {\n          processes.addSubprocess(\n            startReplicaBackupProcess(lc, config),\n            'supporting',\n            'litestream',\n          );\n          resolve();\n        },\n      );\n      await backupReady;\n    }\n  }\n\n  if (numSyncers > 0) {\n    const {promise: reaperReady, resolve: reaperStarted} = resolver();\n    loadWorker(REAPER_URL, 'supporting').once('message', reaperStarted);\n    // Before starting the view-syncers, ensure that the reaper has started\n    // up, indicating that any CVR db migrations have been performed.\n    await reaperReady;\n  }\n\n  // Only run the shadow-sync canary on the replication-manager (or in\n  // single-node mode, where it also owns upstream). Running on every\n  // view-syncer would hammer the upstream with N redundant canaries.\n  if (config.shadowSync.enabled && runChangeStreamer) {\n    const {promise: shadowReady, resolve: shadowStarted} = resolver();\n    loadWorker(SHADOW_SYNCER_URL, 'supporting').once('message', shadowStarted);\n    await shadowReady;\n  }\n\n  const syncers: Worker[] = [];\n  if (numSyncers) {\n    const mode: ReplicaFileMode =\n      runChangeStreamer && litestream.backupURL ? 'serving-copy' : 'serving';\n    const {promise: replicaReady, resolve} = resolver();\n    const replicator = loadWorker(\n      REPLICATOR_URL,\n      'supporting',\n      mode,\n      mode,\n    ).once('message', () => {\n      subscribeTo(lc, replicator);\n      resolve();\n    });\n    await replicaReady;\n\n    const notifier = createNotifierFrom(lc, replicator);\n    for (let i = 0; i < numSyncers; i++) {\n      syncers.push(loadWorker(SYNCER_URL, 'user-facing', i, mode, String(i)));\n    }\n    syncers.forEach(syncer => handleSubscriptionsFrom(lc, syncer, notifier));\n  }\n  let mutator: Worker | undefined;\n  if (clientConnectionBifurcated) {\n    mutator = loadWorker(MUTATOR_URL, 'supporting', 'mutator');\n  }\n\n  lc.info?.('waiting for workers to be ready ...');\n  const logWaiting = setInterval(\n    () => lc.info?.(`still waiting for ${processes.initializing().join(', ')}`),\n    10_000,\n  );\n  await processes.allWorkersReady();\n  clearInterval(logWaiting);\n  lc.info?.(`all workers ready (${Date.now() - startMs} ms)`);\n\n  parent.send(['ready', {ready: true}]);\n\n  try {\n    await runUntilKilled(\n      lc,\n      parent,\n      new WorkerDispatcher(\n        lc,\n        taskID,\n        parent,\n        syncers,\n        mutator,\n        changeStreamer,\n      ),\n    );\n  } catch (err) {\n    processes.logErrorAndExit(err, 'dispatcher');\n  }\n\n  await processes.done();\n}\n\nif (!singleProcessMode()) {\n  void exitAfter(() => runWorker(must(parentWorker), process.env));\n}\n"],"mappings":";;;;;;;;;;;;;;AAyCA,eAA8B,UAC5B,QACA,KACe;CACf,MAAM,UAAU,KAAK,KAAK;CAC1B,MAAM,SAAS,wBAAwB,EAAC,KAAI,CAAC;AAE7C,eACE,iBAAiB,QAAQ,cAAc,GAAG,MAAM,EAChD,cACA,EACD;CACD,MAAM,KAAK,iBAAiB,QAAQ,aAAa;AACjD,eAAc,IAAI,OAAO;CAEzB,MAAM,YAAY,IAAI,eAAe,IAAI,OAAO;CAEhD,MAAM,EAAC,gBAAgB,eAAc;AACrC,KAAI,OAAO,uBAAuB,OAAO,SAAS,WAAW,WAC3D,OAAM,IAAI,MACR,sCAAsC,OAAO,SAAS,SAAS,QAAQ,WAAW,kHAEnF;AAEH,KAAI,OAAO,IAAI,WAAW,WACxB,OAAM,IAAI,MACR,iCAAiC,OAAO,IAAI,SAAS,QAAQ,WAAW,6GAEzE;CAGH,MAAM,gBACJ,eAAe,IACX,EAAE,GACF;EACE;EACA,OAAO,KAAK,MAAM,OAAO,SAAS,WAAW,WAAW,CAAC;EACzD;EACA,OAAO,KAAK,MAAM,OAAO,IAAI,WAAW,WAAW,CAAC;EACrD;CAEP,SAAS,WACP,WACA,MACA,IACA,GAAG,MACK;EACR,MAAM,SAAS,YAAY,WAAW,KAAK,GAAG,MAAM,GAAG,cAAc;EACrE,MAAM,OAAO,KAAK,SAAS,UAAU,SAAS,IAAI,KAAK,KAAK,GAAG,KAAK;AACpE,SAAO,UAAU,UAAU,QAAQ,MAAM,KAAK;;CAGhD,MAAM,EACJ,QACA,gBAAgB,EAAC,MAAM,oBAAoB,KAAK,qBAChD,eACE;CACJ,MAAM,oBACJ,uBAAuB,eAAe,sBAAsB,KAAA;CAE9D,IAAI;AAEJ,KAAI,CAAC,mBAAmB;AACtB,mBAAiB,KAAA;AACjB,MAAI,WAAW,WAGb,OAAM,eAAe,IAAI,QAAQ,KAAK;QAEnC;EACL,MAAM,EAAC,SAAS,qBAAqB,SAAS,0BAC5C,UAAU;AACZ,mBAAiB,WAAW,qBAAqB,aAAa,CAAC,KAC7D,WACA,sBACD;AAID,QAAM;AAEN,MAAI,WAAW,WAAW;GAExB,MAAM,EAAC,SAAS,aAAa,YAAW,UAAU;GAClD,MAAM,OAAwB;AAC9B,cAAW,gBAAgB,cAAc,MAAM,KAAK,CAAC,KAInD,iBACM;AACJ,cAAU,cACR,0BAA0B,IAAI,OAAO,EACrC,cACA,aACD;AACD,aAAS;KAEZ;AACD,SAAM;;;AAIV,KAAI,aAAa,GAAG;EAClB,MAAM,EAAC,SAAS,aAAa,SAAS,kBAAiB,UAAU;AACjE,aAAW,YAAY,aAAa,CAAC,KAAK,WAAW,cAAc;AAGnE,QAAM;;AAMR,KAAI,OAAO,WAAW,WAAW,mBAAmB;EAClD,MAAM,EAAC,SAAS,aAAa,SAAS,kBAAiB,UAAU;AACjE,aAAW,mBAAmB,aAAa,CAAC,KAAK,WAAW,cAAc;AAC1E,QAAM;;CAGR,MAAM,UAAoB,EAAE;AAC5B,KAAI,YAAY;EACd,MAAM,OACJ,qBAAqB,WAAW,YAAY,iBAAiB;EAC/D,MAAM,EAAC,SAAS,cAAc,YAAW,UAAU;EACnD,MAAM,aAAa,WACjB,gBACA,cACA,MACA,KACD,CAAC,KAAK,iBAAiB;AACtB,eAAY,IAAI,WAAW;AAC3B,YAAS;IACT;AACF,QAAM;EAEN,MAAM,WAAW,mBAAmB,IAAI,WAAW;AACnD,OAAK,IAAI,IAAI,GAAG,IAAI,YAAY,IAC9B,SAAQ,KAAK,WAAW,YAAY,eAAe,GAAG,MAAM,OAAO,EAAE,CAAC,CAAC;AAEzE,UAAQ,SAAQ,WAAU,wBAAwB,IAAI,QAAQ,SAAS,CAAC;;CAE1E,IAAI;AAKJ,IAAG,OAAO,sCAAsC;CAChD,MAAM,aAAa,kBACX,GAAG,OAAO,qBAAqB,UAAU,cAAc,CAAC,KAAK,KAAK,GAAG,EAC3E,IACD;AACD,OAAM,UAAU,iBAAiB;AACjC,eAAc,WAAW;AACzB,IAAG,OAAO,sBAAsB,KAAK,KAAK,GAAG,QAAQ,MAAM;AAE3D,QAAO,KAAK,CAAC,SAAS,EAAC,OAAO,MAAK,CAAC,CAAC;AAErC,KAAI;AACF,QAAM,eACJ,IACA,QACA,IAAI,iBACF,IACA,QACA,QACA,SACA,SACA,eACD,CACF;UACM,KAAK;AACZ,YAAU,gBAAgB,KAAK,aAAa;;AAG9C,OAAM,UAAU,MAAM;;AAGxB,IAAI,CAAC,mBAAmB,CACjB,iBAAgB,UAAU,KAAK,aAAa,EAAE,QAAQ,IAAI,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"reaper.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/reaper.ts"],"names":[],"mappings":"AAQA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAQ/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAgCf"}
+{"version":3,"file":"reaper.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/reaper.ts"],"names":[],"mappings":"AAQA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAQ/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA+Bf"}

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

@@ -24,10 +24,7 @@ async function runWorker(parent, env, ...argv) {
 	startAnonymousTelemetry(lc, config);
 	const { cvr } = config;
 	const shard = getShardID(config);
-	const cvrDB = pgClient(lc, cvr.db, {
-		max: 1,
-		connection: { ["application_name"]: `zero-sync-cvr-purger` }
-	});
+	const cvrDB = pgClient(lc, cvr.db, `sync-cvr-purger`, { max: 1 });
 	await initViewSyncerSchema(lc, cvrDB, shard);
 	parent.send(["ready", { ready: true }]);
 	return runUntilKilled(lc, parent, new CVRPurger(lc, cvrDB, shard, {

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

@@ -1 +1 @@
-{"version":3,"file":"reaper.js","names":[],"sources":["../../../../../zero-cache/src/server/reaper.ts"],"sourcesContent":["import {must} from '../../../shared/src/must.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {ActiveUsersGauge} from '../services/view-syncer/active-users-gauge.ts';\nimport {CVRPurger} from '../services/view-syncer/cvr-purger.ts';\nimport {initViewSyncerSchema} from '../services/view-syncer/schema/init.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardID} from '../types/shards.ts';\nimport {startAnonymousTelemetry} from './anonymous-otel-start.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nconst MS_PER_HOUR = 1000 * 60 * 60;\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...argv: string[]\n): Promise<void> {\n  const config = getNormalizedZeroConfig({env, argv});\n\n  startOtelAuto(createLogContext(config, 'reaper', 0, false), 'reaper', 0);\n  const lc = createLogContext(config, 'reaper');\n  initEventSink(lc, config);\n  startAnonymousTelemetry(lc, config);\n\n  const {cvr} = config;\n  const shard = getShardID(config);\n  const cvrDB = pgClient(lc, cvr.db, {\n    max: 1,\n    connection: {['application_name']: `zero-sync-cvr-purger`},\n  });\n  await initViewSyncerSchema(lc, cvrDB, shard);\n  parent.send(['ready', {ready: true}]);\n\n  return runUntilKilled(\n    lc,\n    parent,\n    new CVRPurger(lc, cvrDB, shard, {\n      inactivityThresholdMs:\n        cvr.garbageCollectionInactivityThresholdHours * MS_PER_HOUR,\n      initialBatchSize: cvr.garbageCollectionInitialBatchSize,\n      initialIntervalMs: cvr.garbageCollectionInitialIntervalSeconds * 1000,\n    }),\n    // Periodically computes and exports active users gauge to anonymous telemetry\n    new ActiveUsersGauge(lc, cvrDB, shard, {\n      // Default 10minutes refresh; can be made configurable later if needed\n      updateIntervalMs: 10 * 60 * 1000,\n    }),\n  );\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"mappings":";;;;;;;;;;;;;;AAkBA,IAAM,cAAc,MAAO,KAAK;AAEhC,eAA8B,UAC5B,QACA,KACA,GAAG,MACY;CACf,MAAM,SAAS,wBAAwB;EAAC;EAAK;EAAK,CAAC;AAEnD,eAAc,iBAAiB,QAAQ,UAAU,GAAG,MAAM,EAAE,UAAU,EAAE;CACxE,MAAM,KAAK,iBAAiB,QAAQ,SAAS;AAC7C,eAAc,IAAI,OAAO;AACzB,yBAAwB,IAAI,OAAO;CAEnC,MAAM,EAAC,QAAO;CACd,MAAM,QAAQ,WAAW,OAAO;CAChC,MAAM,QAAQ,SAAS,IAAI,IAAI,IAAI;EACjC,KAAK;EACL,YAAY,GAAE,qBAAqB,wBAAuB;EAC3D,CAAC;AACF,OAAM,qBAAqB,IAAI,OAAO,MAAM;AAC5C,QAAO,KAAK,CAAC,SAAS,EAAC,OAAO,MAAK,CAAC,CAAC;AAErC,QAAO,eACL,IACA,QACA,IAAI,UAAU,IAAI,OAAO,OAAO;EAC9B,uBACE,IAAI,4CAA4C;EAClD,kBAAkB,IAAI;EACtB,mBAAmB,IAAI,0CAA0C;EAClE,CAAC,EAEF,IAAI,iBAAiB,IAAI,OAAO,OAAO,EAErC,kBAAkB,MAAU,KAC7B,CAAC,CACH;;AAIH,IAAI,CAAC,mBAAmB,CACjB,iBACH,UAAU,KAAK,aAAa,EAAE,QAAQ,KAAK,GAAG,QAAQ,KAAK,MAAM,EAAE,CAAC,CACrE"}
+{"version":3,"file":"reaper.js","names":[],"sources":["../../../../../zero-cache/src/server/reaper.ts"],"sourcesContent":["import {must} from '../../../shared/src/must.ts';\nimport {getNormalizedZeroConfig} from '../config/zero-config.ts';\nimport {initEventSink} from '../observability/events.ts';\nimport {exitAfter, runUntilKilled} from '../services/life-cycle.ts';\nimport {ActiveUsersGauge} from '../services/view-syncer/active-users-gauge.ts';\nimport {CVRPurger} from '../services/view-syncer/cvr-purger.ts';\nimport {initViewSyncerSchema} from '../services/view-syncer/schema/init.ts';\nimport {pgClient} from '../types/pg.ts';\nimport {\n  parentWorker,\n  singleProcessMode,\n  type Worker,\n} from '../types/processes.ts';\nimport {getShardID} from '../types/shards.ts';\nimport {startAnonymousTelemetry} from './anonymous-otel-start.ts';\nimport {createLogContext} from './logging.ts';\nimport {startOtelAuto} from './otel-start.ts';\n\nconst MS_PER_HOUR = 1000 * 60 * 60;\n\nexport default async function runWorker(\n  parent: Worker,\n  env: NodeJS.ProcessEnv,\n  ...argv: string[]\n): Promise<void> {\n  const config = getNormalizedZeroConfig({env, argv});\n\n  startOtelAuto(createLogContext(config, 'reaper', 0, false), 'reaper', 0);\n  const lc = createLogContext(config, 'reaper');\n  initEventSink(lc, config);\n  startAnonymousTelemetry(lc, config);\n\n  const {cvr} = config;\n  const shard = getShardID(config);\n  const cvrDB = pgClient(lc, cvr.db, `sync-cvr-purger`, {\n    max: 1,\n  });\n  await initViewSyncerSchema(lc, cvrDB, shard);\n  parent.send(['ready', {ready: true}]);\n\n  return runUntilKilled(\n    lc,\n    parent,\n    new CVRPurger(lc, cvrDB, shard, {\n      inactivityThresholdMs:\n        cvr.garbageCollectionInactivityThresholdHours * MS_PER_HOUR,\n      initialBatchSize: cvr.garbageCollectionInitialBatchSize,\n      initialIntervalMs: cvr.garbageCollectionInitialIntervalSeconds * 1000,\n    }),\n    // Periodically computes and exports active users gauge to anonymous telemetry\n    new ActiveUsersGauge(lc, cvrDB, shard, {\n      // Default 10minutes refresh; can be made configurable later if needed\n      updateIntervalMs: 10 * 60 * 1000,\n    }),\n  );\n}\n\n// fork()\nif (!singleProcessMode()) {\n  void exitAfter(() =>\n    runWorker(must(parentWorker), process.env, ...process.argv.slice(2)),\n  );\n}\n"],"mappings":";;;;;;;;;;;;;;AAkBA,IAAM,cAAc,MAAO,KAAK;AAEhC,eAA8B,UAC5B,QACA,KACA,GAAG,MACY;CACf,MAAM,SAAS,wBAAwB;EAAC;EAAK;EAAK,CAAC;AAEnD,eAAc,iBAAiB,QAAQ,UAAU,GAAG,MAAM,EAAE,UAAU,EAAE;CACxE,MAAM,KAAK,iBAAiB,QAAQ,SAAS;AAC7C,eAAc,IAAI,OAAO;AACzB,yBAAwB,IAAI,OAAO;CAEnC,MAAM,EAAC,QAAO;CACd,MAAM,QAAQ,WAAW,OAAO;CAChC,MAAM,QAAQ,SAAS,IAAI,IAAI,IAAI,mBAAmB,EACpD,KAAK,GACN,CAAC;AACF,OAAM,qBAAqB,IAAI,OAAO,MAAM;AAC5C,QAAO,KAAK,CAAC,SAAS,EAAC,OAAO,MAAK,CAAC,CAAC;AAErC,QAAO,eACL,IACA,QACA,IAAI,UAAU,IAAI,OAAO,OAAO;EAC9B,uBACE,IAAI,4CAA4C;EAClD,kBAAkB,IAAI;EACtB,mBAAmB,IAAI,0CAA0C;EAClE,CAAC,EAEF,IAAI,iBAAiB,IAAI,OAAO,OAAO,EAErC,kBAAkB,MAAU,KAC7B,CAAC,CACH;;AAIH,IAAI,CAAC,mBAAmB,CACjB,iBACH,UAAU,KAAK,aAAa,EAAE,QAAQ,KAAK,GAAG,QAAQ,KAAK,MAAM,EAAE,CAAC,CACrE"}