@effect-app/infra 2.75.0 → 2.77.0

package/dist/api/routing/middleware/generic-middleware.js

@@ -1,20 +1,19 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Effect } from "effect-app";
+export const genericMiddleware = (i) => i;
 export const genericMiddlewareMaker = (...middlewares) => {
     return {
         dependencies: middlewares.map((_) => _.Default),
         effect: Effect.gen(function* () {
             const middlewaresInstances = yield* Effect.all(middlewares);
-            return (handle, moduleName) => {
-                return (input, headers) => {
-                    let effect = handle;
-                    for (const middleware of middlewaresInstances.toReversed()) {
-                        effect = middleware(effect, moduleName);
-                    }
-                    return effect(input, headers);
-                };
+            return (options) => {
+                let next = options.next;
+                for (const middleware of middlewaresInstances.toReversed()) {
+                    next = middleware({ ...options, next });
+                }
+                return next;
             };
         })
     };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJpYy1taWRkbGV3YXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwaS9yb3V0aW5nL21pZGRsZXdhcmUvZ2VuZXJpYy1taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQWMsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBUy9DLE1BQU0sQ0FBQyxNQUFNLHNCQUFzQixHQUFHLENBSXBDLEdBQUcsV0FBYyxFQUdqQixFQUFFO0lBQ0YsT0FBTztRQUNMLFlBQVksRUFBRSxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDO1FBQy9DLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztZQUMxQixNQUFNLG9CQUFvQixHQUFHLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUE7WUFFM0QsT0FBTyxDQUNMLE1BQTRFLEVBQzVFLFVBQWtCLEVBQ2xCLEVBQUU7Z0JBQ0YsT0FBTyxDQUFDLEtBQVUsRUFBRSxPQUE0QixFQUFFLEVBQUU7b0JBQ2xELElBQUksTUFBTSxHQUFHLE1BQU0sQ0FBQTtvQkFDbkIsS0FBSyxNQUFNLFVBQVUsSUFBSyxvQkFBOEIsQ0FBQyxVQUFVLEVBQUUsRUFBRSxDQUFDO3dCQUN0RSxNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsQ0FBQTtvQkFDekMsQ0FBQztvQkFDRCxPQUFPLE1BQU0sQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUE7Z0JBQy9CLENBQUMsQ0FBQTtZQUNILENBQUMsQ0FBQTtRQUNILENBQUMsQ0FBQztLQUNJLENBQUE7QUFDVixDQUFDLENBQUEifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJpYy1taWRkbGV3YXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwaS9yb3V0aW5nL21pZGRsZXdhcmUvZ2VuZXJpYy1taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQWMsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBaUIvQyxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUFDLENBQXlCLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUVqRSxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQUlwQyxHQUFHLFdBQWMsRUFHakIsRUFBRTtJQUNGLE9BQU87UUFDTCxZQUFZLEVBQUUsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQztRQUMvQyxNQUFNLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7WUFDMUIsTUFBTSxvQkFBb0IsR0FBRyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFBO1lBRTNELE9BQU8sQ0FDTCxPQUF1QyxFQUN2QyxFQUFFO2dCQUNGLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUE7Z0JBQ3ZCLEtBQUssTUFBTSxVQUFVLElBQUssb0JBQThCLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQztvQkFDdEUsSUFBSSxHQUFHLFVBQVUsQ0FBQyxFQUFFLEdBQUcsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7Z0JBQ3pDLENBQUM7Z0JBQ0QsT0FBTyxJQUFJLENBQUE7WUFDYixDQUFDLENBQUE7UUFDSCxDQUFDLENBQUM7S0FDSSxDQUFBO0FBQ1YsQ0FBQyxDQUFBIn0=

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

@@ -1,23 +1,22 @@
 import { Context, Effect } from "effect-app";
-import { HttpHeaders, type HttpRouter } from "effect-app/http";
 declare const DevMode_base: Context.ReferenceClass<DevMode, "DevMode", boolean>;
 export declare class DevMode extends DevMode_base {
 }
-declare const ConfigureInterruptibility_base: Effect.Service.Class<ConfigureInterruptibility, "ConfigureInterruptibility", {
-    readonly effect: Effect.Effect<(<A, E>(handle: (input: any, headers: HttpHeaders.Headers) => Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>, _moduleName: string) => (input: any, headers: HttpHeaders.Headers) => Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>), never, never>;
+declare const RequestCacheMiddleware_base: Effect.Service.Class<RequestCacheMiddleware, "RequestCacheMiddleware", {
+    readonly effect: Effect.Effect<import("./generic-middleware.js").GenericMiddlewareMaker, never, never>;
 }>;
-export declare class ConfigureInterruptibility extends ConfigureInterruptibility_base {
+export declare class RequestCacheMiddleware extends RequestCacheMiddleware_base {
 }
-declare const CaptureHttpHeadersAsRpcHeaders_base: Effect.Service.Class<CaptureHttpHeadersAsRpcHeaders, "CaptureHttpHeadersAsRpcHeaders", {
-    readonly effect: Effect.Effect<(<A, E>(handle: (input: any, headers: HttpHeaders.Headers) => Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>, _moduleName: string) => (input: any, rpcHeaders: HttpHeaders.Headers) => Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>), never, never>;
+declare const ConfigureInterruptibility_base: Effect.Service.Class<ConfigureInterruptibility, "ConfigureInterruptibility", {
+    readonly effect: Effect.Effect<import("./generic-middleware.js").GenericMiddlewareMaker, never, never>;
 }>;
-export declare class CaptureHttpHeadersAsRpcHeaders extends CaptureHttpHeadersAsRpcHeaders_base {
+export declare class ConfigureInterruptibility extends ConfigureInterruptibility_base {
 }
 declare const MiddlewareLogger_base: Effect.Service.Class<MiddlewareLogger, "MiddlewareLogger", {
-    readonly effect: Effect.Effect<(<A, E>(handle: (input: any, headers: HttpHeaders.Headers) => Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>, moduleName: string) => (input: any, rpcHeaders: HttpHeaders.Headers) => Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>), never, never>;
+    readonly effect: Effect.Effect<import("./generic-middleware.js").GenericMiddlewareMaker, never, never>;
 }>;
 export declare class MiddlewareLogger extends MiddlewareLogger_base {
 }
-export declare const DefaultGenericMiddlewares: readonly [typeof ConfigureInterruptibility, typeof CaptureHttpHeadersAsRpcHeaders, typeof MiddlewareLogger];
+export declare const DefaultGenericMiddlewares: readonly [typeof RequestCacheMiddleware, typeof ConfigureInterruptibility, typeof MiddlewareLogger];
 export {};
 //# sourceMappingURL=middleware.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAE,MAAM,EAAe,MAAM,YAAY,CAAA;AAChE,OAAO,EAAE,WAAW,EAAE,KAAK,UAAU,EAAqB,MAAM,iBAAiB,CAAA;;AAQjF,qBAAa,OAAQ,SAAQ,YAAsE;CAAG;;qCAMxF,CAAC,EAAE,CAAC,UACF,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,eAC5F,MAAM;;AAN3B,qBAAa,yBAA0B,SAAQ,8BAgB9C;CAAG;;qCAKU,CAAC,EAAE,CAAC,UACF,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,eAC5F,MAAM;;AAL3B,qBAAa,8BACX,SAAQ,mCAcN;CACF;;qCAIU,CAAC,EAAE,CAAC,UACF,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,cAC7F,MAAM;;AAJxB,qBAAa,gBAAiB,SAAQ,qBAkEpC;CAAG;AAEL,eAAO,MAAM,yBAAyB,6GAI5B,CAAA"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,OAAO,EAAE,MAAM,EAAe,MAAM,YAAY,CAAA;;AAShE,qBAAa,OAAQ,SAAQ,YAAsE;CAAG;;;;AAEtG,qBAAa,sBAAuB,SAAQ,2BAM1C;CAAG;;;;AAGL,qBAAa,yBAA0B,SAAQ,8BAY9C;CAAG;;;;AAGJ,qBAAa,gBAAiB,SAAQ,qBA4DpC;CAAG;AAEL,eAAO,MAAM,yBAAyB,qGAI5B,CAAA"}

package/dist/api/routing/middleware/middleware.js

@@ -1,73 +1,71 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { Cause, Context, Effect, ParseResult } from "effect-app";
-import { HttpHeaders, HttpServerRequest } from "effect-app/http";
 import { pretty } from "effect-app/utils";
 import { logError, reportError } from "../../../errorReporter.js";
 import { InfraLogger } from "../../../logger.js";
+import { genericMiddleware, RequestCacheLayers } from "../../routing.js";
 const logRequestError = logError("Request");
 const reportRequestError = reportError("Request");
 export class DevMode extends Context.Reference()("DevMode", { defaultValue: () => false }) {
 }
-export class ConfigureInterruptibility extends Effect.Service()("ConfigureInterruptibility", {
+// Effect Rpc Middleware: Wrap
+export class RequestCacheMiddleware extends Effect.Service()("RequestCacheMiddleware", {
     effect: Effect.gen(function* () {
-        return (handle, _moduleName) => Effect.fnUntraced(function* (input, headers) {
-            return yield* handle(input, headers).pipe(
-            // TODO: make this depend on query/command, and consider if middleware also should be affected. right now it's not.
-            Effect.uninterruptible);
-        });
+        return genericMiddleware(Effect.fnUntraced(function* (options) {
+            return yield* options.next.pipe(Effect.provide(RequestCacheLayers));
+        }));
     })
 }) {
 }
-export class CaptureHttpHeadersAsRpcHeaders extends Effect.Service()("CaptureHttpHeadersAsRpcHeaders", {
+// Effect Rpc Middleware: Wrap
+export class ConfigureInterruptibility extends Effect.Service()("ConfigureInterruptibility", {
     effect: Effect.gen(function* () {
-        return (handle, _moduleName) => Effect.fnUntraced(function* (input, rpcHeaders) {
-            // merge in the request headers
-            // we should consider if we should merge them into rpc headers on the Protocol layer instead.
-            const httpReq = yield* HttpServerRequest.HttpServerRequest;
-            const headers = HttpHeaders.merge(httpReq.headers, rpcHeaders);
-            return yield* handle(input, headers);
-        });
+        return genericMiddleware(Effect.fnUntraced(function* (options) {
+            return yield* options.next.pipe(
+            // TODO: make this depend on query/command, and consider if middleware also should be affected. right now it's not.
+            Effect.uninterruptible);
+        }));
     })
 }) {
 }
+// Effect Rpc Middleware: Wrap
 export class MiddlewareLogger extends Effect.Service()("MiddlewareLogger", {
     effect: Effect.gen(function* () {
-        return (handle, moduleName) => Effect.fnUntraced(function* (input, rpcHeaders) {
+        return genericMiddleware(Effect.fnUntraced(function* ({ headers, next, payload, rpc }) {
             const devMode = yield* DevMode;
-            // merge in the request headers
-            // we should consider if we should merge them into rpc headers on the Protocol layer instead.
-            const httpReq = yield* HttpServerRequest.HttpServerRequest;
-            const headers = HttpHeaders.merge(httpReq.headers, rpcHeaders);
             return yield* Effect
-                .annotateCurrentSpan("requestInput", Object.entries(input).reduce((prev, [key, value]) => {
-                prev[key] = key === "password"
-                    ? "<redacted>"
-                    : typeof value === "string" || typeof value === "number" || typeof value === "boolean"
-                        ? typeof value === "string" && value.length > 256
-                            ? (value.substring(0, 253) + "...")
-                            : value
-                        : Array.isArray(value)
-                            ? `Array[${value.length}]`
-                            : value === null || value === undefined
-                                ? `${value}`
-                                : typeof value === "object" && value
-                                    ? `Object[${Object.keys(value).length}]`
-                                    : typeof value;
-                return prev;
-            }, {}))
+                .annotateCurrentSpan("requestInput", typeof payload === "object" && payload !== null
+                ? Object.entries(payload).reduce((prev, [key, value]) => {
+                    prev[key] = key === "password"
+                        ? "<redacted>"
+                        : typeof value === "string" || typeof value === "number" || typeof value === "boolean"
+                            ? typeof value === "string" && value.length > 256
+                                ? (value.substring(0, 253) + "...")
+                                : value
+                            : Array.isArray(value)
+                                ? `Array[${value.length}]`
+                                : value === null || value === undefined
+                                    ? `${value}`
+                                    : typeof value === "object" && value
+                                        ? `Object[${Object.keys(value).length}]`
+                                        : typeof value;
+                    return prev;
+                }, {})
+                : payload)
                 .pipe(
             // can't use andThen due to some being a function and effect
-            Effect.zipRight(handle(input, headers)), 
+            Effect.zipRight(next), 
             // TODO: support ParseResult if the error channel of the request allows it.. but who would want that?
             Effect.catchAll((_) => ParseResult.isParseError(_) ? Effect.die(_) : Effect.fail(_)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
                 .all([
                 reportRequestError(cause, {
-                    action: `${moduleName}.${input._tag}`
+                    action: rpc._tag
                 }),
                 InfraLogger
                     .logError("Finished request", cause)
                     .pipe(Effect.annotateLogs({
-                    action: `${moduleName}.${input._tag}`,
-                    req: pretty(input),
+                    action: rpc._tag,
+                    req: pretty(payload),
                     headers: pretty(headers)
                     // resHeaders: pretty(
                     //   Object
@@ -79,13 +77,13 @@ export class MiddlewareLogger extends Effect.Service()("MiddlewareLogger", {
                     // )
                 }))
             ])), devMode ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")));
-        });
+        }));
     })
 }) {
 }
 export const DefaultGenericMiddlewares = [
+    RequestCacheMiddleware,
     ConfigureInterruptibility,
-    CaptureHttpHeadersAsRpcHeaders,
     MiddlewareLogger
 ];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNoRSxPQUFPLEVBQUUsV0FBVyxFQUFtQixpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ2pGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUVoRCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDM0MsTUFBTSxrQkFBa0IsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFakQsTUFBTSxPQUFPLE9BQVEsU0FBUSxPQUFPLENBQUMsU0FBUyxFQUFXLENBQUMsU0FBUyxFQUFFLEVBQUUsWUFBWSxFQUFFLEdBQUcsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDO0NBQUc7QUFFdEcsTUFBTSxPQUFPLHlCQUEwQixTQUFRLE1BQU0sQ0FBQyxPQUFPLEVBQTZCLENBQ3hGLDJCQUEyQixFQUMzQjtJQUNFLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUMxQixPQUFPLENBQ0wsTUFBeUcsRUFDekcsV0FBbUIsRUFDbkIsRUFBRSxDQUNGLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUMsS0FBVSxFQUFFLE9BQTRCO1lBQ2xFLE9BQU8sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQyxJQUFJO1lBQ3ZDLG1IQUFtSDtZQUNuSCxNQUFNLENBQUMsZUFBZSxDQUN2QixDQUFBO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUM7Q0FDSCxDQUNGO0NBQUc7QUFFSixNQUFNLE9BQU8sOEJBQ1gsU0FBUSxNQUFNLENBQUMsT0FBTyxFQUFrQyxDQUFDLGdDQUFnQyxFQUFFO0lBQ3pGLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUMxQixPQUFPLENBQ0wsTUFBeUcsRUFDekcsV0FBbUIsRUFDbkIsRUFBRSxDQUNGLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUMsS0FBVSxFQUFFLFVBQStCO1lBQ3JFLCtCQUErQjtZQUMvQiw2RkFBNkY7WUFDN0YsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUE7WUFDMUQsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLFVBQVUsQ0FBQyxDQUFBO1lBQzlELE9BQU8sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUN0QyxDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQztDQUNILENBQUM7Q0FDRjtBQUVGLE1BQU0sT0FBTyxnQkFBaUIsU0FBUSxNQUFNLENBQUMsT0FBTyxFQUFvQixDQUFDLGtCQUFrQixFQUFFO0lBQzNGLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUMxQixPQUFPLENBQ0wsTUFBeUcsRUFDekcsVUFBa0IsRUFDbEIsRUFBRSxDQUNGLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUMsS0FBVSxFQUFFLFVBQStCO1lBQ3JFLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQTtZQUM5QiwrQkFBK0I7WUFDL0IsNkZBQTZGO1lBQzdGLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLGlCQUFpQixDQUFDLGlCQUFpQixDQUFBO1lBQzFELE1BQU0sT0FBTyxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxVQUFVLENBQUMsQ0FBQTtZQUU5RCxPQUFPLEtBQUssQ0FBQyxDQUFDLE1BQU07aUJBQ2pCLG1CQUFtQixDQUNsQixjQUFjLEVBQ2QsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFvQixFQUFFLEVBQUU7Z0JBQ3JFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxHQUFHLEtBQUssVUFBVTtvQkFDNUIsQ0FBQyxDQUFDLFlBQVk7b0JBQ2QsQ0FBQyxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksT0FBTyxLQUFLLEtBQUssU0FBUzt3QkFDdEYsQ0FBQyxDQUFDLE9BQU8sS0FBSyxLQUFLLFFBQVEsSUFBSSxLQUFLLENBQUMsTUFBTSxHQUFHLEdBQUc7NEJBQy9DLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEdBQUcsQ0FBQyxHQUFHLEtBQUssQ0FBQzs0QkFDbkMsQ0FBQyxDQUFDLEtBQUs7d0JBQ1QsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDOzRCQUN0QixDQUFDLENBQUMsU0FBUyxLQUFLLENBQUMsTUFBTSxHQUFHOzRCQUMxQixDQUFDLENBQUMsS0FBSyxLQUFLLElBQUksSUFBSSxLQUFLLEtBQUssU0FBUztnQ0FDdkMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxFQUFFO2dDQUNaLENBQUMsQ0FBQyxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksS0FBSztvQ0FDcEMsQ0FBQyxDQUFDLFVBQVUsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLEdBQUc7b0NBQ3hDLENBQUMsQ0FBQyxPQUFPLEtBQUssQ0FBQTtnQkFDaEIsT0FBTyxJQUFJLENBQUE7WUFDYixDQUFDLEVBQUUsRUFBK0MsQ0FBQyxDQUNwRDtpQkFDQSxJQUFJO1lBQ0gsNERBQTREO1lBQzVELE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQztZQUN2QyxxR0FBcUc7WUFDckcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUNwRixNQUFNLENBQUMsYUFBYSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFDOUYsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQ3pCLE1BQU07aUJBQ0gsR0FBRyxDQUFDO2dCQUNILGtCQUFrQixDQUFDLEtBQUssRUFBRTtvQkFDeEIsTUFBTSxFQUFFLEdBQUcsVUFBVSxJQUFJLEtBQUssQ0FBQyxJQUFJLEVBQUU7aUJBQ3RDLENBQUM7Z0JBQ0YsV0FBVztxQkFDUixRQUFRLENBQUMsa0JBQWtCLEVBQUUsS0FBSyxDQUFDO3FCQUNuQyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQztvQkFDeEIsTUFBTSxFQUFFLEdBQUcsVUFBVSxJQUFJLEtBQUssQ0FBQyxJQUFJLEVBQUU7b0JBQ3JDLEdBQUcsRUFBRSxNQUFNLENBQUMsS0FBSyxDQUFDO29CQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQztvQkFDeEIsc0JBQXNCO29CQUN0QixXQUFXO29CQUNYLHdCQUF3QjtvQkFDeEIsd0NBQXdDO29CQUN4QyxtRkFBbUY7b0JBQ25GLG9CQUFvQjtvQkFDcEIsb0NBQW9DO29CQUNwQyxJQUFJO2lCQUNMLENBQUMsQ0FBQzthQUNOLENBQUMsQ0FDTCxFQUNELE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUMsQ0FDdEYsQ0FBQTtRQUNMLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDO0NBQ0gsQ0FBQztDQUFHO0FBRUwsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUc7SUFDdkMseUJBQXlCO0lBQ3pCLDhCQUE4QjtJQUM5QixnQkFBZ0I7Q0FDUixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDaEUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRXhFLE1BQU0sZUFBZSxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUMzQyxNQUFNLGtCQUFrQixHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUVqRCxNQUFNLE9BQU8sT0FBUSxTQUFRLE9BQU8sQ0FBQyxTQUFTLEVBQVcsQ0FBQyxTQUFTLEVBQUUsRUFBRSxZQUFZLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7Q0FBRztBQUN0Ryw4QkFBOEI7QUFDOUIsTUFBTSxPQUFPLHNCQUF1QixTQUFRLE1BQU0sQ0FBQyxPQUFPLEVBQTBCLENBQUMsd0JBQXdCLEVBQUU7SUFDN0csTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQzFCLE9BQU8saUJBQWlCLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxPQUFPO1lBQzFELE9BQU8sS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.75.0",
+  "version": "2.77.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.2.2",
-    "effect-app": "2.49.0"
+    "effect-app": "2.50.0"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.5.0",
@@ -38,10 +38,10 @@
   "peerDependencies": {
     "@azure/cosmos": "^4.5.0",
     "@azure/service-bus": "^7.9.5",
-    "@effect/experimental": "^0.54.1",
+    "@effect/experimental": "^0.54.3",
     "@effect/platform": "^0.90.0",
     "@effect/rpc-http": "^0.52.4",
-    "@effect/rpc": "^0.68.0",
+    "@effect/rpc": "^0.68.1",
     "@effect/sql": "^0.44.0",
     "@effect/vitest": "^0.25.0",
     "@sendgrid/helpers": "^8.0.0",
@@ -51,7 +51,7 @@
     "jwt-decode": "^4.0.0",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
-    "effect": "^3.17.2",
+    "effect": "^3.17.4",
     "express": "^5.1.0"
   },
   "typesVersions": {

package/src/api/layerUtils.ts

@@ -1,4 +1,5 @@
-import { type Context, type Layer, type NonEmptyReadonlyArray } from "effect-app"
+import { Context, Effect, type Layer, type NonEmptyReadonlyArray, Option } from "effect-app"
+import { InfraLogger } from "../logger.js"
 
 export namespace LayerUtils {
   export type GetLayersSuccess<Layers extends ReadonlyArray<Layer.Layer.Any>> = Layers extends
@@ -24,11 +25,46 @@ export type ContextTagWithDefault<Id, A, LayerE, LayerR, Tag = unknown> =
   & (Tag extends string ? Context.Tag<Id, { _tag: Tag } & A> : Context.Tag<Id, A>)
   & {
     Default: Layer.Layer<Id, LayerE, LayerR>
-    // new(a: A): Id
   }
 
 export namespace ContextTagWithDefault {
-  export type Base<A> = ContextTagWithDefault<any, any, A, any, any>
+  export type Base<A> = ContextTagWithDefault<any, A, any, any, any>
 }
 
 export type GetContext<T> = T extends Context.Context<infer Y> ? Y : never
+
+export const mergeContexts = Effect.fnUntraced(
+  function*<T extends readonly { maker: any; handle: Effect<Context<any>> }[]>(makers: T) {
+    let context = Context.empty()
+    for (const mw of makers) {
+      yield* InfraLogger.logDebug("Building context for middleware", mw.maker.key ?? mw.maker)
+      const moreContext = yield* mw.handle.pipe(Effect.provide(context))
+      yield* InfraLogger.logDebug(
+        "Built context for middleware",
+        mw.maker.key ?? mw.maker,
+        (moreContext as any).toJSON().services
+      )
+      context = Context.merge(context, moreContext)
+    }
+    return context as Context.Context<Effect.Success<T[number]["handle"]>>
+  }
+)
+
+export const mergeOptionContexts = Effect.fnUntraced(
+  function*<T extends readonly { maker: any; handle: Effect<Option<Context<any>>> }[]>(makers: T) {
+    let context = Context.empty()
+    for (const mw of makers) {
+      yield* InfraLogger.logDebug("Building context for middleware", mw.maker.key ?? mw.maker)
+      const moreContext = yield* mw.handle.pipe(Effect.provide(context))
+      yield* InfraLogger.logDebug(
+        "Built context for middleware",
+        mw.maker.key ?? mw.maker,
+        Option.map(moreContext, (c) => (c as any).toJSON().services)
+      )
+      if (moreContext.value) {
+        context = Context.merge(context, moreContext.value)
+      }
+    }
+    return context
+  }
+)

package/src/api/routing/middleware/ContextProvider.ts

@@ -1,7 +1,7 @@
 import { type Array, Context, Effect, Layer, type NonEmptyArray, pipe, type Scope } from "effect-app"
 import { type HttpRouter } from "effect-app/http"
-import { type ContextTagWithDefault, type GetContext, type LayerUtils } from "../../layerUtils.js"
-import { mergeContexts } from "./dynamic-middleware.js"
+import { type Tag } from "effect/Context"
+import { type ContextTagWithDefault, type GetContext, type LayerUtils, mergeContexts } from "../../layerUtils.js"
 
 // the context provider provides additional stuff
 export type ContextProviderShape<ContextProviderA, ContextProviderR extends HttpRouter.HttpRouter.Provided> = Effect<
@@ -14,38 +14,44 @@ export interface ContextProviderId {
   _tag: "ContextProvider"
 }
 
+/**
+ * TDeps is an array of services with Default implementation
+ * each service is an effect which builds some context for each request
+ */
+type TDepsArr = Array.NonEmptyReadonlyArray<
+  & (
+    // E = never => the context provided cannot trigger errors
+    // can't put HttpRouter.HttpRouter.Provided as R here because of variance
+    // (TDeps is an input type parameter so it's contravariant therefore Effect's R becomes contravariant too)
+    | Context.Tag<any, Effect<Context.Context<any>, never, any> & { _tag: any }>
+    | Context.Tag<any, Effect<Context.Context<any>, never, never> & { _tag: any }>
+  )
+  & {
+    Default: Layer.Layer<Effect<Context.Context<any>> & { _tag: any }, any, any>
+  }
+>
+
+type ConstrainDeps<TDeps extends TDepsArr> = {
+  [K in keyof TDeps]: TDeps[K]["Service"] extends Effect<Context.Context<any>, never, HttpRouter.HttpRouter.Provided>
+    ? TDeps[K]
+    : `HttpRouter.HttpRouter.Provided are the only requirements ${TDeps[K]["Service"][
+      "_tag"
+    ]}'s returned effect can have`
+}
+
 // Note: the type here must be aligned with MergedContextProvider
 export const mergeContextProviders = <
-  // TDeps is an array of services whit Default implementation
-  // each service is an effect which builds some context for each request
-  TDeps extends Array.NonEmptyReadonlyArray<
-    & (
-      // E = never => the context provided cannot trigger errors
-      // can't put HttpRouter.HttpRouter.Provided as R here because of variance
-      // (TDeps is an input type parameter so it's contravariant therefore Effect's R becomes contravariant too)
-      | Context.Tag<any, Effect<Context.Context<any>, never, any> & { _tag: any }>
-      | Context.Tag<any, Effect<Context.Context<any>, never, never> & { _tag: any }>
-    )
-    & {
-      new(...args: any[]): any
-      Default: Layer.Layer<Effect<Context.Context<any>> & { _tag: any }, any, any>
-    }
-  >
+  TDeps extends TDepsArr
 >(
-  ...deps: {
-    [K in keyof TDeps]: TDeps[K]["Service"] extends Effect<Context.Context<any>, never, HttpRouter.HttpRouter.Provided>
-      ? TDeps[K]
-      : `HttpRouter.HttpRouter.Provided are the only requirements ${TDeps[K]["Service"][
-        "_tag"
-      ]}'s returned effect can have`
-  }
+  ...deps: ConstrainDeps<TDeps>
 ): {
   dependencies: { [K in keyof TDeps]: TDeps[K]["Default"] }
   effect: Effect.Effect<
     Effect.Effect<
-      Context.Context<GetContext<Effect.Success<InstanceType<TDeps[number]>>>>,
+      // we need to merge all contexts into one
+      Context.Context<GetContext<Effect.Success<Tag.Service<TDeps[number]>>>>,
       never,
-      Effect.Context<InstanceType<TDeps[number]>>
+      Effect.Context<Tag.Service<TDeps[number]>>
     >,
     LayerUtils.GetLayersError<{ [K in keyof TDeps]: TDeps[K]["Default"] }>,
     LayerUtils.GetLayersSuccess<{ [K in keyof TDeps]: TDeps[K]["Default"] }>
@@ -64,6 +70,7 @@ export const mergeContextProviders = <
   }) as any
 })
 
+// Effect Rpc Middleware: for single tag providing, we could use Provides, for providing Context or Layer (bad boy) we could use Wrap..
 export const ContextProvider = <
   ContextProviderA,
   MakeContextProviderE,
@@ -102,29 +109,9 @@ export const ContextProvider = <
 
 // Note: the type here must be aligned with mergeContextProviders
 export const MergedContextProvider = <
-  // TDeps is an array of services whit Default implementation
-  // each service is an effect which builds some context for each request
-  TDeps extends Array.NonEmptyReadonlyArray<
-    & (
-      // E = never => the context provided cannot trigger errors
-      // can't put HttpRouter.HttpRouter.Provided as R here because of variance
-      // (TDeps is an input type parameter so it's contravariant therefore Effect's R becomes contravariant too)
-      | Context.Tag<any, Effect<Context.Context<any>, never, any> & { _tag: any }>
-      | Context.Tag<any, Effect<Context.Context<any>, never, never> & { _tag: any }>
-    )
-    & {
-      new(...args: any[]): any
-      Default: Layer.Layer<Effect<Context.Context<any>> & { _tag: any }, any, any>
-    }
-  >
+  TDeps extends TDepsArr
 >(
-  ...deps: {
-    [K in keyof TDeps]: TDeps[K]["Service"] extends Effect<Context.Context<any>, never, HttpRouter.HttpRouter.Provided>
-      ? TDeps[K]
-      : `HttpRouter.HttpRouter.Provided are the only requirements ${TDeps[K]["Service"][
-        "_tag"
-      ]}'s returned effect can have`
-  }
+  ...deps: ConstrainDeps<TDeps>
 ) =>
   pipe(
     deps as [Parameters<typeof mergeContextProviders>[0]],
@@ -133,13 +120,14 @@ export const MergedContextProvider = <
   ) as unknown as ContextTagWithDefault<
     ContextProviderId,
     Effect.Effect<
-      Context.Context<GetContext<Effect.Success<InstanceType<TDeps[number]>>>>,
+      // we need to merge all contexts into one
+      Context.Context<GetContext<Effect.Success<Tag.Service<TDeps[number]>>>>,
       never,
-      Effect.Context<InstanceType<TDeps[number]>>
+      Effect.Context<Tag.Service<TDeps[number]>>
     >,
     LayerUtils.GetLayersError<{ [K in keyof TDeps]: TDeps[K]["Default"] }>,
     | Exclude<
-      InstanceType<TDeps[number]>,
+      Tag.Service<TDeps[number]>,
       LayerUtils.GetLayersSuccess<{ [K in keyof TDeps]: TDeps[K]["Default"] }>
     >
     | LayerUtils.GetLayersContext<{ [K in keyof TDeps]: TDeps[K]["Default"] }>

package/src/api/routing/middleware/DynamicMiddleware.ts

@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Context, Effect, Layer, type NonEmptyArray, type Request, type S, type Scope } from "effect-app"
 import type { GetEffectContext, RPCContextMap } from "effect-app/client/req"
-import { type HttpRouter } from "effect-app/http"
+import { HttpHeaders, type HttpRouter, HttpServerRequest } from "effect-app/http"
 import type * as EffectRequest from "effect/Request"
 import { type ContextTagWithDefault, type LayerUtils } from "../../layerUtils.js"
 import { type ContextProviderId, type ContextProviderShape } from "./ContextProvider.js"
@@ -23,7 +23,7 @@ export type MakeRPCHandlerFactory<
   HandlerR
 >(
   schema: T & S.Schema<Req, any, never>,
-  handler: (
+  next: (
     request: Req,
     headers: any
   ) => Effect.Effect<
@@ -56,7 +56,7 @@ export type RPCHandlerFactory<
   HandlerR
 >(
   schema: T & S.Schema<Req, any, never>,
-  handler: (
+  next: (
     request: Req,
     headers: any
   ) => Effect.Effect<
@@ -76,7 +76,7 @@ export type RPCHandlerFactory<
     // the middleware will remove from HandlerR the dynamic context
     // & S.Schema<Req, any, never> is useless here but useful when creating the middleware
     Exclude<HandlerR, GetEffectContext<RequestContextMap, (T & S.Schema<Req, any, never>)["config"]>>,
-    // the context provider provides additional stuff both to the middleware and the handler
+    // the context provider provides additional stuff both to the middleware and the next
     ContextProviderA
   >
 >
@@ -90,7 +90,7 @@ type RequestContextMapProvider<RequestContextMap extends Record<string, RPCConte
 }
 
 export interface MiddlewareMake<
-  RequestContextMap extends Record<string, RPCContextMap.Any>, // what services will the middleware provide dynamically to the handler, or raise errors.
+  RequestContextMap extends Record<string, RPCContextMap.Any>, // what services will the middleware provide dynamically to the next, or raise errors.
   //
   // ContextProvider is a service that builds additional context for each request.
   ContextProviderA, // what the context provider provides
@@ -117,9 +117,9 @@ export interface MiddlewareMake<
     MakeContextProviderR
   >
 
-  /* dependencies for the main middleware running just before the handler is called */
+  /* dependencies for the main middleware running just before the next is called */
   dependencies?: MiddlewareDependencies
-  // this actually builds "the middleware", i.e. returns the augmented handler factory when yielded...
+  // this actually builds "the middleware", i.e. returns the augmented next factory when yielded...
   execute?: (
     maker: (
       // MiddlewareR is set to ContextProviderA | HttpRouter.HttpRouter.Provided because that's what, at most
@@ -138,7 +138,7 @@ export interface MiddlewareMakerId {
 }
 
 export type Middleware<
-  RequestContextMap extends Record<string, RPCContextMap.Any>, // what services will the middlware provide dynamically to the handler, or raise errors.
+  RequestContextMap extends Record<string, RPCContextMap.Any>, // what services will the middlware provide dynamically to the next, or raise errors.
   MakeMiddlewareE, // what the middleware construction can fail with
   MakeMiddlewareR, // what the middlware requires to be constructed
   ContextProviderA // what the context provider provides
@@ -190,7 +190,6 @@ export const makeMiddleware =
       MiddlewareDependencies
     >
   ) => {
-    // type Id = MiddlewareMakerId &
     const MiddlewareMaker = Context.GenericTag<
       MiddlewareMakerId,
       {
@@ -216,35 +215,47 @@ export const makeMiddleware =
             ) => cb)
             : Effect.succeed<
               MakeRPCHandlerFactory<RequestContextMap, ContextProviderA | HttpRouter.HttpRouter.Provided>
-            >((_schema, handle) => (req, headers) => handle(req, headers)),
+            >((_schema, next) => (payload, headers) => next(payload, headers)),
           contextProvider: make.contextProvider // uses the middleware.contextProvider tag to get the context provider service
         })
         .pipe(
           Effect.map(({ contextProvider, dynamicMiddlewares, generic, middleware }) => ({
             _tag: "MiddlewareMaker" as const,
             effect: makeRpcEffect<RequestContextMap, ContextProviderA>()(
-              (schema, handler, moduleName) => {
-                const h = middleware(schema, handler as any, moduleName)
-                return generic(
-                  Effect.fnUntraced(function*(req, headers) {
-                    yield* Effect.annotateCurrentSpan(
-                      "request.name",
-                      moduleName ? `${moduleName}.${req._tag}` : req._tag
-                    )
+              (schema, next, moduleName) => {
+                const h = middleware(schema, next as any, moduleName)
+                return (payload, rpcHeaders) =>
+                  Effect.gen(function*() {
+                    // TODO: perhaps this should be part of Protocol instead.
+                    // the alternative is that UserProfile handling is part of Http Middleware instead of Rpc Middleware..
+                    // the Rpc Middleware then just needs to confirm if it's there..
+                    const req = yield* HttpServerRequest.HttpServerRequest
+                    const headers = HttpHeaders.merge(req.headers, rpcHeaders)
+                    return yield* generic({
+                      payload,
+                      headers,
+                      rpc: { _tag: `${moduleName}.${payload._tag}` }, // todo: make moduleName part of the tag on S.Req creation.
+                      next: Effect.gen(function*() {
+                        yield* Effect.annotateCurrentSpan(
+                          "request.name",
+                          moduleName ? `${moduleName}.${payload._tag}` : payload._tag
+                        )
 
-                    // the contextProvider is an Effect that builds the context for the request
-                    return yield* contextProvider.pipe(
-                      Effect.flatMap((contextProviderContext) =>
-                        // the dynamicMiddlewares is an Effect that builds the dynamiuc context for the request
-                        dynamicMiddlewares(schema.config ?? {}, headers).pipe(
-                          Effect.flatMap((dynamicContext) => h(req, headers).pipe(Effect.provide(dynamicContext))),
-                          Effect.provide(contextProviderContext)
+                        // the contextProvider is an Effect that builds the context for the request
+                        return yield* contextProvider.pipe(
+                          Effect.flatMap((contextProviderContext) =>
+                            // the dynamicMiddlewares is an Effect that builds the dynamiuc context for the request
+                            dynamicMiddlewares(schema.config ?? {}, headers).pipe(
+                              Effect.flatMap((dynamicContext) =>
+                                h(payload, headers).pipe(Effect.provide(dynamicContext))
+                              ),
+                              Effect.provide(contextProviderContext)
+                            )
+                          )
                         )
-                      )
-                    )
-                  }) as any,
-                  moduleName
-                )
+                      }) as any
+                    })
+                  }) as any // why?
               }
             )
           }))
@@ -291,7 +302,7 @@ function makeRpcEffect<
       HandlerR
     >(
       schema: T & S.Schema<Req, any, never>,
-      handler: (
+      next: (
         request: Req,
         headers: any
       ) => Effect.Effect<