fix: fall back to Sharp when CLI decoders are unavailable

DNG and FITS previews showed "Preview not available" because their CLI
decoders (ExifTool/ImageMagick) were not installed. Sharp can read both
formats natively (DNG is TIFF-based, FITS via libvips fitsload).

Added Sharp fallback to the preview endpoint, batch processing, and
tool factory: when decodeToSharpCompat throws, try sharp(buffer).metadata()
before returning 422. If Sharp can read the buffer, processing continues
without the CLI decoder.
This commit is contained in:
SnapOtter
2026-05-11 18:00:59 +08:00
parent 7d9612784e
commit 2acf0ea48a
3 changed files with 36 additions and 16 deletions
+6 -1
View File
@@ -13,6 +13,7 @@ import { getBundleForTool, TOOL_BUNDLE_MAP } from "@snapotter/shared";
import archiver from "archiver"; import archiver from "archiver";
import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify"; import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
import PQueue from "p-queue"; import PQueue from "p-queue";
import sharp from "sharp";
import { env } from "../config.js"; import { env } from "../config.js";
import { autoOrient } from "../lib/auto-orient.js"; import { autoOrient } from "../lib/auto-orient.js";
import { resolveConcurrency } from "../lib/env.js"; import { resolveConcurrency } from "../lib/env.js";
@@ -169,7 +170,11 @@ export async function registerBatchRoutes(app: FastifyInstance): Promise<void> {
if (ext) processFilename = `${processFilename.slice(0, -ext.length)}.png`; if (ext) processFilename = `${processFilename.slice(0, -ext.length)}.png`;
} }
if (!skipPreprocess && needsCliDecode(validation.format)) { if (!skipPreprocess && needsCliDecode(validation.format)) {
processBuffer = await decodeToSharpCompat(processBuffer, validation.format); try {
processBuffer = await decodeToSharpCompat(processBuffer, validation.format);
} catch {
await sharp(processBuffer).metadata();
}
const ext = processFilename.match(/\.[^.]+$/)?.[0]; const ext = processFilename.match(/\.[^.]+$/)?.[0];
if (ext) processFilename = `${processFilename.slice(0, -ext.length)}.png`; if (ext) processFilename = `${processFilename.slice(0, -ext.length)}.png`;
} }
+19 -8
View File
@@ -156,17 +156,28 @@ export async function fileRoutes(app: FastifyInstance): Promise<void> {
try { try {
buffer = await decodeToSharpCompat(buffer, validation.format); buffer = await decodeToSharpCompat(buffer, validation.format);
} catch { } catch {
return reply.status(422).send({ // CLI decoder unavailable -- try Sharp directly as fallback for preview
error: `Failed to decode ${validation.format.toUpperCase()} file`, try {
}); await sharp(buffer).metadata();
} catch {
return reply.status(422).send({
error: `Failed to decode ${validation.format.toUpperCase()} file`,
});
}
} }
} }
const webp = await sharp(buffer) try {
.resize(1200, 1200, { fit: "inside", withoutEnlargement: true }) const webp = await sharp(buffer)
.webp({ quality: 80 }) .resize(1200, 1200, { fit: "inside", withoutEnlargement: true })
.toBuffer(); .webp({ quality: 80 })
return reply.header("Content-Type", "image/webp").send(webp); .toBuffer();
return reply.header("Content-Type", "image/webp").send(webp);
} catch {
return reply.status(422).send({
error: `Failed to generate preview for ${validation.format.toUpperCase()} file`,
});
}
}); });
} }
+11 -7
View File
@@ -198,14 +198,18 @@ export function createToolRoute<T>(app: FastifyInstance, config: ToolRouteConfig
try { try {
const fileExt = filename.split(".").pop()?.toLowerCase(); const fileExt = filename.split(".").pop()?.toLowerCase();
fileBuffer = await decodeToSharpCompat(fileBuffer, validation.format, fileExt); fileBuffer = await decodeToSharpCompat(fileBuffer, validation.format, fileExt);
const ext = filename.match(/\.[^.]+$/)?.[0]; } catch {
if (ext) filename = `${filename.slice(0, -ext.length)}.png`; try {
} catch (err) { await sharp(fileBuffer).metadata();
return reply.status(422).send({ } catch (err) {
error: `Failed to decode ${validation.format.toUpperCase()} file`, return reply.status(422).send({
details: err instanceof Error ? err.message : String(err), error: `Failed to decode ${validation.format.toUpperCase()} file`,
}); details: err instanceof Error ? err.message : String(err),
});
}
} }
const ext = filename.match(/\.[^.]+$/)?.[0];
if (ext) filename = `${filename.slice(0, -ext.length)}.png`;
} }
// Sanitize SVG input to prevent XXE, SSRF, and script injection // Sanitize SVG input to prevent XXE, SSRF, and script injection