@rotorsoft/act 1.33.2 → 1.33.4

package/dist/index.js

@@ -1370,13 +1370,14 @@ var CorrelateCycle = class {
         });
     }
     if (streams.length) {
+      const held = lease && this._lease_until > 0;
       const renewed_at = Date.now();
       const { subscribed, correlating } = await this._cd.subscribe(
         streams,
         last_id,
-        lease ? { key: this._key, by: this._by, millis: CORRELATION_LEASE_MS } : void 0
+        held ? { key: this._key, by: this._by, millis: CORRELATION_LEASE_MS } : void 0
       );
-      if (lease && correlating !== false)
+      if (held && correlating !== false)
         this._lease_until = renewed_at + CORRELATION_LEASE_MS;
       const marked = streams.filter(
         (entry) => entry.correlated_at !== void 0
@@ -2365,7 +2366,7 @@ var DrainController = class {
   _defer = new DeferTimer(() => {
     this._armed = true;
     void this._deps.run_scoped(async () => {
-      while (!this._stopped && (await this.drain()).leased.length > 0) ;
+      while ((await this.drain()).leased.length > 0) ;
     });
   });
   _worker;
@@ -2421,7 +2422,7 @@ var DrainController = class {
     this._defer.stop();
   }
   async drain(options = {}) {
-    if (!this._armed) return EMPTY_DRAIN;
+    if (!this._armed || this._stopped) return EMPTY_DRAIN;
     if (this._locked) return EMPTY_DRAIN;
     const d = this._deps.defaults ?? {};
     const streamLimit = d.streamLimit ?? options.streamLimit ?? DEFAULT_STREAM_LIMIT;
@@ -2785,10 +2786,9 @@ function build_handle_batch(logger) {
 // src/internal/settle.ts
 var SettleLoop = class {
   _timer = void 0;
-  _running = false;
   /**
-   * Resolves when the cycle in flight finishes, so shutdown can wait for
-   * it (`stop()` cancels scheduling only). Never rejects.
+   * The cycle in flight, set while one runs. Shutdown waits for it
+   * (`stop()` cancels scheduling only). Never rejects.
    */
   _inflight;
   /** A wake-up arrived while a cycle ran: run one more pass after it. */
@@ -2820,7 +2820,7 @@ var SettleLoop = class {
   schedule(options) {
     if (this._stopped) return;
     if (options) this._next = options;
-    if (this._running) {
+    if (this._inflight) {
       this._pending = true;
       return;
     }
@@ -2840,12 +2840,7 @@ var SettleLoop = class {
         ...drain_options
       } = this._next ?? {};
       this._next = void 0;
-      this._running = true;
-      let settle_done;
-      this._inflight = new Promise((done) => {
-        settle_done = done;
-      });
-      (async () => {
+      this._inflight = (async () => {
         await this._deps.init();
         let settled_drain;
         for (let i = 0; i < maxPasses && !this._stopped; i++) {
@@ -2869,9 +2864,7 @@ var SettleLoop = class {
       })().catch((err) => {
         this._deps.breaker.failed(Date.now(), err);
       }).finally(() => {
-        this._running = false;
         this._inflight = void 0;
-        settle_done();
         if (this._pending) {
           this._pending = false;
           this.schedule(this._next);
@@ -3178,7 +3171,9 @@ var Act = class {
           { ...q, limit: q.limit ?? this._poll_limit ?? 100 },
           true
         ),
-        drain: (o) => this.drain(o),
+        // `settle()` validated the options, and `_schedule` skips writer-only
+        // instances, so the loop drains through the internal path.
+        drain: (o) => this._scoped(() => this._drain_all(o)),
         on_settled: (drain) => this.emit("settled", drain),
         breaker: this._breaker
       },
@@ -3204,11 +3199,11 @@ var Act = class {
       resolveShutdownConfig(options);
       this._shutdown_promise = (async () => {
         this.stop_correlations();
-        const disposer = await this._notify_disposer;
-        if (disposer) await disposer();
         this._settle.stop(true);
         this._breaker.stop();
         for (const c of this._drain_controllers.values()) c.stop();
+        const disposer = await this._notify_disposer;
+        if (disposer) await disposer();
         await this._await_inflight(options?.graceMs);
         await this._scoped(() => this._correlate.release_correlation());
         this._emitter.removeAllListeners();
@@ -3256,12 +3251,7 @@ var Act = class {
       return await s.notify((notification) => {
         try {
           this.emit("notified", notification);
-          if (this._drain) {
-            const armed = this._arm_for_event_names(
-              notification.events.map((e) => e.name)
-            );
-            this._settle_armed(armed);
-          }
+          this._wake(notification.events.map((e) => e.name));
         } catch (err) {
           this._logger.error(err, "notified handler threw");
         }
@@ -3319,10 +3309,7 @@ var Act = class {
         payload,
         do_options
       );
-      const armed = this._arm_for_event_names(
-        snapshots.map((s) => s.event.name)
-      );
-      this._settle_armed(armed);
+      this._wake(snapshots.map((s) => s.event.name));
       this.emit("committed", snapshots);
       return snapshots;
     });
@@ -3469,17 +3456,21 @@ var Act = class {
       return { fetched: [], leased: [], acked: [], blocked: [] };
     return this._scoped(() => this._drain_all(options));
   }
+  /** Arms correlate and every lane; false on an app with no reactions. */
   _arm_all() {
-    if (!this._reactive) return;
+    if (!this._reactive) return false;
     this._correlate.arm();
     for (const c of this._drain_controllers.values()) c.arm();
+    return true;
   }
   /**
-   * Settles what a change armed (a commit, a reset, an unblock, a restore,
-   * a notification from another process), unless the app walks the
-   * pipeline itself (`autoSettle: false`).
+   * Wakes what a change freed (a commit, a reset, an unblock, a restore,
+   * a notification from another process): arms the lanes these events
+   * react on, or every lane without names, and settles them unless the app
+   * walks the pipeline itself (`autoSettle: false`).
    */
-  _settle_armed(armed) {
+  _wake(names) {
+    const armed = names ? this._arm_for_event_names(names) : this._arm_all();
     if (armed && this._auto_settle) this._schedule();
   }
   /** Schedules a settle pass; writer-only instances (`drain: false`) skip it. */
@@ -3647,8 +3638,7 @@ var Act = class {
       for (const handler of this._batch_handlers.values())
         handler[FOLD_RESET]?.();
       if (count > 0) {
-        this._arm_all();
-        this._settle_armed(this._reactive);
+        this._wake();
       }
       return count;
     });
@@ -3682,8 +3672,7 @@ var Act = class {
     return this._scoped(async () => {
       const count = await store().unblock(input);
       if (count > 0) {
-        this._arm_all();
-        this._settle_armed(this._reactive);
+        this._wake();
       }
       return count;
     });
@@ -3745,8 +3734,7 @@ var Act = class {
       });
       if (!sink) {
         this._correlate.restart();
-        this._arm_all();
-        this._settle_armed(this._reactive);
+        this._wake();
       }
       return { kept, migrated, dropped, duration_ms: Date.now() - started };
     });