@effect-app/infra 0.87.5 → 0.89.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/infra
 
+## 0.89.0
+
+### Minor Changes
+
+- ee322d46: Cleanup Queue
+
+## 0.88.0
+
+### Minor Changes
+
+- 8d312e3d: updater queue for updated requestcontext
+
 ## 0.87.5
 
 ### Patch Changes

package/_cjs/services/QueueMaker/memQueue.cjs

@@ -7,28 +7,29 @@ exports.makeMemQueue = makeMemQueue;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
 var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
-var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
-var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
-var tsplus_module_6 = _interopRequireWildcard(require("effect/Fiber"));
+var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
+var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/infra/services/Store/Memory"));
+var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
+var tsplus_module_7 = _interopRequireWildcard(require("effect/Fiber"));
 var _memQueue = require("@effect-app/infra-adapters/memQueue");
 var _RequestContext = require("@effect-app/infra/RequestContext");
 var _ids = require("@effect-app/prelude/ids");
 var _RequestContextContainer = require("../RequestContextContainer.cjs");
-var _Memory = require("../Store/Memory.cjs");
 var _errors2 = require("./errors.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * @tsplus static QueueMaker.Ops makeMem
  */
-function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provideContext, parseDrain) {
+function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, parseDrain) {
   return tsplus_module_1.gen(function* ($) {
     const mem = yield* $(_memQueue.MemQueue);
     const q = yield* $(mem.getOrCreateQueue(queueName));
     const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName));
+    const rcc = yield* $(_RequestContextContainer.RequestContextContainer);
     return {
       publish: (...messages) => tsplus_module_1.gen(function* ($) {
-        const requestContext = yield* $(_RequestContextContainer.RequestContextContainer.get);
+        const requestContext = yield* $(rcc.requestContext);
         return yield* $(tsplus_module_3.forkDaemonReportQueue(tsplus_module_2.ext_forEach(messages, m => tsplus_module_1.asUnit(
         // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
         tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.stringify(encoder({
@@ -48,15 +49,15 @@ function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provi
         tsplus_module_1.flatMap(tsplus_module_1.orDie(tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.parse(msg)), parseDrain)), ({
           body,
           meta
-        }) => provideContext(_RequestContext.RequestContext.inherit(meta, {
+        }) => tsplus_module_1.zipRight(silenceAndReportError(tsplus_module_1.zipRight(tsplus_module_1.annotateLogs({
+          body: tsplus_module_6.RecordPretty(tsplus_module_6.object$(body)),
+          meta: tsplus_module_6.RecordPretty(tsplus_module_6.object$(meta))
+        })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body))))(tsplus_module_1.zipRight(tsplus_module_1.flatMap(rcc.requestContext, _ => tsplus_module_5.restoreFromRequestContext(_)))(rcc.start(_RequestContext.RequestContext.inherit(meta, {
           id: (0, _ids.RequestId)(body.id),
           locale: "en",
-          name: tsplus_module_5.ReasonableString(body._tag)
-        }))(silenceAndReportError(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_1.annotateLogs({
-          body: tsplus_module_4.RecordPretty(tsplus_module_4.object$(body)),
-          meta: tsplus_module_4.RecordPretty(tsplus_module_4.object$(meta))
-        })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => _Memory.restoreFromRequestContext), handleEvent(body)))));
-        return yield* $(tsplus_module_1.forkScoped(tsplus_module_1.forever(silenceAndReportError(tsplus_module_1.flatMap(qDrain.take(), x => tsplus_module_1.flatMap(tsplus_module_1.fork(tsplus_module_1.uninterruptible(processMessage(x))), _ => tsplus_module_6.join(_)))
+          name: tsplus_module_4.ReasonableString(body._tag)
+        })))));
+        return yield* $(tsplus_module_1.forkScoped(tsplus_module_1.forever(silenceAndReportError(tsplus_module_1.flatMap(qDrain.take(), x => tsplus_module_1.flatMap(tsplus_module_1.fork(tsplus_module_1.uninterruptible(processMessage(x))), _ => tsplus_module_7.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.
         ))));

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

@@ -1 +1 @@
-{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_RequestContextContainer","_Memory","_errors2","_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","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","publish","messages","requestContext","RequestContextContainer","tsplus_module_3","forkDaemonReportQueue","tsplus_module_2","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","body","meta","_","offer","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","orDie","parse","RequestContext","inherit","id","RequestId","locale","tsplus_module_5","ReasonableString","_tag","zipRight","tap","annotateLogs","tsplus_module_4","RecordPretty","object$","logDebug","restoreFromRequestContext","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_6","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_RequestContextContainer","_errors2","_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","encoder","makeHandleEvent","parseDrain","tsplus_module_1","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","publish","messages","requestContext","tsplus_module_3","forkDaemonReportQueue","tsplus_module_2","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","body","meta","_","offer","drain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","orDie","parse","zipRight","annotateLogs","tsplus_module_6","RecordPretty","object$","logDebug","tsplus_module_5","restoreFromRequestContext","start","RequestContext","inherit","id","RequestId","locale","tsplus_module_4","ReasonableString","_tag","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_7","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/QueueMaker/sbqueue.cjs

@@ -6,25 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 exports.makeServiceBusLayers = makeServiceBusLayers;
 exports.makeServiceBusQueue = makeServiceBusQueue;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/core/Tag"));
-var tsplus_module_2 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
-var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
-var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
-var tsplus_module_6 = _interopRequireWildcard(require("effect/Layer"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/infra/services/Store/Memory"));
+var tsplus_module_4 = _interopRequireWildcard(require("effect/Effect"));
+var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
+var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
+var tsplus_module_7 = _interopRequireWildcard(require("effect/Layer"));
 var _ServiceBus = require("@effect-app/infra-adapters/ServiceBus");
 var _errorReporter = require("@effect-app/infra/errorReporter");
 var _RequestContext = require("@effect-app/infra/RequestContext");
 var _ids = require("@effect-app/prelude/ids");
 var _RequestContextContainer = require("../RequestContextContainer.cjs");
-var _Memory = require("../Store/Memory.cjs");
 var _errors2 = require("./errors.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * @tsplus static QueueMaker.Ops makeServiceBus
  */
-function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEvent, provideContext, parseDrain) {
-  return tsplus_module_2.gen(function* ($) {
+function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEvent, parseDrain) {
+  return tsplus_module_4.gen(function* ($) {
     const s = yield* $(_ServiceBus.Sender);
     const receiver = yield* $(_ServiceBus.Receiver);
     const receiverLayer = tsplus_module_1.makeLayer(_ServiceBus.Receiver, receiver);
@@ -34,33 +34,34 @@ function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEven
     const reportError = (0, _errors2.reportNonInterruptedFailureCause)({
       name: "ServiceBusQueue.drain." + queueDrainName
     });
+    const rcc = yield* $(_RequestContextContainer.RequestContextContainer);
     return {
-      drain: tsplus_module_2.gen(function* ($) {
+      drain: tsplus_module_4.gen(function* ($) {
         const handleEvent = yield* $(makeHandleEvent);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         function processMessage(messageBody) {
-          return tsplus_module_2.tapErrorCause(tsplus_module_2.flatMap(tsplus_module_2.orDie(tsplus_module_2.flatMap(tsplus_module_2.sync(() => JSON.parse(messageBody)), x => parseDrain(x))), ({
+          return tsplus_module_4.tapErrorCause(tsplus_module_4.flatMap(tsplus_module_4.orDie(tsplus_module_4.flatMap(tsplus_module_4.sync(() => JSON.parse(messageBody)), x => parseDrain(x))), ({
             body,
             meta
-          }) => provideContext(_RequestContext.RequestContext.inherit(meta, {
+          }) => tsplus_module_4.zipRight(silenceAndReportError(tsplus_module_4.orDie(tsplus_module_4.zipRight(tsplus_module_4.annotateLogs({
+            body: tsplus_module_5.RecordPretty(tsplus_module_5.object$(body)),
+            meta: tsplus_module_5.RecordPretty(tsplus_module_5.object$(meta))
+          })(tsplus_module_4.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body)))))(tsplus_module_4.zipRight(tsplus_module_4.flatMap(rcc.requestContext, _ => tsplus_module_3.restoreFromRequestContext(_)))(rcc.start(_RequestContext.RequestContext.inherit(meta, {
             id: (0, _ids.RequestId)(body.id),
             locale: "en",
-            name: tsplus_module_4.ReasonableString(body._tag)
-          }))(silenceAndReportError(tsplus_module_2.orDie(tsplus_module_2.zipRight(tsplus_module_2.tap(tsplus_module_2.annotateLogs({
-            body: tsplus_module_3.RecordPretty(tsplus_module_3.object$(body)),
-            meta: tsplus_module_3.RecordPretty(tsplus_module_3.object$(meta))
-          })(tsplus_module_2.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => _Memory.restoreFromRequestContext), handleEvent(body))))))
+            name: tsplus_module_2.ReasonableString(body._tag)
+          })))))
           // we reportError here, so that we report the error only, and keep flowing
           , reportError);
         }
-        return yield* $(tsplus_module_2.provide((0, _ServiceBus.subscribe)({
-          processMessage: x => tsplus_module_2.uninterruptible(processMessage(x.body)),
-          processError: err => tsplus_module_2.sync(() => (0, _errorReporter.captureException)(err.error))
+        return yield* $(tsplus_module_4.provide((0, _ServiceBus.subscribe)({
+          processMessage: x => tsplus_module_4.uninterruptible(processMessage(x.body)),
+          processError: err => tsplus_module_4.sync(() => (0, _errorReporter.captureException)(err.error))
         }), receiverLayer));
       }),
-      publish: (...messages) => tsplus_module_2.gen(function* ($) {
-        const requestContext = yield* $(_RequestContextContainer.RequestContextContainer.get);
-        return yield* $(tsplus_module_5.forkDaemonReportQueue(tsplus_module_2.promise(() => s.sendMessages(messages.map(x => ({
+      publish: (...messages) => tsplus_module_4.gen(function* ($) {
+        const requestContext = yield* $(rcc.requestContext);
+        return yield* $(tsplus_module_6.forkDaemonReportQueue(tsplus_module_4.promise(() => s.sendMessages(messages.map(x => ({
           body: JSON.stringify(encoder({
             body: x,
             meta: requestContext
@@ -77,6 +78,6 @@ function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEven
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
 function makeServiceBusLayers(url, queueName, queueDrainName) {
-  return tsplus_module_6.provide(tsplus_module_6.merge((0, _ServiceBus.LiveSender)(queueName))((0, _ServiceBus.LiveReceiver)(queueDrainName)))((0, _ServiceBus.LiveServiceBusClient)(url));
+  return tsplus_module_7.provide(tsplus_module_7.merge((0, _ServiceBus.LiveSender)(queueName))((0, _ServiceBus.LiveReceiver)(queueDrainName)))((0, _ServiceBus.LiveServiceBusClient)(url));
 }
 //# sourceMappingURL=sbqueue.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_RequestContextContainer","_Memory","_errors2","_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","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_2","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_1","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","drain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","body","meta","RequestContext","inherit","id","RequestId","locale","tsplus_module_4","ReasonableString","_tag","zipRight","tap","annotateLogs","tsplus_module_3","RecordPretty","object$","logDebug","restoreFromRequestContext","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","requestContext","RequestContextContainer","tsplus_module_5","forkDaemonReportQueue","promise","sendMessages","map","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_6","merge","LiveSender","LiveReceiver","LiveServiceBusClient"],"sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;AAAA,IAAAA,WAAA,GAAAC,OAAA;AASA,IAAAC,cAAA,GAAAD,OAAA;AACA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,IAAA,GAAAH,OAAA;AAEA,IAAAI,wBAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AACA,IAAAM,QAAA,GAAAN,OAAA;AAA2F,SAAAO,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;AAG3F;;;AAGM,SAAUY,mBAAmBA,CAQjCC,UAAkB,EAClBC,cAAsB,EACtBC,OAAyD,EACzDC,eAAwF,EACxFC,cAEiE,EACjEC,UAGmF;EAEnF,OAAOC,eAAA,CAAAC,GAAA,CAAW,WAAUC,CAAC;IAC3B,MAAMC,CAAC,GAAG,OAAOD,CAAC,CAACE,kBAAM,CAAC;IAC1B,MAAMC,QAAQ,GAAG,OAAOH,CAAC,CAACI,oBAAQ,CAAC;IACnC,MAAMC,aAAa,GAAGC,eAAA,CAAAC,SAAA,CAAAH,oBAAQ,EAAWD,QAAQ,CAAC;IAClD,MAAMK,qBAAqB,GAAG,IAAAC,oCAA2B,EAAC;MAAEC,IAAI,EAAE,wBAAwB,GAAGjB;IAAc,CAAE,CAAC;IAC9G,MAAMkB,WAAW,GAAG,IAAAC,yCAAgC,EAAC;MAAEF,IAAI,EAAE,wBAAwB,GAAGjB;IAAc,CAAE,CAAC;IAEzG,OAAO;MACLoB,KAAK,EAAEf,eAAA,CAAAC,GAAA,CAAW,WAAUC,CAAC;QAC3B,MAAMc,WAAW,GAAG,OAAOd,CAAC,CAACL,eAAe,CAAC;QAC7C;QACA,SAASoB,cAAcA,CAACC,WAAgB;UACtC,OAAOlB,eAAA,CAAAmB,aAAA,CAAAnB,eAAA,CAAAoB,OAAA,CAAApB,eAAA,CAAAqB,KAAA,CAAArB,eAAA,CAAAoB,OAAA,CAAApB,eAAA,CAAAsB,IAAA,CACC,MAAMC,IAAI,CAACC,KAAK,CAACN,WAAW,CAAC,CAAC,EAC1BO,CAAC,IAAK1B,UAAU,CAAC0B,CAAC,CAAC,CAAC,GAErB,CAAC;YAAEC,IAAI;YAAEC;UAAI,CAAE,KAUlB7B,cAAc,CACZ8B,8BAAc,CAACC,OAAO,CAACF,IAAI,EAAE;YAC3BG,EAAE,EAAE,IAAAC,cAAS,EAACL,IAAI,CAACI,EAAE,CAAC;YACtBE,MAAM,EAAE,IAAa;YACrBpB,IAAI,EAAEqB,eAAA,CAAAC,gBAAgB,CAACR,IAAI,CAACS,IAAI;WACjC,CAAC,CACH,CARIzB,qBAAqB,CAAAV,eAAA,CAAAqB,KAAA,CAP9BrB,eAAA,CAAAoC,QAAA,CAAApC,eAAA,CAAAqC,GAAA,CAESrC,eAAA,CAAAsC,YAAA,CAAoB;YAAEZ,IAAI,EAAAa,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEf,IAAI,EAAU;YAAEC,IAAI,EAAAY,eAAA,CAAAC,YAAA,CAAAD,eAAA,CAAAE,OAAA,CAAEd,IAAI;UAAU,CAAE,CAAC,CAF5E3B,eAAA,CAAA0C,QAAA,CACY,OAAO/C,cAAc,+BAA+B,CAAC,GAE1D,MAAMgD,iCAAyB,CAAC,EAC3B3B,WAAW,CAACU,IAAI,CAAC,CAAC,GAY3B;UAEL;UAAA,EACeb,WAAW,CAAC;QAC/B;QAEA,OAAO,OAAOX,CAAC,CACbF,eAAA,CAAA4C,OAAA,KAAAC,qBAAS,EAAC;UACR5B,cAAc,EAAGQ,CAAC,IAAIzB,eAAA,CAAA8C,eAAA,CAAC7B,cAAc,CAACQ,CAAC,CAACC,IAAI,CAAC,CAAgB;UAC7DqB,YAAY,EAAGC,GAAG,IAAKhD,eAAA,CAAAsB,IAAA,OAAO,IAAA2B,+BAAgB,EAACD,GAAG,CAACE,KAAK,CAAC;SAC1D,CAAC,EACS3C,aAAa,CAAC,CAC1B;MACH,CAAC,CAAC;MAEF4C,OAAO,EAAEA,CAAC,GAAGC,QAAQ,KACnBpD,eAAA,CAAAC,GAAA,CAAW,WAAUC,CAAC;QACpB,MAAMmD,cAAc,GAAG,OAAOnD,CAAC,CAACoD,gDAAuB,CAAC1E,GAAG,CAAC;QAC5D,OAAO,OAAOsB,CAAC,CAAAqD,eAAA,CAAAC,qBAAA,CACbxD,eAAA,CAAAyD,OAAA,CACW,MACPtD,CAAC,CAACuD,YAAY,CACZN,QAAQ,CAACO,GAAG,CAAElC,CAAC,KAAM;UACnBC,IAAI,EAAEH,IAAI,CAACqC,SAAS,CAClBhE,OAAO,CAAC;YAAE8B,IAAI,EAAED,CAAC;YAAEE,IAAI,EAAE0B;UAAc,CAAE,CAAC,CAC3C;UACDQ,SAAS,EAAEpC,CAAC,CAACK,EAAE;UAAE;UACjBgC,WAAW,EAAE;SACd,CAAC,CAAC,CACJ,CACF,EAEJ;MACH,CAAC;KAC6B;EACpC,CAAC,CAAC;AACJ;AAEA;;;AAGM,SAAUC,oBAAoBA,CAACC,GAAW,EAAEC,SAAiB,EAAEtE,cAAsB;EACzF,OAAAuE,eAAA,CAAAtB,OAAA,CACKsB,eAAA,CAAAC,KAAA,CAAgC,IAAAC,sBAAU,EAACH,SAAS,CAAC,EAApD,IAAAI,wBAAY,EAAC1E,cAAc,CAAC,CAAyB,EADpD,IAAA2E,gCAAoB,EAACN,GAAG,CAAC;AAElC"}
+{"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_RequestContextContainer","_errors2","_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","encoder","makeHandleEvent","parseDrain","tsplus_module_4","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_1","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","drain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","body","meta","zipRight","annotateLogs","tsplus_module_5","RecordPretty","object$","logDebug","requestContext","_","tsplus_module_3","restoreFromRequestContext","start","RequestContext","inherit","id","RequestId","locale","tsplus_module_2","ReasonableString","_tag","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","tsplus_module_6","forkDaemonReportQueue","promise","sendMessages","map","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_7","merge","LiveSender","LiveReceiver","LiveServiceBusClient"],"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":["QueueMaker","exports"],"sources":["../../../_src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;AAaO,MAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE"}
+{"version":3,"file":"service.cjs","names":["QueueMaker","exports"],"sources":["../../../_src/services/QueueMaker/service.ts"],"sourcesContent":[null],"mappings":";;;;;;AAWO,MAAMA,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAkB,EAAE"}

package/_cjs/services/Store/Memory.cjs

@@ -15,13 +15,10 @@ var tsplus_module_5 = _interopRequireWildcard(require("effect/Effect"));
 var tsplus_module_6 = _interopRequireWildcard(require("effect/Chunk"));
 var tsplus_module_7 = _interopRequireWildcard(require("effect/Ref"));
 var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
-var _RequestContextContainer = require("../RequestContextContainer.cjs");
 var _service = require("./service.cjs");
 var _utils = require("./utils.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 function memFilter(filter, cursor) {
   return c => {
     const skip = cursor?.skip;
@@ -40,7 +37,11 @@ function memFilter(filter, cursor) {
   };
 }
 const storeId = exports.storeId = tsplus_module_4.unsafeMake("primary");
-const restoreFromRequestContext = exports.restoreFromRequestContext = tsplus_module_5.flatMap(_RequestContextContainer.RequestContextContainer.get, ctx => tsplus_module_4.set(storeId, ctx.namespace ?? "primary"));
+/**
+ * @tsplus getter RequestContext restoreStoreId
+ */
+const restoreFromRequestContext = ctx => tsplus_module_4.set(storeId, ctx.namespace ?? "primary");
+exports.restoreFromRequestContext = restoreFromRequestContext;
 function logQuery(filter, cursor) {
   return tsplus_module_5.annotateLogs({
     query: JSON.stringify(filter, undefined, 2),

package/_cjs/services/Store/Memory.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Memory.cjs","names":["_RequestContextContainer","require","_service","_utils","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","memFilter","filter","cursor","c","skip","limit","tsplus_module_3","getOrElse","map","tsplus_module_2","findFirstMap","codeFilter","tsplus_module_1","make","filterMap","drop","undefined","take","storeId","exports","tsplus_module_4","unsafeMake","restoreFromRequestContext","tsplus_module_5","flatMap","RequestContextContainer","ctx","namespace","logQuery","annotateLogs","query","JSON","stringify","logDebug","makeMemoryStoreInt","name","seed","gen","$","updateETag","makeUpdateETag","items_","sync","items","Map","tsplus_module_6","ext_itToChunk","_","id","makeStore","entries","makeETag","store","tsplus_module_7","sem","unsafeMakeSemaphore","withPermit","withPermits","values","s","all","fromIterable","batchSet","tap","tsplus_module_8","ext_forEach","find","current","m","mut","forEach","fromNullable","filterJoinSelect","codeFilterJoinSelect","bulkSet","remove","makeMemoryStore","config","storesSem","primary","context","stores","getStore","allowNamespace","succeed","Error","suspend","provide","orDie","args","MemoryStoreLive","StoreMaker","makeLayer"],"sources":["../../../_src/services/Store/Memory.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"Memory.cjs","names":["_service","require","_utils","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","memFilter","filter","cursor","c","skip","limit","tsplus_module_3","getOrElse","map","tsplus_module_2","findFirstMap","codeFilter","tsplus_module_1","make","filterMap","drop","undefined","take","storeId","exports","tsplus_module_4","unsafeMake","restoreFromRequestContext","ctx","namespace","logQuery","tsplus_module_5","annotateLogs","query","JSON","stringify","logDebug","makeMemoryStoreInt","name","seed","gen","$","updateETag","makeUpdateETag","items_","sync","items","Map","tsplus_module_6","ext_itToChunk","_","id","makeStore","entries","makeETag","store","tsplus_module_7","sem","unsafeMakeSemaphore","withPermit","withPermits","values","s","all","fromIterable","batchSet","tap","tsplus_module_8","ext_forEach","flatMap","find","current","m","mut","forEach","fromNullable","filterJoinSelect","codeFilterJoinSelect","bulkSet","remove","makeMemoryStore","config","storesSem","primary","context","stores","getStore","allowNamespace","succeed","Error","suspend","provide","orDie","args","MemoryStoreLive","StoreMaker","makeLayer"],"sources":["../../../_src/services/Store/Memory.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/services/QueueMaker/memQueue.ts

@@ -3,7 +3,6 @@ import { RequestContext } from "@effect-app/infra/RequestContext"
 import { RequestId } from "@effect-app/prelude/ids"
 import type { CustomSchemaException } from "@effect-app/prelude/schema"
 import { RequestContextContainer } from "../RequestContextContainer.js"
-import { restoreFromRequestContext } from "../Store/Memory.js"
 import { reportNonInterruptedFailure } from "./errors.js"
 import type { QueueBase } from "./service.js"
 
@@ -14,17 +13,13 @@ export function makeMemQueue<
   DrainR,
   Evt,
   DrainEvt extends { id: StringId; _tag: string },
-  RContext,
   EvtE,
   DrainE
 >(
   queueName: string,
   queueDrainName: string,
   encoder: (e: { body: Evt; meta: RequestContext }) => EvtE,
-  makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<RContext, DrainE, void>>,
-  provideContext: (context: RequestContext) => <R, E, A>(
-    eff: Effect<RContext | R, E, A>
-  ) => Effect<Exclude<R, RContext | RequestContextContainer>, E, A>,
+  makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>,
   parseDrain: (
     a: unknown,
     env?: Parser.ParserEnv | undefined
@@ -34,11 +29,12 @@ export function makeMemQueue<
     const mem = yield* $(MemQueue)
     const q = yield* $(mem.getOrCreateQueue(queueName))
     const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName))
+    const rcc = yield* $(RequestContextContainer)
 
     return {
       publish: (...messages) =>
         Effect.gen(function*($) {
-          const requestContext = yield* $(RequestContextContainer.get)
+          const requestContext = yield* $(rcc.requestContext)
           return yield* $(
             messages
               .forEachEffect((m) =>
@@ -64,21 +60,17 @@ export function makeMemQueue<
             .flatMap(parseDrain)
             .orDie
             .flatMap(({ body, meta }) =>
-              Effect
-                .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
-                .apply(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
-                .tap(() => restoreFromRequestContext)
-                .zipRight(handleEvent(body))
-                .apply(silenceAndReportError)
-                .apply(
-                  provideContext(
-                    RequestContext.inherit(meta, {
-                      id: RequestId(body.id),
-                      locale: "en" as const,
-                      name: ReasonableString(body._tag)
-                    })
-                  )
-                )
+              rcc.start(RequestContext.inherit(meta, {
+                id: RequestId(body.id),
+                locale: "en" as const,
+                name: ReasonableString(body._tag)
+              }))
+                > rcc.requestContext.flatMap((_) => _.restoreStoreId)
+                > Effect
+                  .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
+                  .apply(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
+                  .zipRight(handleEvent(body))
+                  .apply(silenceAndReportError)
             )
         return yield* $(
           qDrain

package/_src/services/QueueMaker/sbqueue.ts

@@ -12,7 +12,6 @@ import { RequestContext } from "@effect-app/infra/RequestContext"
 import { RequestId } from "@effect-app/prelude/ids"
 import type { CustomSchemaException } from "@effect-app/prelude/schema"
 import { RequestContextContainer } from "../RequestContextContainer.js"
-import { restoreFromRequestContext } from "../Store/Memory.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js"
 import type { QueueBase } from "./service.js"
 
@@ -23,17 +22,13 @@ export function makeServiceBusQueue<
   DrainR,
   Evt extends { id: StringId; _tag: string },
   DrainEvt extends { id: StringId; _tag: string },
-  RContext,
   EvtE,
   DrainE
 >(
   _queueName: string,
   queueDrainName: string,
   encoder: (e: { body: Evt; meta: RequestContext }) => EvtE,
-  makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<RContext, DrainE, void>>,
-  provideContext: (context: RequestContext) => <R, E, A>(
-    eff: Effect<RContext | R, E, A>
-  ) => Effect<Exclude<R, RContext | RequestContextContainer>, E, A>,
+  makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>,
   parseDrain: (
     a: unknown,
     env?: Parser.ParserEnv | undefined
@@ -45,6 +40,7 @@ export function makeServiceBusQueue<
     const receiverLayer = Receiver.makeLayer(receiver)
     const silenceAndReportError = reportNonInterruptedFailure({ name: "ServiceBusQueue.drain." + queueDrainName })
     const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName })
+    const rcc = yield* $(RequestContextContainer)
 
     return {
       drain: Effect.gen(function*($) {
@@ -56,23 +52,19 @@ export function makeServiceBusQueue<
             .flatMap((x) => parseDrain(x))
             .orDie
             .flatMap(({ body, meta }) =>
-              Effect
-                .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
-                .apply(Effect.annotateLogs({ body: body.$$.pretty, meta: meta.$$.pretty }))
-                .tap(() => restoreFromRequestContext)
-                .zipRight(handleEvent(body))
-                .orDie
-                // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
-                .apply(silenceAndReportError)
-                .apply(
-                  provideContext(
-                    RequestContext.inherit(meta, {
-                      id: RequestId(body.id),
-                      locale: "en" as const,
-                      name: ReasonableString(body._tag)
-                    })
-                  )
-                )
+              rcc.start(RequestContext.inherit(meta, {
+                id: RequestId(body.id),
+                locale: "en" as const,
+                name: ReasonableString(body._tag)
+              }))
+                > rcc.requestContext.flatMap((_) => _.restoreStoreId)
+                > Effect
+                  .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
+                  .apply(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.
+                  .apply(silenceAndReportError)
             )
             // we reportError here, so that we report the error only, and keep flowing
             .tapErrorCause(reportError)
@@ -89,7 +81,7 @@ export function makeServiceBusQueue<
 
       publish: (...messages) =>
         Effect.gen(function*($) {
-          const requestContext = yield* $(RequestContextContainer.get)
+          const requestContext = yield* $(rcc.requestContext)
           return yield* $(
             Effect
               .promise(() =>

package/_src/services/QueueMaker/service.ts

@@ -1,10 +1,8 @@
-import type { RequestContextContainer } from "../RequestContextContainer.js"
-
 export interface QueueBase<RContext, Evt> {
   drain: Effect<Scope | RContext, never, void>
   publish: (
     ...messages: NonEmptyReadonlyArray<Evt>
-  ) => Effect<RequestContextContainer, never, void>
+  ) => Effect<never, never, void>
 }
 
 /**

package/_src/services/Store/Memory.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { RequestContextContainer } from "../RequestContextContainer.js"
+import type { RequestContext } from "../../RequestContext.js"
 import type { Filter, FilterJoinSelect, PersistenceModelType, Store, StoreConfig } from "./service.js"
 import { StoreMaker } from "./service.js"
 import { codeFilter, codeFilterJoinSelect, makeETag, makeUpdateETag } from "./utils.js"
@@ -24,9 +24,11 @@ export function memFilter<T extends { id: string }>(filter: Filter<T>, cursor?:
 }
 
 export const storeId = FiberRef.unsafeMake("primary")
-export const restoreFromRequestContext = RequestContextContainer.get.flatMap((ctx) =>
-  storeId.set(ctx.namespace ?? "primary")
-)
+
+/**
+ * @tsplus getter RequestContext restoreStoreId
+ */
+export const restoreFromRequestContext = (ctx: RequestContext) => storeId.set(ctx.namespace ?? "primary")
 
 function logQuery(filter: any, cursor: any) {
   return Effect

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

@@ -11,14 +11,14 @@ import { RequestContextContainer } from "../RequestContextContainer.js";
 export declare function makeMemQueue<DrainR, Evt, DrainEvt extends {
     id: StringId;
     _tag: string;
-}, RContext, EvtE, DrainE>(queueName: string, queueDrainName: string, encoder: (e: {
+}, EvtE, DrainE>(queueName: string, queueDrainName: string, encoder: (e: {
     body: Evt;
     meta: RequestContext;
-}) => EvtE, makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<RContext, DrainE, void>>, provideContext: (context: RequestContext) => <R, E, A>(eff: Effect<RContext | R, E, A>) => Effect<Exclude<R, RContext | RequestContextContainer>, E, A>, parseDrain: (a: unknown, env?: Parser.ParserEnv | undefined) => Effect<never, CustomSchemaException, {
+}) => EvtE, makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>, parseDrain: (a: unknown, env?: Parser.ParserEnv | undefined) => Effect<never, CustomSchemaException, {
     body: DrainEvt;
     meta: RequestContext;
-}>): import("effect/Effect").Effect<MemQueue, never, {
-    publish: (messages_0: Evt, ...messages_1: Evt[]) => import("effect/Effect").Effect<RequestContextContainer, never, import("effect/Fiber").RuntimeFiber<never, void[]>>;
+}>): import("effect/Effect").Effect<MemQueue | RequestContextContainer, 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 | DrainR, 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;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAQvE,wBAAgB,YAAY,CAC1B,MAAM,EACN,GAAG,EACH,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,QAAQ,EACR,IAAI,EACJ,MAAM,EAEN,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,KAAK,IAAI,EACzD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EACxF,cAAc,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACnD,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC5B,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,uBAAuB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACjE,UAAU,EAAE,CACV,CAAC,EAAE,OAAO,EACV,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,KAC/B,MAAM,CAAC,KAAK,EAAE,qBAAqB,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;;;GAiEpF"}
+{"version":3,"file":"memQueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAA;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,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,OAAO,EAAE,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,KAAK,IAAI,EACzD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EACrF,UAAU,EAAE,CACV,CAAC,EAAE,OAAO,EACV,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,KAC/B,MAAM,CAAC,KAAK,EAAE,qBAAqB,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;;;GA8DpF"}

package/dist/services/QueueMaker/memQueue.js

@@ -1,26 +1,27 @@
 import * as tsplus_module_1 from "effect/Effect";
 import * as tsplus_module_2 from "@effect-app/core/_ext/Iterable";
 import * as tsplus_module_3 from "@effect-app/infra/services/QueueMaker/errors";
-import * as tsplus_module_4 from "@effect-app/prelude/utils";
-import * as tsplus_module_5 from "@effect-app/prelude/schema";
-import * as tsplus_module_6 from "effect/Fiber";
+import * as tsplus_module_4 from "@effect-app/prelude/schema";
+import * as tsplus_module_5 from "@effect-app/infra/services/Store/Memory";
+import * as tsplus_module_6 from "@effect-app/prelude/utils";
+import * as tsplus_module_7 from "effect/Fiber";
 import { MemQueue } from "@effect-app/infra-adapters/memQueue";
 import { RequestContext } from "@effect-app/infra/RequestContext";
 import { RequestId } from "@effect-app/prelude/ids";
 import { RequestContextContainer } from "../RequestContextContainer.js";
-import { restoreFromRequestContext } from "../Store/Memory.js";
 import { reportNonInterruptedFailure } from "./errors.js";
 /**
  * @tsplus static QueueMaker.Ops makeMem
  */
-export function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provideContext, parseDrain) {
+export function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, parseDrain) {
     return tsplus_module_1.gen(function* ($) {
         const mem = yield* $(MemQueue);
         const q = yield* $(mem.getOrCreateQueue(queueName));
         const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName));
+        const rcc = yield* $(RequestContextContainer);
         return {
             publish: (...messages) => tsplus_module_1.gen(function* ($) {
-                const requestContext = yield* $(RequestContextContainer.get);
+                const requestContext = yield* $(rcc.requestContext);
                 return yield* $(tsplus_module_3.forkDaemonReportQueue(tsplus_module_2.ext_forEach(messages, (m) => tsplus_module_1.asUnit(
                 // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
                 tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.stringify(encoder({ body: m, meta: requestContext })))
@@ -32,13 +33,13 @@ export function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent
                 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)
-                tsplus_module_1.flatMap(tsplus_module_1.orDie(tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => provideContext(RequestContext.inherit(meta, {
+                tsplus_module_1.flatMap(tsplus_module_1.orDie(tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => tsplus_module_1.zipRight(silenceAndReportError(tsplus_module_1.zipRight(tsplus_module_1.annotateLogs({ body: tsplus_module_6.RecordPretty(tsplus_module_6.object$(body)), meta: tsplus_module_6.RecordPretty(tsplus_module_6.object$(meta)) })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body))))(tsplus_module_1.zipRight(tsplus_module_1.flatMap(rcc.requestContext, (_) => tsplus_module_5.restoreFromRequestContext(_)))(rcc.start(RequestContext.inherit(meta, {
                     id: RequestId(body.id),
                     locale: "en",
-                    name: tsplus_module_5.ReasonableString(body._tag)
-                }))(silenceAndReportError(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_1.annotateLogs({ body: tsplus_module_4.RecordPretty(tsplus_module_4.object$(body)), meta: tsplus_module_4.RecordPretty(tsplus_module_4.object$(meta)) })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => restoreFromRequestContext), handleEvent(body)))));
+                    name: tsplus_module_4.ReasonableString(body._tag)
+                })))));
                 return yield* $(tsplus_module_1.forkScoped(tsplus_module_1.forever(silenceAndReportError(tsplus_module_1.flatMap(qDrain
-                    .take(), (x) => tsplus_module_1.flatMap(tsplus_module_1.fork(tsplus_module_1.uninterruptible(processMessage(x))), (_) => tsplus_module_6.join(_)))
+                    .take(), (x) => tsplus_module_1.flatMap(tsplus_module_1.fork(tsplus_module_1.uninterruptible(processMessage(x))), (_) => tsplus_module_7.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.
                 ))));
@@ -46,4 +47,4 @@ export function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFDQUFxQyxDQUFBO0FBQzlELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQTtBQUNqRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFFbkQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDOUQsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBR3pEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FRMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsT0FBeUQsRUFDekQsZUFBd0YsRUFDeEYsY0FFaUUsRUFDakUsVUFHbUY7SUFFbkYsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDbkQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO1FBRTdELE9BQU87WUFDTCxPQUFPLEVBQUUsQ0FBQyxHQUFHLFFBQVEsRUFBRSxFQUFFLENBQ3ZCLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7Z0JBQ3BCLE1BQU0sY0FBYyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDNUQsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLHVDQUNiLDRCQUFBLFFBQVEsRUFDUyxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUNuQix1SEFBdUg7Z0JBQ3ZILHdCQUFBLDJCQUNFLElBQUksQ0FBQyxTQUFTLENBQ1osT0FBTyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FDM0MsQ0FDRjtnQkFDQyx1RUFBdUU7a0JBQzlELENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQ3BCLENBQ1YsRUFFSixDQUFBO1lBQ0gsQ0FBQyxDQUFDO1lBQ0osS0FBSyxFQUFFLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7Z0JBQzNCLE1BQU0sV0FBVyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsQ0FBQTtnQkFDN0MsTUFBTSxxQkFBcUIsR0FBRywyQkFBMkIsQ0FBQyxFQUFFLElBQUksRUFBRSxpQkFBaUIsR0FBRyxjQUFjLEVBQUUsQ0FBQyxDQUFBO2dCQUN2RyxNQUFNLGNBQWMsR0FBRyxDQUFDLEdBQVcsRUFBRSxFQUFFO2dCQUNyQyxzSEFBc0g7Z0JBQ3RILDhDQUFBLHdCQUFBLDJCQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsRUFDWixVQUFVLENBQUMsR0FFWCxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FRdEIsY0FBYyxDQUNaLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFO29CQUMzQixFQUFFLEVBQUUsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7b0JBQ3RCLE1BQU0sRUFBRSxJQUFhO29CQUNyQixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztpQkFDbEMsQ0FBQyxDQUNILENBUkkscUJBQXFCLENBTDlCLHlCQUFBLG9CQUVTLDZCQUFvQixFQUFFLElBQUksdURBQUUsSUFBSSxFQUFVLEVBQUUsSUFBSSx1REFBRSxJQUFJLEVBQVUsRUFBRSxDQUFDLENBRjVFLHlCQUNZLE9BQU8sY0FBYywrQkFBK0IsQ0FBQyxHQUUxRCxHQUFHLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxFQUMzQixXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsRUFVM0IsQ0FDSixDQUFBO2dCQUNMLE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxvREFNSixxQkFBcUIsQ0FMOUIsd0JBQUEsTUFBTTtxQkFDSCxJQUFJLEVBQUUsRUFDRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsNkVBQUEsY0FBYyxDQUFDLENBQUMsQ0FBQyxJQUE4QixDQUFDLENBQUMsRUFBRSxFQUFFLHNCQUFDLENBQUMsQ0FBSyxDQUFDLENBQUM7Z0JBQzlFLHlGQUF5RjtnQkFDekYsdUlBQXVJO29CQUkxSSxDQUFBO1lBQ0gsQ0FBQyxDQUFDO1NBQzhCLENBQUE7SUFDcEMsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBRW5ELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUd6RDs7R0FFRztBQUNILE1BQU0sVUFBVSxZQUFZLENBTzFCLFNBQWlCLEVBQ2pCLGNBQXNCLEVBQ3RCLE9BQXlELEVBQ3pELGVBQXFGLEVBQ3JGLFVBR21GO0lBRW5GLE9BQU8sb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDOUIsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO1FBQ25ELE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQTtRQUM3RCxNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUU3QyxPQUFPO1lBQ0wsT0FBTyxFQUFFLENBQUMsR0FBRyxRQUFRLEVBQUUsRUFBRSxDQUN2QixvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO2dCQUNwQixNQUFNLGNBQWMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFBO2dCQUNuRCxPQUFPLEtBQUssQ0FBQyxDQUFDLENBQUMsdUNBQ2IsNEJBQUEsUUFBUSxFQUNTLENBQUMsQ0FBQyxFQUFFLEVBQUU7Z0JBQ25CLHVIQUF1SDtnQkFDdkgsd0JBQUEsMkJBQ0UsSUFBSSxDQUFDLFNBQVMsQ0FDWixPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxjQUFjLEVBQUUsQ0FBQyxDQUMzQyxDQUNGO2dCQUNDLHVFQUF1RTtrQkFDOUQsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FDcEIsQ0FDVixFQUVKLENBQUE7WUFDSCxDQUFDLENBQUM7WUFDSixLQUFLLEVBQUUsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztnQkFDM0IsTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFBO2dCQUM3QyxNQUFNLHFCQUFxQixHQUFHLDJCQUEyQixDQUFDLEVBQUUsSUFBSSxFQUFFLGlCQUFpQixHQUFHLGNBQWMsRUFBRSxDQUFDLENBQUE7Z0JBQ3ZHLE1BQU0sY0FBYyxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUU7Z0JBQ3JDLHNIQUFzSDtnQkFDdEgsOENBQUEsd0JBQUEsMkJBQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUNaLFVBQVUsQ0FBQyxHQUVYLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSwwQkFXZixxQkFBcUIsQ0FKNUIseUJBRU8sNkJBQW9CLEVBQUUsSUFBSSx1REFBRSxJQUFJLEVBQVUsRUFBRSxJQUFJLHVEQUFFLElBQUksRUFBVSxFQUFFLENBQUMsQ0FGMUUseUJBQ1UsT0FBTyxjQUFjLCtCQUErQixDQUFDLEdBRXJELFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyw0QkFKNUIsd0JBQUEsR0FBRyxDQUFDLGNBQWMsRUFBUyxDQUFDLENBQUMsRUFBRSxFQUFFLDJDQUFDLENBQUMsQ0FBZSxDQUFDLEVBTHZELEdBQUcsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUU7b0JBQ3JDLEVBQUUsRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztvQkFDdEIsTUFBTSxFQUFFLElBQWE7b0JBQ3JCLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2lCQUNsQyxDQUFDLENBQUMsRUFNOEIsQ0FDbEMsQ0FBQTtnQkFDTCxPQUFPLEtBQUssQ0FBQyxDQUFDLENBQUMsb0RBTUoscUJBQXFCLENBTDlCLHdCQUFBLE1BQU07cUJBQ0gsSUFBSSxFQUFFLEVBQ0UsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLDZFQUFBLGNBQWMsQ0FBQyxDQUFDLENBQUMsSUFBOEIsQ0FBQyxDQUFDLEVBQUUsRUFBRSxzQkFBQyxDQUFDLENBQUssQ0FBQyxDQUFDO2dCQUM5RSx5RkFBeUY7Z0JBQ3pGLHVJQUF1STtvQkFJMUksQ0FBQTtZQUNILENBQUMsQ0FBQztTQUM4QixDQUFBO0lBQ3BDLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9

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

@@ -13,15 +13,15 @@ export declare function makeServiceBusQueue<DrainR, Evt extends {
 }, DrainEvt extends {
     id: StringId;
     _tag: string;
-}, RContext, EvtE, DrainE>(_queueName: string, queueDrainName: string, encoder: (e: {
+}, EvtE, DrainE>(_queueName: string, queueDrainName: string, encoder: (e: {
     body: Evt;
     meta: RequestContext;
-}) => EvtE, makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<RContext, DrainE, void>>, provideContext: (context: RequestContext) => <R, E, A>(eff: Effect<RContext | R, E, A>) => Effect<Exclude<R, RContext | RequestContextContainer>, E, A>, parseDrain: (a: unknown, env?: Parser.ParserEnv | undefined) => Effect<never, CustomSchemaException, {
+}) => EvtE, makeHandleEvent: Effect<DrainR, never, (ks: DrainEvt) => Effect<never, DrainE, void>>, parseDrain: (a: unknown, env?: Parser.ParserEnv | undefined) => Effect<never, CustomSchemaException, {
     body: DrainEvt;
     meta: RequestContext;
-}>): import("effect/Effect").Effect<import("@azure/service-bus").ServiceBusReceiver | import("@azure/service-bus").ServiceBusSender, never, {
+}>): 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 | DrainR, never, void>;
-    publish: (messages_0: Evt, ...messages_1: Evt[]) => import("effect/Effect").Effect<RequestContextContainer, never, import("effect/Fiber").RuntimeFiber<never, void>>;
+    publish: (messages_0: Evt, ...messages_1: Evt[]) => import("effect/Effect").Effect<never, never, import("effect/Fiber").RuntimeFiber<never, void>>;
 }>;
 /**
  * @tsplus static QueueMaker.Ops makeServiceBusLayers

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":";;AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAQvE,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,QAAQ,EACR,IAAI,EACJ,MAAM,EAEN,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,KAAK,IAAI,EACzD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EACxF,cAAc,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EACnD,GAAG,EAAE,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAC5B,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,uBAAuB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EACjE,UAAU,EAAE,CACV,CAAC,EAAE,OAAO,EACV,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,KAC/B,MAAM,CAAC,KAAK,EAAE,qBAAqB,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;;;GAuEpF;;;;;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+IAG1F"}
+{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":";;AAUA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,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,OAAO,EAAE,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,KAAK,IAAI,EACzD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,EACrF,UAAU,EAAE,CACV,CAAC,EAAE,OAAO,EACV,GAAG,CAAC,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,KAC/B,MAAM,CAAC,KAAK,EAAE,qBAAqB,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;;;GAoEpF;;;;;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+IAG1F"}

package/dist/services/QueueMaker/sbqueue.js

@@ -1,47 +1,48 @@
 import * as tsplus_module_1 from "@effect-app/core/Tag";
-import * as tsplus_module_2 from "effect/Effect";
-import * as tsplus_module_3 from "@effect-app/prelude/utils";
-import * as tsplus_module_4 from "@effect-app/prelude/schema";
-import * as tsplus_module_5 from "@effect-app/infra/services/QueueMaker/errors";
-import * as tsplus_module_6 from "effect/Layer";
+import * as tsplus_module_2 from "@effect-app/prelude/schema";
+import * as tsplus_module_3 from "@effect-app/infra/services/Store/Memory";
+import * as tsplus_module_4 from "effect/Effect";
+import * as tsplus_module_5 from "@effect-app/prelude/utils";
+import * as tsplus_module_6 from "@effect-app/infra/services/QueueMaker/errors";
+import * as tsplus_module_7 from "effect/Layer";
 import { LiveReceiver, LiveSender, LiveServiceBusClient, Receiver, Sender, subscribe } from "@effect-app/infra-adapters/ServiceBus";
 import { captureException } from "@effect-app/infra/errorReporter";
 import { RequestContext } from "@effect-app/infra/RequestContext";
 import { RequestId } from "@effect-app/prelude/ids";
 import { RequestContextContainer } from "../RequestContextContainer.js";
-import { restoreFromRequestContext } from "../Store/Memory.js";
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js";
 /**
  * @tsplus static QueueMaker.Ops makeServiceBus
  */
-export function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEvent, provideContext, parseDrain) {
-    return tsplus_module_2.gen(function* ($) {
+export function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEvent, parseDrain) {
+    return tsplus_module_4.gen(function* ($) {
         const s = yield* $(Sender);
         const receiver = yield* $(Receiver);
         const receiverLayer = tsplus_module_1.makeLayer(Receiver, receiver);
         const silenceAndReportError = reportNonInterruptedFailure({ name: "ServiceBusQueue.drain." + queueDrainName });
         const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName });
+        const rcc = yield* $(RequestContextContainer);
         return {
-            drain: tsplus_module_2.gen(function* ($) {
+            drain: tsplus_module_4.gen(function* ($) {
                 const handleEvent = yield* $(makeHandleEvent);
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 function processMessage(messageBody) {
-                    return tsplus_module_2.tapErrorCause(tsplus_module_2.flatMap(tsplus_module_2.orDie(tsplus_module_2.flatMap(tsplus_module_2.sync(() => JSON.parse(messageBody)), (x) => parseDrain(x))), ({ body, meta }) => provideContext(RequestContext.inherit(meta, {
+                    return tsplus_module_4.tapErrorCause(tsplus_module_4.flatMap(tsplus_module_4.orDie(tsplus_module_4.flatMap(tsplus_module_4.sync(() => JSON.parse(messageBody)), (x) => parseDrain(x))), ({ body, meta }) => tsplus_module_4.zipRight(silenceAndReportError(tsplus_module_4.orDie(tsplus_module_4.zipRight(tsplus_module_4.annotateLogs({ body: tsplus_module_5.RecordPretty(tsplus_module_5.object$(body)), meta: tsplus_module_5.RecordPretty(tsplus_module_5.object$(meta)) })(tsplus_module_4.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), handleEvent(body)))))(tsplus_module_4.zipRight(tsplus_module_4.flatMap(rcc.requestContext, (_) => tsplus_module_3.restoreFromRequestContext(_)))(rcc.start(RequestContext.inherit(meta, {
                         id: RequestId(body.id),
                         locale: "en",
-                        name: tsplus_module_4.ReasonableString(body._tag)
-                    }))(silenceAndReportError(tsplus_module_2.orDie(tsplus_module_2.zipRight(tsplus_module_2.tap(tsplus_module_2.annotateLogs({ body: tsplus_module_3.RecordPretty(tsplus_module_3.object$(body)), meta: tsplus_module_3.RecordPretty(tsplus_module_3.object$(meta)) })(tsplus_module_2.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => restoreFromRequestContext), handleEvent(body))))))
+                        name: tsplus_module_2.ReasonableString(body._tag)
+                    })))))
                     // we reportError here, so that we report the error only, and keep flowing
                     , reportError);
                 }
-                return yield* $(tsplus_module_2.provide(subscribe({
-                    processMessage: (x) => tsplus_module_2.uninterruptible(processMessage(x.body)),
-                    processError: (err) => tsplus_module_2.sync(() => captureException(err.error))
+                return yield* $(tsplus_module_4.provide(subscribe({
+                    processMessage: (x) => tsplus_module_4.uninterruptible(processMessage(x.body)),
+                    processError: (err) => tsplus_module_4.sync(() => captureException(err.error))
                 }), receiverLayer));
             }),
-            publish: (...messages) => tsplus_module_2.gen(function* ($) {
-                const requestContext = yield* $(RequestContextContainer.get);
-                return yield* $(tsplus_module_5.forkDaemonReportQueue(tsplus_module_2.promise(() => s.sendMessages(messages.map((x) => ({
+            publish: (...messages) => tsplus_module_4.gen(function* ($) {
+                const requestContext = yield* $(rcc.requestContext);
+                return yield* $(tsplus_module_6.forkDaemonReportQueue(tsplus_module_4.promise(() => s.sendMessages(messages.map((x) => ({
                     body: JSON.stringify(encoder({ body: x, meta: requestContext })),
                     messageId: x.id, /* correllationid: requestId */
                     contentType: "application/json"
@@ -54,6 +55,6 @@ export function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHan
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
 export function makeServiceBusLayers(url, queueName, queueDrainName) {
-    return tsplus_module_6.provide((tsplus_module_6.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))))(LiveServiceBusClient(url));
+    return tsplus_module_7.provide((tsplus_module_7.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))))(LiveServiceBusClient(url));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLE9BQU8sRUFDTCxZQUFZLEVBQ1osVUFBVSxFQUNWLG9CQUFvQixFQUNwQixRQUFRLEVBQ1IsTUFBTSxFQUNOLFNBQVMsRUFDVixNQUFNLHVDQUF1QyxDQUFBO0FBRTlDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFBO0FBQ2xFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQTtBQUNqRSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFFbkQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDOUQsT0FBTyxFQUFFLDJCQUEyQixFQUFFLGdDQUFnQyxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRzNGOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG1CQUFtQixDQVFqQyxVQUFrQixFQUNsQixjQUFzQixFQUN0QixPQUF5RCxFQUN6RCxlQUF3RixFQUN4RixjQUVpRSxFQUNqRSxVQUdtRjtJQUVuRixPQUFPLG9CQUFXLFFBQVEsQ0FBQyxFQUFDLENBQUM7UUFDM0IsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFBO1FBQzFCLE1BQU0sUUFBUSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUNuQyxNQUFNLGFBQWEsR0FBRywwQkFBQSxRQUFRLEVBQVcsUUFBUSxDQUFDLENBQUE7UUFDbEQsTUFBTSxxQkFBcUIsR0FBRywyQkFBMkIsQ0FBQyxFQUFFLElBQUksRUFBRSx3QkFBd0IsR0FBRyxjQUFjLEVBQUUsQ0FBQyxDQUFBO1FBQzlHLE1BQU0sV0FBVyxHQUFHLGdDQUFnQyxDQUFDLEVBQUUsSUFBSSxFQUFFLHdCQUF3QixHQUFHLGNBQWMsRUFBRSxDQUFDLENBQUE7UUFFekcsT0FBTztZQUNMLEtBQUssRUFBRSxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO2dCQUMzQixNQUFNLFdBQVcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLENBQUE7Z0JBQzdDLDhEQUE4RDtnQkFDOUQsU0FBUyxjQUFjLENBQUMsV0FBZ0I7b0JBQ3RDLE9BQU8sOEJBQUEsOENBQUEsd0JBQUEscUJBQ0MsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQyxFQUMzQixDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBRXJCLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQVV0QixjQUFjLENBQ1osY0FBYyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUU7d0JBQzNCLEVBQUUsRUFBRSxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQzt3QkFDdEIsTUFBTSxFQUFFLElBQWE7d0JBQ3JCLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO3FCQUNsQyxDQUFDLENBQ0gsQ0FSSSxxQkFBcUIsdUJBUDlCLHlCQUFBLG9CQUVTLDZCQUFvQixFQUFFLElBQUksdURBQUUsSUFBSSxFQUFVLEVBQUUsSUFBSSx1REFBRSxJQUFJLEVBQVUsRUFBRSxDQUFDLENBRjVFLHlCQUNZLE9BQU8sY0FBYywrQkFBK0IsQ0FBQyxHQUUxRCxHQUFHLEVBQUUsQ0FBQyx5QkFBeUIsQ0FBQyxFQUMzQixXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsR0FZM0IsQ0FDSjtvQkFDRCwwRUFBMEU7c0JBQzNELFdBQVcsQ0FBQyxDQUFBO2dCQUMvQixDQUFDO2dCQUVELE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNiLHdCQUFBLFNBQVMsQ0FBQztvQkFDUixjQUFjLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxpQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFnQjtvQkFDN0QsWUFBWSxFQUFFLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQywyQkFBTyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7aUJBQzNELENBQUMsRUFDUyxhQUFhLENBQUMsQ0FDMUIsQ0FBQTtZQUNILENBQUMsQ0FBQztZQUVGLE9BQU8sRUFBRSxDQUFDLEdBQUcsUUFBUSxFQUFFLEVBQUUsQ0FDdkIsb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztnQkFDcEIsTUFBTSxjQUFjLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUM1RCxPQUFPLEtBQUssQ0FBQyxDQUFDLENBQUMsdUNBQ2Isd0JBQ1csR0FBRyxFQUFFLENBQ1osQ0FBQyxDQUFDLFlBQVksQ0FDWixRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUNuQixJQUFJLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FDbEIsT0FBTyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLENBQUMsQ0FDM0M7b0JBQ0QsU0FBUyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsK0JBQStCO29CQUNoRCxXQUFXLEVBQUUsa0JBQWtCO2lCQUNoQyxDQUFDLENBQUMsQ0FDSixDQUNGLEVBRUosQ0FBQTtZQUNILENBQUMsQ0FBQztTQUM0QixDQUFBO0lBQ3BDLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG9CQUFvQixDQUFDLEdBQVcsRUFBRSxTQUFpQixFQUFFLGNBQXNCO0lBQ3pGLCtCQUNLLHVCQUFnQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQXBELFlBQVksQ0FBQyxjQUFjLENBQUMsRUFBeUIsRUFEcEQsb0JBQW9CLENBQUMsR0FBRyxDQUFDLEVBQzJCO0FBQzdELENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsUUFBUSxFQUNSLE1BQU0sRUFDTixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBRW5ELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUczRjs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FPakMsVUFBa0IsRUFDbEIsY0FBc0IsRUFDdEIsT0FBeUQsRUFDekQsZUFBcUYsRUFDckYsVUFHbUY7SUFFbkYsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUMxQixNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDbkMsTUFBTSxhQUFhLEdBQUcsMEJBQUEsUUFBUSxFQUFXLFFBQVEsQ0FBQyxDQUFBO1FBQ2xELE1BQU0scUJBQXFCLEdBQUcsMkJBQTJCLENBQUMsRUFBRSxJQUFJLEVBQUUsd0JBQXdCLEdBQUcsY0FBYyxFQUFFLENBQUMsQ0FBQTtRQUM5RyxNQUFNLFdBQVcsR0FBRyxnQ0FBZ0MsQ0FBQyxFQUFFLElBQUksRUFBRSx3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

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

@@ -1,10 +1,9 @@
 import { Effect } from "effect/Effect";
 import { Scope } from "effect/Scope";
 import { NonEmptyReadonlyArray } from "effect/ReadonlyArray";
-import type { RequestContextContainer } from "../RequestContextContainer.js";
 export interface QueueBase<RContext, Evt> {
     drain: Effect<Scope | RContext, never, void>;
-    publish: (...messages: NonEmptyReadonlyArray<Evt>) => Effect<RequestContextContainer, never, void>;
+    publish: (...messages: NonEmptyReadonlyArray<Evt>) => Effect<never, never, void>;
 }
 /**
  * @tsplus type QueueMaker.Ops

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,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AAE5E,MAAM,WAAW,SAAS,CAAC,QAAQ,EAAE,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC5C,OAAO,EAAE,CACP,GAAG,QAAQ,EAAE,qBAAqB,CAAC,GAAG,CAAC,KACpC,MAAM,CAAC,uBAAuB,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CAClD;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;CAAG;AACjC,eAAO,MAAM,UAAU,EAAE,aAAkB,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/service.ts"],"names":[],"mappings":";;;AAAA,MAAM,WAAW,SAAS,CAAC,QAAQ,EAAE,GAAG;IACtC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC5C,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"}

package/dist/services/QueueMaker/service.js

@@ -1,2 +1,2 @@
 export const QueueMaker = {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWFBLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBa0IsRUFBRSxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVdBLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBa0IsRUFBRSxDQUFBIn0=

package/dist/services/Store/Memory.d.ts

@@ -1,6 +1,6 @@
 import { Effect } from "effect/Effect";
 import { NonEmptyReadonlyArray, NonEmptyArray } from "effect/ReadonlyArray";
-import { RequestContextContainer } from "../RequestContextContainer.js";
+import type { RequestContext } from "../../RequestContext.js";
 import type { Filter, PersistenceModelType, Store, StoreConfig } from "./service.js";
 import { StoreMaker } from "./service.js";
 export declare function memFilter<T extends {
@@ -10,7 +10,11 @@ export declare function memFilter<T extends {
     limit?: number;
 }): (c: T[]) => T[];
 export declare const storeId: import("effect/FiberRef").FiberRef<string>;
-export declare const restoreFromRequestContext: import("effect/Effect").Effect<RequestContextContainer, never, void>;
+/**
+ * @tsplus getter RequestContext restoreStoreId
+ * @tsplus location "@effect-app/infra/services/Store/Memory"
+ */
+export declare const restoreFromRequestContext: (ctx: RequestContext) => import("effect/Effect").Effect<never, never, void>;
 export declare function makeMemoryStoreInt<Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(name: string, seed?: Effect<R, E, Iterable<PM>>): import("effect/Effect").Effect<R, E, Store<PM, Id>>;
 export declare const makeMemoryStore: () => {
     make: <Id extends string, PM extends PersistenceModelType<Id>, R = never, E = never>(name: string, seed?: Effect<R, E, Iterable<PM>>, config?: StoreConfig<PM>) => import("effect/Effect").Effect<R, E, Store<PM, Id>>;

package/dist/services/Store/Memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/Memory.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,MAAM,EAAoB,oBAAoB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AACtG,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,wBAAgB,SAAS,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,OACnG,CAAC,EAAE,KAAG,CAAC,EAAE,CAetB;AAED,eAAO,MAAM,OAAO,4CAAiC,CAAA;AACrD,eAAO,MAAM,yBAAyB,sEAErC,CAAA;AAeD,wBAAgB,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,SAAS,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAC7G,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,uDAqDlC;AAED,eAAO,MAAM,eAAe;+FAElB,MAAM,SACL,OAAO,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,WACxB,YAAY,EAAE,CAAC;CAoC1B,CAAA;AAEF,eAAO,MAAM,eAAe,wDAA0C,CAAA"}
+{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/Memory.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAoB,oBAAoB,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AACtG,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,wBAAgB,SAAS,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,OACnG,CAAC,EAAE,KAAG,CAAC,EAAE,CAetB;AAED,eAAO,MAAM,OAAO,4CAAiC,CAAA;;;;;AAKrD,eAAO,MAAM,yBAAyB,QAAS,cAAc,uDAA4C,CAAA;AAezG,wBAAgB,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,SAAS,oBAAoB,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAC7G,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,uDAqDlC;AAED,eAAO,MAAM,eAAe;+FAElB,MAAM,SACL,OAAO,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,WACxB,YAAY,EAAE,CAAC;CAoC1B,CAAA;AAEF,eAAO,MAAM,eAAe,wDAA0C,CAAA"}

package/dist/services/Store/Memory.js

@@ -6,8 +6,6 @@ import * as tsplus_module_5 from "effect/Effect";
 import * as tsplus_module_6 from "effect/Chunk";
 import * as tsplus_module_7 from "effect/Ref";
 import * as tsplus_module_8 from "@effect-app/core/_ext/Iterable";
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { RequestContextContainer } from "../RequestContextContainer.js";
 import { StoreMaker } from "./service.js";
 import { codeFilter, codeFilterJoinSelect, makeETag, makeUpdateETag } from "./utils.js";
 export function memFilter(filter, cursor) {
@@ -28,7 +26,10 @@ export function memFilter(filter, cursor) {
     });
 }
 export const storeId = tsplus_module_4.unsafeMake("primary");
-export const restoreFromRequestContext = tsplus_module_5.flatMap(RequestContextContainer.get, (ctx) => tsplus_module_4.set(storeId, ctx.namespace ?? "primary"));
+/**
+ * @tsplus getter RequestContext restoreStoreId
+ */
+export const restoreFromRequestContext = (ctx) => tsplus_module_4.set(storeId, ctx.namespace ?? "primary");
 function logQuery(filter, cursor) {
     return tsplus_module_5.annotateLogs({
         query: JSON.stringify(filter, undefined, 2),
@@ -100,4 +101,4 @@ export const makeMemoryStore = () => ({
     })
 });
 export const MemoryStoreLive = StoreMaker.makeLayer(makeMemoryStore());
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../../_src/services/Store/Memory.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../../_src/services/Store/Memory.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.87.5",
+  "version": "0.89.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -18,10 +18,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
-    "@effect-app/schema": "0.62.1",
-    "@effect-app/prelude": "0.70.1",
+    "@effect-app/core": "0.68.1",
     "@effect-app/infra-adapters": "0.59.1",
-    "@effect-app/core": "0.68.1"
+    "@effect-app/prelude": "0.70.1",
+    "@effect-app/schema": "0.62.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.0",