@effect-app/infra 2.45.3 → 2.46.0

package/dist/api/routing.js

@@ -1,32 +1,17 @@
-import { Rpc, RpcRouter } from "@effect/rpc";
-import { Array, Cause, Duration, Effect, FiberRef, flow, Layer, Predicate, Request, S, Schedule, Schema } from "effect-app";
-import { HttpHeaders, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http";
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-empty-object-type */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+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, Predicate, Request, S, Schedule, Schema } from "effect-app";
 import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils";
-import { logError, reportError } from "../errorReporter.js";
-import { InfraLogger } from "../logger.js";
 import { makeRpc } from "./routing/DynamicMiddleware.js";
-import { determineMethod } from "./routing/utils.js";
 const logRequestError = logError("Request");
 const reportRequestError = reportError("Request");
 const optimisticConcurrencySchedule = Schedule.once.pipe(Schedule.intersect(Schedule.recurWhile((a) => a?._tag === "OptimisticConcurrencyException")));
-/**
- *   Plain jane JSON version, with custom status codes just for fun
- */
-export const toHttpApp = (self, options) => {
-    const handler = RpcRouter.toHandlerNoStream(self, options);
-    return HttpServerRequest.HttpServerRequest.pipe(Effect.flatMap((_) => _.json), Effect.flatMap(handler), Effect.flatMap((r) => {
-        // currently only 200, 418, 422 are allowed, see apiClientFactory
-        let status = 200;
-        const results = Array.isArray(r) ? r : [r];
-        if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Die")) {
-            status = 418;
-        }
-        else if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Fail")) {
-            status = 422; // 418
-        }
-        return HttpServerResponse.json(r, { status }).pipe(Effect.orDie);
-    }), Effect.tapDefect(reportError("RPCHttpApp")));
-};
 export const RouterSymbol = Symbol();
 // export interface RouteMatcher<
 //   Filtered extends Record<string, any>,
@@ -87,9 +72,8 @@ export const makeRouter = (middleware, devMode) => {
             return prev;
         }, {});
         const f = (layers, make) => {
-            const r = (class Router extends HttpRouter.Tag(`${meta.moduleName}Router`)() {
-            });
-            const layer = r.use((router) => Effect.gen(function* () {
+            const layer = (requestLayers) => Effect
+                .gen(function* () {
                 const controllers = yield* make;
                 const rpc = yield* makeRpc(middleware);
                 // return make.pipe(Effect.map((c) => controllers(c, layers)))
@@ -99,49 +83,50 @@ export const makeRouter = (middleware, devMode) => {
                     const method = determineMethod(String(cur), req);
                     const isCommand = method._tag === "command";
                     const handle = isCommand
-                        ? (req) => Effect.retry(handler.handler(req), optimisticConcurrencySchedule)
-                        : (req) => Effect.interruptible(handler.handler(req));
-                    acc[cur] = rpc.effect(handler._tag === "raw"
-                        ? class extends req {
-                            static success = S.encodedSchema(req.success);
-                            get [Schema.symbolSerializable]() {
-                                return this.constructor;
+                        ? (req, headers) => Effect.retry(handler.handler(req, headers), optimisticConcurrencySchedule)
+                        : (req, headers) => Effect.interruptible(handler.handler(req, headers));
+                    acc[cur] = [
+                        handler._tag === "raw"
+                            ? class extends req {
+                                static success = S.encodedSchema(req.success);
+                                get [Schema.symbolSerializable]() {
+                                    return this.constructor;
+                                }
+                                get [Schema.symbolWithResult]() {
+                                    return {
+                                        failure: req.failure,
+                                        success: S.encodedSchema(req.success)
+                                    };
+                                }
                             }
-                            get [Schema.symbolWithResult]() {
-                                return {
-                                    failure: req.failure,
-                                    success: S.encodedSchema(req.success)
-                                };
-                            }
-                        }
-                        : req, (req) => 
-                    // TODO: render more data... similar to console?
-                    Effect
-                        .annotateCurrentSpan("requestInput", Object.entries(req).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;
-                    }, {}))
-                        .pipe(
-                    // can't use andThen due to some being a function and effect
-                    Effect.zipRight(handle(req)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
-                        .all([
-                        reportRequestError(cause, {
-                            action: `${meta.moduleName}.${req._tag}`
-                        }),
-                        Rpc.currentHeaders.pipe(Effect.andThen((headers) => {
-                            return InfraLogger
+                            : req,
+                        (requestLayers) => rpc.effect(req, (input, headers) => 
+                        // TODO: render more data... similar to console?
+                        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;
+                        }, {}))
+                            .pipe(
+                        // can't use andThen due to some being a function and effect
+                        Effect.zipRight(handle(input, headers)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
+                            .all([
+                            reportRequestError(cause, {
+                                action: `${meta.moduleName}.${req._tag}`
+                            }),
+                            InfraLogger
                                 .logError("Finished request", cause)
                                 .pipe(Effect.annotateLogs({
                                 action: `${meta.moduleName}.${req._tag}`,
@@ -155,33 +140,54 @@ export const makeRouter = (middleware, devMode) => {
                                 //       return prev
                                 //     }, {} as Record<string, any>)
                                 // )
-                            }));
-                        }))
-                    ])), 
-                    // NOTE: this does not catch errors from the middlewares..
-                    // 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
-                    })), meta.moduleName); // TODO
+                            }))
+                        ])), 
+                        // NOTE: this does not catch errors from the middlewares..
+                        // 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
+                    ];
                     return acc;
                 }, {});
-                const rpcRouter = RpcRouter.make(...Object.values(mapped));
-                const httpApp = toHttpApp(rpcRouter, {
-                    spanPrefix: rsc
-                        .meta
-                        .moduleName + "."
-                });
-                yield* router
-                    .post("/", httpApp, { uninterruptible: true });
-            }));
+                const rpcs = RpcGroup.make(...typedValuesOf(mapped).map((_) => {
+                    return Rpc.fromTaggedRequest(_[0]);
+                }));
+                const rpcLayer = (requestLayers) => rpcs.toLayer(Effect.gen(function* () {
+                    return typedValuesOf(mapped).reduce((acc, [req, handler]) => {
+                        acc[req._tag] = handler(requestLayers);
+                        return acc;
+                    }, {});
+                }));
+                const impl = rpcLayer(requestLayers);
+                const l = RpcServer.layer(rpcs).pipe(Layer.provide(impl));
+                // TODO: also takes optional a RouterTag..
+                return l.pipe(Layer.provideMerge(RpcServer.layerProtocolHttp({ path: ("/rpc/" + meta.moduleName) })));
+                // const rpcRouter = RpcRouter.make(...typedValuesOf(mapped).map(_ => _[0]) as any) as RpcRouter.RpcRouter<
+                //   RPCRouteReq<typeof mapped[keyof typeof mapped]>,
+                //   RPCRouteR<typeof mapped[keyof typeof mapped]>
+                // >
+                // const httpApp = toHttpApp(rpcRouter, {
+                //   spanPrefix: rsc
+                //     .meta
+                //     .moduleName + "."
+                // })
+                // yield* router
+                //   .post(
+                //     "/",
+                //     httpApp as any,
+                //     { uninterruptible: true }
+                //   )
+            })
+                .pipe(Layer.unwrapEffect);
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-            const routes = layer.pipe(Layer.provideMerge(r.Live), layers && Array.isNonEmptyReadonlyArray(layers) ? Layer.provide(layers) : (_) => _, 
+            const routes = ((requestLayer) => layer(requestLayer).pipe(layers && Array.isNonEmptyReadonlyArray(layers) ? Layer.provide(layers) : (_) => _, 
             // TODO: only provide to the middleware?
-            middleware.dependencies ? Layer.provide(middleware.dependencies) : (_) => _);
+            middleware.dependencies ? Layer.provide(middleware.dependencies) : (_) => _));
             // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
             return {
                 moduleName: meta.moduleName,
-                Router: r,
                 routes
             };
         };
@@ -206,24 +212,7 @@ export const makeRouter = (middleware, devMode) => {
     }
     function matchAll(handlers, requestLayer) {
         const routers = typedValuesOf(handlers);
-        const rootRouter = class extends HttpRouter.Tag("RootRouter")() {
-        };
-        const r = rootRouter
-            .use((router) => Effect.gen(function* () {
-            for (const route of routers) {
-                yield* router.mount(("/rpc/" + route.moduleName), yield* route
-                    .Router
-                    .router
-                    .pipe(Effect.map(HttpRouter.use(flow(Effect.provide(requestLayer))))));
-            }
-        }))
-            .pipe(routers.length
-            ? Layer.provide(routers.map((r) => r.routes).flat())
-            : (_) => _);
-        return {
-            layer: r,
-            Router: rootRouter
-        };
+        return Layer.mergeAll(...routers.map((_) => _.routes(requestLayer))); // TODO
     }
     return {
         matchAll,
@@ -232,11 +221,4 @@ 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));
-export const RpcHeadersFromHttpHeaders = Effect
-    .gen(function* () {
-    const httpReq = yield* HttpServerRequest.HttpServerRequest;
-    // TODO: only pass Authentication etc, or move headers to actual Rpc Headers
-    yield* FiberRef.update(Rpc.currentHeaders, (headers) => HttpHeaders.merge(httpReq.headers, headers));
-})
-    .pipe(Layer.effectDiscard);
-//# 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,31 +1,31 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.45.3",
+  "version": "2.46.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@faker-js/faker": "^8.4.1",
     "change-case": "^5.4.4",
     "cross-fetch": "^4.1.0",
-    "express-oauth2-jwt-bearer": "^1.6.0",
+    "express-oauth2-jwt-bearer": "^1.6.1",
     "fast-check": "~4.0.0",
     "path-parser": "^6.1.0",
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.1.1",
-    "effect-app": "2.35.0"
+    "effect-app": "2.36.0"
   },
   "devDependencies": {
-    "@azure/cosmos": "^4.2.0",
+    "@azure/cosmos": "^4.3.0",
     "@azure/service-bus": "^7.9.5",
     "@babel/cli": "^7.26.4",
-    "@babel/core": "^7.26.9",
+    "@babel/core": "^7.26.10",
     "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
     "@babel/plugin-syntax-import-attributes": "^7.26.0",
     "@babel/plugin-transform-modules-commonjs": "^7.26.3",
     "babel-plugin-replace-import-extension": "^1.1.5",
-    "@sentry/node": "^9.5.0",
-    "@types/express": "^5.0.0",
+    "@sentry/node": "^9.6.1",
+    "@types/express": "^5.0.1",
     "@types/node": "~22.13.10",
     "@types/proper-lockfile": "^4.1.4",
     "@types/redis": "^2.8.32",
@@ -33,27 +33,27 @@
     "express": "^4.21.2",
     "jwks-rsa": "2.1.4",
     "jwt-decode": "^4.0.0",
-    "mongodb": "6.14.2",
+    "mongodb": "6.15.0",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
     "strip-ansi": "^7.1.0",
     "typescript": "^5.8.2",
-    "vitest": "^3.0.8"
+    "vitest": "^3.0.9"
   },
   "peerDependencies": {
-    "@azure/cosmos": "^4.2.0",
+    "@azure/cosmos": "^4.3.0",
     "@azure/service-bus": "^7.9.5",
-    "@effect/experimental": "^0.43.1",
-    "@effect/platform": "^0.79.1",
-    "@effect/rpc-http": "^0.52.1",
-    "@effect/rpc": "^0.54.1",
-    "@effect/sql": "^0.32.1",
-    "@effect/vitest": "^0.19.8",
+    "@effect/experimental": "^0.44.0",
+    "@effect/platform": "^0.80.0",
+    "@effect/rpc-http": "^0.52.4",
+    "@effect/rpc": "^0.55.0",
+    "@effect/sql": "^0.33.0",
+    "@effect/vitest": "^0.20.0",
     "@sendgrid/helpers": "^8.0.0",
     "@sendgrid/mail": "^8.1.4",
     "redis": "^3.1.2",
     "redlock": "^4.2.0",
-    "effect": "^3.13.10",
+    "effect": "^3.14.0",
     "express": "^4.21.2"
   },
   "typesVersions": {

package/src/api/routing/DynamicMiddleware.ts

@@ -1,9 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Rpc } from "@effect/rpc"
 import { type Array, Effect, type Layer, type Request, type S } from "effect-app"
-import type { GetEffectContext, RPCContextMap } from "effect-app/client/req"
+import type { RPCContextMap } from "effect-app/client/req"
 import type * as EffectRequest from "effect/Request"
 
 export interface Middleware<
@@ -25,11 +24,13 @@ export interface Middleware<
     >(
       schema: T & S.Schema<Req, any, never>,
       handler: (
-        request: Req
+        request: Req,
+        headers: any
       ) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R>,
       moduleName?: string
     ) => (
-      req: Req
+      req: Req,
+      headers: any
     ) => Effect.Effect<
       Request.Request.Success<Req>,
       Request.Request.Error<Req>,
@@ -52,7 +53,8 @@ export const makeRpc = <
     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
+        request: Req,
+        headers: any
       ) => Effect.Effect<
         EffectRequest.Request.Success<Req>,
         EffectRequest.Request.Error<Req>,
@@ -60,9 +62,10 @@ export const makeRpc = <
       >,
       moduleName?: string
     ) => {
-      return Rpc.effect<Req, Context | Exclude<R, GetEffectContext<CTXMap, T["config"]>>>(
-        schema,
-        execute(schema, handler, moduleName)
-      )
+      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.
+        )
     }
   })))