@@ -10,7 +10,7 @@ import {
1010 HttpRouter ,
1111 HttpServer ,
1212} from "@effect/platform" ;
13- import { Effect , Layer , Scope } from "effect" ;
13+ import { Effect , Layer } from "effect" ;
1414import { setCookie } from "@tanstack/react-start/server" ;
1515
1616import { addGroup } from "@executor/api" ;
@@ -69,20 +69,19 @@ const SharedServices = Layer.mergeAll(
6969 HttpServer . layerContext ,
7070) ;
7171
72- const sharedServicesScope = Effect . runSync ( Scope . make ( ) ) ;
73- const SharedServicesMemoized = Effect . runSync (
74- Layer . memoize ( SharedServices ) . pipe (
75- Scope . extend ( sharedServicesScope ) ,
76- ) ,
77- ) ;
78-
79- const publicApiHandler = HttpApiBuilder . toWebHandler (
80- PublicCloudApiLive . pipe (
81- Layer . provideMerge ( SharedServicesMemoized ) ,
82- Layer . provideMerge ( HttpRouter . setRouterConfig ( { maxParamLength : 1000 } ) ) ,
83- ) ,
84- { middleware : HttpMiddleware . logger } ,
85- ) ;
72+ let _publicApiHandler : ReturnType < typeof HttpApiBuilder . toWebHandler > | null = null ;
73+ const getPublicApiHandler = ( ) => {
74+ if ( ! _publicApiHandler ) {
75+ _publicApiHandler = HttpApiBuilder . toWebHandler (
76+ PublicCloudApiLive . pipe (
77+ Layer . provideMerge ( SharedServices ) ,
78+ Layer . provideMerge ( HttpRouter . setRouterConfig ( { maxParamLength : 1000 } ) ) ,
79+ ) ,
80+ { middleware : HttpMiddleware . logger } ,
81+ ) ;
82+ }
83+ return _publicApiHandler ;
84+ } ;
8685
8786const parseCookie = ( cookieHeader : string | null , name : string ) : string | null => {
8887 if ( ! cookieHeader ) return null ;
@@ -187,7 +186,7 @@ const createProtectedHandler = (
187186 Layer . provideMerge ( HttpApiBuilder . middlewareOpenApi ( ) ) ,
188187 Layer . provideMerge ( ProtectedCloudApiLive ) ,
189188 Layer . provideMerge ( requestServices ) ,
190- Layer . provideMerge ( SharedServicesMemoized ) ,
189+ Layer . provideMerge ( SharedServices ) ,
191190 Layer . provideMerge ( HttpRouter . setRouterConfig ( { maxParamLength : 1000 } ) ) ,
192191 ) ,
193192 { middleware : HttpMiddleware . logger } ,
@@ -210,7 +209,7 @@ export const handleApiRequest = async (request: Request): Promise<Response> => {
210209 const pathname = new URL ( request . url ) . pathname ;
211210
212211 if ( isPublicPath ( pathname ) ) {
213- return publicApiHandler . handler ( request ) ;
212+ return getPublicApiHandler ( ) . handler ( request ) ;
214213 }
215214
216215 const requestProgram = Effect . gen ( function * ( ) {
@@ -248,7 +247,7 @@ export const handleApiRequest = async (request: Request): Promise<Response> => {
248247
249248 return Effect . runPromise (
250249 requestProgram . pipe (
251- Effect . provide ( SharedServicesMemoized ) ,
250+ Effect . provide ( SharedServices ) ,
252251 Effect . scoped ,
253252 ) ,
254253 ) ;
0 commit comments