@rotorsoft/act 1.31.18 → 1.31.20

package/dist/index.js

@@ -3811,13 +3811,13 @@ var Act = class {
       resolveShutdownConfig(options);
       this._shutdown_promise = (async () => {
         this.stop_correlations();
-        await this._scoped(() => this._correlate.release_correlation());
         const disposer = await this._notify_disposer;
         if (disposer) await disposer();
         this.stop_settling();
         this._breaker.stop();
         for (const c of this._drain_controllers.values()) c.stop();
         await this._await_inflight(options?.graceMs);
+        await this._scoped(() => this._correlate.release_correlation());
         this._emitter.removeAllListeners();
       })();
     }
@@ -3835,9 +3835,14 @@ var Act = class {
    * lane that pinned no lease contributes `drain()`'s own fallback, and the
    * whole thing is capped so a long-leased lane cannot hold a deploy open.
    * Idle lanes do not count — nothing is running on them to wait for.
+   *
+   * An in-flight settle counts the same way, on the same fallback (#1617).
+   * It is waited on like any cycle, and deriving from the lanes alone gave
+   * it a budget of `0` whenever it was the only thing running — which
+   * returned before the wait it was about to be added to.
    */
-  _derive_grace_ms(running) {
-    let max = 0;
+  _derive_grace_ms(running, settling) {
+    let max = settling ? DEFAULT_SHUTDOWN_GRACE_MS : 0;
     for (const c of running)
       max = Math.max(max, c.lease_millis ?? DEFAULT_SHUTDOWN_GRACE_MS);
     return Math.min(max, MAX_SHUTDOWN_GRACE_MS);
@@ -3848,7 +3853,7 @@ var Act = class {
     );
     const settling = this._settle.inflight;
     if (running.length === 0 && !settling) return;
-    const grace = grace_ms ?? this._derive_grace_ms(running);
+    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);