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
712 lines
21 KiB
TypeScript
712 lines
21 KiB
TypeScript
/**
|
|
* Integration tests for the SSE progress tracking system.
|
|
*
|
|
* The GET /api/v1/jobs/:jobId/progress endpoint uses reply.hijack()
|
|
* for SSE streaming, which makes it incompatible with Fastify's inject()
|
|
* (inject never completes for hijacked responses that wait for events).
|
|
*
|
|
* Instead, we test progress tracking indirectly through batch and pipeline
|
|
* batch routes that drive updateJobProgress() and verify:
|
|
* - X-Job-Id header presence (job was tracked)
|
|
* - clientJobId passthrough (custom IDs are used)
|
|
* - Completed batch with progress tracking
|
|
* - Pipeline batch progress tracking
|
|
* - Job persistence in the database
|
|
*/
|
|
|
|
import { randomUUID } from "node:crypto";
|
|
import { readFileSync } from "node:fs";
|
|
import { join } from "node:path";
|
|
import { eq } from "drizzle-orm";
|
|
import { afterAll, beforeAll, describe, expect, it } from "vitest";
|
|
import { db, schema } from "../../apps/api/src/db/index.js";
|
|
import {
|
|
drainPersistQueue,
|
|
recoverStaleJobs,
|
|
updateJobProgress,
|
|
updateSingleFileProgress,
|
|
} from "../../apps/api/src/routes/progress.js";
|
|
import { buildTestApp, createMultipartPayload, loginAsAdmin, type TestApp } from "./test-server.js";
|
|
|
|
const FIXTURES = join(__dirname, "..", "fixtures");
|
|
const PNG = readFileSync(join(FIXTURES, "test-200x150.png"));
|
|
const JPG = readFileSync(join(FIXTURES, "test-100x100.jpg"));
|
|
|
|
let testApp: TestApp;
|
|
let app: TestApp["app"];
|
|
let adminToken: string;
|
|
|
|
beforeAll(async () => {
|
|
testApp = await buildTestApp();
|
|
app = testApp.app;
|
|
adminToken = await loginAsAdmin(app);
|
|
}, 30_000);
|
|
|
|
afterAll(async () => {
|
|
await testApp.cleanup();
|
|
}, 10_000);
|
|
|
|
// ── Batch progress tracking via X-Job-Id ────────────────────────
|
|
|
|
// Fire-and-forget persist calls need time to flush to the DB.
|
|
// With Postgres, async writes involve network round-trips that may exceed a
|
|
// fixed delay. Poll for the expected terminal status with a generous ceiling.
|
|
const flushPersist = async (
|
|
jobId?: string,
|
|
terminalStatuses: string[] = ["completed", "failed"],
|
|
maxMs = 2000,
|
|
) => {
|
|
if (!jobId) {
|
|
// Fallback: fixed delay when no jobId is available
|
|
await new Promise((r) => setTimeout(r, 200));
|
|
return;
|
|
}
|
|
// Drain any pending persist writes before polling the DB
|
|
await drainPersistQueue(jobId);
|
|
const start = Date.now();
|
|
while (Date.now() - start < maxMs) {
|
|
const [row] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
if (row && terminalStatuses.includes(row.status)) return;
|
|
await new Promise((r) => setTimeout(r, 50));
|
|
}
|
|
};
|
|
|
|
describe("Batch progress tracking", () => {
|
|
it("assigns a job ID to batch operations", async () => {
|
|
const { body, contentType } = createMultipartPayload([
|
|
{ name: "file", filename: "a.png", contentType: "image/png", content: PNG },
|
|
{ name: "file", filename: "b.jpg", contentType: "image/jpeg", content: JPG },
|
|
{ name: "settings", content: JSON.stringify({ width: 50 }) },
|
|
]);
|
|
|
|
const res = await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/tools/resize/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
expect(res.statusCode).toBe(200);
|
|
const jobId = res.headers["x-job-id"] as string;
|
|
expect(jobId).toBeDefined();
|
|
expect(jobId.length).toBeGreaterThan(0);
|
|
});
|
|
|
|
it("uses client-provided job ID when clientJobId is supplied", async () => {
|
|
const clientJobId = randomUUID();
|
|
|
|
const { body, contentType } = createMultipartPayload([
|
|
{ name: "file", filename: "track.png", contentType: "image/png", content: PNG },
|
|
{ name: "settings", content: JSON.stringify({ width: 80 }) },
|
|
{ name: "clientJobId", content: clientJobId },
|
|
]);
|
|
|
|
const res = await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/tools/resize/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
expect(res.statusCode).toBe(200);
|
|
expect(res.headers["x-job-id"]).toBe(clientJobId);
|
|
});
|
|
|
|
it("persists job progress to the database after batch completes", async () => {
|
|
const clientJobId = randomUUID();
|
|
|
|
const { body, contentType } = createMultipartPayload([
|
|
{ name: "file", filename: "persist.png", contentType: "image/png", content: PNG },
|
|
{ name: "file", filename: "persist2.jpg", contentType: "image/jpeg", content: JPG },
|
|
{ name: "settings", content: JSON.stringify({ width: 60 }) },
|
|
{ name: "clientJobId", content: clientJobId },
|
|
]);
|
|
|
|
const res = await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/tools/resize/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
expect(res.statusCode).toBe(200);
|
|
await flushPersist(clientJobId);
|
|
|
|
// Check the jobs table for the persisted progress
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, clientJobId));
|
|
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("completed");
|
|
expect(job?.progress).toBe(1); // 100% complete
|
|
expect(job?.completedAt).not.toBeNull();
|
|
});
|
|
|
|
it("persists failed job status to the database", async () => {
|
|
// Provide an invalid file (empty buffer won't be uploaded, so all fail)
|
|
const clientJobId = randomUUID();
|
|
|
|
const { body, contentType } = createMultipartPayload([
|
|
{
|
|
name: "file",
|
|
filename: "bad.txt",
|
|
contentType: "text/plain",
|
|
content: Buffer.from("not an image"),
|
|
},
|
|
{ name: "settings", content: JSON.stringify({ width: 50 }) },
|
|
{ name: "clientJobId", content: clientJobId },
|
|
]);
|
|
|
|
const res = await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/tools/resize/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
// Should fail (422 = all files failed)
|
|
expect(res.statusCode).toBe(422);
|
|
|
|
await flushPersist(clientJobId);
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, clientJobId));
|
|
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("failed");
|
|
});
|
|
|
|
it("tracks progress for multi-file batch with partial success", async () => {
|
|
const clientJobId = randomUUID();
|
|
|
|
// Mix valid image + invalid data -- partial success
|
|
const { body, contentType } = createMultipartPayload([
|
|
{ name: "file", filename: "good.png", contentType: "image/png", content: PNG },
|
|
{
|
|
name: "file",
|
|
filename: "bad.txt",
|
|
contentType: "text/plain",
|
|
content: Buffer.from("not an image"),
|
|
},
|
|
{ name: "settings", content: JSON.stringify({ width: 50 }) },
|
|
{ name: "clientJobId", content: clientJobId },
|
|
]);
|
|
|
|
const res = await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/tools/resize/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
// Should succeed (at least one file processed)
|
|
expect(res.statusCode).toBe(200);
|
|
|
|
await flushPersist(clientJobId);
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, clientJobId));
|
|
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("completed");
|
|
// Should have error info for the failed file
|
|
if (job?.error) {
|
|
const errors = JSON.parse(job?.error);
|
|
expect(errors.length).toBeGreaterThanOrEqual(1);
|
|
}
|
|
});
|
|
});
|
|
|
|
// ── Pipeline batch progress ─────────────────────────────────────
|
|
describe("Pipeline batch progress tracking", () => {
|
|
it("tracks progress during pipeline batch execution", async () => {
|
|
const clientJobId = randomUUID();
|
|
|
|
const { body, contentType } = createMultipartPayload([
|
|
{ name: "file", filename: "pipe1.png", contentType: "image/png", content: PNG },
|
|
{ name: "file", filename: "pipe2.jpg", contentType: "image/jpeg", content: JPG },
|
|
{
|
|
name: "pipeline",
|
|
content: JSON.stringify({
|
|
steps: [{ toolId: "resize", settings: { width: 50 } }],
|
|
}),
|
|
},
|
|
{ name: "clientJobId", content: clientJobId },
|
|
]);
|
|
|
|
const res = await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/pipeline/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
expect(res.statusCode).toBe(200);
|
|
expect(res.headers["x-job-id"]).toBe(clientJobId);
|
|
|
|
// Verify DB persistence
|
|
await flushPersist(clientJobId);
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, clientJobId));
|
|
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("completed");
|
|
});
|
|
|
|
it("pipeline batch generates job ID when not provided", async () => {
|
|
const { body, contentType } = createMultipartPayload([
|
|
{ name: "file", filename: "auto.png", contentType: "image/png", content: PNG },
|
|
{
|
|
name: "pipeline",
|
|
content: JSON.stringify({
|
|
steps: [{ toolId: "rotate", settings: { angle: 90 } }],
|
|
}),
|
|
},
|
|
]);
|
|
|
|
const res = await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/pipeline/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
expect(res.statusCode).toBe(200);
|
|
const jobId = res.headers["x-job-id"] as string;
|
|
expect(jobId).toBeDefined();
|
|
expect(jobId.length).toBeGreaterThan(0);
|
|
});
|
|
});
|
|
|
|
// ── Job DB record structure ─────────────────────────────────────
|
|
describe("Job DB record structure", () => {
|
|
it("persisted job contains expected fields", async () => {
|
|
const clientJobId = randomUUID();
|
|
|
|
const { body, contentType } = createMultipartPayload([
|
|
{ name: "file", filename: "fields.png", contentType: "image/png", content: PNG },
|
|
{ name: "settings", content: JSON.stringify({ width: 70 }) },
|
|
{ name: "clientJobId", content: clientJobId },
|
|
]);
|
|
|
|
await app.inject({
|
|
method: "POST",
|
|
url: "/api/v1/tools/resize/batch",
|
|
headers: {
|
|
"content-type": contentType,
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
body,
|
|
});
|
|
|
|
await flushPersist(clientJobId);
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, clientJobId));
|
|
|
|
expect(job).toBeDefined();
|
|
expect(job?.id).toBe(clientJobId);
|
|
expect(job?.type).toBe("batch");
|
|
expect(typeof job?.progress).toBe("number");
|
|
expect(job?.progress).toBeGreaterThanOrEqual(0);
|
|
expect(job?.progress).toBeLessThanOrEqual(1);
|
|
});
|
|
});
|
|
|
|
// ── SSE endpoint ───────────────────────────────────────────────
|
|
describe("SSE progress endpoint", () => {
|
|
it("returns SSE headers when connecting to progress stream", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
// Pre-populate a completed job so the SSE endpoint sends it immediately and closes
|
|
updateJobProgress({
|
|
jobId,
|
|
status: "completed",
|
|
totalFiles: 1,
|
|
completedFiles: 1,
|
|
failedFiles: 0,
|
|
errors: [],
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const res = await app.inject({
|
|
method: "GET",
|
|
url: `/api/v1/jobs/${jobId}/progress`,
|
|
headers: {
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
});
|
|
|
|
// Hijacked responses return 200 (or -1 in some Fastify versions)
|
|
// The important thing is we get SSE content back
|
|
expect(res.statusCode).toBe(200);
|
|
const body = res.body;
|
|
// SSE events contain "data:" prefix
|
|
expect(body).toContain("data:");
|
|
|
|
// Parse the SSE data
|
|
const dataMatch = body.match(/data: (.+)/);
|
|
expect(dataMatch).not.toBeNull();
|
|
const event = JSON.parse(dataMatch?.[1]);
|
|
expect(event.status).toBe("completed");
|
|
expect(event.type).toBe("batch");
|
|
});
|
|
|
|
it("SSE endpoint returns existing progress for failed job", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
updateJobProgress({
|
|
jobId,
|
|
status: "failed",
|
|
totalFiles: 2,
|
|
completedFiles: 1,
|
|
failedFiles: 1,
|
|
errors: [{ filename: "bad.png", error: "Invalid image" }],
|
|
});
|
|
|
|
const res = await app.inject({
|
|
method: "GET",
|
|
url: `/api/v1/jobs/${jobId}/progress`,
|
|
headers: {
|
|
authorization: `Bearer ${adminToken}`,
|
|
},
|
|
});
|
|
|
|
expect(res.statusCode).toBe(200);
|
|
const body = res.body;
|
|
const dataMatch = body.match(/data: (.+)/);
|
|
expect(dataMatch).not.toBeNull();
|
|
const event = JSON.parse(dataMatch?.[1]);
|
|
expect(event.status).toBe("failed");
|
|
expect(event.failedFiles).toBe(1);
|
|
expect(event.errors).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
// ── updateJobProgress direct tests ─────────────────────────────
|
|
describe("updateJobProgress direct calls", () => {
|
|
it("persists job progress to the database for a new job", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
updateJobProgress({
|
|
jobId,
|
|
status: "processing",
|
|
totalFiles: 5,
|
|
completedFiles: 2,
|
|
failedFiles: 0,
|
|
errors: [],
|
|
});
|
|
await flushPersist(jobId, ["processing"]);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("processing");
|
|
expect(job?.progress).toBeCloseTo(0.4, 1); // 2/5
|
|
expect(job?.type).toBe("batch");
|
|
});
|
|
|
|
it("updates existing job progress in the database", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
// Create initial progress
|
|
updateJobProgress({
|
|
jobId,
|
|
status: "processing",
|
|
totalFiles: 3,
|
|
completedFiles: 1,
|
|
failedFiles: 0,
|
|
errors: [],
|
|
});
|
|
await flushPersist(jobId, ["processing"]);
|
|
|
|
// Update progress
|
|
updateJobProgress({
|
|
jobId,
|
|
status: "completed",
|
|
totalFiles: 3,
|
|
completedFiles: 3,
|
|
failedFiles: 0,
|
|
errors: [],
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("completed");
|
|
expect(job?.progress).toBe(1);
|
|
expect(job?.completedAt).not.toBeNull();
|
|
});
|
|
|
|
it("persists errors to the database", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
updateJobProgress({
|
|
jobId,
|
|
status: "failed",
|
|
totalFiles: 2,
|
|
completedFiles: 0,
|
|
failedFiles: 2,
|
|
errors: [
|
|
{ filename: "a.png", error: "Invalid format" },
|
|
{ filename: "b.png", error: "Corrupt file" },
|
|
],
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("failed");
|
|
expect(job?.error).not.toBeNull();
|
|
const errors = JSON.parse(job?.error ?? "[]");
|
|
expect(errors).toHaveLength(2);
|
|
});
|
|
|
|
it("handles zero totalFiles without division by zero", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
updateJobProgress({
|
|
jobId,
|
|
status: "completed",
|
|
totalFiles: 0,
|
|
completedFiles: 0,
|
|
failedFiles: 0,
|
|
errors: [],
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.progress).toBe(0);
|
|
});
|
|
});
|
|
|
|
// ── updateSingleFileProgress direct tests ──────────────────────
|
|
describe("updateSingleFileProgress direct calls", () => {
|
|
it("persists single-file progress for new job", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "processing",
|
|
percent: 50,
|
|
stage: "encoding",
|
|
});
|
|
await flushPersist(jobId, ["processing"]);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("processing");
|
|
expect(job?.progress).toBeCloseTo(0.5, 1);
|
|
expect(job?.type).toBe("single");
|
|
});
|
|
|
|
it("persists complete phase", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "complete",
|
|
percent: 100,
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("completed");
|
|
expect(job?.progress).toBe(1);
|
|
// completedAt is only set on UPDATE path (not INSERT for new jobs)
|
|
expect(job?.type).toBe("single");
|
|
});
|
|
|
|
it("persists failed phase with error", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "failed",
|
|
percent: 30,
|
|
error: "Processing timeout",
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("failed");
|
|
expect(job?.error).toBe("Processing timeout");
|
|
expect(job?.type).toBe("single");
|
|
});
|
|
|
|
it("sets completedAt when updating existing job to complete", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
// Create initial job
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "processing",
|
|
percent: 50,
|
|
});
|
|
await flushPersist(jobId, ["processing"]);
|
|
|
|
// Update to complete
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "complete",
|
|
percent: 100,
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("completed");
|
|
expect(job?.completedAt).not.toBeNull();
|
|
});
|
|
|
|
it("sets completedAt when updating existing job to failed", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
// Create initial job
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "processing",
|
|
percent: 25,
|
|
});
|
|
await flushPersist(jobId, ["processing"]);
|
|
|
|
// Update to failed
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "failed",
|
|
percent: 25,
|
|
error: "Timeout error",
|
|
});
|
|
await flushPersist(jobId);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("failed");
|
|
expect(job?.completedAt).not.toBeNull();
|
|
expect(job?.error).toBe("Timeout error");
|
|
});
|
|
|
|
it("updates existing single-file job progress", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
// Create
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "processing",
|
|
percent: 25,
|
|
stage: "analyzing",
|
|
});
|
|
await flushPersist(jobId, ["processing"]);
|
|
|
|
// Update
|
|
updateSingleFileProgress({
|
|
jobId,
|
|
phase: "processing",
|
|
percent: 75,
|
|
stage: "encoding",
|
|
});
|
|
await flushPersist(jobId, ["processing"]);
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.progress).toBeCloseTo(0.75, 1);
|
|
});
|
|
});
|
|
|
|
// ── recoverStaleJobs ───────────────────────────────────────────
|
|
describe("recoverStaleJobs", () => {
|
|
it("marks processing jobs as failed on recovery", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
// Insert a processing job directly
|
|
await db.insert(schema.jobs).values({
|
|
id: jobId,
|
|
type: "batch",
|
|
status: "processing",
|
|
progress: 0.5,
|
|
inputFiles: "[]",
|
|
});
|
|
|
|
await recoverStaleJobs();
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("failed");
|
|
expect(job?.error).toContain("Server restarted");
|
|
expect(job?.completedAt).not.toBeNull();
|
|
});
|
|
|
|
it("marks queued jobs as failed on recovery", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
await db.insert(schema.jobs).values({
|
|
id: jobId,
|
|
type: "batch",
|
|
status: "queued",
|
|
progress: 0,
|
|
inputFiles: "[]",
|
|
});
|
|
|
|
await recoverStaleJobs();
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("failed");
|
|
expect(job?.error).toContain("Server restarted");
|
|
});
|
|
|
|
it("does not modify completed jobs", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
await db.insert(schema.jobs).values({
|
|
id: jobId,
|
|
type: "batch",
|
|
status: "completed",
|
|
progress: 1,
|
|
inputFiles: "[]",
|
|
completedAt: new Date(),
|
|
});
|
|
|
|
await recoverStaleJobs();
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.status).toBe("completed");
|
|
});
|
|
|
|
it("does not modify already-failed jobs", async () => {
|
|
const jobId = randomUUID();
|
|
|
|
await db.insert(schema.jobs).values({
|
|
id: jobId,
|
|
type: "batch",
|
|
status: "failed",
|
|
progress: 0,
|
|
inputFiles: "[]",
|
|
error: "Original error",
|
|
completedAt: new Date(),
|
|
});
|
|
|
|
await recoverStaleJobs();
|
|
|
|
const [job] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
|
expect(job).toBeDefined();
|
|
expect(job?.error).toBe("Original error");
|
|
});
|
|
});
|