@rotorsoft/act 1.23.3 → 1.23.5

package/dist/index.js

@@ -20,7 +20,7 @@ import {
   sleep,
   store,
   validate
-} from "./chunk-5YIRFU4Y.js";
+} from "./chunk-DORIRU2I.js";
 import {
   ActorSchema,
   CausationEventSchema,
@@ -2300,7 +2300,7 @@ function trace_cycle(logger, leased, fetched, handled, acked, blocked) {
 }
 
 // src/internal/drain-cycle.ts
-async function run_drain_cycle(ops, registry, batch_handlers, handle, handle_batch, lagging, leading, eventLimit, leaseMillis, is_deferred, lane) {
+async function run_drain_cycle(ops, registry, batch_handlers, handle, handle_batch, lagging, leading, eventLimit, leaseMillis, lane) {
   const leased = await ops.claim(
     lagging,
     leading,
@@ -2309,18 +2309,7 @@ async function run_drain_cycle(ops, registry, batch_handlers, handle, handle_bat
     lane
   );
   if (!leased.length) return void 0;
-  const active = is_deferred ? leased.filter((l) => !is_deferred(l.stream)) : leased;
-  if (!active.length) {
-    return {
-      leased,
-      fetched: [],
-      handled: [],
-      acked: [],
-      blocked: [],
-      closeable: []
-    };
-  }
-  const fetched = await ops.fetch(active, eventLimit);
+  const fetched = await ops.fetch(leased, eventLimit);
   const fetch_map = /* @__PURE__ */ new Map();
   const fetch_window_at = fetched.reduce(
     (max, { at, events }) => Math.max(max, events.at(-1)?.id || at),
@@ -2339,7 +2328,7 @@ async function run_drain_cycle(ops, registry, batch_handlers, handle, handle_bat
     fetch_map.set(stream, { fetch: f, payloads });
   }
   const handled = await Promise.all(
-    active.map((lease) => {
+    leased.map((lease) => {
       const entry = fetch_map.get(lease.stream);
       const at = entry.fetch.events.at(-1)?.id || fetch_window_at;
       const { payloads } = entry;
@@ -2352,7 +2341,7 @@ async function run_drain_cycle(ops, registry, batch_handlers, handle, handle_bat
   );
   const acked = await ops.ack(
     handled.flatMap(
-      (h) => h.defer !== void 0 ? { ...h.lease, due: h.defer } : h.handled > 0 || !h.error ? { ...h.lease, at: h.acked_at } : []
+      (h) => h.defer !== void 0 ? { ...h.lease, due: h.defer, retry: -1 } : h.handled > 0 || !h.error ? { ...h.lease, at: h.acked_at } : h.next_attempt_at !== void 0 ? { ...h.lease, due: h.next_attempt_at } : []
     )
   );
   const blocked = await ops.block(
@@ -2475,7 +2464,6 @@ var DrainController = class {
         leading,
         eventLimit,
         leaseMillis,
-        this._defer.size > 0 ? this._defer.is_deferred : void 0,
         this._deps.lane
       );
       this._deps.breaker.passed();