feat(db)!: SnapOtter 2.0 phase 1 foundation: postgres, migrator, compose stack (#216)

* feat(infra): add dev compose stack with postgres and redis

* fix(infra): comment dev env defaults until wired; harden dev compose restart and start_period

* chore(deps): add pg driver and testcontainers for postgres migration

* feat(db): translate schema to drizzle pg-core (timestamptz, boolean, pgEnum, jsonb)

Schema translation (apps/api/src/db/schema.ts):
- sqlite-core -> pg-core, all 10 tables preserved 1:1
- integer(mode:'timestamp') -> timestamp({ withTimezone: true })
- integer(mode:'boolean') -> boolean
- jobs.status text enum -> pgEnum('job_status') with same 4 values
- 7 columns changed from text to jsonb: jobs.inputFiles, jobs.settings,
  pipelines.steps, apiKeys.permissions, roles.permissions,
  auditLog.details, userFiles.toolChain
- settings.value stays text, jobs.error stays text, jobs.progress stays real

jsonb call-site sweep (removed JSON.stringify on writes, JSON.parse on reads):
- apps/api/src/routes/roles.ts: permissions read/write (3 sites)
- apps/api/src/routes/api-keys.ts: permissions write + read (2 sites)
- apps/api/src/routes/audit-log.ts: details read (1 site)
- apps/api/src/routes/pipeline.ts: steps write + read (2 sites)
- apps/api/src/routes/progress.ts: inputFiles write (2 sites)
- apps/api/src/routes/tool-factory.ts: toolChain read + write (2 sites)
- apps/api/src/routes/user-files.ts: toolChain read + write (4 sites)
- apps/api/src/permissions.ts: roles.permissions read (1 site)
- apps/api/src/lib/audit.ts: details write (1 site)
- apps/api/src/plugins/auth.ts: apiKeys.permissions read (1 site)

* refactor(db): type jsonb columns via $type and note raw CTE conversion requirements

* feat(db): archive sqlite migrations and generate postgres baseline

* chore(db): dockerignore legacy migrations, add archive breadcrumb, fix trailing newline

* feat(db): pg pool connection, advisory-locked boot migrations, DATABASE_URL config

* fix(db): friendly fatal on unreachable postgres, idempotent closeDb, lock-key convention note

* refactor(db): async drizzle calls in plugins, lib, permissions

* fix(api): analytics never throws, typed permission guard, single-query session invalidation

* refactor(db): async drizzle calls across all routes and bootstrap

Convert every route file and index.ts from sync SQLite drizzle
patterns to async node-postgres drizzle:

- .all() removed (bare await on select)
- .get() converted to destructured [row] = await ...
- .run() removed (bare await on insert/update/delete)
- .changes replaced with .rowCount (null-guarded) in progress.ts
- sqlite import removed from user-files.ts; raw CTEs converted to
  await db.execute(sql`...`) with postgres-dialect recursive CTEs
- ChainRow types updated: tool_chain is parsed jsonb (string[] | null),
  created_at is Date (timestamptz) with no * 1000 conversion
- All requirePermission() guard calls awaited (security: unawaited
  async guard returns truthy Promise, bypassing permission check)
- All hasEffectivePermission() and getPermissions() calls awaited
- All auditLog() calls awaited (preserves write-before-response order)
- trackEvent() and captureException() left un-awaited (fire-and-forget
  by design, guaranteed never-throw)
- ensureAnonymousUser(), startCleanupCron(), recoverStaleJobs() awaited
  in bootstrap sequence
- ensureInstanceId() and ensureDefaultSettings() made async

Files converted: 14 (index.ts + 12 route files + tools/index.ts)

* fix(db): await async checkStorageQuota in user-files upload/save routes

* fix(db): await checkStorageQuota in save-result route (missed second call site)

* feat(db): sqlite-to-postgres migrator with CLI and first-boot import

* fix(db): migrator error context, honest force semantics, boot-hook fatal, null-variance tests

* test: run suite against per-file postgres databases via testcontainers

- Add tests/global-setup.ts: spins up a Postgres testcontainer,
  creates a migrated template database once per vitest run.
- Rewrite tests/setup/per-fork-env.ts: each test file (forks pool)
  clones the template into its own database via CREATE DATABASE ...
  TEMPLATE, preserving the same per-file isolation granularity.
- Update vitest.config.ts: add globalSetup, pg alias, update comment.
- Fix tests/integration/test-server.ts: remove DB_PATH mkdir, async
  runMigrations, async db operations, remove SQLite WAL checkpoint.
- Fix 21 unit test db/index mocks: add pool and closeDb exports.
- Fix 8 unit test files: add async/await for now-async permission,
  audit, and analytics functions.
- Fix 18 integration test files: convert sync .run()/.all()/.get()
  to async drizzle patterns, add async to callbacks.
- Production change: apps/api/src/routes/teams.ts: cast COUNT(*)
  to ::int so Postgres returns a number instead of bigint string.

* fix(db): seed built-in roles, reject NUL bytes, cast COUNT, serialize job persists

- Seed built-in roles (admin, editor, user) at boot via ensureBuiltinRoles()
  with onConflictDoNothing, restoring data that legacy SQLite migration 0007
  provided via INSERT statements (the pg baseline is DDL-only).
- Reject NUL bytes in login credentials with 401 (postgres rejects \x00 in
  text columns; valid usernames never contain NUL, matching 1.x behavior).
- Cast COUNT(*)::int in user-files, audit-log, and roles listing queries so
  postgres returns a JS number instead of bigint-as-string.
- Serialize fire-and-forget job progress DB writes per jobId so the final
  "completed" status is never overwritten by a late-arriving "processing"
  write (race condition exposed by async postgres round-trips).

* test: fix teams race, seed roles in test server, poll for job status

- Add missing await to resetTeams() in teams PUT beforeEach (the async
  delete raced with the subsequent insert under postgres).
- Call ensureBuiltinRoles() in test server bootstrap so integration tests
  have the same built-in roles as production.
- Replace fixed 100ms flushPersist delay with a polling helper that waits
  for terminal job status, eliminating timing-dependent failures caused by
  postgres network round-trip latency.

* test: make heic temp-file cleanup assertion resilient to concurrent workers

Use a set-based diff instead of raw file count when checking that
decodeHeic cleans up temp files. Other concurrent test workers can
create heic-in-*/heic-out-* files in the shared tmpdir, inflating the
"after" count and causing spurious failures under full-suite load.

* fix(db): align builtin-role seed to post-0010 legacy state; test polish

* feat(docker): three-container compose (app, postgres, redis) with boot wait and migrations

* fix(docker): set TEST_DATABASE_URL so containerized tests skip testcontainers

* chore(docker): test compose project name, clearer 1.x upgrade comment, unref probe timer

* feat(enterprise): enforce D15 license boundary; move s3 storage into packages/enterprise

* fix(enterprise): restore lazy aws-sdk loading; community installs load no s3 code at boot

* fix(enterprise): boundary check catches dynamic imports; document getS3 concurrency

* feat(db)!: SnapOtter 2.0 phase 1 foundation: postgres, migrator, compose stack

BREAKING CHANGE: SQLite is no longer the runtime database. Deployments now
require Postgres (and Redis, used from phase 2). Existing installs migrate
with SQLITE_MIGRATE_PATH or 'pnpm --filter @snapotter/api migrate:sqlite'.

* fix(ci): postgres service + fresh e2e database per run; ignore unfixable torch CVE-2025-3000
This commit is contained in:
SnapOtter
2026-06-13 10:15:23 +08:00
committed by GitHub
parent 4ec39c556f
commit 1c724d5d21
124 changed files with 3891 additions and 1703 deletions
+30 -32
View File
@@ -26,19 +26,19 @@ afterAll(async () => {
}, 10_000);
// Helper: seed a Default team if not present
function ensureDefaultTeam(): string {
const existing = db.select().from(schema.teams).where(eq(schema.teams.name, "Default")).get();
async function ensureDefaultTeam(): Promise<string> {
const [existing] = await db.select().from(schema.teams).where(eq(schema.teams.name, "Default"));
if (existing) return existing.id;
const id = randomUUID();
db.insert(schema.teams).values({ id, name: "Default" }).run();
await db.insert(schema.teams).values({ id, name: "Default" });
return id;
}
// Helper: clean all teams except Default, and recreate Default if missing
function resetTeams(): string {
async function resetTeams(): Promise<string> {
// Delete non-Default teams
db.delete(schema.teams).where(sql`${schema.teams.name} != 'Default'`).run();
return ensureDefaultTeam();
await db.delete(schema.teams).where(sql`${schema.teams.name} != 'Default'`);
return await ensureDefaultTeam();
}
// ═══════════════════════════════════════════════════════════════════════════
@@ -106,10 +106,10 @@ describe("POST /api/v1/teams", () => {
// Login as non-admin
// First clear mustChangePassword
const userId = JSON.parse(regRes.body).id;
db.update(schema.users)
await db
.update(schema.users)
.set({ mustChangePassword: false })
.where(eq(schema.users.id, userId))
.run();
.where(eq(schema.users.id, userId));
const loginRes = await app.inject({
method: "POST",
@@ -127,7 +127,7 @@ describe("POST /api/v1/teams", () => {
expect(res.statusCode).toBe(403);
// Cleanup
db.delete(schema.users).where(eq(schema.users.id, userId)).run();
await db.delete(schema.users).where(eq(schema.users.id, userId));
});
it("rejects duplicate names (case-insensitive)", async () => {
@@ -211,11 +211,11 @@ describe("POST /api/v1/teams", () => {
describe("PUT /api/v1/teams/:id", () => {
let teamId: string;
beforeEach(() => {
resetTeams();
beforeEach(async () => {
await resetTeams();
// Create a team to rename
teamId = randomUUID();
db.insert(schema.teams).values({ id: teamId, name: "OldName" }).run();
await db.insert(schema.teams).values({ id: teamId, name: "OldName" });
});
it("renames a team", async () => {
@@ -229,7 +229,7 @@ describe("PUT /api/v1/teams/:id", () => {
expect(JSON.parse(res.body).ok).toBe(true);
// Verify
const team = db.select().from(schema.teams).where(eq(schema.teams.id, teamId)).get();
const [team] = await db.select().from(schema.teams).where(eq(schema.teams.id, teamId));
expect(team?.name).toBe("NewName");
});
@@ -293,13 +293,13 @@ describe("PUT /api/v1/teams/:id", () => {
describe("DELETE /api/v1/teams/:id", () => {
let defaultTeamId: string;
beforeEach(() => {
defaultTeamId = resetTeams();
beforeEach(async () => {
defaultTeamId = await resetTeams();
});
it("deletes an empty team", async () => {
const teamId = randomUUID();
db.insert(schema.teams).values({ id: teamId, name: "ToDelete" }).run();
await db.insert(schema.teams).values({ id: teamId, name: "ToDelete" });
const res = await app.inject({
method: "DELETE",
@@ -310,25 +310,23 @@ describe("DELETE /api/v1/teams/:id", () => {
expect(JSON.parse(res.body).ok).toBe(true);
// Verify it's gone
const team = db.select().from(schema.teams).where(eq(schema.teams.id, teamId)).get();
const [team] = await db.select().from(schema.teams).where(eq(schema.teams.id, teamId));
expect(team).toBeUndefined();
});
it("rejects deleting a team with members", async () => {
const teamId = randomUUID();
db.insert(schema.teams).values({ id: teamId, name: "HasMembers" }).run();
await db.insert(schema.teams).values({ id: teamId, name: "HasMembers" });
// Assign a user to this team
const userId = randomUUID();
db.insert(schema.users)
.values({
id: userId,
username: "memberuser",
passwordHash: "dummy:hash",
role: "user",
team: teamId,
})
.run();
await db.insert(schema.users).values({
id: userId,
username: "memberuser",
passwordHash: "dummy:hash",
role: "user",
team: teamId,
});
const res = await app.inject({
method: "DELETE",
@@ -339,8 +337,8 @@ describe("DELETE /api/v1/teams/:id", () => {
expect(JSON.parse(res.body).error).toMatch(/members/i);
// Cleanup
db.delete(schema.users).where(eq(schema.users.id, userId)).run();
db.delete(schema.teams).where(eq(schema.teams.id, teamId)).run();
await db.delete(schema.users).where(eq(schema.users.id, userId));
await db.delete(schema.teams).where(eq(schema.teams.id, teamId));
});
it("rejects deleting the Default team", async () => {
@@ -355,7 +353,7 @@ describe("DELETE /api/v1/teams/:id", () => {
it("requires admin", async () => {
const teamId = randomUUID();
db.insert(schema.teams).values({ id: teamId, name: "NoAuth" }).run();
await db.insert(schema.teams).values({ id: teamId, name: "NoAuth" });
const res = await app.inject({
method: "DELETE",
@@ -364,7 +362,7 @@ describe("DELETE /api/v1/teams/:id", () => {
expect(res.statusCode).toBe(401);
// Cleanup
db.delete(schema.teams).where(eq(schema.teams.id, teamId)).run();
await db.delete(schema.teams).where(eq(schema.teams.id, teamId));
});
it("returns 404 for non-existent team", async () => {