mirror of
https://github.com/snapotter-hq/SnapOtter.git
synced 2026-08-03 07:46:42 +02:00
* 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
278 lines
8.8 KiB
TypeScript
278 lines
8.8 KiB
TypeScript
/**
|
|
* Unit tests for batch processing route utility logic.
|
|
*
|
|
* Tests filename deduplication, batch size enforcement, skip-preprocess
|
|
* logic for metadata tools, and the file results map construction.
|
|
*/
|
|
import { describe, expect, it, vi } from "vitest";
|
|
|
|
// Mock DB
|
|
vi.mock("../../../apps/api/src/db/index.js", () => ({
|
|
db: {
|
|
select: () => ({
|
|
from: () => ({
|
|
where: () => ({ get: () => null }),
|
|
all: () => [],
|
|
}),
|
|
}),
|
|
insert: () => ({ values: () => ({ run: vi.fn() }) }),
|
|
update: () => ({ set: () => ({ where: () => ({ run: vi.fn() }) }) }),
|
|
},
|
|
pool: {},
|
|
closeDb: async () => {},
|
|
schema: {
|
|
settings: { key: {} },
|
|
jobs: { id: {}, status: {} },
|
|
},
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/config.js", () => ({
|
|
env: {
|
|
WORKSPACE_PATH: "/tmp/test",
|
|
MAX_MEGAPIXELS: 100,
|
|
MAX_BATCH_SIZE: 10,
|
|
CONCURRENT_JOBS: 3,
|
|
},
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/feature-status.js", () => ({
|
|
isToolInstalled: vi.fn(() => true),
|
|
}));
|
|
|
|
// ── Batch size enforcement ─────────────────────────────────────────────
|
|
|
|
describe("batch size enforcement", () => {
|
|
it("allows files within the limit", () => {
|
|
const maxBatchSize = 10;
|
|
const fileCount = 5;
|
|
const exceeds = maxBatchSize > 0 && fileCount > maxBatchSize;
|
|
expect(exceeds).toBe(false);
|
|
});
|
|
|
|
it("rejects files exceeding the limit", () => {
|
|
const maxBatchSize = 10;
|
|
const fileCount = 15;
|
|
const exceeds = maxBatchSize > 0 && fileCount > maxBatchSize;
|
|
expect(exceeds).toBe(true);
|
|
});
|
|
|
|
it("allows any count when limit is 0 (unlimited)", () => {
|
|
const maxBatchSize = 0;
|
|
const fileCount = 999;
|
|
const exceeds = maxBatchSize > 0 && fileCount > maxBatchSize;
|
|
expect(exceeds).toBe(false);
|
|
});
|
|
|
|
it("rejects when count equals limit + 1", () => {
|
|
const maxBatchSize = 10;
|
|
const fileCount = 11;
|
|
const exceeds = maxBatchSize > 0 && fileCount > maxBatchSize;
|
|
expect(exceeds).toBe(true);
|
|
});
|
|
|
|
it("allows when count equals limit exactly", () => {
|
|
const maxBatchSize = 10;
|
|
const fileCount = 10;
|
|
const exceeds = maxBatchSize > 0 && fileCount > maxBatchSize;
|
|
expect(exceeds).toBe(false);
|
|
});
|
|
});
|
|
|
|
// ── Skip-preprocess logic ──────────────────────────────────────────────
|
|
|
|
describe("skip-preprocess logic for metadata tools", () => {
|
|
it("skips preprocess for edit-metadata", () => {
|
|
const toolId = "edit-metadata";
|
|
const skipPreprocess = toolId === "edit-metadata" || toolId === "strip-metadata";
|
|
expect(skipPreprocess).toBe(true);
|
|
});
|
|
|
|
it("skips preprocess for strip-metadata", () => {
|
|
const toolId = "strip-metadata";
|
|
const skipPreprocess = toolId === "edit-metadata" || toolId === "strip-metadata";
|
|
expect(skipPreprocess).toBe(true);
|
|
});
|
|
|
|
it("does not skip preprocess for resize", () => {
|
|
const toolId = "resize";
|
|
const skipPreprocess = toolId === "edit-metadata" || toolId === "strip-metadata";
|
|
expect(skipPreprocess).toBe(false);
|
|
});
|
|
|
|
it("does not skip preprocess for compress", () => {
|
|
const toolId = "compress";
|
|
const skipPreprocess = toolId === "edit-metadata" || toolId === "strip-metadata";
|
|
expect(skipPreprocess).toBe(false);
|
|
});
|
|
});
|
|
|
|
// ── Output filename suffix logic ───────────────────────────────────────
|
|
|
|
describe("batch output filename suffix", () => {
|
|
function addToolSuffix(filename: string, processFilename: string, toolId: string): string {
|
|
let outFilename = filename;
|
|
if (outFilename === processFilename) {
|
|
const dotIdx = processFilename.lastIndexOf(".");
|
|
const ext = dotIdx > 0 ? processFilename.slice(dotIdx) : "";
|
|
const base = ext ? processFilename.slice(0, -ext.length) : processFilename;
|
|
outFilename = `${base}_${toolId}${ext}`;
|
|
}
|
|
return outFilename;
|
|
}
|
|
|
|
it("adds tool suffix when filename unchanged", () => {
|
|
const result = addToolSuffix("photo.png", "photo.png", "resize");
|
|
expect(result).toBe("photo_resize.png");
|
|
});
|
|
|
|
it("preserves filename when tool changed it", () => {
|
|
const result = addToolSuffix("converted.jpg", "photo.png", "convert");
|
|
expect(result).toBe("converted.jpg");
|
|
});
|
|
|
|
it("handles filenames without extension", () => {
|
|
const result = addToolSuffix("README", "README", "compress");
|
|
expect(result).toBe("README_compress");
|
|
});
|
|
|
|
it("handles filenames with multiple dots", () => {
|
|
const result = addToolSuffix("my.photo.final.png", "my.photo.final.png", "sharpen");
|
|
expect(result).toBe("my.photo.final_sharpen.png");
|
|
});
|
|
});
|
|
|
|
// ── File results map construction ──────────────────────────────────────
|
|
|
|
describe("file results map (X-File-Results header)", () => {
|
|
function getUniqueName(name: string, usedNames: Set<string>): string {
|
|
if (!usedNames.has(name)) {
|
|
usedNames.add(name);
|
|
return name;
|
|
}
|
|
const dotIdx = name.lastIndexOf(".");
|
|
const base = dotIdx > 0 ? name.slice(0, dotIdx) : name;
|
|
const ext = dotIdx > 0 ? name.slice(dotIdx) : "";
|
|
let counter = 1;
|
|
let candidate = `${base}_${counter}${ext}`;
|
|
while (usedNames.has(candidate)) {
|
|
counter++;
|
|
candidate = `${base}_${counter}${ext}`;
|
|
}
|
|
usedNames.add(candidate);
|
|
return candidate;
|
|
}
|
|
|
|
it("builds correct map for unique filenames", () => {
|
|
const results: ({ buffer: Buffer; filename: string } | null)[] = [
|
|
{ buffer: Buffer.from("a"), filename: "a.png" },
|
|
{ buffer: Buffer.from("b"), filename: "b.png" },
|
|
null,
|
|
];
|
|
|
|
const usedNames = new Set<string>();
|
|
const fileResultsMap: Record<string, string> = {};
|
|
|
|
for (let i = 0; i < results.length; i++) {
|
|
const entry = results[i];
|
|
if (entry) {
|
|
const uniqueName = getUniqueName(entry.filename, usedNames);
|
|
entry.filename = uniqueName;
|
|
fileResultsMap[String(i)] = uniqueName;
|
|
}
|
|
}
|
|
|
|
expect(fileResultsMap).toEqual({
|
|
"0": "a.png",
|
|
"1": "b.png",
|
|
});
|
|
});
|
|
|
|
it("deduplicates conflicting filenames", () => {
|
|
const results: ({ buffer: Buffer; filename: string } | null)[] = [
|
|
{ buffer: Buffer.from("a"), filename: "photo.png" },
|
|
{ buffer: Buffer.from("b"), filename: "photo.png" },
|
|
{ buffer: Buffer.from("c"), filename: "photo.png" },
|
|
];
|
|
|
|
const usedNames = new Set<string>();
|
|
const fileResultsMap: Record<string, string> = {};
|
|
|
|
for (let i = 0; i < results.length; i++) {
|
|
const entry = results[i];
|
|
if (entry) {
|
|
const uniqueName = getUniqueName(entry.filename, usedNames);
|
|
entry.filename = uniqueName;
|
|
fileResultsMap[String(i)] = uniqueName;
|
|
}
|
|
}
|
|
|
|
expect(fileResultsMap).toEqual({
|
|
"0": "photo.png",
|
|
"1": "photo_1.png",
|
|
"2": "photo_2.png",
|
|
});
|
|
});
|
|
|
|
it("skips null entries (failed files)", () => {
|
|
const results: ({ buffer: Buffer; filename: string } | null)[] = [
|
|
null,
|
|
{ buffer: Buffer.from("b"), filename: "ok.jpg" },
|
|
null,
|
|
];
|
|
|
|
const usedNames = new Set<string>();
|
|
const fileResultsMap: Record<string, string> = {};
|
|
|
|
for (let i = 0; i < results.length; i++) {
|
|
const entry = results[i];
|
|
if (entry) {
|
|
const uniqueName = getUniqueName(entry.filename, usedNames);
|
|
entry.filename = uniqueName;
|
|
fileResultsMap[String(i)] = uniqueName;
|
|
}
|
|
}
|
|
|
|
expect(fileResultsMap).toEqual({ "1": "ok.jpg" });
|
|
});
|
|
|
|
it("returns empty map when all files failed", () => {
|
|
const results: null[] = [null, null, null];
|
|
const _usedNames = new Set<string>();
|
|
const fileResultsMap: Record<string, string> = {};
|
|
|
|
for (let i = 0; i < results.length; i++) {
|
|
const entry = results[i];
|
|
if (entry) {
|
|
fileResultsMap[String(i)] = "never";
|
|
}
|
|
}
|
|
|
|
expect(fileResultsMap).toEqual({});
|
|
});
|
|
});
|
|
|
|
// ── Progress state transitions ─────────────────────────────────────────
|
|
|
|
describe("batch progress status determination", () => {
|
|
it("status is 'failed' when all files fail", () => {
|
|
const totalFiles = 3;
|
|
const failedFiles = 3;
|
|
const status = failedFiles === totalFiles ? "failed" : "completed";
|
|
expect(status).toBe("failed");
|
|
});
|
|
|
|
it("status is 'completed' when some files succeed", () => {
|
|
const totalFiles = 3;
|
|
const failedFiles = 1;
|
|
const status = failedFiles === totalFiles ? "failed" : "completed";
|
|
expect(status).toBe("completed");
|
|
});
|
|
|
|
it("status is 'completed' when no files fail", () => {
|
|
const totalFiles = 5;
|
|
const failedFiles = 0;
|
|
const status = failedFiles === totalFiles ? "failed" : "completed";
|
|
expect(status).toBe("completed");
|
|
});
|
|
});
|