@effect-app/infra 2.76.0 → 2.78.0

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

@@ -1,82 +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 { RequestCacheLayers } from "../../routing.js";
+import { genericMiddleware, RequestCacheLayers } from "../../routing.js";
 const logRequestError = logError("Request");
 const reportRequestError = reportError("Request");
 export class DevMode extends Context.Reference()("DevMode", { defaultValue: () => false }) {
 }
+// 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(Effect.provide(RequestCacheLayers));
-        });
+        return genericMiddleware(Effect.fnUntraced(function* (options) {
+            return yield* options.next.pipe(Effect.provide(RequestCacheLayers));
+        }));
     })
 }) {
 }
+// Effect Rpc Middleware: Wrap
 export class ConfigureInterruptibility extends Effect.Service()("ConfigureInterruptibility", {
     effect: Effect.gen(function* () {
-        return (handle, _moduleName) => Effect.fnUntraced(function* (input, headers) {
-            return yield* handle(input, headers).pipe(
+        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);
-        });
-    })
-}) {
-}
-export class CaptureHttpHeadersAsRpcHeaders extends Effect.Service()("CaptureHttpHeadersAsRpcHeaders", {
-    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);
-        });
+        }));
     })
 }) {
 }
+// 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
@@ -88,14 +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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNoRSxPQUFPLEVBQUUsV0FBVyxFQUFtQixpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ2pGLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUVyRCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDM0MsTUFBTSxrQkFBa0IsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFakQsTUFBTSxPQUFPLE9BQVEsU0FBUSxPQUFPLENBQUMsU0FBUyxFQUFXLENBQUMsU0FBUyxFQUFFLEVBQUUsWUFBWSxFQUFFLEdBQUcsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDO0NBQUc7QUFFdEcsTUFBTSxPQUFPLHNCQUF1QixTQUFRLE1BQU0sQ0FBQyxPQUFPLEVBQTBCLENBQUMsd0JBQXdCLEVBQUU7SUFDN0csTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQzFCLE9BQU8sQ0FDTCxNQUF5RyxFQUN6RyxXQUFtQixFQUNuQixFQUFFLENBQ0YsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxLQUFVLEVBQUUsT0FBNEI7WUFDbEUsT0FBTyxLQUFLLENBQUMsQ0FBQyxNQUFN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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDaEUsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUFDakUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQ2hELE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRXhFLE1BQU0sZUFBZSxHQUFHLFFBQVEsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUMzQyxNQUFNLGtCQUFrQixHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUVqRCxNQUFNLE9BQU8sT0FBUSxTQUFRLE9BQU8sQ0FBQyxTQUFTLEVBQVcsQ0FBQyxTQUFTLEVBQUUsRUFBRSxZQUFZLEVBQUUsR0FBRyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7Q0FBRztBQUN0Ryw4QkFBOEI7QUFDOUIsTUFBTSxPQUFPLHNCQUF1QixTQUFRLE1BQU0sQ0FBQyxPQUFPLEVBQTBCLENBQUMsd0JBQXdCLEVBQUU7SUFDN0csTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQzFCLE9BQU8saUJBQWlCLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxPQUFPO1lBQzFELE9BQU8sS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.76.0",
+  "version": "2.78.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
@@ -27,7 +28,43 @@ export type ContextTagWithDefault<Id, A, LayerE, LayerR, Tag = unknown> =
   }
 
 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,8 +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 Tag } from "effect/Context"
-import { type ContextTagWithDefault, type GetContext, type LayerUtils } from "../../layerUtils.js"
-import { mergeContexts } from "./dynamic-middleware.js"
+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<
@@ -71,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,

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

@@ -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,42 @@ 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, headers) =>
+                  Effect.gen(function*() {
+                    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 +297,7 @@ function makeRpcEffect<
       HandlerR
     >(
       schema: T & S.Schema<Req, any, never>,
-      handler: (
+      next: (
         request: Req,
         headers: any
       ) => Effect.Effect<

package/src/api/routing/middleware/dynamic-middleware.ts

@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Array, Context, Effect, Option, type S } from "effect-app"
+import { Array, type Context, Effect, type Option, type S } from "effect-app"
 import { type GetEffectContext, type RPCContextMap } from "effect-app/client"
 import { type Tag } from "effect-app/Context"
 import { typedValuesOf } from "effect-app/utils"
-import { InfraLogger } from "../../../logger.js"
-import { type ContextTagWithDefault } from "../../layerUtils.js"
+import { type ContextTagWithDefault, mergeOptionContexts } from "../../layerUtils.js"
 import { sort } from "../tsort.js"
 
 export type ContextWithLayer<
@@ -39,42 +38,7 @@ export namespace ContextWithLayer {
   >
 }
 
-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
-  }
-)
-
+// Effect Rpc Middleware: no substitute atm. though maybe something could be achieved with Wrap, we just don't have type safety on the Request input etc.
 export const implementMiddleware = <T extends Record<string, RPCContextMap.Any>>() =>
 <
   TI extends {

package/src/api/routing/middleware/generic-middleware.ts

@@ -3,10 +3,20 @@ import { type Array, Effect } from "effect-app"
 import { type HttpHeaders, type HttpRouter } from "effect-app/http"
 import { type ContextTagWithDefault } from "../../layerUtils.js"
 
+export interface GenericMiddlewareOptions<A, E> {
+  // Effect rpc middleware does not support changing payload or headers, but we do..
+  readonly next: Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>
+  readonly payload: unknown
+  readonly headers: HttpHeaders.Headers
+  // readonly clientId: number
+  readonly rpc: { _tag: string } // Rpc.AnyWithProps
+}
+
 export type GenericMiddlewareMaker = <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>
+  options: GenericMiddlewareOptions<A, E>
+) => Effect.Effect<A, E, HttpRouter.HttpRouter.Provided>
+
+export const genericMiddleware = (i: GenericMiddlewareMaker) => i
 
 export const genericMiddlewareMaker = <
   T extends Array<
@@ -21,17 +31,14 @@ export const genericMiddlewareMaker = <
     effect: Effect.gen(function*() {
       const middlewaresInstances = yield* Effect.all(middlewares)
 
-      return <A, E, R>(
-        handle: (input: any, headers: HttpHeaders.Headers) => Effect.Effect<A, E, R>,
-        moduleName: string
+      return <A, E>(
+        options: GenericMiddlewareOptions<A, E>
       ) => {
-        return (input: any, headers: HttpHeaders.Headers) => {
-          let effect = handle
-          for (const middleware of (middlewaresInstances as any[]).toReversed()) {
-            effect = middleware(effect, moduleName)
-          }
-          return effect(input, headers)
+        let next = options.next
+        for (const middleware of (middlewaresInstances as any[]).toReversed()) {
+          next = middleware({ ...options, next })
         }
+        return next
       }
     })
   } as any