@rotorsoft/act-pg 1.13.18 → 1.14.0

package/dist/index.js

@@ -84,6 +84,8 @@ var PostgresStore = class {
   config;
   _fqt;
   _fqs;
+  /** Correlate checkpoint table (#1484) — one row, id 0. */
+  _fqc;
   /**
    * Per-instance writer identifier embedded in every NOTIFY payload. The
    * `notify()` LISTEN handler skips payloads where `by === this._by`,
@@ -170,6 +172,7 @@ var PostgresStore = class {
     this._pool = new Pool({ ...poolConfig, types: scopedTypes });
     this._fqt = `"${this.config.schema}"."${this.config.table}"`;
     this._fqs = `"${this.config.schema}"."${this.config.table}_streams"`;
+    this._fqc = `"${this.config.schema}"."${this.config.table}_correlated"`;
     this._channel = notify_channel(this.config.schema, this.config.table);
     if (this.config.notify) {
       this.notify = this._subscribe_notifications.bind(this);
@@ -306,6 +309,16 @@ var PostgresStore = class {
           deferred_at timestamptz
         ) TABLESPACE pg_default;`
       );
+      await client.query(
+        `CREATE TABLE IF NOT EXISTS ${this._fqc} (
+          id int PRIMARY KEY DEFAULT 0,
+          at bigint NOT NULL DEFAULT -1,
+          CONSTRAINT ${this.config.table}_correlated_singleton CHECK (id = 0)
+        ) TABLESPACE pg_default;`
+      );
+      await client.query(
+        `INSERT INTO ${this._fqc} (id) VALUES (0) ON CONFLICT (id) DO NOTHING;`
+      );
       await client.query(
         `ALTER TABLE ${this._fqs}
          ADD COLUMN IF NOT EXISTS priority int NOT NULL DEFAULT 0;`
@@ -391,7 +404,7 @@ var PostgresStore = class {
           WHERE schema_name = '${this.config.schema}'
         ) THEN
           EXECUTE 'DROP TABLE IF EXISTS ${this._fqt}';
-          EXECUTE 'DROP TABLE IF EXISTS ${this._fqs}';
+          EXECUTE 'DROP TABLE IF EXISTS ${this._fqc}, ${this._fqs}';
           IF '${this.config.schema}' <> 'public' THEN
             EXECUTE 'DROP SCHEMA "${this.config.schema}" CASCADE';
           END IF;
@@ -650,13 +663,16 @@ var PostgresStore = class {
             AND (deferred_at IS NULL OR deferred_at <= NOW())
         ),
         available AS (
-          -- Never processed: claimable without probing the log at all.
-          SELECT stream, source, at, priority, lane FROM eligible WHERE at < 0
-          UNION ALL
+          -- Every arm below is watermark-agnostic (#1446): a fresh
+          -- subscription sits at -1, and e.id > s.at already answers
+          -- correctly there, since the first event has a greater id.
+          -- There used to be a fourth arm claiming at < 0 unconditionally,
+          -- which handed out an empty lease and a no-op ack for every
+          -- subscription with no matching events yet.
           -- Source-less subscription: any non-snapshot event past the
           -- watermark counts, so the id index alone answers it.
           SELECT stream, source, at, priority, lane FROM eligible s
-          WHERE s.at >= 0 AND s.source IS NULL
+          WHERE s.source IS NULL
             AND EXISTS (
               SELECT 1 FROM ${this._fqt} e
               WHERE e.id > s.at AND e.name <> '${SNAP_EVENT}' LIMIT 1
@@ -665,7 +681,7 @@ var PostgresStore = class {
           -- Literal source (no regex metacharacter): exact equality, so
           -- "s1" never claims "s12", and (stream, id) is usable.
           SELECT stream, source, at, priority, lane FROM eligible s
-          WHERE s.at >= 0 AND s.source IS NOT NULL
+          WHERE s.source IS NOT NULL
             AND s.source !~ '${SOURCE_METACHARACTER_CLASS}'
             AND EXISTS (
               SELECT 1 FROM ${this._fqt} e
@@ -678,7 +694,7 @@ var PostgresStore = class {
           -- it anchors. Unavoidably a scan \u2014 but only for the subscriptions
           -- that actually declare a pattern.
           SELECT stream, source, at, priority, lane FROM eligible s
-          WHERE s.at >= 0 AND s.source IS NOT NULL
+          WHERE s.source IS NOT NULL
             AND s.source ~ '${SOURCE_METACHARACTER_CLASS}'
             AND EXISTS (
               SELECT 1 FROM ${this._fqt} e
@@ -780,7 +796,7 @@ var PostgresStore = class {
    * @param streams - Streams to register with optional source.
    * @returns subscribed count and current max watermark.
    */
-  async subscribe(streams) {
+  async subscribe(streams, correlated_at) {
     const client = await this._client("subscribe");
     try {
       await client.query("BEGIN");
@@ -821,11 +837,21 @@ var PostgresStore = class {
           [JSON.stringify(streams)]
         );
       }
+      if (correlated_at !== void 0)
+        await client.query(
+          `UPDATE ${this._fqc} SET at = GREATEST(at, $1::bigint) WHERE id = 0`,
+          [correlated_at]
+        );
       const { rows } = await client.query(
-        `SELECT COALESCE(MAX(at), -1) AS max FROM ${this._fqs}`
+        `SELECT (SELECT COALESCE(MAX(at), -1) FROM ${this._fqs}) AS max,
+                (SELECT at FROM ${this._fqc} WHERE id = 0) AS correlated_at`
       );
       await client.query("COMMIT");
-      return { subscribed, watermark: rows[0]?.max ?? -1 };
+      return {
+        subscribed,
+        watermark: rows[0]?.max ?? -1,
+        correlated_at: Number(rows[0]?.correlated_at ?? -1)
+      };
     } catch (error) {
       await client.query("ROLLBACK").catch(() => {
       });