@effect-app/infra 2.21.4 → 2.22.0

package/test/controller7.test.ts

@@ -0,0 +1,216 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing7"
+import type { RequestContext } from "@effect-app/infra/RequestContext"
+import { Rpc } from "@effect/rpc"
+import type { Request } from "effect-app"
+import { Context, Effect, FiberRef, Layer, S, Schedule } from "effect-app"
+import { type GetEffectContext, makeRpcClient, type RPCContextMap, UnauthorizedError } from "effect-app/client"
+import { HttpHeaders, HttpServerRequest } from "effect-app/http"
+import type * as EffectRequest from "effect/Request"
+import { it } from "vitest"
+
+const optimisticConcurrencySchedule = Schedule.once
+  && Schedule.recurWhile<any>((a) => a?._tag === "OptimisticConcurrencyException")
+
+export interface CTX {
+  context: RequestContext
+}
+
+export type CTXMap = {
+  // allowAnonymous: RPCContextMap.Inverted<"userProfile", UserProfile, typeof NotLoggedInError>
+  // TODO: not boolean but `string[]`
+  requireRoles: RPCContextMap.Custom<"", never, typeof UnauthorizedError, Array<string>>
+}
+const middleware = makeMiddleware({
+  contextMap: null as unknown as CTXMap,
+  // helper to deal with nested generic lmitations
+  context: null as any as HttpServerRequest.HttpServerRequest,
+  execute: Effect.gen(function*() {
+    return <T extends { config?: { [K in keyof CTXMap]?: any } }, Req extends S.TaggedRequest.All, R>(
+      _schema: T & S.Schema<Req, any, never>,
+      handler: (request: Req) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R>,
+      moduleName?: string
+    ) =>
+    (
+      req: Req
+    ): Effect.Effect<
+      Request.Request.Success<Req>,
+      Request.Request.Error<Req>,
+      | HttpServerRequest.HttpServerRequest
+      | Exclude<R, GetEffectContext<CTXMap, T["config"]>>
+    > =>
+      Effect
+        .gen(function*() {
+          // const headers = yield* Rpc.currentHeaders
+          const ctx = Context.empty()
+
+          // const config = "config" in schema ? schema.config : undefined
+
+          // Check JWT
+          // TODO
+          // if (!fakeLogin && !request.allowAnonymous) {
+          //   yield* Effect.catchAll(
+          //     checkJWTI({
+          //       ...authConfig,
+          //       issuer: authConfig.issuer + "/",
+          //       jwksUri: `${authConfig.issuer}/.well-known/jwks.json`
+          //     }),
+          //     (err) => Effect.fail(new JWTError({ error: err }))
+          //   )
+          // }
+
+          // const fakeLogin = true
+          // const r = (fakeLogin
+          //   ? makeUserProfileFromUserHeader(headers["x-user"])
+          //   : makeUserProfileFromAuthorizationHeader(
+          //     headers["authorization"]
+          //   ))
+          //   .pipe(Effect.exit, basicRuntime.runSync)
+          // if (!Exit.isSuccess(r)) {
+          //   yield* Effect.logWarning("Parsing userInfo failed").pipe(Effect.annotateLogs("r", r))
+          // }
+          // const userProfile = Option.fromNullable(Exit.isSuccess(r) ? r.value : undefined)
+          // if (Option.isSome(userProfile)) {
+          //   // yield* rcc.update((_) => ({ ..._, userPorfile: userProfile.value }))
+          //   ctx = ctx.pipe(Context.add(UserProfile, userProfile.value))
+          // } else if (!config?.allowAnonymous) {
+          //   return yield* new NotLoggedInError({ message: "no auth" })
+          // }
+
+          // if (config?.requireRoles) {
+          //   // TODO
+          //   if (
+          //     !userProfile.value
+          //     || !config.requireRoles.every((role: any) => userProfile.value!.roles.includes(role))
+          //   ) {
+          //     return yield* new UnauthorizedError()
+          //   }
+          // }
+
+          return yield* handler(req).pipe(
+            Effect.retry(optimisticConcurrencySchedule),
+            Effect.provide(ctx as Context.Context<GetEffectContext<CTXMap, T["config"]>>)
+          )
+        })
+        .pipe(
+          Effect.provide(
+            Effect
+              .gen(function*() {
+                yield* Effect.annotateCurrentSpan("request.name", moduleName ? `${moduleName}.${req._tag}` : req._tag)
+                // yield* RequestContextContainer.update((_) => ({
+                //   ..._,
+                //   name: NonEmptyString255(moduleName ? `${moduleName}.${req._tag}` : req._tag)
+                // }))
+                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)
+          )
+        )
+    // .pipe(Effect.provide(RequestCacheLayers)) as any
+  })
+})
+
+export const { Router, matchAll, matchFor } = makeRouter(middleware, true)
+
+export type RequestConfig = {
+  /** Disable authentication requirement */
+  allowAnonymous?: true
+  /** Control the roles that are required to access the resource */
+  allowRoles?: readonly string[]
+}
+export const { TaggedRequest: Req } = makeRpcClient<RequestConfig, CTXMap>({
+  // allowAnonymous: NotLoggedInError,
+  requireRoles: UnauthorizedError
+})
+
+export class GetSomething extends Req<GetSomething>()("GetSomething", {
+  id: S.String
+}, { success: S.Void }) {}
+
+export class GetSomethingElse extends Req<GetSomethingElse>()("GetSomethingElse", {
+  id: S.String
+}, { success: S.String }) {}
+
+const Something = { GetSomething, GetSomethingElse, meta: { moduleName: "Something" as const } }
+
+export class SomethingService extends Effect.Service<SomethingService>()("SomethingService", {
+  dependencies: [],
+  effect: Effect.gen(function*() {
+    return {}
+  })
+}) {}
+
+declare const a: {
+  (opt: { a: 1 }): void
+  (opt: { a: 2 }): void
+  (opt: { b: 3 }): void
+  (opt: { b: 3 }): void
+}
+
+export class SomethingRepo extends Effect.Service<SomethingRepo>()("SomethingRepo", {
+  dependencies: [SomethingService.Default],
+  effect: Effect.gen(function*() {
+    const smth = yield* SomethingService
+    console.log({ smth })
+    return {}
+  })
+}) {}
+
+export class SomethingService2 extends Effect.Service<SomethingService2>()("SomethingService2", {
+  dependencies: [],
+  effect: Effect.gen(function*() {
+    return {}
+  })
+}) {}
+
+it("router6", () => {
+  const routes = Router(Something)({
+    dependencies: [
+      SomethingRepo.Default,
+      SomethingService.Default,
+      SomethingService2.Default
+    ],
+    effect: Effect.gen(function*() {
+      const repo = yield* SomethingRepo
+      const smth = yield* SomethingService
+      const smth2 = yield* SomethingService2
+
+      console.log({ repo, smth, smth2 })
+
+      return matchFor(Something)({
+        GetSomething: Effect.void,
+        GetSomethingElse: Effect.succeed("12")
+      })
+    })
+  })
+  console.log({ routes })
+})
+
+export default Router(Something)({
+  dependencies: [
+    SomethingRepo.Default,
+    SomethingService.Default,
+    SomethingService2.Default
+  ],
+  effect: Effect.gen(function*() {
+    const repo = yield* SomethingRepo
+    const smth = yield* SomethingService
+    const smth2 = yield* SomethingService2
+
+    console.log({ repo, smth, smth2 })
+
+    return matchFor(Something)({
+      GetSomething: Effect.void,
+      GetSomethingElse: Effect.succeed("12")
+    })
+  })
+})

package/test/dist/controller6.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller6.test.d.ts","sourceRoot":"","sources":["../controller6.test.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAW,MAAM,EAAY,KAAK,EAAE,CAAC,EAAY,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAwC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC/G,OAAO,EAAe,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAOhE,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,MAAM,MAAM,GAAG;IAGnB,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACvF,CAAA;AAmGD,eAAO,MAAQ,QAAQ;;;;;gBA0E2jD,MAAO,KAAK;;;;;;GA1ErkD,QAAQ;;;;;;iDA0EgoF,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAAk0D,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAAk0D,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAAk0D,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAA6xD,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;CA1E74T,CAAA;AAElE,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;yCAxEE,EAAG,MAAM,CAAC,MAAM;iBAgCzC,EAAA,MA9BD,CA8BC,GA9BG,GA8BH,EAAA,MA5BF,CA4BE,MA5BK;iBA4BL,EAAA,MA3BA,CAAC,GAAG,GAAE,EAAG,MAAM,CAAC,MAAM;;;;;;2CASkB,EAAG,MAAM,CAAC,MAAM;iBAkBxD,EAjBC,MAAM,CAAC,GAAG,GAAE,EAAG,MAAM,CAAC,MAAM;;;;;;2CAUtB,EAAE,MAAM,CAAC,MAAM;iBACA,EAAG,MAAM,CAAC,GAAG,GAAE,EAAG,MAAM,CAAC,MAAM;;;;;;2CAcjD,EAAA,MAAE,CAAC,MAAM;;;;;2CAMqC,EAAG,MAAM,CAAC,MACrE;;;CA4BC,CAAA;;;;;;;;;;AAEF,qBAAa,YAAa,SAAQ,iBAEX;CAAG;;;;;;;;;;AAE1B,qBAAa,gBAAiB,SAAQ,qBAEb;CAAG;;;;;AAI5B,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG"}
+{"version":3,"file":"controller6.test.d.ts","sourceRoot":"","sources":["../controller6.test.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAW,MAAM,EAAY,KAAK,EAAE,CAAC,EAAY,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAwC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAC/G,OAAO,EAAe,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAOhE,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,cAAc,CAAA;CACxB;AAED,MAAM,MAAM,MAAM,GAAG;IAGnB,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;CACvF,CAAA;AAmGD,eAAO,MAAQ,QAAQ;;;;;gBA0EqxD,MAAO,KAAK;;;;;;GA1E/xD,QAAQ;;;;;;iDA0E01F,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAAk0D,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAAk0D,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAAk0D,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;iDAA6xD,MAAM,KAAK,CAAC,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;CA1EvmU,CAAA;AAElE,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;yCAxEE,EAAG,MAAM,CAAC,MAAM;iBAgCzC,EAAA,MA9BD,CA8BC,GA9BG,GA8BH,EAAA,MA5BF,CA4BE,MA5BK;iBA4BL,EAAA,MA3BA,CAAC,GAAG,GAAE,EAAG,MAAM,CAAC,MAAM;;;;;;2CASkB,EAAG,MAAM,CAAC,MAAM;iBAkBxD,EAjBC,MAAM,CAAC,GAAG,GAAE,EAAG,MAAM,CAAC,MAAM;;;;;;2CAUtB,EAAE,MAAM,CAAC,MAAM;iBACA,EAAG,MAAM,CAAC,GAAG,GAAE,EAAG,MAAM,CAAC,MAAM;;;;;;2CAcjD,EAAA,MAAE,CAAC,MAAM;;;;;2CAMqC,EAAG,MAAM,CAAC,MACrE;;;CA4BC,CAAA;;;;;;;;;;AAEF,qBAAa,YAAa,SAAQ,iBAEX;CAAG;;;;;;;;;;AAE1B,qBAAa,gBAAiB,SAAQ,qBAEb;CAAG;;;;;AAI5B,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG"}

package/test/dist/controller7.test.d.ts.map

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