@rotorsoft/act 1.31.17 → 1.31.19

package/dist/index.js

@@ -10,6 +10,7 @@ import {
   TOMBSTONE_EVENT,
   cache,
   config,
+  current_autoclose_window,
   current_reacting,
   dateReviver,
   default_scope,
@@ -25,7 +26,7 @@ import {
   sleep,
   store,
   validate
-} from "./chunk-LTA7FYBC.js";
+} from "./chunk-34WL4DPW.js";
 import {
   ActorSchema,
   CausationEventSchema,
@@ -805,7 +806,7 @@ var DeferSignal = class extends Error {
 
 // src/internal/autoclose-reaction.ts
 var AUTOCLOSE_TARGET_PREFIX = "__autoclose__:";
-function synthesize_autoclose_reactions(registry, states, config2) {
+function synthesize_autoclose_reactions(registry, states, read_window) {
   for (const st of states.values()) {
     const predicate = st.autoclose;
     if (!predicate) continue;
@@ -828,10 +829,9 @@ function synthesize_autoclose_reactions(registry, states, config2) {
       options: { blockOnError: false, maxRetries: 3 },
       handler: async (event) => {
         const aggregate = event.stream;
-        if (!in_autoclose_window(config2.autocloseWindow, /* @__PURE__ */ new Date()))
-          throw new DeferSignal({
-            at: next_window_open(config2.autocloseWindow, /* @__PURE__ */ new Date())
-          });
+        const window = read_window();
+        if (!in_autoclose_window(window, /* @__PURE__ */ new Date()))
+          throw new DeferSignal({ at: next_window_open(window, /* @__PURE__ */ new Date()) });
         const stats = await store().query_stats([aggregate], {
           count: true,
           tail: keep_days !== void 0 ? true : void 0,
@@ -3521,7 +3521,20 @@ var Act = class {
     this._lanes = lanes;
     validate_only_lanes(options, lanes);
     this._ports = options.scoped ?? default_scope();
-    this._scoped = make_run_scoped(this._ports);
+    const ports = this._ports;
+    this._scoped = make_run_scoped({
+      // Delegating getters, NOT a spread: `default_scope()` resolves the
+      // process singletons lazily, so copying its properties would freeze
+      // whichever adapters happened to be installed at construction and
+      // ignore a later `store(...)` / `cache(...)`.
+      get store() {
+        return ports.store;
+      },
+      get cache() {
+        return ports.cache;
+      },
+      autoclose_window: resolveAutocloseConfig(options).autocloseWindow
+    });
     this._correlator = options.correlator ?? default_correlator;
     this._es = build_es(this._logger, this._correlator, patch_fn);
     this._cd = build_drain(this._logger);
@@ -3798,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();
       })();
     }
@@ -3822,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);
@@ -3835,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);
@@ -5313,7 +5331,7 @@ function act() {
         synthesize_autoclose_reactions(
           registry,
           states,
-          resolveAutocloseConfig(options ?? {})
+          current_autoclose_window
         );
         Object.freeze(registry.actions);
         Object.freeze(registry.events);