@rotorsoft/act 1.33.13 → 1.33.14

package/dist/index.js

@@ -1259,11 +1259,8 @@ var CorrelateCycle = class {
     await this._init();
     const epoch = this._epoch;
     const idle = () => ({
-      subscribed: 0,
-      last_id: this._checkpoint,
-      read: false,
-      marked: 0,
-      scanned: false
+      kind: "idle",
+      last_id: this._checkpoint
     });
     if (this._raised === this._lowered) return idle();
     const raised = this._raised;
@@ -1389,11 +1386,11 @@ var CorrelateCycle = class {
             lane
           });
       }
-      return { subscribed, last_id, read, marked, scanned: true };
+      return { kind: "scanned", last_id, subscribed, marked, read };
     }
     this._checkpoint = last_id;
     if (!stopped && found !== query.limit) this._lowered = raised;
-    return { subscribed: 0, last_id, read, marked: 0, scanned: true };
+    return { kind: "scanned", last_id, subscribed: 0, marked: 0, read };
   }
   /**
    * Read the row of each target this scan had no record of (new or evicted),
@@ -2868,11 +2865,12 @@ var SettleLoop = class {
       this._inflight = (async () => {
         const passes = [];
         for (let i = 0; i < maxPasses && !this._stopped; i++) {
-          const { subscribed, read, scanned } = await this._deps.correlate(correlate_query);
+          const pass = await this._deps.correlate(correlate_query);
+          const scanned = pass.kind === "scanned";
           if (scanned) this._deps.breaker.passed();
           const drain = await this._deps.drain(drain_options);
           passes.push(drain);
-          const made_progress = subscribed > 0 || drain.leased.length > 0 || read;
+          const made_progress = drain.leased.length > 0 || scanned && (pass.subscribed > 0 || pass.read);
           if (!made_progress) break;
         }
         if (passes.length) this._deps.on_settled(merge_drains(passes));
@@ -3180,7 +3178,7 @@ var Act = class {
   _build_settle(options) {
     return new SettleLoop(
       {
-        correlate: (q) => this._correlate_scanned(
+        correlate: (q) => this._correlate_pass(
           { ...q, limit: q.limit ?? this._poll_limit ?? 100 },
           true
         ),
@@ -3243,15 +3241,16 @@ var Act = class {
     if (running.length === 0 && !settling) return;
     const grace = grace_ms ?? this._derive_grace_ms(running, !!settling);
     if (grace <= 0) return;
-    const inflight = running.map((c) => c.inflight);
-    if (settling) inflight.push(settling);
     let timer;
     const budget = new Promise((resolve) => {
       timer = setTimeout(resolve, grace);
       timer.unref();
     });
     try {
-      await Promise.race([Promise.all(inflight), budget]);
+      await Promise.race([
+        Promise.all([...running.map((c) => c.inflight), settling]),
+        budget
+      ]);
     } finally {
       clearTimeout(timer);
     }
@@ -3542,17 +3541,20 @@ var Act = class {
    * @see {@link start_correlations} for automatic periodic correlation
    */
   async correlate(query = { after: -1, limit: 10 }) {
-    const { subscribed, last_id } = await this._correlate_scanned(query);
-    return { subscribed, last_id };
+    const pass = await this._correlate_pass(query);
+    return {
+      subscribed: pass.kind === "scanned" ? pass.subscribed : 0,
+      last_id: pass.last_id
+    };
   }
-  /** `correlate` plus `scanned`, which settle needs for the breaker. */
-  async _correlate_scanned(query, lease = false) {
-    if (!this._drain)
-      return { subscribed: 0, last_id: -1, read: false, scanned: false };
+  /** One correlate pass; arms every lane when it found work. */
+  async _correlate_pass(query, lease = false) {
+    if (!this._drain) return { kind: "idle", last_id: -1 };
     return this._scoped(async () => {
-      const { subscribed, last_id, read, marked, scanned } = await this._correlate.correlate(query, lease);
-      if (subscribed > 0 || marked > 0) this._arm_all();
-      return { subscribed, last_id, read, scanned };
+      const pass = await this._correlate.correlate(query, lease);
+      if (pass.kind === "scanned" && (pass.subscribed > 0 || pass.marked > 0))
+        this._arm_all();
+      return pass;
     });
   }
   /**