History

proper layer handling

Rhys Sullivan committed 7 months ago

Commit d5a2fe61 parent 93d88b72 files · +16 −16Browse files

Unified · Split

2 files
  1. apps/cloud/src/api.ts +15 −15
  2. apps/cloud/src/services/db.ts +1 −1
apps/cloud/src/api.ts+15−15
@@ -9,7 +9,7 @@ import { · 8 unmodified lines
99 HttpMiddleware,
1010 HttpServer,
1111 } from "@effect/platform";
12−import { Effect, Layer, ManagedRuntime } from "effect";
12+import { Effect, Layer, Scope } from "effect";
1313 import { setCookie } from "@tanstack/react-start/server";
1414
1515 import { addGroup, CoreHandlers, ExecutorService, ExecutionEngineService } from "@executor/api";
@@ -66,16 +66,18 @@ const SharedServices = Layer.mergeAll( · 50 unmodified lines
6666 HttpServer.layerContext,
6767 );
6868
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+);
7075
7176 const publicApiHandler = HttpApiBuilder.toWebHandler(
7277 PublicCloudApiLive.pipe(
73− Layer.provideMerge(SharedServices),
78+ Layer.provideMerge(SharedServicesMemoized),
7479 ),
75− {
76− middleware: HttpMiddleware.logger,
77− memoMap: cloudRuntime.memoMap,
78− },
80+ { middleware: HttpMiddleware.logger },
7981 );
8082
8183 const parseCookie = (cookieHeader: string | null, name: string): string | null => {
@@ -181,22 +183,19 @@ const createProtectedHandler = ( · 99 unmodified lines
181183 Layer.provideMerge(HttpApiBuilder.middlewareOpenApi()),
182184 Layer.provideMerge(ProtectedCloudApiLive),
183185 Layer.provideMerge(requestServices),
184− Layer.provideMerge(SharedServices),
186+ Layer.provideMerge(SharedServicesMemoized),
185187 ),
186− {
187− middleware: HttpMiddleware.logger,
188− memoMap: cloudRuntime.memoMap,
189− },
188+ { middleware: HttpMiddleware.logger },
190189 );
191190 };
192191
193−type ProtectedHandler = ReturnType<typeof createProtectedHandler>;
194−
195192 const closeExecutor = (executor: TeamExecutor) =>
196193 executor.close().pipe(
197194 Effect.orElseSucceed(() => undefined),
198195 );
199196
197+type ProtectedHandler = ReturnType<typeof createProtectedHandler>;
198+
200199 const disposeProtectedHandler = (handler: ProtectedHandler) =>
201200 Effect.promise(() => handler.dispose()).pipe(
202201 Effect.orElseSucceed(() => undefined),
@@ -242,8 +241,9 @@ export const handleApiRequest = async (request: Request): Promise<Response> => { · 39 unmodified lines
242241 return response;
243242 });
244243
245− return cloudRuntime.runPromise(
244+ return Effect.runPromise(
246245 requestProgram.pipe(
246+ Effect.provide(SharedServicesMemoized),
247247 Effect.scoped,
248248 ),
249249 );
apps/cloud/src/services/db.ts+1−1
@@ -46,7 +46,7 @@ const createDbResource = async (): Promise<DbResource> => { · 45 unmodified lines
4646 return {
4747 db,
4848 close: async () => {
49− const closeClient = (client as { close?: () => Promise<void> }).close;
49+ const closeClient = client.close;
5050 if (closeClient) {
5151 await closeClient.call(client);
5252 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t