@effect-app/infra 0.25.7 → 0.25.9

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @effect-app/infra
 
+## 0.25.9
+
+### Patch Changes
+
+- 8da4c8fc: Add match and improve error handling
+- Updated dependencies [8da4c8fc]
+  - @effect-app/core@0.23.1
+  - @effect-app/infra-adapters@0.20.5
+  - @effect-app/prelude@0.21.5
+  - @effect-app/schema@0.18.4
+
+## 0.25.8
+
+### Patch Changes
+
+- ba26d2fc: Fix Queue error reporting and request semantics
+
 ## 0.25.7
 
 ### Patch Changes

package/_cjs/api/defaultErrorHandler.cjs

@@ -14,29 +14,24 @@ var _reportError = require("./reportError.cjs");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function defaultBasicErrorHandler(_req, res, _requestContext, r2) {
-  return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
-    res.status(400).send(err.errors);
-  }))
+  const sendError = code => body => tsplus_module_1.sync(() => res.status(code).send(body));
+  return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => sendError(400)(err.errors))
   // final catch all; expecting never so that unhandled known errors will show up
   , err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
 }
 const optimisticConcurrencySchedule = tsplus_module_5.intersect(tsplus_module_5.recurWhile(a => a._tag === "OptimisticConcurrencyException"))(tsplus_module_5.once());
 function defaultErrorHandler(req, res, _, r2) {
   const r3 = req.method === "PATCH" ? tsplus_module_1.retry(r2, optimisticConcurrencySchedule) : r2;
-  return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
-    res.status(400).send(err.errors);
-  })), "NotFoundError", err => tsplus_module_1.sync(() => {
-    res.status(404).send(err);
-  })), "NotLoggedInError", err => tsplus_module_1.sync(() => {
-    res.status(401).send(err);
-  })), "UnauthorizedError", err => tsplus_module_1.sync(() => {
-    res.status(403).send(err);
-  })), "InvalidStateError", err => tsplus_module_1.sync(() => {
-    res.status(422).send(err);
-  })), "OptimisticConcurrencyException", err => tsplus_module_1.sync(() => {
+  const sendError = code => body => tsplus_module_1.sync(() => res.status(code).send(body));
+  return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTags(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), {
+    "ValidationError": err => sendError(400)(err.errors),
+    "NotFoundError": sendError(404),
+    "NotLoggedInError": sendError(401),
+    "UnauthorizedError": sendError(403),
+    "InvalidStateError": sendError(422),
     // 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
-    res.status(412).send(err);
-  }))
+    "OptimisticConcurrencyException": sendError(412)
+  })
   // final catch all; expecting never so that unhandled known errors will show up
   , err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
 }

package/_cjs/api/defaultErrorHandler.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"defaultErrorHandler.cjs","mappings":";;;;;;;;;;;;AAUA;AAAkD;AAAA;AAE5C,SAAUA,wBAAwB,CACtCC,IAAqB,EACrBC,GAAqB,EACrBC,eAA+B,EAC/BC,EAAoC;EAEpC,OAAOC,yBAAe,MACpBC,kFAAE,EACeC,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAC9BJ,qBAAY,MAAK;IACfJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAACG,MAAM,CAAC;EAClC,CAAC,CAAC;EACJ;EAAA,EACWH,GAAU,IACnBJ,qEACE,gGAAgG,GAAGI,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH;AAEA,MAAMI,6BAA6B,6BACjCC,2BAAqCC,CAAC,IAAIA,CAAC,CAACC,IAAI,KAAK,gCAAgC,CAAC,EADlDF,sBAAe,CACmC;AAElF,SAAUG,mBAAmB,CACjCC,GAAoB,EACpBjB,GAAqB,EACrBkB,CAAiB,EACjBhB,EAAoC;EAEpC,MAAMiB,EAAE,GAAGF,GAAG,CAACG,MAAM,KAAK,OAAO,GAC7BhB,wBAAE,EAAOQ,6BAA6B,CAAC,GACvCV,EAAE;EACN,OAAOC,yBAAe,MACpBC,+MAAE,EACeC,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAC9BJ,qBAAY,MAAK;IACfJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAACG,MAAM,CAAC;EAClC,CAAC,CAAC,CAAC,EACK,eAAe,EAAEH,GAAG,IAC5BJ,qBAAY,MAAK;IACfJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,kBAAkB,EAAEA,GAAG,IAC/BJ,qBAAY,MAAK;IACfJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,mBAAmB,EAAEA,GAAG,IAChCJ,qBAAY,MAAK;IACfJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,mBAAmB,EAAEA,GAAG,IAChCJ,qBAAY,MAAK;IACfJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,gCAAgC,EAAEA,GAAG,IAC7CJ,qBAAY,MAAK;IACf;IACAJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC;EACJ;EAAA,EACWA,GAAU,IACnBJ,qEACE,gGAAgG,GAAGI,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH","names":["defaultBasicErrorHandler","_req","res","_requestContext","r2","tsplus_module_4","tsplus_module_1","cause","tsplus_module_2","tsplus_module_3","err","status","send","errors","optimisticConcurrencySchedule","tsplus_module_5","a","_tag","defaultErrorHandler","req","_","r3","method"],"sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"sourcesContent":[null]}
+{"version":3,"file":"defaultErrorHandler.cjs","mappings":";;;;;;;;;;;;AAUA;AAAkD;AAAA;AAE5C,SAAUA,wBAAwB,CACtCC,IAAqB,EACrBC,GAAqB,EACrBC,eAA+B,EAC/BC,EAAoC;EAEpC,MAAMC,SAAS,GAAIC,IAAY,IAAMC,IAAa,IAAKC,2BAAON,GAAG,CAACO,MAAM,CAACH,IAAI,CAAC,CAACI,IAAI,CAACH,IAAI,CAAC,CAAC;EAC1F,OAAOI,yBAAe,MACpBH,kFAAE,EACeI,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAAIV,SAAS,CAAC,GAAG,CAAC,CAACU,GAAG,CAACC,MAAM,CAAC;EAC9D;EAAA,EACWD,GAAU,IACnBP,qEACE,gGAAgG,GAAGO,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH;AAEA,MAAME,6BAA6B,6BACjCC,2BAAqCC,CAAC,IAAIA,CAAC,CAACC,IAAI,KAAK,gCAAgC,CAAC,EADlDF,sBAAe,CACmC;AAElF,SAAUG,mBAAmB,CACjCC,GAAoB,EACpBpB,GAAqB,EACrBqB,CAAiB,EACjBnB,EAAoC;EAEpC,MAAMoB,EAAE,GAAGF,GAAG,CAACG,MAAM,KAAK,OAAO,GAC7BjB,wBAAE,EAAOS,6BAA6B,CAAC,GACvCb,EAAE;EACN,MAAMC,SAAS,GAAIC,IAAY,IAAMC,IAAa,IAAKC,2BAAON,GAAG,CAACO,MAAM,CAACH,IAAI,CAAC,CAACI,IAAI,CAACH,IAAI,CAAC,CAAC;EAC1F,OAAOI,yBAAe,MACpBH,mFAAE,EACeI,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACtE;IACT,iBAAiB,EAAEC,GAAG,IAAIV,SAAS,CAAC,GAAG,CAAC,CAACU,GAAG,CAACC,MAAM,CAAC;IACpD,eAAe,EAAEX,SAAS,CAAC,GAAG,CAAC;IAC/B,kBAAkB,EAAEA,SAAS,CAAC,GAAG,CAAC;IAClC,mBAAmB,EAAEA,SAAS,CAAC,GAAG,CAAC;IACnC,mBAAmB,EAAEA,SAAS,CAAC,GAAG,CAAC;IACnC;IACA,gCAAgC,EAAEA,SAAS,CAAC,GAAG;GAChD;EACD;EAAA,EACWU,GAAU,IACnBP,qEACE,gGAAgG,GAAGO,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH","names":["defaultBasicErrorHandler","_req","res","_requestContext","r2","sendError","code","body","tsplus_module_1","status","send","tsplus_module_4","cause","tsplus_module_2","tsplus_module_3","err","errors","optimisticConcurrencySchedule","tsplus_module_5","a","_tag","defaultErrorHandler","req","_","r3","method"],"sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"sourcesContent":[null]}

package/_cjs/services/QueueMaker/errors.cjs

@@ -5,11 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MessageException = exports.FatalQueueException = void 0;
 exports.forkDaemonReportQueue = forkDaemonReportQueue;
-exports.reportFailure = reportFailure;
-exports.reportQueueError = exports.reportFatalQueueError = void 0;
-var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
+exports.reportFatalQueueError = void 0;
+exports.reportNonInterruptedFailure = reportNonInterruptedFailure;
+exports.reportNonInterruptedFailureCause = reportNonInterruptedFailureCause;
+exports.reportQueueError = void 0;
+var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/core/Option"));
 var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/infra/RequestContext"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Effect"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect/data/Context"));
+var tsplus_module_4 = _interopRequireWildcard(require("@effect/io/Effect"));
+var tsplus_module_5 = _interopRequireWildcard(require("@effect/io/Exit"));
+var tsplus_module_6 = _interopRequireWildcard(require("@effect/io/Cause"));
 var _errorReporter = require("@effect-app/infra/errorReporter");
 var _errors = require("@effect-app/infra/errors");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -27,10 +32,10 @@ class FatalQueueException extends _errors.CauseException {
 }
 exports.FatalQueueException = FatalQueueException;
 const reportQueueError_ = (0, _errorReporter.reportError)(cause => new MessageException(cause));
-const reportQueueError = (cause, context) => tsplus_module_1.serviceWithEffect(tsplus_module_2.tag, requestContext => tsplus_module_1.sync(() => reportQueueError_(cause, {
-  requestContext,
+const reportQueueError = (cause, context) => tsplus_module_4.flatMap(tsplus_module_4.contextWith(_ => tsplus_module_3.getOption(_, tsplus_module_2.tag)), requestContext => reportQueueError_(cause, {
+  requestContext: tsplus_module_1.getOrUndefined(requestContext),
   ...context
-})));
+}));
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
  * new fiber is attached to the global scope, when the fiber executing the
@@ -42,13 +47,20 @@ const reportQueueError = (cause, context) => tsplus_module_1.serviceWithEffect(t
  */
 exports.reportQueueError = reportQueueError;
 function forkDaemonReportQueue(self) {
-  return tsplus_module_1.daemonChildren(tsplus_module_1.fork(tsplus_module_1.tapErrorCause(self, reportQueueError)));
+  return tsplus_module_4.daemonChildren(tsplus_module_4.fork(tsplus_module_4.tapErrorCause(self, reportNonInterruptedFailureCause({}))));
 }
 const reportFatalQueueError = (0, _errorReporter.reportError)(cause => new FatalQueueException(cause));
 exports.reportFatalQueueError = reportFatalQueueError;
-function reportFailure(name) {
-  return self => tsplus_module_1.tap(tsplus_module_1.exit(self), exit => exit._tag === "Failure" ? reportFatalQueueError(exit.cause, {
-    name
-  }) : tsplus_module_3.unit);
+function reportNonInterruptedFailure(context) {
+  const report = reportNonInterruptedFailureCause(context);
+  return inp => tsplus_module_4.flatMap(tsplus_module_4.exit(inp), result => tsplus_module_5.match(result, cause => tsplus_module_4.map(report(cause), () => result), () => tsplus_module_4.sync(() => result)));
+}
+function reportNonInterruptedFailureCause(context) {
+  return cause => {
+    if (tsplus_module_6.isInterrupted(cause)) {
+      return tsplus_module_4.failCause(cause);
+    }
+    return reportQueueError(cause, context);
+  };
 }
 //# sourceMappingURL=errors.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"errors.cjs","mappings":";;;;;;;;;;;;AAAA;AACA;AAAyD;AAAA;AAGnD,MAAOA,gBAAoB,SAAQC,sBAAiB;EACxDC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAEK,MAAOC,mBAAuB,SAAQH,sBAAiB;EAC3DC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAED,MAAME,iBAAiB,GAAG,8BAAW,EAACF,KAAK,IAAI,IAAIH,gBAAgB,CAACG,KAAK,CAAC,CAAC;AAEpE,MAAMG,gBAAgB,GAAG,CAAIH,KAAe,EAAEI,OAA6C,KAChGC,uDAAoCC,cAAc,IAChDD,2BAAOH,iBAAiB,CAACF,KAAK,EAAE;EAAEM,cAAc;EAAE,GAAGF;AAAO,CAAE,CAAC,CAAC,CACjE;AAEH;;;;;;;;;AAAA;AASM,SAAUG,qBAAqB,CAAUC,IAAqB;EAClE,2DAAOH,kCAAI,EAAeF,gBAAgB,CAAC;AAC7C;AAEO,MAAMM,qBAAqB,GAAG,8BAAW,EAC9CT,KAAK,IAAI,IAAIC,mBAAmB,CAACD,KAAK,CAAC,CACxC;AAAA;AAEK,SAAUU,aAAa,CAACC,IAAY;EACxC,OAAiBH,IAAqB,IACpCH,6CAAI,GAAUO,IAAI,IAChBA,IAAI,CAACC,IAAI,KAAK,SAAS,GACnBJ,qBAAqB,CAACG,IAAI,CAACZ,KAAK,EAAE;IAAEW;EAAI,CAAE,CAAC,GAC5CG,oBAAY,CAChB;AACL","names":["MessageException","CauseException","constructor","cause","FatalQueueException","reportQueueError_","reportQueueError","context","tsplus_module_1","requestContext","forkDaemonReportQueue","self","reportFatalQueueError","reportFailure","name","exit","_tag","tsplus_module_3"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/errors.ts"],"sourcesContent":[null]}
+{"version":3,"file":"errors.cjs","mappings":";;;;;;;;;;;;;;;;;AAAA;AACA;AAAyD;AAAA;AAGnD,MAAOA,gBAAoB,SAAQC,sBAAiB;EACxDC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAEK,MAAOC,mBAAuB,SAAQH,sBAAiB;EAC3DC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAED,MAAME,iBAAiB,GAAG,8BAAW,EAACF,KAAK,IAAI,IAAIH,gBAAgB,CAACG,KAAK,CAAC,CAAC;AAEpE,MAAMG,gBAAgB,GAAG,CAAIH,KAAe,EAAEI,OAA6C,KAChGC,oDAAoBC,CAAiB,IAAKC,0BAAkBD,CAAC,sBAAqB,CAAC,EACxEE,cAAc,IAAIN,iBAAiB,CAACF,KAAK,EAAE;EAAEQ,cAAc,iCAAEA,cAAc,CAAM;EAAE,GAAGJ;AAAO,CAAE,CAAC,CAAC;AAE9G;;;;;;;;;AAAA;AASM,SAAUK,qBAAqB,CAAUC,IAAqB;EAClE,2DAAOL,kCAAI,EAAeM,gCAAgC,CAAC,EAAE,CAAC,CAAC;AACjE;AAEO,MAAMC,qBAAqB,GAAG,8BAAW,EAC9CZ,KAAK,IAAI,IAAIC,mBAAmB,CAACD,KAAK,CAAC,CACxC;AAAA;AAEK,SAAUa,2BAA2B,CAACT,OAAiC;EAC3E,MAAMU,MAAM,GAAGH,gCAAgC,CAACP,OAAO,CAAC;EACxD,OAAiBW,GAAoB,IACnCV,gDAAG,GACQW,MAAM,IACbC,4BAAM,EACJjB,KAAK,IAAIK,0BAAM,CAACL,KAAK,CAAC,EAAK,MAAMgB,MAAM,CAAC,EACxC,MAAMX,2BAAOW,MAAM,CAAC,CACrB,CACF;AACP;AAEM,SAAUL,gCAAgC,CAACP,OAAiC;EAChF,OAAWJ,KAAe,IAAgC;IACxD,IAAIkB,mCAAK,CAAgB,EAAE;MACzB,iCAAQlB,KAAsB;;IAEhC,OAAOG,gBAAgB,CAACH,KAAK,EAAEI,OAAO,CAAC;EACzC,CAAC;AACH","names":["MessageException","CauseException","constructor","cause","FatalQueueException","reportQueueError_","reportQueueError","context","tsplus_module_4","_","tsplus_module_3","requestContext","forkDaemonReportQueue","self","reportNonInterruptedFailureCause","reportFatalQueueError","reportNonInterruptedFailure","report","inp","result","tsplus_module_5","tsplus_module_6"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/errors.ts"],"sourcesContent":[null]}

package/_cjs/services/QueueMaker/memQueue.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.makeMemQueue = makeMemQueue;
-exports.silence = silence;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
 var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/infra/RequestContext"));
 var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
@@ -13,10 +12,6 @@ var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/utils
 var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
 var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
 var tsplus_module_8 = _interopRequireWildcard(require("@effect/io/Fiber"));
-var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
-var tsplus_module_10 = _interopRequireWildcard(require("@effect/io/Cause"));
-var tsplus_module_11 = _interopRequireWildcard(require("@effect-app/core/Effect"));
-var tsplus_module_12 = _interopRequireWildcard(require("@effect/io/Exit"));
 var _memQueue = require("@effect-app/infra-adapters/memQueue");
 var _Memory = require("../Store/Memory.cjs");
 var _errors2 = require("./errors.cjs");
@@ -29,7 +24,7 @@ function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provi
   return tsplus_module_1.gen(function* ($) {
     const mem = yield* $(tsplus_module_1.service(_memQueue.MemQueue));
     const q = yield* $(mem.getOrCreateQueue(queueName));
-    const qReply = yield* $(mem.getOrCreateQueue(queueDrainName));
+    const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName));
     return {
       publish: (...messages) => tsplus_module_1.gen(function* ($) {
         const requestContext = yield* $(tsplus_module_1.service(tsplus_module_2.tag));
@@ -44,6 +39,9 @@ function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provi
       }),
       drain: tsplus_module_1.gen(function* ($) {
         const handleEvent = yield* $(makeHandleEvent);
+        const silenceAndReportError = (0, _errors2.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)), ({
@@ -53,29 +51,16 @@ function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provi
           id: body.id,
           locale: "en",
           name: tsplus_module_7.ReasonableString(body._tag)
-        }))(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_6.logAnnotates({
+        }))(silenceAndReportError(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_6.logAnnotates({
           body: tsplus_module_5.RecordPretty(tsplus_module_5.object$(body)),
           meta: tsplus_module_5.RecordPretty(tsplus_module_5.object$(meta))
-        })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => _Memory.restoreFromRequestContext), silence(handleEvent(body)))));
-        return yield* $(tsplus_module_1.forkScoped(tsplus_module_1.forever(tsplus_module_9.setupReq3((0, _errors2.reportFailure)("drain")(tsplus_module_1.flatMap(qReply.take(), x => tsplus_module_1.flatMap(tsplus_module_1.fork(tsplus_module_1.uninterruptible(processMessage(x))), _ => tsplus_module_8.join(_)))), "Queue.ReceiveMessage"))));
+        })(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_8.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.
+        ))));
       })
     };
   });
 }
-// We want the Queue to continue processing even on errors per messages
-// must make sure that the errors are processed/handled beforehand.
-function silence(inp) {
-  return tsplus_module_1.flatMap(tsplus_module_1.exit(inp), result => tsplus_module_1.gen(function* ($) {
-    const requestContext = yield* $(tsplus_module_1.service(tsplus_module_2.tag));
-    return yield* $(tsplus_module_12.match(result, cause => {
-      if (tsplus_module_10.isInterrupted(cause)) {
-        return tsplus_module_1.failCause(cause);
-      }
-      (0, _errors2.reportQueueError)(cause, {
-        requestContext
-      });
-      return tsplus_module_11.unit;
-    }, () => tsplus_module_11.unit));
-  }));
-}
 //# sourceMappingURL=memQueue.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"memQueue.cjs","mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAGA;AACA;AAA6D;AAAA;AAG7D;;;AAGM,SAAUA,YAAY,CAC1BC,SAAiB,EACjBC,cAAsB,EACtBC,OAAyD,EACzDC,eAAwF,EACxFC,cAEuC,EACvCC,UAGmF;EAEnF,OAAOC,oBAAW,WAAUC,CAAC;IAC3B,MAAMC,GAAG,GAAG,OAAOD,CAAC,yBAACE,kBAAQ,EAAQ;IACrC,MAAMC,CAAC,GAAG,OAAOH,CAAC,CAACC,GAAG,CAACG,gBAAgB,CAACX,SAAS,CAAC,CAAC;IACnD,MAAMY,MAAM,GAAG,OAAOL,CAAC,CAACC,GAAG,CAACG,gBAAgB,CAACV,cAAc,CAAC,CAAC;IAE7D,OAAO;MACLY,OAAO,EAAE,CAAC,GAAGC,QAAQ,KACnBR,oBAAW,WAAUC,CAAC;QACpB,MAAMQ,cAAc,GAAG,OAAOR,CAAC,8CAA2B;QAC1D,OAAO,OAAOA,CAAC,uCACbS,oCAAQ,EAAeC,CAAC,IAAGX;QACzB;QACAA,mDACEY,IAAI,CAACC,SAAS,CACZjB,OAAO,CAAC;UAAEkB,IAAI,EAAEH,CAAC;UAAEI,IAAI,EAAEN;QAAc,CAAE,CAAC,CAC3C;QAED;QAAA,EACSO,CAAC,IAAIZ,CAAC,CAACa,KAAK,CAACD,CAAC,CAAC,CAAC,CAClB,CACV,EAEF;MACH,CAAC,CAAC;MACJE,KAAK,EAAElB,oBAAW,WAAUC,CAAC;QAC3B,MAAMkB,WAAW,GAAG,OAAOlB,CAAC,CAACJ,eAAe,CAAC;QAC7C,MAAMuB,cAAc,GAAIC,GAAW;QACjC;QACArB,iGAAOY,IAAI,CAACU,KAAK,CAACD,GAAG,CAAC,CAAC,EACZtB,UAAU,CAAC,GAEX,CAAC;UAAEe,IAAI;UAAEC;QAAI,CAAE,KAOlBjB,cAAc,CACZyB,8BAAc,CAACC,OAAO,CAACT,IAAI,EAAE;UAC3BU,EAAE,EAAEX,IAAI,CAACW,EAAE;UACXC,MAAM,EAAE,IAAa;UACrBC,IAAI,EAAEC,gCAAgB,CAACd,IAAI,CAACe,IAAI;SACjC,CAAC,CACH,CAZL7B,6CAES8B,6BAAoB;UAAEhB,IAAI,uDAAEA,IAAI,EAAU;UAAEC,IAAI,uDAAEA,IAAI;QAAU,CAAE,CAAC,CAF5Ef,yBACY,OAAOL,cAAc,+BAA+B,CAAC,GAE1D,MAAMoC,iCAAyB,CAAC,EAC3BC,OAAO,CAACb,WAAW,CAACL,IAAI,CAAC,CAAC,CAAC,CASpC,CACJ;QACL,OAAO,OAAOb,CAAC,oDACbgC,0BAES,0BAAa,EAAC,OAAO,CAAC,CAF/BjC,8BAAM,CAACkC,IAAI,EAAE,EACFC,CAAC,IAAInC,2FAAc,CAACmC,CAAC,CAAC,IAA8BnB,CAAC,IAAGoB,qBAACpB,CAAC,CAAK,CAAC,CAAC,GAGpD,sBAAsB,CAAC,GAGhD;MACH,CAAC;KAC+B;EACpC,CAAC,CAAC;AACJ;AAEA;AACA;AACM,SAAUgB,OAAO,CAAUK,GAAoB;EACnD,OAAOrC,gDAAG,GAAcsC,MAAM,IAC5BtC,oBAAW,WAAUC,CAAC;IACpB,MAAMQ,cAAc,GAAG,OAAOR,CAAC,8CAA2B;IAC1D,OAAO,OAAOA,CAAC,CACbsC,6BAAM,EACJC,KAAK,IAAG;MACN,IAAIC,oCAAK,CAAgB,EAAE;QACzB,iCAAQD,KAAsB;;MAEhC,6BAAgB,EAACA,KAAK,EAAE;QAAE/B;MAAc,CAAE,CAAC;MAC3C;IACF,CAAC,EACD,MAAKiC,qBAAY,CAClB,CACF;EACH,CAAC,CAAC,CACH;AACH","names":["makeMemQueue","queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","mem","MemQueue","q","getOrCreateQueue","qReply","publish","messages","requestContext","tsplus_module_3","m","JSON","stringify","body","meta","_","offer","drain","handleEvent","processMessage","msg","parse","RequestContext","inherit","id","locale","name","tsplus_module_7","_tag","tsplus_module_6","restoreFromRequestContext","silence","tsplus_module_9","take","x","tsplus_module_8","inp","result","tsplus_module_12","cause","tsplus_module_10","tsplus_module_11"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null]}
+{"version":3,"file":"memQueue.cjs","mappings":";;;;;;;;;;;;;;AAAA;AAGA;AACA;AAAyD;AAAA;AAGzD;;;AAGM,SAAUA,YAAY,CAQ1BC,SAAiB,EACjBC,cAAsB,EACtBC,OAAyD,EACzDC,eAAwF,EACxFC,cAEwD,EACxDC,UAGmF;EAEnF,OAAOC,oBAAW,WAAUC,CAAC;IAC3B,MAAMC,GAAG,GAAG,OAAOD,CAAC,yBAACE,kBAAQ,EAAQ;IACrC,MAAMC,CAAC,GAAG,OAAOH,CAAC,CAACC,GAAG,CAACG,gBAAgB,CAACX,SAAS,CAAC,CAAC;IACnD,MAAMY,MAAM,GAAG,OAAOL,CAAC,CAACC,GAAG,CAACG,gBAAgB,CAACV,cAAc,CAAC,CAAC;IAE7D,OAAO;MACLY,OAAO,EAAE,CAAC,GAAGC,QAAQ,KACnBR,oBAAW,WAAUC,CAAC;QACpB,MAAMQ,cAAc,GAAG,OAAOR,CAAC,8CAA2B;QAC1D,OAAO,OAAOA,CAAC,uCACbS,oCAAQ,EAAeC,CAAC,IAAGX;QACzB;QACAA,mDACEY,IAAI,CAACC,SAAS,CACZjB,OAAO,CAAC;UAAEkB,IAAI,EAAEH,CAAC;UAAEI,IAAI,EAAEN;QAAc,CAAE,CAAC,CAC3C;QAED;QAAA,EACSO,CAAC,IAAIZ,CAAC,CAACa,KAAK,CAACD,CAAC,CAAC,CAAC,CAClB,CACV,EAEF;MACH,CAAC,CAAC;MACJE,KAAK,EAAElB,oBAAW,WAAUC,CAAC;QAC3B,MAAMkB,WAAW,GAAG,OAAOlB,CAAC,CAACJ,eAAe,CAAC;QAC7C,MAAMuB,qBAAqB,GAAG,wCAA2B,EAAC;UAAEC,IAAI,EAAE,iBAAiB,GAAG1B;QAAc,CAAE,CAAC;QACvG,MAAM2B,cAAc,GAAIC,GAAW;QACjC;QACAvB,iGAAOY,IAAI,CAACY,KAAK,CAACD,GAAG,CAAC,CAAC,EACZxB,UAAU,CAAC,GAEX,CAAC;UAAEe,IAAI;UAAEC;QAAI,CAAE,KAQlBjB,cAAc,CACZ2B,8BAAc,CAACC,OAAO,CAACX,IAAI,EAAE;UAC3BY,EAAE,EAAEb,IAAI,CAACa,EAAE;UACXC,MAAM,EAAE,IAAa;UACrBP,IAAI,EAAEQ,gCAAgB,CAACf,IAAI,CAACgB,IAAI;SACjC,CAAC,CACH,CARIV,qBAAqB,CAL9BpB,6CAES+B,6BAAoB;UAAEjB,IAAI,uDAAEA,IAAI,EAAU;UAAEC,IAAI,uDAAEA,IAAI;QAAU,CAAE,CAAC,CAF5Ef,yBACY,OAAOL,cAAc,+BAA+B,CAAC,GAE1D,MAAMqC,iCAAyB,CAAC,EAC3Bb,WAAW,CAACL,IAAI,CAAC,CAAC,EAU3B,CACJ;QACL,OAAO,OAAOb,CAAC,oDAKJmB,qBAAqB,CAJ9BpB,8BAAM,CAACiC,IAAI,EAAE,EACFC,CAAC,IAAIlC,2FAAc,CAACkC,CAAC,CAAC,IAA8BlB,CAAC,IAAGmB,qBAACnB,CAAC,CAAK,CAAC;QACzE;QACA;QAAA,IAIH;MACH,CAAC;KAC+B;EACpC,CAAC,CAAC;AACJ","names":["makeMemQueue","queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","mem","MemQueue","q","getOrCreateQueue","qDrain","publish","messages","requestContext","tsplus_module_3","m","JSON","stringify","body","meta","_","offer","drain","handleEvent","silenceAndReportError","name","processMessage","msg","parse","RequestContext","inherit","id","locale","tsplus_module_7","_tag","tsplus_module_6","restoreFromRequestContext","take","x","tsplus_module_8"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null]}

package/_cjs/services/QueueMaker/sbqueue.cjs

@@ -10,10 +10,9 @@ var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/core/Tag"));
 var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
 var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
 var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
-var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
-var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/RequestContext"));
-var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
-var tsplus_module_9 = _interopRequireWildcard(require("@effect/io/Layer"));
+var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/infra/RequestContext"));
+var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
+var tsplus_module_8 = _interopRequireWildcard(require("@effect/io/Layer"));
 var _ServiceBus = require("@effect-app/infra-adapters/ServiceBus");
 var _errorReporter = require("@effect-app/infra/errorReporter");
 var _Memory = require("../Store/Memory.cjs");
@@ -28,31 +27,39 @@ function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEven
     const s = yield* $(tsplus_module_1.service(_ServiceBus.Sender));
     const receiver = yield* $(tsplus_module_1.service(_ServiceBus.Receiver));
     const receiverLayer = tsplus_module_2.makeLayer(_ServiceBus.Receiver, receiver);
+    const silenceAndReportError = (0, _errors2.reportNonInterruptedFailure)({
+      name: "ServiceBusQueue.drain." + queueDrainName
+    });
+    const reportError = (0, _errors2.reportNonInterruptedFailureCause)({
+      name: "ServiceBusQueue.drain." + queueDrainName
+    });
     return {
       drain: tsplus_module_1.gen(function* ($) {
         const handleEvent = yield* $(makeHandleEvent);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         function processMessage(messageBody) {
-          return tsplus_module_1.asUnit(tsplus_module_1.orDie(tsplus_module_6.setupReq3(tsplus_module_1.flatMap(tsplus_module_1.tapErrorCause(tsplus_module_1.orDie(tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.parse(messageBody)), x => parseDrain(x))), report), ({
+          return tsplus_module_1.tapErrorCause(tsplus_module_1.flatMap(tsplus_module_1.orDie(tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.parse(messageBody)), x => parseDrain(x))), ({
             body,
             meta
-          }) => provideContext(tsplus_module_7.RequestContext.inherit(meta, {
+          }) => provideContext(tsplus_module_6.RequestContext.inherit(meta, {
             id: body.id,
             locale: "en",
             name: tsplus_module_5.ReasonableString(body._tag)
-          }))(tsplus_module_1.tapErrorCause(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_4.logAnnotates({
+          }))(silenceAndReportError(tsplus_module_1.orDie(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_4.logAnnotates({
             body: tsplus_module_3.RecordPretty(tsplus_module_3.object$(body)),
             meta: tsplus_module_3.RecordPretty(tsplus_module_3.object$(meta))
-          })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => _Memory.restoreFromRequestContext), handleEvent(body)), report))), "Queue.ReceiveMessage")));
+          })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => _Memory.restoreFromRequestContext), handleEvent(body))))))
+          // we reportError here, so that we report the error only, and keep flowing
+          , reportError);
         }
         return yield* $(tsplus_module_1.provideSomeLayer((0, _ServiceBus.subscribe)({
-          processMessage: x => tsplus_module_1.uninterruptible(processMessage(x.body)),
+          processMessage: x => tsplus_module_1.flatMap(tsplus_module_1.uninterruptible(processMessage(x.body)), _ => tsplus_module_1.done(_)),
           processError: err => tsplus_module_1.sync(() => (0, _errorReporter.captureException)(err.error))
         }), receiverLayer));
       }),
       publish: (...messages) => tsplus_module_1.gen(function* ($) {
-        const requestContext = yield* $(tsplus_module_1.service(tsplus_module_7.tag));
-        return yield* $(tsplus_module_8.forkDaemonReportQueue(tsplus_module_1.promise(() => s.sendMessages(messages.map(x => ({
+        const requestContext = yield* $(tsplus_module_1.service(tsplus_module_6.tag));
+        return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_1.promise(() => s.sendMessages(messages.map(x => ({
           body: JSON.stringify(encoder({
             body: x,
             meta: requestContext
@@ -68,14 +75,6 @@ function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEven
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
  */
 function makeServiceBusLayers(url, queueName, queueDrainName) {
-  return tsplus_module_9.provide(tsplus_module_9.merge((0, _ServiceBus.LiveSender)(queueName))((0, _ServiceBus.LiveReceiver)(queueDrainName)))((0, _ServiceBus.LiveServiceBusClient)(url));
-}
-function report(cause) {
-  return tsplus_module_1.gen(function* ($) {
-    const requestContext = yield* $(tsplus_module_1.service(tsplus_module_7.tag));
-    return (0, _errors2.reportQueueError)(cause, {
-      requestContext
-    });
-  });
+  return tsplus_module_8.provide(tsplus_module_8.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","mappings":"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","names":["makeServiceBusQueue","_queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","drain","handleEvent","processMessage","messageBody","tsplus_module_6","JSON","parse","x","report","body","meta","RequestContext","inherit","id","locale","name","tsplus_module_5","_tag","tsplus_module_4","restoreFromRequestContext","processError","err","error","publish","messages","requestContext","sendMessages","map","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_9","cause"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null]}
+{"version":3,"file":"sbqueue.cjs","mappings":"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","names":["makeServiceBusQueue","_queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","silenceAndReportError","name","reportError","drain","handleEvent","processMessage","messageBody","JSON","parse","x","body","meta","RequestContext","inherit","id","locale","tsplus_module_5","_tag","tsplus_module_4","restoreFromRequestContext","_","processError","err","error","publish","messages","requestContext","sendMessages","map","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_8"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null]}

package/_src/api/defaultErrorHandler.ts

@@ -16,13 +16,11 @@ export function defaultBasicErrorHandler<R>(
   _requestContext: RequestContext,
   r2: Effect<R, ValidationError, void>
 ) {
+  const sendError = (code: number) => (body: unknown) => Effect(res.status(code).send(body))
   return Debug.untraced(() =>
     r2
       .tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
-      .catchTag("ValidationError", err =>
-        Effect.sync(() => {
-          res.status(400).send(err.errors)
-        }))
+      .catchTag("ValidationError", err => sendError(400)(err.errors))
       // final catch all; expecting never so that unhandled known errors will show up
       .catchAll((err: never) =>
         Effect.logError(
@@ -46,34 +44,19 @@ export function defaultErrorHandler<R>(
   const r3 = req.method === "PATCH"
     ? r2.retry(optimisticConcurrencySchedule)
     : r2
+  const sendError = (code: number) => (body: unknown) => Effect(res.status(code).send(body))
   return Debug.untraced(() =>
     r3
       .tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
-      .catchTag("ValidationError", err =>
-        Effect.sync(() => {
-          res.status(400).send(err.errors)
-        }))
-      .catchTag("NotFoundError", err =>
-        Effect.sync(() => {
-          res.status(404).send(err)
-        }))
-      .catchTag("NotLoggedInError", err =>
-        Effect.sync(() => {
-          res.status(401).send(err)
-        }))
-      .catchTag("UnauthorizedError", err =>
-        Effect.sync(() => {
-          res.status(403).send(err)
-        }))
-      .catchTag("InvalidStateError", err =>
-        Effect.sync(() => {
-          res.status(422).send(err)
-        }))
-      .catchTag("OptimisticConcurrencyException", err =>
-        Effect.sync(() => {
-          // 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
-          res.status(412).send(err)
-        }))
+      .catchTags({
+        "ValidationError": err => sendError(400)(err.errors),
+        "NotFoundError": sendError(404),
+        "NotLoggedInError": sendError(401),
+        "UnauthorizedError": sendError(403),
+        "InvalidStateError": sendError(422),
+        // 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
+        "OptimisticConcurrencyException": sendError(412)
+      })
       // final catch all; expecting never so that unhandled known errors will show up
       .catchAll((err: never) =>
         Effect.logError(

package/_src/services/QueueMaker/errors.ts

@@ -17,9 +17,8 @@ export class FatalQueueException<E> extends CauseException<E> {
 const reportQueueError_ = reportError(cause => new MessageException(cause))
 
 export const reportQueueError = <E>(cause: Cause<E>, context?: Record<string, unknown> | undefined) =>
-  RequestContext.Tag.accessWithEffect(requestContext =>
-    Effect(reportQueueError_(cause, { requestContext, ...context }))
-  )
+  Effect.contextWith((_: Context<never>) => Context.getOption(_, RequestContext.Tag))
+    .flatMap(requestContext => reportQueueError_(cause, { requestContext: requestContext.value, ...context }))
 
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
@@ -31,18 +30,30 @@ export const reportQueueError = <E>(cause: Cause<E>, context?: Record<string, un
  * @tsplus getter effect/io/Effect forkDaemonReportQueue
  */
 export function forkDaemonReportQueue<R, E, A>(self: Effect<R, E, A>) {
-  return self.tapErrorCause(reportQueueError).fork.daemonChildren
+  return self.tapErrorCause(reportNonInterruptedFailureCause({})).fork.daemonChildren
 }
 
 export const reportFatalQueueError = reportError(
   cause => new FatalQueueException(cause)
 )
 
-export function reportFailure(name: string) {
-  return <R, E, A>(self: Effect<R, E, A>) =>
-    self.exit.tap(exit =>
-      exit._tag === "Failure"
-        ? reportFatalQueueError(exit.cause, { name })
-        : Effect.unit
-    )
+export function reportNonInterruptedFailure(context?: Record<string, unknown>) {
+  const report = reportNonInterruptedFailureCause(context)
+  return <R, E, A>(inp: Effect<R, E, A>): Effect<R, never, Exit<E, A>> =>
+    inp.exit
+      .flatMap(result =>
+        result.match(
+          cause => report(cause).map(() => result),
+          () => Effect(result)
+        )
+      )
+}
+
+export function reportNonInterruptedFailureCause(context?: Record<string, unknown>) {
+  return <E>(cause: Cause<E>): Effect<never, never, void> => {
+    if (cause.isInterrupted()) {
+      return (cause as Cause<never>).failCause
+    }
+    return reportQueueError(cause, context)
+  }
 }

package/_src/services/QueueMaker/memQueue.ts

@@ -2,20 +2,27 @@ import { MemQueue } from "@effect-app/infra-adapters/memQueue"
 import { RequestContext } from "@effect-app/infra/RequestContext"
 import type { CustomSchemaException } from "@effect-app/prelude/schema"
 import { restoreFromRequestContext } from "../Store/Memory.js"
-import { reportFailure, reportQueueError } from "./errors.js"
+import { reportNonInterruptedFailure } from "./errors.js"
 import type { QueueBase } from "./service.js"
 
 /**
  * @tsplus static QueueMaker.Ops makeMem
  */
-export function makeMemQueue<DrainR, Evt, DrainEvt extends { id: StringId; _tag: string }, RContext, EvtE, DrainE>(
+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>, E, A>,
+  ) => Effect<Exclude<R, RContext | RequestContext>, E, A>,
   parseDrain: (
     a: unknown,
     env?: Parser.ParserEnv | undefined
@@ -24,7 +31,7 @@ export function makeMemQueue<DrainR, Evt, DrainEvt extends { id: StringId; _tag:
   return Effect.gen(function*($) {
     const mem = yield* $(MemQueue.access)
     const q = yield* $(mem.getOrCreateQueue(queueName))
-    const qReply = yield* $(mem.getOrCreateQueue(queueDrainName))
+    const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName))
 
     return {
       publish: (...messages) =>
@@ -47,6 +54,7 @@ export function makeMemQueue<DrainR, Evt, DrainEvt extends { id: StringId; _tag:
         }),
       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))
@@ -57,7 +65,8 @@ export function makeMemQueue<DrainR, Evt, DrainEvt extends { id: StringId; _tag:
                 .logDebug(`$$ [${queueDrainName}] Processing incoming message`)
                 .apply(Effect.logAnnotates({ body: body.$$.pretty, meta: meta.$$.pretty }))
                 .tap(() => restoreFromRequestContext)
-                .zipRight(silence(handleEvent(body)))
+                .zipRight(handleEvent(body))
+                .apply(silenceAndReportError)
                 .apply(
                   provideContext(
                     RequestContext.inherit(meta, {
@@ -69,11 +78,11 @@ export function makeMemQueue<DrainR, Evt, DrainEvt extends { id: StringId; _tag:
                 )
             )
         return yield* $(
-          qReply.take()
+          qDrain.take()
             .flatMap(x => processMessage(x).uninterruptible.fork.flatMap(_ => _.join))
-            .apply(reportFailure("drain"))
-            // runs before `forever` or we have an open, increasing span forever
-            .setupRequestFromWith("Queue.ReceiveMessage")
+            // 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.
+            .apply(silenceAndReportError)
             .forever
             .forkScoped
         )
@@ -81,25 +90,3 @@ export function makeMemQueue<DrainR, Evt, DrainEvt extends { id: StringId; _tag:
     } satisfies QueueBase<DrainR, Evt>
   })
 }
-
-// We want the Queue to continue processing even on errors per messages
-// must make sure that the errors are processed/handled beforehand.
-export function silence<R, E, A>(inp: Effect<R, E, A>) {
-  return inp.exit.flatMap(result =>
-    Effect.gen(function*($) {
-      const requestContext = yield* $(RequestContext.Tag.access)
-      return yield* $(
-        result.match(
-          cause => {
-            if (cause.isInterrupted()) {
-              return (cause as Cause<never>).failCause
-            }
-            reportQueueError(cause, { requestContext })
-            return Effect.unit
-          },
-          () => Effect.unit
-        )
-      )
-    })
-  )
-}