@rotorsoft/act 1.21.0 → 1.22.1

package/dist/index.js

@@ -538,6 +538,14 @@ function in_autoclose_window(window, now) {
   const hour = hour_in_zone(now, window.timeZone);
   return window.start < window.end ? hour >= window.start && hour < window.end : hour >= window.start || hour < window.end;
 }
+function next_window_open(window, now) {
+  for (let h = 0; h <= 48; h++) {
+    const candidate = new Date(now.getTime() + h * 36e5);
+    if (hour_in_zone(candidate, window.timeZone) === window.start)
+      return candidate;
+  }
+  return new Date(now.getTime() + 864e5);
+}
 
 // src/internal/autoclose-policy.ts
 import { z as z2 } from "zod";
@@ -707,7 +715,7 @@ function synthesize_autoclose_reactions(registry, states, config2) {
         const aggregate = event.stream;
         if (!in_autoclose_window(config2.autocloseWindow, /* @__PURE__ */ new Date()))
           throw new DeferSignal({
-            at: new Date(Date.now() + config2.autocloseCycleMinutes * 6e4)
+            at: next_window_open(config2.autocloseWindow, /* @__PURE__ */ new Date())
           });
         const stats = await store().query_stats([aggregate], {
           count: true,
@@ -2393,10 +2401,15 @@ function build_handle(deps) {
   return async (lease, payloads) => {
     if (payloads.length === 0) return { lease, handled: 0, acked_at: lease.at };
     const stream = lease.stream;
-    let at = payloads.at(0).event.id;
+    const last_index_of = /* @__PURE__ */ new Map();
+    for (let i = 0; i < payloads.length; i++)
+      last_index_of.set(payloads[i].event.id, i);
+    let at = lease.at;
     let handled = 0;
     if (lease.retry > 0)
-      logger.warn(`Retrying ${stream}@${at} (${lease.retry}).`);
+      logger.warn(
+        `Retrying ${stream}@${payloads.at(0).event.id} (${lease.retry}).`
+      );
     const scoped_app = {
       do: bound_do,
       load: bound_load,
@@ -2404,7 +2417,8 @@ function build_handle(deps) {
       query_array: bound_query_array,
       forget: bound_forget
     };
-    for (const payload of payloads) {
+    for (let i = 0; i < payloads.length; i++) {
+      const payload = payloads[i];
       const { event, handler } = payload;
       scoped_app.do = (action2, target, action_payload, options) => bound_do(action2, target, action_payload, {
         ...options,
@@ -2412,8 +2426,10 @@ function build_handle(deps) {
       });
       try {
         await handler(event, stream, scoped_app);
-        at = event.id;
-        handled++;
+        if (last_index_of.get(event.id) === i) {
+          at = event.id;
+          handled++;
+        }
       } catch (error) {
         if (error instanceof DeferSignal)
           return {