62b5fb998e
- Fix createRequestHandler → createRequestListener (@react-router/node removed the old API) - Move noEmit + allowImportingTsExtensions to tsconfig.base.json so all packages and apps inherit them consistently - Add explicit .ts extensions to all remaining relative imports across packages and apps Verified locally: node --experimental-strip-types server.ts starts and responds 200. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
41 lines
1.4 KiB
TypeScript
41 lines
1.4 KiB
TypeScript
import { drizzle } from "drizzle-orm/postgres-js";
|
|
import postgres from "postgres";
|
|
import * as plannerSchema from "./schema/planner.ts";
|
|
import * as journalSchema from "./schema/journal.ts";
|
|
|
|
export function createDb(connectionString?: string) {
|
|
const client = postgres(
|
|
connectionString ?? process.env.DATABASE_URL ?? "postgres://trails:trails@localhost:5432/trails",
|
|
);
|
|
return drizzle(client, {
|
|
schema: { ...plannerSchema, ...journalSchema },
|
|
});
|
|
}
|
|
|
|
export type Database = ReturnType<typeof createDb>;
|
|
|
|
/**
|
|
* Wraps a route handler (loader/action) to catch database errors
|
|
* and return a 503 Service Unavailable instead of crashing.
|
|
*/
|
|
export function withDb<T>(handler: () => Promise<T>): Promise<T> {
|
|
return handler().catch((error) => {
|
|
// Re-throw React Router responses and data() throws:
|
|
// - Response instances (redirects, manual responses)
|
|
// - DataWithResponseInit from data() throws (type + data + init)
|
|
if (
|
|
error instanceof Response ||
|
|
(error != null && typeof error === "object" && error.type === "DataWithResponseInit")
|
|
) {
|
|
throw error;
|
|
}
|
|
|
|
// Database error — throw as a 503 that the error boundary will catch
|
|
const message = error instanceof Error ? error.message : String(error);
|
|
console.error("[withDb] Database error:", message);
|
|
|
|
throw new Response("Database unavailable", { status: 503, statusText: "Service Unavailable" });
|
|
});
|
|
}
|
|
|
|
export { plannerSchema, journalSchema };
|