@effect-app/infra 0.37.3 → 0.37.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 0.37.4
+
+### Patch Changes
+
+- improve req log ctx
+
 ## 0.37.3
 
 ### Patch Changes

package/_cjs/api/defaultErrorHandler.cjs

@@ -13,14 +13,14 @@ var tsplus_module_5 = _interopRequireWildcard(require("@effect/io/Schedule"));
 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) {
+function defaultBasicErrorHandler(_req, res, r2) {
   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) {
+function defaultErrorHandler(req, res, r2) {
   const r3 = req.method === "PATCH" ? tsplus_module_1.retry(r2, optimisticConcurrencySchedule) : r2;
   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), {

package/_cjs/api/defaultErrorHandler.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"defaultErrorHandler.cjs","names":["_reportError","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","defaultBasicErrorHandler","_req","res","_requestContext","r2","sendError","code","body","tsplus_module_1","sync","status","send","tsplus_module_4","untraced","catchAll","catchTag","tapErrorCause","cause","tsplus_module_2","isFailure","logRequestError","tsplus_module_3","unit","err","errors","flatMap","map","logError","die","optimisticConcurrencySchedule","tsplus_module_5","intersect","recurWhile","a","_tag","once","defaultErrorHandler","req","_","r3","method","retry","catchTags"],"sources":["../../_src/api/defaultErrorHandler.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"defaultErrorHandler.cjs","names":["_reportError","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","defaultBasicErrorHandler","_req","res","r2","sendError","code","body","tsplus_module_1","sync","status","send","tsplus_module_4","untraced","catchAll","catchTag","tapErrorCause","cause","tsplus_module_2","isFailure","logRequestError","tsplus_module_3","unit","err","errors","flatMap","map","logError","die","optimisticConcurrencySchedule","tsplus_module_5","intersect","recurWhile","a","_tag","once","defaultErrorHandler","req","r3","method","retry","catchTags"],"sources":["../../_src/api/defaultErrorHandler.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/api/routing.cjs

@@ -19,8 +19,8 @@ var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/Effect")
 var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/_ext/Schema.ext"));
 var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
 var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
-var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/core/Option"));
-var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
+var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
+var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/core/Option"));
 var tsplus_module_10 = _interopRequireWildcard(require("@effect/io/Debug"));
 var Ex = _interopRequireWildcard(require("@effect-app/infra-adapters/express"));
 var MO = _interopRequireWildcard(require("@effect-app/prelude/schema"));
@@ -144,7 +144,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
     }), ({
       pars,
       requestContext
-    }) => tsplus_module_3.provideService(tsplus_module_9.setupRequestFrom(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_7.logAnnotates({
+    }) => tsplus_module_3.provideService(tsplus_module_8.setupRequestFrom(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_7.logAnnotates({
       method: req.method,
       path: req.originalUrl,
       ...(s.verbose ? {
@@ -154,31 +154,33 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
         reqCookies: (0, tsplus_module_6.pretty)(pars.cookies),
         reqHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.headers))
       } : undefined)
-    })(tsplus_module_3.logInfo("Incoming request"))), tsplus_module_3.suspendSucceed(() => {
+    })(
+    // TODO: we don;t have access to user id here cause context is not yet created
+    tsplus_module_3.logInfo("Incoming request"))), tsplus_module_3.suspendSucceed(() => {
       const handleRequest = tsplus_module_3.flatMap(tsplus_module_3.map(parseRequest(req), ({
         body,
         path,
         query
       }) => {
         const hn = {
-          ...tsplus_module_8.getOrUndefined(body),
-          ...tsplus_module_8.getOrUndefined(query),
-          ...tsplus_module_8.getOrUndefined(path)
+          ...tsplus_module_9.getOrUndefined(body),
+          ...tsplus_module_9.getOrUndefined(query),
+          ...tsplus_module_9.getOrUndefined(path)
         };
         return hn;
       }), parsedReq => tsplus_module_3.flatMap(restore(() => handle(parsedReq))(), r => respond(parsedReq, res, r)));
       // Commands should not be interruptable.
       const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
       // the first log entry should be of the request start.
-      const r2 = makeMiddlewareContext ? tsplus_module_3.zipRight(_Memory.restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(tsplus_module_9.setupRequestFrom(r))) : tsplus_module_3.zipRight(_Memory.restoreFromRequestContext
+      const r2 = makeMiddlewareContext ? tsplus_module_3.zipRight(_Memory.restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res))(tsplus_module_8.setupRequestFrom(r))) : tsplus_module_3.zipRight(_Memory.restoreFromRequestContext
       // PR is not relevant here
       , r);
-      return errorHandler(req, res, requestContext, r2);
-    })), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), (0, _reportError.reportRequestError)(cause, {
+      return errorHandler(req, res, r2);
+    })), cause => tsplus_module_8.setupRequestFrom(tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), tsplus_module_3.flatMap(_RequestContextContainer.RequestContextContainer.get, requestContext => (0, _reportError.reportRequestError)(cause, {
       requestContext,
       path: req.originalUrl,
       method: req.method
-    }), tsplus_module_3.suspendSucceed(() => {
+    })), tsplus_module_3.suspendSucceed(() => {
       const headers = res.getHeaders();
       return tsplus_module_7.logAnnotates({
         method: req.method,
@@ -194,7 +196,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
           return prev;
         }, {})))
       })(tsplus_module_3.logErrorCauseMessage("Finished request", cause));
-    })), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
+    })), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause))))), () => tsplus_module_8.setupRequestFrom(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
       const headers = res.getHeaders();
       return tsplus_module_7.logAnnotates({
         method: req.method,
@@ -204,7 +206,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
           resHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(headers))
         } : undefined)
       })(tsplus_module_3.logInfo("Finished request"));
-    }))), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
+    })))), _RequestContextContainer.RequestContextContainer, new _RequestContextContainer.RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
     ));
   };
 }

package/_cjs/api/routing.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routing.cjs","names":["Ex","_interopRequireWildcard","require","MO","_RequestContext","_RequestContextContainer","_Memory","_defaultErrorHandler","_requestHandler","_routing","_reportError","_util","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RequestSettings","tsplus_module_1","unsafeMake","verbose","exports","makeRequestParsers","Request","ph","tsplus_module_3","sync","tsplus_module_2","map","fromNullable","Headers","s","Parser","for","condemnFail","parseHeaders","u","tsplus_module_4","flatMapOption","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","zipRight","method","toLowerCase","path","split","makeRequestHandler","makeRouteDescriptor","respondSuccess","encodeResponse","req","res","a","flatMap","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","extractSchema","Void","encoder","Encoder","requestParsers","parseRequest","parseRequestParams","respond","getParams","params","query","body","headers","cookies","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_5","parseUnsafe","RequestId","make","storeId","namespace","ReasonableString","Array","isArray","requestContext","RequestContext","name","Model","SchemaNamed","createdAt","tsplus_module_10","untraced","restore","all","setHeader","pars","provideService","tsplus_module_9","setupRequestFrom","tap","tapErrorCause","tsplus_module_7","logAnnotates","originalUrl","reqPath","tsplus_module_6","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","logInfo","suspendSucceed","handleRequest","hn","tsplus_module_8","getOrUndefined","parsedReq","uninterruptible","r2","restoreFromRequestContext","provideSomeContextEffect","cause","allPar","reportRequestError","getHeaders","statusCode","toString","resHeaders","entries","reduce","prev","value","snipString","logErrorCauseMessage","console","error","RequestContextContainer","RequestContextContainerImpl","matchAll","handlers","mapped","RecordKeys","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sources":["../../_src/api/routing.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"routing.cjs","names":["Ex","_interopRequireWildcard","require","MO","_RequestContext","_RequestContextContainer","_Memory","_defaultErrorHandler","_requestHandler","_routing","_reportError","_util","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","RequestSettings","tsplus_module_1","unsafeMake","verbose","exports","makeRequestParsers","Request","ph","tsplus_module_3","sync","tsplus_module_2","map","fromNullable","Headers","s","Parser","for","condemnFail","parseHeaders","u","tsplus_module_4","flatMapOption","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","zipRight","method","toLowerCase","path","split","makeRequestHandler","makeRouteDescriptor","respondSuccess","encodeResponse","req","res","a","flatMap","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","extractSchema","Void","encoder","Encoder","requestParsers","parseRequest","parseRequestParams","respond","getParams","params","query","body","headers","cookies","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_5","parseUnsafe","RequestId","make","storeId","namespace","ReasonableString","Array","isArray","requestContext","RequestContext","name","Model","SchemaNamed","createdAt","tsplus_module_10","untraced","restore","all","setHeader","pars","provideService","tsplus_module_8","setupRequestFrom","tap","tapErrorCause","tsplus_module_7","logAnnotates","originalUrl","reqPath","tsplus_module_6","RecordPretty","object$","reqQuery","reqBody","pretty","reqCookies","reqHeaders","logInfo","suspendSucceed","handleRequest","hn","tsplus_module_9","getOrUndefined","parsedReq","uninterruptible","r2","restoreFromRequestContext","provideSomeContextEffect","cause","allPar","RequestContextContainer","reportRequestError","getHeaders","statusCode","toString","resHeaders","entries","reduce","prev","value","snipString","logErrorCauseMessage","console","error","RequestContextContainerImpl","matchAll","handlers","mapped","RecordKeys","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sources":["../../_src/api/routing.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/api/defaultErrorHandler.ts

@@ -7,13 +7,11 @@ import type {
   UnauthorizedError,
   ValidationError
 } from "../errors.js"
-import type { RequestContext } from "../RequestContext.js"
 import { logRequestError } from "./reportError.js"
 
 export function defaultBasicErrorHandler<R>(
   _req: express.Request,
   res: express.Response,
-  _requestContext: RequestContext,
   r2: Effect<R, ValidationError, void>
 ) {
   const sendError = (code: number) => (body: unknown) => Effect(res.status(code).send(body))
@@ -38,7 +36,6 @@ const optimisticConcurrencySchedule = Schedule.once() &&
 export function defaultErrorHandler<R>(
   req: express.Request,
   res: express.Response,
-  _: RequestContext,
   r2: Effect<R, SupportedErrors, void>
 ) {
   const r3 = req.method === "PATCH"

package/_src/api/routing.ts

@@ -97,9 +97,8 @@ export function makeRequestParsers<
 
 export type MakeMiddlewareContext<ResE, R2 = never, PR = never> = (
   req: express.Request,
-  res: express.Response,
-  context: RequestContext
-) => Effect<R2, ResE, Context<PR>>
+  res: express.Response
+) => Effect<R2 | RequestContextContainer, ResE, Context<PR>>
 
 export type Middleware<
   R,
@@ -148,7 +147,6 @@ export function match<
   errorHandler: <R>(
     req: express.Request,
     res: express.Response,
-    requestContext: RequestContext,
     r2: Effect<R, E | ValidationError, void>
   ) => Effect<RErr, never, void>,
   middleware?: Middleware<
@@ -232,9 +230,8 @@ export function makeRequestHandler<
   errorHandler: <R>(
     req: express.Request,
     res: express.Response,
-    requestContext: RequestContext,
     r2: Effect<R, E | ValidationError, void>
-  ) => Effect<RErr | R, never, void>,
+  ) => Effect<RErr | R | RequestContextContainer, never, void>,
   makeMiddlewareContext?: MakeMiddlewareContext<E, R2, PR>
 ): (
   req: express.Request,
@@ -317,6 +314,7 @@ export function makeRequestHandler<
       })
         .flatMap(({ pars, requestContext }) =>
           RequestSettings.get.flatMap(s =>
+            // TODO: we don;t have access to user id here cause context is not yet created
             Effect.logInfo("Incoming request").apply(
               Effect.logAnnotates({
                 method: req.method,
@@ -355,14 +353,13 @@ export function makeRequestHandler<
                 ? restoreFromRequestContext
                   .zipRight(r.setupRequestFrom
                     // the db namespace must be restored, before calling provide here
-                    .provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext)))
+                    .provideSomeContextEffect(makeMiddlewareContext(req, res)))
                 : restoreFromRequestContext
                   // PR is not relevant here
                   .zipRight(r) as Effect<R, E | ValidationError, void>
               return errorHandler(
                 req,
                 res,
-                requestContext,
                 r2
               )
             })
@@ -370,11 +367,13 @@ export function makeRequestHandler<
             .tapErrorCause(cause =>
               Effect.allPar(
                 Effect(res.status(500).send()),
-                reportRequestError(cause, {
-                  requestContext,
-                  path: req.originalUrl,
-                  method: req.method
-                }),
+                RequestContextContainer.get.flatMap(requestContext =>
+                  reportRequestError(cause, {
+                    requestContext,
+                    path: req.originalUrl,
+                    method: req.method
+                  })
+                ),
                 Effect.suspendSucceed(() => {
                   const headers = res.getHeaders()
                   return Effect.logErrorCauseMessage(
@@ -400,6 +399,7 @@ export function makeRequestHandler<
                 })
               )
                 .tapErrorCause(cause => Effect(console.error("Error occurred while reporting error", cause)))
+                .setupRequestFrom
             )
             .tap(() =>
               RequestSettings.get.flatMap(s => {
@@ -414,7 +414,7 @@ export function makeRequestHandler<
                     } :
                     undefined
                 }))
-              })
+              }).setupRequestFrom
             )
             .setupRequestFrom
             .provideService(RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.

package/dist/api/defaultErrorHandler.d.ts

@@ -1,8 +1,7 @@
 import { Effect } from "@effect/io/Effect";
 import type express from "express";
 import type { InvalidStateError, NotFoundError, NotLoggedInError, OptimisticConcurrencyException, UnauthorizedError, ValidationError } from "../errors.js";
-import type { RequestContext } from "../RequestContext.js";
-export declare function defaultBasicErrorHandler<R>(_req: express.Request, res: express.Response, _requestContext: RequestContext, r2: Effect<R, ValidationError, void>): import("@effect/io/Effect").Effect<import("../services/RequestContextContainer.js").RequestContextContainer | R, never, void | express.Response<any, Record<string, any>>>;
-export declare function defaultErrorHandler<R>(req: express.Request, res: express.Response, _: RequestContext, r2: Effect<R, SupportedErrors, void>): import("@effect/io/Effect").Effect<import("../services/RequestContextContainer.js").RequestContextContainer | R, never, void | express.Response<any, Record<string, any>>>;
+export declare function defaultBasicErrorHandler<R>(_req: express.Request, res: express.Response, r2: Effect<R, ValidationError, void>): import("@effect/io/Effect").Effect<import("../services/RequestContextContainer.js").RequestContextContainer | R, never, void | express.Response<any, Record<string, any>>>;
+export declare function defaultErrorHandler<R>(req: express.Request, res: express.Response, r2: Effect<R, SupportedErrors, void>): import("@effect/io/Effect").Effect<import("../services/RequestContextContainer.js").RequestContextContainer | R, never, void | express.Response<any, Record<string, any>>>;
 export type SupportedErrors = ValidationError | NotFoundError | NotLoggedInError | UnauthorizedError | InvalidStateError | OptimisticConcurrencyException;
 //# sourceMappingURL=defaultErrorHandler.d.ts.map

package/dist/api/defaultErrorHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,eAAe,EAAE,cAAc,EAC/B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,8KAgBrC;AAKD,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,CAAC,EAAE,cAAc,EACjB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,8KA2BrC;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,8BAA8B,CAAA"}
+{"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AAGrB,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,8KAgBrC;AAKD,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,8KA2BrC;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,8BAA8B,CAAA"}

package/dist/api/defaultErrorHandler.js

@@ -4,14 +4,14 @@ import * as tsplus_module_3 from "@effect-app/core/Effect";
 import * as tsplus_module_4 from "@effect/io/Debug";
 import * as tsplus_module_5 from "@effect/io/Schedule";
 import { logRequestError } from "./reportError.js";
-export function defaultBasicErrorHandler(_req, res, _requestContext, r2) {
+export function defaultBasicErrorHandler(_req, res, r2) {
     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) ? 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());
-export function defaultErrorHandler(req, res, _, r2) {
+export function defaultErrorHandler(req, res, r2) {
     const r3 = req.method === "PATCH"
         ? tsplus_module_1.retry(r2, optimisticConcurrencySchedule)
         : r2;
@@ -28,4 +28,4 @@ export function defaultErrorHandler(req, res, _, r2) {
     // 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)));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvYXBpL2RlZmF1bHRFcnJvckhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFVQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFbEQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxJQUFxQixFQUNyQixHQUFxQixFQUNyQixlQUErQixFQUMvQixFQUFvQztJQUVwQyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFhLEVBQUUsRUFBRSxDQUFDLDJCQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDMUYsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIseUJBQUEseUJBQUEsOEJBQUEsRUFBRSxFQUNlLEtBQUssQ0FBQyxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDdkUsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQy9ELCtFQUErRTtNQUNyRSxDQUFDLEdBQVUsRUFBRSxFQUFFLENBQ3ZCLHdCQUFBLG9CQUFBLHlCQUNFLGdHQUFnRyxHQUFHLEdBQUcsQ0FDdkcsRUFDTSxHQUFHLEVBQUUsQ0FBQyxHQUFjLENBQUMsc0JBQ04sQ0FDdkIsQ0FDSixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sNkJBQTZCLDZCQUNqQywyQkFBcUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLGdDQUFnQyxDQUFDLEVBRGxELHNCQUFlLENBQ21DLENBQUE7QUFFeEYsTUFBTSxVQUFVLG1CQUFtQixDQUNqQyxHQUFvQixFQUNwQixHQUFxQixFQUNyQixDQUFpQixFQUNqQixFQUFvQztJQUVwQyxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxLQUFLLE9BQU87UUFDL0IsQ0FBQyxDQUFDLHNCQUFBLEVBQUUsRUFBTyw2QkFBNkIsQ0FBQztRQUN6QyxDQUFDLENBQUMsRUFBRSxDQUFBO0lBQ04sTUFBTSxTQUFTLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBYSxFQUFFLEVBQUUsQ0FBQywyQkFBTyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQzFGLE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLHlCQUFBLDBCQUFBLDhCQUFBLEVBQUUsRUFDZSxLQUFLLENBQUMsRUFBRSxDQUFDLDBCQUFBLEtBQUssQ0FBWSxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBWSxDQUFDLEVBQ3RFO1FBQ1QsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUNwRCxlQUFlLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztRQUMvQixrQkFBa0IsRUFBRSxTQUFTLENBQUMsR0FBRyxDQUFDO1FBQ2xDLG1CQUFtQixFQUFFLFNBQVMsQ0FBQyxHQUFHLENBQUM7UUFDbkMsbUJBQW1CLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztRQUNuQyw0SUFBNEk7UUFDNUksZ0NBQWdDLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztLQUNqRCxDQUFDO0lBQ0YsK0VBQStFO01BQ3JFLENBQUMsR0FBVSxFQUFFLEVBQUUsQ0FDdkIsd0JBQUEsb0JBQUEseUJBQ0UsZ0dBQWdHLEdBQUcsR0FBRyxDQUN2RyxFQUNNLEdBQUcsRUFBRSxDQUFDLEdBQWMsQ0FBQyxzQkFDTixDQUN2QixDQUNKLENBQUE7QUFDSCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvYXBpL2RlZmF1bHRFcnJvckhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFTQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFbEQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxJQUFxQixFQUNyQixHQUFxQixFQUNyQixFQUFvQztJQUVwQyxNQUFNLFNBQVMsR0FBRyxDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFhLEVBQUUsRUFBRSxDQUFDLDJCQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDMUYsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIseUJBQUEseUJBQUEsOEJBQUEsRUFBRSxFQUNlLEtBQUssQ0FBQyxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDdkUsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQy9ELCtFQUErRTtNQUNyRSxDQUFDLEdBQVUsRUFBRSxFQUFFLENBQ3ZCLHdCQUFBLG9CQUFBLHlCQUNFLGdHQUFnRyxHQUFHLEdBQUcsQ0FDdkcsRUFDTSxHQUFHLEVBQUUsQ0FBQyxHQUFjLENBQUMsc0JBQ04sQ0FDdkIsQ0FDSixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sNkJBQTZCLDZCQUNqQywyQkFBcUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLGdDQUFnQyxDQUFDLEVBRGxELHNCQUFlLENBQ21DLENBQUE7QUFFeEYsTUFBTSxVQUFVLG1CQUFtQixDQUNqQyxHQUFvQixFQUNwQixHQUFxQixFQUNyQixFQUFvQztJQUVwQyxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxLQUFLLE9BQU87UUFDL0IsQ0FBQyxDQUFDLHNCQUFBLEVBQUUsRUFBTyw2QkFBNkIsQ0FBQztRQUN6QyxDQUFDLENBQUMsRUFBRSxDQUFBO0lBQ04sTUFBTSxTQUFTLEdBQUcsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBYSxFQUFFLEVBQUUsQ0FBQywyQkFBTyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQzFGLE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLHlCQUFBLDBCQUFBLDhCQUFBLEVBQUUsRUFDZSxLQUFLLENBQUMsRUFBRSxDQUFDLDBCQUFBLEtBQUssQ0FBWSxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBWSxDQUFDLEVBQ3RFO1FBQ1QsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQztRQUNwRCxlQUFlLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztRQUMvQixrQkFBa0IsRUFBRSxTQUFTLENBQUMsR0FBRyxDQUFDO1FBQ2xDLG1CQUFtQixFQUFFLFNBQVMsQ0FBQyxHQUFHLENBQUM7UUFDbkMsbUJBQW1CLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztRQUNuQyw0SUFBNEk7UUFDNUksZ0NBQWdDLEVBQUUsU0FBUyxDQUFDLEdBQUcsQ0FBQztLQUNqRCxDQUFDO0lBQ0YsK0VBQStFO01BQ3JFLENBQUMsR0FBVSxFQUFFLEVBQUUsQ0FDdkIsd0JBQUEsb0JBQUEseUJBQ0UsZ0dBQWdHLEdBQUcsR0FBRyxDQUN2RyxFQUNNLEdBQUcsRUFBRSxDQUFDLEdBQWMsQ0FBQyxzQkFDTixDQUN2QixDQUNKLENBQUE7QUFDSCxDQUFDIn0=

package/dist/api/routing.d.ts

@@ -7,7 +7,6 @@ import type { GetRequest, GetResponse } from "@effect-app/prelude/schema";
 import * as MO from "@effect-app/prelude/schema";
 import type express from "express";
 import type { ValidationError } from "../errors.js";
-import { RequestContext } from "../RequestContext.js";
 import { RequestContextContainer } from "../services/RequestContextContainer.js";
 import type { SupportedErrors } from "./defaultErrorHandler.js";
 import type { Encode, RequestHandler, RequestHandlerOptRes, RequestParsers } from "./express/schema/requestHandler.js";
@@ -16,14 +15,14 @@ export declare const RequestSettings: import("@effect/io/FiberRef").FiberRef<{
     verbose: boolean;
 }>;
 export declare function makeRequestParsers<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, Errors>(Request: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors>["Request"]): RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA>;
-export type MakeMiddlewareContext<ResE, R2 = never, PR = never> = (req: express.Request, res: express.Response, context: RequestContext) => Effect<R2, ResE, Context<PR>>;
+export type MakeMiddlewareContext<ResE, R2 = never, PR = never> = (req: express.Request, res: express.Response) => Effect<R2 | RequestContextContainer, ResE, Context<PR>>;
 export type Middleware<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, ResE, R2 = never, PR = never> = (handler: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE>) => {
     handler: typeof handler;
     makeContext: MakeMiddlewareContext<ResE, R2, PR>;
 };
-export declare function match<R, E, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, R2 = never, PR = never, RErr = never>(requestHandler: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E>, errorHandler: <R>(req: express.Request, res: express.Response, requestContext: RequestContext, r2: Effect<R, E | ValidationError, void>) => Effect<RErr, never, void>, middleware?: Middleware<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E, R2, PR>): import("@effect/io/Effect").Effect<Ex.ExpressEnv | Exclude<R, RequestContextContainer> | Exclude<R2, RequestContextContainer> | Exclude<RErr, RequestContextContainer>, never, import("./express/schema/routing.js").RouteDescriptor<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E, MO.Methods>>;
+export declare function match<R, E, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, R2 = never, PR = never, RErr = never>(requestHandler: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E>, errorHandler: <R>(req: express.Request, res: express.Response, r2: Effect<R, E | ValidationError, void>) => Effect<RErr, never, void>, middleware?: Middleware<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E, R2, PR>): import("@effect/io/Effect").Effect<Ex.ExpressEnv | Exclude<R, RequestContextContainer> | Exclude<R2, RequestContextContainer> | Exclude<RErr, RequestContextContainer>, never, import("./express/schema/routing.js").RouteDescriptor<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E, MO.Methods>>;
 export declare function respondSuccess<ReqA, A, E>(encodeResponse: (req: ReqA) => Encode<A, E>): (req: ReqA, res: express.Response, a: A) => import("@effect/io/Effect").Effect<never, never, void>;
-export declare function makeRequestHandler<R, E, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA = void, R2 = never, PR = never, RErr = never>(handler: RequestHandlerOptRes<R | PR, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E>, errorHandler: <R>(req: express.Request, res: express.Response, requestContext: RequestContext, r2: Effect<R, E | ValidationError, void>) => Effect<RErr | R, never, void>, makeMiddlewareContext?: MakeMiddlewareContext<E, R2, PR>): (req: express.Request, res: express.Response) => Effect<Exclude<RErr | R | R2, RequestContextContainer>, never, void>;
+export declare function makeRequestHandler<R, E, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA = void, R2 = never, PR = never, RErr = never>(handler: RequestHandlerOptRes<R | PR, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, E>, errorHandler: <R>(req: express.Request, res: express.Response, r2: Effect<R, E | ValidationError, void>) => Effect<RErr | R | RequestContextContainer, never, void>, makeMiddlewareContext?: MakeMiddlewareContext<E, R2, PR>): (req: express.Request, res: express.Response) => Effect<Exclude<RErr | R | R2, RequestContextContainer>, never, void>;
 export type RequestHandlers = {
     [key: string]: BasicRequestHandler;
 };

package/dist/api/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}

package/dist/api/routing.js

@@ -5,8 +5,8 @@ import * as tsplus_module_4 from "@effect-app/core/Effect";
 import * as tsplus_module_5 from "@effect-app/prelude/_ext/Schema.ext";
 import * as tsplus_module_6 from "@effect-app/prelude/utils";
 import * as tsplus_module_7 from "@effect-app/prelude/_ext/misc";
-import * as tsplus_module_8 from "@effect-app/core/Option";
-import * as tsplus_module_9 from "@effect-app/infra/api/setupRequest";
+import * as tsplus_module_8 from "@effect-app/infra/api/setupRequest";
+import * as tsplus_module_9 from "@effect-app/core/Option";
 import * as tsplus_module_10 from "@effect/io/Debug";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as Ex from "@effect-app/infra-adapters/express";
@@ -124,7 +124,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                 return requestContext;
             }),
             pars: getParams(req)
-        }), ({ pars, requestContext }) => tsplus_module_3.provideService(tsplus_module_9.setupRequestFrom(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_7.logAnnotates({
+        }), ({ pars, requestContext }) => tsplus_module_3.provideService(tsplus_module_8.setupRequestFrom(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_7.logAnnotates({
             method: req.method,
             path: req.originalUrl,
             ...s.verbose
@@ -136,12 +136,14 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     reqHeaders: tsplus_module_6.RecordPretty(tsplus_module_6.object$(pars.headers))
                 } :
                 undefined
-        })(tsplus_module_3.logInfo("Incoming request"))), tsplus_module_3.suspendSucceed(() => {
+        })(
+        // TODO: we don;t have access to user id here cause context is not yet created
+        tsplus_module_3.logInfo("Incoming request"))), tsplus_module_3.suspendSucceed(() => {
             const handleRequest = tsplus_module_3.flatMap(tsplus_module_3.map(parseRequest(req), ({ body, path, query }) => {
                 const hn = {
-                    ...tsplus_module_8.getOrUndefined(body),
-                    ...tsplus_module_8.getOrUndefined(query),
-                    ...tsplus_module_8.getOrUndefined(path)
+                    ...tsplus_module_9.getOrUndefined(body),
+                    ...tsplus_module_9.getOrUndefined(query),
+                    ...tsplus_module_9.getOrUndefined(path)
                 };
                 return hn;
             }), parsedReq => tsplus_module_3.flatMap(restore(() => handle(parsedReq))(), r => respond(parsedReq, res, r)));
@@ -149,16 +151,16 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
             const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
             // the first log entry should be of the request start.
             const r2 = makeMiddlewareContext
-                ? tsplus_module_3.zipRight(restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(tsplus_module_9.setupRequestFrom(r)))
+                ? tsplus_module_3.zipRight(restoreFromRequestContext, tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res))(tsplus_module_8.setupRequestFrom(r)))
                 : tsplus_module_3.zipRight(restoreFromRequestContext
                 // PR is not relevant here
                 , r);
-            return errorHandler(req, res, requestContext, r2);
-        })), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), reportRequestError(cause, {
+            return errorHandler(req, res, r2);
+        })), cause => tsplus_module_8.setupRequestFrom(tsplus_module_3.tapErrorCause(tsplus_module_3.allPar(tsplus_module_3.sync(() => res.status(500).send()), tsplus_module_3.flatMap(RequestContextContainer.get, requestContext => reportRequestError(cause, {
             requestContext,
             path: req.originalUrl,
             method: req.method
-        }), tsplus_module_3.suspendSucceed(() => {
+        })), tsplus_module_3.suspendSucceed(() => {
             const headers = res.getHeaders();
             return tsplus_module_7.logAnnotates({
                 method: req.method,
@@ -174,7 +176,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     return prev;
                 }, {})))
             })(tsplus_module_3.logErrorCauseMessage("Finished request", cause));
-        })), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
+        })), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause))))), () => tsplus_module_8.setupRequestFrom(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => {
             const headers = res.getHeaders();
             return tsplus_module_7.logAnnotates({
                 method: req.method,
@@ -186,7 +188,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
                     } :
                     undefined
             })(tsplus_module_3.logInfo("Finished request"));
-        }))), RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
+        })))), RequestContextContainer, new RequestContextContainerImpl(requestContext)) // otherwise external error reporter breaks.
         ));
     };
 }
@@ -249,4 +251,4 @@ export function matchResource(mod) {
         return handler;
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.37.3",
+  "version": "0.37.4",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -21,8 +21,8 @@
     "redlock": "^4.2.0",
     "@effect-app/prelude": "0.26.1",
     "@effect-app/core": "0.33.0",
-    "@effect-app/schema": "0.24.0",
-    "@effect-app/infra-adapters": "0.26.1"
+    "@effect-app/infra-adapters": "0.26.1",
+    "@effect-app/schema": "0.24.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.0",