Skip to content

Fix cloud app hanging on Cloudflare Workers #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RhysSullivan merged 1 commit into from
Apr 9, 2026
Merged

Fix cloud app hanging on Cloudflare Workers #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions apps/cloud/src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
HttpRouter,
HttpServer,
} from "@effect/platform";
import { Effect, Layer, Scope } from "effect";
import { Effect, Layer } from "effect";
import { setCookie } from "@tanstack/react-start/server";

import { addGroup } from "@executor/api";
Expand Down Expand Up @@ -69,20 +69,19 @@ const SharedServices = Layer.mergeAll(
HttpServer.layerContext,
);

const sharedServicesScope = Effect.runSync(Scope.make());
const SharedServicesMemoized = Effect.runSync(
Layer.memoize(SharedServices).pipe(
Scope.extend(sharedServicesScope),
),
);

const publicApiHandler = HttpApiBuilder.toWebHandler(
PublicCloudApiLive.pipe(
Layer.provideMerge(SharedServicesMemoized),
Layer.provideMerge(HttpRouter.setRouterConfig({ maxParamLength: 1000 })),
),
{ middleware: HttpMiddleware.logger },
);
let _publicApiHandler: ReturnType<typeof HttpApiBuilder.toWebHandler> | null = null;
const getPublicApiHandler = () => {
if (!_publicApiHandler) {
_publicApiHandler = HttpApiBuilder.toWebHandler(
PublicCloudApiLive.pipe(
Layer.provideMerge(SharedServices),
Layer.provideMerge(HttpRouter.setRouterConfig({ maxParamLength: 1000 })),
),
{ middleware: HttpMiddleware.logger },
);
}
return _publicApiHandler;
};

const parseCookie = (cookieHeader: string | null, name: string): string | null => {
if (!cookieHeader) return null;
Expand Down Expand Up @@ -187,7 +186,7 @@ const createProtectedHandler = (
Layer.provideMerge(HttpApiBuilder.middlewareOpenApi()),
Layer.provideMerge(ProtectedCloudApiLive),
Layer.provideMerge(requestServices),
Layer.provideMerge(SharedServicesMemoized),
Layer.provideMerge(SharedServices),
Layer.provideMerge(HttpRouter.setRouterConfig({ maxParamLength: 1000 })),
),
{ middleware: HttpMiddleware.logger },
Expand All @@ -210,7 +209,7 @@ export const handleApiRequest = async (request: Request): Promise<Response> => {
const pathname = new URL(request.url).pathname;

if (isPublicPath(pathname)) {
return publicApiHandler.handler(request);
return getPublicApiHandler().handler(request);
}

const requestProgram = Effect.gen(function* () {
Expand Down Expand Up @@ -248,7 +247,7 @@ export const handleApiRequest = async (request: Request): Promise<Response> => {

return Effect.runPromise(
requestProgram.pipe(
Effect.provide(SharedServicesMemoized),
Effect.provide(SharedServices),
Effect.scoped,
),
);
Expand Down
12 changes: 7 additions & 5 deletions apps/cloud/src/services/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@ const resolveConnectionString = resolveHyperdriveUrl.pipe(
const acquirePostgres = (connectionString: string) =>
Effect.tryPromise(async () => {
const { drizzle } = await import("drizzle-orm/node-postgres");
const { Pool } = await import("pg");
const pool = new Pool({ connectionString });
return { db: drizzle(pool, { schema }) as DrizzleDb, pool };
const { Client } = await import("pg");
// Use Client (not Pool) — Hyperdrive manages connection pooling externally.
const client = new Client({ connectionString });
await client.connect();
return { db: drizzle(client, { schema }) as DrizzleDb, client };
});

const releasePostgres = ({ pool }: { pool: { end: () => Promise<void> } }) =>
Effect.promise(() => pool.end()).pipe(Effect.orElseSucceed(() => undefined));
const releasePostgres = ({ client }: { client: { end: () => Promise<void> } }) =>
Effect.promise(() => client.end()).pipe(Effect.orElseSucceed(() => undefined));

// ---------------------------------------------------------------------------
// Service
Expand Down