@inoo-ch/payload-image-optimizer 1.3.0 → 1.3.2

package/dist/hooks/afterChange.js

@@ -2,29 +2,38 @@ import fs from 'fs/promises';
 import path from 'path';
 import { resolveCollectionConfig } from '../defaults.js';
 import { resolveStaticDir } from '../utilities/resolveStaticDir.js';
+import { isCloudStorage } from '../utilities/storage.js';
 export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
     return async ({ context, doc, req })=>{
         if (context?.imageOptimizer_skip) return doc;
-        if (!req.file || !req.file.data || !req.file.mimetype?.startsWith('image/')) return doc;
+        // Use context flag from beforeChange instead of checking req.file.data directly.
+        // Cloud storage adapters may consume req.file.data in their own afterChange hook
+        // before ours runs, which would cause this guard to bail out and leave status as 'pending'.
+        if (!context?.imageOptimizer_hasUpload) return doc;
         const collectionConfig = req.payload.collections[collectionSlug].config;
-        const staticDir = resolveStaticDir(collectionConfig);
-        const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug);
-        // Overwrite the file on disk with the processed (stripped/resized/converted) buffer
-        // Payload 3.0 writes the original buffer to disk; we replace it here
-        const processedBuffer = context.imageOptimizer_processedBuffer;
-        if (processedBuffer && doc.filename && staticDir) {
-            const safeFilename = path.basename(doc.filename);
-            const filePath = path.join(staticDir, safeFilename);
-            await fs.writeFile(filePath, processedBuffer);
-            // If replaceOriginal changed the filename, clean up the old file Payload wrote
-            const originalFilename = context.imageOptimizer_originalFilename;
-            if (originalFilename && originalFilename !== safeFilename) {
-                const oldFilePath = path.join(staticDir, path.basename(originalFilename));
-                await fs.unlink(oldFilePath).catch(()=>{
-                // Old file may not exist if Payload used the new filename
-                });
+        const cloudStorage = isCloudStorage(collectionConfig);
+        // When using local storage, overwrite the file on disk with the processed buffer.
+        // Payload's uploadFiles step writes the original buffer; we replace it here.
+        // When using cloud storage, skip — the cloud adapter's afterChange hook already
+        // uploads the correct buffer from req.file.data (set in our beforeChange hook).
+        if (!cloudStorage) {
+            const staticDir = resolveStaticDir(collectionConfig);
+            const processedBuffer = context.imageOptimizer_processedBuffer;
+            if (processedBuffer && doc.filename && staticDir) {
+                const safeFilename = path.basename(doc.filename);
+                const filePath = path.join(staticDir, safeFilename);
+                await fs.writeFile(filePath, processedBuffer);
+                // If replaceOriginal changed the filename, clean up the old file Payload wrote
+                const originalFilename = context.imageOptimizer_originalFilename;
+                if (originalFilename && originalFilename !== safeFilename) {
+                    const oldFilePath = path.join(staticDir, path.basename(originalFilename));
+                    await fs.unlink(oldFilePath).catch(()=>{
+                    // Old file may not exist if Payload used the new filename
+                    });
+                }
             }
         }
+        const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug);
         // When replaceOriginal is on and only one format is configured, the main file
         // is already converted — skip the async job and mark complete immediately.
         if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1) {
@@ -33,8 +42,31 @@ export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
                 id: doc.id,
                 data: {
                     imageOptimizer: {
+                        ...doc.imageOptimizer,
+                        status: 'complete',
+                        variants: [],
+                        error: null
+                    }
+                },
+                context: {
+                    imageOptimizer_skip: true
+                }
+            });
+            return doc;
+        }
+        // With cloud storage, variant files cannot be written — skip the async job
+        // and mark complete. CDN-level image optimization (e.g. Next.js Image) can
+        // serve alternative formats on the fly.
+        if (cloudStorage) {
+            await req.payload.update({
+                collection: collectionSlug,
+                id: doc.id,
+                data: {
+                    imageOptimizer: {
+                        ...doc.imageOptimizer,
                         status: 'complete',
-                        variants: []
+                        variants: [],
+                        error: null
                     }
                 },
                 context: {
@@ -43,7 +75,7 @@ export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
             });
             return doc;
         }
-        // Queue async format conversion job for remaining variants
+        // Queue async format conversion job for remaining variants (local storage only)
         await req.payload.jobs.queue({
             task: 'imageOptimizer_convertFormats',
             input: {

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 { resolveCollectionConfig } from '../defaults.js'\nimport { resolveStaticDir } from '../utilities/resolveStaticDir.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    if (!req.file || !req.file.data || !req.file.mimetype?.startsWith('image/')) return doc\n\n    const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config\n    const staticDir = resolveStaticDir(collectionConfig)\n\n    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)\n\n    // Overwrite the file on disk with the processed (stripped/resized/converted) buffer\n    // Payload 3.0 writes the original buffer to disk; we replace it here\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    // When replaceOriginal is on and only one format is configured, the main file\n    // is already converted — skip the async job and mark complete immediately.\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1) {\n      await req.payload.update({\n        collection: collectionSlug,\n        id: doc.id,\n        data: {\n          imageOptimizer: {\n            status: 'complete',\n            variants: [],\n          },\n        },\n        context: { imageOptimizer_skip: true },\n      })\n      return doc\n    }\n\n    // Queue async format conversion job for remaining variants\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","resolveCollectionConfig","resolveStaticDir","createAfterChangeHook","resolvedConfig","collectionSlug","context","doc","req","imageOptimizer_skip","file","data","mimetype","startsWith","collectionConfig","payload","collections","config","staticDir","perCollectionConfig","processedBuffer","imageOptimizer_processedBuffer","filename","safeFilename","basename","filePath","join","writeFile","originalFilename","imageOptimizer_originalFilename","oldFilePath","unlink","catch","replaceOriginal","formats","length","update","collection","id","imageOptimizer","status","variants","jobs","queue","task","input","docId","String","run","err","logger","error"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAIvB,SAASC,uBAAuB,QAAQ,iBAAgB;AACxD,SAASC,gBAAgB,QAAQ,mCAAkC;AAEnE,OAAO,MAAMC,wBAAwB,CACnCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,GAAG,EAAEC,GAAG,EAAE;QACjC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,IAAI,CAACC,IAAIE,IAAI,IAAI,CAACF,IAAIE,IAAI,CAACC,IAAI,IAAI,CAACH,IAAIE,IAAI,CAACE,QAAQ,EAAEC,WAAW,WAAW,OAAON;QAEpF,MAAMO,mBAAmBN,IAAIO,OAAO,CAACC,WAAW,CAACX,eAAuD,CAACY,MAAM;QAC/G,MAAMC,YAAYhB,iBAAiBY;QAEnC,MAAMK,sBAAsBlB,wBAAwBG,gBAAgBC;QAEpE,oFAAoF;QACpF,qEAAqE;QACrE,MAAMe,kBAAkBd,QAAQe,8BAA8B;QAC9D,IAAID,mBAAmBb,IAAIe,QAAQ,IAAIJ,WAAW;YAChD,MAAMK,eAAevB,KAAKwB,QAAQ,CAACjB,IAAIe,QAAQ;YAC/C,MAAMG,WAAWzB,KAAK0B,IAAI,CAACR,WAAWK;YACtC,MAAMxB,GAAG4B,SAAS,CAACF,UAAUL;YAE7B,+EAA+E;YAC/E,MAAMQ,mBAAmBtB,QAAQuB,+BAA+B;YAChE,IAAID,oBAAoBA,qBAAqBL,cAAc;gBACzD,MAAMO,cAAc9B,KAAK0B,IAAI,CAACR,WAAWlB,KAAKwB,QAAQ,CAACI;gBACvD,MAAM7B,GAAGgC,MAAM,CAACD,aAAaE,KAAK,CAAC;gBACjC,0DAA0D;gBAC5D;YACF;QACF;QAEA,8EAA8E;QAC9E,2EAA2E;QAC3E,IAAIb,oBAAoBc,eAAe,IAAId,oBAAoBe,OAAO,CAACC,MAAM,IAAI,GAAG;YAClF,MAAM3B,IAAIO,OAAO,CAACqB,MAAM,CAAC;gBACvBC,YAAYhC;gBACZiC,IAAI/B,IAAI+B,EAAE;gBACV3B,MAAM;oBACJ4B,gBAAgB;wBACdC,QAAQ;wBACRC,UAAU,EAAE;oBACd;gBACF;gBACAnC,SAAS;oBAAEG,qBAAqB;gBAAK;YACvC;YACA,OAAOF;QACT;QAEA,2DAA2D;QAC3D,MAAMC,IAAIO,OAAO,CAAC2B,IAAI,CAACC,KAAK,CAAC;YAC3BC,MAAM;YACNC,OAAO;gBACLxC;gBACAyC,OAAOC,OAAOxC,IAAI+B,EAAE;YACtB;QACF;QAEA9B,IAAIO,OAAO,CAAC2B,IAAI,CAACM,GAAG,GAAGhB,KAAK,CAAC,CAACiB;YAC5BzC,IAAIO,OAAO,CAACmC,MAAM,CAACC,KAAK,CAAC;gBAAEF;YAAI,GAAG;QACpC;QAEA,OAAO1C;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 { resolveCollectionConfig } from '../defaults.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    const perCollectionConfig = resolveCollectionConfig(resolvedConfig, collectionSlug)\n\n    // When replaceOriginal is on and only one format is configured, the main file\n    // is already converted — skip the async job and mark complete immediately.\n    if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length <= 1) {\n      await req.payload.update({\n        collection: collectionSlug,\n        id: doc.id,\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 doc\n    }\n\n    // With cloud storage, variant files cannot be written — skip the async job\n    // and mark complete. CDN-level image optimization (e.g. Next.js Image) can\n    // serve alternative formats on the fly.\n    if (cloudStorage) {\n      await req.payload.update({\n        collection: collectionSlug,\n        id: doc.id,\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 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","resolveCollectionConfig","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","perCollectionConfig","replaceOriginal","formats","length","update","collection","id","data","imageOptimizer","status","variants","error","jobs","queue","task","input","docId","String","run","err","logger"],"mappings":"AAAA,OAAOA,QAAQ,cAAa;AAC5B,OAAOC,UAAU,OAAM;AAIvB,SAASC,uBAAuB,QAAQ,iBAAgB;AACxD,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,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,MAAMC,sBAAsB9B,wBAAwBI,gBAAgBC;QAEpE,8EAA8E;QAC9E,2EAA2E;QAC3E,IAAIyB,oBAAoBC,eAAe,IAAID,oBAAoBE,OAAO,CAACC,MAAM,IAAI,GAAG;YAClF,MAAMzB,IAAII,OAAO,CAACsB,MAAM,CAAC;gBACvBC,YAAY9B;gBACZ+B,IAAI7B,IAAI6B,EAAE;gBACVC,MAAM;oBACJC,gBAAgB;wBACd,GAAG/B,IAAI+B,cAAc;wBACrBC,QAAQ;wBACRC,UAAU,EAAE;wBACZC,OAAO;oBACT;gBACF;gBACAnC,SAAS;oBAAEG,qBAAqB;gBAAK;YACvC;YACA,OAAOF;QACT;QAEA,2EAA2E;QAC3E,2EAA2E;QAC3E,wCAAwC;QACxC,IAAIQ,cAAc;YAChB,MAAMP,IAAII,OAAO,CAACsB,MAAM,CAAC;gBACvBC,YAAY9B;gBACZ+B,IAAI7B,IAAI6B,EAAE;gBACVC,MAAM;oBACJC,gBAAgB;wBACd,GAAG/B,IAAI+B,cAAc;wBACrBC,QAAQ;wBACRC,UAAU,EAAE;wBACZC,OAAO;oBACT;gBACF;gBACAnC,SAAS;oBAAEG,qBAAqB;gBAAK;YACvC;YACA,OAAOF;QACT;QAEA,gFAAgF;QAChF,MAAMC,IAAII,OAAO,CAAC8B,IAAI,CAACC,KAAK,CAAC;YAC3BC,MAAM;YACNC,OAAO;gBACLxC;gBACAyC,OAAOC,OAAOxC,IAAI6B,EAAE;YACtB;QACF;QAEA5B,IAAII,OAAO,CAAC8B,IAAI,CAACM,GAAG,GAAGnB,KAAK,CAAC,CAACoB;YAC5BzC,IAAII,OAAO,CAACsC,MAAM,CAACT,KAAK,CAAC;gBAAEQ;YAAI,GAAG;QACpC;QAEA,OAAO1C;IACT;AACF,EAAC"}

package/dist/hooks/beforeChange.js

@@ -33,9 +33,19 @@ export const createBeforeChangeHook = (resolvedConfig, collectionSlug)=>{
         if (resolvedConfig.generateThumbHash) {
             data.imageOptimizer.thumbHash = await generateThumbHash(finalBuffer);
         }
-        // Store processed buffer in context for afterChange to write to disk
-        // (Payload 3.0 does not use modified req.file.data for the disk write)
+        // Write processed buffer back to req.file so cloud storage adapters
+        // (which read req.file in their afterChange hook) upload the optimized version.
+        // Payload's own uploadFiles step does NOT re-read req.file.data for its local
+        // disk write, so we also store the buffer in context for our afterChange hook
+        // to overwrite the local file when local storage is enabled.
+        req.file.data = finalBuffer;
+        req.file.size = finalSize;
+        if (perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0) {
+            req.file.name = data.filename;
+            req.file.mimetype = data.mimeType;
+        }
         context.imageOptimizer_processedBuffer = finalBuffer;
+        context.imageOptimizer_hasUpload = true;
         return data;
     };
 };

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'\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    data.imageOptimizer = {\n      originalSize,\n      optimizedSize: finalSize,\n      status: 'pending',\n    }\n\n    if (resolvedConfig.generateThumbHash) {\n      data.imageOptimizer.thumbHash = await generateThumbHash(finalBuffer)\n    }\n\n    // Store processed buffer in context for afterChange to write to disk\n    // (Payload 3.0 does not use modified req.file.data for the disk write)\n    context.imageOptimizer_processedBuffer = finalBuffer\n\n    return data\n  }\n}\n"],"names":["path","resolveCollectionConfig","convertFormat","generateThumbHash","stripAndResize","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","imageOptimizer","optimizedSize","status","thumbHash","imageOptimizer_processedBuffer"],"mappings":"AAAA,OAAOA,UAAU,OAAM;AAIvB,SAASC,uBAAuB,QAAQ,iBAAgB;AACxD,SAASC,aAAa,EAAEC,iBAAiB,EAAEC,cAAc,QAAQ,yBAAwB;AAEzF,OAAO,MAAMC,yBAAyB,CACpCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,IAAI,EAAEC,GAAG,EAAE;QAClC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,IAAI,CAACC,IAAIE,IAAI,IAAI,CAACF,IAAIE,IAAI,CAACH,IAAI,IAAI,CAACC,IAAIE,IAAI,CAACC,QAAQ,EAAEC,WAAW,WAAW,OAAOL;QAEpF,MAAMM,eAAeL,IAAIE,IAAI,CAACH,IAAI,CAACO,MAAM;QAEzC,MAAMC,sBAAsBhB,wBAAwBK,gBAAgBC;QAEpE,uDAAuD;QACvD,MAAMW,YAAY,MAAMd,eACtBM,IAAIE,IAAI,CAACH,IAAI,EACbQ,oBAAoBE,aAAa,EACjCb,eAAec,aAAa;QAG9B,IAAIC,cAAcH,UAAUI,MAAM;QAClC,IAAIC,YAAYL,UAAUM,IAAI;QAE9B,IAAIP,oBAAoBQ,eAAe,IAAIR,oBAAoBS,OAAO,CAACV,MAAM,GAAG,GAAG;YACjF,yDAAyD;YACzD,MAAMW,gBAAgBV,oBAAoBS,OAAO,CAAC,EAAE;YACpD,MAAME,YAAY,MAAM1B,cAAcgB,UAAUI,MAAM,EAAEK,cAAcE,MAAM,EAAEF,cAAcG,OAAO;YAEnGT,cAAcO,UAAUN,MAAM;YAC9BC,YAAYK,UAAUJ,IAAI;YAE1B,sEAAsE;YACtE,MAAMO,mBAAmBtB,KAAKuB,QAAQ,IAAItB,IAAIE,IAAI,CAACqB,IAAI,IAAI;YAC3D,MAAMC,cAAc,GAAGlC,KAAKmC,KAAK,CAACJ,kBAAkBE,IAAI,CAAC,CAAC,EAAEN,cAAcE,MAAM,EAAE;YAClFrB,QAAQ4B,+BAA+B,GAAGL;YAC1CtB,KAAKuB,QAAQ,GAAGE;YAChBzB,KAAK4B,QAAQ,GAAGT,UAAUS,QAAQ;YAClC5B,KAAK6B,QAAQ,GAAGf;QAClB;QAEAd,KAAK8B,cAAc,GAAG;YACpBxB;YACAyB,eAAejB;YACfkB,QAAQ;QACV;QAEA,IAAInC,eAAeH,iBAAiB,EAAE;YACpCM,KAAK8B,cAAc,CAACG,SAAS,GAAG,MAAMvC,kBAAkBkB;QAC1D;QAEA,qEAAqE;QACrE,uEAAuE;QACvEb,QAAQmC,8BAA8B,GAAGtB;QAEzC,OAAOZ;IACT;AACF,EAAC"}
+{"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'\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    data.imageOptimizer = {\n      originalSize,\n      optimizedSize: finalSize,\n      status: 'pending',\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","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","imageOptimizer","optimizedSize","status","thumbHash","imageOptimizer_processedBuffer","imageOptimizer_hasUpload"],"mappings":"AAAA,OAAOA,UAAU,OAAM;AAIvB,SAASC,uBAAuB,QAAQ,iBAAgB;AACxD,SAASC,aAAa,EAAEC,iBAAiB,EAAEC,cAAc,QAAQ,yBAAwB;AAEzF,OAAO,MAAMC,yBAAyB,CACpCC,gBACAC;IAEA,OAAO,OAAO,EAAEC,OAAO,EAAEC,IAAI,EAAEC,GAAG,EAAE;QAClC,IAAIF,SAASG,qBAAqB,OAAOF;QAEzC,IAAI,CAACC,IAAIE,IAAI,IAAI,CAACF,IAAIE,IAAI,CAACH,IAAI,IAAI,CAACC,IAAIE,IAAI,CAACC,QAAQ,EAAEC,WAAW,WAAW,OAAOL;QAEpF,MAAMM,eAAeL,IAAIE,IAAI,CAACH,IAAI,CAACO,MAAM;QAEzC,MAAMC,sBAAsBhB,wBAAwBK,gBAAgBC;QAEpE,uDAAuD;QACvD,MAAMW,YAAY,MAAMd,eACtBM,IAAIE,IAAI,CAACH,IAAI,EACbQ,oBAAoBE,aAAa,EACjCb,eAAec,aAAa;QAG9B,IAAIC,cAAcH,UAAUI,MAAM;QAClC,IAAIC,YAAYL,UAAUM,IAAI;QAE9B,IAAIP,oBAAoBQ,eAAe,IAAIR,oBAAoBS,OAAO,CAACV,MAAM,GAAG,GAAG;YACjF,yDAAyD;YACzD,MAAMW,gBAAgBV,oBAAoBS,OAAO,CAAC,EAAE;YACpD,MAAME,YAAY,MAAM1B,cAAcgB,UAAUI,MAAM,EAAEK,cAAcE,MAAM,EAAEF,cAAcG,OAAO;YAEnGT,cAAcO,UAAUN,MAAM;YAC9BC,YAAYK,UAAUJ,IAAI;YAE1B,sEAAsE;YACtE,MAAMO,mBAAmBtB,KAAKuB,QAAQ,IAAItB,IAAIE,IAAI,CAACqB,IAAI,IAAI;YAC3D,MAAMC,cAAc,GAAGlC,KAAKmC,KAAK,CAACJ,kBAAkBE,IAAI,CAAC,CAAC,EAAEN,cAAcE,MAAM,EAAE;YAClFrB,QAAQ4B,+BAA+B,GAAGL;YAC1CtB,KAAKuB,QAAQ,GAAGE;YAChBzB,KAAK4B,QAAQ,GAAGT,UAAUS,QAAQ;YAClC5B,KAAK6B,QAAQ,GAAGf;QAClB;QAEAd,KAAK8B,cAAc,GAAG;YACpBxB;YACAyB,eAAejB;YACfkB,QAAQ;QACV;QAEA,IAAInC,eAAeH,iBAAiB,EAAE;YACpCM,KAAK8B,cAAc,CAACG,SAAS,GAAG,MAAMvC,kBAAkBkB;QAC1D;QAEA,oEAAoE;QACpE,gFAAgF;QAChF,8EAA8E;QAC9E,8EAA8E;QAC9E,6DAA6D;QAC7DX,IAAIE,IAAI,CAACH,IAAI,GAAGY;QAChBX,IAAIE,IAAI,CAACY,IAAI,GAAGD;QAChB,IAAIN,oBAAoBQ,eAAe,IAAIR,oBAAoBS,OAAO,CAACV,MAAM,GAAG,GAAG;YACjFN,IAAIE,IAAI,CAACqB,IAAI,GAAGxB,KAAKuB,QAAQ;YAC7BtB,IAAIE,IAAI,CAACC,QAAQ,GAAGJ,KAAK4B,QAAQ;QACnC;QACA7B,QAAQmC,8BAA8B,GAAGtB;QACzCb,QAAQoC,wBAAwB,GAAG;QAEnC,OAAOnC;IACT;AACF,EAAC"}

package/dist/tasks/convertFormats.js

@@ -3,6 +3,7 @@ import path from 'path';
 import { resolveCollectionConfig } from '../defaults.js';
 import { convertFormat } from '../processing/index.js';
 import { resolveStaticDir } from '../utilities/resolveStaticDir.js';
+import { fetchFileBuffer, isCloudStorage } from '../utilities/storage.js';
 export const createConvertFormatsHandler = (resolvedConfig)=>{
     return async ({ input, req })=>{
         try {
@@ -11,19 +12,42 @@ export const createConvertFormatsHandler = (resolvedConfig)=>{
                 id: input.docId
             });
             const collectionConfig = req.payload.collections[input.collectionSlug].config;
+            const cloudStorage = isCloudStorage(collectionConfig);
+            // Cloud storage: variant files cannot be uploaded without direct adapter access.
+            // Mark as complete — CDN-level image optimization handles format conversion.
+            if (cloudStorage) {
+                await req.payload.update({
+                    collection: input.collectionSlug,
+                    id: input.docId,
+                    data: {
+                        imageOptimizer: {
+                            ...doc.imageOptimizer,
+                            status: 'complete',
+                            variants: [],
+                            error: null
+                        }
+                    },
+                    context: {
+                        imageOptimizer_skip: true
+                    }
+                });
+                return {
+                    output: {
+                        variantsGenerated: 0
+                    }
+                };
+            }
             const staticDir = resolveStaticDir(collectionConfig);
             if (!staticDir) {
                 throw new Error(`No staticDir configured for collection "${input.collectionSlug}"`);
             }
-            // Sanitize filename to prevent path traversal
-            const safeFilename = path.basename(doc.filename);
-            const filePath = path.join(staticDir, safeFilename);
-            const fileBuffer = await fs.readFile(filePath);
+            const fileBuffer = await fetchFileBuffer(doc, collectionConfig);
             const variants = [];
             const perCollectionConfig = resolveCollectionConfig(resolvedConfig, input.collectionSlug);
             // When replaceOriginal is on, the main file is already in the primary format —
             // skip it and only generate variants for the remaining formats.
             const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0 ? perCollectionConfig.formats.slice(1) : perCollectionConfig.formats;
+            const safeFilename = path.basename(doc.filename);
             for (const format of formatsToGenerate){
                 const result = await convertFormat(fileBuffer, format.format, format.quality);
                 const variantFilename = `${path.parse(safeFilename).name}-optimized.${format.format}`;
@@ -43,8 +67,10 @@ export const createConvertFormatsHandler = (resolvedConfig)=>{
                 id: input.docId,
                 data: {
                     imageOptimizer: {
+                        ...doc.imageOptimizer,
                         status: 'complete',
-                        variants
+                        variants,
+                        error: null
                     }
                 },
                 context: {

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'\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 staticDir = resolveStaticDir(collectionConfig)\n\n      if (!staticDir) {\n        throw new Error(`No staticDir configured for collection \"${input.collectionSlug}\"`)\n      }\n\n      // Sanitize filename to prevent path traversal\n      const safeFilename = path.basename(doc.filename)\n      const filePath = path.join(staticDir, safeFilename)\n      const fileBuffer = await fs.readFile(filePath)\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      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            status: 'complete',\n            variants,\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","createConvertFormatsHandler","resolvedConfig","input","req","doc","payload","findByID","collection","collectionSlug","id","docId","collectionConfig","collections","config","staticDir","Error","safeFilename","basename","filename","filePath","join","fileBuffer","readFile","variants","perCollectionConfig","formatsToGenerate","replaceOriginal","formats","length","slice","format","result","quality","variantFilename","parse","name","writeFile","buffer","push","filesize","size","width","height","mimeType","url","update","data","imageOptimizer","status","context","imageOptimizer_skip","output","variantsGenerated","err","errorMessage","message","String","error","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 },\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

@@ -3,6 +3,7 @@ import path from 'path';
 import { resolveCollectionConfig } from '../defaults.js';
 import { stripAndResize, generateThumbHash, convertFormat } from '../processing/index.js';
 import { resolveStaticDir } from '../utilities/resolveStaticDir.js';
+import { fetchFileBuffer, isCloudStorage } from '../utilities/storage.js';
 export const createRegenerateDocumentHandler = (resolvedConfig)=>{
     return async ({ input, req })=>{
         try {
@@ -20,28 +21,12 @@ export const createRegenerateDocumentHandler = (resolvedConfig)=>{
                 };
             }
             const collectionConfig = req.payload.collections[input.collectionSlug].config;
-            const staticDir = resolveStaticDir(collectionConfig);
-            if (!staticDir) {
-                throw new Error(`No staticDir configured for collection "${input.collectionSlug}"`);
-            }
-            // Sanitize filename to prevent path traversal
-            const safeFilename = path.basename(doc.filename);
-            const filePath = path.join(staticDir, safeFilename);
-            let fileBuffer;
-            try {
-                fileBuffer = await fs.readFile(filePath);
-            } catch  {
-                // If file not on disk, try fetching from URL
-                if (doc.url) {
-                    const url = doc.url.startsWith('http') ? doc.url : `${process.env.NEXT_PUBLIC_SERVER_URL || ''}${doc.url}`;
-                    const response = await fetch(url);
-                    fileBuffer = Buffer.from(await response.arrayBuffer());
-                } else {
-                    throw new Error(`File not found: ${filePath}`);
-                }
-            }
+            const cloudStorage = isCloudStorage(collectionConfig);
+            const fileBuffer = await fetchFileBuffer(doc, collectionConfig);
             const originalSize = fileBuffer.length;
             const perCollectionConfig = resolveCollectionConfig(resolvedConfig, input.collectionSlug);
+            // Sanitize filename to prevent path traversal
+            const safeFilename = path.basename(doc.filename);
             // Step 1: Strip metadata + resize
             const processed = await stripAndResize(fileBuffer, perCollectionConfig.maxDimensions, resolvedConfig.stripMetadata);
             let mainBuffer = processed.buffer;
@@ -57,60 +42,96 @@ export const createRegenerateDocumentHandler = (resolvedConfig)=>{
                 newFilename = `${path.parse(safeFilename).name}.${primaryFormat.format}`;
                 newMimeType = converted.mimeType;
             }
-            // Write optimized file to disk
-            const newFilePath = path.join(staticDir, newFilename);
-            await fs.writeFile(newFilePath, mainBuffer);
-            // Clean up old file if filename changed
-            if (newFilename !== safeFilename) {
-                await fs.unlink(filePath).catch(()=>{});
-            }
             // Step 2: Generate ThumbHash
             let thumbHash;
             if (resolvedConfig.generateThumbHash) {
                 thumbHash = await generateThumbHash(mainBuffer);
             }
-            // Step 3: Convert to configured formats (skip primary when replaceOriginal)
-            const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0 ? perCollectionConfig.formats.slice(1) : perCollectionConfig.formats;
+            // Step 3: Store the optimized file
             const variants = [];
-            for (const format of formatsToGenerate){
-                const result = await convertFormat(mainBuffer, format.format, format.quality);
-                const variantFilename = `${path.parse(newFilename).name}-optimized.${format.format}`;
-                await fs.writeFile(path.join(staticDir, variantFilename), result.buffer);
-                variants.push({
-                    format: format.format,
-                    filename: variantFilename,
-                    filesize: result.size,
-                    width: result.width,
-                    height: result.height,
-                    mimeType: result.mimeType,
-                    url: `/api/${input.collectionSlug}/file/${variantFilename}`
+            if (cloudStorage) {
+                // Cloud storage: re-upload the optimized file via Payload's update API.
+                // This triggers the cloud adapter's afterChange hook which uploads to cloud.
+                const updateData = {
+                    imageOptimizer: {
+                        originalSize,
+                        optimizedSize: mainSize,
+                        status: 'complete',
+                        thumbHash,
+                        variants: [],
+                        error: null
+                    }
+                };
+                if (newFilename !== safeFilename) {
+                    updateData.filename = newFilename;
+                    updateData.filesize = mainSize;
+                    updateData.mimeType = newMimeType;
+                }
+                await req.payload.update({
+                    collection: input.collectionSlug,
+                    id: input.docId,
+                    data: updateData,
+                    file: {
+                        data: mainBuffer,
+                        mimetype: newMimeType || doc.mimeType,
+                        name: newFilename,
+                        size: mainSize
+                    },
+                    context: {
+                        imageOptimizer_skip: true
+                    }
                 });
-            }
-            // Step 4: Update the document with all optimization data
-            const updateData = {
-                imageOptimizer: {
-                    originalSize,
-                    optimizedSize: mainSize,
-                    status: 'complete',
-                    thumbHash,
-                    variants,
-                    error: null
+            } else {
+                // Local storage: write files to disk
+                const staticDir = resolveStaticDir(collectionConfig);
+                const newFilePath = path.join(staticDir, newFilename);
+                await fs.writeFile(newFilePath, mainBuffer);
+                // Clean up old file if filename changed
+                if (newFilename !== safeFilename) {
+                    const oldFilePath = path.join(staticDir, safeFilename);
+                    await fs.unlink(oldFilePath).catch(()=>{});
                 }
-            };
-            // Update filename, mimeType, and filesize when replaceOriginal changed them
-            if (newFilename !== safeFilename) {
-                updateData.filename = newFilename;
-                updateData.filesize = mainSize;
-                updateData.mimeType = newMimeType;
-            }
-            await req.payload.update({
-                collection: input.collectionSlug,
-                id: input.docId,
-                data: updateData,
-                context: {
-                    imageOptimizer_skip: true
+                // Generate variant files (local storage only)
+                const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0 ? perCollectionConfig.formats.slice(1) : perCollectionConfig.formats;
+                for (const format of formatsToGenerate){
+                    const result = await convertFormat(mainBuffer, format.format, format.quality);
+                    const variantFilename = `${path.parse(newFilename).name}-optimized.${format.format}`;
+                    await fs.writeFile(path.join(staticDir, variantFilename), result.buffer);
+                    variants.push({
+                        format: format.format,
+                        filename: variantFilename,
+                        filesize: result.size,
+                        width: result.width,
+                        height: result.height,
+                        mimeType: result.mimeType,
+                        url: `/api/${input.collectionSlug}/file/${variantFilename}`
+                    });
                 }
-            });
+                // Update the document with optimization data
+                const updateData = {
+                    imageOptimizer: {
+                        originalSize,
+                        optimizedSize: mainSize,
+                        status: 'complete',
+                        thumbHash,
+                        variants,
+                        error: null
+                    }
+                };
+                if (newFilename !== safeFilename) {
+                    updateData.filename = newFilename;
+                    updateData.filesize = mainSize;
+                    updateData.mimeType = newMimeType;
+                }
+                await req.payload.update({
+                    collection: input.collectionSlug,
+                    id: input.docId,
+                    data: updateData,
+                    context: {
+                        imageOptimizer_skip: true
+                    }
+                });
+            }
             return {
                 output: {
                     status: 'complete'

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'\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 staticDir = resolveStaticDir(collectionConfig)\n\n      if (!staticDir) {\n        throw new Error(`No staticDir configured for collection \"${input.collectionSlug}\"`)\n      }\n\n      // Sanitize filename to prevent path traversal\n      const safeFilename = path.basename(doc.filename)\n      const filePath = path.join(staticDir, safeFilename)\n\n      let fileBuffer: Buffer\n      try {\n        fileBuffer = await fs.readFile(filePath)\n      } catch {\n        // If file not on disk, try fetching from URL\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          fileBuffer = Buffer.from(await response.arrayBuffer())\n        } else {\n          throw new Error(`File not found: ${filePath}`)\n        }\n      }\n\n      const originalSize = fileBuffer.length\n      const perCollectionConfig = resolveCollectionConfig(resolvedConfig, input.collectionSlug)\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      // Write optimized file to disk\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        await fs.unlink(filePath).catch(() => {})\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: Convert to configured formats (skip primary when replaceOriginal)\n      const formatsToGenerate = perCollectionConfig.replaceOriginal && perCollectionConfig.formats.length > 0\n        ? perCollectionConfig.formats.slice(1)\n        : perCollectionConfig.formats\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      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      // Step 4: Update the document with all 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      // Update filename, mimeType, and filesize when replaceOriginal changed them\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      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","createRegenerateDocumentHandler","resolvedConfig","input","req","doc","payload","findByID","collection","collectionSlug","id","docId","mimeType","startsWith","output","status","reason","collectionConfig","collections","config","staticDir","Error","safeFilename","basename","filename","filePath","join","fileBuffer","readFile","url","process","env","NEXT_PUBLIC_SERVER_URL","response","fetch","Buffer","from","arrayBuffer","originalSize","length","perCollectionConfig","processed","maxDimensions","stripMetadata","mainBuffer","buffer","mainSize","size","newFilename","newMimeType","replaceOriginal","formats","primaryFormat","converted","format","quality","parse","name","newFilePath","writeFile","unlink","catch","thumbHash","formatsToGenerate","slice","variants","result","variantFilename","push","filesize","width","height","updateData","imageOptimizer","optimizedSize","error","update","data","context","imageOptimizer_skip","err","errorMessage","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 },\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.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Returns true when the collection uses cloud/external storage (disableLocalStorage: true).
+ * When true, files are uploaded by external adapter hooks — no local FS writes should happen.
+ */
+export declare function isCloudStorage(collectionConfig: {
+    upload?: boolean | Record<string, any>;
+}): boolean;
+/**
+ * Reads a file buffer from local disk or fetches it from URL.
+ * Tries local disk first (when available), falls back to URL fetch.
+ * This makes the plugin storage-agnostic — works with local FS and cloud storage alike.
+ */
+export declare function fetchFileBuffer(doc: {
+    filename?: string;
+    url?: string;
+}, collectionConfig: {
+    upload?: boolean | Record<string, any>;
+}): Promise<Buffer>;

package/dist/utilities/storage.js

@@ -0,0 +1,39 @@
+import fs from 'fs/promises';
+import path from 'path';
+import { resolveStaticDir } from './resolveStaticDir.js';
+/**
+ * Returns true when the collection uses cloud/external storage (disableLocalStorage: true).
+ * When true, files are uploaded by external adapter hooks — no local FS writes should happen.
+ */ export function isCloudStorage(collectionConfig) {
+    return typeof collectionConfig.upload === 'object' && collectionConfig.upload.disableLocalStorage === true;
+}
+/**
+ * Reads a file buffer from local disk or fetches it from URL.
+ * Tries local disk first (when available), falls back to URL fetch.
+ * This makes the plugin storage-agnostic — works with local FS and cloud storage alike.
+ */ export async function fetchFileBuffer(doc, collectionConfig) {
+    const safeFilename = doc.filename ? path.basename(doc.filename) : undefined;
+    // Try local disk first (only when local storage is enabled)
+    if (!isCloudStorage(collectionConfig) && safeFilename) {
+        const staticDir = resolveStaticDir(collectionConfig);
+        if (staticDir) {
+            try {
+                return await fs.readFile(path.join(staticDir, safeFilename));
+            } catch  {
+            // Fall through to URL fetch
+            }
+        }
+    }
+    // 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 (!response.ok) {
+            throw new Error(`Failed to fetch file from ${url}: ${response.status} ${response.statusText}`);
+        }
+        return Buffer.from(await response.arrayBuffer());
+    }
+    throw new Error(`Cannot read file: no local path or URL available for "${doc.filename}"`);
+}
+
+//# sourceMappingURL=storage.js.map

package/dist/utilities/storage.js.map

@@ -0,0 +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"}

package/package.json

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

package/src/components/OptimizationStatus.tsx

@@ -2,7 +2,7 @@
 
 import React from 'react'
 import { thumbHashToDataURL } from 'thumbhash'
-import { useAllFormFields } from '@payloadcms/ui'
+import { useAllFormFields, useDocumentInfo } from '@payloadcms/ui'
 
 const formatBytes = (bytes: number): string => {
   if (bytes === 0) return '0 B'
@@ -19,15 +19,90 @@ const statusColors: Record<string, string> = {
   error: '#ef4444',
 }
 
+const POLL_INTERVAL_MS = 2000
+
+type PolledData = {
+  status?: string
+  originalSize?: number
+  optimizedSize?: number
+  thumbHash?: string
+  error?: string
+  variants?: Array<{
+    format?: string
+    filename?: string
+    filesize?: number
+    width?: number
+    height?: number
+  }>
+}
+
 export const OptimizationStatus: React.FC<{ path?: string }> = (props) => {
   const [formState] = useAllFormFields()
+  const { collectionSlug, id } = useDocumentInfo()
   const basePath = props.path ?? 'imageOptimizer'
 
-  const status = formState[`${basePath}.status`]?.value as string | undefined
-  const originalSize = formState[`${basePath}.originalSize`]?.value as number | undefined
-  const optimizedSize = formState[`${basePath}.optimizedSize`]?.value as number | undefined
-  const thumbHash = formState[`${basePath}.thumbHash`]?.value as string | undefined
-  const error = formState[`${basePath}.error`]?.value as string | undefined
+  const formStatus = formState[`${basePath}.status`]?.value as string | undefined
+  const formOriginalSize = formState[`${basePath}.originalSize`]?.value as number | undefined
+  const formOptimizedSize = formState[`${basePath}.optimizedSize`]?.value as number | undefined
+  const formThumbHash = formState[`${basePath}.thumbHash`]?.value as string | undefined
+  const formError = formState[`${basePath}.error`]?.value as string | undefined
+
+  const [polledData, setPolledData] = React.useState<PolledData | null>(null)
+
+  // Reset polled data when a new upload changes the form status back to pending
+  React.useEffect(() => {
+    if (formStatus === 'pending') {
+      setPolledData(null)
+    }
+  }, [formStatus])
+
+  // Poll for status updates when status is non-terminal
+  React.useEffect(() => {
+    const currentStatus = polledData?.status ?? formStatus
+    if (!currentStatus || currentStatus === 'complete' || currentStatus === 'error') return
+    if (!collectionSlug || !id) return
+
+    const controller = new AbortController()
+
+    const poll = async () => {
+      try {
+        const res = await fetch(`/api/${collectionSlug}/${id}?depth=0`, {
+          signal: controller.signal,
+        })
+        if (!res.ok) return
+        const doc = await res.json()
+        const optimizer = doc.imageOptimizer
+        if (!optimizer) return
+
+        setPolledData({
+          status: optimizer.status,
+          originalSize: optimizer.originalSize,
+          optimizedSize: optimizer.optimizedSize,
+          thumbHash: optimizer.thumbHash,
+          error: optimizer.error,
+          variants: optimizer.variants,
+        })
+      } catch {
+        // Silently ignore fetch errors (abort, network issues)
+      }
+    }
+
+    const intervalId = setInterval(poll, POLL_INTERVAL_MS)
+    // Run immediately on mount
+    poll()
+
+    return () => {
+      controller.abort()
+      clearInterval(intervalId)
+    }
+  }, [polledData?.status, formStatus, collectionSlug, id])
+
+  // Use polled data when available, otherwise fall back to form state
+  const status = polledData?.status ?? formStatus
+  const originalSize = polledData?.originalSize ?? formOriginalSize
+  const optimizedSize = polledData?.optimizedSize ?? formOptimizedSize
+  const thumbHash = polledData?.thumbHash ?? formThumbHash
+  const error = polledData?.error ?? formError
 
   const thumbHashUrl = React.useMemo(() => {
     if (!thumbHash) return null
@@ -39,26 +114,30 @@ export const OptimizationStatus: React.FC<{ path?: string }> = (props) => {
     }
   }, [thumbHash])
 
-  // Read variants array from form state
-  const variantsField = formState[`${basePath}.variants`]
-  const rowCount = (variantsField as any)?.rows?.length ?? 0
+  // Read variants from polled data or form state
   const variants: Array<{
     format?: string
     filename?: string
     filesize?: number
     width?: number
     height?: number
-  }> = []
-
-  for (let i = 0; i < rowCount; i++) {
-    variants.push({
-      format: formState[`${basePath}.variants.${i}.format`]?.value as string | undefined,
-      filename: formState[`${basePath}.variants.${i}.filename`]?.value as string | undefined,
-      filesize: formState[`${basePath}.variants.${i}.filesize`]?.value as number | undefined,
-      width: formState[`${basePath}.variants.${i}.width`]?.value as number | undefined,
-      height: formState[`${basePath}.variants.${i}.height`]?.value as number | undefined,
-    })
-  }
+  }> = React.useMemo(() => {
+    if (polledData?.variants) return polledData.variants
+
+    const variantsField = formState[`${basePath}.variants`]
+    const rowCount = (variantsField as any)?.rows?.length ?? 0
+    const formVariants: typeof variants = []
+    for (let i = 0; i < rowCount; i++) {
+      formVariants.push({
+        format: formState[`${basePath}.variants.${i}.format`]?.value as string | undefined,
+        filename: formState[`${basePath}.variants.${i}.filename`]?.value as string | undefined,
+        filesize: formState[`${basePath}.variants.${i}.filesize`]?.value as number | undefined,
+        width: formState[`${basePath}.variants.${i}.width`]?.value as number | undefined,
+        height: formState[`${basePath}.variants.${i}.height`]?.value as number | undefined,
+      })
+    }
+    return formVariants
+  }, [polledData?.variants, formState, basePath])
 
   if (!status) {
     return (

package/src/hooks/afterChange.ts

@@ -14,7 +14,10 @@ export const createAfterChangeHook = (
   return async ({ context, doc, req }) => {
     if (context?.imageOptimizer_skip) return doc
 
-    if (!req.file || !req.file.data || !req.file.mimetype?.startsWith('image/')) return doc
+    // Use context flag from beforeChange instead of checking req.file.data directly.
+    // Cloud storage adapters may consume req.file.data in their own afterChange hook
+    // before ours runs, which would cause this guard to bail out and leave status as 'pending'.
+    if (!context?.imageOptimizer_hasUpload) return doc
 
     const collectionConfig = req.payload.collections[collectionSlug as keyof typeof req.payload.collections].config
     const cloudStorage = isCloudStorage(collectionConfig)
@@ -52,8 +55,10 @@ export const createAfterChangeHook = (
         id: doc.id,
         data: {
           imageOptimizer: {
+            ...doc.imageOptimizer,
             status: 'complete',
             variants: [],
+            error: null,
           },
         },
         context: { imageOptimizer_skip: true },
@@ -70,8 +75,10 @@ export const createAfterChangeHook = (
         id: doc.id,
         data: {
           imageOptimizer: {
+            ...doc.imageOptimizer,
             status: 'complete',
             variants: [],
+            error: null,
           },
         },
         context: { imageOptimizer_skip: true },

package/src/hooks/beforeChange.ts

@@ -67,6 +67,7 @@ export const createBeforeChangeHook = (
       req.file.mimetype = data.mimeType
     }
     context.imageOptimizer_processedBuffer = finalBuffer
+    context.imageOptimizer_hasUpload = true
 
     return data
   }

package/src/tasks/convertFormats.ts

@@ -28,8 +28,10 @@ export const createConvertFormatsHandler = (resolvedConfig: ResolvedImageOptimiz
           id: input.docId,
           data: {
             imageOptimizer: {
+              ...doc.imageOptimizer,
               status: 'complete',
               variants: [],
+              error: null,
             },
           },
           context: { imageOptimizer_skip: true },
@@ -86,8 +88,10 @@ export const createConvertFormatsHandler = (resolvedConfig: ResolvedImageOptimiz
         id: input.docId,
         data: {
           imageOptimizer: {
+            ...doc.imageOptimizer,
             status: 'complete',
             variants,
+            error: null,
           },
         },
         context: { imageOptimizer_skip: true },