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
286 lines
9.2 KiB
TypeScript
286 lines
9.2 KiB
TypeScript
/**
|
|
* Unit tests for pipeline route utility logic.
|
|
*
|
|
* Tests pipeline step validation schemas, tool resolution (content-aware resize),
|
|
* unique filename deduplication, and the pipeline step schema constraints.
|
|
*/
|
|
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() }) }),
|
|
delete: () => ({ where: () => ({ run: vi.fn() }) }),
|
|
update: () => ({ set: () => ({ where: () => ({ run: vi.fn() }) }) }),
|
|
},
|
|
pool: {},
|
|
closeDb: async () => {},
|
|
schema: {
|
|
settings: { key: {} },
|
|
pipelines: { id: {} },
|
|
userFiles: { id: {} },
|
|
jobs: { id: {}, status: {} },
|
|
},
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/config.js", () => ({
|
|
env: {
|
|
WORKSPACE_PATH: "/tmp/test",
|
|
MAX_MEGAPIXELS: 100,
|
|
MAX_SVG_SIZE_MB: 10,
|
|
MAX_PIPELINE_STEPS: 20,
|
|
MAX_BATCH_SIZE: 10,
|
|
CONCURRENT_JOBS: 3,
|
|
},
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/analytics.js", () => ({
|
|
trackEvent: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/auto-orient.js", () => ({
|
|
autoOrient: vi.fn((buf: Buffer) => Promise.resolve(buf)),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/file-validation.js", () => ({
|
|
validateImageBuffer: vi.fn(() =>
|
|
Promise.resolve({ valid: true, format: "png", width: 100, height: 100 }),
|
|
),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/filename.js", () => ({
|
|
sanitizeFilename: (n: string) => n,
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/format-decoders.js", () => ({
|
|
decodeToSharpCompat: vi.fn(),
|
|
needsCliDecode: vi.fn(() => false),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/heic-converter.js", () => ({
|
|
decodeHeic: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/svg-sanitize.js", () => ({
|
|
isSvgBuffer: vi.fn(() => false),
|
|
sanitizeSvg: vi.fn((b: Buffer) => b),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/workspace.js", () => ({
|
|
createWorkspace: vi.fn(() => Promise.resolve("/tmp/workspace/pipeline-1")),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/feature-status.js", () => ({
|
|
isToolInstalled: vi.fn(() => true),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/errors.js", () => ({
|
|
formatZodErrors: (issues: Array<{ message: string }>) => issues.map((i) => i.message).join("; "),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/lib/env.js", () => ({
|
|
resolveConcurrency: () => 2,
|
|
resolveWorkerThreads: () => 2,
|
|
loadEnv: () => ({}),
|
|
}));
|
|
|
|
vi.mock("node:fs/promises", () => ({
|
|
writeFile: vi.fn().mockResolvedValue(undefined),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/plugins/auth.js", () => ({
|
|
requireAuth: vi.fn(() => ({ id: "user-1", username: "test", role: "admin" })),
|
|
getAuthUser: vi.fn(() => ({ id: "user-1", username: "test", role: "admin" })),
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/permissions.js", () => ({
|
|
hasEffectivePermission: vi.fn(() => true),
|
|
requirePermission: () => vi.fn(() => ({ id: "user-1", username: "test", role: "admin" })),
|
|
}));
|
|
|
|
import {
|
|
getRegisteredToolIds,
|
|
getToolConfig,
|
|
registerToolProcessFn,
|
|
} from "../../../apps/api/src/routes/tool-factory.js";
|
|
|
|
// ── Pipeline step schema tests (reproduced logic) ──────────────────────
|
|
|
|
describe("pipeline step schema validation", () => {
|
|
it("requires at least one step", () => {
|
|
const steps: unknown[] = [];
|
|
expect(steps.length).toBe(0);
|
|
// Pipeline definition schema requires min 1 step
|
|
});
|
|
|
|
it("validates step has toolId field", () => {
|
|
const step = { toolId: "resize", settings: {} };
|
|
expect(step.toolId).toBe("resize");
|
|
expect(step.settings).toEqual({});
|
|
});
|
|
|
|
it("defaults settings to empty object when omitted", () => {
|
|
const step = { toolId: "compress" };
|
|
const settings = (step as { settings?: Record<string, unknown> }).settings ?? {};
|
|
expect(settings).toEqual({});
|
|
});
|
|
});
|
|
|
|
// ── Tool resolution (content-aware resize routing) ─────────────────────
|
|
|
|
describe("content-aware resize routing", () => {
|
|
it("resolves resize with contentAware to content-aware-resize", () => {
|
|
const step = { toolId: "resize", settings: { contentAware: true, width: 200 } };
|
|
|
|
const resolvedToolId =
|
|
step.toolId === "resize" && step.settings?.contentAware
|
|
? "content-aware-resize"
|
|
: step.toolId;
|
|
|
|
expect(resolvedToolId).toBe("content-aware-resize");
|
|
});
|
|
|
|
it("keeps resize as-is without contentAware", () => {
|
|
const step = { toolId: "resize", settings: { width: 200 } };
|
|
|
|
const resolvedToolId =
|
|
step.toolId === "resize" && (step.settings as Record<string, unknown>)?.contentAware
|
|
? "content-aware-resize"
|
|
: step.toolId;
|
|
|
|
expect(resolvedToolId).toBe("resize");
|
|
});
|
|
|
|
it("keeps non-resize tools unchanged", () => {
|
|
const step = { toolId: "compress", settings: { quality: 80 } };
|
|
|
|
const resolvedToolId =
|
|
step.toolId === "resize" && (step.settings as Record<string, unknown>)?.contentAware
|
|
? "content-aware-resize"
|
|
: step.toolId;
|
|
|
|
expect(resolvedToolId).toBe("compress");
|
|
});
|
|
});
|
|
|
|
// ── Unique filename deduplication ──────────────────────────────────────
|
|
|
|
describe("filename deduplication (getUniqueName logic)", () => {
|
|
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("returns the original name when no conflicts", () => {
|
|
const used = new Set<string>();
|
|
expect(getUniqueName("photo.png", used)).toBe("photo.png");
|
|
});
|
|
|
|
it("adds _1 suffix on first conflict", () => {
|
|
const used = new Set<string>(["photo.png"]);
|
|
expect(getUniqueName("photo.png", used)).toBe("photo_1.png");
|
|
});
|
|
|
|
it("increments counter on repeated conflicts", () => {
|
|
const used = new Set<string>(["photo.png", "photo_1.png"]);
|
|
expect(getUniqueName("photo.png", used)).toBe("photo_2.png");
|
|
});
|
|
|
|
it("handles filenames without extension", () => {
|
|
const used = new Set<string>(["README"]);
|
|
expect(getUniqueName("README", used)).toBe("README_1");
|
|
});
|
|
|
|
it("handles multiple dots in filename", () => {
|
|
const used = new Set<string>(["my.photo.final.png"]);
|
|
expect(getUniqueName("my.photo.final.png", used)).toBe("my.photo.final_1.png");
|
|
});
|
|
|
|
it("tracks all used names across multiple calls", () => {
|
|
const used = new Set<string>();
|
|
expect(getUniqueName("a.jpg", used)).toBe("a.jpg");
|
|
expect(getUniqueName("a.jpg", used)).toBe("a_1.jpg");
|
|
expect(getUniqueName("a.jpg", used)).toBe("a_2.jpg");
|
|
expect(getUniqueName("b.jpg", used)).toBe("b.jpg");
|
|
});
|
|
});
|
|
|
|
// ── Tool registry integration ──────────────────────────────────────────
|
|
|
|
describe("pipeline tool registry lookup", () => {
|
|
const testToolId = `pipeline-test-${Math.random().toString(36).slice(2, 8)}`;
|
|
|
|
it("getToolConfig returns undefined for unregistered tool", () => {
|
|
expect(getToolConfig("nonexistent-tool-xyz")).toBeUndefined();
|
|
});
|
|
|
|
it("registered tool is found via getToolConfig", () => {
|
|
registerToolProcessFn({
|
|
toolId: testToolId,
|
|
settingsSchema: {
|
|
safeParse: (d: unknown) => ({ success: true, data: d }),
|
|
parse: (d: unknown) => d,
|
|
} as never,
|
|
process: async (buf: Buffer) => ({
|
|
buffer: buf,
|
|
filename: "out.png",
|
|
contentType: "image/png",
|
|
}),
|
|
});
|
|
|
|
const config = getToolConfig(testToolId);
|
|
expect(config).toBeDefined();
|
|
expect(config?.toolId).toBe(testToolId);
|
|
});
|
|
|
|
it("registered tool appears in getRegisteredToolIds", () => {
|
|
expect(getRegisteredToolIds()).toContain(testToolId);
|
|
});
|
|
|
|
it("registered tool process function executes correctly", async () => {
|
|
const config = getToolConfig(testToolId);
|
|
const result = await config?.process(Buffer.from("test"), {}, "input.png");
|
|
expect(result.buffer).toEqual(Buffer.from("test"));
|
|
expect(result.filename).toBe("out.png");
|
|
expect(result.contentType).toBe("image/png");
|
|
});
|
|
});
|
|
|
|
// ── Pipeline step error wrapping ───────────────────────────────────────
|
|
|
|
describe("pipeline step error message formatting", () => {
|
|
it("wraps step errors with step number and tool ID", () => {
|
|
const stepErr = new Error("Invalid dimensions");
|
|
const i = 2;
|
|
const toolId = "resize";
|
|
const msg = stepErr instanceof Error ? stepErr.message : "Processing failed";
|
|
const wrapped = `Step ${i + 1} (${toolId}): ${msg}`;
|
|
expect(wrapped).toBe("Step 3 (resize): Invalid dimensions");
|
|
});
|
|
|
|
it("falls back to generic message for non-Error", () => {
|
|
const stepErr = "some string";
|
|
const msg = stepErr instanceof Error ? stepErr.message : "Processing failed";
|
|
expect(msg).toBe("Processing failed");
|
|
});
|
|
});
|