| @@ -30,6 +30,11 @@ const resolveHyperdriveUrl = Effect.tryPromise({ · 29 unmodified lines |
| 30 | 30 | |
| 31 | 31 | const resolveConnectionString = resolveHyperdriveUrl.pipe( |
| 32 | 32 | Effect.map((url) => url ?? (server.DATABASE_URL || undefined)), |
| 33 | + Effect.flatMap((url) => |
| 34 | + url |
| 35 | + ? Effect.succeed(url) |
| 36 | + : Effect.fail(new Error("No database connection string available (set DATABASE_URL or configure Hyperdrive)")), |
| 37 | + ), |
| 33 | 38 | ); |
| 34 | 39 | |
| 35 | 40 | // --------------------------------------------------------------------------- |
| @@ -47,22 +52,6 @@ const acquirePostgres = (connectionString: string) => · 11 unmodified lines |
| 47 | 52 | const releasePostgres = ({ pool }: { pool: { end: () => Promise<void> } }) => |
| 48 | 53 | Effect.promise(() => pool.end()).pipe(Effect.orElseSucceed(() => undefined)); |
| 49 | 54 | |
| 50 | | −// --------------------------------------------------------------------------- |
| 51 | | −// PGlite — local dev fallback |
| 52 | | −// --------------------------------------------------------------------------- |
| 53 | | − |
| 54 | | −const acquirePglite = Effect.tryPromise(async () => { |
| 55 | | − const { PGlite } = await import("@electric-sql/pglite"); |
| 56 | | − const { drizzle } = await import("drizzle-orm/pglite"); |
| 57 | | − const client = new PGlite(server.PGLITE_DATA_DIR); |
| 58 | | − return { db: drizzle(client, { schema }) as DrizzleDb, client }; |
| 59 | | −}); |
| 60 | | − |
| 61 | | −const releasePglite = ({ client }: { client: { close?: () => Promise<void> } }) => |
| 62 | | − Effect.promise(() => client.close?.() ?? Promise.resolve()).pipe( |
| 63 | | − Effect.orElseSucceed(() => undefined), |
| 64 | | − ); |
| 65 | | − |
| 66 | 55 | // --------------------------------------------------------------------------- |
| 67 | 56 | // Service |
| 68 | 57 | // --------------------------------------------------------------------------- |
| @@ -75,16 +64,10 @@ export class DbService extends Context.Tag("@executor/cloud/DbService")< · 6 unmodified lines |
| 75 | 64 | this, |
| 76 | 65 | Effect.gen(function* () { |
| 77 | 66 | 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); |
| 67 | + const { db } = yield* Effect.acquireRelease( |
| 68 | + acquirePostgres(connectionString), |
| 69 | + releasePostgres, |
| 70 | + ); |
| 88 | 71 | return db; |
| 89 | 72 | }), |
| 90 | 73 | ); |