@rotorsoft/act 1.33.8 → 1.33.9

package/dist/index.js

@@ -1162,8 +1162,14 @@ var CorrelateCycle = class {
   _key;
   /** Local expiry of the held lease (0 = none); stale only costs a duplicate scan. */
   _lease_until = 0;
-  /** Raised by a commit or notification, lowered by a short page. Starts armed. */
-  _armed = true;
+  /**
+   * Armed while `_raised` (bumped by a commit or notification) is ahead of
+   * `_lowered` (the raise count the last short page saw). Starts armed.
+   */
+  _raised = 1;
+  _lowered = 0;
+  /** Counts releases, so a lease reply that lands after one is dropped. */
+  _releases = 0;
   _init_promise;
   // Bounded by `maxSubscribedStreams`; static records live apart so eviction
   // never drops their +Infinity floor.
@@ -1199,7 +1205,7 @@ var CorrelateCycle = class {
   }
   /** A commit (local or remote) may have produced uncorrelated events. */
   arm() {
-    this._armed = true;
+    this._raised++;
   }
   async init() {
     if (this._initialized) return;
@@ -1233,7 +1239,7 @@ var CorrelateCycle = class {
     this._checkpoint = -1;
     this._dynamic_subscriptions.clear();
     this._static_subscriptions.clear();
-    this._armed = true;
+    this._raised++;
   }
   /** Forget dynamic targets whose rows a full close deleted, so they re-subscribe. */
   forget_subscribed(streams) {
@@ -1253,22 +1259,26 @@ var CorrelateCycle = class {
   /** Scan past the checkpoint, subscribe new targets and raise their work marks. */
   async correlate(query = { after: -1, limit: 10 }, lease = false) {
     await this.init();
-    if (!this._armed)
+    if (this._raised === this._lowered)
       return {
         subscribed: 0,
         last_id: this._checkpoint,
         marked: 0,
         scanned: false
       };
+    const raised = this._raised;
     const now = Date.now();
     if (lease && now >= this._lease_until - CORRELATION_LEASE_MS / 2) {
+      const releases = this._releases;
       const { correlating } = await this._cd.subscribe([], void 0, {
         key: this._key,
         by: this._by,
         millis: CORRELATION_LEASE_MS
       });
-      this._lease_until = correlating ? now + CORRELATION_LEASE_MS : 0;
-      if (correlating === false)
+      const released = this._releases !== releases;
+      if (!released)
+        this._lease_until = correlating ? now + CORRELATION_LEASE_MS : 0;
+      if (correlating === false || released)
         return {
           subscribed: 0,
           last_id: this._checkpoint,
@@ -1389,7 +1399,7 @@ var CorrelateCycle = class {
       return { subscribed, last_id, marked, scanned: true };
     }
     this._checkpoint = last_id;
-    this._armed = stopped || found === query.limit;
+    if (!stopped && found !== query.limit) this._lowered = raised;
     return { subscribed: 0, last_id, marked: 0, scanned: true };
   }
   /**
@@ -1435,6 +1445,7 @@ var CorrelateCycle = class {
   async release_correlation() {
     try {
       this._lease_until = 0;
+      this._releases++;
       await this._cd.subscribe([], void 0, {
         key: this._key,
         by: this._by,
@@ -2348,7 +2359,13 @@ var EMPTY_DRAIN = {
 };
 var RETRY = "";
 var DrainController = class {
-  _armed = false;
+  /**
+   * Armed while `_raised` is ahead of `_lowered` (the raise count the last
+   * empty claim saw), so a claim never lowers over a raise that landed
+   * during it.
+   */
+  _raised = 0;
+  _lowered = 0;
   _ratio = 0.5;
   /**
    * Local wake at the earliest parked (backoff or defer) visit, or at the
@@ -2358,7 +2375,7 @@ var DrainController = class {
    * stays until handled or until a later pass claims nothing.
    */
   _defer = new DeferTimer(() => {
-    this._armed = true;
+    this.arm();
     void this._deps.run_scoped(async () => {
       while ((await this.drain()).leased.length > 0) ;
     });
@@ -2374,7 +2391,7 @@ var DrainController = class {
     this._deps = deps;
   }
   arm() {
-    this._armed = true;
+    this._raised++;
   }
   /** Cold start: re-seed a persisted `deferred_at` into the local wake. */
   seed_defer(stream, at) {
@@ -2382,7 +2399,7 @@ var DrainController = class {
     this._defer.schedule();
   }
   get armed() {
-    return this._armed;
+    return this._raised !== this._lowered;
   }
   get inflight() {
     return this._inflight;
@@ -2399,7 +2416,7 @@ var DrainController = class {
     if (this._worker || this._stopped) return;
     const run = this._deps.run_scoped;
     const tick = async () => {
-      if (this._armed) await run(() => this.drain());
+      if (this.armed) await run(() => this.drain());
       if (this._stopped) return;
       this._worker = setTimeout(tick, cycleMs);
       this._worker.unref();
@@ -2416,7 +2433,7 @@ var DrainController = class {
     this._defer.stop();
   }
   async drain(options = {}) {
-    if (!this._armed || this._stopped || this._inflight)
+    if (!this.armed || this._stopped || this._inflight)
       return EMPTY_DRAIN;
     const d = this._deps.defaults ?? {};
     const streamLimit = d.streamLimit ?? options.streamLimit ?? DEFAULT_STREAM_LIMIT;
@@ -2431,6 +2448,7 @@ var DrainController = class {
       const lagging = Math.ceil(streamLimit * this._ratio);
       const leading = streamLimit - lagging;
       const started = Date.now();
+      const raised = this._raised;
       const cycle = await run_drain_cycle(this._deps, {
         lagging,
         leading,
@@ -2442,7 +2460,7 @@ var DrainController = class {
       if (!cycle) {
         this._defer.prune(started);
         this._deps.breaker.passed();
-        this._armed = false;
+        this._lowered = raised;
         return EMPTY_DRAIN;
       }
       const { leased, fetched, handled, acked, blocked, closeable } = cycle;