@rocicorp/zero 0.25.0 → 0.26.0-canary.0

package/out/zero-cache/src/services/change-streamer/schema/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/init.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {\n  runSchemaMigrations,\n  type IncrementalMigrationMap,\n  type Migration,\n} from '../../../db/migration.ts';\nimport type {PostgresDB, PostgresTransaction} from '../../../types/pg.ts';\nimport {cdcSchema, type ShardID} from '../../../types/shards.ts';\nimport {\n  createReplicationStateTable,\n  setupCDCTables,\n  type ReplicationState,\n} from './tables.ts';\n\nasync function migrateFromLegacySchemas(\n  lc: LogContext,\n  db: PostgresDB,\n  newSchema: string,\n  ...legacy: string[]\n) {\n  const rows = await db<{nspname: string}[]>`\n    SELECT nspname FROM pg_namespace \n      WHERE nspname IN ${db([newSchema, ...legacy])}`.values();\n  // oxlint-disable-next-line unicorn/prefer-set-has -- Small collection, array is more appropriate\n  const names = rows.flat();\n  if (names.includes(newSchema)) {\n    return; // already migrated\n  }\n  for (const schema of legacy) {\n    if (names.includes(schema)) {\n      lc.info?.(`Migrating ${schema} to ${newSchema}`);\n      await db`ALTER SCHEMA ${db(schema)} RENAME TO ${db(newSchema)}`;\n      break;\n    }\n  }\n}\n\nexport async function initChangeStreamerSchema(\n  log: LogContext,\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<void> {\n  const schema = cdcSchema(shard);\n  const {appID} = shard;\n  await migrateFromLegacySchemas(\n    log,\n    db,\n    schema,\n    appID === 'zero' ? `cdc_0` : `cdc_${appID}`,\n    'cdc',\n  );\n\n  const setupMigration: Migration = {\n    migrateSchema: (lc, tx) => setupCDCTables(lc, tx, shard),\n    minSafeVersion: 1,\n  };\n\n  async function migrateV1toV2(_: LogContext, db: PostgresTransaction) {\n    await db`\n    ALTER TABLE ${db(schema)}.\"replicationConfig\" ADD \"resetRequired\" BOOL`;\n  }\n\n  const migrateV2ToV3 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db.unsafe(createReplicationStateTable(shard));\n    },\n\n    migrateData: async (_: LogContext, db: PostgresTransaction) => {\n      const lastWatermark = await getLastWatermarkV2(db, shard);\n      const replicationState: Partial<ReplicationState> = {lastWatermark};\n      await db`\n      TRUNCATE TABLE ${db(schema)}.\"replicationState\"`;\n      await db`\n      INSERT INTO ${db(schema)}.\"replicationState\" ${db(replicationState)}`;\n    },\n  };\n\n  const migrateV3ToV4 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db`\n      ALTER TABLE ${db(schema)}.\"changeLog\" ALTER \"change\" TYPE JSON;\n      `;\n    },\n  };\n\n  const migrateV4ToV5 = {\n    migrateSchema: async (_: LogContext, db: PostgresTransaction) => {\n      await db`\n      ALTER TABLE ${db(schema)}.\"replicationState\" ADD \"ownerAddress\" TEXT;\n      `;\n    },\n  };\n\n  const schemaVersionMigrationMap: IncrementalMigrationMap = {\n    2: {migrateSchema: migrateV1toV2},\n    3: migrateV2ToV3,\n    4: migrateV3ToV4,\n    5: migrateV4ToV5,\n  };\n\n  await runSchemaMigrations(\n    log,\n    'change-streamer',\n    schema,\n    db,\n    setupMigration,\n    schemaVersionMigrationMap,\n  );\n}\n\nexport async function getLastWatermarkV2(\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<string> {\n  const schema = cdcSchema(shard);\n  const [{max}] = await db<{max: string | null}[]>`\n    SELECT MAX(watermark) as max FROM ${db(schema)}.\"changeLog\"`;\n  if (max !== null) {\n    return max;\n  }\n  // The changeLog is only empty if nothing has been synced since initial-sync.\n  // In this case, the last watermark is the replicaVersion.\n  const [{replicaVersion}] = await db<{replicaVersion: string}[]>`\n    SELECT \"replicaVersion\" FROM ${db(schema)}.\"replicationConfig\"\n    `;\n  return replicaVersion;\n}\n"],"names":["db"],"mappings":";;;AAcA,eAAe,yBACb,IACA,IACA,cACG,QACH;AACA,QAAM,OAAO,MAAM;AAAA;AAAA,yBAEI,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC,GAAG,OAAA;AAEpD,QAAM,QAAQ,KAAK,KAAA;AACnB,MAAI,MAAM,SAAS,SAAS,GAAG;AAC7B;AAAA,EACF;AACA,aAAW,UAAU,QAAQ;AAC3B,QAAI,MAAM,SAAS,MAAM,GAAG;AAC1B,SAAG,OAAO,aAAa,MAAM,OAAO,SAAS,EAAE;AAC/C,YAAM,kBAAkB,GAAG,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC;AAC7D;AAAA,IACF;AAAA,EACF;AACF;AAEA,eAAsB,yBACpB,KACA,IACA,OACe;AACf,QAAM,SAAS,UAAU,KAAK;AAC9B,QAAM,EAAC,UAAS;AAChB,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU,SAAS,UAAU,OAAO,KAAK;AAAA,IACzC;AAAA,EAAA;AAGF,QAAM,iBAA4B;AAAA,IAChC,eAAe,CAAC,IAAI,OAAO,eAAe,IAAI,IAAI,KAAK;AAAA,IACvD,gBAAgB;AAAA,EAAA;AAGlB,iBAAe,cAAc,GAAeA,KAAyB;AACnE,UAAMA;AAAAA,kBACQA,IAAG,MAAM,CAAC;AAAA,EAC1B;AAEA,QAAM,gBAAgB;AAAA,IACpB,eAAe,OAAO,GAAeA,QAA4B;AAC/D,YAAMA,IAAG,OAAO,4BAA4B,KAAK,CAAC;AAAA,IACpD;AAAA,IAEA,aAAa,OAAO,GAAeA,QAA4B;AAC7D,YAAM,gBAAgB,MAAM,mBAAmBA,KAAI,KAAK;AACxD,YAAM,mBAA8C,EAAC,cAAA;AACrD,YAAMA;AAAAA,uBACWA,IAAG,MAAM,CAAC;AAC3B,YAAMA;AAAAA,oBACQA,IAAG,MAAM,CAAC,uBAAuBA,IAAG,gBAAgB,CAAC;AAAA,IACrE;AAAA,EAAA;AAGF,QAAM,gBAAgB;AAAA,IACpB,eAAe,OAAO,GAAeA,QAA4B;AAC/D,YAAMA;AAAAA,oBACQA,IAAG,MAAM,CAAC;AAAA;AAAA,IAE1B;AAAA,EAAA;AAGF,QAAM,gBAAgB;AAAA,IACpB,eAAe,OAAO,GAAeA,QAA4B;AAC/D,YAAMA;AAAAA,oBACQA,IAAG,MAAM,CAAC;AAAA;AAAA,IAE1B;AAAA,EAAA;AAGF,QAAM,4BAAqD;AAAA,IACzD,GAAG,EAAC,eAAe,cAAA;AAAA,IACnB,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,EAAA;AAGL,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA;AAEJ;AAEA,eAAsB,mBACpB,IACA,OACiB;AACjB,QAAM,SAAS,UAAU,KAAK;AAC9B,QAAM,CAAC,EAAC,KAAI,IAAI,MAAM;AAAA,wCACgB,GAAG,MAAM,CAAC;AAChD,MAAI,QAAQ,MAAM;AAChB,WAAO;AAAA,EACT;AAGA,QAAM,CAAC,EAAC,gBAAe,IAAI,MAAM;AAAA,mCACA,GAAG,MAAM,CAAC;AAAA;AAE3C,SAAO;AACT;"}

package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts

@@ -1,5 +1,5 @@
-import { LogContext } from '@rocicorp/logger';
-import postgres from 'postgres';
+import type { LogContext } from '@rocicorp/logger';
+import type postgres from 'postgres';
 import { AbortError } from '../../../../../shared/src/abort-error.ts';
 import { type PostgresDB } from '../../../types/pg.ts';
 import { type ShardID } from '../../../types/shards.ts';

package/out/zero-cache/src/services/change-streamer/schema/tables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,QAAuC,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAC,UAAU,EAAC,MAAM,0CAA0C,CAAC;AAEpE,OAAO,EAA0B,KAAK,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,8CAA8C,CAAC;AACzE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8CAA8C,CAAC;AAOpF,eAAO,MAAM,SAAS,QAAQ,CAAC;AAM/B,MAAM,MAAM,cAAc,GAAG;IAG3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiBF;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,UASzD;AAED,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAIxB;AAED;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC,CAAC;AAsBF,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,QAAQ,CAAC,cAAc,EAC3B,KAAK,EAAE,OAAO,iBAIf;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,iBAKtE;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,iBAAiB,EACpC,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,OAAO,iBAyEnB;AAED,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,IAAI,qBAAqB;CACnC"}
+{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAErC,OAAO,EAAC,UAAU,EAAC,MAAM,0CAA0C,CAAC;AAEpE,OAAO,EAA0B,KAAK,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,8CAA8C,CAAC;AACzE,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8CAA8C,CAAC;AAOpF,eAAO,MAAM,SAAS,QAAQ,CAAC;AAM/B,MAAM,MAAM,cAAc,GAAG;IAG3B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAiBF;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,UASzD;AAED,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,UAAU,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAIxB;AAED;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC,CAAC;AAsBF,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,QAAQ,CAAC,cAAc,EAC3B,KAAK,EAAE,OAAO,iBAIf;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,iBAKtE;AAED,wBAAsB,uBAAuB,CAC3C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,UAAU,EACd,iBAAiB,EAAE,iBAAiB,EACpC,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,OAAO,iBAyEnB;AAED,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,QAAQ,CAAC,IAAI,qBAAqB;CACnC"}

package/out/zero-cache/src/services/change-streamer/schema/tables.js

@@ -1,23 +1,22 @@
-import { LogContext } from '@rocicorp/logger';
-import { ident } from 'pg-format';
-import postgres, {} from 'postgres';
+import { ident } from "pg-format";
+import "postgres";
 import { AbortError } from "../../../../../shared/src/abort-error.js";
 import { equals } from "../../../../../shared/src/set-utils.js";
 import { disableStatementTimeout } from "../../../types/pg.js";
 import { cdcSchema } from "../../../types/shards.js";
-// For readability in the sql statements.
 function schema(shard) {
-    return ident(cdcSchema(shard));
+  return ident(cdcSchema(shard));
 }
-export const PG_SCHEMA = 'cdc';
 function createSchema(shard) {
-    return /*sql*/ `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;
+  return (
+    /*sql*/
+    `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`
+  );
 }
 function createChangeLogTable(shard) {
-    // Note: The "change" column used to be JSONB, but that was problematic in that
-    // it does not handle the NULL unicode character.
-    // https://vladimir.varank.in/notes/2021/01/you-dont-insert-unicode-null-character-as-postgres-jsonb/
-    return /*sql*/ `
+  return (
+    /*sql*/
+    `
   CREATE TABLE ${schema(shard)}."changeLog" (
     watermark  TEXT,
     pos        INT8,
@@ -25,97 +24,113 @@ function createChangeLogTable(shard) {
     precommit  TEXT,  -- Only exists on commit entries. Purely for debugging.
     PRIMARY KEY (watermark, pos)
   );
-`;
+`
+  );
 }
-export function createReplicationStateTable(shard) {
-    return /*sql*/ `
+function createReplicationStateTable(shard) {
+  return (
+    /*sql*/
+    `
   CREATE TABLE ${schema(shard)}."replicationState" (
     "lastWatermark" TEXT NOT NULL,
     "owner" TEXT,
     "ownerAddress" TEXT,
     "lock" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)
   );
-`;
+`
+  );
 }
-export async function discoverChangeStreamerAddress(shard, sql) {
-    const result = await sql `
+async function discoverChangeStreamerAddress(shard, sql) {
+  const result = await sql`
     SELECT "ownerAddress" FROM ${sql(cdcSchema(shard))}."replicationState"`;
-    return result[0].ownerAddress;
+  return result[0].ownerAddress;
 }
 function createReplicationConfigTable(shard) {
-    return /*sql*/ `
+  return (
+    /*sql*/
+    `
   CREATE TABLE ${schema(shard)}."replicationConfig" (
     "replicaVersion" TEXT NOT NULL,
     "publications" TEXT[] NOT NULL,
     "resetRequired" BOOL,
     "lock" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)
   );
-`;
+`
+  );
 }
 function createTables(shard) {
-    return (createSchema(shard) +
-        createChangeLogTable(shard) +
-        createReplicationStateTable(shard) +
-        createReplicationConfigTable(shard));
+  return createSchema(shard) + createChangeLogTable(shard) + createReplicationStateTable(shard) + createReplicationConfigTable(shard);
 }
-export async function setupCDCTables(lc, db, shard) {
-    lc.info?.(`Setting up CDC tables`);
-    await db.unsafe(createTables(shard));
+async function setupCDCTables(lc, db, shard) {
+  lc.info?.(`Setting up CDC tables`);
+  await db.unsafe(createTables(shard));
 }
-export async function markResetRequired(sql, shard) {
-    const schema = cdcSchema(shard);
-    await sql `
-  UPDATE ${sql(schema)}."replicationConfig"
+async function markResetRequired(sql, shard) {
+  const schema2 = cdcSchema(shard);
+  await sql`
+  UPDATE ${sql(schema2)}."replicationConfig"
     SET "resetRequired" = true`;
 }
-export async function ensureReplicationConfig(lc, db, subscriptionState, shard, autoReset) {
-    const { publications, replicaVersion, watermark } = subscriptionState;
-    const replicaConfig = { publications, replicaVersion };
-    const replicationState = {
-        lastWatermark: replicaVersion,
-    };
-    const schema = cdcSchema(shard);
-    await db.begin(async (sql) => {
-        disableStatementTimeout(sql);
-        const stmts = [];
-        const results = await sql `
+async function ensureReplicationConfig(lc, db, subscriptionState, shard, autoReset) {
+  const { publications, replicaVersion, watermark } = subscriptionState;
+  const replicaConfig = { publications, replicaVersion };
+  const replicationState = {
+    lastWatermark: replicaVersion
+  };
+  const schema2 = cdcSchema(shard);
+  await db.begin(async (sql) => {
+    disableStatementTimeout(sql);
+    const stmts = [];
+    const results = await sql`
     SELECT "replicaVersion", "publications", "resetRequired" 
-      FROM ${sql(schema)}."replicationConfig"`;
-        if (results.length) {
-            const { replicaVersion, publications } = results[0];
-            if (replicaVersion !== replicaConfig.replicaVersion ||
-                !equals(new Set(publications), new Set(replicaConfig.publications))) {
-                if (replicaConfig.replicaVersion !== watermark) {
-                    throw new AutoResetSignal(`Cannot reset change db@${replicaVersion} to ` +
-                        `service replica@${replicaConfig.replicaVersion} ` +
-                        `from watermark ${watermark}`);
-                }
-                lc.info?.(`Data in cdc tables @${replicaVersion} is incompatible ` +
-                    `with replica @${replicaConfig.replicaVersion}. Clearing tables.`);
-                stmts.push(sql `TRUNCATE TABLE ${sql(schema)}."changeLog"`, sql `TRUNCATE TABLE ${sql(schema)}."replicationConfig"`, sql `TRUNCATE TABLE ${sql(schema)}."replicationState"`);
-            }
-        }
-        // Initialize (or re-initialize TRUNCATED) tables
-        if (results.length === 0 || stmts.length > 0) {
-            stmts.push(sql `INSERT INTO ${sql(schema)}."replicationConfig" ${sql(replicaConfig)}`, sql `INSERT INTO ${sql(schema)}."replicationState" 
-           ${sql(replicationState)}`);
-            return Promise.all(stmts);
-        }
-        const { resetRequired } = results[0];
-        if (resetRequired) {
-            if (autoReset) {
-                throw new AutoResetSignal('reset required by replication stream');
-            }
-            lc.error?.('\n\n\n' +
-                'Reset required but --auto-reset is not enabled.\n' +
-                'This can happen for upstream databases that do not support event triggers.\n' +
-                'To correct this, see https://zero.rocicorp.dev/docs/connecting-to-postgres#schema-changes' +
-                '\n\n\n');
+      FROM ${sql(schema2)}."replicationConfig"`;
+    if (results.length) {
+      const { replicaVersion: replicaVersion2, publications: publications2 } = results[0];
+      if (replicaVersion2 !== replicaConfig.replicaVersion || !equals(new Set(publications2), new Set(replicaConfig.publications))) {
+        if (replicaConfig.replicaVersion !== watermark) {
+          throw new AutoResetSignal(
+            `Cannot reset change db@${replicaVersion2} to service replica@${replicaConfig.replicaVersion} from watermark ${watermark}`
+          );
         }
-        return [];
-    });
+        lc.info?.(
+          `Data in cdc tables @${replicaVersion2} is incompatible with replica @${replicaConfig.replicaVersion}. Clearing tables.`
+        );
+        stmts.push(
+          sql`TRUNCATE TABLE ${sql(schema2)}."changeLog"`,
+          sql`TRUNCATE TABLE ${sql(schema2)}."replicationConfig"`,
+          sql`TRUNCATE TABLE ${sql(schema2)}."replicationState"`
+        );
+      }
+    }
+    if (results.length === 0 || stmts.length > 0) {
+      stmts.push(
+        sql`INSERT INTO ${sql(schema2)}."replicationConfig" ${sql(replicaConfig)}`,
+        sql`INSERT INTO ${sql(schema2)}."replicationState" 
+           ${sql(replicationState)}`
+      );
+      return Promise.all(stmts);
+    }
+    const { resetRequired } = results[0];
+    if (resetRequired) {
+      if (autoReset) {
+        throw new AutoResetSignal("reset required by replication stream");
+      }
+      lc.error?.(
+        "\n\n\nReset required but --auto-reset is not enabled.\nThis can happen for upstream databases that do not support event triggers.\nTo correct this, see https://zero.rocicorp.dev/docs/connecting-to-postgres#schema-changes\n\n\n"
+      );
+    }
+    return [];
+  });
 }
-export class AutoResetSignal extends AbortError {
-    name = 'AutoResetSignal';
+class AutoResetSignal extends AbortError {
+  name = "AutoResetSignal";
 }
-//# sourceMappingURL=tables.js.map
+export {
+  AutoResetSignal,
+  createReplicationStateTable,
+  discoverChangeStreamerAddress,
+  ensureReplicationConfig,
+  markResetRequired,
+  setupCDCTables
+};
+//# sourceMappingURL=tables.js.map

package/out/zero-cache/src/services/change-streamer/schema/tables.js.map

@@ -1 +1 @@
-{"version":3,"file":"tables.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tables.js","sources":["../../../../../../../zero-cache/src/services/change-streamer/schema/tables.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport {ident} from 'pg-format';\nimport type postgres from 'postgres';\nimport {type PendingQuery, type Row} from 'postgres';\nimport {AbortError} from '../../../../../shared/src/abort-error.ts';\nimport {equals} from '../../../../../shared/src/set-utils.ts';\nimport {disableStatementTimeout, type PostgresDB} from '../../../types/pg.ts';\nimport {cdcSchema, type ShardID} from '../../../types/shards.ts';\nimport type {Change} from '../../change-source/protocol/current/data.ts';\nimport type {SubscriptionState} from '../../replicator/schema/replication-state.ts';\n\n// For readability in the sql statements.\nfunction schema(shard: ShardID) {\n  return ident(cdcSchema(shard));\n}\n\nexport const PG_SCHEMA = 'cdc';\n\nfunction createSchema(shard: ShardID) {\n  return /*sql*/ `CREATE SCHEMA IF NOT EXISTS ${schema(shard)};`;\n}\n\nexport type ChangeLogEntry = {\n  // A strictly monotonically increasing, lexicographically sortable\n  // value that uniquely identifies a position in the change stream.\n  watermark: string;\n  change: Change;\n};\n\nfunction createChangeLogTable(shard: ShardID) {\n  // Note: The \"change\" column used to be JSONB, but that was problematic in that\n  // it does not handle the NULL unicode character.\n  // https://vladimir.varank.in/notes/2021/01/you-dont-insert-unicode-null-character-as-postgres-jsonb/\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"changeLog\" (\n    watermark  TEXT,\n    pos        INT8,\n    change     JSON NOT NULL,\n    precommit  TEXT,  -- Only exists on commit entries. Purely for debugging.\n    PRIMARY KEY (watermark, pos)\n  );\n`;\n}\n\n/**\n * Tracks the watermark from which to resume the change stream and the\n * current owner (task ID) acting as the single writer to the changeLog.\n */\nexport type ReplicationState = {\n  lastWatermark: string;\n  owner: string | null;\n};\n\nexport function createReplicationStateTable(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"replicationState\" (\n    \"lastWatermark\" TEXT NOT NULL,\n    \"owner\" TEXT,\n    \"ownerAddress\" TEXT,\n    \"lock\" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n  );\n`;\n}\n\nexport async function discoverChangeStreamerAddress(\n  shard: ShardID,\n  sql: PostgresDB,\n): Promise<string | null> {\n  const result = await sql<{ownerAddress: string | null}[]> /*sql*/ `\n    SELECT \"ownerAddress\" FROM ${sql(cdcSchema(shard))}.\"replicationState\"`;\n  return result[0].ownerAddress;\n}\n\n/**\n * This mirrors the analogously named table in the SQLite replica\n * (`services/replicator/schema/replication-state.ts`), and is used\n * to detect when the replica has been reset and is no longer compatible\n * with the current ChangeLog.\n */\nexport type ReplicationConfig = {\n  replicaVersion: string;\n  publications: readonly string[];\n};\n\nfunction createReplicationConfigTable(shard: ShardID) {\n  return /*sql*/ `\n  CREATE TABLE ${schema(shard)}.\"replicationConfig\" (\n    \"replicaVersion\" TEXT NOT NULL,\n    \"publications\" TEXT[] NOT NULL,\n    \"resetRequired\" BOOL,\n    \"lock\" INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)\n  );\n`;\n}\n\nfunction createTables(shard: ShardID) {\n  return (\n    createSchema(shard) +\n    createChangeLogTable(shard) +\n    createReplicationStateTable(shard) +\n    createReplicationConfigTable(shard)\n  );\n}\n\nexport async function setupCDCTables(\n  lc: LogContext,\n  db: postgres.TransactionSql,\n  shard: ShardID,\n) {\n  lc.info?.(`Setting up CDC tables`);\n  await db.unsafe(createTables(shard));\n}\n\nexport async function markResetRequired(sql: PostgresDB, shard: ShardID) {\n  const schema = cdcSchema(shard);\n  await sql`\n  UPDATE ${sql(schema)}.\"replicationConfig\"\n    SET \"resetRequired\" = true`;\n}\n\nexport async function ensureReplicationConfig(\n  lc: LogContext,\n  db: PostgresDB,\n  subscriptionState: SubscriptionState,\n  shard: ShardID,\n  autoReset: boolean,\n) {\n  const {publications, replicaVersion, watermark} = subscriptionState;\n  const replicaConfig = {publications, replicaVersion};\n  const replicationState: Partial<ReplicationState> = {\n    lastWatermark: replicaVersion,\n  };\n  const schema = cdcSchema(shard);\n\n  await db.begin(async sql => {\n    disableStatementTimeout(sql);\n\n    const stmts: PendingQuery<Row[]>[] = [];\n    const results = await sql<\n      {\n        replicaVersion: string;\n        publications: string[];\n        resetRequired: boolean | null;\n      }[]\n    > /*sql*/ `\n    SELECT \"replicaVersion\", \"publications\", \"resetRequired\" \n      FROM ${sql(schema)}.\"replicationConfig\"`;\n\n    if (results.length) {\n      const {replicaVersion, publications} = results[0];\n      if (\n        replicaVersion !== replicaConfig.replicaVersion ||\n        !equals(new Set(publications), new Set(replicaConfig.publications))\n      ) {\n        if (replicaConfig.replicaVersion !== watermark) {\n          throw new AutoResetSignal(\n            `Cannot reset change db@${replicaVersion} to ` +\n              `service replica@${replicaConfig.replicaVersion} ` +\n              `from watermark ${watermark}`,\n          );\n        }\n        lc.info?.(\n          `Data in cdc tables @${replicaVersion} is incompatible ` +\n            `with replica @${replicaConfig.replicaVersion}. Clearing tables.`,\n        );\n        stmts.push(\n          sql`TRUNCATE TABLE ${sql(schema)}.\"changeLog\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"replicationConfig\"`,\n          sql`TRUNCATE TABLE ${sql(schema)}.\"replicationState\"`,\n        );\n      }\n    }\n    // Initialize (or re-initialize TRUNCATED) tables\n    if (results.length === 0 || stmts.length > 0) {\n      stmts.push(\n        sql`INSERT INTO ${sql(schema)}.\"replicationConfig\" ${sql(replicaConfig)}`,\n        sql`INSERT INTO ${sql(schema)}.\"replicationState\" \n           ${sql(replicationState)}`,\n      );\n      return Promise.all(stmts);\n    }\n\n    const {resetRequired} = results[0];\n    if (resetRequired) {\n      if (autoReset) {\n        throw new AutoResetSignal('reset required by replication stream');\n      }\n      lc.error?.(\n        '\\n\\n\\n' +\n          'Reset required but --auto-reset is not enabled.\\n' +\n          'This can happen for upstream databases that do not support event triggers.\\n' +\n          'To correct this, see https://zero.rocicorp.dev/docs/connecting-to-postgres#schema-changes' +\n          '\\n\\n\\n',\n      );\n    }\n\n    return [];\n  });\n}\n\nexport class AutoResetSignal extends AbortError {\n  readonly name = 'AutoResetSignal';\n}\n"],"names":["schema","replicaVersion","publications"],"mappings":"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"}

package/out/zero-cache/src/services/change-streamer/snapshot.d.ts

@@ -2,6 +2,8 @@
  * Definitions for the `snapshot` API, which serves the purpose of:
  * - informing subscribers (i.e. view-syncers) of the (litestream)
  *   backup location from which to restore a replica snapshot
+ * - checking whether a restored backup or existing replica is
+ *   compatible with the change-streamer
  * - preventing change-log cleanup while a snapshot restore is in
  *   progress
  * - tracking the approximate time it takes from the beginning of
@@ -10,13 +12,69 @@
  *   backed up changes.
  */
 import * as v from '../../../../shared/src/valita.ts';
+declare const statusSchema: v.ObjectType<{
+    tag: v.Type<"status">;
+    /**
+     * The location from which litestream should perform the restore.
+     */
+    backupURL: v.Type<string>;
+    /**
+     * The `replicaVersion` of the backup. If a subscriber's restored or
+     * existing replica is of a different version, it should delete it and
+     * retry the restore from litestream (i.e. equivalent to a
+     * `WrongReplicaVersion` response from a `/changes` subscription).
+     */
+    replicaVersion: v.Type<string>;
+    /**
+     * The earliest watermark from which catchup is possible. If the
+     * subscriber's replica is older that this watermark, it should delete it
+     * and (retry the) restore from litestream (i.e. equivalent to a
+     * `WatermarkTooOld` response from a `/changes` subscription).
+     */
+    minWatermark: v.Type<string>;
+}, undefined>;
+export type SnapshotStatus = v.Infer<typeof statusSchema>;
 declare const statusMessageSchema: v.TupleType<[v.Type<"status">, v.ObjectType<{
     tag: v.Type<"status">;
+    /**
+     * The location from which litestream should perform the restore.
+     */
     backupURL: v.Type<string>;
+    /**
+     * The `replicaVersion` of the backup. If a subscriber's restored or
+     * existing replica is of a different version, it should delete it and
+     * retry the restore from litestream (i.e. equivalent to a
+     * `WrongReplicaVersion` response from a `/changes` subscription).
+     */
+    replicaVersion: v.Type<string>;
+    /**
+     * The earliest watermark from which catchup is possible. If the
+     * subscriber's replica is older that this watermark, it should delete it
+     * and (retry the) restore from litestream (i.e. equivalent to a
+     * `WatermarkTooOld` response from a `/changes` subscription).
+     */
+    minWatermark: v.Type<string>;
 }, undefined>]>;
 export declare const snapshotMessageSchema: v.UnionType<[v.TupleType<[v.Type<"status">, v.ObjectType<{
     tag: v.Type<"status">;
+    /**
+     * The location from which litestream should perform the restore.
+     */
     backupURL: v.Type<string>;
+    /**
+     * The `replicaVersion` of the backup. If a subscriber's restored or
+     * existing replica is of a different version, it should delete it and
+     * retry the restore from litestream (i.e. equivalent to a
+     * `WrongReplicaVersion` response from a `/changes` subscription).
+     */
+    replicaVersion: v.Type<string>;
+    /**
+     * The earliest watermark from which catchup is possible. If the
+     * subscriber's replica is older that this watermark, it should delete it
+     * and (retry the) restore from litestream (i.e. equivalent to a
+     * `WatermarkTooOld` response from a `/changes` subscription).
+     */
+    minWatermark: v.Type<string>;
 }, undefined>]>]>;
 export type SnapshotMessage = v.Infer<typeof statusMessageSchema>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/snapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAOtD,QAAA,MAAM,mBAAmB;;;eAA+C,CAAC;AAEzE,eAAO,MAAM,qBAAqB;;;iBAA+B,CAAC;AAElE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/snapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAEtD,QAAA,MAAM,YAAY;;IAGhB;;OAEG;;IAGH;;;;;OAKG;;IAGH;;;;;OAKG;;aAEH,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAE1D,QAAA,MAAM,mBAAmB;;IAxBvB;;OAEG;;IAGH;;;;;OAKG;;IAGH;;;;;OAKG;;eAMmE,CAAC;AAEzE,eAAO,MAAM,qBAAqB;;IA1BhC;;OAEG;;IAGH;;;;;OAKG;;IAGH;;;;;OAKG;;iBAQ4D,CAAC;AAElE,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC"}

package/out/zero-cache/src/services/change-streamer/snapshot.js

@@ -1,19 +1,29 @@
-/**
- * Definitions for the `snapshot` API, which serves the purpose of:
- * - informing subscribers (i.e. view-syncers) of the (litestream)
- *   backup location from which to restore a replica snapshot
- * - preventing change-log cleanup while a snapshot restore is in
- *   progress
- * - tracking the approximate time it takes from the beginning of
- *   snapshot "reservation" to the subsequent subscription, which
- *   serves as the minimum interval to wait before cleaning up
- *   backed up changes.
- */
-import * as v from "../../../../shared/src/valita.js";
-const statusSchema = v.object({
-    tag: v.literal('status'),
-    backupURL: v.string(),
+import "../../../../shared/src/valita.js";
+import { object, string, literal, tuple, union } from "@badrap/valita";
+const statusSchema = object({
+  tag: literal("status"),
+  /**
+   * The location from which litestream should perform the restore.
+   */
+  backupURL: string(),
+  /**
+   * The `replicaVersion` of the backup. If a subscriber's restored or
+   * existing replica is of a different version, it should delete it and
+   * retry the restore from litestream (i.e. equivalent to a
+   * `WrongReplicaVersion` response from a `/changes` subscription).
+   */
+  replicaVersion: string(),
+  /**
+   * The earliest watermark from which catchup is possible. If the
+   * subscriber's replica is older that this watermark, it should delete it
+   * and (retry the) restore from litestream (i.e. equivalent to a
+   * `WatermarkTooOld` response from a `/changes` subscription).
+   */
+  minWatermark: string()
 });
-const statusMessageSchema = v.tuple([v.literal('status'), statusSchema]);
-export const snapshotMessageSchema = v.union(statusMessageSchema);
-//# sourceMappingURL=snapshot.js.map
+const statusMessageSchema = tuple([literal("status"), statusSchema]);
+const snapshotMessageSchema = union(statusMessageSchema);
+export {
+  snapshotMessageSchema
+};
+//# sourceMappingURL=snapshot.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/snapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,CAAC,MAAM,kCAAkC,CAAC;AAEtD,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"snapshot.js","sources":["../../../../../../zero-cache/src/services/change-streamer/snapshot.ts"],"sourcesContent":["/**\n * Definitions for the `snapshot` API, which serves the purpose of:\n * - informing subscribers (i.e. view-syncers) of the (litestream)\n *   backup location from which to restore a replica snapshot\n * - checking whether a restored backup or existing replica is\n *   compatible with the change-streamer\n * - preventing change-log cleanup while a snapshot restore is in\n *   progress\n * - tracking the approximate time it takes from the beginning of\n *   snapshot \"reservation\" to the subsequent subscription, which\n *   serves as the minimum interval to wait before cleaning up\n *   backed up changes.\n */\n\nimport * as v from '../../../../shared/src/valita.ts';\n\nconst statusSchema = v.object({\n  tag: v.literal('status'),\n\n  /**\n   * The location from which litestream should perform the restore.\n   */\n  backupURL: v.string(),\n\n  /**\n   * The `replicaVersion` of the backup. If a subscriber's restored or\n   * existing replica is of a different version, it should delete it and\n   * retry the restore from litestream (i.e. equivalent to a\n   * `WrongReplicaVersion` response from a `/changes` subscription).\n   */\n  replicaVersion: v.string(),\n\n  /**\n   * The earliest watermark from which catchup is possible. If the\n   * subscriber's replica is older that this watermark, it should delete it\n   * and (retry the) restore from litestream (i.e. equivalent to a\n   * `WatermarkTooOld` response from a `/changes` subscription).\n   */\n  minWatermark: v.string(),\n});\n\nexport type SnapshotStatus = v.Infer<typeof statusSchema>;\n\nconst statusMessageSchema = v.tuple([v.literal('status'), statusSchema]);\n\nexport const snapshotMessageSchema = v.union(statusMessageSchema);\n\nexport type SnapshotMessage = v.Infer<typeof statusMessageSchema>;\n"],"names":["v.object","v.literal","v.string","v.tuple","v.union"],"mappings":";;AAgBA,MAAM,eAAeA,OAAS;AAAA,EAC5B,KAAKC,QAAU,QAAQ;AAAA;AAAA;AAAA;AAAA,EAKvB,WAAWC,OAAE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQb,gBAAgBA,OAAE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAQlB,cAAcA,OAAE;AAClB,CAAC;AAID,MAAM,sBAAsBC,MAAQ,CAACF,QAAU,QAAQ,GAAG,YAAY,CAAC;AAEhE,MAAM,wBAAwBG,MAAQ,mBAAmB;"}

package/out/zero-cache/src/services/change-streamer/storer.d.ts

@@ -1,4 +1,4 @@
-import { LogContext } from '@rocicorp/logger';
+import type { LogContext } from '@rocicorp/logger';
 import { type PostgresDB } from '../../types/pg.ts';
 import { type ShardID } from '../../types/shards.ts';
 import { type Commit } from '../change-source/protocol/current/downstream.ts';
@@ -6,7 +6,7 @@ import type { StatusMessage } from '../change-source/protocol/current/status.ts'
 import type { ReplicatorMode } from '../replicator/replicator.ts';
 import type { Service } from '../service.ts';
 import type { WatermarkedChange } from './change-streamer-service.ts';
-import { Subscriber } from './subscriber.ts';
+import type { Subscriber } from './subscriber.ts';
 /**
  * Handles the storage of changes and the catchup of subscribers
  * that are behind.
@@ -43,6 +43,7 @@ export declare class Storer implements Service {
     constructor(lc: LogContext, shard: ShardID, taskID: string, discoveryAddress: string, discoveryProtocol: string, db: PostgresDB, replicaVersion: string, onConsumed: (c: Commit | StatusMessage) => void, onFatal: (err: Error) => void);
     assumeOwnership(): Promise<void>;
     getLastWatermarkToStartStream(): Promise<string>;
+    getMinWatermarkForCatchup(): Promise<string | null>;
     purgeRecordsBefore(watermark: string): Promise<number>;
     store(entry: WatermarkedChange): void;
     abort(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"storer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/storer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAU5C,OAAO,EAA0B,KAAK,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,6CAA6C,CAAC;AAC/E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAQpE,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAoC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,MAAO,YAAW,OAAO;;IACpC,QAAQ,CAAC,EAAE,YAAY;gBAerB,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,EACzB,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,KAAK,IAAI,EAC/C,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAkBzB,eAAe;IAcf,6BAA6B,IAAI,OAAO,CAAC,MAAM,CAAC;IAatD,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BtD,KAAK,CAAC,KAAK,EAAE,iBAAiB;IAI9B,KAAK;IAIL,MAAM,CAAC,CAAC,EAAE,aAAa;IAIvB,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc;IAMpD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS;IA8BnC,GAAG;IA2OT,IAAI;CAIL"}
+{"version":3,"file":"storer.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/change-streamer/storer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAA0B,KAAK,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAY,KAAK,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,iDAAiD,CAAC;AAC5E,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,6CAA6C,CAAC;AAC/E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,8BAA8B,CAAC;AAQpE,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAoChD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,MAAO,YAAW,OAAO;;IACpC,QAAQ,CAAC,EAAE,YAAY;gBAerB,EAAE,EAAE,UAAU,EACd,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,EACzB,EAAE,EAAE,UAAU,EACd,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,KAAK,IAAI,EAC/C,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI;IAkBzB,eAAe;IAcf,6BAA6B,IAAI,OAAO,CAAC,MAAM,CAAC;IAahD,yBAAyB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAQzD,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBtD,KAAK,CAAC,KAAK,EAAE,iBAAiB;IAI9B,KAAK;IAIL,MAAM,CAAC,CAAC,EAAE,aAAa;IAIvB,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc;IAMpD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS;IA8BnC,GAAG;IA6PT,IAAI;CAIL"}