External/SnapOtter
1
0
Fork 0
mirror of https://github.com/snapotter-hq/SnapOtter.git synced 2026-08-03 07:46:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: add exotic format decoding to image composition tool

Browse Source 
The compose route only decoded HEIC/HEIF via ensureSharpCompat, causing
EPS, PSD, BMP, RAW, and other exotic formats to fail with
"Processing failed". Now uses the same full format pipeline as the
tool-factory for both base and overlay buffers.
This commit is contained in:
SnapOtter
2026-05-12 19:41:23 +08:00
parent d3d50c92be
commit 449f5dc97e
3 changed files with 150 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/routes/tools/compose.ts
+27 -4
View File
@@ -6,10 +6,32 @@ import sharp from "sharp";
import { z } from "zod";
import { autoOrient } from "../../lib/auto-orient.js";
import { formatZodErrors } from "../../lib/errors.js";
import { validateImageBuffer } from "../../lib/file-validation.js";
import { sanitizeFilename } from "../../lib/filename.js";
import { ensureSharpCompat } from "../../lib/heic-converter.js";
import { decodeToSharpCompat, needsCliDecode } from "../../lib/format-decoders.js";
import { decodeHeic } from "../../lib/heic-converter.js";
import { decompressSvgz, sanitizeSvg } from "../../lib/svg-sanitize.js";
import { createWorkspace } from "../../lib/workspace.js";
async function decodeBuffer(buffer: Buffer, filename: string): Promise<Buffer> {
const validation = await validateImageBuffer(buffer, filename);
if (!validation.valid) {
throw new Error(`Invalid image: ${validation.reason}`);
}
if (validation.format === "heif") {
buffer = await decodeHeic(buffer);
} else if (needsCliDecode(validation.format)) {
const ext = filename.split(".").pop()?.toLowerCase();
buffer = await decodeToSharpCompat(buffer, validation.format, ext);
} else if (validation.format === "svg") {
buffer = decompressSvgz(buffer);
buffer = sanitizeSvg(buffer);
}
return autoOrient(buffer);
}
const settingsSchema = z.object({
x: z.number().min(0).default(0),
y: z.number().min(0).default(0),
@@ -35,6 +57,7 @@ export function registerCompose(app: FastifyInstance) {
let baseBuffer: Buffer | null = null;
let overlayBuffer: Buffer | null = null;
let filename = "image";
let overlayFilename = "overlay";
let settingsRaw: string | null = null;
try {
@@ -48,6 +71,7 @@ export function registerCompose(app: FastifyInstance) {
const buf = Buffer.concat(chunks);
if (part.fieldname === "overlay") {
overlayBuffer = buf;
overlayFilename = sanitizeFilename(part.filename ?? "overlay");
} else {
baseBuffer = buf;
filename = sanitizeFilename(part.filename ?? "image");
@@ -85,9 +109,8 @@ export function registerCompose(app: FastifyInstance) {
}
try {
// Decode HEIC/HEIF if needed, then normalize EXIF orientation
baseBuffer = await autoOrient(await ensureSharpCompat(baseBuffer));
overlayBuffer = await autoOrient(await ensureSharpCompat(overlayBuffer));
baseBuffer = await decodeBuffer(baseBuffer, filename);
overlayBuffer = await decodeBuffer(overlayBuffer, overlayFilename);
// Apply opacity to overlay if needed
let processedOverlay = overlayBuffer;