@rotorsoft/act 1.32.18 → 1.32.19

package/dist/index.js

@@ -859,6 +859,10 @@ var BackoffOptionsSchema = z2.object({
   maxMs: z2.number().gt(0).optional(),
   jitter: z2.boolean().optional()
 });
+var DEFAULT_BACKOFF = {
+  strategy: "fixed",
+  baseMs: 1e4
+};
 var DEFAULT_MAX_RETRIES = 3;
 var DEFAULT_BLOCK_ON_ERROR = true;
 var ReactionOptionsSchema = z2.object({
@@ -2063,9 +2067,8 @@ var DeferTimer = class {
   _on_wake;
   /**
    * @param on_wake - invoked once each time the earliest due-time elapses,
-   *   after the come-due entries have been removed. Consumers use it to
-   *   re-arm their loop (the drain sets its `armed` flag; autoclose runs a
-   *   tick).
+   *   after the come-due entries have been removed. The consumer re-schedules
+   *   for whatever is still parked.
    */
   constructor(on_wake) {
     this._on_wake = on_wake;
@@ -2118,14 +2121,9 @@ var DeferTimer = class {
     this._timer = setTimeout(() => {
       this._timer = void 0;
       const now = Date.now();
-      let came_due = false;
       for (const [stream, at] of this._due)
-        if (at <= now) {
-          this._due.delete(stream);
-          came_due = true;
-        }
+        if (at <= now) this._due.delete(stream);
       this._on_wake();
-      if (!came_due && this._due.size > 0) this.schedule();
     }, delay);
     this._timer.unref();
   }
@@ -2842,7 +2840,7 @@ async function run_drain_cycle(deps, cycle) {
           handled: 0,
           acked_at: lease.at,
           error,
-          ...block2 ? { block: true } : {}
+          ...block2 ? { block: true } : { next_attempt_at: Date.now() + DEFAULT_BACKOFF.baseMs }
         };
         return Promise.resolve(failed);
       }
@@ -2890,11 +2888,15 @@ var DrainController = class {
   _ratio = 0.5;
   /**
    * Local wake for streams this worker parked (backoff or defer). The
-   * schedule itself is persisted in the store; this only re-arms the drain
-   * at the earliest pending visit.
+   * schedule itself is persisted in the store; this runs the drain at the
+   * earliest pending visit. A parked stream already carries its mark, so
+   * the drain alone finds it, and on an idle app nothing else would.
+   * `stop()` cancels the timer and a stopped drain never re-schedules it,
+   * so a wake never runs after a stop.
    */
   _defer = new DeferTimer(() => {
     this._armed = true;
+    void this._deps.run_scoped(() => this.drain());
   });
   /** Worker timer. Set when `start()` is active, undefined otherwise. */
   _worker;
@@ -2982,13 +2984,13 @@ var DrainController = class {
   async drain(options = {}) {
     if (!this._armed) return EMPTY_DRAIN;
     if (this._locked) return EMPTY_DRAIN;
-    if (this._deps.breaker.state(Date.now()) === "open")
-      return EMPTY_DRAIN;
     const d = this._deps.defaults ?? {};
     const streamLimit = d.streamLimit ?? options.streamLimit ?? DEFAULT_STREAM_LIMIT;
     const eventLimit = d.eventLimit ?? options.eventLimit ?? DEFAULT_EVENT_LIMIT;
     const leaseMillis = d.leaseMillis ?? options.leaseMillis ?? DEFAULT_LEASE_MILLIS;
     try {
+      if (this._deps.breaker.state(Date.now()) === "open")
+        return EMPTY_DRAIN;
       this._locked = true;
       this._inflight = new Promise((done) => {
         this._inflight_done = done;
@@ -3006,7 +3008,6 @@ var DrainController = class {
       if (!cycle) {
         this._deps.breaker.passed();
         this._armed = false;
-        if (this._defer.size > 0) this._defer.schedule();
         return EMPTY_DRAIN;
       }
       const { leased, fetched, handled, acked, blocked, closeable } = cycle;
@@ -3015,11 +3016,9 @@ var DrainController = class {
       for (const lease of acked) this._defer.delete(lease.stream);
       for (const lease of blocked) this._defer.delete(lease.stream);
       for (const h of handled) {
-        const retry_at = h.error && !h.block ? h.next_attempt_at ?? Date.now() + leaseMillis : void 0;
-        const next = h.defer ?? retry_at;
+        const next = h.defer ?? h.next_attempt_at;
         if (next !== void 0) this._defer.set(h.lease.stream, next);
       }
-      if (this._defer.size > 0) this._defer.schedule();
       if (acked.length) this._deps.on_acked(acked);
       if (closeable.length) await this._deps.on_close(closeable);
       this._deps.breaker.passed();
@@ -3030,6 +3029,7 @@ var DrainController = class {
       this._deps.breaker.failed(Date.now(), error);
       return EMPTY_DRAIN;
     } finally {
+      if (!this._stopped) this._defer.schedule();
       this._locked = false;
       this._inflight = void 0;
       this._inflight_done?.();
@@ -3235,7 +3235,7 @@ function finalize(lease, handled, at, error, options, logger, failed_at) {
     logger.error(
       non_retryable ? `Blocking ${lease.stream} on non-retryable error.` : `Blocking ${lease.stream} after ${lease.retry} retries.`
     );
-  const next_attempt_at = !block2 && options.backoff ? Date.now() + compute_backoff_delay(lease.retry, options.backoff) : void 0;
+  const next_attempt_at = block2 ? void 0 : Date.now() + compute_backoff_delay(lease.retry, options.backoff ?? DEFAULT_BACKOFF);
   return {
     lease,
     handled,