@reventlessdev/reventless-local 3.0.0-alpha.113 → 3.0.0-alpha.115

package/src/adapter/LocalBus.res

@@ -265,7 +265,19 @@ module Impl = (C: BusConfig): T => {
     let drainLoop = Effect.scoped(
       PubSub.subscribe(hub)->Effect.flatMap(queue =>
         Stream.fromQueue(queue)->Stream.runForEach(msg =>
-          Effect.promise(() => handler(msg.service, msg.meta, msg.json))->Effect.zipRight(msg.done_)
+          // A throwing/rejecting handler must not (a) leave `done_` uncalled —
+          // the publisher's countdown would never reach zero and every publish
+          // on this topic would hang — nor (b) kill this drain fiber, which
+          // would stop consuming while the subscriber stays counted, hanging all
+          // future publishes too. So: convert a rejection into a typed error
+          // (`tryPromise`), log-and-recover (`catchAll`) so the stream keeps
+          // draining, and run `done_` via `ensuring` so the countdown always
+          // advances regardless of outcome.
+          Effect.tryPromise(~catch=e => e, () => handler(msg.service, msg.meta, msg.json))
+          ->Effect.catchAll(err =>
+            Effect.sync(() => Console.error2("[LocalBus] subscriber handler failed:", err))
+          )
+          ->Effect.ensuring(msg.done_)
         )
       ),
     )
@@ -372,7 +384,11 @@ module Impl = (C: BusConfig): T => {
       let pending = queue.contents
       queue.contents = []
       pending->Array.forEach(json => {
-        let _ = handler(json, ())
+        let _ =
+          handler(json, ())->Promise.catch(e => {
+            Console.error2("[LocalBus] parked command handler failed:", e)
+            Promise.resolve()
+          })
       })
     | None => ()
     }
@@ -414,7 +430,11 @@ module Impl = (C: BusConfig): T => {
   // and done_ is called immediately. This prevents a deadlock where publishEvent on the
   // EP topic would block until the downstream aggregate command chain completes.
   let makeFireAndForgetHandler = handler => (_, _, json) => {
-    let _ = handler(json, ())
+    let _ =
+      handler(json, ())->Promise.catch(e => {
+        Console.error2("[LocalBus] fire-and-forget handler failed:", e)
+        Promise.resolve()
+      })
     Promise.resolve()
   }
 

package/src/adapter/LocalBus.res.mjs

@@ -1,12 +1,14 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Effect from "@reventlessdev/rescript-effect/src/Effect.res.mjs";
 import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Queue from "effect/Queue";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
-import * as Effect from "effect/Effect";
+import * as Effect$1 from "effect/Effect";
 import * as PubSub from "effect/PubSub";
 import * as Stream from "effect/Stream";
+import * as Stdlib_Promise from "@rescript/runtime/lib/es6/Stdlib_Promise.js";
 import * as Deferred from "effect/Deferred";
 import * as Primitive_option from "@rescript/runtime/lib/es6/Primitive_option.js";
 
@@ -110,9 +112,9 @@ function Impl(C) {
   };
   let makeHub = () => {
     if (capacity !== undefined) {
-      return Effect.runSync(PubSub.bounded(capacity));
+      return Effect$1.runSync(PubSub.bounded(capacity));
     } else {
-      return Effect.runSync(PubSub.unbounded());
+      return Effect$1.runSync(PubSub.unbounded());
     }
   };
   let subscribeToEvents = (topicName, handler) => {
@@ -127,8 +129,10 @@ function Impl(C) {
     }
     let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
     subscriberCounts.contents[topicName] = n + 1 | 0;
-    let drainLoop = Effect.scoped(Effect.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect.zipRight(Effect.promise(() => handler(msg.service, msg.meta, msg.json)), msg.done_))));
-    Effect.runFork(drainLoop);
+    let drainLoop = Effect$1.scoped(Effect$1.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect$1.ensuring(Effect$1.catchAll(Effect.tryPromise(e => e, () => handler(msg.service, msg.meta, msg.json)), err => Effect$1.sync(() => {
+      console.error("[LocalBus] subscriber handler failed:", err);
+    })), msg.done_))));
+    Effect$1.runFork(drainLoop);
   };
   let subscribeToEventStream = topicName => {
     let h = eventHubs.contents[topicName];
@@ -140,10 +144,10 @@ function Impl(C) {
       eventHubs.contents[topicName] = h$1;
       hub = h$1;
     }
-    return Effect.map(Effect.acquireRelease(Effect.flatMap(Effect.sync(() => {
+    return Effect$1.map(Effect$1.acquireRelease(Effect$1.flatMap(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
       subscriberCounts.contents[topicName] = n + 1 | 0;
-    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect.zipRight(Effect.sync(() => {
+    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect$1.zipRight(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 1);
       subscriberCounts.contents[topicName] = n - 1 | 0;
     }), Queue.shutdown(queue))), queue => Stream.fromQueue(queue));
@@ -161,17 +165,17 @@ function Impl(C) {
     if (n === 0) {
       return;
     }
-    let allDone = Effect.runSync(Deferred.make());
+    let allDone = Effect$1.runSync(Deferred.make());
     let remaining = {
       contents: n
     };
-    let done_ = Effect.flatMap(Effect.sync(() => {
+    let done_ = Effect$1.flatMap(Effect$1.sync(() => {
       remaining.contents = remaining.contents - 1 | 0;
     }), () => {
       if (remaining.contents === 0) {
-        return Effect.map(Deferred.succeed(allDone, undefined), param => {});
+        return Effect$1.map(Deferred.succeed(allDone, undefined), param => {});
       } else {
-        return Effect.succeed();
+        return Effect$1.succeed();
       }
     });
     let msg = {
@@ -180,10 +184,10 @@ function Impl(C) {
       json: json,
       done_: done_
     };
-    let publishAndWait = capacity !== undefined ? Effect.flatMap(PubSub.publish(hub$1, msg), param => Deferred.await(allDone)) : Effect.zipRight(Effect.sync(() => {
-        Effect.runSync(PubSub.publish(hub$1, msg));
+    let publishAndWait = capacity !== undefined ? Effect$1.flatMap(PubSub.publish(hub$1, msg), param => Deferred.await(allDone)) : Effect$1.zipRight(Effect$1.sync(() => {
+        Effect$1.runSync(PubSub.publish(hub$1, msg));
       }), Deferred.await(allDone));
-    await Effect.runPromise(publishAndWait);
+    await Effect$1.runPromise(publishAndWait);
   };
   let dispatchCommand = async (channelName, json) => {
     let handler = commandHandlers.contents[channelName];
@@ -212,7 +216,10 @@ function Impl(C) {
     let pending = queue.contents;
     queue.contents = [];
     pending.forEach(json => {
-      handler(json, undefined);
+      Stdlib_Promise.$$catch(handler(json, undefined), e => {
+        console.error("[LocalBus] parked command handler failed:", e);
+        return Promise.resolve();
+      });
     });
   };
   let registerQueryDb = (name, ops) => {
@@ -252,7 +259,10 @@ function Impl(C) {
     contents: {}
   };
   let makeFireAndForgetHandler = handler => ((param, param$1, json) => {
-    handler(json, undefined);
+    Stdlib_Promise.$$catch(handler(json, undefined), e => {
+      console.error("[LocalBus] fire-and-forget handler failed:", e);
+      return Promise.resolve();
+    });
     return Promise.resolve();
   });
   let registerEventCollectorHandler = (ecName, handler) => {
@@ -273,10 +283,10 @@ function Impl(C) {
     eventCollectorPendingTopics.contents[ecName] = pending;
   };
   let reset = () => {
-    let shutdownAll = Effect.map(Effect.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
+    let shutdownAll = Effect$1.map(Effect$1.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
       concurrency: "unbounded"
     }), param => {});
-    Effect.runSync(shutdownAll);
+    Effect$1.runSync(shutdownAll);
     eventHubs.contents = {};
     subscriberCounts.contents = {};
     commandHandlers.contents = {};
@@ -342,7 +352,7 @@ function Make($star) {
   let dcbEventLogReadRegistry = {
     contents: {}
   };
-  let makeHub = () => Effect.runSync(PubSub.unbounded());
+  let makeHub = () => Effect$1.runSync(PubSub.unbounded());
   let subscribeToEvents = (topicName, handler) => {
     let h = eventHubs.contents[topicName];
     let hub;
@@ -355,8 +365,10 @@ function Make($star) {
     }
     let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
     subscriberCounts.contents[topicName] = n + 1 | 0;
-    let drainLoop = Effect.scoped(Effect.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect.zipRight(Effect.promise(() => handler(msg.service, msg.meta, msg.json)), msg.done_))));
-    Effect.runFork(drainLoop);
+    let drainLoop = Effect$1.scoped(Effect$1.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect$1.ensuring(Effect$1.catchAll(Effect.tryPromise(e => e, () => handler(msg.service, msg.meta, msg.json)), err => Effect$1.sync(() => {
+      console.error("[LocalBus] subscriber handler failed:", err);
+    })), msg.done_))));
+    Effect$1.runFork(drainLoop);
   };
   let subscribeToEventStream = topicName => {
     let h = eventHubs.contents[topicName];
@@ -368,10 +380,10 @@ function Make($star) {
       eventHubs.contents[topicName] = h$1;
       hub = h$1;
     }
-    return Effect.map(Effect.acquireRelease(Effect.flatMap(Effect.sync(() => {
+    return Effect$1.map(Effect$1.acquireRelease(Effect$1.flatMap(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
       subscriberCounts.contents[topicName] = n + 1 | 0;
-    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect.zipRight(Effect.sync(() => {
+    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect$1.zipRight(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 1);
       subscriberCounts.contents[topicName] = n - 1 | 0;
     }), Queue.shutdown(queue))), queue => Stream.fromQueue(queue));
@@ -389,17 +401,17 @@ function Make($star) {
     if (n === 0) {
       return;
     }
-    let allDone = Effect.runSync(Deferred.make());
+    let allDone = Effect$1.runSync(Deferred.make());
     let remaining = {
       contents: n
     };
-    let done_ = Effect.flatMap(Effect.sync(() => {
+    let done_ = Effect$1.flatMap(Effect$1.sync(() => {
       remaining.contents = remaining.contents - 1 | 0;
     }), () => {
       if (remaining.contents === 0) {
-        return Effect.map(Deferred.succeed(allDone, undefined), param => {});
+        return Effect$1.map(Deferred.succeed(allDone, undefined), param => {});
       } else {
-        return Effect.succeed();
+        return Effect$1.succeed();
       }
     });
     let msg = {
@@ -408,10 +420,10 @@ function Make($star) {
       json: json,
       done_: done_
     };
-    let publishAndWait = Effect.zipRight(Effect.sync(() => {
-      Effect.runSync(PubSub.publish(hub$1, msg));
+    let publishAndWait = Effect$1.zipRight(Effect$1.sync(() => {
+      Effect$1.runSync(PubSub.publish(hub$1, msg));
     }), Deferred.await(allDone));
-    await Effect.runPromise(publishAndWait);
+    await Effect$1.runPromise(publishAndWait);
   };
   let dispatchCommand = async (channelName, json) => {
     let handler = commandHandlers.contents[channelName];
@@ -440,7 +452,10 @@ function Make($star) {
     let pending = queue.contents;
     queue.contents = [];
     pending.forEach(json => {
-      handler(json, undefined);
+      Stdlib_Promise.$$catch(handler(json, undefined), e => {
+        console.error("[LocalBus] parked command handler failed:", e);
+        return Promise.resolve();
+      });
     });
   };
   let registerQueryDb = (name, ops) => {
@@ -480,7 +495,10 @@ function Make($star) {
     contents: {}
   };
   let makeFireAndForgetHandler = handler => ((param, param$1, json) => {
-    handler(json, undefined);
+    Stdlib_Promise.$$catch(handler(json, undefined), e => {
+      console.error("[LocalBus] fire-and-forget handler failed:", e);
+      return Promise.resolve();
+    });
     return Promise.resolve();
   });
   let registerEventCollectorHandler = (ecName, handler) => {
@@ -501,10 +519,10 @@ function Make($star) {
     eventCollectorPendingTopics.contents[ecName] = pending;
   };
   let reset = () => {
-    let shutdownAll = Effect.map(Effect.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
+    let shutdownAll = Effect$1.map(Effect$1.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
       concurrency: "unbounded"
     }), param => {});
-    Effect.runSync(shutdownAll);
+    Effect$1.runSync(shutdownAll);
     eventHubs.contents = {};
     subscriberCounts.contents = {};
     commandHandlers.contents = {};
@@ -570,7 +588,7 @@ function MakeSilent($star) {
   let dcbEventLogReadRegistry = {
     contents: {}
   };
-  let makeHub = () => Effect.runSync(PubSub.unbounded());
+  let makeHub = () => Effect$1.runSync(PubSub.unbounded());
   let subscribeToEvents = (topicName, handler) => {
     let h = eventHubs.contents[topicName];
     let hub;
@@ -583,8 +601,10 @@ function MakeSilent($star) {
     }
     let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
     subscriberCounts.contents[topicName] = n + 1 | 0;
-    let drainLoop = Effect.scoped(Effect.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect.zipRight(Effect.promise(() => handler(msg.service, msg.meta, msg.json)), msg.done_))));
-    Effect.runFork(drainLoop);
+    let drainLoop = Effect$1.scoped(Effect$1.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect$1.ensuring(Effect$1.catchAll(Effect.tryPromise(e => e, () => handler(msg.service, msg.meta, msg.json)), err => Effect$1.sync(() => {
+      console.error("[LocalBus] subscriber handler failed:", err);
+    })), msg.done_))));
+    Effect$1.runFork(drainLoop);
   };
   let subscribeToEventStream = topicName => {
     let h = eventHubs.contents[topicName];
@@ -596,10 +616,10 @@ function MakeSilent($star) {
       eventHubs.contents[topicName] = h$1;
       hub = h$1;
     }
-    return Effect.map(Effect.acquireRelease(Effect.flatMap(Effect.sync(() => {
+    return Effect$1.map(Effect$1.acquireRelease(Effect$1.flatMap(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
       subscriberCounts.contents[topicName] = n + 1 | 0;
-    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect.zipRight(Effect.sync(() => {
+    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect$1.zipRight(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 1);
       subscriberCounts.contents[topicName] = n - 1 | 0;
     }), Queue.shutdown(queue))), queue => Stream.fromQueue(queue));
@@ -617,17 +637,17 @@ function MakeSilent($star) {
     if (n === 0) {
       return;
     }
-    let allDone = Effect.runSync(Deferred.make());
+    let allDone = Effect$1.runSync(Deferred.make());
     let remaining = {
       contents: n
     };
-    let done_ = Effect.flatMap(Effect.sync(() => {
+    let done_ = Effect$1.flatMap(Effect$1.sync(() => {
       remaining.contents = remaining.contents - 1 | 0;
     }), () => {
       if (remaining.contents === 0) {
-        return Effect.map(Deferred.succeed(allDone, undefined), param => {});
+        return Effect$1.map(Deferred.succeed(allDone, undefined), param => {});
       } else {
-        return Effect.succeed();
+        return Effect$1.succeed();
       }
     });
     let msg = {
@@ -636,10 +656,10 @@ function MakeSilent($star) {
       json: json,
       done_: done_
     };
-    let publishAndWait = Effect.zipRight(Effect.sync(() => {
-      Effect.runSync(PubSub.publish(hub$1, msg));
+    let publishAndWait = Effect$1.zipRight(Effect$1.sync(() => {
+      Effect$1.runSync(PubSub.publish(hub$1, msg));
     }), Deferred.await(allDone));
-    await Effect.runPromise(publishAndWait);
+    await Effect$1.runPromise(publishAndWait);
   };
   let dispatchCommand = async (channelName, json) => {
     let handler = commandHandlers.contents[channelName];
@@ -668,7 +688,10 @@ function MakeSilent($star) {
     let pending = queue.contents;
     queue.contents = [];
     pending.forEach(json => {
-      handler(json, undefined);
+      Stdlib_Promise.$$catch(handler(json, undefined), e => {
+        console.error("[LocalBus] parked command handler failed:", e);
+        return Promise.resolve();
+      });
     });
   };
   let registerQueryDb = (name, ops) => {
@@ -708,7 +731,10 @@ function MakeSilent($star) {
     contents: {}
   };
   let makeFireAndForgetHandler = handler => ((param, param$1, json) => {
-    handler(json, undefined);
+    Stdlib_Promise.$$catch(handler(json, undefined), e => {
+      console.error("[LocalBus] fire-and-forget handler failed:", e);
+      return Promise.resolve();
+    });
     return Promise.resolve();
   });
   let registerEventCollectorHandler = (ecName, handler) => {
@@ -729,10 +755,10 @@ function MakeSilent($star) {
     eventCollectorPendingTopics.contents[ecName] = pending;
   };
   let reset = () => {
-    let shutdownAll = Effect.map(Effect.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
+    let shutdownAll = Effect$1.map(Effect$1.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
       concurrency: "unbounded"
     }), param => {});
-    Effect.runSync(shutdownAll);
+    Effect$1.runSync(shutdownAll);
     eventHubs.contents = {};
     subscriberCounts.contents = {};
     commandHandlers.contents = {};
@@ -799,7 +825,7 @@ function MakeBounded(C) {
   let dcbEventLogReadRegistry = {
     contents: {}
   };
-  let makeHub = () => Effect.runSync(PubSub.bounded(capacity));
+  let makeHub = () => Effect$1.runSync(PubSub.bounded(capacity));
   let subscribeToEvents = (topicName, handler) => {
     let h = eventHubs.contents[topicName];
     let hub;
@@ -812,8 +838,10 @@ function MakeBounded(C) {
     }
     let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
     subscriberCounts.contents[topicName] = n + 1 | 0;
-    let drainLoop = Effect.scoped(Effect.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect.zipRight(Effect.promise(() => handler(msg.service, msg.meta, msg.json)), msg.done_))));
-    Effect.runFork(drainLoop);
+    let drainLoop = Effect$1.scoped(Effect$1.flatMap(PubSub.subscribe(hub), queue => Stream.runForEach(Stream.fromQueue(queue), msg => Effect$1.ensuring(Effect$1.catchAll(Effect.tryPromise(e => e, () => handler(msg.service, msg.meta, msg.json)), err => Effect$1.sync(() => {
+      console.error("[LocalBus] subscriber handler failed:", err);
+    })), msg.done_))));
+    Effect$1.runFork(drainLoop);
   };
   let subscribeToEventStream = topicName => {
     let h = eventHubs.contents[topicName];
@@ -825,10 +853,10 @@ function MakeBounded(C) {
       eventHubs.contents[topicName] = h$1;
       hub = h$1;
     }
-    return Effect.map(Effect.acquireRelease(Effect.flatMap(Effect.sync(() => {
+    return Effect$1.map(Effect$1.acquireRelease(Effect$1.flatMap(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 0);
       subscriberCounts.contents[topicName] = n + 1 | 0;
-    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect.zipRight(Effect.sync(() => {
+    }), () => PubSub.subscribe(hub)), (queue, _exit) => Effect$1.zipRight(Effect$1.sync(() => {
       let n = Stdlib_Option.getOr(subscriberCounts.contents[topicName], 1);
       subscriberCounts.contents[topicName] = n - 1 | 0;
     }), Queue.shutdown(queue))), queue => Stream.fromQueue(queue));
@@ -845,17 +873,17 @@ function MakeBounded(C) {
     if (n === 0) {
       return;
     }
-    let allDone = Effect.runSync(Deferred.make());
+    let allDone = Effect$1.runSync(Deferred.make());
     let remaining = {
       contents: n
     };
-    let done_ = Effect.flatMap(Effect.sync(() => {
+    let done_ = Effect$1.flatMap(Effect$1.sync(() => {
       remaining.contents = remaining.contents - 1 | 0;
     }), () => {
       if (remaining.contents === 0) {
-        return Effect.map(Deferred.succeed(allDone, undefined), param => {});
+        return Effect$1.map(Deferred.succeed(allDone, undefined), param => {});
       } else {
-        return Effect.succeed();
+        return Effect$1.succeed();
       }
     });
     let msg = {
@@ -864,8 +892,8 @@ function MakeBounded(C) {
       json: json,
       done_: done_
     };
-    let publishAndWait = Effect.flatMap(PubSub.publish(Primitive_option.valFromOption(hub), msg), param => Deferred.await(allDone));
-    await Effect.runPromise(publishAndWait);
+    let publishAndWait = Effect$1.flatMap(PubSub.publish(Primitive_option.valFromOption(hub), msg), param => Deferred.await(allDone));
+    await Effect$1.runPromise(publishAndWait);
   };
   let dispatchCommand = async (channelName, json) => {
     let handler = commandHandlers.contents[channelName];
@@ -894,7 +922,10 @@ function MakeBounded(C) {
     let pending = queue.contents;
     queue.contents = [];
     pending.forEach(json => {
-      handler(json, undefined);
+      Stdlib_Promise.$$catch(handler(json, undefined), e => {
+        console.error("[LocalBus] parked command handler failed:", e);
+        return Promise.resolve();
+      });
     });
   };
   let registerQueryDb = (name, ops) => {
@@ -934,7 +965,10 @@ function MakeBounded(C) {
     contents: {}
   };
   let makeFireAndForgetHandler = handler => ((param, param$1, json) => {
-    handler(json, undefined);
+    Stdlib_Promise.$$catch(handler(json, undefined), e => {
+      console.error("[LocalBus] fire-and-forget handler failed:", e);
+      return Promise.resolve();
+    });
     return Promise.resolve();
   });
   let registerEventCollectorHandler = (ecName, handler) => {
@@ -955,10 +989,10 @@ function MakeBounded(C) {
     eventCollectorPendingTopics.contents[ecName] = pending;
   };
   let reset = () => {
-    let shutdownAll = Effect.map(Effect.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
+    let shutdownAll = Effect$1.map(Effect$1.all(Object.values(eventHubs.contents).map(hub => PubSub.shutdown(hub)), {
       concurrency: "unbounded"
     }), param => {});
-    Effect.runSync(shutdownAll);
+    Effect$1.runSync(shutdownAll);
     eventHubs.contents = {};
     subscriberCounts.contents = {};
     commandHandlers.contents = {};
@@ -1008,4 +1042,4 @@ export {
   MakeSilent,
   MakeBounded,
 }
-/* effect/Queue Not a pure module */
+/* Effect Not a pure module */

package/src/adapter/QueryDb/QueryDbStorage_InMemory.res

@@ -87,6 +87,60 @@ module Make = (Bus: LocalBus.T) => {
       allItems.contents = flattenStore(store.contents)
     }
 
+    // TTL parity with the SQLite backend (which filters on `expires_at`). We
+    // record an absolute expiry (epoch seconds, the same value SQLite stores) per
+    // (partition, sub-key) and drop expired entries lazily on read — a session
+    // without reads never spends cycles expiring, matching SQLite's read-time
+    // `notExpiredClause`. Previously `~ttl` was ignored entirely in memory.
+    let expiries: ref<dict<dict<float>>> = ref(Dict.make())
+    let nowSecs = () => Date.now() /. 1000.0
+    let recordExpiry = (id: string, subKey: string, ttl: option<int>) =>
+      switch ttl {
+      | Some(t) =>
+        let subExp = switch expiries.contents->Dict.get(id) {
+        | Some(m) => m
+        | None =>
+          let m = Dict.make()
+          expiries.contents->Dict.set(id, m)
+          m
+        }
+        subExp->Dict.set(subKey, Int.toFloat(t))
+      | None =>
+        switch expiries.contents->Dict.get(id) {
+        | Some(m) => m->Dict.delete(subKey)
+        | None => ()
+        }
+      }
+    let purgeExpired = () => {
+      let now = nowSecs()
+      let removedAny = ref(false)
+      expiries.contents
+      ->Dict.toArray
+      ->Array.forEach(((id, subExp)) =>
+        subExp
+        ->Dict.toArray
+        ->Array.forEach(((subKey, exp)) =>
+          if exp <= now {
+            switch store.contents->Dict.get(id) {
+            | Some(sm) =>
+              if sm->Dict.get(subKey)->Option.isSome {
+                sm->Dict.delete(subKey)
+                removedAny := true
+              }
+              if sm->Dict.keysToArray->Array.length == 0 {
+                store.contents->Dict.delete(id)
+              }
+            | None => ()
+            }
+            subExp->Dict.delete(subKey)
+          }
+        )
+      )
+      if removedAny.contents {
+        syncAll()
+      }
+    }
+
     let getOrCreateSubMap = (partitionKey: string): dict<JSON.t> =>
       switch store.contents->Dict.get(partitionKey) {
       | Some(m) => m
@@ -96,11 +150,15 @@ module Make = (Bus: LocalBus.T) => {
         m
       }
 
-    let load: QueryDb.load<string, JSON.t> = async id =>
+    let load: QueryDb.load<string, JSON.t> = async id => {
+      purgeExpired()
       Ok(sortedItems(store.contents, id))
+    }
 
-    let loadStream: QueryDb.loadStream<string, JSON.t> = id =>
+    let loadStream: QueryDb.loadStream<string, JSON.t> = id => {
+      purgeExpired()
       sortedItems(store.contents, id)->Stream.fromIterable
+    }
 
     // Entity key matches the AWS StateTopic Lambda output (Phase 1):
     // single-key tables → partition value; composite tables → `pk-sk`.
@@ -129,20 +187,22 @@ module Make = (Bus: LocalBus.T) => {
       Bus.publishStateChange(~name, ~descriptor)
     }
 
-    let save: QueryDb.save<string, JSON.t> = async (id, state, _saveMode, _ttl) => {
+    let save: QueryDb.save<string, JSON.t> = async (id, state, _saveMode, ttl) => {
       let subKey = getSubKey(state, subIdField)
       let subMap = getOrCreateSubMap(id)
       subMap->Dict.set(subKey, state)
+      recordExpiry(id, subKey, ttl)
       syncAll()
       publishUpdated(id, state)
       Ok()
     }
 
     let saveBatch: QueryDb.saveBatch<string, JSON.t> = async batch => {
-      batch->Array.forEach(((id, state, _ttl)) => {
+      batch->Array.forEach(((id, state, ttl)) => {
         let subKey = getSubKey(state, subIdField)
         let subMap = getOrCreateSubMap(id)
         subMap->Dict.set(subKey, state)
+        recordExpiry(id, subKey, ttl)
       })
       syncAll()
       // Notify subscribers for each saved item
@@ -150,7 +210,33 @@ module Make = (Bus: LocalBus.T) => {
       Ok()
     }
 
-    let count: QueryDb.count<string> = async (_id, _fieldName, inc) => Ok(inc)
+    // Atomic-ish counter, mirroring DynamoDB's `ADD #fieldName :inc` on key {id}:
+    // read the field on the partition-key item (counters are single-state, so the
+    // implicit sub-key ""), add `inc`, persist, and return the NEW total. The
+    // previous `Ok(inc)` echoed the increment and never touched the store, so the
+    // running total was wrong and `loadStream` never reflected the counter.
+    let count: QueryDb.count<string> = async (id, fieldName, inc) => {
+      let subMap = getOrCreateSubMap(id)
+      let existing = subMap->Dict.get("")->Option.flatMap(JSON.Decode.object)
+      let current =
+        existing
+        ->Option.flatMap(o => o->Dict.get(fieldName))
+        ->Option.flatMap(JSON.Decode.float)
+        ->Option.mapOr(0, Float.toInt)
+      let next = current + inc
+      let obj = Dict.make()
+      switch existing {
+      | Some(o) => o->Dict.toArray->Array.forEach(((k, v)) => obj->Dict.set(k, v))
+      | None => ()
+      }
+      obj->Dict.set("id", JSON.Encode.string(id))
+      obj->Dict.set(fieldName, JSON.Encode.int(next))
+      let newItem = JSON.Encode.object(obj)
+      subMap->Dict.set("", newItem)
+      syncAll()
+      publishUpdated(id, newItem)
+      Ok(next)
+    }
 
     let delete: QueryDb.delete<string> = async (id, subIdOpt) => {
       switch subIdOpt {
@@ -215,8 +301,14 @@ module Make = (Bus: LocalBus.T) => {
     }
 
     Bus.registerQueryDb(name, ops)
-    Bus.registerQueryDbScan(name, () => allItems.contents)
-    Bus.registerQueryDbStream(name, () => allItems.contents->Stream.fromIterable)
+    Bus.registerQueryDbScan(name, () => {
+      purgeExpired()
+      allItems.contents
+    })
+    Bus.registerQueryDbStream(name, () => {
+      purgeExpired()
+      allItems.contents->Stream.fromIterable
+    })
 
     {
       resources: [],