11// ---------------------------------------------------------------------------
2- // Database service — PGlite for dev , node-postgres for prod
2+ // Database service — Hyperdrive on Cloudflare , node-postgres for local dev
33// ---------------------------------------------------------------------------
4+ //
5+ // Migrations are run out-of-band (e.g. via a separate script or CI step),
6+ // not at request time — Cloudflare Workers cannot read the filesystem.
47
58import { Context , Effect , Layer } from "effect" ;
6- import { resolve } from "node:path" ;
79import * as sharedSchema from "@executor/storage-postgres/schema" ;
810import * as cloudSchema from "./schema" ;
911import type { DrizzleDb } from "@executor/storage-postgres" ;
@@ -13,62 +15,77 @@ const schema = { ...sharedSchema, ...cloudSchema };
1315
1416export type { DrizzleDb } ;
1517
16- const MIGRATIONS_DIR = resolve (
17- import . meta. dirname ,
18- "../../../../packages/core/storage-postgres/drizzle" ,
18+ // ---------------------------------------------------------------------------
19+ // Connection string resolution
20+ // ---------------------------------------------------------------------------
21+
22+ const resolveHyperdriveUrl = Effect . tryPromise ( {
23+ try : async ( ) => {
24+ const { env } = await import ( "cloudflare:workers" ) ;
25+ const hyperdrive = ( env as any ) . HYPERDRIVE ;
26+ return ( hyperdrive ?. connectionString as string ) ?? null ;
27+ } ,
28+ catch : ( ) => null ,
29+ } ) . pipe ( Effect . map ( ( v ) => v ?? undefined ) ) ;
30+
31+ const resolveConnectionString = resolveHyperdriveUrl . pipe (
32+ Effect . map ( ( url ) => url ?? ( server . DATABASE_URL || undefined ) ) ,
1933) ;
2034
21- type DbResource = {
22- readonly db : DrizzleDb ;
23- readonly close : ( ) => Promise < void > ;
24- } ;
35+ // ---------------------------------------------------------------------------
36+ // Postgres via node-postgres (used with Hyperdrive or DATABASE_URL)
37+ // ---------------------------------------------------------------------------
2538
26- const createDbResource = async ( ) : Promise < DbResource > => {
27- if ( server . DATABASE_URL ) {
39+ const acquirePostgres = ( connectionString : string ) =>
40+ Effect . tryPromise ( async ( ) => {
2841 const { drizzle } = await import ( "drizzle-orm/node-postgres" ) ;
29- const { migrate } = await import ( "drizzle-orm/node-postgres/migrator" ) ;
3042 const { Pool } = await import ( "pg" ) ;
31- const pool = new Pool ( { connectionString : server . DATABASE_URL } ) ;
32- const db = drizzle ( pool , { schema } ) as DrizzleDb ;
33- await migrate ( db as any , { migrationsFolder : MIGRATIONS_DIR } ) ;
34- return {
35- db,
36- close : ( ) => pool . end ( ) ,
37- } ;
38- }
43+ const pool = new Pool ( { connectionString } ) ;
44+ return { db : drizzle ( pool , { schema } ) as DrizzleDb , pool } ;
45+ } ) ;
46+
47+ const releasePostgres = ( { pool } : { pool : { end : ( ) => Promise < void > } } ) =>
48+ Effect . promise ( ( ) => pool . end ( ) ) . pipe ( Effect . orElseSucceed ( ( ) => undefined ) ) ;
3949
50+ // ---------------------------------------------------------------------------
51+ // PGlite — local dev fallback
52+ // ---------------------------------------------------------------------------
53+
54+ const acquirePglite = Effect . tryPromise ( async ( ) => {
4055 const { PGlite } = await import ( "@electric-sql/pglite" ) ;
4156 const { drizzle } = await import ( "drizzle-orm/pglite" ) ;
42- const { migrate } = await import ( "drizzle-orm/pglite/migrator" ) ;
43- const dataDir = server . PGLITE_DATA_DIR ;
44- const client = new PGlite ( dataDir ) ;
45- const db = drizzle ( client , { schema } ) as DrizzleDb ;
46- await migrate ( db , { migrationsFolder : MIGRATIONS_DIR } ) ;
47- return {
48- db,
49- close : async ( ) => {
50- const closeClient = client . close ;
51- if ( closeClient ) {
52- await closeClient . call ( client ) ;
53- }
54- } ,
55- } ;
56- } ;
57+ const client = new PGlite ( server . PGLITE_DATA_DIR ) ;
58+ return { db : drizzle ( client , { schema } ) as DrizzleDb , client } ;
59+ } ) ;
5760
58- const closeDbResource = ( resource : DbResource ) =>
59- Effect . promise ( ( ) => resource . close ( ) ) . pipe (
61+ const releasePglite = ( { client } : { client : { close ?: ( ) => Promise < void > } } ) =>
62+ Effect . promise ( ( ) => client . close ?. ( ) ?? Promise . resolve ( ) ) . pipe (
6063 Effect . orElseSucceed ( ( ) => undefined ) ,
6164 ) ;
6265
66+ // ---------------------------------------------------------------------------
67+ // Service
68+ // ---------------------------------------------------------------------------
69+
6370export class DbService extends Context . Tag ( "@executor/cloud/DbService" ) <
6471 DbService ,
6572 DrizzleDb
6673> ( ) {
6774 static Live = Layer . scoped (
6875 this ,
69- Effect . acquireRelease (
70- Effect . promise ( ( ) => createDbResource ( ) ) ,
71- closeDbResource ,
72- ) . pipe ( Effect . map ( ( resource ) => resource . db ) ) ,
76+ Effect . gen ( function * ( ) {
77+ const connectionString = yield * resolveConnectionString ;
78+
79+ if ( connectionString ) {
80+ const { db } = yield * Effect . acquireRelease (
81+ acquirePostgres ( connectionString ) ,
82+ releasePostgres ,
83+ ) ;
84+ return db ;
85+ }
86+
87+ const { db } = yield * Effect . acquireRelease ( acquirePglite , releasePglite ) ;
88+ return db ;
89+ } ) ,
7390 ) ;
7491}
0 commit comments