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
211 lines
6.9 KiB
TypeScript
211 lines
6.9 KiB
TypeScript
/**
|
|
* S3 storage backend integration tests.
|
|
*
|
|
* Tests the full file-storage abstraction layer against a real MinIO instance.
|
|
* Requires MinIO on port 19000:
|
|
* docker run -d --name snapotter-minio-test -p 19000:9000 \
|
|
* -e MINIO_ROOT_USER=minioadmin -e MINIO_ROOT_PASSWORD=minioadmin \
|
|
* minio/minio server /data
|
|
*/
|
|
|
|
import { spawnSync } from "node:child_process";
|
|
import { readFileSync } from "node:fs";
|
|
import { join } from "node:path";
|
|
import {
|
|
CreateBucketCommand,
|
|
DeleteBucketCommand,
|
|
DeleteObjectCommand,
|
|
HeadObjectCommand,
|
|
ListObjectsV2Command,
|
|
S3Client,
|
|
} from "@aws-sdk/client-s3";
|
|
import { loadS3Storage, type S3StorageModule } from "@snapotter/enterprise";
|
|
import { afterAll, beforeAll, describe, expect, it } from "vitest";
|
|
import { env } from "../../apps/api/src/config.js";
|
|
|
|
const FIXTURES = join(__dirname, "..", "fixtures");
|
|
const PNG = readFileSync(join(FIXTURES, "test-200x150.png"));
|
|
|
|
const S3_ENDPOINT = "http://localhost:19000";
|
|
const BUCKET = `snapotter-s3test-${Date.now()}`;
|
|
const CREDS = { accessKeyId: "minioadmin", secretAccessKey: "minioadmin" };
|
|
|
|
const minioAvailable = (() => {
|
|
const result = spawnSync("curl", ["-sf", "http://localhost:19000/minio/health/live"], {
|
|
timeout: 2000,
|
|
stdio: "ignore",
|
|
});
|
|
return result.status === 0;
|
|
})();
|
|
|
|
let s3Client: S3Client;
|
|
let s3Storage: S3StorageModule;
|
|
let originalStorageMode: string;
|
|
|
|
async function listKeys(): Promise<string[]> {
|
|
const result = await s3Client.send(new ListObjectsV2Command({ Bucket: BUCKET }));
|
|
return (result.Contents || []).map((o) => o.Key!);
|
|
}
|
|
|
|
async function objectExists(key: string): Promise<boolean> {
|
|
try {
|
|
await s3Client.send(new HeadObjectCommand({ Bucket: BUCKET, Key: key }));
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
describe.skipIf(!minioAvailable)("S3 storage backend", () => {
|
|
let storedName: string;
|
|
|
|
beforeAll(async () => {
|
|
s3Client = new S3Client({
|
|
region: "us-east-1",
|
|
endpoint: S3_ENDPOINT,
|
|
forcePathStyle: true,
|
|
credentials: CREDS,
|
|
});
|
|
|
|
await s3Client.send(new CreateBucketCommand({ Bucket: BUCKET }));
|
|
|
|
s3Storage = await loadS3Storage();
|
|
|
|
originalStorageMode = env.STORAGE_MODE;
|
|
const e = env as Record<string, unknown>;
|
|
e.STORAGE_MODE = "s3";
|
|
e.S3_BUCKET = BUCKET;
|
|
e.S3_REGION = "us-east-1";
|
|
e.S3_ENDPOINT = S3_ENDPOINT;
|
|
e.S3_ACCESS_KEY_ID = CREDS.accessKeyId;
|
|
e.S3_SECRET_ACCESS_KEY = CREDS.secretAccessKey;
|
|
e.S3_FORCE_PATH_STYLE = true;
|
|
e.S3_PREFIX = "";
|
|
|
|
s3Storage.configureS3({
|
|
bucket: BUCKET,
|
|
region: "us-east-1",
|
|
endpoint: S3_ENDPOINT,
|
|
accessKeyId: CREDS.accessKeyId,
|
|
secretAccessKey: CREDS.secretAccessKey,
|
|
forcePathStyle: true,
|
|
prefix: "",
|
|
});
|
|
}, 15_000);
|
|
|
|
afterAll(async () => {
|
|
(env as Record<string, unknown>).STORAGE_MODE = originalStorageMode;
|
|
|
|
try {
|
|
const objects = await s3Client.send(new ListObjectsV2Command({ Bucket: BUCKET }));
|
|
if (objects.Contents) {
|
|
for (const obj of objects.Contents) {
|
|
await s3Client.send(new DeleteObjectCommand({ Bucket: BUCKET, Key: obj.Key! }));
|
|
}
|
|
}
|
|
await s3Client.send(new DeleteBucketCommand({ Bucket: BUCKET }));
|
|
} catch {
|
|
// Best-effort cleanup
|
|
}
|
|
}, 15_000);
|
|
|
|
it("saveFile writes object to S3", async () => {
|
|
const { saveFile } = await import("../../apps/api/src/lib/file-storage.js");
|
|
storedName = await saveFile(PNG, "test-upload.png");
|
|
|
|
expect(storedName).toMatch(/^[a-f0-9-]+\.png$/);
|
|
expect(await objectExists(`files/${storedName}`)).toBe(true);
|
|
});
|
|
|
|
it("readStoredFile returns the correct buffer", async () => {
|
|
const { readStoredFile } = await import("../../apps/api/src/lib/file-storage.js");
|
|
const buffer = await readStoredFile(storedName);
|
|
expect(Buffer.compare(buffer, PNG)).toBe(0);
|
|
});
|
|
|
|
it("streamStoredFile returns a readable stream", async () => {
|
|
const { streamStoredFile } = await import("../../apps/api/src/lib/file-storage.js");
|
|
const stream = await streamStoredFile(storedName);
|
|
|
|
const chunks: Buffer[] = [];
|
|
for await (const chunk of stream) {
|
|
chunks.push(Buffer.from(chunk));
|
|
}
|
|
expect(Buffer.compare(Buffer.concat(chunks), PNG)).toBe(0);
|
|
});
|
|
|
|
it("saveThumbnail stores in S3, getCachedThumbnail retrieves it", async () => {
|
|
const { saveThumbnail, getCachedThumbnail } = await import(
|
|
"../../apps/api/src/lib/file-storage.js"
|
|
);
|
|
const thumbData = Buffer.from("fake-thumbnail-data");
|
|
|
|
await saveThumbnail(storedName, thumbData);
|
|
expect(await objectExists(`thumbs/${storedName}.thumb.jpg`)).toBe(true);
|
|
|
|
const cached = await getCachedThumbnail(storedName);
|
|
expect(cached).not.toBeNull();
|
|
expect(Buffer.compare(cached!, thumbData)).toBe(0);
|
|
});
|
|
|
|
it("deleteThumbnail removes thumbnail from S3", async () => {
|
|
const { deleteThumbnail } = await import("../../apps/api/src/lib/file-storage.js");
|
|
await deleteThumbnail(storedName);
|
|
expect(await objectExists(`thumbs/${storedName}.thumb.jpg`)).toBe(false);
|
|
});
|
|
|
|
it("deleteStoredFile removes file from S3", async () => {
|
|
const { deleteStoredFile } = await import("../../apps/api/src/lib/file-storage.js");
|
|
await deleteStoredFile(storedName);
|
|
expect(await objectExists(`files/${storedName}`)).toBe(false);
|
|
});
|
|
|
|
it("deleteStoredFile is idempotent (no error for missing key)", async () => {
|
|
const { deleteStoredFile } = await import("../../apps/api/src/lib/file-storage.js");
|
|
await expect(deleteStoredFile("nonexistent-file.png")).resolves.toBeUndefined();
|
|
});
|
|
|
|
it("getCachedThumbnail returns null for missing thumbnail", async () => {
|
|
const { getCachedThumbnail } = await import("../../apps/api/src/lib/file-storage.js");
|
|
expect(await getCachedThumbnail("nonexistent.png")).toBeNull();
|
|
});
|
|
|
|
it("S3_PREFIX scopes all object keys under a tenant prefix", async () => {
|
|
const { saveFile, deleteStoredFile } = await import("../../apps/api/src/lib/file-storage.js");
|
|
|
|
(env as Record<string, unknown>).S3_PREFIX = "tenant-123";
|
|
s3Storage.configureS3({
|
|
bucket: BUCKET,
|
|
region: "us-east-1",
|
|
endpoint: S3_ENDPOINT,
|
|
accessKeyId: CREDS.accessKeyId,
|
|
secretAccessKey: CREDS.secretAccessKey,
|
|
forcePathStyle: true,
|
|
prefix: "tenant-123",
|
|
});
|
|
const name = await saveFile(PNG, "prefixed.png");
|
|
|
|
expect(await objectExists(`tenant-123/files/${name}`)).toBe(true);
|
|
expect(await objectExists(`files/${name}`)).toBe(false);
|
|
|
|
await deleteStoredFile(name);
|
|
expect(await objectExists(`tenant-123/files/${name}`)).toBe(false);
|
|
|
|
(env as Record<string, unknown>).S3_PREFIX = "";
|
|
s3Storage.configureS3({
|
|
bucket: BUCKET,
|
|
region: "us-east-1",
|
|
endpoint: S3_ENDPOINT,
|
|
accessKeyId: CREDS.accessKeyId,
|
|
secretAccessKey: CREDS.secretAccessKey,
|
|
forcePathStyle: true,
|
|
prefix: "",
|
|
});
|
|
});
|
|
|
|
it("bucket is empty after all operations", async () => {
|
|
const keys = await listKeys();
|
|
expect(keys).toHaveLength(0);
|
|
});
|
|
});
|