Skip to content

Commit 65c5a7c

Browse files
authored
Fix cloud app hanging on Cloudflare Workers (#121)
- Use pg.Client instead of pg.Pool (Hyperdrive manages pooling) - Remove Layer.memoize/Scope at module top level (hangs in Workers init) - Make public API handler lazy - Remove debug endpoint
1 parent 2f65dae commit 65c5a7c

2 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎apps/cloud/src/api.ts‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -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";
1414
import { setCookie } from "@tanstack/react-start/server";
1515

1616
import { 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

8786
const 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
);

‎apps/cloud/src/services/db.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ const resolveConnectionString = resolveHyperdriveUrl.pipe(
4444
const acquirePostgres = (connectionString: string) =>
4545
Effect.tryPromise(async () => {
4646
const { drizzle } = await import("drizzle-orm/node-postgres");
47-
const { Pool } = await import("pg");
48-
const pool = new Pool({ connectionString });
49-
return { db: drizzle(pool, { schema }) as DrizzleDb, pool };
47+
const { Client } = await import("pg");
48+
// Use Client (not Pool) — Hyperdrive manages connection pooling externally.
49+
const client = new Client({ connectionString });
50+
await client.connect();
51+
return { db: drizzle(client, { schema }) as DrizzleDb, client };
5052
});
5153

52-
const releasePostgres = ({ pool }: { pool: { end: () => Promise<void> } }) =>
53-
Effect.promise(() => pool.end()).pipe(Effect.orElseSucceed(() => undefined));
54+
const releasePostgres = ({ client }: { client: { end: () => Promise<void> } }) =>
55+
Effect.promise(() => client.end()).pipe(Effect.orElseSucceed(() => undefined));
5456

5557
// ---------------------------------------------------------------------------
5658
// Service

0 commit comments

Comments
 (0)