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
317 lines
10 KiB
TypeScript
317 lines
10 KiB
TypeScript
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
const config = vi.hoisted(() => ({
|
|
ANALYTICS_ENABLED: false,
|
|
POSTHOG_API_KEY: "",
|
|
POSTHOG_HOST: "",
|
|
SENTRY_DSN: "",
|
|
ANALYTICS_SAMPLE_RATE: 1.0,
|
|
}));
|
|
|
|
const dbGetResult = vi.hoisted(() => ({ value: null as unknown }));
|
|
const mockAuthUser = vi.hoisted(() => ({
|
|
value: null as { id: string; analyticsEnabled?: boolean } | null,
|
|
}));
|
|
|
|
const mockCapture = vi.hoisted(() => vi.fn());
|
|
const mockShutdown = vi.hoisted(() => vi.fn().mockResolvedValue(undefined));
|
|
const MockPostHog = vi.hoisted(() =>
|
|
vi.fn().mockImplementation(() => ({
|
|
capture: mockCapture,
|
|
shutdown: mockShutdown,
|
|
})),
|
|
);
|
|
|
|
const mockSentryCapture = vi.hoisted(() => vi.fn());
|
|
const mockSentryClose = vi.hoisted(() => vi.fn().mockResolvedValue(undefined));
|
|
const mockSentryInit = vi.hoisted(() => vi.fn());
|
|
|
|
vi.mock("../../../apps/api/src/config.js", () => ({ env: config }));
|
|
|
|
vi.mock("../../../apps/api/src/db/index.js", () => ({
|
|
db: {
|
|
select: () => ({
|
|
from: () => ({
|
|
where: () => {
|
|
const val = dbGetResult.value;
|
|
return Promise.resolve(val ? [val] : []);
|
|
},
|
|
}),
|
|
}),
|
|
},
|
|
pool: {},
|
|
closeDb: async () => {},
|
|
schema: {
|
|
settings: { key: "key" },
|
|
users: { id: "id", analyticsEnabled: "analyticsEnabled" },
|
|
},
|
|
}));
|
|
|
|
vi.mock("../../../apps/api/src/plugins/auth.js", () => ({
|
|
getAuthUser: () => mockAuthUser.value,
|
|
}));
|
|
|
|
vi.mock("drizzle-orm", () => ({
|
|
eq: () => "mocked-eq",
|
|
}));
|
|
|
|
vi.mock("posthog-node", () => ({
|
|
PostHog: MockPostHog,
|
|
}));
|
|
|
|
vi.mock("@sentry/node", () => ({
|
|
init: mockSentryInit,
|
|
captureException: mockSentryCapture,
|
|
close: mockSentryClose,
|
|
}));
|
|
|
|
type AnalyticsModule = typeof import("../../../apps/api/src/lib/analytics.js");
|
|
let mod: AnalyticsModule;
|
|
|
|
beforeEach(async () => {
|
|
config.ANALYTICS_ENABLED = false;
|
|
config.POSTHOG_API_KEY = "";
|
|
config.POSTHOG_HOST = "";
|
|
config.SENTRY_DSN = "";
|
|
config.ANALYTICS_SAMPLE_RATE = 1.0;
|
|
|
|
dbGetResult.value = null;
|
|
mockAuthUser.value = null;
|
|
|
|
mockCapture.mockClear();
|
|
mockShutdown.mockClear();
|
|
MockPostHog.mockClear();
|
|
mockSentryCapture.mockClear();
|
|
mockSentryClose.mockClear();
|
|
mockSentryInit.mockClear();
|
|
|
|
vi.resetModules();
|
|
mod = await import("../../../apps/api/src/lib/analytics.js");
|
|
});
|
|
|
|
describe("initAnalytics", () => {
|
|
it("does nothing when ANALYTICS_ENABLED is false", async () => {
|
|
config.ANALYTICS_ENABLED = false;
|
|
await expect(mod.initAnalytics()).resolves.toBeUndefined();
|
|
expect(MockPostHog).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("does nothing when ANALYTICS_ENABLED is true but POSTHOG_API_KEY is empty", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "";
|
|
await expect(mod.initAnalytics()).resolves.toBeUndefined();
|
|
expect(MockPostHog).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("initializes posthog when enabled with API key", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.POSTHOG_HOST = "https://test.posthog.com";
|
|
await mod.initAnalytics();
|
|
|
|
expect(MockPostHog).toHaveBeenCalledWith("phc_test_key", {
|
|
host: "https://test.posthog.com",
|
|
flushAt: 20,
|
|
flushInterval: 30000,
|
|
});
|
|
});
|
|
|
|
it("initializes sentry when SENTRY_DSN is provided", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.SENTRY_DSN = "https://test@sentry.io/123";
|
|
await mod.initAnalytics();
|
|
expect(mockSentryInit).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
dsn: "https://test@sentry.io/123",
|
|
sendDefaultPii: false,
|
|
}),
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("captureException", () => {
|
|
it("does nothing when sentryModule is null", async () => {
|
|
await expect(mod.captureException(new Error("test"))).resolves.toBeUndefined();
|
|
});
|
|
|
|
it("does nothing when request user is not opted in", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.SENTRY_DSN = "https://test@sentry.io/123";
|
|
await mod.initAnalytics();
|
|
|
|
mockAuthUser.value = null;
|
|
const fakeRequest = { headers: {} } as Parameters<typeof mod.captureException>[1];
|
|
await mod.captureException(new Error("test"), fakeRequest);
|
|
expect(mockSentryCapture).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("captures when sentry is initialized and no request provided", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.SENTRY_DSN = "https://test@sentry.io/123";
|
|
await mod.initAnalytics();
|
|
|
|
const err = new Error("test error");
|
|
await mod.captureException(err);
|
|
expect(mockSentryCapture).toHaveBeenCalledWith(err);
|
|
});
|
|
|
|
it("captures when sentry is initialized and request user is opted in", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.SENTRY_DSN = "https://test@sentry.io/123";
|
|
await mod.initAnalytics();
|
|
|
|
mockAuthUser.value = { id: "user-1", analyticsEnabled: true };
|
|
dbGetResult.value = { analyticsEnabled: true };
|
|
const fakeRequest = { headers: {} } as Parameters<typeof mod.captureException>[1];
|
|
const err = new Error("opted in error");
|
|
await mod.captureException(err, fakeRequest);
|
|
expect(mockSentryCapture).toHaveBeenCalledWith(err);
|
|
});
|
|
});
|
|
|
|
describe("shutdownAnalytics", () => {
|
|
it("resolves without error when no clients initialized", async () => {
|
|
await expect(mod.shutdownAnalytics()).resolves.toBeUndefined();
|
|
});
|
|
|
|
it("shuts down posthog when initialized", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
await mod.initAnalytics();
|
|
await mod.shutdownAnalytics();
|
|
expect(mockShutdown).toHaveBeenCalled();
|
|
});
|
|
|
|
it("closes sentry when initialized", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.SENTRY_DSN = "https://test@sentry.io/123";
|
|
await mod.initAnalytics();
|
|
await mod.shutdownAnalytics();
|
|
expect(mockSentryClose).toHaveBeenCalledWith(2000);
|
|
});
|
|
});
|
|
|
|
describe("trackEvent", () => {
|
|
it("does nothing when posthogClient is null", async () => {
|
|
const fakeRequest = {} as Parameters<typeof mod.trackEvent>[0];
|
|
await expect(
|
|
mod.trackEvent(fakeRequest, "test_event", { key: "value" }),
|
|
).resolves.toBeUndefined();
|
|
});
|
|
|
|
it("does nothing when ANALYTICS_ENABLED is false", async () => {
|
|
config.ANALYTICS_ENABLED = false;
|
|
const fakeRequest = {} as Parameters<typeof mod.trackEvent>[0];
|
|
await expect(
|
|
mod.trackEvent(fakeRequest, "test_event", { key: "value" }),
|
|
).resolves.toBeUndefined();
|
|
});
|
|
|
|
it("does nothing when request user is not opted in", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
await mod.initAnalytics();
|
|
|
|
mockAuthUser.value = null;
|
|
const fakeRequest = { headers: {} } as Parameters<typeof mod.trackEvent>[0];
|
|
await mod.trackEvent(fakeRequest, "test_event", { key: "value" });
|
|
expect(mockCapture).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("does nothing when ANALYTICS_SAMPLE_RATE is 0", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.ANALYTICS_SAMPLE_RATE = 0;
|
|
await mod.initAnalytics();
|
|
|
|
mockAuthUser.value = { id: "user-1", analyticsEnabled: true };
|
|
dbGetResult.value = { analyticsEnabled: true };
|
|
const fakeRequest = { headers: {} } as Parameters<typeof mod.trackEvent>[0];
|
|
await mod.trackEvent(fakeRequest, "test_event", { key: "value" });
|
|
expect(mockCapture).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("captures event when all conditions are met", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.ANALYTICS_SAMPLE_RATE = 1.0;
|
|
await mod.initAnalytics();
|
|
|
|
mockAuthUser.value = { id: "user-1", analyticsEnabled: true };
|
|
dbGetResult.value = { analyticsEnabled: true };
|
|
const fakeRequest = { headers: {} } as Parameters<typeof mod.trackEvent>[0];
|
|
await mod.trackEvent(fakeRequest, "tool_used", { tool: "resize" });
|
|
expect(mockCapture).toHaveBeenCalledWith({
|
|
distinctId: "unknown",
|
|
event: "tool_used",
|
|
properties: { tool: "resize" },
|
|
});
|
|
});
|
|
|
|
it("uses instance ID from DB when available", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.ANALYTICS_SAMPLE_RATE = 1.0;
|
|
await mod.initAnalytics();
|
|
|
|
dbGetResult.value = { value: "inst-abc-123", analyticsEnabled: true };
|
|
mockAuthUser.value = { id: "user-1", analyticsEnabled: true };
|
|
const fakeRequest = { headers: {} } as Parameters<typeof mod.trackEvent>[0];
|
|
await mod.trackEvent(fakeRequest, "tool_used", { tool: "crop" });
|
|
expect(mockCapture).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
distinctId: "inst-abc-123",
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("allows anonymous users with x-analytics-consent header", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.ANALYTICS_SAMPLE_RATE = 1.0;
|
|
await mod.initAnalytics();
|
|
|
|
mockAuthUser.value = { id: "anonymous" };
|
|
const fakeRequest = {
|
|
headers: { "x-analytics-consent": "true" },
|
|
} as unknown as Parameters<typeof mod.trackEvent>[0];
|
|
await mod.trackEvent(fakeRequest, "test_event", { key: "value" });
|
|
expect(mockCapture).toHaveBeenCalled();
|
|
});
|
|
|
|
it("rejects anonymous users without consent header", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.ANALYTICS_SAMPLE_RATE = 1.0;
|
|
await mod.initAnalytics();
|
|
|
|
mockAuthUser.value = { id: "anonymous" };
|
|
const fakeRequest = {
|
|
headers: {},
|
|
} as unknown as Parameters<typeof mod.trackEvent>[0];
|
|
mod.trackEvent(fakeRequest, "test_event", { key: "value" });
|
|
expect(mockCapture).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("does not throw when capture throws internally", async () => {
|
|
config.ANALYTICS_ENABLED = true;
|
|
config.POSTHOG_API_KEY = "phc_test_key";
|
|
config.ANALYTICS_SAMPLE_RATE = 1.0;
|
|
await mod.initAnalytics();
|
|
|
|
mockCapture.mockImplementationOnce(() => {
|
|
throw new Error("capture failed");
|
|
});
|
|
|
|
mockAuthUser.value = { id: "user-1", analyticsEnabled: true };
|
|
dbGetResult.value = { analyticsEnabled: true };
|
|
const fakeRequest = { headers: {} } as Parameters<typeof mod.trackEvent>[0];
|
|
expect(() => mod.trackEvent(fakeRequest, "test_event", { key: "value" })).not.toThrow();
|
|
});
|
|
});
|