@effect-app/infra 0.109.6 → 0.111.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @effect-app/infra
 
+## 0.111.0
+
+### Minor Changes
+
+- bogus
+
+### Patch Changes
+
+- Updated dependencies
+  - @effect-app/infra-adapters@0.69.0
+  - @effect-app/prelude@0.86.0
+
+## 0.110.0
+
+### Minor Changes
+
+- 9309a1f: queue maker has drain constructor instead of drain function
+
+### Patch Changes
+
+- Updated dependencies [4627526]
+  - @effect-app/prelude@0.85.5
+  - @effect-app/infra-adapters@0.68.6
+
 ## 0.109.6
 
 ### Patch Changes

package/_cjs/services/QueueMaker/memQueue.cjs

@@ -26,7 +26,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 /**
  * @tsplus static QueueMaker.Ops makeMem
  */
-function makeMemQueue(queueName, queueDrainName, schema, drainSchema, makeHandleEvent) {
+function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
   return tsplus_module_3.gen(function* ($) {
     const mem = yield* $(_memQueue.MemQueue);
     const q = yield* $(mem.getOrCreateQueue(queueName));
@@ -58,8 +58,7 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema, makeHandle
         // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
         , _ => q.offer(_))))));
       }),
-      drain: tsplus_module_3.gen(function* ($) {
-        const handleEvent = yield* $(makeHandleEvent);
+      makeDrain: handleEvent => tsplus_module_3.gen(function* ($) {
         const silenceAndReportError = (0, _errors2.reportNonInterruptedFailure)({
           name: "MemQueue.drain." + queueDrainName
         });

package/_cjs/services/QueueMaker/memQueue.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeMemQueue","queueName","queueDrainName","schema","drainSchema","makeHandleEvent","tsplus_module_3","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","tsplus_module_1","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_2","parseCondemnDie","publish","messages","requestContext","currentSpan","span","tsplus_module_5","getOrUndefined","tsplus_module_4","map","Tracer","externalSpan","tsplus_module_7","forkDaemonReportQueue","tsplus_module_6","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","encodeSync","_","offer","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","orDie","parse","withSpan","tsplus_module_9","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_8","RecordPretty","object$","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","attributes","parent","undefined","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_10","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeMemQueue","queueName","queueDrainName","schema","drainSchema","tsplus_module_3","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","tsplus_module_1","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_2","parseCondemnDie","publish","messages","requestContext","currentSpan","span","tsplus_module_5","getOrUndefined","tsplus_module_4","map","Tracer","externalSpan","tsplus_module_7","forkDaemonReportQueue","tsplus_module_6","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","encodeSync","_","offer","makeDrain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","orDie","parse","withSpan","tsplus_module_9","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_8","RecordPretty","object$","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","attributes","parent","undefined","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_10","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/QueueMaker/sbqueue.cjs

@@ -29,7 +29,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 /**
  * @tsplus static QueueMaker.Ops makeServiceBus
  */
-function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, makeHandleEvent) {
+function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
   const wireSchema = (0, _schema2.struct)({
     body: schema,
     meta: _service.QueueMeta
@@ -51,8 +51,7 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, ma
     });
     const rcc = yield* $(_RequestContextContainer.RequestContextContainer);
     return {
-      drain: tsplus_module_5.gen(function* ($) {
-        const handleEvent = yield* $(makeHandleEvent);
+      makeDrain: handleEvent => tsplus_module_5.gen(function* ($) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         function processMessage(messageBody) {
           return tsplus_module_5.tapErrorCause(tsplus_module_5.flatMap(tsplus_module_5.orDie(tsplus_module_5.flatMap(tsplus_module_5.sync(() => JSON.parse(messageBody)), x => parseDrain(x))), ({

package/_cjs/services/QueueMaker/sbqueue.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_schema2","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","makeHandleEvent","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_1","parseCondemnDie","tsplus_module_5","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","withSpan","tsplus_module_6","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_4","RecordPretty","object$","RequestContext","inherit","requestContext","id","RequestId","locale","tsplus_module_3","NonEmptyString255","_tag","attributes","parent","span","Tracer","externalSpan","undefined","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","currentSpan","tsplus_module_8","getOrUndefined","tsplus_module_7","map","tsplus_module_9","forkDaemonReportQueue","promise","sendMessages","m","stringify","encodeSync","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_10","LiveServiceBusClient","merge","LiveSender","LiveReceiver"],"sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_schema2","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_1","parseCondemnDie","tsplus_module_5","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","makeDrain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","withSpan","tsplus_module_6","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_4","RecordPretty","object$","RequestContext","inherit","requestContext","id","RequestId","locale","tsplus_module_3","NonEmptyString255","_tag","attributes","parent","span","Tracer","externalSpan","undefined","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","currentSpan","tsplus_module_8","getOrUndefined","tsplus_module_7","map","tsplus_module_9","forkDaemonReportQueue","promise","sendMessages","m","stringify","encodeSync","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_10","LiveServiceBusClient","merge","LiveSender","LiveReceiver"],"sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/QueueMaker/service.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"service.cjs","names":["_RequestContext","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","QueueMaker","exports","QueueMeta","tsplus_module_1","struct","requestContext","RequestContext","span","tsplus_module_2","optionalProp","spanId","string","traceId","sampled","bool"],"sources":["../../../_src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAAwD,SAAAC,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAI,wBAAAJ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAf,CAAA,oBAAAe,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAe,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAd,CAAA,EAAAe,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAf,CAAA,CAAAe,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA;AAejD,MAAMY,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE;AAEpC,MAAME,SAAS,GAAAD,OAAA,CAAAC,SAAA,GAAGC,eAAA,CAAAC,MAAM,CAAC;EAC9BC,cAAc,EAAEC,8BAAc;EAC9BC,IAAI,EAAAC,eAAA,CAAAC,YAAA,CAAEN,eAAA,CAAAC,MAAM,CAAC;IACXM,MAAM,EAAAP,eAAA,CAAEQ,MAAM;IACdC,OAAO,EAAAT,eAAA,CAAEQ,MAAM;IACfE,OAAO,EAAAL,eAAA,CAAAC,YAAA,CAAAN,eAAA,CAAEW,IAAI;GACd,CAAC;CAEH,CAAC"}
+{"version":3,"file":"service.cjs","names":["_RequestContext","require","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","QueueMaker","exports","QueueMeta","tsplus_module_1","struct","requestContext","RequestContext","span","tsplus_module_2","optionalProp","spanId","string","traceId","sampled","bool"],"sources":["../../../_src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA;AAAwD,SAAAC,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAI,wBAAAJ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAf,CAAA,oBAAAe,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAe,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAd,CAAA,EAAAe,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAf,CAAA,CAAAe,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA;AAiBjD,MAAMY,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE;AAEpC,MAAME,SAAS,GAAAD,OAAA,CAAAC,SAAA,GAAGC,eAAA,CAAAC,MAAM,CAAC;EAC9BC,cAAc,EAAEC,8BAAc;EAC9BC,IAAI,EAAAC,eAAA,CAAAC,YAAA,CAAEN,eAAA,CAAAC,MAAM,CAAC;IACXM,MAAM,EAAAP,eAAA,CAAEQ,MAAM;IACdC,OAAO,EAAAT,eAAA,CAAEQ,MAAM;IACfE,OAAO,EAAAL,eAAA,CAAAC,YAAA,CAAAN,eAAA,CAAEW,IAAI;GACd,CAAC;CAEH,CAAC"}

package/_src/services/QueueMaker/memQueue.ts

@@ -10,17 +10,14 @@ import { type QueueBase, QueueMeta } from "./service.js"
  * @tsplus static QueueMaker.Ops makeMem
  */
 export function makeMemQueue<
-  DrainR,
-  Evt,
+  Evt extends { id: StringId; _tag: string },
   DrainEvt extends { id: StringId; _tag: string },
-  EvtE,
-  DrainE
+  EvtE
 >(
   queueName: string,
   queueDrainName: string,
   schema: Schema.Schema<unknown, Evt, any, EvtE, any>,
-  drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>,
-  makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>
+  drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>
 ) {
   return Effect.gen(function*($) {
     const mem = yield* $(MemQueue)
@@ -54,43 +51,45 @@ export function makeMemQueue<
               .forkDaemonReportQueue
           )
         }),
-      drain: Effect.gen(function*($) {
-        const handleEvent = yield* $(makeHandleEvent)
-        const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName })
-        const processMessage = (msg: string) =>
-          // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-          Effect(JSON.parse(msg))
-            .flatMap(parseDrain)
-            .orDie
-            .flatMap(({ body, meta }) =>
-              Effect
-                .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
-                .pipe(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
-                .zipRight(handleEvent(body))
-                .pipe(silenceAndReportError)
-                .setupRequestContext(RequestContext.inherit(meta.requestContext, {
-                  id: RequestId(body.id),
-                  locale: "en" as const,
-                  name: NonEmptyString255(body._tag)
-                }))
-                .withSpan("queue.drain", {
-                  attributes: { "queue.name": queueDrainName },
-                  parent: meta.span
-                    ? Tracer.externalSpan(meta.span)
-                    : undefined
-                })
-            )
-        return yield* $(
-          qDrain
-            .take
-            .flatMap((x) => processMessage(x).uninterruptible.fork.flatMap((_) => _.join))
-            // TODO: normally a failed item would be returned to the queue and retried up to X times.
-            // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.
-            .pipe(silenceAndReportError)
-            .forever
-            .forkScoped
-        )
-      })
-    } satisfies QueueBase<DrainR, Evt>
+      makeDrain: <DrainE, DrainR>(
+        handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>
+      ) =>
+        Effect.gen(function*($) {
+          const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName })
+          const processMessage = (msg: string) =>
+            // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
+            Effect(JSON.parse(msg))
+              .flatMap(parseDrain)
+              .orDie
+              .flatMap(({ body, meta }) =>
+                Effect
+                  .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
+                  .pipe(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
+                  .zipRight(handleEvent(body))
+                  .pipe(silenceAndReportError)
+                  .setupRequestContext(RequestContext.inherit(meta.requestContext, {
+                    id: RequestId(body.id),
+                    locale: "en" as const,
+                    name: NonEmptyString255(body._tag)
+                  }))
+                  .withSpan("queue.drain", {
+                    attributes: { "queue.name": queueDrainName },
+                    parent: meta.span
+                      ? Tracer.externalSpan(meta.span)
+                      : undefined
+                  })
+              )
+          return yield* $(
+            qDrain
+              .take
+              .flatMap((x) => processMessage(x).uninterruptible.fork.flatMap((_) => _.join))
+              // TODO: normally a failed item would be returned to the queue and retried up to X times.
+              // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.
+              .pipe(silenceAndReportError)
+              .forever
+              .forkScoped
+          )
+        })
+    } satisfies QueueBase<Evt, DrainEvt>
   })
 }

package/_src/services/QueueMaker/sbqueue.ts

@@ -20,17 +20,14 @@ import { type QueueBase, QueueMeta } from "./service.js"
  * @tsplus static QueueMaker.Ops makeServiceBus
  */
 export function makeServiceBusQueue<
-  DrainR,
   Evt extends { id: StringId; _tag: string },
   DrainEvt extends { id: StringId; _tag: string },
-  EvtE,
-  DrainE
+  EvtE
 >(
   _queueName: string,
   queueDrainName: string,
   schema: Schema.Schema<unknown, Evt, any, EvtE, any>,
-  drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>,
-  makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>
+  drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>
 ) {
   const wireSchema = struct({
     body: schema,
@@ -48,46 +45,48 @@ export function makeServiceBusQueue<
     const rcc = yield* $(RequestContextContainer)
 
     return {
-      drain: Effect.gen(function*($) {
-        const handleEvent = yield* $(makeHandleEvent)
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        function processMessage(messageBody: any) {
-          return Effect
-            .sync(() => JSON.parse(messageBody))
-            .flatMap((x) => parseDrain(x))
-            .orDie
-            .flatMap(({ body, meta }) =>
-              Effect
-                .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
-                .pipe(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
-                .zipRight(handleEvent(body))
-                .orDie
-                // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
-                .pipe(silenceAndReportError)
-                .setupRequestContext(RequestContext.inherit(meta.requestContext, {
-                  id: RequestId(body.id),
-                  locale: "en" as const,
-                  name: NonEmptyString255(body._tag)
-                }))
-                .withSpan("queue.drain", {
-                  attributes: { "queue.name": queueDrainName },
-                  parent: meta.span
-                    ? Tracer.externalSpan(meta.span)
-                    : undefined
-                })
-            )
-            // we reportError here, so that we report the error only, and keep flowing
-            .tapErrorCause(reportError)
-        }
+      makeDrain: <DrainE, DrainR>(
+        handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>
+      ) =>
+        Effect.gen(function*($) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          function processMessage(messageBody: any) {
+            return Effect
+              .sync(() => JSON.parse(messageBody))
+              .flatMap((x) => parseDrain(x))
+              .orDie
+              .flatMap(({ body, meta }) =>
+                Effect
+                  .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
+                  .pipe(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
+                  .zipRight(handleEvent(body))
+                  .orDie
+                  // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
+                  .pipe(silenceAndReportError)
+                  .setupRequestContext(RequestContext.inherit(meta.requestContext, {
+                    id: RequestId(body.id),
+                    locale: "en" as const,
+                    name: NonEmptyString255(body._tag)
+                  }))
+                  .withSpan("queue.drain", {
+                    attributes: { "queue.name": queueDrainName },
+                    parent: meta.span
+                      ? Tracer.externalSpan(meta.span)
+                      : undefined
+                  })
+              )
+              // we reportError here, so that we report the error only, and keep flowing
+              .tapErrorCause(reportError)
+          }
 
-        return yield* $(
-          subscribe({
-            processMessage: (x) => processMessage(x.body).uninterruptible,
-            processError: (err) => Effect(captureException(err.error))
-          })
-            .provide(receiverLayer)
-        )
-      }),
+          return yield* $(
+            subscribe({
+              processMessage: (x) => processMessage(x.body).uninterruptible,
+              processError: (err) => Effect(captureException(err.error))
+            })
+              .provide(receiverLayer)
+          )
+        }),
 
       publish: (...messages) =>
         Effect.gen(function*($) {
@@ -110,7 +109,7 @@ export function makeServiceBusQueue<
               .forkDaemonReportQueue
           )
         })
-    } satisfies QueueBase<DrainR, Evt>
+    } satisfies QueueBase<Evt, DrainEvt>
   })
 }
 

package/_src/services/QueueMaker/service.ts

@@ -2,8 +2,10 @@ import { RequestContext } from "../../RequestContext.js"
 import type { RequestContextContainer } from "../RequestContextContainer.js"
 import type { ContextMapContainer } from "../Store/ContextMapContainer.js"
 
-export interface QueueBase<RContext, Evt> {
-  drain: Effect<Scope | RequestContextContainer | ContextMapContainer | RContext, never, void>
+export interface QueueBase<Evt, DrainEvt> {
+  makeDrain: <DrainE, DrainR>(
+    makeHandleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>
+  ) => Effect<Scope | RequestContextContainer | ContextMapContainer | DrainR, never, void>
   publish: (
     ...messages: NonEmptyReadonlyArray<Evt>
   ) => Effect<never, never, void>

package/dist/services/QueueMaker/memQueue.d.ts

@@ -2,16 +2,20 @@ import { StringId } from "@effect-app/prelude/schema";
 import { Schema } from "@effect-app/prelude";
 import { Effect } from "effect/Effect";
 import { MemQueue } from "@effect-app/infra-adapters/memQueue";
+import { Tracer } from "effect";
 import { RequestContextContainer } from "../RequestContextContainer.js";
 /**
  * @tsplus static QueueMaker.Ops makeMem
  * @tsplus location "@effect-app/infra/services/QueueMaker/memQueue"
  */
-export declare function makeMemQueue<DrainR, Evt, DrainEvt extends {
+export declare function makeMemQueue<Evt extends {
     id: StringId;
     _tag: string;
-}, EvtE, DrainE>(queueName: string, queueDrainName: string, schema: Schema.Schema<unknown, Evt, any, EvtE, any>, drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>, makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>): import("effect/Effect").Effect<RequestContextContainer | MemQueue, never, {
+}, DrainEvt extends {
+    id: StringId;
+    _tag: string;
+}, EvtE>(queueName: string, queueDrainName: string, schema: Schema.Schema<unknown, Evt, any, EvtE, any>, drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>): import("effect/Effect").Effect<RequestContextContainer | MemQueue, never, {
     publish: (messages_0: Evt, ...messages_1: Evt[]) => import("effect/Effect").Effect<never, never, import("effect/Fiber").RuntimeFiber<never, void[]>>;
-    drain: import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | DrainR, never, import("effect/Fiber").RuntimeFiber<never, never>>;
+    makeDrain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>) => import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<DrainR, Tracer.ParentSpan>, Tracer.ParentSpan>, never, import("effect/Fiber").RuntimeFiber<never, never>>;
 }>;
 //# sourceMappingURL=memQueue.d.ts.map

package/dist/services/QueueMaker/memQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memQueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAI9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,YAAY,CAC1B,MAAM,EACN,GAAG,EACH,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,MAAM,EAEN,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC5D,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;;GAyEtF"}
+{"version":3,"file":"memQueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAG9D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EAEJ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;;kDAmCpC,QAAQ,KAAK,OAAO,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC;GAwClE"}

package/dist/services/QueueMaker/memQueue.js

@@ -18,7 +18,7 @@ import { QueueMeta } from "./service.js";
 /**
  * @tsplus static QueueMaker.Ops makeMem
  */
-export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, makeHandleEvent) {
+export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
     return tsplus_module_3.gen(function* ($) {
         const mem = yield* $(MemQueue);
         const q = yield* $(mem.getOrCreateQueue(queueName));
@@ -38,8 +38,7 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, mak
                 // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
                 , (_) => q.offer(_))))));
             }),
-            drain: tsplus_module_3.gen(function* ($) {
-                const handleEvent = yield* $(makeHandleEvent);
+            makeDrain: (handleEvent) => tsplus_module_3.gen(function* ($) {
                 const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName });
                 const processMessage = (msg) => 
                 // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
@@ -64,4 +63,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, mak
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FPMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQsRUFDNUQsZUFBcUY7SUFFckYsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDbkQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO1FBQzdELE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBRTdDLE1BQU0sVUFBVSxHQUFHLGdCQUFBLE1B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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FLMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQ7SUFFNUQsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDbkQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO1FBQzdELE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBRTdDLE1BQU0sVUFBVSxHQUFHLGdCQUFBLE1BQU0sQ0FBQyxFQUFF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

package/dist/services/QueueMaker/sbqueue.d.ts

@@ -1,19 +1,20 @@
 import { StringId } from "@effect-app/prelude/schema";
 import { Schema } from "@effect-app/prelude";
 import { Effect } from "effect/Effect";
+import { Tracer } from "effect";
 import { RequestContextContainer } from "../RequestContextContainer.js";
 /**
  * @tsplus static QueueMaker.Ops makeServiceBus
  * @tsplus location "@effect-app/infra/services/QueueMaker/sbqueue"
  */
-export declare function makeServiceBusQueue<DrainR, Evt extends {
+export declare function makeServiceBusQueue<Evt extends {
     id: StringId;
     _tag: string;
 }, DrainEvt extends {
     id: StringId;
     _tag: string;
-}, EvtE, DrainE>(_queueName: string, queueDrainName: string, schema: Schema.Schema<unknown, Evt, any, EvtE, any>, drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>, makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>): import("effect/Effect").Effect<RequestContextContainer | import("@azure/service-bus").ServiceBusReceiver | import("@azure/service-bus").ServiceBusSender, never, {
-    drain: import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | DrainR, never, void>;
+}, EvtE>(_queueName: string, queueDrainName: string, schema: Schema.Schema<unknown, Evt, any, EvtE, any>, drainSchema: Schema.Schema<unknown, DrainEvt, any, any, any>): import("effect/Effect").Effect<RequestContextContainer | import("@azure/service-bus").ServiceBusReceiver | import("@azure/service-bus").ServiceBusSender, never, {
+    makeDrain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>) => import("effect/Effect").Effect<import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, Tracer.ParentSpan>, import("@azure/service-bus").ServiceBusReceiver>, never, void>;
     publish: (messages_0: Evt, ...messages_1: Evt[]) => import("effect/Effect").Effect<never, never, import("effect/Fiber").RuntimeFiber<never, void>>;
 }>;
 /**

package/dist/services/QueueMaker/sbqueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":";;;AAcA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,mBAAmB,CACjC,MAAM,EACN,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,MAAM,EAEN,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC5D,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;;GAkFtF;;;;;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+IAE1F"}
+{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":";;;AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,mBAAmB,CACjC,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EAEJ,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;kDAmBpC,QAAQ,KAAK,OAAO,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC;;GAiElE;;;;;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+IAE1F"}

package/dist/services/QueueMaker/sbqueue.js

@@ -20,7 +20,7 @@ import { QueueMeta } from "./service.js";
 /**
  * @tsplus static QueueMaker.Ops makeServiceBus
  */
-export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, makeHandleEvent) {
+export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
     const wireSchema = struct({
         body: schema,
         meta: QueueMeta
@@ -35,8 +35,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
         const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName });
         const rcc = yield* $(RequestContextContainer);
         return {
-            drain: tsplus_module_5.gen(function* ($) {
-                const handleEvent = yield* $(makeHandleEvent);
+            makeDrain: (handleEvent) => tsplus_module_5.gen(function* ($) {
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 function processMessage(messageBody) {
                     return tsplus_module_5.tapErrorCause(tsplus_module_5.flatMap(tsplus_module_5.orDie(tsplus_module_5.flatMap(tsplus_module_5.sync(() => JSON.parse(messageBody)), (x) => parseDrain(x))), ({ body, meta }) => tsplus_module_5.withSpan(tsplus_module_6.setupRequestContext(tsplus_module_5.orDie(tsplus_module_5.zipRight(tsplus_module_5.logDebug(`$$ [${queueDrainName}] Processing incoming message`)
@@ -77,4 +76,4 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
 export function makeServiceBusLayers(url, queueName, queueDrainName) {
     return tsplus_module_10.provide(LiveServiceBusClient(url))((tsplus_module_10.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsUUFBUSxFQUNSLE1BQU0sRUFDTixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUMzRixPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FPakMsVUFBa0IsRUFDbEIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQsRUFDNUQsZUFBcUY7SUFFckYsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO1FBQ3hCLElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLFNBQVM7S0FDaEIsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFVBQVUsbUNBQUcsTUFBTSxDQUFnQixDQUFBO0lB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsUUFBUSxFQUNSLE1BQU0sRUFDTixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUMzRixPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FLakMsVUFBa0IsRUFDbEIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQ7SUFFNUQsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO1FBQ3hCLElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLFNBQVM7S0FDaEIsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFVBQVUsbUNBQUcsTUFBTSxDQUFnQixDQUFBO0lBRXpDLE9BQU8sb0JB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

package/dist/services/QueueMaker/service.d.ts

@@ -4,8 +4,8 @@ import { NonEmptyReadonlyArray } from "effect/ReadonlyArray";
 import { RequestContext } from "../../RequestContext.js";
 import type { RequestContextContainer } from "../RequestContextContainer.js";
 import type { ContextMapContainer } from "../Store/ContextMapContainer.js";
-export interface QueueBase<RContext, Evt> {
-    drain: Effect<Scope | RequestContextContainer | ContextMapContainer | RContext, never, void>;
+export interface QueueBase<Evt, DrainEvt> {
+    makeDrain: <DrainE, DrainR>(makeHandleEvent: (ks: DrainEvt) => Effect<DrainR, DrainE, void>) => Effect<Scope | RequestContextContainer | ContextMapContainer | DrainR, never, void>;
     publish: (...messages: NonEmptyReadonlyArray<Evt>) => Effect<never, never, void>;
 }
 /**

package/dist/services/QueueMaker/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/service.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAE1E,MAAM,WAAW,SAAS,CAAC,QAAQ,EAAE,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,uBAAuB,GAAG,mBAAmB,GAAG,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC5F,OAAO,EAAE,CACP,GAAG,QAAQ,EAAE,qBAAqB,CAAC,GAAG,CAAC,KACpC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;CAAG;AACjC,eAAO,MAAM,UAAU,EAAE,aAAkB,CAAA;AAE3C,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;GAQpB,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/service.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAC5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAE1E,MAAM,WAAW,SAAS,CAAC,GAAG,EAAE,QAAQ;IACtC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EACxB,eAAe,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,KAC5D,MAAM,CAAC,KAAK,GAAG,uBAAuB,GAAG,mBAAmB,GAAG,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACxF,OAAO,EAAE,CACP,GAAG,QAAQ,EAAE,qBAAqB,CAAC,GAAG,CAAC,KACpC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;CAAG;AACjC,eAAO,MAAM,UAAU,EAAE,aAAkB,CAAA;AAE3C,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;GAQpB,CAAA"}

package/dist/services/QueueMaker/service.js

@@ -10,4 +10,4 @@ export const QueueMeta = tsplus_module_1.struct({
         sampled: tsplus_module_2.optionalProp(tsplus_module_1.bool)
     }))
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBZXhELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBa0IsRUFBRSxDQUFBO0FBRTNDLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxnQkFBQSxNQUFNLENBQUM7SUFDOUIsY0FBYyxFQUFFLGNBQWM7SUFDOUIsSUFBSSwrQkFBRSxnQkFBQSxNQUFNLENBQUM7UUFDWCxNQUFNLGtCQUFFLE1BQU07UUFDZCxPQUFPLGtCQUFFLE1BQU07UUFDZixPQUFPLCtDQUFFLElBQUksQ0FBUztLQUN2QixDQUFDLENBQ1M7Q0FDWixDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBaUJ4RCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQWtCLEVBQUUsQ0FBQTtBQUUzQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsZ0JBQUEsTUFBTSxDQUFDO0lBQzlCLGNBQWMsRUFBRSxjQUFjO0lBQzlCLElBQUksK0JBQUUsZ0JBQUEsTUFBTSxDQUFDO1FBQ1gsTUFBTSxrQkFBRSxNQUFNO1FBQ2QsT0FBTyxrQkFBRSxNQUFNO1FBQ2YsT0FBTywrQ0FBRSxJQUFJLENBQVM7S0FDdkIsQ0FBQyxDQUNTO0NBQ1osQ0FBQyxDQUFBIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.109.6",
+  "version": "0.111.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,9 +19,9 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.79.1",
-    "@effect-app/infra-adapters": "0.68.5",
-    "@effect-app/schema": "0.77.1",
-    "@effect-app/prelude": "0.85.4"
+    "@effect-app/infra-adapters": "0.69.0",
+    "@effect-app/prelude": "0.86.0",
+    "@effect-app/schema": "0.77.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",