| @@ -9,7 +9,7 @@ import { · 8 unmodified lines |
| 9 | 9 | HttpMiddleware, |
| 10 | 10 | HttpServer, |
| 11 | 11 | } from "@effect/platform"; |
| 12 | | −import { Effect, Layer, ManagedRuntime } from "effect"; |
| 12 | +import { Effect, Layer, Scope } from "effect"; |
| 13 | 13 | import { setCookie } from "@tanstack/react-start/server"; |
| 14 | 14 | |
| 15 | 15 | import { addGroup, CoreHandlers, ExecutorService, ExecutionEngineService } from "@executor/api"; |
| @@ -66,16 +66,18 @@ const SharedServices = Layer.mergeAll( · 50 unmodified lines |
| 66 | 66 | HttpServer.layerContext, |
| 67 | 67 | ); |
| 68 | 68 | |
| 69 | | −const cloudRuntime = ManagedRuntime.make(SharedServices); |
| 69 | +const sharedServicesScope = Effect.runSync(Scope.make()); |
| 70 | +const SharedServicesMemoized = Effect.runSync( |
| 71 | + Layer.memoize(SharedServices).pipe( |
| 72 | + Scope.extend(sharedServicesScope), |
| 73 | + ), |
| 74 | +); |
| 70 | 75 | |
| 71 | 76 | const publicApiHandler = HttpApiBuilder.toWebHandler( |
| 72 | 77 | PublicCloudApiLive.pipe( |
| 73 | | − Layer.provideMerge(SharedServices), |
| 78 | + Layer.provideMerge(SharedServicesMemoized), |
| 74 | 79 | ), |
| 75 | | − { |
| 76 | | − middleware: HttpMiddleware.logger, |
| 77 | | − memoMap: cloudRuntime.memoMap, |
| 78 | | − }, |
| 80 | + { middleware: HttpMiddleware.logger }, |
| 79 | 81 | ); |
| 80 | 82 | |
| 81 | 83 | const parseCookie = (cookieHeader: string | null, name: string): string | null => { |
| @@ -181,22 +183,19 @@ const createProtectedHandler = ( · 99 unmodified lines |
| 181 | 183 | Layer.provideMerge(HttpApiBuilder.middlewareOpenApi()), |
| 182 | 184 | Layer.provideMerge(ProtectedCloudApiLive), |
| 183 | 185 | Layer.provideMerge(requestServices), |
| 184 | | − Layer.provideMerge(SharedServices), |
| 186 | + Layer.provideMerge(SharedServicesMemoized), |
| 185 | 187 | ), |
| 186 | | − { |
| 187 | | − middleware: HttpMiddleware.logger, |
| 188 | | − memoMap: cloudRuntime.memoMap, |
| 189 | | − }, |
| 188 | + { middleware: HttpMiddleware.logger }, |
| 190 | 189 | ); |
| 191 | 190 | }; |
| 192 | 191 | |
| 193 | | −type ProtectedHandler = ReturnType<typeof createProtectedHandler>; |
| 194 | | − |
| 195 | 192 | const closeExecutor = (executor: TeamExecutor) => |
| 196 | 193 | executor.close().pipe( |
| 197 | 194 | Effect.orElseSucceed(() => undefined), |
| 198 | 195 | ); |
| 199 | 196 | |
| 197 | +type ProtectedHandler = ReturnType<typeof createProtectedHandler>; |
| 198 | + |
| 200 | 199 | const disposeProtectedHandler = (handler: ProtectedHandler) => |
| 201 | 200 | Effect.promise(() => handler.dispose()).pipe( |
| 202 | 201 | Effect.orElseSucceed(() => undefined), |
| @@ -242,8 +241,9 @@ export const handleApiRequest = async (request: Request): Promise<Response> => { · 39 unmodified lines |
| 242 | 241 | return response; |
| 243 | 242 | }); |
| 244 | 243 | |
| 245 | | − return cloudRuntime.runPromise( |
| 244 | + return Effect.runPromise( |
| 246 | 245 | requestProgram.pipe( |
| 246 | + Effect.provide(SharedServicesMemoized), |
| 247 | 247 | Effect.scoped, |
| 248 | 248 | ), |
| 249 | 249 | ); |