From 440b50340f6357bd41ab4168db5666065d975b4c Mon Sep 17 00:00:00 2001 From: Varun Date: Fri, 3 Apr 2026 20:26:56 +0530 Subject: [PATCH] fix: reset stuck items on resume, validate platform, move ensurePowerToolsTag to setup, safe JSON.parse Co-Authored-By: Claude Sonnet 4.6 --- src/pages/api/import-jobs/index.ts | 7 +++++++ src/pages/assets/import-shared.tsx | 7 ++++++- .../import/processors/immich-shared-link.ts | 20 +++++++++++-------- src/workers/import/runner.ts | 17 +++++++++++++++- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/pages/api/import-jobs/index.ts b/src/pages/api/import-jobs/index.ts index 10084bf..a1dfe0e 100644 --- a/src/pages/api/import-jobs/index.ts +++ b/src/pages/api/import-jobs/index.ts @@ -4,6 +4,7 @@ import { importJobs, importJobItems } from "@/db/schema"; import { getCurrentUser } from "@/handlers/serverUtils/user.utils"; import { getUserHeaders } from "@/helpers/user.helper"; import { runImportJob } from "@/workers/import/runner"; +import { getProcessor } from "@/workers/import/registry"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { if (req.method !== "POST") { @@ -24,6 +25,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) return res.status(400).json({ error: "Each asset must have a string id" }); } + try { + getProcessor(platform); + } catch { + return res.status(400).json({ error: `Unknown platform: ${platform}` }); + } + const [job] = await appDb .insert(importJobs) .values({ diff --git a/src/pages/assets/import-shared.tsx b/src/pages/assets/import-shared.tsx index 00dacf5..34988a7 100644 --- a/src/pages/assets/import-shared.tsx +++ b/src/pages/assets/import-shared.tsx @@ -209,7 +209,12 @@ export default function ImportSharedPage() { setImportAllLoading(false); setImportAllDialogOpen(false); - const importData = JSON.parse(job.importData); + let importData: Record = {}; + try { + importData = JSON.parse(job.importData); + } catch { + // malformed importData — skip album name append + } const failedCount = job.failedCount; const skippedCount = job.skippedCount; const uploadedCount = job.uploadedCount; diff --git a/src/workers/import/processors/immich-shared-link.ts b/src/workers/import/processors/immich-shared-link.ts index c944ace..e3eb9a3 100644 --- a/src/workers/import/processors/immich-shared-link.ts +++ b/src/workers/import/processors/immich-shared-link.ts @@ -285,11 +285,12 @@ export class ImmichSharedLinkProcessor implements ImportProcessor { albumId = albumOptions.addToAlbumId.trim(); } - return { - skipAssetIds, - albumId, - importDataPatch: albumId ? { albumId } : undefined, - }; + const tag = await ensurePowerToolsTag({ ...context.headers, "Content-Type": "application/json" } as HeadersRecord); + const importDataPatch: Record = {}; + if (albumId) importDataPatch.albumId = albumId; + importDataPatch.tagId = tag.id; + + return { skipAssetIds, albumId, importDataPatch }; } async processItem( @@ -332,9 +333,12 @@ export class ImmichSharedLinkProcessor implements ImportProcessor { // Strip Content-Type for multipart upload (same pattern as upload-all.ts) const { ["Content-Type"]: _omit, ...uploadHeaders } = headers; - // Ensure the power-tools tag exists and upload - const tag = await ensurePowerToolsTag(headers); - const immichId = await uploadAssetBuffer(asset, downloaded, uploadHeaders, headers, tag.id); + // Read tagId from importData set during setup() + const importData = JSON.parse(job.importData) as { albumId?: string; tagId?: string }; + const tagId = importData.tagId; + if (!tagId) throw new Error("tagId missing from job importData — setup() may not have completed"); + + const immichId = await uploadAssetBuffer(asset, downloaded, uploadHeaders as HeadersRecord, headers as HeadersRecord, tagId); // Add to album if one was resolved during setup if (context.albumId) { diff --git a/src/workers/import/runner.ts b/src/workers/import/runner.ts index 3cd9a98..476b38b 100644 --- a/src/workers/import/runner.ts +++ b/src/workers/import/runner.ts @@ -21,10 +21,25 @@ export async function getJobItems(jobId: string) { } export async function resumePendingJobs() { - // Reset jobs that were mid-flight when the server last crashed. + // Reset any jobs stuck in 'processing' from a previous crashed run. // We cannot restart workers here — no auth headers are available at boot. // Workers restart automatically when the polling endpoint (GET /api/import-jobs/[jobId]) // detects a pending job with no active worker. + + // First reset stuck items (must happen before the job status reset) + const stuckJobs = await appDb + .select({ id: importJobs.id }) + .from(importJobs) + .where(eq(importJobs.status, "processing")); + + if (stuckJobs.length > 0) { + const stuckJobIds = stuckJobs.map((j) => j.id); + await appDb + .update(importJobItems) + .set({ status: "pending" }) + .where(and(inArray(importJobItems.jobId, stuckJobIds), eq(importJobItems.status, "processing"))); + } + await appDb .update(importJobs) .set({ status: "pending" })