@rocicorp/zero 0.25.0 → 0.26.0-canary.0

package/out/zero-cache/src/services/change-source/pg/logical-replication/stream.js

@@ -1,146 +1,154 @@
-import { PG_ADMIN_SHUTDOWN, PG_OBJECT_IN_USE, PG_OBJECT_NOT_IN_PREREQUISITE_STATE, } from '@drdgvhbh/postgres-error-codes';
-import { defu } from 'defu';
-import postgres, {} from 'postgres';
+import { PG_ADMIN_SHUTDOWN, PG_OBJECT_IN_USE, PG_OBJECT_NOT_IN_PREREQUISITE_STATE } from "@drdgvhbh/postgres-error-codes";
+import { defu } from "defu";
+import postgres from "postgres";
 import { sleep } from "../../../../../../shared/src/sleep.js";
 import { getTypeParsers } from "../../../../db/pg-type-parser.js";
-import {} from "../../../../types/pg.js";
+import "../../../../types/pg.js";
 import { pipe } from "../../../../types/streams.js";
 import { Subscription } from "../../../../types/subscription.js";
 import { AutoResetSignal } from "../../../change-streamer/schema/tables.js";
 import { fromBigInt } from "../lsn.js";
 import { PgoutputParser } from "./pgoutput-parser.js";
 const DEFAULT_RETRIES_IF_REPLICATION_SLOT_ACTIVE = 5;
-export async function subscribe(lc, db, slot, publications, lsn, retriesIfReplicationSlotActive = DEFAULT_RETRIES_IF_REPLICATION_SLOT_ACTIVE, applicationName = 'zero-replicator') {
-    const session = postgres(defu({
+async function subscribe(lc, db, slot, publications, lsn, retriesIfReplicationSlotActive = DEFAULT_RETRIES_IF_REPLICATION_SLOT_ACTIVE, applicationName = "zero-replicator") {
+  const session = postgres(
+    defu(
+      {
         max: 1,
-        ['fetch_types']: false, // Necessary for the streaming protocol
-        ['idle_timeout']: null,
-        ['max_lifetime']: null,
+        ["fetch_types"]: false,
+        // Necessary for the streaming protocol
+        ["idle_timeout"]: null,
+        ["max_lifetime"]: null,
         connection: {
-            ['application_name']: applicationName,
-            replication: 'database', // https://www.postgresql.org/docs/current/protocol-replication.html
-        },
-    }, 
-    // ParsedOptions are technically compatible with Options, but happen
-    // to not be typed that way. The postgres.js author does an equivalent
-    // merge of ParsedOptions and Options here:
-    // https://github.com/porsager/postgres/blob/089214e85c23c90cf142d47fb30bd03f42874984/src/subscribe.js#L13
-    db.options));
-    // Postgres will send keepalives before timing out a wal_sender. It is possible that
-    // these keepalives are not received if there is back-pressure in the replication
-    // stream. To keep the connection alive, explicitly send keepalives if none have been
-    // sent within the last 75% of the wal_sender_timeout.
-    //
-    // https://www.postgresql.org/docs/current/runtime-config-replication.html#GUC-WAL-SENDER-TIMEOUT
-    const [{ walSenderTimeoutMs }] = await session `SELECT EXTRACT(EPOCH FROM (setting || unit)::interval) * 1000 
+          ["application_name"]: applicationName,
+          replication: "database"
+          // https://www.postgresql.org/docs/current/protocol-replication.html
+        }
+      },
+      // ParsedOptions are technically compatible with Options, but happen
+      // to not be typed that way. The postgres.js author does an equivalent
+      // merge of ParsedOptions and Options here:
+      // https://github.com/porsager/postgres/blob/089214e85c23c90cf142d47fb30bd03f42874984/src/subscribe.js#L13
+      db.options
+    )
+  );
+  const [{ walSenderTimeoutMs }] = await session`SELECT EXTRACT(EPOCH FROM (setting || unit)::interval) * 1000 
         AS "walSenderTimeoutMs" FROM pg_settings
         WHERE name = 'wal_sender_timeout'`.simple();
-    const manualKeepaliveTimeout = Math.floor(walSenderTimeoutMs * 0.75);
-    lc.info?.(`wal_sender_timeout: ${walSenderTimeoutMs}ms. ` +
-        `Ensuring manual keepalives at least every ${manualKeepaliveTimeout}ms`);
-    const [readable, writable] = await startReplicationStream(lc, session, slot, publications, lsn, retriesIfReplicationSlotActive + 1);
-    let lastAckTime = Date.now();
-    function sendAck(lsn) {
-        writable.write(makeAck(lsn));
-        lastAckTime = Date.now();
+  const manualKeepaliveTimeout = Math.floor(walSenderTimeoutMs * 0.75);
+  lc.info?.(
+    `wal_sender_timeout: ${walSenderTimeoutMs}ms. Ensuring manual keepalives at least every ${manualKeepaliveTimeout}ms`
+  );
+  const [readable, writable] = await startReplicationStream(
+    lc,
+    session,
+    slot,
+    publications,
+    lsn,
+    retriesIfReplicationSlotActive + 1
+  );
+  let lastAckTime = Date.now();
+  function sendAck(lsn2) {
+    writable.write(makeAck(lsn2));
+    lastAckTime = Date.now();
+  }
+  const livenessTimer = setInterval(() => {
+    const now = Date.now();
+    if (now - lastAckTime > manualKeepaliveTimeout) {
+      sendAck(0n);
+      lc.debug?.(`sent manual keepalive`);
     }
-    const livenessTimer = setInterval(() => {
-        const now = Date.now();
-        if (now - lastAckTime > manualKeepaliveTimeout) {
-            sendAck(0n);
-            lc.debug?.(`sent manual keepalive`);
-        }
-    }, manualKeepaliveTimeout / 5);
-    let destroyed = false;
-    const typeParsers = await getTypeParsers(db);
-    const parser = new PgoutputParser(typeParsers);
-    const messages = Subscription.create({
-        cleanup: () => {
-            destroyed = true;
-            readable.destroyed || readable.destroy();
-            clearInterval(livenessTimer);
-            return session.end();
-        },
-    });
-    readable.once('close', () => 
-    // Only log a warning if the stream was not manually closed.
-    destroyed || lc.warn?.(`replication stream closed by ${db.options.host}`));
-    readable.once('error', e => 
-    // Don't log the shutdown signal. This is the expected way for upstream
-    // to close the connection (and will be logged downstream).
-    (e instanceof postgres.PostgresError && e.code === PG_ADMIN_SHUTDOWN) ||
-        lc.error?.(`error from ${db.options.host}`, e));
-    pipe(readable, messages, buffer => parseStreamMessage(lc, buffer, parser));
-    return {
-        messages,
-        acks: { push: sendAck },
-    };
+  }, manualKeepaliveTimeout / 5);
+  let destroyed = false;
+  const typeParsers = await getTypeParsers(db);
+  const parser = new PgoutputParser(typeParsers);
+  const messages = Subscription.create({
+    cleanup: () => {
+      destroyed = true;
+      readable.destroyed || readable.destroy();
+      clearInterval(livenessTimer);
+      return session.end();
+    }
+  });
+  readable.once(
+    "close",
+    () => (
+      // Only log a warning if the stream was not manually closed.
+      destroyed || lc.warn?.(`replication stream closed by ${db.options.host}`)
+    )
+  );
+  readable.once(
+    "error",
+    (e) => (
+      // Don't log the shutdown signal. This is the expected way for upstream
+      // to close the connection (and will be logged downstream).
+      e instanceof postgres.PostgresError && e.code === PG_ADMIN_SHUTDOWN || lc.error?.(`error from ${db.options.host}`, e)
+    )
+  );
+  pipe(readable, messages, (buffer) => parseStreamMessage(lc, buffer, parser));
+  return {
+    messages,
+    acks: { push: sendAck }
+  };
 }
 async function startReplicationStream(lc, session, slot, publications, lsn, maxAttempts) {
-    for (let i = 0; i < maxAttempts; i++) {
-        try {
-            const stream = session
-                .unsafe(`START_REPLICATION SLOT "${slot}" LOGICAL ${fromBigInt(lsn)} (
+  for (let i = 0; i < maxAttempts; i++) {
+    try {
+      const stream = session.unsafe(
+        `START_REPLICATION SLOT "${slot}" LOGICAL ${fromBigInt(lsn)} (
         proto_version '1', 
         publication_names '${publications}',
         messages 'true'
-      )`)
-                .execute();
-            return await Promise.all([stream.readable(), stream.writable()]);
+      )`
+      ).execute();
+      return await Promise.all([stream.readable(), stream.writable()]);
+    } catch (e) {
+      if (e instanceof postgres.PostgresError) {
+        if (e.code === PG_OBJECT_IN_USE) {
+          lc.warn?.(`attempt ${i + 1}: ${String(e)}`, e);
+          await sleep(10);
+          continue;
         }
-        catch (e) {
-            if (e instanceof postgres.PostgresError) {
-                // error: replication slot "zero_slot_change_source_test_id" is active for PID 268
-                if (e.code === PG_OBJECT_IN_USE) {
-                    // The freeing up of the replication slot is not transactional;
-                    // sometimes it takes time for Postgres to consider the slot
-                    // inactive.
-                    lc.warn?.(`attempt ${i + 1}: ${String(e)}`, e);
-                    await sleep(10);
-                    continue;
-                }
-                // error: This slot has been invalidated because it exceeded the maximum reserved size.
-                // (This is a different manifestation of a slot being invalidated when
-                //  the wal exceeds the max_slot_wal_keep_size)
-                if (e.code === PG_OBJECT_NOT_IN_PREREQUISITE_STATE) {
-                    lc.error?.(`error starting replication stream`, e);
-                    throw new AutoResetSignal(`unable to start replication stream`, {
-                        cause: e,
-                    });
-                }
-            }
-            throw e;
+        if (e.code === PG_OBJECT_NOT_IN_PREREQUISITE_STATE) {
+          lc.error?.(`error starting replication stream`, e);
+          throw new AutoResetSignal(`unable to start replication stream`, {
+            cause: e
+          });
         }
+      }
+      throw e;
     }
-    throw new Error(`exceeded max attempts (${maxAttempts}) to start the Postgres stream`);
+  }
+  throw new Error(
+    `exceeded max attempts (${maxAttempts}) to start the Postgres stream`
+  );
 }
 function parseStreamMessage(lc, buffer, parser) {
-    // https://www.postgresql.org/docs/current/protocol-replication.html#PROTOCOL-REPLICATION-XLOGDATA
-    if (buffer[0] !== 0x77 && buffer[0] !== 0x6b) {
-        lc.warn?.('Unknown message', buffer[0]);
-        return null;
-    }
-    const lsn = buffer.readBigUInt64BE(1);
-    if (buffer[0] === 0x77) {
-        // XLogData
-        return [lsn, parser.parse(buffer.subarray(25))];
-    }
-    if (buffer.readInt8(17)) {
-        // Primary keepalive message: shouldRespond
-        lc.debug?.(`pg keepalive (shouldRespond: true) ${lsn}`);
-        return [lsn, { tag: 'keepalive' }];
-    }
+  if (buffer[0] !== 119 && buffer[0] !== 107) {
+    lc.warn?.("Unknown message", buffer[0]);
     return null;
+  }
+  const lsn = buffer.readBigUInt64BE(1);
+  if (buffer[0] === 119) {
+    return [lsn, parser.parse(buffer.subarray(25))];
+  }
+  if (buffer.readInt8(17)) {
+    lc.debug?.(`pg keepalive (shouldRespond: true) ${lsn}`);
+    return [lsn, { tag: "keepalive" }];
+  }
+  return null;
 }
-// https://www.postgresql.org/docs/current/protocol-replication.html#PROTOCOL-REPLICATION-STANDBY-STATUS-UPDATE
 function makeAck(lsn) {
-    const microNow = BigInt(Date.now() - Date.UTC(2000, 0, 1)) * BigInt(1000);
-    const x = Buffer.alloc(34);
-    x[0] = 'r'.charCodeAt(0);
-    x.writeBigInt64BE(lsn, 1);
-    x.writeBigInt64BE(lsn, 9);
-    x.writeBigInt64BE(lsn, 17);
-    x.writeBigInt64BE(microNow, 25);
-    return x;
+  const microNow = BigInt(Date.now() - Date.UTC(2e3, 0, 1)) * BigInt(1e3);
+  const x = Buffer.alloc(34);
+  x[0] = "r".charCodeAt(0);
+  x.writeBigInt64BE(lsn, 1);
+  x.writeBigInt64BE(lsn, 9);
+  x.writeBigInt64BE(lsn, 17);
+  x.writeBigInt64BE(microNow, 25);
+  return x;
 }
-//# sourceMappingURL=stream.js.map
+export {
+  subscribe
+};
+//# sourceMappingURL=stream.js.map

package/out/zero-cache/src/services/change-source/pg/logical-replication/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/logical-replication/stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stream.js","sources":["../../../../../../../../zero-cache/src/services/change-source/pg/logical-replication/stream.ts"],"sourcesContent":["import {\n  PG_ADMIN_SHUTDOWN,\n  PG_OBJECT_IN_USE,\n  PG_OBJECT_NOT_IN_PREREQUISITE_STATE,\n} from '@drdgvhbh/postgres-error-codes';\nimport type {LogContext} from '@rocicorp/logger';\nimport {defu} from 'defu';\nimport postgres, {type Options, type PostgresType} from 'postgres';\nimport {sleep} from '../../../../../../shared/src/sleep.ts';\nimport {getTypeParsers} from '../../../../db/pg-type-parser.ts';\nimport {type PostgresDB} from '../../../../types/pg.ts';\nimport {pipe, type Sink, type Source} from '../../../../types/streams.ts';\nimport {Subscription} from '../../../../types/subscription.ts';\nimport {AutoResetSignal} from '../../../change-streamer/schema/tables.ts';\nimport {fromBigInt} from '../lsn.ts';\nimport {PgoutputParser} from './pgoutput-parser.ts';\nimport type {Message} from './pgoutput.types.ts';\n\nconst DEFAULT_RETRIES_IF_REPLICATION_SLOT_ACTIVE = 5;\n\nexport type StreamMessage = [lsn: bigint, Message | {tag: 'keepalive'}];\n\nexport async function subscribe(\n  lc: LogContext,\n  db: PostgresDB,\n  slot: string,\n  publications: string[],\n  lsn: bigint,\n  retriesIfReplicationSlotActive = DEFAULT_RETRIES_IF_REPLICATION_SLOT_ACTIVE,\n  applicationName = 'zero-replicator',\n): Promise<{messages: Source<StreamMessage>; acks: Sink<bigint>}> {\n  const session = postgres(\n    defu(\n      {\n        max: 1,\n        ['fetch_types']: false, // Necessary for the streaming protocol\n        ['idle_timeout']: null,\n        ['max_lifetime']: null as unknown as number,\n        connection: {\n          ['application_name']: applicationName,\n          replication: 'database', // https://www.postgresql.org/docs/current/protocol-replication.html\n        },\n      },\n      // ParsedOptions are technically compatible with Options, but happen\n      // to not be typed that way. The postgres.js author does an equivalent\n      // merge of ParsedOptions and Options here:\n      // https://github.com/porsager/postgres/blob/089214e85c23c90cf142d47fb30bd03f42874984/src/subscribe.js#L13\n      db.options as unknown as Options<Record<string, PostgresType>>,\n    ),\n  );\n\n  // Postgres will send keepalives before timing out a wal_sender. It is possible that\n  // these keepalives are not received if there is back-pressure in the replication\n  // stream. To keep the connection alive, explicitly send keepalives if none have been\n  // sent within the last 75% of the wal_sender_timeout.\n  //\n  // https://www.postgresql.org/docs/current/runtime-config-replication.html#GUC-WAL-SENDER-TIMEOUT\n  const [{walSenderTimeoutMs}] = await session<\n    {walSenderTimeoutMs: number}[]\n  >`SELECT EXTRACT(EPOCH FROM (setting || unit)::interval) * 1000 \n        AS \"walSenderTimeoutMs\" FROM pg_settings\n        WHERE name = 'wal_sender_timeout'`.simple();\n  const manualKeepaliveTimeout = Math.floor(walSenderTimeoutMs * 0.75);\n  lc.info?.(\n    `wal_sender_timeout: ${walSenderTimeoutMs}ms. ` +\n      `Ensuring manual keepalives at least every ${manualKeepaliveTimeout}ms`,\n  );\n\n  const [readable, writable] = await startReplicationStream(\n    lc,\n    session,\n    slot,\n    publications,\n    lsn,\n    retriesIfReplicationSlotActive + 1,\n  );\n\n  let lastAckTime = Date.now();\n  function sendAck(lsn: bigint) {\n    writable.write(makeAck(lsn));\n    lastAckTime = Date.now();\n  }\n\n  const livenessTimer = setInterval(() => {\n    const now = Date.now();\n    if (now - lastAckTime > manualKeepaliveTimeout) {\n      sendAck(0n);\n      lc.debug?.(`sent manual keepalive`);\n    }\n  }, manualKeepaliveTimeout / 5);\n\n  let destroyed = false;\n  const typeParsers = await getTypeParsers(db);\n  const parser = new PgoutputParser(typeParsers);\n  const messages = Subscription.create<StreamMessage>({\n    cleanup: () => {\n      destroyed = true;\n      readable.destroyed || readable.destroy();\n      clearInterval(livenessTimer);\n      return session.end();\n    },\n  });\n\n  readable.once(\n    'close',\n    () =>\n      // Only log a warning if the stream was not manually closed.\n      destroyed || lc.warn?.(`replication stream closed by ${db.options.host}`),\n  );\n  readable.once(\n    'error',\n    e =>\n      // Don't log the shutdown signal. This is the expected way for upstream\n      // to close the connection (and will be logged downstream).\n      (e instanceof postgres.PostgresError && e.code === PG_ADMIN_SHUTDOWN) ||\n      lc.error?.(`error from ${db.options.host}`, e),\n  );\n\n  pipe(readable, messages, buffer => parseStreamMessage(lc, buffer, parser));\n\n  return {\n    messages,\n    acks: {push: sendAck},\n  };\n}\n\nasync function startReplicationStream(\n  lc: LogContext,\n  session: postgres.Sql,\n  slot: string,\n  publications: string[],\n  lsn: bigint,\n  maxAttempts: number,\n) {\n  for (let i = 0; i < maxAttempts; i++) {\n    try {\n      const stream = session\n        .unsafe(\n          `START_REPLICATION SLOT \"${slot}\" LOGICAL ${fromBigInt(lsn)} (\n        proto_version '1', \n        publication_names '${publications}',\n        messages 'true'\n      )`,\n        )\n        .execute();\n      return await Promise.all([stream.readable(), stream.writable()]);\n    } catch (e) {\n      if (e instanceof postgres.PostgresError) {\n        // error: replication slot \"zero_slot_change_source_test_id\" is active for PID 268\n        if (e.code === PG_OBJECT_IN_USE) {\n          // The freeing up of the replication slot is not transactional;\n          // sometimes it takes time for Postgres to consider the slot\n          // inactive.\n          lc.warn?.(`attempt ${i + 1}: ${String(e)}`, e);\n          await sleep(10);\n          continue;\n        }\n        // error: This slot has been invalidated because it exceeded the maximum reserved size.\n        // (This is a different manifestation of a slot being invalidated when\n        //  the wal exceeds the max_slot_wal_keep_size)\n        if (e.code === PG_OBJECT_NOT_IN_PREREQUISITE_STATE) {\n          lc.error?.(`error starting replication stream`, e);\n          throw new AutoResetSignal(`unable to start replication stream`, {\n            cause: e,\n          });\n        }\n      }\n      throw e;\n    }\n  }\n  throw new Error(\n    `exceeded max attempts (${maxAttempts}) to start the Postgres stream`,\n  );\n}\n\nfunction parseStreamMessage(\n  lc: LogContext,\n  buffer: Buffer,\n  parser: PgoutputParser,\n): StreamMessage | null {\n  // https://www.postgresql.org/docs/current/protocol-replication.html#PROTOCOL-REPLICATION-XLOGDATA\n  if (buffer[0] !== 0x77 && buffer[0] !== 0x6b) {\n    lc.warn?.('Unknown message', buffer[0]);\n    return null;\n  }\n  const lsn = buffer.readBigUInt64BE(1);\n  if (buffer[0] === 0x77) {\n    // XLogData\n    return [lsn, parser.parse(buffer.subarray(25))];\n  }\n  if (buffer.readInt8(17)) {\n    // Primary keepalive message: shouldRespond\n    lc.debug?.(`pg keepalive (shouldRespond: true) ${lsn}`);\n    return [lsn, {tag: 'keepalive'}];\n  }\n  return null;\n}\n\n// https://www.postgresql.org/docs/current/protocol-replication.html#PROTOCOL-REPLICATION-STANDBY-STATUS-UPDATE\nfunction makeAck(lsn: bigint): Buffer {\n  const microNow = BigInt(Date.now() - Date.UTC(2000, 0, 1)) * BigInt(1000);\n\n  const x = Buffer.alloc(34);\n  x[0] = 'r'.charCodeAt(0);\n  x.writeBigInt64BE(lsn, 1);\n  x.writeBigInt64BE(lsn, 9);\n  x.writeBigInt64BE(lsn, 17);\n  x.writeBigInt64BE(microNow, 25);\n  return x;\n}\n"],"names":["lsn"],"mappings":"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"}

package/out/zero-cache/src/services/change-source/pg/lsn.js

@@ -1,23 +1,24 @@
 import { assert } from "../../../../../shared/src/asserts.js";
-import { versionFromLexi, versionToLexi, } from "../../../types/lexi-version.js";
-export function toBigInt(lsn) {
-    const parts = lsn.split('/');
-    assert(parts.length === 2, `Malformed LSN: "${lsn}"`);
-    const high = BigInt(`0x${parts[0]}`);
-    const low = BigInt(`0x${parts[1]}`);
-    const val = (high << 32n) + low;
-    return val;
+import { versionToLexi } from "../../../types/lexi-version.js";
+function toBigInt(lsn) {
+  const parts = lsn.split("/");
+  assert(parts.length === 2, `Malformed LSN: "${lsn}"`);
+  const high = BigInt(`0x${parts[0]}`);
+  const low = BigInt(`0x${parts[1]}`);
+  const val = (high << 32n) + low;
+  return val;
 }
-export function toLexiVersion(lsn) {
-    return versionToLexi(toBigInt(lsn));
+function toLexiVersion(lsn) {
+  return versionToLexi(toBigInt(lsn));
 }
-export function fromLexiVersion(lexi) {
-    const val = versionFromLexi(lexi);
-    return fromBigInt(val);
+function fromBigInt(val) {
+  const high = val >> 32n;
+  const low = val & 0xffffffffn;
+  return `${high.toString(16).toUpperCase()}/${low.toString(16).toUpperCase()}`;
 }
-export function fromBigInt(val) {
-    const high = val >> 32n;
-    const low = val & 0xffffffffn;
-    return `${high.toString(16).toUpperCase()}/${low.toString(16).toUpperCase()}`;
-}
-//# sourceMappingURL=lsn.js.map
+export {
+  fromBigInt,
+  toBigInt,
+  toLexiVersion
+};
+//# sourceMappingURL=lsn.js.map

package/out/zero-cache/src/services/change-source/pg/lsn.js.map

@@ -1 +1 @@
-{"version":3,"file":"lsn.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/lsn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,sCAAsC,CAAC;AAC5D,OAAO,EACL,eAAe,EACf,aAAa,GAEd,MAAM,gCAAgC,CAAC;AAiBxC,MAAM,UAAU,QAAQ,CAAC,GAAQ;IAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,mBAAmB,GAAG,GAAG,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC;IAChC,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAQ;IACpC,OAAO,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAiB;IAC/C,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAClC,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,GAAW;IACpC,MAAM,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC;IACxB,MAAM,GAAG,GAAG,GAAG,GAAG,WAAW,CAAC;IAC9B,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;AAChF,CAAC"}
+{"version":3,"file":"lsn.js","sources":["../../../../../../../zero-cache/src/services/change-source/pg/lsn.ts"],"sourcesContent":["import {assert} from '../../../../../shared/src/asserts.ts';\nimport {\n  versionFromLexi,\n  versionToLexi,\n  type LexiVersion,\n} from '../../../types/lexi-version.ts';\nimport type {Change} from '../protocol/current/data.ts';\n\n/**\n * Parsing and conversion utilities for the pg_lsn Type, which represents\n * the \"Log Sequence Number\" used as a monotonic progress marker for logical\n * replication from a PostgresSQL database.\n *\n * The LSN is a 64-bit integer represented in logical replication as two\n * hexadecimal numbers (up to 8 digits each) separated by a slash. This is\n * converted to a LexiVersion and used as DB-agnostic version in change log,\n * invalidation index, and row version in the tables of the sync replica.\n */\nexport type LSN = string;\n\nexport type RecordType = Change['tag'];\n\nexport function toBigInt(lsn: LSN): bigint {\n  const parts = lsn.split('/');\n  assert(parts.length === 2, `Malformed LSN: \"${lsn}\"`);\n  const high = BigInt(`0x${parts[0]}`);\n  const low = BigInt(`0x${parts[1]}`);\n  const val = (high << 32n) + low;\n  return val;\n}\n\nexport function toLexiVersion(lsn: LSN): LexiVersion {\n  return versionToLexi(toBigInt(lsn));\n}\n\nexport function fromLexiVersion(lexi: LexiVersion): LSN {\n  const val = versionFromLexi(lexi);\n  return fromBigInt(val);\n}\n\nexport function fromBigInt(val: bigint): LSN {\n  const high = val >> 32n;\n  const low = val & 0xffffffffn;\n  return `${high.toString(16).toUpperCase()}/${low.toString(16).toUpperCase()}`;\n}\n"],"names":[],"mappings":";;AAsBO,SAAS,SAAS,KAAkB;AACzC,QAAM,QAAQ,IAAI,MAAM,GAAG;AAC3B,SAAO,MAAM,WAAW,GAAG,mBAAmB,GAAG,GAAG;AACpD,QAAM,OAAO,OAAO,KAAK,MAAM,CAAC,CAAC,EAAE;AACnC,QAAM,MAAM,OAAO,KAAK,MAAM,CAAC,CAAC,EAAE;AAClC,QAAM,OAAO,QAAQ,OAAO;AAC5B,SAAO;AACT;AAEO,SAAS,cAAc,KAAuB;AACnD,SAAO,cAAc,SAAS,GAAG,CAAC;AACpC;AAOO,SAAS,WAAW,KAAkB;AAC3C,QAAM,OAAO,OAAO;AACpB,QAAM,MAAM,MAAM;AAClB,SAAO,GAAG,KAAK,SAAS,EAAE,EAAE,YAAA,CAAa,IAAI,IAAI,SAAS,EAAE,EAAE,aAAa;AAC7E;"}

package/out/zero-cache/src/services/change-source/pg/schema/ddl.d.ts

@@ -22,7 +22,7 @@ export declare const ddlEventSchema: v.ObjectType<Omit<{
             primaryKey: v.Optional<string[]>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications" | "oid" | "columns" | "replicaIdentity"> & {
+        }, "columns" | "publications" | "oid" | "replicaIdentity"> & {
             oid: v.Type<number>;
             columns: v.Type<Record<string, {
                 pgTypeClass?: "e" | "d" | "b" | "c" | "p" | "r" | "m" | undefined;
@@ -74,7 +74,7 @@ export declare const ddlStartEventSchema: v.ObjectType<Omit<Omit<{
             primaryKey: v.Optional<string[]>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications" | "oid" | "columns" | "replicaIdentity"> & {
+        }, "columns" | "publications" | "oid" | "replicaIdentity"> & {
             oid: v.Type<number>;
             columns: v.Type<Record<string, {
                 pgTypeClass?: "e" | "d" | "b" | "c" | "p" | "r" | "m" | undefined;
@@ -141,7 +141,7 @@ export declare const ddlUpdateEventSchema: v.ObjectType<Omit<Omit<{
             primaryKey: v.Optional<string[]>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications" | "oid" | "columns" | "replicaIdentity"> & {
+        }, "columns" | "publications" | "oid" | "replicaIdentity"> & {
             oid: v.Type<number>;
             columns: v.Type<Record<string, {
                 pgTypeClass?: "e" | "d" | "b" | "c" | "p" | "r" | "m" | undefined;
@@ -199,7 +199,7 @@ export declare const replicationEventSchema: v.UnionType<[v.ObjectType<Omit<Omit
             primaryKey: v.Optional<string[]>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications" | "oid" | "columns" | "replicaIdentity"> & {
+        }, "columns" | "publications" | "oid" | "replicaIdentity"> & {
             oid: v.Type<number>;
             columns: v.Type<Record<string, {
                 pgTypeClass?: "e" | "d" | "b" | "c" | "p" | "r" | "m" | undefined;
@@ -252,7 +252,7 @@ export declare const replicationEventSchema: v.UnionType<[v.ObjectType<Omit<Omit
             primaryKey: v.Optional<string[]>;
         }, "schema"> & {
             schema: v.Type<string>;
-        }, "publications" | "oid" | "columns" | "replicaIdentity"> & {
+        }, "columns" | "publications" | "oid" | "replicaIdentity"> & {
             oid: v.Type<number>;
             columns: v.Type<Record<string, {
                 pgTypeClass?: "e" | "d" | "b" | "c" | "p" | "r" | "m" | undefined;