diff --git a/backend/package.json b/backend/package.json index 848d22a..1616aed 100644 --- a/backend/package.json +++ b/backend/package.json @@ -5,7 +5,7 @@ "scripts": { "dev": "bun --watch src/main.ts", "dev:compose": "cp ../bun.lockb . && docker compose -f docker-compose.dev.yml up --build", - "build": "bun build index.ts --outdir dist --target bun", + "build": "bun build src/main.ts --outdir dist --target bun", "start": "bun dist/main.js", "generate": "drizzle-kit generate", "migrate": "bun src/db/migrate.ts", diff --git a/backend/src/db/models.ts b/backend/src/db/models.ts index 500f838..bda507f 100644 --- a/backend/src/db/models.ts +++ b/backend/src/db/models.ts @@ -4,7 +4,7 @@ import { type InferInsertModel, type InferSelectModel, } from "drizzle-orm"; -import { blob, integer, sqliteTable, text } from "drizzle-orm/sqlite-core"; +import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core"; import { nanoid } from "nanoid"; import type { ServerBackupSchema } from "../schemas/server.schema"; diff --git a/backend/src/lib/dbms/postgres.ts b/backend/src/lib/dbms/postgres.ts index 1b39bf7..393bd25 100644 --- a/backend/src/lib/dbms/postgres.ts +++ b/backend/src/lib/dbms/postgres.ts @@ -44,7 +44,7 @@ class PostgresDbms extends BaseDbms { } private get dbUrl() { - const { user, pass, host } = this.config; + const { user, pass = "", host } = this.config; const port = this.config.port || 5432; return `postgresql://${user}:${urlencode(pass)}@${host}:${port}`; } diff --git a/backend/src/services/backup.service.ts b/backend/src/services/backup.service.ts index 2c829ed..739a104 100644 --- a/backend/src/services/backup.service.ts +++ b/backend/src/services/backup.service.ts @@ -8,7 +8,6 @@ import type { import { and, count, desc, eq, inArray } from "drizzle-orm"; import DatabaseService from "./database.service"; import { HTTPException } from "hono/http-exception"; -import ServerService from "./server.service"; export default class BackupService { private databaseService = new DatabaseService(); diff --git a/backend/src/test.ts b/backend/src/test.ts deleted file mode 100644 index 771f8f2..0000000 --- a/backend/src/test.ts +++ /dev/null @@ -1,35 +0,0 @@ -import DatabaseUtil from "../lib/database-util"; -import { DOCKER_HOST, BACKUP_DIR } from "../consts"; -import { mkdir } from "../utility/utils"; -import path from "path"; - -const main = async () => { - try { - const db = new DatabaseUtil({ - type: "postgres", - host: DOCKER_HOST, - user: "postgres", - pass: "postgres", - port: 5432, - }); - - const databases = await db.getDatabases(); - console.log(databases); - - const dbName = "test"; - - // Create backup - const outDir = path.join(BACKUP_DIR, db.config.host, dbName); - mkdir(outDir); - const outFile = path.join(outDir, `/${Date.now()}.tar`); - console.log(await db.dump(dbName, outFile)); - console.log(outFile); - - // Restore backup - console.log(await db.restore(outFile)); - } catch (err) { - console.log((err as any).message); - } -}; - -main();