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(pipeline): route content-aware resize correctly and improve error messages

Browse Source 
- Route resize steps with contentAware=true to the content-aware-resize
  tool in both single-file and batch pipeline paths
- Update HEIC filename extension to .png after decoding so downstream
  tools don't attempt double-decoding
- Wrap per-step errors with step number and tool name for clarity
  (e.g. "Step 1 (resize): Resize requires width, height, or percentage")
- Show first file's step-level error in batch failure messages
This commit is contained in:
Siddharth Kumar Sah
2026-04-13 17:04:11 +08:00
parent 940638680e
commit cd886f0f82
2 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/src/routes/pipeline.ts
+56 -26
View File
@@ -104,6 +104,9 @@ export async function registerPipelineRoutes(app: FastifyInstance): Promise<void
if (validation.format === "heif") {
try {
fileBuffer = await decodeHeic(fileBuffer);
// Update filename extension to match the decoded format
const ext = filename.match(/\.[^.]+$/)?.[0];
if (ext) filename = filename.slice(0, -ext.length) + ".png";
} catch (err) {
return reply.status(422).send({
error: "Failed to decode HEIC file. Ensure libheif-examples is installed.",
@@ -141,10 +144,17 @@ export async function registerPipelineRoutes(app: FastifyInstance): Promise<void
// Validate all tool IDs exist before starting
for (let i = 0; i < pipeline.steps.length; i++) {
const step = pipeline.steps[i];
const toolConfig = getToolConfig(step.toolId);
// Route content-aware resize to its dedicated tool
const resolvedToolId =
step.toolId === "resize" && step.settings?.contentAware
? "content-aware-resize"
: step.toolId;
const toolConfig = getToolConfig(resolvedToolId);
if (!toolConfig) {
return reply.status(400).send({
error: `Step ${i + 1}: Tool "${step.toolId}" not found`,
error: `Step ${i + 1} (${step.toolId}): Tool not found or not available`,
});
}
@@ -171,32 +181,41 @@ export async function registerPipelineRoutes(app: FastifyInstance): Promise<void
try {
for (let i = 0; i < pipeline.steps.length; i++) {
const step = pipeline.steps[i];
const toolConfig = getToolConfig(step.toolId);
// Route content-aware resize to its dedicated tool
const resolvedToolId =
step.toolId === "resize" && step.settings?.contentAware
? "content-aware-resize"
: step.toolId;
const toolConfig = getToolConfig(resolvedToolId);
if (!toolConfig) {
return reply
.status(400)
.send({ error: `Step ${i + 1}: Tool "${step.toolId}" not found` });
return reply.status(400).send({
error: `Step ${i + 1} (${step.toolId}): Tool not found or not available`,
});
}
// Parse settings through the schema to apply defaults
const settings = toolConfig.settingsSchema.parse(step.settings);
try {
const settings = toolConfig.settingsSchema.parse(step.settings);
const result = await toolConfig.process(currentBuffer, settings, currentFilename);
const result = await toolConfig.process(currentBuffer, settings, currentFilename);
stepResults.push({
step: i + 1,
toolId: step.toolId,
size: result.buffer.length,
});
stepResults.push({
step: i + 1,
toolId: step.toolId,
size: result.buffer.length,
});
currentBuffer = result.buffer;
currentFilename = result.filename;
currentBuffer = result.buffer;
currentFilename = result.filename;
} catch (stepErr) {
const msg = stepErr instanceof Error ? stepErr.message : "Processing failed";
throw new Error(`Step ${i + 1} (${step.toolId}): ${msg}`);
}
}
} catch (err) {
const message = err instanceof Error ? err.message : "Pipeline processing failed";
return reply.status(422).send({
error: "Pipeline processing failed",
details: message,
error: message,
completedSteps: stepResults,
});
}
@@ -503,16 +522,27 @@ export async function registerPipelineRoutes(app: FastifyInstance): Promise<void
// Run through all pipeline steps sequentially
for (let i = 0; i < pipeline.steps.length; i++) {
const step = pipeline.steps[i];
const toolConfig = getToolConfig(step.toolId);
// Route content-aware resize to its dedicated tool
const resolvedToolId =
step.toolId === "resize" && step.settings?.contentAware
? "content-aware-resize"
: step.toolId;
const toolConfig = getToolConfig(resolvedToolId);
if (!toolConfig) {
throw new Error(`Step ${i + 1}: Tool "${step.toolId}" not found`);
throw new Error(`Step ${i + 1} (${step.toolId}): Tool not found or not available`);
}
const settings = toolConfig.settingsSchema.parse(step.settings);
const result = await toolConfig.process(currentBuffer, settings, currentFilename);
currentBuffer = result.buffer;
currentFilename = result.filename;
try {
const settings = toolConfig.settingsSchema.parse(step.settings);
const result = await toolConfig.process(currentBuffer, settings, currentFilename);
currentBuffer = result.buffer;
currentFilename = result.filename;
} catch (stepErr) {
const msg = stepErr instanceof Error ? stepErr.message : "Processing failed";
throw new Error(`Step ${i + 1} (${step.toolId}): ${msg}`);
}
}
results[index] = { buffer: currentBuffer, filename: currentFilename };
apps/web/src/hooks/use-pipeline-processor.ts
+12 -3
View File
@@ -265,9 +265,18 @@ export function usePipelineProcessor() {
let errorMsg: string;
try {
const body = JSON.parse(text);
errorMsg = body.details
? `${body.error}: ${body.details}`
: body.error || `Batch processing failed: ${response.status}`;
if (body.errors && Array.isArray(body.errors) && body.errors.length > 0) {
// Show the first file's step-level error (all files typically fail at the same step)
const first = body.errors[0];
errorMsg = first.error;
if (body.errors.length > 1) {
errorMsg += ` (${body.errors.length} files failed)`;
}
} else {
errorMsg = body.details
? `${body.error}: ${body.details}`
: body.error || `Batch processing failed: ${response.status}`;
}
} catch {
errorMsg = `Batch processing failed: ${response.status}`;
}