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

package/dist/endpoints/regenerate.js

@@ -87,7 +87,7 @@ export const createRegenerateHandler = (resolvedConfig)=>{
                     err
                 }, 'Regeneration job runner failed');
             });
-            waitUntil(runPromise);
+            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'\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)\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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"}
+{"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

@@ -53,7 +53,7 @@ export const createAfterChangeHook = (resolvedConfig, collectionSlug)=>{
                 err
             }, 'Image optimizer job runner failed');
         });
-        waitUntil(runPromise);
+        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'\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)\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;QAEV,OAAO/B;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/utilities/waitUntil.d.ts

@@ -1,7 +1,14 @@
 /**
  * Extends the serverless function lifetime to keep a promise alive after the
- * response is sent. Uses the Next.js `waitUntil` context when available
- * (Vercel / serverless). In non-serverless environments, the promise runs
- * fire-and-forget as before — Node.js keeps the process alive regardless.
+ * 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>): void;
+export declare function waitUntil(promise: Promise<unknown>, req?: {
+    context?: {
+        waitUntil?: (p: Promise<unknown>) => void;
+    };
+}): void;

package/dist/utilities/waitUntil.js

@@ -1,9 +1,16 @@
 /**
  * Extends the serverless function lifetime to keep a promise alive after the
- * response is sent. Uses the Next.js `waitUntil` context when available
- * (Vercel / serverless). In non-serverless environments, the promise runs
- * fire-and-forget as before — Node.js keeps the process alive regardless.
- */ export function waitUntil(promise) {
+ * 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);
 }

package/dist/utilities/waitUntil.js.map

@@ -1 +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. Uses the Next.js `waitUntil` context when available\n * (Vercel / serverless). In non-serverless environments, the promise runs\n * fire-and-forget as before — Node.js keeps the process alive regardless.\n */\nexport function waitUntil(promise: Promise<unknown>): void {\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","ctx","globalThis","__next_request_context"],"mappings":"AAAA;;;;;CAKC,GACD,OAAO,SAASA,UAAUC,OAAyB;IACjD,MAAMC,MAAM,AAACC,WAAuCC,sBAAsB;IAI1EF,KAAKF,YAAYC;AACnB"}
+{"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.4.0",
+  "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

@@ -78,7 +78,7 @@ export const createRegenerateHandler = (resolvedConfig: ResolvedImageOptimizerCo
       const runPromise = req.payload.jobs.run({ limit: queued }).catch((err: unknown) => {
         req.payload.logger.error({ err }, 'Regeneration job runner failed')
       })
-      waitUntil(runPromise)
+      waitUntil(runPromise, req)
     }
 
     return Response.json({ queued, collectionSlug })

package/src/hooks/afterChange.ts

@@ -65,7 +65,7 @@ export const createAfterChangeHook = (
     const runPromise = req.payload.jobs.run().catch((err: unknown) => {
       req.payload.logger.error({ err }, 'Image optimizer job runner failed')
     })
-    waitUntil(runPromise)
+    waitUntil(runPromise, req)
 
     return doc
   }

package/src/utilities/waitUntil.ts

@@ -1,10 +1,21 @@
 /**
  * Extends the serverless function lifetime to keep a promise alive after the
- * response is sent. Uses the Next.js `waitUntil` context when available
- * (Vercel / serverless). In non-serverless environments, the promise runs
- * fire-and-forget as before — Node.js keeps the process alive regardless.
+ * 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>): void {
+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