@effect-app/infra 4.0.0-beta.8 → 4.0.0-beta.82

package/src/QueueMaker/sbqueue.ts

@@ -1,12 +1,11 @@
 import { Tracer } from "effect"
-import { Cause, Effect, flow, S } from "effect-app"
+import { Cause, Effect, flow, type NonEmptyReadonlyArray, S } from "effect-app"
 import type { StringId } from "effect-app/Schema"
 import { pretty } from "effect-app/utils"
 import { Receiver, Sender } from "../adapters/ServiceBus.js"
 import { getRequestContext, setupRequestContextWithCustomSpan } from "../api/setupRequest.js"
 import { InfraLogger } from "../logger.js"
 import { reportNonInterruptedFailure, reportNonInterruptedFailureCause, reportQueueError } from "./errors.js"
-import type { NonEmptyReadonlyArray } from "effect-app"
 import { type QueueBase, QueueMeta } from "./service.js"
 
 export function makeServiceBusQueue<
@@ -22,8 +21,11 @@ export function makeServiceBusQueue<
     body: schema,
     meta: QueueMeta
   })
+  const wireSchemaJson = S.fromJsonString(S.toCodecJson(wireSchema))
+  const encodePublish = S.encodeEffect(wireSchemaJson)
   const drainW = S.Struct({ body: drainSchema, meta: QueueMeta })
-  const parseDrain = flow(S.decodeUnknownEffect(drainW), Effect.orDie)
+  const drainWJson = S.fromJsonString(S.toCodecJson(drainW))
+  const parseDrain = flow(S.decodeUnknownEffect(drainWJson), Effect.orDie)
 
   return Effect.gen(function*() {
     const sender = yield* Sender
@@ -40,55 +42,51 @@ export function makeServiceBusQueue<
         handleEvent: (ks: DrainEvt) => Effect.Effect<void, DrainE, DrainR>,
         sessionId?: string
       ) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        function processMessage(messageBody: any) {
-          return Effect
-            .sync(() => JSON.parse(messageBody))
-            .pipe(
-              Effect.flatMap((x) => parseDrain(x)),
-              Effect.orDie,
-              Effect
-                .flatMap(({ body, meta }) => {
-                  let effect = InfraLogger
-                    .logDebug(`[${receiver.name}] Processing incoming message`)
-                    .pipe(
-                      Effect.annotateLogs({
-                        body: pretty(body),
-                        meta: pretty(meta)
-                      }),
-                      Effect.andThen(handleEvent(body)),
-                      Effect.orDie
-                    )
-                    // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
-                    .pipe(
-                      silenceAndReportError,
-                      (_) =>
-                        setupRequestContextWithCustomSpan(
-                          _,
-                          meta,
-                          `queue.drain: ${receiver.name}${sessionId ? `#${sessionId}` : ""}.${body._tag}`,
-                          {
-                            captureStackTrace: false,
-                            kind: "consumer",
-                            attributes: {
-                              "queue.name": receiver.name,
-                              "queue.sessionId": sessionId,
-                              "queue.input": body
-                            }
+        function processMessage(messageBody: unknown) {
+          return parseDrain(messageBody).pipe(
+            Effect.orDie,
+            Effect
+              .flatMap(({ body, meta }) => {
+                let effect = InfraLogger
+                  .logDebug(`[${receiver.name}] Processing incoming message`)
+                  .pipe(
+                    Effect.annotateLogs({
+                      body: pretty(body),
+                      meta: pretty(meta)
+                    }),
+                    Effect.andThen(handleEvent(body)),
+                    Effect.orDie
+                  )
+                  // we silenceAndReportError here, so that the error is reported, and moves into the Exit.
+                  .pipe(
+                    silenceAndReportError,
+                    (_) =>
+                      setupRequestContextWithCustomSpan(
+                        _,
+                        meta,
+                        `queue.drain: ${receiver.name}${sessionId ? `#${sessionId}` : ""}.${body._tag}`,
+                        {
+                          captureStackTrace: false,
+                          kind: "consumer",
+                          attributes: {
+                            "queue.name": receiver.name,
+                            "queue.sessionId": sessionId,
+                            "queue.input": body
                           }
-                        )
-                    )
-                  if (meta.span) {
-                    effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
-                  }
-                  return effect
-                }),
-              Effect
-                // we reportError here, so that we report the error only, and keep flowing
-                .tapCause(reportError),
-              // we still need to flatten the Exit.
-              Effect.flatMap((_) => _)
-            )
+                        }
+                      )
+                  )
+                if (meta.span) {
+                  effect = Effect.withParentSpan(effect, Tracer.externalSpan(meta.span))
+                }
+                return effect
+              }),
+            Effect
+              // we reportError here, so that we report the error only, and keep flowing
+              .tapCause(reportError),
+            // we still need to flatten the Exit.
+            Effect.flatMap((_) => _)
+          )
         }
 
         return receiver
@@ -111,17 +109,22 @@ export function makeServiceBusQueue<
         getRequestContext
           .pipe(
             Effect.flatMap((requestContext) =>
-              Effect.forEach(messages, (m) =>
-                S.encodeEffect(wireSchema)({
-                  body: m,
-                  meta: requestContext
-                }).pipe(Effect.orDie, Effect.map((encoded) => ({
-                  body: JSON.stringify(encoded),
-                  messageId: m.id, /* correllationid: requestId */
-                  contentType: "application/json",
-                  sessionId: "sessionId" in m ? m.sessionId as string : undefined as unknown as string // TODO: optional
-                }))))
-              .pipe(Effect.flatMap((msgs) => sender.sendMessages(msgs)))
+              Effect
+                .forEach(messages, (m) =>
+                  encodePublish({
+                    body: m,
+                    meta: requestContext
+                  })
+                    .pipe(
+                      Effect.orDie,
+                      Effect.map((body) => ({
+                        body,
+                        messageId: m.id, /* correllationid: requestId */
+                        contentType: "application/json",
+                        sessionId: "sessionId" in m ? m.sessionId as string : undefined as unknown as string // TODO: optional
+                      }))
+                    ))
+                .pipe(Effect.flatMap((msgs) => sender.sendMessages(msgs)))
             ),
             Effect.withSpan("queue.publish: " + sender.name, {
               kind: "producer",

package/src/RequestContext.ts

@@ -1,11 +1,11 @@
-import { S, ServiceMap } from "effect-app"
+import { Context, S } from "effect-app"
 import { UserProfileId } from "effect-app/ids"
 import { NonEmptyString255 } from "effect-app/Schema"
 
-export const Locale = S.Literal("en", "de")
+export const Locale = S.Literals(["en", "de"])
 export type Locale = typeof Locale.Type
 
-export class LocaleRef extends ServiceMap.Reference("Locale", { defaultValue: (): Locale => "en" }) {}
+export class LocaleRef extends Context.Reference("Locale", { defaultValue: (): Locale => "en" }) {}
 
 export class RequestContext extends S.ExtendedClass<
   RequestContext,
@@ -23,7 +23,7 @@ export class RequestContext extends S.ExtendedClass<
   /** @deprecated */
   userProfile: S.optional(S.Struct({ sub: UserProfileId })) //
 }) {
-  // static Tag = ServiceMap.Tag<RequestContext>()
+  // static Tag = Context.Tag<RequestContext>()
 
   static toMonitoring(this: void, self: RequestContext) {
     return {

package/src/RequestFiberSet.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Effect, Fiber, FiberSet, Layer, ServiceMap, type Tracer } from "effect-app"
+import { Context, Effect, Fiber, FiberSet, Layer, Option, type Tracer } from "effect-app"
 import { reportRequestError, reportUnknownRequestError } from "./api/reportError.js"
 import { InfraLogger } from "./logger.js"
 
@@ -8,8 +8,8 @@ const getRootParentSpan = Effect.gen(function*() {
     Effect.catchTag("NoSuchElementError", () => Effect.succeed(null))
   )
   if (!span) return span
-  while (span._tag === "Span" && span.parent !== undefined) {
-    span = span.parent
+  while (span._tag === "Span" && Option.isSome(span.parent)) {
+    span = span.parent.value
   }
   return span
 })
@@ -92,7 +92,7 @@ const make = Effect.gen(function*() {
  * Whenever you fork a fiber for a Request, and you want to prevent dependent services to close prematurely on interruption,
  * like the ServiceBus Sender, you should register these fibers in this FiberSet.
  */
-export class RequestFiberSet extends ServiceMap.Service<RequestFiberSet>()("RequestFiberSet", { make }) {
+export class RequestFiberSet extends Context.Service<RequestFiberSet>()("RequestFiberSet", { make }) {
   static readonly Live = Layer.effect(this, this.make)
   static readonly register = <A, E, R>(self: Effect.Effect<A, E, R>) =>
     this.asEffect().pipe(Effect.andThen((_) => _.register(self)))

package/src/Store/ContextMapContainer.ts

@@ -1,4 +1,8 @@
-import { Data, Effect, Layer, ServiceMap } from "effect-app"
+import { Context, Data, Effect, type Exit, Layer, RequestResolver } from "effect-app"
+import type { NonEmptyArray } from "effect/Array"
+import { dual } from "effect/Function"
+import * as MutableHashMap from "effect/MutableHashMap"
+import type * as Request from "effect/Request"
 import { ContextMap } from "./service.js"
 
 // TODO: we have to create a new contextmap on every request.
@@ -7,7 +11,7 @@ import { ContextMap } from "./service.js"
 // we can call another start after startup. but it would be even better if we could Die on accessing rootmap
 // we could also make the ContextMap optional, and when missing, issue a warning instead?
 
-export class ContextMapContainer extends ServiceMap.Reference("ContextMapContainer", {
+export class ContextMapContainer extends Context.Reference("ContextMapContainer", {
   defaultValue: (): ContextMap | "root" => "root"
 }) {
   static readonly layer = Layer.effect(this, ContextMap.make.pipe(Effect.map(ContextMap.of)))
@@ -18,3 +22,95 @@ export class ContextMapNotStartedError extends Data.TaggedError("ContextMapNotSt
 export const getContextMap = ContextMapContainer.asEffect().pipe(
   Effect.filterOrFail((_) => _ !== "root", () => new ContextMapNotStartedError())
 )
+
+export const withRequestResolverCache: {
+  <A extends Request.Request<any, any>>(options: {
+    readonly capacity: number
+    readonly strategy?: "lru" | "fifo" | undefined
+  }): (self: RequestResolver.RequestResolver<A>) => RequestResolver.RequestResolver<A>
+  <A extends Request.Request<any, any>>(
+    self: RequestResolver.RequestResolver<A>,
+    options: {
+      readonly capacity: number
+      readonly strategy?: "lru" | "fifo" | undefined
+    }
+  ): RequestResolver.RequestResolver<A>
+} = dual(2, <A extends Request.Request<any, any>>(
+  self: RequestResolver.RequestResolver<A>,
+  options: {
+    readonly capacity: number
+    readonly strategy?: "lru" | "fifo" | undefined
+  }
+): RequestResolver.RequestResolver<A> => {
+  const cacheKey = Symbol()
+  const strategy = options.strategy ?? "lru"
+  type CacheEntry = {
+    readonly entry: Request.Entry<A>
+    exit: Exit.Exit<Request.Success<A>, Request.Error<A>> | undefined
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  return RequestResolver.makeWith({
+    ...(self as any),
+    runAll(
+      entries: NonEmptyArray<Request.Entry<A>>,
+      key: unknown
+    ) {
+      return Effect.flatMap(
+        getContextMap.pipe(Effect.orDie),
+        (contextMap) => {
+          const cache = contextMap.getOrCreateStore<MutableHashMap.MutableHashMap<A, CacheEntry>>(
+            cacheKey,
+            () => MutableHashMap.empty()
+          )
+
+          const uncached: Array<Request.Entry<A>> = []
+          for (const entry of entries) {
+            const ocached = MutableHashMap.get(cache, entry.request)
+            if (ocached._tag === "None") {
+              const cached: CacheEntry = { entry, exit: undefined }
+              MutableHashMap.set(cache, entry.request, cached)
+              const prevComplete = entry.completeUnsafe.bind(entry)
+              entry.completeUnsafe = (exit) => {
+                cached.exit = exit
+                prevComplete(exit)
+              }
+              uncached.push(entry)
+            } else {
+              const cached = ocached.value
+              if (cached.exit) {
+                if (strategy === "lru") {
+                  MutableHashMap.remove(cache, cached.entry.request)
+                  MutableHashMap.set(cache, cached.entry.request, cached)
+                }
+                entry.completeUnsafe(cached.exit as any)
+              } else {
+                cached.entry.uninterruptible = true
+                const prevComplete = cached.entry.completeUnsafe.bind(cached.entry)
+                cached.entry.completeUnsafe = (exit) => {
+                  prevComplete(exit)
+                  entry.completeUnsafe(exit)
+                }
+              }
+            }
+          }
+
+          if (uncached.length === 0) return Effect.void
+
+          return Effect.onExit(
+            (self as any).runAll(uncached, key),
+            () => {
+              let toRemove = MutableHashMap.size(cache) - options.capacity
+              if (toRemove <= 0) return Effect.void
+              for (const k of MutableHashMap.keys(cache)) {
+                MutableHashMap.remove(cache, k)
+                toRemove--
+                if (toRemove <= 0) break
+              }
+              return Effect.void
+            }
+          )
+        }
+      )
+    }
+  })
+})