@effect-app/infra 2.64.6 → 2.65.0

package/dist/api/routing.js

@@ -6,34 +6,40 @@ import { determineMethod } from "@effect-app/infra/api/routing/utils";
 import { logError, reportError } from "@effect-app/infra/errorReporter";
 import { InfraLogger } from "@effect-app/infra/logger";
 import { Rpc, RpcGroup, RpcServer } from "@effect/rpc";
-import { Array, Cause, Duration, Effect, Layer, ParseResult, Predicate, Request, S, Schedule, Schema } from "effect-app";
+import { Array, Cause, Context, Duration, Effect, Layer, ParseResult, Predicate, Request, S, Schedule, Schema } from "effect-app";
 import { HttpRouter } from "effect-app/http";
 import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils";
 import { makeRpc } from "./routing/DynamicMiddleware.js";
 const logRequestError = logError("Request");
 const reportRequestError = reportError("Request");
+// retry just once on optimistic concurrency exceptions
 const optimisticConcurrencySchedule = Schedule.once.pipe(Schedule.intersect(Schedule.recurWhile((a) => a?._tag === "OptimisticConcurrencyException")));
+// note:
+// "d" stands for decoded i.e. the Type
+// "raw" stands for encoded i.e. the Encoded
+var RequestTypes;
+(function (RequestTypes) {
+    RequestTypes.DECODED = "d";
+    RequestTypes.TYPE = "raw";
+})(RequestTypes || (RequestTypes = {}));
 export const RouterSymbol = Symbol();
-// export interface RouteMatcher<
-//   Filtered extends Record<string, any>,
-//   CTXMap extends Record<string, any>,
-//   Rsc extends Filtered
-// > extends RouteMatcherInt<Filtered, CTXMap, Rsc> {}
+// identity factory for Middleware
 export const makeMiddleware = (content) => content;
 export class Router extends HttpRouter.Tag("@effect-app/Rpc")() {
 }
 export const makeRouter = (middleware, devMode) => {
     function matchFor(rsc) {
-        const meta = rsc.meta;
-        const filtered = typedKeysOf(rsc).reduce((acc, cur) => {
+        const { meta } = rsc;
+        const requestModules = typedKeysOf(rsc).reduce((acc, cur) => {
             if (Predicate.isObject(rsc[cur]) && rsc[cur]["success"]) {
                 acc[cur] = rsc[cur];
             }
             return acc;
         }, {});
-        const items = typedKeysOf(filtered).reduce((prev, cur) => {
+        const items = typedKeysOf(requestModules).reduce((prev, cur) => {
             ;
             prev[cur] = Object.assign((fnOrEffect) => {
+                // fnOrEffect is the actual handler implementation
                 if (fnOrEffect[Symbol.toStringTag] === "GeneratorFunction")
                     fnOrEffect = Effect.fnUntraced(fnOrEffect);
                 const stack = new Error().stack?.split("\n").slice(2).join("\n");
@@ -41,13 +47,13 @@ export const makeRouter = (middleware, devMode) => {
                     ? class {
                         static request = rsc[cur];
                         static stack = stack;
-                        static _tag = "d";
+                        static _tag = RequestTypes.DECODED;
                         static handler = () => fnOrEffect;
                     }
                     : class {
                         static request = rsc[cur];
                         static stack = stack;
-                        static _tag = "d";
+                        static _tag = RequestTypes.DECODED;
                         static handler = fnOrEffect;
                     };
             }, {
@@ -65,20 +71,20 @@ export const makeRouter = (middleware, devMode) => {
                         ? class {
                             static request = rsc[cur];
                             static stack = stack;
-                            static _tag = "raw";
+                            static _tag = RequestTypes.TYPE;
                             static handler = () => fnOrEffect;
                         }
                         : class {
                             static request = rsc[cur];
                             static stack = stack;
-                            static _tag = "raw";
-                            static handler = (req) => fnOrEffect(req);
+                            static _tag = RequestTypes.TYPE;
+                            static handler = fnOrEffect;
                         };
                 }
             });
             return prev;
         }, {});
-        const total = Object.keys(filtered).length;
+        const total = Object.keys(requestModules).length;
         const router = {
             accum: {},
             add(a) {
@@ -95,7 +101,7 @@ export const makeRouter = (middleware, devMode) => {
             return acc;
         }, {});
         const f = (layers, make) => {
-            const layer = (requestLayers) => Effect
+            const layer = Effect
                 .gen(function* () {
                 make = make[Symbol.toStringTag] === "GeneratorFunction"
                     ? Effect.fnUntraced(make)(router3)
@@ -103,7 +109,7 @@ export const makeRouter = (middleware, devMode) => {
                 const controllers = yield* make;
                 const rpc = yield* makeRpc(middleware);
                 // return make.pipe(Effect.map((c) => controllers(c, layers)))
-                const mapped = typedKeysOf(filtered).reduce((acc, cur) => {
+                const mapped = typedKeysOf(requestModules).reduce((acc, cur) => {
                     const handler = controllers[cur];
                     const req = rsc[cur];
                     const method = determineMethod(String(cur), req);
@@ -112,7 +118,7 @@ export const makeRouter = (middleware, devMode) => {
                         ? (req, headers) => Effect.retry(handler.handler(req, headers), optimisticConcurrencySchedule)
                         : (req, headers) => Effect.interruptible(handler.handler(req, headers));
                     acc[cur] = [
-                        handler._tag === "raw"
+                        handler._tag === RequestTypes.TYPE
                             ? class extends req {
                                 static success = S.encodedSchema(req.success);
                                 get [Schema.symbolSerializable]() {
@@ -126,7 +132,7 @@ export const makeRouter = (middleware, devMode) => {
                                 }
                             }
                             : req,
-                        (requestLayers) => rpc.effect(req, (input, headers) => 
+                        rpc.effect(req, (input, headers) => 
                         // TODO: render more data... similar to console?
                         Effect
                             .annotateCurrentSpan("requestInput", Object.entries(input).reduce((prev, [key, value]) => {
@@ -174,7 +180,7 @@ export const makeRouter = (middleware, devMode) => {
                         // we should re-evalute this in any case..
                         devMode ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")), Effect.withSpan("Request." + meta.moduleName + "." + req._tag, {
                             captureStackTrace: () => handler.stack
-                        }), Effect.provide(requestLayers)), meta.moduleName),
+                        })), meta.moduleName),
                         meta.moduleName
                     ];
                     return acc;
@@ -182,13 +188,13 @@ export const makeRouter = (middleware, devMode) => {
                 const rpcs = RpcGroup.make(...typedValuesOf(mapped).map((_) => {
                     return Rpc.fromTaggedRequest(_[0]);
                 }));
-                const rpcLayer = (requestLayers) => rpcs.toLayer(Effect.gen(function* () {
+                const rpcLayer = rpcs.toLayer(Effect.gen(function* () {
                     return typedValuesOf(mapped).reduce((acc, [req, handler]) => {
-                        acc[req._tag] = handler(requestLayers);
+                        acc[req._tag] = handler;
                         return acc;
                     }, {});
                 }));
-                const impl = rpcLayer(requestLayers);
+                const impl = rpcLayer;
                 const l = RpcServer.layer(rpcs, { spanPrefix: "RpcServer." + meta.moduleName }).pipe(Layer.provide(impl));
                 return l.pipe(Layer.provideMerge(RpcServer.layerProtocolHttp({ path: ("/" + meta.moduleName), routerTag: Router })));
                 // const rpcRouter = RpcRouter.make(...typedValuesOf(mapped).map(_ => _[0]) as any) as RpcRouter.RpcRouter<
@@ -209,7 +215,7 @@ export const makeRouter = (middleware, devMode) => {
             })
                 .pipe(Layer.unwrapEffect);
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-            const routes = ((requestLayer) => layer(requestLayer).pipe(layers && Array.isNonEmptyReadonlyArray(layers) ? Layer.provide(layers) : (_) => _, 
+            const routes = (layer.pipe(layers && Array.isNonEmptyReadonlyArray(layers) ? Layer.provide(layers) : (_) => _, Layer.provide(middleware.contextProvider.Default), 
             // TODO: only provide to the middleware?
             middleware.dependencies ? Layer.provide(middleware.dependencies) : (_) => _));
             // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
@@ -221,9 +227,9 @@ export const makeRouter = (middleware, devMode) => {
         const effect = ((m) => Object.assign(f(m.dependencies, m.effect), { make: m }));
         return Object.assign(effect, items, { router, router3 });
     }
-    function matchAll(handlers, requestLayer) {
+    function matchAll(handlers) {
         const routers = typedValuesOf(handlers);
-        return Layer.mergeAll(...routers.map((_) => _.routes(requestLayer))); // TODO
+        return Layer.mergeAll(...routers.map((_) => _.routes)); // TODO
     }
     return {
         matchAll,
@@ -232,4 +238,9 @@ export const makeRouter = (middleware, devMode) => {
     };
 };
 export const RequestCacheLayers = Layer.mergeAll(Layer.setRequestCache(Request.makeCache({ capacity: 500, timeToLive: Duration.hours(8) })), Layer.setRequestCaching(true), Layer.setRequestBatching(true));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
+export class DefaultContextMaker extends Effect.Service()("ContextMaker", {
+    strict: false,
+    succeed: Effect.succeed(Context.empty())
+}) {
+}
+//# 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": "2.64.6",
+  "version": "2.65.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.43.3"
+    "effect-app": "2.44.0"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.5.0",

package/src/api/internal/auth.ts

@@ -29,7 +29,7 @@ export const checkJWTI = (config: Config) => {
           ) {
             return cb(Effect.fail(err))
           }
-          return Effect.die(err)
+          return cb(Effect.die(err))
         }
         const r = { headers: req.headers, query: {}, body: {}, is: () => false } // is("urlencoded")
         try {

package/src/api/internal/middlewares.ts

@@ -47,36 +47,32 @@ export const endpointCallsMetric = () => {
   const endpointCalledCounter = Metric.counter("server.endpoint_calls")
 
   return Middleware.make((app) =>
-    Effect.gen(function*(_) {
-      const request = yield* _(HttpServerRequest.HttpServerRequest)
+    Effect.gen(function*() {
+      const request = yield* (HttpServerRequest.HttpServerRequest)
 
-      yield* _(
+      yield* pipe(
         Metric.increment(endpointCalledCounter),
         Effect.tagMetrics("path", request.url)
       )
 
-      return yield* _(app)
+      return yield* app
     })
   )
 }
 
 export const errorLog = Middleware.make((app) =>
-  Effect.gen(function*(_) {
-    const request = yield* _(HttpServerRequest.HttpServerRequest)
+  Effect.gen(function*() {
+    const request = yield* HttpServerRequest.HttpServerRequest
 
-    const response = yield* _(app)
+    const response = yield* app
 
     if (response.status >= 400 && response.status < 500) {
-      yield* _(
-        InfraLogger.logWarning(
-          `${request.method.toUpperCase()} ${request.url} client error ${response.status}`
-        )
+      yield* InfraLogger.logWarning(
+        `${request.method.toUpperCase()} ${request.url} client error ${response.status}`
       )
     } else if (response.status >= 500) {
-      yield* _(
-        InfraLogger.logError(
-          `${request.method.toUpperCase()} ${request.url} server error ${response.status}`
-        )
+      yield* InfraLogger.logError(
+        `${request.method.toUpperCase()} ${request.url} server error ${response.status}`
       )
     }
 
@@ -84,7 +80,7 @@ export const errorLog = Middleware.make((app) =>
   })
 )
 
-export const toServerResponse = (err: NotLoggedInError) =>
+const toServerResponse = (err: NotLoggedInError) =>
   HttpServerResponse.empty().pipe(
     HttpServerResponse.setStatus(401),
     HttpServerResponse.setBody(HttpBody.unsafeJson({ message: err.message }))
@@ -100,13 +96,13 @@ export const basicAuth = <_, R>(
   }>
 ) =>
   Middleware.make((app) =>
-    Effect.gen(function*(_) {
+    Effect.gen(function*() {
       const headerName = options?.headerName ?? "Authorization"
       const skippedPaths = options?.skipPaths ?? []
-      const request = yield* _(HttpServerRequest.HttpServerRequest)
+      const request = yield* HttpServerRequest.HttpServerRequest
 
       if (skippedPaths.includes(request.url)) {
-        return yield* _(app)
+        return yield* app
       }
 
       const authHeader = request.headers[headerName.toLowerCase()]
@@ -149,19 +145,16 @@ export const basicAuth = <_, R>(
         )
       }
 
-      const check = yield* _(
-        checkCredentials({
-          user: credentialsParts[0],
-          password: credentialsParts[1]!
-        }),
-        Effect.either
-      )
+      const check = yield* Effect.either(checkCredentials({
+        user: credentialsParts[0],
+        password: credentialsParts[1]!
+      }))
 
       if (Either.isLeft(check)) {
         return toServerResponse(check.left)
       }
 
-      return yield* _(app)
+      return yield* app
     })
   )
 
@@ -181,15 +174,12 @@ export const cors = (_options?: Partial<Middlewares.CorsOptions>) => {
   }
 
   const allowOrigin = (originHeader: string) => {
-    if (options.allowedOrigins.length === 0) {
+    if (options.allowedOrigins.includes("*")) {
       return { "Access-Control-Allow-Origin": "*" }
     }
 
-    if (options.allowedOrigins.length === 1) {
-      return {
-        "Access-Control-Allow-Origin": options.allowedOrigins[0],
-        Vary: "Origin"
-      }
+    if (options.allowedOrigins.length === 0) {
+      return { "Access-Control-Allow-Origin": "*" }
     }
 
     if (isAllowedOrigin(originHeader)) {
@@ -221,6 +211,8 @@ export const cors = (_options?: Partial<Middlewares.CorsOptions>) => {
   })()
 
   const allowHeaders = (accessControlRequestHeaders: string | undefined) => {
+    if(!options.allowedOrigins) return undefined
+
     if (options.allowedHeaders.length === 0 && accessControlRequestHeaders) {
       return {
         Vary: "Access-Control-Request-Headers",
@@ -228,7 +220,7 @@ export const cors = (_options?: Partial<Middlewares.CorsOptions>) => {
       }
     }
 
-    if (options.allowedHeaders) {
+    if (options.allowedHeaders.length) {
       return {
         "Access-Control-Allow-Headers": options.allowedHeaders.join(",")
       }
@@ -256,8 +248,8 @@ export const cors = (_options?: Partial<Middlewares.CorsOptions>) => {
   })()
 
   return Middleware.make((app) =>
-    Effect.gen(function*(_) {
-      const request = yield* _(HttpServerRequest.HttpServerRequest)
+    Effect.gen(function*() {
+      const request = yield* HttpServerRequest.HttpServerRequest
 
       const origin = request.headers["origin"]
       const accessControlRequestHeaders = request.headers["access-control-request-headers"]
@@ -279,7 +271,7 @@ export const cors = (_options?: Partial<Middlewares.CorsOptions>) => {
         return ServerResponse.empty({ status: 204, headers: HttpHeaders.fromInput(dropUndefined(corsHeaders)) })
       }
 
-      const response = yield* _(app)
+      const response = yield* app
 
       return response.pipe(ServerResponse.setHeaders(dropUndefined(corsHeaders)))
     })

package/src/api/routing/DynamicMiddleware.ts

@@ -1,41 +1,53 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { type Array, Effect, type Layer, type Request, type S } from "effect-app"
+import { type Array, type Context, Effect, type Layer, type Request, type S } from "effect-app"
 import type { RPCContextMap } from "effect-app/client/req"
+
 import type * as EffectRequest from "effect/Request"
 
+export type RPCHandlerFactory<CTXMap extends Record<string, RPCContextMap.Any>> = <
+  T extends {
+    config?: Partial<Record<keyof CTXMap, any>>
+  },
+  Req extends S.TaggedRequest.All,
+  R
+>(
+  schema: T & S.Schema<Req, any, never>,
+  handler: (
+    request: Req,
+    headers: any
+  ) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R>,
+  moduleName?: string
+) => (
+  req: Req,
+  headers: any
+) => Effect.Effect<
+  Request.Request.Success<Req>,
+  Request.Request.Error<Req>,
+  any // smd
+>
+
+export type ContextProviderOut<RRet> = Effect<Context.Context<RRet>> & { _tag: "ContextMaker" }
+
 export interface Middleware<
-  Context,
+  MiddlewareContext,
   CTXMap extends Record<string, RPCContextMap.Any>,
   R,
-  Layers extends Array<Layer.Layer.Any>
+  Layers extends Array<Layer.Layer.Any>,
+  CtxId,
+  RRet,
+  RErr,
+  RCtx
 > {
   dependencies?: Layers
   contextMap: CTXMap
-  context: Context
+  context: MiddlewareContext
+  contextProvider: Context.Tag<CtxId, ContextProviderOut<RRet>> & {
+    Default: Layer.Layer<CtxId, RErr, RCtx>
+  }
   execute: Effect<
-    <
-      T extends {
-        config?: { [K in keyof CTXMap]?: any }
-      },
-      Req extends S.TaggedRequest.All,
-      R
-    >(
-      schema: T & S.Schema<Req, any, never>,
-      handler: (
-        request: Req,
-        headers: any
-      ) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R>,
-      moduleName?: string
-    ) => (
-      req: Req,
-      headers: any
-    ) => Effect.Effect<
-      Request.Request.Success<Req>,
-      Request.Request.Error<Req>,
-      any // smd
-    >,
+    RPCHandlerFactory<CTXMap>,
     never,
     R
   >
@@ -45,27 +57,40 @@ export const makeRpc = <
   Context,
   CTXMap extends Record<string, RPCContextMap.Any>,
   R,
-  Layers extends Array<Layer.Layer.Any>
+  Layers extends Array<Layer.Layer.Any>,
+  CtxId,
+  RRet,
+  RErr,
+  RCtx
 >(
-  middleware: Middleware<Context, CTXMap, R, Layers>
+  middleware: Middleware<Context, CTXMap, R, Layers, CtxId, RRet, RErr, RCtx>
 ) =>
-  middleware.execute.pipe(Effect.map((execute) => ({
-    effect: <T extends { config?: { [K in keyof CTXMap]?: any } }, Req extends S.TaggedRequest.All, R>(
-      schema: T & S.Schema<Req, any, never>,
-      handler: (
-        request: Req,
-        headers: any
-      ) => Effect.Effect<
-        EffectRequest.Request.Success<Req>,
-        EffectRequest.Request.Error<Req>,
-        R
-      >,
-      moduleName?: string
-    ) => {
-      const h = execute(schema, handler, moduleName)
-      return (req: Req, headers: any) =>
-        h(req, headers).pipe(
-          Effect.uninterruptible // TODO: make this depend on query/command, and consider if middleware also should be affected or not.
-        )
-    }
-  })))
+  Effect
+    .all({
+      execute: middleware.execute,
+      contextProvider: middleware.contextProvider
+    })
+    .pipe(Effect.map(({ contextProvider, execute }) => ({
+      effect: <T extends { config?: Partial<Record<keyof CTXMap, any>> }, Req extends S.TaggedRequest.All, R>(
+        schema: T & S.Schema<Req, any, never>,
+        handler: (
+          request: Req,
+          headers: any
+        ) => Effect.Effect<
+          EffectRequest.Request.Success<Req>,
+          EffectRequest.Request.Error<Req>,
+          R
+        >,
+        moduleName?: string
+      ) => {
+        const h = execute(schema, handler, moduleName)
+        return (req: Req, headers: any) =>
+          Effect.gen(function*() {
+            const ctx = yield* contextProvider
+            return yield* h(req, headers).pipe(
+              Effect.provide(ctx),
+              Effect.uninterruptible // TODO: make this depend on query/command, and consider if middleware also should be affected or not.
+            )
+          })
+      }
+    })))