mirror of
https://github.com/snapotter-hq/SnapOtter.git
synced 2026-08-03 07:46:42 +02:00
fix(compress-pdf): land close to the target size, honestly (#522)
Target-size compression had only a coarse DPI lever, so it undershot badly (a 350KB target could land at 216KB) and silently missed unreachable targets. Adds JPEG quality as a second lever (forced re-encode so it bites on JPEG scans), folds both into one monotonic quality axis that target-size binary-searches, reports targetMet honestly in the panel across 21 locales, and flips the tool to async for the extra passes. Quality-mode output sizes shift intentionally (slider now drives JPEG quality at full resolution in its top half).
This commit is contained in:
@@ -8,7 +8,8 @@ import {
|
||||
type TestApp,
|
||||
} from "../../test-server.js";
|
||||
|
||||
const PDF = readFixture(fixtures.document.pdf3);
|
||||
const PDF = readFixture(fixtures.document.pdf3); // text (test-3page.pdf)
|
||||
const SCAN = readFixture(fixtures.document.pdfScanned); // image-heavy ~1MB scan
|
||||
|
||||
let testApp: TestApp;
|
||||
let adminToken: string;
|
||||
@@ -23,9 +24,9 @@ afterAll(async () => {
|
||||
}, 10_000);
|
||||
|
||||
describe.skipIf(!gsAvailable())("compress-pdf (requires gs)", () => {
|
||||
async function run(settings: Record<string, unknown>) {
|
||||
function post(pdf: Buffer, filename: string, settings: Record<string, unknown>) {
|
||||
const { body, contentType } = createMultipartPayload([
|
||||
{ name: "file", filename: "test-3page.pdf", contentType: "application/pdf", content: PDF },
|
||||
{ name: "file", filename, contentType: "application/pdf", content: pdf },
|
||||
{ name: "settings", content: JSON.stringify(settings) },
|
||||
]);
|
||||
return testApp.app.inject({
|
||||
@@ -36,23 +37,60 @@ describe.skipIf(!gsAvailable())("compress-pdf (requires gs)", () => {
|
||||
});
|
||||
}
|
||||
|
||||
async function expectValidPdf(res: Awaited<ReturnType<typeof run>>): Promise<number> {
|
||||
expect(res.statusCode).toBe(200);
|
||||
const envelope = JSON.parse(res.body);
|
||||
expect(envelope.downloadUrl).toBeDefined();
|
||||
const dl = await testApp.app.inject({ method: "GET", url: envelope.downloadUrl });
|
||||
// compress-pdf has executionHint "long": 202 + poll the durable job row. The
|
||||
// completion payload (including targetMet) lands in jobs.progress.result.
|
||||
async function runToCompletion(
|
||||
pdf: Buffer,
|
||||
filename: string,
|
||||
settings: Record<string, unknown>,
|
||||
): Promise<{ size: number; result: Record<string, unknown> }> {
|
||||
const res = await post(pdf, filename, settings);
|
||||
expect(res.statusCode).toBe(202);
|
||||
const { jobId } = JSON.parse(res.body);
|
||||
const { db, schema } = await import("../../../../apps/api/src/db/index.js");
|
||||
const { eq } = await import("drizzle-orm");
|
||||
let row: { status: string; outputRefs: unknown; progress: unknown } | undefined;
|
||||
for (let i = 0; i < 120; i++) {
|
||||
[row] = await db.select().from(schema.jobs).where(eq(schema.jobs.id, jobId));
|
||||
if (row && ["completed", "failed", "canceled"].includes(row.status)) break;
|
||||
await new Promise((r) => setTimeout(r, 500));
|
||||
}
|
||||
expect(row?.status).toBe("completed");
|
||||
const completed = row as { status: string; outputRefs: string[]; progress: unknown };
|
||||
const result = (completed.progress as { result?: Record<string, unknown> }).result ?? {};
|
||||
const outName = completed.outputRefs[0].split("/").pop() as string;
|
||||
const dl = await testApp.app.inject({
|
||||
method: "GET",
|
||||
url: `/api/v1/download/${jobId}/${encodeURIComponent(outName)}`,
|
||||
});
|
||||
expect(dl.statusCode).toBe(200);
|
||||
expect(dl.rawPayload.subarray(0, 5).toString()).toBe("%PDF-");
|
||||
return dl.rawPayload.length;
|
||||
return { size: dl.rawPayload.length, result };
|
||||
}
|
||||
|
||||
it("compresses by quality and returns a valid PDF", async () => {
|
||||
await expectValidPdf(await run({ mode: "quality", quality: 60 }));
|
||||
}, 60_000);
|
||||
it("quality mode: higher quality yields larger-or-equal output", async () => {
|
||||
const lo = await runToCompletion(SCAN, "ocr-scanned.pdf", { mode: "quality", quality: 30 });
|
||||
const hi = await runToCompletion(SCAN, "ocr-scanned.pdf", { mode: "quality", quality: 90 });
|
||||
expect(hi.size).toBeGreaterThanOrEqual(lo.size);
|
||||
}, 120_000);
|
||||
|
||||
it("compresses to a target size (DPI binary search) and returns a valid PDF", async () => {
|
||||
// Output is content-dependent (text PDFs barely shrink), so assert a valid
|
||||
// PDF rather than an exact size; this exercises the binary-search path.
|
||||
await expectValidPdf(await run({ mode: "targetSize", targetSizeKb: 50 }));
|
||||
it("target-size: image PDF lands within [0.80x, 1.0x] of target", async () => {
|
||||
const targetKb = 300;
|
||||
const { size, result } = await runToCompletion(SCAN, "ocr-scanned.pdf", {
|
||||
mode: "targetSize",
|
||||
targetSizeKb: targetKb,
|
||||
});
|
||||
expect(size).toBeLessThanOrEqual(targetKb * 1024);
|
||||
expect(size).toBeGreaterThanOrEqual(targetKb * 1024 * 0.8);
|
||||
expect(result.targetMet).toBe(true);
|
||||
}, 120_000);
|
||||
|
||||
it("target-size: text PDF with tiny target reports targetMet=false and never enlarges", async () => {
|
||||
const { size, result } = await runToCompletion(PDF, "test-3page.pdf", {
|
||||
mode: "targetSize",
|
||||
targetSizeKb: 1,
|
||||
});
|
||||
expect(result.targetMet).toBe(false);
|
||||
expect(size).toBeLessThanOrEqual(PDF.length);
|
||||
}, 120_000);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user