@rotorsoft/act-pg 1.13.5 → 1.13.7

package/dist/index.js

@@ -27,10 +27,13 @@ var dateReviver = (_key, value) => {
 var logger = log();
 var SOURCE_METACHARACTER_CLASS = "[]^$.*+?()[{}|\\\\]";
 var { Pool, types } = pg;
-types.setTypeParser(
-  types.builtins.JSONB,
-  (val) => JSON.parse(val, dateReviver)
-);
+var JSONB_OID = types.builtins.JSONB;
+var scopedTypes = {
+  getTypeParser: ((oid, format) => oid === JSONB_OID ? (val) => JSON.parse(val, dateReviver) : types.getTypeParser(
+    oid,
+    format
+  ))
+};
 var SAFE_IDENTIFIER = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 var PG_UNIQUE_VIOLATION = "23505";
 var NOTIFY_CHANNEL_PREFIX = "act_commit";
@@ -172,7 +175,7 @@ var PostgresStore = class {
       pii_encryption: ___,
       ...poolConfig
     } = this.config;
-    this._pool = new Pool(poolConfig);
+    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._channel = notify_channel(this.config.schema, this.config.table);
@@ -420,11 +423,11 @@ var PostgresStore = class {
           query.stream_exact ? `stream = $${values.length}` : `stream ~ $${values.length}`
         );
       }
-      if (names?.length) {
+      if (names !== void 0) {
         values.push(names);
         conditions.push(`name = ANY($${values.length})`);
       }
-      if (before) {
+      if (before !== void 0) {
         values.push(before);
         conditions.push(`id<$${values.length}`);
       }
@@ -579,6 +582,11 @@ var PostgresStore = class {
       const { rows } = await client.query(
         `
         WITH
+        -- Plain read of the eligible frontier \u2014 no row lock here. A CTE
+        -- carrying FOR UPDATE never inlines, so locking it would materialize
+        -- and lock EVERY claimable stream for this transaction, starving
+        -- overlapping competing consumers. We only lock the small
+        -- lagging+leading candidate slice, down in the "locked" CTE.
         available AS (
           SELECT stream, source, at, priority, lane
           FROM ${this._fqs} s
@@ -602,7 +610,6 @@ var PostgresStore = class {
                 )
               LIMIT 1
             ))
-          FOR UPDATE SKIP LOCKED
         ),
         -- Priority lanes (ACT-102): higher priority first, then
         -- lagging-watermark order. With everyone at priority=0 the
@@ -624,6 +631,20 @@ var PostgresStore = class {
           SELECT DISTINCT ON (stream) stream, source, at, lane, lagging
           FROM (SELECT * FROM lag UNION ALL SELECT * FROM lead) t
           ORDER BY stream, at
+        ),
+        -- Lock ONLY the <= lagging+leading candidate rows. The
+        -- lease-eligibility predicate is re-asserted here under the lock so a
+        -- lease acquired by a competing worker between the unlocked read and
+        -- this lock is never stolen. Competing workers SKIP-LOCK just this
+        -- slice, not the whole frontier, and claim other eligible streams.
+        locked AS (
+          SELECT s2.stream
+          FROM ${this._fqs} s2
+          WHERE s2.stream IN (SELECT stream FROM combined)
+            AND s2.blocked = false
+            AND (s2.leased_by IS NULL OR s2.leased_until <= NOW())
+            AND (s2.deferred_at IS NULL OR s2.deferred_at <= NOW())
+          FOR UPDATE OF s2 SKIP LOCKED
         )
         UPDATE ${this._fqs} s
         SET
@@ -632,6 +653,7 @@ var PostgresStore = class {
           retry = s.retry + 1
         FROM combined c
         WHERE s.stream = c.stream
+          AND s.stream IN (SELECT stream FROM locked)
         RETURNING s.stream, s.source, s.at, s.retry, c.lagging, s.lane
         `,
         params