@inoo-ch/payload-image-optimizer 1.3.9 → 1.4.1

package/dist/endpoints/regenerate.js

@@ -1,3 +1,4 @@
+import { waitUntil } from '../utilities/waitUntil.js';
 export const createRegenerateHandler = (resolvedConfig)=>{
     const handler = async (req)=>{
         if (!req.user) {
@@ -76,15 +77,17 @@ export const createRegenerateHandler = (resolvedConfig)=>{
             page++;
         }
         req.payload.logger.info(`Image optimizer: queued ${queued} images from '${collectionSlug}' for regeneration`);
-        // Fire the job runner (non-blocking)
+        // Fire the job runner — use waitUntil to keep the serverless function alive
+        // after the response is sent, so jobs actually complete on Vercel/serverless.
         if (queued > 0) {
-            req.payload.jobs.run({
+            const runPromise = req.payload.jobs.run({
                 limit: queued
             }).catch((err)=>{
                 req.payload.logger.error({
                     err
                 }, 'Regeneration job runner failed');
             });
+            waitUntil(runPromise, req);
         }
         return Response.json({
             queued,

package/dist/endpoints/regenerate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/endpoints/regenerate.ts"],"sourcesContent":["import type { PayloadHandler } from 'payload'\nimport type { CollectionSlug, Where } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\n\nexport const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    let body: { collectionSlug?: string; force?: boolean }\n    try {\n      body = await req.json!()\n    } catch {\n      body = {}\n    }\n\n    const collectionSlug = body.collectionSlug\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json(\n        { error: 'Invalid or unconfigured collection slug' },\n        { status: 400 },\n      )\n    }\n\n    // Find all image documents in the collection\n    // Unless force=true, skip already-processed docs\n    const where: Where = body.force\n      ? { mimeType: { contains: 'image/' } }\n      : {\n          and: [\n            { mimeType: { contains: 'image/' } },\n            {\n              or: [\n                { 'imageOptimizer.status': { not_equals: 'complete' } },\n                { 'imageOptimizer.status': { exists: false } },\n              ],\n            },\n          ],\n        }\n\n    let queued = 0\n    let page = 1\n    let hasMore = true\n\n    while (hasMore) {\n      const result = await req.payload.find({\n        collection: collectionSlug as CollectionSlug,\n        limit: 50,\n        page,\n        depth: 0,\n        where,\n        sort: 'createdAt',\n      })\n\n      for (const doc of result.docs) {\n        await req.payload.jobs.queue({\n          task: 'imageOptimizer_regenerateDocument',\n          input: {\n            collectionSlug,\n            docId: String(doc.id),\n          },\n        })\n        queued++\n      }\n\n      hasMore = result.hasNextPage\n      page++\n    }\n\n    req.payload.logger.info(`Image optimizer: queued ${queued} images from '${collectionSlug}' for regeneration`)\n\n    // Fire the job runner (non-blocking)\n    if (queued > 0) {\n      req.payload.jobs.run({ limit: queued }).catch((err: unknown) => {\n        req.payload.logger.error({ err }, 'Regeneration job runner failed')\n      })\n    }\n\n    return Response.json({ queued, collectionSlug })\n  }\n\n  return handler\n}\n\nexport const createRegenerateStatusHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    const url = new URL(req.url!)\n    const collectionSlug = url.searchParams.get('collection')\n\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json({ error: 'Invalid collection slug' }, { status: 400 })\n    }\n\n    const total = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: { mimeType: { contains: 'image/' } },\n    })\n\n    const complete = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'complete' },\n      },\n    })\n\n    const errored = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'error' },\n      },\n    })\n\n    return Response.json({\n      collectionSlug,\n      total: total.totalDocs,\n      complete: complete.totalDocs,\n      errored: errored.totalDocs,\n      pending: total.totalDocs - complete.totalDocs - errored.totalDocs,\n    })\n  }\n\n  return handler\n}\n"],"names":["createRegenerateHandler","resolvedConfig","handler","req","user","Response","json","error","status","body","collectionSlug","collections","where","force","mimeType","contains","and","or","not_equals","exists","queued","page","hasMore","result","payload","find","collection","limit","depth","sort","doc","docs","jobs","queue","task","input","docId","String","id","hasNextPage","logger","info","run","catch","err","createRegenerateStatusHandler","url","URL","searchParams","get","total","count","complete","equals","errored","totalDocs","pending"],"mappings":"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"}
+{"version":3,"sources":["../../src/endpoints/regenerate.ts"],"sourcesContent":["import type { PayloadHandler } from 'payload'\nimport type { CollectionSlug, Where } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { waitUntil } from '../utilities/waitUntil.js'\n\nexport const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    let body: { collectionSlug?: string; force?: boolean }\n    try {\n      body = await req.json!()\n    } catch {\n      body = {}\n    }\n\n    const collectionSlug = body.collectionSlug\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json(\n        { error: 'Invalid or unconfigured collection slug' },\n        { status: 400 },\n      )\n    }\n\n    // Find all image documents in the collection\n    // Unless force=true, skip already-processed docs\n    const where: Where = body.force\n      ? { mimeType: { contains: 'image/' } }\n      : {\n          and: [\n            { mimeType: { contains: 'image/' } },\n            {\n              or: [\n                { 'imageOptimizer.status': { not_equals: 'complete' } },\n                { 'imageOptimizer.status': { exists: false } },\n              ],\n            },\n          ],\n        }\n\n    let queued = 0\n    let page = 1\n    let hasMore = true\n\n    while (hasMore) {\n      const result = await req.payload.find({\n        collection: collectionSlug as CollectionSlug,\n        limit: 50,\n        page,\n        depth: 0,\n        where,\n        sort: 'createdAt',\n      })\n\n      for (const doc of result.docs) {\n        await req.payload.jobs.queue({\n          task: 'imageOptimizer_regenerateDocument',\n          input: {\n            collectionSlug,\n            docId: String(doc.id),\n          },\n        })\n        queued++\n      }\n\n      hasMore = result.hasNextPage\n      page++\n    }\n\n    req.payload.logger.info(`Image optimizer: queued ${queued} images from '${collectionSlug}' for regeneration`)\n\n    // Fire the job runner — use waitUntil to keep the serverless function alive\n    // after the response is sent, so jobs actually complete on Vercel/serverless.\n    if (queued > 0) {\n      const runPromise = req.payload.jobs.run({ limit: queued }).catch((err: unknown) => {\n        req.payload.logger.error({ err }, 'Regeneration job runner failed')\n      })\n      waitUntil(runPromise, req)\n    }\n\n    return Response.json({ queued, collectionSlug })\n  }\n\n  return handler\n}\n\nexport const createRegenerateStatusHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  const handler: PayloadHandler = async (req) => {\n    if (!req.user) {\n      return Response.json({ error: 'Unauthorized' }, { status: 401 })\n    }\n\n    const url = new URL(req.url!)\n    const collectionSlug = url.searchParams.get('collection')\n\n    if (!collectionSlug || !resolvedConfig.collections[collectionSlug as CollectionSlug]) {\n      return Response.json({ error: 'Invalid collection slug' }, { status: 400 })\n    }\n\n    const total = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: { mimeType: { contains: 'image/' } },\n    })\n\n    const complete = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'complete' },\n      },\n    })\n\n    const errored = await req.payload.count({\n      collection: collectionSlug as CollectionSlug,\n      where: {\n        mimeType: { contains: 'image/' },\n        'imageOptimizer.status': { equals: 'error' },\n      },\n    })\n\n    return Response.json({\n      collectionSlug,\n      total: total.totalDocs,\n      complete: complete.totalDocs,\n      errored: errored.totalDocs,\n      pending: total.totalDocs - complete.totalDocs - errored.totalDocs,\n    })\n  }\n\n  return handler\n}\n"],"names":["waitUntil","createRegenerateHandler","resolvedConfig","handler","req","user","Response","json","error","status","body","collectionSlug","collections","where","force","mimeType","contains","and","or","not_equals","exists","queued","page","hasMore","result","payload","find","collection","limit","depth","sort","doc","docs","jobs","queue","task","input","docId","String","id","hasNextPage","logger","info","runPromise","run","catch","err","createRegenerateStatusHandler","url","URL","searchParams","get","total","count","complete","equals","errored","totalDocs","pending"],"mappings":"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"}

package/dist/hooks/afterChange.js

@@ -2,6 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { resolveStaticDir } from '../utilities/resolveStaticDir.js';
 import { isCloudStorage } from '../utilities/storage.js';
+import { waitUntil } from '../utilities/waitUntil.js';
 export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
     return async ({ context, doc, req })=>{
         if (context?.imageOptimizer_skip) return doc;
@@ -47,11 +48,12 @@ export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
                 docId: String(doc.id)
             }
         });
-        req.payload.jobs.run().catch((err)=>{
+        const runPromise = req.payload.jobs.run().catch((err)=>{
             req.payload.logger.error({
                 err
             }, 'Image optimizer job runner failed');
         });
+        waitUntil(runPromise, req);
         return doc;
     };
 };

package/dist/hooks/afterChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/afterChange.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\nimport type { CollectionAfterChangeHook } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { isCloudStorage } from '../utilities/storage.js'\n\nexport const createAfterChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionAfterChangeHook => {\n  return async ({ context, doc, req }) => {\n    if (context?.imageOptimizer_skip) return doc\n\n    // Use context flag from beforeChange instead of checking req.file.data directly.\n    // Cloud storage adapters may consume req.file.data in their own afterChange hook\n    // before ours runs, which would cause this guard to bail out and leave status as 'pending'.\n    if (!context?.imageOptimizer_hasUpload) return doc\n\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const cloudStorage = isCloudStorage(collectionConfig)\n\n    // When using local storage, overwrite the file on disk with the processed buffer.\n    // Payload's uploadFiles step writes the original buffer; we replace it here.\n    // When using cloud storage, skip — the cloud adapter's afterChange hook already\n    // uploads the correct buffer from req.file.data (set in our beforeChange hook).\n    if (!cloudStorage) {\n      const staticDir = resolveStaticDir(collectionConfig)\n      const processedBuffer = context.imageOptimizer_processedBuffer as Buffer | undefined\n      if (processedBuffer && doc.filename && staticDir) {\n        const safeFilename = path.basename(doc.filename as string)\n        const filePath = path.join(staticDir, safeFilename)\n        await fs.writeFile(filePath, processedBuffer)\n\n        // If replaceOriginal changed the filename, clean up the old file Payload wrote\n        const originalFilename = context.imageOptimizer_originalFilename as string | undefined\n        if (originalFilename && originalFilename !== safeFilename) {\n          const oldFilePath = path.join(staticDir, path.basename(originalFilename))\n          await fs.unlink(oldFilePath).catch(() => {\n            // Old file may not exist if Payload used the new filename\n          })\n        }\n      }\n    }\n\n    // When status was already resolved in beforeChange (cloud storage, or\n    // replaceOriginal with a single format), no async job or update is needed.\n    // This avoids a separate update() call that fails with 404 on MongoDB due to\n    // transaction isolation when cloud storage adapters are involved.\n    if (context?.imageOptimizer_statusResolved) {\n      return doc\n    }\n\n    // Queue async format conversion job for remaining variants (local storage only)\n    await req.payload.jobs.queue({\n      task: 'imageOptimizer_convertFormats',\n      input: {\n        collectionSlug,\n        docId: String(doc.id),\n      },\n    })\n\n    req.payload.jobs.run().catch((err: unknown) => {\n      req.payload.logger.error({ err }, 'Image optimizer job runner failed')\n    })\n\n    return doc\n  }\n}\n"],"names":["fs","path","resolveStaticDir","isCloudStorage","createAfterChangeHook","resolvedConfig","collectionSlug","context","doc","req","imageOptimizer_skip","imageOptimizer_hasUpload","collectionConfig","payload","collections","config","cloudStorage","staticDir","processedBuffer","imageOptimizer_processedBuffer","filename","safeFilename","basename","filePath","join","writeFile","originalFilename","imageOptimizer_originalFilename","oldFilePath","unlink","catch","imageOptimizer_statusResolved","jobs","queue","task","input","docId","String","id","run","err","logger","error"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAIvB,SAASC,gBAAgB,QAAQ,mCAAkC;AACnE,SAASC,cAAc,QAAQ,0BAAyB;AAExD,OAAO,MAAMC,wBAAwB,CACnCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAE;QACjC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,iFAAiF;QACjF,iFAAiF;QACjF,4FAA4F;QAC5F,IAAI,CAACD,SAASI,0BAA0B,OAAOH;QAE/C,MAAMI,mBAAmBH,IAAII,OAAO,CAACC,WAAW,CAACR,eAAuD,CAACS,MAAM;QAC/G,MAAMC,eAAeb,eAAeS;QAEpC,kFAAkF;QAClF,6EAA6E;QAC7E,gFAAgF;QAChF,gFAAgF;QAChF,IAAI,CAACI,cAAc;YACjB,MAAMC,YAAYf,iBAAiBU;YACnC,MAAMM,kBAAkBX,QAAQY,8BAA8B;YAC9D,IAAID,mBAAmBV,IAAIY,QAAQ,IAAIH,WAAW;gBAChD,MAAMI,eAAepB,KAAKqB,QAAQ,CAACd,IAAIY,QAAQ;gBAC/C,MAAMG,WAAWtB,KAAKuB,IAAI,CAACP,WAAWI;gBACtC,MAAMrB,GAAGyB,SAAS,CAACF,UAAUL;gBAE7B,+EAA+E;gBAC/E,MAAMQ,mBAAmBnB,QAAQoB,+BAA+B;gBAChE,IAAID,oBAAoBA,qBAAqBL,cAAc;oBACzD,MAAMO,cAAc3B,KAAKuB,IAAI,CAACP,WAAWhB,KAAKqB,QAAQ,CAACI;oBACvD,MAAM1B,GAAG6B,MAAM,CAACD,aAAaE,KAAK,CAAC;oBACjC,0DAA0D;oBAC5D;gBACF;YACF;QACF;QAEA,sEAAsE;QACtE,2EAA2E;QAC3E,6EAA6E;QAC7E,kEAAkE;QAClE,IAAIvB,SAASwB,+BAA+B;YAC1C,OAAOvB;QACT;QAEA,gFAAgF;QAChF,MAAMC,IAAII,OAAO,CAACmB,IAAI,CAACC,KAAK,CAAC;YAC3BC,MAAM;YACNC,OAAO;gBACL7B;gBACA8B,OAAOC,OAAO7B,IAAI8B,EAAE;YACtB;QACF;QAEA7B,IAAII,OAAO,CAACmB,IAAI,CAACO,GAAG,GAAGT,KAAK,CAAC,CAACU;YAC5B/B,IAAII,OAAO,CAAC4B,MAAM,CAACC,KAAK,CAAC;gBAAEF;YAAI,GAAG;QACpC;QAEA,OAAOhC;IACT;AACF,EAAC"}
+{"version":3,"sources":["../../src/hooks/afterChange.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\nimport type { CollectionAfterChangeHook } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { isCloudStorage } from '../utilities/storage.js'\nimport { waitUntil } from '../utilities/waitUntil.js'\n\nexport const createAfterChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionAfterChangeHook => {\n  return async ({ context, doc, req }) => {\n    if (context?.imageOptimizer_skip) return doc\n\n    // Use context flag from beforeChange instead of checking req.file.data directly.\n    // Cloud storage adapters may consume req.file.data in their own afterChange hook\n    // before ours runs, which would cause this guard to bail out and leave status as 'pending'.\n    if (!context?.imageOptimizer_hasUpload) return doc\n\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const cloudStorage = isCloudStorage(collectionConfig)\n\n    // When using local storage, overwrite the file on disk with the processed buffer.\n    // Payload's uploadFiles step writes the original buffer; we replace it here.\n    // When using cloud storage, skip — the cloud adapter's afterChange hook already\n    // uploads the correct buffer from req.file.data (set in our beforeChange hook).\n    if (!cloudStorage) {\n      const staticDir = resolveStaticDir(collectionConfig)\n      const processedBuffer = context.imageOptimizer_processedBuffer as Buffer | undefined\n      if (processedBuffer && doc.filename && staticDir) {\n        const safeFilename = path.basename(doc.filename as string)\n        const filePath = path.join(staticDir, safeFilename)\n        await fs.writeFile(filePath, processedBuffer)\n\n        // If replaceOriginal changed the filename, clean up the old file Payload wrote\n        const originalFilename = context.imageOptimizer_originalFilename as string | undefined\n        if (originalFilename && originalFilename !== safeFilename) {\n          const oldFilePath = path.join(staticDir, path.basename(originalFilename))\n          await fs.unlink(oldFilePath).catch(() => {\n            // Old file may not exist if Payload used the new filename\n          })\n        }\n      }\n    }\n\n    // When status was already resolved in beforeChange (cloud storage, or\n    // replaceOriginal with a single format), no async job or update is needed.\n    // This avoids a separate update() call that fails with 404 on MongoDB due to\n    // transaction isolation when cloud storage adapters are involved.\n    if (context?.imageOptimizer_statusResolved) {\n      return doc\n    }\n\n    // Queue async format conversion job for remaining variants (local storage only)\n    await req.payload.jobs.queue({\n      task: 'imageOptimizer_convertFormats',\n      input: {\n        collectionSlug,\n        docId: String(doc.id),\n      },\n    })\n\n    const runPromise = req.payload.jobs.run().catch((err: unknown) => {\n      req.payload.logger.error({ err }, 'Image optimizer job runner failed')\n    })\n    waitUntil(runPromise, req)\n\n    return doc\n  }\n}\n"],"names":["fs","path","resolveStaticDir","isCloudStorage","waitUntil","createAfterChangeHook","resolvedConfig","collectionSlug","context","doc","req","imageOptimizer_skip","imageOptimizer_hasUpload","collectionConfig","payload","collections","config","cloudStorage","staticDir","processedBuffer","imageOptimizer_processedBuffer","filename","safeFilename","basename","filePath","join","writeFile","originalFilename","imageOptimizer_originalFilename","oldFilePath","unlink","catch","imageOptimizer_statusResolved","jobs","queue","task","input","docId","String","id","runPromise","run","err","logger","error"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAIvB,SAASC,gBAAgB,QAAQ,mCAAkC;AACnE,SAASC,cAAc,QAAQ,0BAAyB;AACxD,SAASC,SAAS,QAAQ,4BAA2B;AAErD,OAAO,MAAMC,wBAAwB,CACnCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAE;QACjC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,iFAAiF;QACjF,iFAAiF;QACjF,4FAA4F;QAC5F,IAAI,CAACD,SAASI,0BAA0B,OAAOH;QAE/C,MAAMI,mBAAmBH,IAAII,OAAO,CAACC,WAAW,CAACR,eAAuD,CAACS,MAAM;QAC/G,MAAMC,eAAed,eAAeU;QAEpC,kFAAkF;QAClF,6EAA6E;QAC7E,gFAAgF;QAChF,gFAAgF;QAChF,IAAI,CAACI,cAAc;YACjB,MAAMC,YAAYhB,iBAAiBW;YACnC,MAAMM,kBAAkBX,QAAQY,8BAA8B;YAC9D,IAAID,mBAAmBV,IAAIY,QAAQ,IAAIH,WAAW;gBAChD,MAAMI,eAAerB,KAAKsB,QAAQ,CAACd,IAAIY,QAAQ;gBAC/C,MAAMG,WAAWvB,KAAKwB,IAAI,CAACP,WAAWI;gBACtC,MAAMtB,GAAG0B,SAAS,CAACF,UAAUL;gBAE7B,+EAA+E;gBAC/E,MAAMQ,mBAAmBnB,QAAQoB,+BAA+B;gBAChE,IAAID,oBAAoBA,qBAAqBL,cAAc;oBACzD,MAAMO,cAAc5B,KAAKwB,IAAI,CAACP,WAAWjB,KAAKsB,QAAQ,CAACI;oBACvD,MAAM3B,GAAG8B,MAAM,CAACD,aAAaE,KAAK,CAAC;oBACjC,0DAA0D;oBAC5D;gBACF;YACF;QACF;QAEA,sEAAsE;QACtE,2EAA2E;QAC3E,6EAA6E;QAC7E,kEAAkE;QAClE,IAAIvB,SAASwB,+BAA+B;YAC1C,OAAOvB;QACT;QAEA,gFAAgF;QAChF,MAAMC,IAAII,OAAO,CAACmB,IAAI,CAACC,KAAK,CAAC;YAC3BC,MAAM;YACNC,OAAO;gBACL7B;gBACA8B,OAAOC,OAAO7B,IAAI8B,EAAE;YACtB;QACF;QAEA,MAAMC,aAAa9B,IAAII,OAAO,CAACmB,IAAI,CAACQ,GAAG,GAAGV,KAAK,CAAC,CAACW;YAC/ChC,IAAII,OAAO,CAAC6B,MAAM,CAACC,KAAK,CAAC;gBAAEF;YAAI,GAAG;QACpC;QACAtC,UAAUoC,YAAY9B;QAEtB,OAAOD;IACT;AACF,EAAC"}

package/dist/hooks/beforeChange.js

@@ -32,7 +32,7 @@ export const createBeforeChangeHook = (resolvedConfig, collectionSlug)=>{
         // when cloud storage adapters are involved.
         const collectionConfig = req.payload.collections[collectionSlug].config;
         const cloudStorage = isCloudStorage(collectionConfig);
-        const needsAsyncJob = !cloudStorage && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1);
+        const needsAsyncJob = !cloudStorage && perCollectionConfig.formats.length > 0 && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1);
         data.imageOptimizer = {
             originalSize,
             optimizedSize: finalSize,

package/dist/hooks/beforeChange.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import path from 'path'\nimport type { CollectionBeforeChangeHook } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { convertFormat, generateThumbHash, stripAndResize } from '../processing/index.js'\nimport { isCloudStorage } from '../utilities/storage.js'\n\nexport const createBeforeChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionBeforeChangeHook => {\n  return async ({ context, data, req }) => {\n    if (context?.imageOptimizer_skip) return data\n\n    if (!req.file || !req.file.data || !req.file.mimetype?.startsWith('image/')) return data\n\n    const originalSize = req.file.data.length\n\n    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)\n\n    // Process in memory: strip EXIF, resize, generate blur\n    const processed = await stripAndResize(\n      req.file.data,\n      perCollectionConfig.maxDimensions,\n      resolvedConfig.stripMetadata,\n    )\n\n    let finalBuffer = processed.buffer\n    let finalSize = processed.size\n\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      // Convert to primary format (first in the formats array)\n      const primaryFormat = perCollectionConfig.formats[0]\n      const converted = await convertFormat(processed.buffer, primaryFormat.format, primaryFormat.quality)\n\n      finalBuffer = converted.buffer\n      finalSize = converted.size\n\n      // Update filename and mimeType so Payload stores the correct metadata\n      const originalFilename = data.filename || req.file.name || ''\n      const newFilename = `${path.parse(originalFilename).name}.${primaryFormat.format}`\n      context.imageOptimizer_originalFilename = originalFilename\n      data.filename = newFilename\n      data.mimeType = converted.mimeType\n      data.filesize = finalSize\n    }\n\n    // Determine if async work (variant generation job) is needed after create.\n    // If not, set status to 'complete' now so afterChange doesn't need a separate\n    // update() call — which fails with 404 on MongoDB due to transaction isolation\n    // when cloud storage adapters are involved.\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const cloudStorage = isCloudStorage(collectionConfig)\n    const needsAsyncJob = !cloudStorage && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1)\n\n    data.imageOptimizer = {\n      originalSize,\n      optimizedSize: finalSize,\n      status: needsAsyncJob ? 'pending' : 'complete',\n      variants: needsAsyncJob ? undefined : [],\n      error: null,\n    }\n\n    if (!needsAsyncJob) {\n      context.imageOptimizer_statusResolved = true\n    }\n\n    if (resolvedConfig.generateThumbHash) {\n      data.imageOptimizer.thumbHash = await generateThumbHash(finalBuffer)\n    }\n\n    // Write processed buffer back to req.file so cloud storage adapters\n    // (which read req.file in their afterChange hook) upload the optimized version.\n    // Payload's own uploadFiles step does NOT re-read req.file.data for its local\n    // disk write, so we also store the buffer in context for our afterChange hook\n    // to overwrite the local file when local storage is enabled.\n    req.file.data = finalBuffer\n    req.file.size = finalSize\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      req.file.name = data.filename\n      req.file.mimetype = data.mimeType\n    }\n    context.imageOptimizer_processedBuffer = finalBuffer\n    context.imageOptimizer_hasUpload = true\n\n    return data\n  }\n}\n"],"names":["path","resolveCollectionConfig","convertFormat","generateThumbHash","stripAndResize","isCloudStorage","createBeforeChangeHook","resolvedConfig","collectionSlug","context","data","req","imageOptimizer_skip","file","mimetype","startsWith","originalSize","length","perCollectionConfig","processed","maxDimensions","stripMetadata","finalBuffer","buffer","finalSize","size","replaceOriginal","formats","primaryFormat","converted","format","quality","originalFilename","filename","name","newFilename","parse","imageOptimizer_originalFilename","mimeType","filesize","collectionConfig","payload","collections","config","cloudStorage","needsAsyncJob","imageOptimizer","optimizedSize","status","variants","undefined","error","imageOptimizer_statusResolved","thumbHash","imageOptimizer_processedBuffer","imageOptimizer_hasUpload"],"mappings":"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"}
+{"version":3,"sources":["../../src/hooks/beforeChange.ts"],"sourcesContent":["import path from 'path'\nimport type { CollectionBeforeChangeHook } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { convertFormat, generateThumbHash, stripAndResize } from '../processing/index.js'\nimport { isCloudStorage } from '../utilities/storage.js'\n\nexport const createBeforeChangeHook = (\n  resolvedConfig: ResolvedImageOptimizerConfig,\n  collectionSlug: string,\n): CollectionBeforeChangeHook => {\n  return async ({ context, data, req }) => {\n    if (context?.imageOptimizer_skip) return data\n\n    if (!req.file || !req.file.data || !req.file.mimetype?.startsWith('image/')) return data\n\n    const originalSize = req.file.data.length\n\n    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)\n\n    // Process in memory: strip EXIF, resize, generate blur\n    const processed = await stripAndResize(\n      req.file.data,\n      perCollectionConfig.maxDimensions,\n      resolvedConfig.stripMetadata,\n    )\n\n    let finalBuffer = processed.buffer\n    let finalSize = processed.size\n\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      // Convert to primary format (first in the formats array)\n      const primaryFormat = perCollectionConfig.formats[0]\n      const converted = await convertFormat(processed.buffer, primaryFormat.format, primaryFormat.quality)\n\n      finalBuffer = converted.buffer\n      finalSize = converted.size\n\n      // Update filename and mimeType so Payload stores the correct metadata\n      const originalFilename = data.filename || req.file.name || ''\n      const newFilename = `${path.parse(originalFilename).name}.${primaryFormat.format}`\n      context.imageOptimizer_originalFilename = originalFilename\n      data.filename = newFilename\n      data.mimeType = converted.mimeType\n      data.filesize = finalSize\n    }\n\n    // Determine if async work (variant generation job) is needed after create.\n    // If not, set status to 'complete' now so afterChange doesn't need a separate\n    // update() call — which fails with 404 on MongoDB due to transaction isolation\n    // when cloud storage adapters are involved.\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const cloudStorage = isCloudStorage(collectionConfig)\n    const needsAsyncJob = !cloudStorage && perCollectionConfig.formats.length > 0 && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1)\n\n    data.imageOptimizer = {\n      originalSize,\n      optimizedSize: finalSize,\n      status: needsAsyncJob ? 'pending' : 'complete',\n      variants: needsAsyncJob ? undefined : [],\n      error: null,\n    }\n\n    if (!needsAsyncJob) {\n      context.imageOptimizer_statusResolved = true\n    }\n\n    if (resolvedConfig.generateThumbHash) {\n      data.imageOptimizer.thumbHash = await generateThumbHash(finalBuffer)\n    }\n\n    // Write processed buffer back to req.file so cloud storage adapters\n    // (which read req.file in their afterChange hook) upload the optimized version.\n    // Payload's own uploadFiles step does NOT re-read req.file.data for its local\n    // disk write, so we also store the buffer in context for our afterChange hook\n    // to overwrite the local file when local storage is enabled.\n    req.file.data = finalBuffer\n    req.file.size = finalSize\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n      req.file.name = data.filename\n      req.file.mimetype = data.mimeType\n    }\n    context.imageOptimizer_processedBuffer = finalBuffer\n    context.imageOptimizer_hasUpload = true\n\n    return data\n  }\n}\n"],"names":["path","resolveCollectionConfig","convertFormat","generateThumbHash","stripAndResize","isCloudStorage","createBeforeChangeHook","resolvedConfig","collectionSlug","context","data","req","imageOptimizer_skip","file","mimetype","startsWith","originalSize","length","perCollectionConfig","processed","maxDimensions","stripMetadata","finalBuffer","buffer","finalSize","size","replaceOriginal","formats","primaryFormat","converted","format","quality","originalFilename","filename","name","newFilename","parse","imageOptimizer_originalFilename","mimeType","filesize","collectionConfig","payload","collections","config","cloudStorage","needsAsyncJob","imageOptimizer","optimizedSize","status","variants","undefined","error","imageOptimizer_statusResolved","thumbHash","imageOptimizer_processedBuffer","imageOptimizer_hasUpload"],"mappings":"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"}

package/dist/tasks/convertFormats.js

@@ -100,7 +100,9 @@ export const createConvertFormatsHandler = (resolvedConfig)=>{
                 });
             } catch (updateErr) {
                 req.payload.logger.error({
-                    err: updateErr
+                    err: updateErr,
+                    docId: input.docId,
+                    collectionSlug: input.collectionSlug
                 }, 'Failed to persist error status for image optimizer');
             }
             throw err;

package/dist/tasks/convertFormats.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/convertFormats.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport type { CollectionSlug } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { convertFormat } from '../processing/index.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { fetchFileBuffer, isCloudStorage } from '../utilities/storage.js'\n\nexport const createConvertFormatsHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  return async ({ input, req }: { input: { collectionSlug: string; docId: string }; req: any }) => {\n    try {\n      const doc = await req.payload.findByID({\n        collection: input.collectionSlug as CollectionSlug,\n        id: input.docId,\n      })\n\n      const collectionConfig = req.payload.collections[input.collectionSlug as keyof typeof req.payload.collections].config\n      const cloudStorage = isCloudStorage(collectionConfig)\n\n      // Cloud storage: variant files cannot be uploaded without direct adapter access.\n      // Mark as complete — CDN-level image optimization handles format conversion.\n      if (cloudStorage) {\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: {\n            imageOptimizer: {\n              ...doc.imageOptimizer,\n              status: 'complete',\n              variants: [],\n              error: null,\n            },\n          },\n          context: { imageOptimizer_skip: true },\n        })\n        return { output: { variantsGenerated: 0 } }\n      }\n\n      const staticDir = resolveStaticDir(collectionConfig)\n      if (!staticDir) {\n        throw new Error(`No staticDir configured for collection \"${input.collectionSlug}\"`)\n      }\n\n      const fileBuffer = await fetchFileBuffer(doc, collectionConfig)\n\n      const variants: Array<{\n        filename: string\n        filesize: number\n        format: string\n        height: number\n        mimeType: string\n        url: string\n        width: number\n      }> = []\n\n      const perCollectionConfig = resolveCollectionConfig(resolvedConfig, input.collectionSlug)\n\n      // When replaceOriginal is on, the main file is already in the primary format —\n      // skip it and only generate variants for the remaining formats.\n      const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0\n        ? perCollectionConfig.formats.slice(1)\n        : perCollectionConfig.formats\n\n      const safeFilename = path.basename(doc.filename)\n\n      for (const format of formatsToGenerate) {\n        const result = await convertFormat(fileBuffer, format.format, format.quality)\n        const variantFilename = `${path.parse(safeFilename).name}-optimized.${format.format}`\n\n        await fs.writeFile(path.join(staticDir, variantFilename), result.buffer)\n\n        variants.push({\n          format: format.format,\n          filename: variantFilename,\n          filesize: result.size,\n          width: result.width,\n          height: result.height,\n          mimeType: result.mimeType,\n          url: `/api/${input.collectionSlug}/file/${variantFilename}`,\n        })\n      }\n\n      await req.payload.update({\n        collection: input.collectionSlug as CollectionSlug,\n        id: input.docId,\n        data: {\n          imageOptimizer: {\n            ...doc.imageOptimizer,\n            status: 'complete',\n            variants,\n            error: null,\n          },\n        },\n        context: { imageOptimizer_skip: true },\n      })\n\n      return { output: { variantsGenerated: variants.length } }\n    } catch (err) {\n      const errorMessage = err instanceof Error ? err.message : String(err)\n\n      try {\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: {\n            imageOptimizer: {\n              status: 'error',\n              error: errorMessage,\n            },\n          },\n          context: { imageOptimizer_skip: true },\n        })\n      } catch (updateErr) {\n        req.payload.logger.error(\n          { err: updateErr },\n          'Failed to persist error status for image optimizer',\n        )\n      }\n\n      throw err\n    }\n  }\n}\n"],"names":["fs","path","resolveCollectionConfig","convertFormat","resolveStaticDir","fetchFileBuffer","isCloudStorage","createConvertFormatsHandler","resolvedConfig","input","req","doc","payload","findByID","collection","collectionSlug","id","docId","collectionConfig","collections","config","cloudStorage","update","data","imageOptimizer","status","variants","error","context","imageOptimizer_skip","output","variantsGenerated","staticDir","Error","fileBuffer","perCollectionConfig","formatsToGenerate","replaceOriginal","formats","length","slice","safeFilename","basename","filename","format","result","quality","variantFilename","parse","name","writeFile","join","buffer","push","filesize","size","width","height","mimeType","url","err","errorMessage","message","String","updateErr","logger"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/convertFormats.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport type { CollectionSlug } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { convertFormat } from '../processing/index.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { fetchFileBuffer, isCloudStorage } from '../utilities/storage.js'\n\nexport const createConvertFormatsHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  return async ({ input, req }: { input: { collectionSlug: string; docId: string }; req: any }) => {\n    try {\n      const doc = await req.payload.findByID({\n        collection: input.collectionSlug as CollectionSlug,\n        id: input.docId,\n      })\n\n      const collectionConfig = req.payload.collections[input.collectionSlug as keyof typeof req.payload.collections].config\n      const cloudStorage = isCloudStorage(collectionConfig)\n\n      // Cloud storage: variant files cannot be uploaded without direct adapter access.\n      // Mark as complete — CDN-level image optimization handles format conversion.\n      if (cloudStorage) {\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: {\n            imageOptimizer: {\n              ...doc.imageOptimizer,\n              status: 'complete',\n              variants: [],\n              error: null,\n            },\n          },\n          context: { imageOptimizer_skip: true },\n        })\n        return { output: { variantsGenerated: 0 } }\n      }\n\n      const staticDir = resolveStaticDir(collectionConfig)\n      if (!staticDir) {\n        throw new Error(`No staticDir configured for collection \"${input.collectionSlug}\"`)\n      }\n\n      const fileBuffer = await fetchFileBuffer(doc, collectionConfig)\n\n      const variants: Array<{\n        filename: string\n        filesize: number\n        format: string\n        height: number\n        mimeType: string\n        url: string\n        width: number\n      }> = []\n\n      const perCollectionConfig = resolveCollectionConfig(resolvedConfig, input.collectionSlug)\n\n      // When replaceOriginal is on, the main file is already in the primary format —\n      // skip it and only generate variants for the remaining formats.\n      const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0\n        ? perCollectionConfig.formats.slice(1)\n        : perCollectionConfig.formats\n\n      const safeFilename = path.basename(doc.filename)\n\n      for (const format of formatsToGenerate) {\n        const result = await convertFormat(fileBuffer, format.format, format.quality)\n        const variantFilename = `${path.parse(safeFilename).name}-optimized.${format.format}`\n\n        await fs.writeFile(path.join(staticDir, variantFilename), result.buffer)\n\n        variants.push({\n          format: format.format,\n          filename: variantFilename,\n          filesize: result.size,\n          width: result.width,\n          height: result.height,\n          mimeType: result.mimeType,\n          url: `/api/${input.collectionSlug}/file/${variantFilename}`,\n        })\n      }\n\n      await req.payload.update({\n        collection: input.collectionSlug as CollectionSlug,\n        id: input.docId,\n        data: {\n          imageOptimizer: {\n            ...doc.imageOptimizer,\n            status: 'complete',\n            variants,\n            error: null,\n          },\n        },\n        context: { imageOptimizer_skip: true },\n      })\n\n      return { output: { variantsGenerated: variants.length } }\n    } catch (err) {\n      const errorMessage = err instanceof Error ? err.message : String(err)\n\n      try {\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: {\n            imageOptimizer: {\n              status: 'error',\n              error: errorMessage,\n            },\n          },\n          context: { imageOptimizer_skip: true },\n        })\n      } catch (updateErr) {\n        req.payload.logger.error(\n          { err: updateErr, docId: input.docId, collectionSlug: input.collectionSlug },\n          'Failed to persist error status for image optimizer',\n        )\n      }\n\n      throw err\n    }\n  }\n}\n"],"names":["fs","path","resolveCollectionConfig","convertFormat","resolveStaticDir","fetchFileBuffer","isCloudStorage","createConvertFormatsHandler","resolvedConfig","input","req","doc","payload","findByID","collection","collectionSlug","id","docId","collectionConfig","collections","config","cloudStorage","update","data","imageOptimizer","status","variants","error","context","imageOptimizer_skip","output","variantsGenerated","staticDir","Error","fileBuffer","perCollectionConfig","formatsToGenerate","replaceOriginal","formats","length","slice","safeFilename","basename","filename","format","result","quality","variantFilename","parse","name","writeFile","join","buffer","push","filesize","size","width","height","mimeType","url","err","errorMessage","message","String","updateErr","logger"],"mappings":"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"}

package/dist/tasks/regenerateDocument.js

@@ -155,7 +155,9 @@ export const createRegenerateDocumentHandler = (resolvedConfig)=>{
                 });
             } catch (updateErr) {
                 req.payload.logger.error({
-                    err: updateErr
+                    err: updateErr,
+                    docId: input.docId,
+                    collectionSlug: input.collectionSlug
                 }, 'Failed to persist error status for image optimizer regeneration');
             }
             throw err;

package/dist/tasks/regenerateDocument.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/regenerateDocument.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport type { CollectionSlug } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { stripAndResize, generateThumbHash, convertFormat } from '../processing/index.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { fetchFileBuffer, isCloudStorage } from '../utilities/storage.js'\n\nexport const createRegenerateDocumentHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  return async ({ input, req }: { input: { collectionSlug: string; docId: string }; req: any }) => {\n    try {\n      const doc = await req.payload.findByID({\n        collection: input.collectionSlug as CollectionSlug,\n        id: input.docId,\n      })\n\n      // Skip non-image documents\n      if (!doc.mimeType || !doc.mimeType.startsWith('image/')) {\n        return { output: { status: 'skipped', reason: 'not-image' } }\n      }\n\n      const collectionConfig = req.payload.collections[input.collectionSlug as keyof typeof req.payload.collections].config\n      const cloudStorage = isCloudStorage(collectionConfig)\n\n      const fileBuffer = await fetchFileBuffer(doc, collectionConfig)\n      const originalSize = fileBuffer.length\n      const perCollectionConfig = resolveCollectionConfig(resolvedConfig, input.collectionSlug)\n\n      // Sanitize filename to prevent path traversal\n      const safeFilename = path.basename(doc.filename)\n\n      // Step 1: Strip metadata + resize\n      const processed = await stripAndResize(\n        fileBuffer,\n        perCollectionConfig.maxDimensions,\n        resolvedConfig.stripMetadata,\n      )\n\n      let mainBuffer = processed.buffer\n      let mainSize = processed.size\n      let newFilename = safeFilename\n      let newMimeType: string | undefined\n\n      // Step 1b: If replaceOriginal, convert main file to primary format\n      if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n        const primaryFormat = perCollectionConfig.formats[0]\n        const converted = await convertFormat(processed.buffer, primaryFormat.format, primaryFormat.quality)\n        mainBuffer = converted.buffer\n        mainSize = converted.size\n        newFilename = `${path.parse(safeFilename).name}.${primaryFormat.format}`\n        newMimeType = converted.mimeType\n      }\n\n      // Step 2: Generate ThumbHash\n      let thumbHash: string | undefined\n      if (resolvedConfig.generateThumbHash) {\n        thumbHash = await generateThumbHash(mainBuffer)\n      }\n\n      // Step 3: Store the optimized file\n      const variants: Array<{\n        filename: string\n        filesize: number\n        format: string\n        height: number\n        mimeType: string\n        url: string\n        width: number\n      }> = []\n\n      if (cloudStorage) {\n        // Cloud storage: re-upload the optimized file via Payload's update API.\n        // This triggers the cloud adapter's afterChange hook which uploads to cloud.\n        const updateData: Record<string, any> = {\n          imageOptimizer: {\n            originalSize,\n            optimizedSize: mainSize,\n            status: 'complete',\n            thumbHash,\n            variants: [],\n            error: null,\n          },\n        }\n\n        if (newFilename !== safeFilename) {\n          updateData.filename = newFilename\n          updateData.filesize = mainSize\n          updateData.mimeType = newMimeType\n        }\n\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: updateData,\n          file: {\n            data: mainBuffer,\n            mimetype: newMimeType || doc.mimeType,\n            name: newFilename,\n            size: mainSize,\n          },\n          context: { imageOptimizer_skip: true },\n        })\n      } else {\n        // Local storage: write files to disk\n        const staticDir = resolveStaticDir(collectionConfig)\n        const newFilePath = path.join(staticDir, newFilename)\n        await fs.writeFile(newFilePath, mainBuffer)\n\n        // Clean up old file if filename changed\n        if (newFilename !== safeFilename) {\n          const oldFilePath = path.join(staticDir, safeFilename)\n          await fs.unlink(oldFilePath).catch(() => {})\n        }\n\n        // Generate variant files (local storage only)\n        const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0\n          ? perCollectionConfig.formats.slice(1)\n          : perCollectionConfig.formats\n\n        for (const format of formatsToGenerate) {\n          const result = await convertFormat(mainBuffer, format.format, format.quality)\n          const variantFilename = `${path.parse(newFilename).name}-optimized.${format.format}`\n          await fs.writeFile(path.join(staticDir, variantFilename), result.buffer)\n\n          variants.push({\n            format: format.format,\n            filename: variantFilename,\n            filesize: result.size,\n            width: result.width,\n            height: result.height,\n            mimeType: result.mimeType,\n            url: `/api/${input.collectionSlug}/file/${variantFilename}`,\n          })\n        }\n\n        // Update the document with optimization data\n        const updateData: Record<string, any> = {\n          imageOptimizer: {\n            originalSize,\n            optimizedSize: mainSize,\n            status: 'complete',\n            thumbHash,\n            variants,\n            error: null,\n          },\n        }\n\n        if (newFilename !== safeFilename) {\n          updateData.filename = newFilename\n          updateData.filesize = mainSize\n          updateData.mimeType = newMimeType\n        }\n\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: updateData,\n          context: { imageOptimizer_skip: true },\n        })\n      }\n\n      return { output: { status: 'complete' } }\n    } catch (err) {\n      const errorMessage = err instanceof Error ? err.message : String(err)\n\n      try {\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: {\n            imageOptimizer: {\n              status: 'error',\n              error: errorMessage,\n            },\n          },\n          context: { imageOptimizer_skip: true },\n        })\n      } catch (updateErr) {\n        req.payload.logger.error(\n          { err: updateErr },\n          'Failed to persist error status for image optimizer regeneration',\n        )\n      }\n\n      throw err\n    }\n  }\n}\n"],"names":["fs","path","resolveCollectionConfig","stripAndResize","generateThumbHash","convertFormat","resolveStaticDir","fetchFileBuffer","isCloudStorage","createRegenerateDocumentHandler","resolvedConfig","input","req","doc","payload","findByID","collection","collectionSlug","id","docId","mimeType","startsWith","output","status","reason","collectionConfig","collections","config","cloudStorage","fileBuffer","originalSize","length","perCollectionConfig","safeFilename","basename","filename","processed","maxDimensions","stripMetadata","mainBuffer","buffer","mainSize","size","newFilename","newMimeType","replaceOriginal","formats","primaryFormat","converted","format","quality","parse","name","thumbHash","variants","updateData","imageOptimizer","optimizedSize","error","filesize","update","data","file","mimetype","context","imageOptimizer_skip","staticDir","newFilePath","join","writeFile","oldFilePath","unlink","catch","formatsToGenerate","slice","result","variantFilename","push","width","height","url","err","errorMessage","Error","message","String","updateErr","logger"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/regenerateDocument.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport type { CollectionSlug } from 'payload'\n\nimport type { ResolvedImageOptimizerConfig } from '../types.js'\nimport { resolveCollectionConfig } from '../defaults.js'\nimport { stripAndResize, generateThumbHash, convertFormat } from '../processing/index.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.js'\nimport { fetchFileBuffer, isCloudStorage } from '../utilities/storage.js'\n\nexport const createRegenerateDocumentHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {\n  return async ({ input, req }: { input: { collectionSlug: string; docId: string }; req: any }) => {\n    try {\n      const doc = await req.payload.findByID({\n        collection: input.collectionSlug as CollectionSlug,\n        id: input.docId,\n      })\n\n      // Skip non-image documents\n      if (!doc.mimeType || !doc.mimeType.startsWith('image/')) {\n        return { output: { status: 'skipped', reason: 'not-image' } }\n      }\n\n      const collectionConfig = req.payload.collections[input.collectionSlug as keyof typeof req.payload.collections].config\n      const cloudStorage = isCloudStorage(collectionConfig)\n\n      const fileBuffer = await fetchFileBuffer(doc, collectionConfig)\n      const originalSize = fileBuffer.length\n      const perCollectionConfig = resolveCollectionConfig(resolvedConfig, input.collectionSlug)\n\n      // Sanitize filename to prevent path traversal\n      const safeFilename = path.basename(doc.filename)\n\n      // Step 1: Strip metadata + resize\n      const processed = await stripAndResize(\n        fileBuffer,\n        perCollectionConfig.maxDimensions,\n        resolvedConfig.stripMetadata,\n      )\n\n      let mainBuffer = processed.buffer\n      let mainSize = processed.size\n      let newFilename = safeFilename\n      let newMimeType: string | undefined\n\n      // Step 1b: If replaceOriginal, convert main file to primary format\n      if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {\n        const primaryFormat = perCollectionConfig.formats[0]\n        const converted = await convertFormat(processed.buffer, primaryFormat.format, primaryFormat.quality)\n        mainBuffer = converted.buffer\n        mainSize = converted.size\n        newFilename = `${path.parse(safeFilename).name}.${primaryFormat.format}`\n        newMimeType = converted.mimeType\n      }\n\n      // Step 2: Generate ThumbHash\n      let thumbHash: string | undefined\n      if (resolvedConfig.generateThumbHash) {\n        thumbHash = await generateThumbHash(mainBuffer)\n      }\n\n      // Step 3: Store the optimized file\n      const variants: Array<{\n        filename: string\n        filesize: number\n        format: string\n        height: number\n        mimeType: string\n        url: string\n        width: number\n      }> = []\n\n      if (cloudStorage) {\n        // Cloud storage: re-upload the optimized file via Payload's update API.\n        // This triggers the cloud adapter's afterChange hook which uploads to cloud.\n        const updateData: Record<string, any> = {\n          imageOptimizer: {\n            originalSize,\n            optimizedSize: mainSize,\n            status: 'complete',\n            thumbHash,\n            variants: [],\n            error: null,\n          },\n        }\n\n        if (newFilename !== safeFilename) {\n          updateData.filename = newFilename\n          updateData.filesize = mainSize\n          updateData.mimeType = newMimeType\n        }\n\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: updateData,\n          file: {\n            data: mainBuffer,\n            mimetype: newMimeType || doc.mimeType,\n            name: newFilename,\n            size: mainSize,\n          },\n          context: { imageOptimizer_skip: true },\n        })\n      } else {\n        // Local storage: write files to disk\n        const staticDir = resolveStaticDir(collectionConfig)\n        const newFilePath = path.join(staticDir, newFilename)\n        await fs.writeFile(newFilePath, mainBuffer)\n\n        // Clean up old file if filename changed\n        if (newFilename !== safeFilename) {\n          const oldFilePath = path.join(staticDir, safeFilename)\n          await fs.unlink(oldFilePath).catch(() => {})\n        }\n\n        // Generate variant files (local storage only)\n        const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0\n          ? perCollectionConfig.formats.slice(1)\n          : perCollectionConfig.formats\n\n        for (const format of formatsToGenerate) {\n          const result = await convertFormat(mainBuffer, format.format, format.quality)\n          const variantFilename = `${path.parse(newFilename).name}-optimized.${format.format}`\n          await fs.writeFile(path.join(staticDir, variantFilename), result.buffer)\n\n          variants.push({\n            format: format.format,\n            filename: variantFilename,\n            filesize: result.size,\n            width: result.width,\n            height: result.height,\n            mimeType: result.mimeType,\n            url: `/api/${input.collectionSlug}/file/${variantFilename}`,\n          })\n        }\n\n        // Update the document with optimization data\n        const updateData: Record<string, any> = {\n          imageOptimizer: {\n            originalSize,\n            optimizedSize: mainSize,\n            status: 'complete',\n            thumbHash,\n            variants,\n            error: null,\n          },\n        }\n\n        if (newFilename !== safeFilename) {\n          updateData.filename = newFilename\n          updateData.filesize = mainSize\n          updateData.mimeType = newMimeType\n        }\n\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: updateData,\n          context: { imageOptimizer_skip: true },\n        })\n      }\n\n      return { output: { status: 'complete' } }\n    } catch (err) {\n      const errorMessage = err instanceof Error ? err.message : String(err)\n\n      try {\n        await req.payload.update({\n          collection: input.collectionSlug as CollectionSlug,\n          id: input.docId,\n          data: {\n            imageOptimizer: {\n              status: 'error',\n              error: errorMessage,\n            },\n          },\n          context: { imageOptimizer_skip: true },\n        })\n      } catch (updateErr) {\n        req.payload.logger.error(\n          { err: updateErr, docId: input.docId, collectionSlug: input.collectionSlug },\n          'Failed to persist error status for image optimizer regeneration',\n        )\n      }\n\n      throw err\n    }\n  }\n}\n"],"names":["fs","path","resolveCollectionConfig","stripAndResize","generateThumbHash","convertFormat","resolveStaticDir","fetchFileBuffer","isCloudStorage","createRegenerateDocumentHandler","resolvedConfig","input","req","doc","payload","findByID","collection","collectionSlug","id","docId","mimeType","startsWith","output","status","reason","collectionConfig","collections","config","cloudStorage","fileBuffer","originalSize","length","perCollectionConfig","safeFilename","basename","filename","processed","maxDimensions","stripMetadata","mainBuffer","buffer","mainSize","size","newFilename","newMimeType","replaceOriginal","formats","primaryFormat","converted","format","quality","parse","name","thumbHash","variants","updateData","imageOptimizer","optimizedSize","error","filesize","update","data","file","mimetype","context","imageOptimizer_skip","staticDir","newFilePath","join","writeFile","oldFilePath","unlink","catch","formatsToGenerate","slice","result","variantFilename","push","width","height","url","err","errorMessage","Error","message","String","updateErr","logger"],"mappings":"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"}

package/dist/utilities/storage.js

@@ -27,7 +27,12 @@ import { resolveStaticDir } from './resolveStaticDir.js';
     // Fetch from URL (works for cloud storage and as fallback for local)
     if (doc.url) {
         const url = doc.url.startsWith('http') ? doc.url : `${process.env.NEXT_PUBLIC_SERVER_URL || ''}${doc.url}`;
-        const response = await fetch(url);
+        if (!url.startsWith('http')) {
+            throw new Error(`Cannot fetch file "${doc.filename}": URL "${doc.url}" is relative and NEXT_PUBLIC_SERVER_URL is not set`);
+        }
+        const response = await fetch(url, {
+            signal: AbortSignal.timeout(30_000)
+        });
         if (!response.ok) {
             throw new Error(`Failed to fetch file from ${url}: ${response.status} ${response.statusText}`);
         }

package/dist/utilities/storage.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/storage.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport { resolveStaticDir } from './resolveStaticDir.js'\n\n/**\n * Returns true when the collection uses cloud/external storage (disableLocalStorage: true).\n * When true, files are uploaded by external adapter hooks — no local FS writes should happen.\n */\nexport function isCloudStorage(collectionConfig: { upload?: boolean | Record<string, any> }): boolean {\n  return typeof collectionConfig.upload === 'object' && collectionConfig.upload.disableLocalStorage === true\n}\n\n/**\n * Reads a file buffer from local disk or fetches it from URL.\n * Tries local disk first (when available), falls back to URL fetch.\n * This makes the plugin storage-agnostic — works with local FS and cloud storage alike.\n */\nexport async function fetchFileBuffer(\n  doc: { filename?: string; url?: string },\n  collectionConfig: { upload?: boolean | Record<string, any> },\n): Promise<Buffer> {\n  const safeFilename = doc.filename ? path.basename(doc.filename) : undefined\n\n  // Try local disk first (only when local storage is enabled)\n  if (!isCloudStorage(collectionConfig) && safeFilename) {\n    const staticDir = resolveStaticDir(collectionConfig)\n    if (staticDir) {\n      try {\n        return await fs.readFile(path.join(staticDir, safeFilename))\n      } catch {\n        // Fall through to URL fetch\n      }\n    }\n  }\n\n  // Fetch from URL (works for cloud storage and as fallback for local)\n  if (doc.url) {\n    const url = doc.url.startsWith('http')\n      ? doc.url\n      : `${process.env.NEXT_PUBLIC_SERVER_URL || ''}${doc.url}`\n    const response = await fetch(url)\n    if (!response.ok) {\n      throw new Error(`Failed to fetch file from ${url}: ${response.status} ${response.statusText}`)\n    }\n    return Buffer.from(await response.arrayBuffer())\n  }\n\n  throw new Error(`Cannot read file: no local path or URL available for \"${doc.filename}\"`)\n}\n"],"names":["fs","path","resolveStaticDir","isCloudStorage","collectionConfig","upload","disableLocalStorage","fetchFileBuffer","doc","safeFilename","filename","basename","undefined","staticDir","readFile","join","url","startsWith","process","env","NEXT_PUBLIC_SERVER_URL","response","fetch","ok","Error","status","statusText","Buffer","from","arrayBuffer"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAEvB,SAASC,gBAAgB,QAAQ,wBAAuB;AAExD;;;CAGC,GACD,OAAO,SAASC,eAAeC,gBAA4D;IACzF,OAAO,OAAOA,iBAAiBC,MAAM,KAAK,YAAYD,iBAAiBC,MAAM,CAACC,mBAAmB,KAAK;AACxG;AAEA;;;;CAIC,GACD,OAAO,eAAeC,gBACpBC,GAAwC,EACxCJ,gBAA4D;IAE5D,MAAMK,eAAeD,IAAIE,QAAQ,GAAGT,KAAKU,QAAQ,CAACH,IAAIE,QAAQ,IAAIE;IAElE,4DAA4D;IAC5D,IAAI,CAACT,eAAeC,qBAAqBK,cAAc;QACrD,MAAMI,YAAYX,iBAAiBE;QACnC,IAAIS,WAAW;YACb,IAAI;gBACF,OAAO,MAAMb,GAAGc,QAAQ,CAACb,KAAKc,IAAI,CAACF,WAAWJ;YAChD,EAAE,OAAM;YACN,4BAA4B;YAC9B;QACF;IACF;IAEA,qEAAqE;IACrE,IAAID,IAAIQ,GAAG,EAAE;QACX,MAAMA,MAAMR,IAAIQ,GAAG,CAACC,UAAU,CAAC,UAC3BT,IAAIQ,GAAG,GACP,GAAGE,QAAQC,GAAG,CAACC,sBAAsB,IAAI,KAAKZ,IAAIQ,GAAG,EAAE;QAC3D,MAAMK,WAAW,MAAMC,MAAMN;QAC7B,IAAI,CAACK,SAASE,EAAE,EAAE;YAChB,MAAM,IAAIC,MAAM,CAAC,0BAA0B,EAAER,IAAI,EAAE,EAAEK,SAASI,MAAM,CAAC,CAAC,EAAEJ,SAASK,UAAU,EAAE;QAC/F;QACA,OAAOC,OAAOC,IAAI,CAAC,MAAMP,SAASQ,WAAW;IAC/C;IAEA,MAAM,IAAIL,MAAM,CAAC,sDAAsD,EAAEhB,IAAIE,QAAQ,CAAC,CAAC,CAAC;AAC1F"}
+{"version":3,"sources":["../../src/utilities/storage.ts"],"sourcesContent":["import fs from 'fs/promises'\nimport path from 'path'\n\nimport { resolveStaticDir } from './resolveStaticDir.js'\n\n/**\n * Returns true when the collection uses cloud/external storage (disableLocalStorage: true).\n * When true, files are uploaded by external adapter hooks — no local FS writes should happen.\n */\nexport function isCloudStorage(collectionConfig: { upload?: boolean | Record<string, any> }): boolean {\n  return typeof collectionConfig.upload === 'object' && collectionConfig.upload.disableLocalStorage === true\n}\n\n/**\n * Reads a file buffer from local disk or fetches it from URL.\n * Tries local disk first (when available), falls back to URL fetch.\n * This makes the plugin storage-agnostic — works with local FS and cloud storage alike.\n */\nexport async function fetchFileBuffer(\n  doc: { filename?: string; url?: string },\n  collectionConfig: { upload?: boolean | Record<string, any> },\n): Promise<Buffer> {\n  const safeFilename = doc.filename ? path.basename(doc.filename) : undefined\n\n  // Try local disk first (only when local storage is enabled)\n  if (!isCloudStorage(collectionConfig) && safeFilename) {\n    const staticDir = resolveStaticDir(collectionConfig)\n    if (staticDir) {\n      try {\n        return await fs.readFile(path.join(staticDir, safeFilename))\n      } catch {\n        // Fall through to URL fetch\n      }\n    }\n  }\n\n  // Fetch from URL (works for cloud storage and as fallback for local)\n  if (doc.url) {\n    const url = doc.url.startsWith('http')\n      ? doc.url\n      : `${process.env.NEXT_PUBLIC_SERVER_URL || ''}${doc.url}`\n\n    if (!url.startsWith('http')) {\n      throw new Error(\n        `Cannot fetch file \"${doc.filename}\": URL \"${doc.url}\" is relative and NEXT_PUBLIC_SERVER_URL is not set`,\n      )\n    }\n\n    const response = await fetch(url, { signal: AbortSignal.timeout(30_000) })\n    if (!response.ok) {\n      throw new Error(`Failed to fetch file from ${url}: ${response.status} ${response.statusText}`)\n    }\n    return Buffer.from(await response.arrayBuffer())\n  }\n\n  throw new Error(`Cannot read file: no local path or URL available for \"${doc.filename}\"`)\n}\n"],"names":["fs","path","resolveStaticDir","isCloudStorage","collectionConfig","upload","disableLocalStorage","fetchFileBuffer","doc","safeFilename","filename","basename","undefined","staticDir","readFile","join","url","startsWith","process","env","NEXT_PUBLIC_SERVER_URL","Error","response","fetch","signal","AbortSignal","timeout","ok","status","statusText","Buffer","from","arrayBuffer"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAEvB,SAASC,gBAAgB,QAAQ,wBAAuB;AAExD;;;CAGC,GACD,OAAO,SAASC,eAAeC,gBAA4D;IACzF,OAAO,OAAOA,iBAAiBC,MAAM,KAAK,YAAYD,iBAAiBC,MAAM,CAACC,mBAAmB,KAAK;AACxG;AAEA;;;;CAIC,GACD,OAAO,eAAeC,gBACpBC,GAAwC,EACxCJ,gBAA4D;IAE5D,MAAMK,eAAeD,IAAIE,QAAQ,GAAGT,KAAKU,QAAQ,CAACH,IAAIE,QAAQ,IAAIE;IAElE,4DAA4D;IAC5D,IAAI,CAACT,eAAeC,qBAAqBK,cAAc;QACrD,MAAMI,YAAYX,iBAAiBE;QACnC,IAAIS,WAAW;YACb,IAAI;gBACF,OAAO,MAAMb,GAAGc,QAAQ,CAACb,KAAKc,IAAI,CAACF,WAAWJ;YAChD,EAAE,OAAM;YACN,4BAA4B;YAC9B;QACF;IACF;IAEA,qEAAqE;IACrE,IAAID,IAAIQ,GAAG,EAAE;QACX,MAAMA,MAAMR,IAAIQ,GAAG,CAACC,UAAU,CAAC,UAC3BT,IAAIQ,GAAG,GACP,GAAGE,QAAQC,GAAG,CAACC,sBAAsB,IAAI,KAAKZ,IAAIQ,GAAG,EAAE;QAE3D,IAAI,CAACA,IAAIC,UAAU,CAAC,SAAS;YAC3B,MAAM,IAAII,MACR,CAAC,mBAAmB,EAAEb,IAAIE,QAAQ,CAAC,QAAQ,EAAEF,IAAIQ,GAAG,CAAC,mDAAmD,CAAC;QAE7G;QAEA,MAAMM,WAAW,MAAMC,MAAMP,KAAK;YAAEQ,QAAQC,YAAYC,OAAO,CAAC;QAAQ;QACxE,IAAI,CAACJ,SAASK,EAAE,EAAE;YAChB,MAAM,IAAIN,MAAM,CAAC,0BAA0B,EAAEL,IAAI,EAAE,EAAEM,SAASM,MAAM,CAAC,CAAC,EAAEN,SAASO,UAAU,EAAE;QAC/F;QACA,OAAOC,OAAOC,IAAI,CAAC,MAAMT,SAASU,WAAW;IAC/C;IAEA,MAAM,IAAIX,MAAM,CAAC,sDAAsD,EAAEb,IAAIE,QAAQ,CAAC,CAAC,CAAC;AAC1F"}

package/dist/utilities/waitUntil.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Extends the serverless function lifetime to keep a promise alive after the
+ * response is sent.
+ *
+ * Resolution order:
+ * 1. Payload's req.context.waitUntil — the documented way for plugins on Vercel
+ * 2. Next.js global context — fallback for native Next.js route handlers
+ * 3. No-op — non-serverless environments keep the process alive regardless
+ */
+export declare function waitUntil(promise: Promise<unknown>, req?: {
+    context?: {
+        waitUntil?: (p: Promise<unknown>) => void;
+    };
+}): void;

package/dist/utilities/waitUntil.js

@@ -0,0 +1,18 @@
+/**
+ * Extends the serverless function lifetime to keep a promise alive after the
+ * response is sent.
+ *
+ * Resolution order:
+ * 1. Payload's req.context.waitUntil — the documented way for plugins on Vercel
+ * 2. Next.js global context — fallback for native Next.js route handlers
+ * 3. No-op — non-serverless environments keep the process alive regardless
+ */ export function waitUntil(promise, req) {
+    if (typeof req?.context?.waitUntil === 'function') {
+        req.context.waitUntil(promise);
+        return;
+    }
+    const ctx = globalThis.__next_request_context;
+    ctx?.waitUntil?.(promise);
+}
+
+//# sourceMappingURL=waitUntil.js.map

package/dist/utilities/waitUntil.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/waitUntil.ts"],"sourcesContent":["/**\n * Extends the serverless function lifetime to keep a promise alive after the\n * response is sent.\n *\n * Resolution order:\n * 1. Payload's req.context.waitUntil — the documented way for plugins on Vercel\n * 2. Next.js global context — fallback for native Next.js route handlers\n * 3. No-op — non-serverless environments keep the process alive regardless\n */\nexport function waitUntil(\n  promise: Promise<unknown>,\n  req?: { context?: { waitUntil?: (p: Promise<unknown>) => void } },\n): void {\n  if (typeof req?.context?.waitUntil === 'function') {\n    req.context.waitUntil(promise)\n    return\n  }\n\n  const ctx = (globalThis as Record<string, unknown>).__next_request_context as\n    | { waitUntil?: (p: Promise<unknown>) => void }\n    | undefined\n\n  ctx?.waitUntil?.(promise)\n}\n"],"names":["waitUntil","promise","req","context","ctx","globalThis","__next_request_context"],"mappings":"AAAA;;;;;;;;CAQC,GACD,OAAO,SAASA,UACdC,OAAyB,EACzBC,GAAiE;IAEjE,IAAI,OAAOA,KAAKC,SAASH,cAAc,YAAY;QACjDE,IAAIC,OAAO,CAACH,SAAS,CAACC;QACtB;IACF;IAEA,MAAMG,MAAM,AAACC,WAAuCC,sBAAsB;IAI1EF,KAAKJ,YAAYC;AACnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inoo-ch/payload-image-optimizer",
-  "version": "1.3.9",
+  "version": "1.4.1",
   "description": "Payload CMS plugin for automatic image optimization — WebP/AVIF conversion, resize, EXIF strip, ThumbHash placeholders, and bulk regeneration",
   "license": "MIT",
   "keywords": [

package/src/endpoints/regenerate.ts

@@ -2,6 +2,7 @@ import type { PayloadHandler } from 'payload'
 import type { CollectionSlug, Where } from 'payload'
 
 import type { ResolvedImageOptimizerConfig } from '../types.js'
+import { waitUntil } from '../utilities/waitUntil.js'
 
 export const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerConfig) => {
   const handler: PayloadHandler = async (req) => {
@@ -71,11 +72,13 @@ export const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerCo
 
     req.payload.logger.info(`Image optimizer: queued ${queued} images from '${collectionSlug}' for regeneration`)
 
-    // Fire the job runner (non-blocking)
+    // Fire the job runner — use waitUntil to keep the serverless function alive
+    // after the response is sent, so jobs actually complete on Vercel/serverless.
     if (queued > 0) {
-      req.payload.jobs.run({ limit: queued }).catch((err: unknown) => {
+      const runPromise = req.payload.jobs.run({ limit: queued }).catch((err: unknown) => {
         req.payload.logger.error({ err }, 'Regeneration job runner failed')
       })
+      waitUntil(runPromise, req)
     }
 
     return Response.json({ queued, collectionSlug })

package/src/hooks/afterChange.ts

@@ -5,6 +5,7 @@ import type { CollectionAfterChangeHook } from 'payload'
 import type { ResolvedImageOptimizerConfig } from '../types.js'
 import { resolveStaticDir } from '../utilities/resolveStaticDir.js'
 import { isCloudStorage } from '../utilities/storage.js'
+import { waitUntil } from '../utilities/waitUntil.js'
 
 export const createAfterChangeHook = (
   resolvedConfig: ResolvedImageOptimizerConfig,
@@ -61,9 +62,10 @@ export const createAfterChangeHook = (
       },
     })
 
-    req.payload.jobs.run().catch((err: unknown) => {
+    const runPromise = req.payload.jobs.run().catch((err: unknown) => {
       req.payload.logger.error({ err }, 'Image optimizer job runner failed')
     })
+    waitUntil(runPromise, req)
 
     return doc
   }

package/src/hooks/beforeChange.ts

@@ -52,7 +52,7 @@ export const createBeforeChangeHook = (
     // when cloud storage adapters are involved.
     const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config
     const cloudStorage = isCloudStorage(collectionConfig)
-    const needsAsyncJob = !cloudStorage && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1)
+    const needsAsyncJob = !cloudStorage && perCollectionConfig.formats.length > 0 && !(perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1)
 
     data.imageOptimizer = {
       originalSize,

package/src/tasks/convertFormats.ts

@@ -115,7 +115,7 @@ export const createConvertFormatsHandler = (resolvedConfig: ResolvedImageOptimiz
         })
       } catch (updateErr) {
         req.payload.logger.error(
-          { err: updateErr },
+          { err: updateErr, docId: input.docId, collectionSlug: input.collectionSlug },
           'Failed to persist error status for image optimizer',
         )
       }

package/src/tasks/regenerateDocument.ts

@@ -180,7 +180,7 @@ export const createRegenerateDocumentHandler = (resolvedConfig: ResolvedImageOpt
         })
       } catch (updateErr) {
         req.payload.logger.error(
-          { err: updateErr },
+          { err: updateErr, docId: input.docId, collectionSlug: input.collectionSlug },
           'Failed to persist error status for image optimizer regeneration',
         )
       }

package/src/utilities/storage.ts

@@ -39,7 +39,14 @@ export async function fetchFileBuffer(
     const url = doc.url.startsWith('http')
       ? doc.url
       : `${process.env.NEXT_PUBLIC_SERVER_URL || ''}${doc.url}`
-    const response = await fetch(url)
+
+    if (!url.startsWith('http')) {
+      throw new Error(
+        `Cannot fetch file "${doc.filename}": URL "${doc.url}" is relative and NEXT_PUBLIC_SERVER_URL is not set`,
+      )
+    }
+
+    const response = await fetch(url, { signal: AbortSignal.timeout(30_000) })
     if (!response.ok) {
       throw new Error(`Failed to fetch file from ${url}: ${response.status} ${response.statusText}`)
     }

package/src/utilities/waitUntil.ts

@@ -0,0 +1,24 @@
+/**
+ * Extends the serverless function lifetime to keep a promise alive after the
+ * response is sent.
+ *
+ * Resolution order:
+ * 1. Payload's req.context.waitUntil — the documented way for plugins on Vercel
+ * 2. Next.js global context — fallback for native Next.js route handlers
+ * 3. No-op — non-serverless environments keep the process alive regardless
+ */
+export function waitUntil(
+  promise: Promise<unknown>,
+  req?: { context?: { waitUntil?: (p: Promise<unknown>) => void } },
+): void {
+  if (typeof req?.context?.waitUntil === 'function') {
+    req.context.waitUntil(promise)
+    return
+  }
+
+  const ctx = (globalThis as Record<string, unknown>).__next_request_context as
+    | { waitUntil?: (p: Promise<unknown>) => void }
+    | undefined
+
+  ctx?.waitUntil?.(promise)
+}