WildDragonLLC/dragonflight
1
0
Fork 0
Code Issues 32 Pull requests 7 Projects Releases Packages Wiki Activity Actions

fix(conform): mark asset error on failure; scope asset lookup by project_id (issue #94 bugs 1, 9)

Browse source
This commit is contained in:
Zac Gaetano 2026-05-26 07:35:13 -04:00
parent a0b7b42524
commit bec64e668d
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
services/worker/src/workers/conform.js
View file

@ -127,10 +127,30 @@ export const conformWorker = async (job) => {
await job.updateProgress(Math.min(5 + (processedEdits / edits.length) * 50, 55)); await job.updateProgress(Math.min(5 + (processedEdits / edits.length) * 50, 55));
console.log(`[conform] Processing edit ${edit.editNumber}: ${edit.reelName}`); console.log(`[conform] Processing edit ${edit.editNumber}: ${edit.reelName}`);
const assetRes = await query( // BUG FIX #9: Scope asset lookup by project_id to prevent cross-project
'SELECT id, original_s3_key FROM assets WHERE filename = $1 LIMIT 1', // collisions when two projects contain assets with the same filename.
[edit.reelName] let assetRes;
); if (projectId) {
assetRes = await query(
`SELECT id, original_s3_key FROM assets
WHERE filename = $1 AND project_id = $2
LIMIT 1`,
[edit.reelName, projectId]
);
// Fall back to unscoped lookup if no match in the current project
// (EDL reel names may reference assets not yet assigned to a project)
if (assetRes.rows.length === 0) {
assetRes = await query(
'SELECT id, original_s3_key FROM assets WHERE filename = $1 LIMIT 1',
[edit.reelName]
);
}
} else {
assetRes = await query(
'SELECT id, original_s3_key FROM assets WHERE filename = $1 LIMIT 1',
[edit.reelName]
);
}
if (assetRes.rows.length === 0) { if (assetRes.rows.length === 0) {
throw new Error(`Asset not found for reel: ${edit.reelName}`); throw new Error(`Asset not found for reel: ${edit.reelName}`);
@ -201,6 +221,15 @@ export const conformWorker = async (job) => {
} catch (error) { } catch (error) {
console.error(`[conform] Error in job ${jobId}:`, error); console.error(`[conform] Error in job ${jobId}:`, error);
// BUG FIX #1: Mark the output asset (if any) as 'error' so the UI doesn't
// show a perpetually-spinning 'processing' state when the conform fails.
// We don't have an assetId until the INSERT succeeds, so target by job key.
await query(
`UPDATE assets
SET status = 'error', updated_at = NOW()
WHERE original_s3_key = $1`,
[`jobs/${jobId}/conformed.mp4`]
).catch(e => console.error('[conform] Failed to mark asset error:', e.message));
throw error; throw error;
} finally { } finally {
await Promise.all([ await Promise.all([