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

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