diff --git a/server/index.ts b/server/index.ts index 826551fc..db0e73ef 100644 --- a/server/index.ts +++ b/server/index.ts @@ -7,6 +7,7 @@ import helmet from "helmet"; import cors from "cors"; import unauth from "@server/routers/unauth"; import Database from 'better-sqlite3'; +import { drizzle } from 'drizzle-orm/better-sqlite3'; const dev = environment.ENVIRONMENT !== "prod"; const app = next({ dev }); @@ -17,22 +18,29 @@ let db: Database.Database; app.prepare().then(() => { // Open the SQLite database connection - db = new Database(`${environment.CONFIG_PATH}/db/db.sqlite`, { verbose: console.log }); + const sqlite = new Database(`${environment.CONFIG_PATH}/db/db.sqlite`, { verbose: console.log }); + const db = drizzle(sqlite); + const server = express(); server.use(helmet()); server.use(cors()); - const prefix = `/api/${environment.API_VERSION}`; - - // Middleware to attach db to req object - server.use((req: Request & { db?: Database.Database }, res: Response, next) => { - req.db = db; - next(); + // Run migrations (if you're using Drizzle's migration system) + // migrate(db, { migrationsFolder: './drizzle' }); + + // Middleware to attach the database to the request + server.use((req, res, next) => { + (req as any).db = db; + next(); }); + + const prefix = `/api/${environment.API_VERSION}`; server.use(prefix, express.json(), unauth); + + // We are using NEXT from here on server.all("*", (req: Request, res: Response) => { const parsedUrl = parse(req.url!, true); handle(req, res, parsedUrl); diff --git a/server/routers/badger/getConfig.ts b/server/routers/badger/getConfig.ts index 224b27c6..b826295c 100644 --- a/server/routers/badger/getConfig.ts +++ b/server/routers/badger/getConfig.ts @@ -1,11 +1,13 @@ import { Request, Response, NextFunction } from 'express'; -import { Database } from 'better-sqlite3'; +import { DrizzleError } from 'drizzle-orm'; +import { BetterSQLite3Database } from 'drizzle-orm/better-sqlite3'; +import { sites, Site } from '../../db/schema'; interface CustomRequest extends Request { - db?: Database; + db?: BetterSQLite3Database; } -export const getConfig = (req: Request, res: Response, next: NextFunction): void => { +export const getConfig = async (req: Request, res: Response, next: NextFunction): Promise => { try { const customReq = req as CustomRequest; const db = customReq.db; @@ -14,13 +16,15 @@ export const getConfig = (req: Request, res: Response, next: NextFunction): void throw new Error('Database is not attached to the request'); } - const query = 'SELECT * FROM sites'; - const statement = db.prepare(query); - const results = statement.all(); + const results: Site[] = db.select().from(sites).all(); res.json(results); } catch (error) { console.error('Error querying database:', error); - next(error); + if (error instanceof DrizzleError) { + res.status(500).json({ error: 'Database query error', message: error.message }); + } else { + next(error); + } } }; \ No newline at end of file