@rotorsoft/act 1.33.3 → 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;
@@ -3198,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();