payload 4.0.0-internal.2fddfc0 → 4.0.0-internal.31ba7ee

package/dist/queues/operations/handleSchedules/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/queues/operations/handleSchedules/index.ts"],"sourcesContent":["import { Cron } from 'croner'\n\nimport type { Job, TaskConfig, WorkflowConfig } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { BeforeScheduleFn, Queueable, ScheduleConfig } from '../../config/types/index.js'\n\nimport { type JobStats, jobStatsGlobalSlug } from '../../config/global.js'\nimport { defaultAfterSchedule } from './defaultAfterSchedule.js'\nimport { defaultBeforeSchedule } from './defaultBeforeSchedule.js'\nimport { getQueuesWithSchedules } from './getQueuesWithSchedules.js'\n\nexport type HandleSchedulesResult = {\n  errored: Queueable[]\n  queued: Queueable[]\n  skipped: Queueable[]\n}\n\n/**\n * On vercel, we cannot auto-schedule jobs using a Cron - instead, we'll use this same endpoint that can\n * also be called from Vercel Cron for auto-running jobs.\n *\n * The benefit of doing it like this instead of a separate endpoint is that we can run jobs immediately\n * after they are scheduled\n */\nexport async function handleSchedules({\n  allQueues = false,\n  queue: _queue,\n  req,\n}: {\n  /**\n   * If you want to schedule jobs from all queues, set this to true.\n   * If you set this to true, the `queue` property will be ignored.\n   *\n   * @default false\n   */\n  allQueues?: boolean\n  /**\n   * If you want to only schedule jobs that are set to schedule in a specific queue, set this to the queue name.\n   *\n   * @default jobs from the `default` queue will be executed.\n   */\n  queue?: string\n  req: PayloadRequest\n}): Promise<HandleSchedulesResult> {\n  const queue = _queue ?? 'default'\n  const jobsConfig = req.payload.config.jobs\n  const queuesWithSchedules = getQueuesWithSchedules({\n    jobsConfig,\n  })\n\n  if (Object.keys(queuesWithSchedules).length === 0) {\n    // No schedules defined => return early, before fetching jobsStatsGlobal, as the global may not even exist\n    return {\n      errored: [],\n      queued: [],\n      skipped: [],\n    }\n  }\n\n  const stats: JobStats = await req.payload.db.findGlobal({\n    slug: jobStatsGlobalSlug,\n    req,\n  })\n\n  /**\n   * Almost last step! Tasks and Workflows added here just need to be constraint-checked (e.g max. 1 running task etc.),\n   * before we can queue them\n   */\n  const queueables: Queueable[] = []\n\n  // Need to know when that particular job was last scheduled in that particular queue\n\n  for (const [queueName, { schedules }] of Object.entries(queuesWithSchedules)) {\n    if (!allQueues && queueName !== queue) {\n      // If a queue is specified, only schedule jobs for that queue\n      continue\n    }\n    for (const schedulable of schedules) {\n      const queuable = checkQueueableTimeConstraints({\n        queue: queueName,\n        scheduleConfig: schedulable.scheduleConfig,\n        stats,\n        taskConfig: schedulable.taskConfig,\n        workflowConfig: schedulable.workflowConfig,\n      })\n      if (queuable) {\n        queueables.push(queuable)\n      }\n    }\n  }\n\n  const queued: Queueable[] = []\n  const skipped: Queueable[] = []\n  const errored: Queueable[] = []\n\n  /**\n   * Now queue, but check for constraints (= beforeSchedule) first.\n   * Default constraint (= defaultBeforeSchedule): max. 1 running / scheduled task or workflow per queue\n   */\n  for (const queueable of queueables) {\n    const { status } = await scheduleQueueable({\n      queueable,\n      req,\n      stats,\n    })\n    switch (status) {\n      case 'error':\n        errored.push(queueable)\n        break\n      case 'skipped':\n        skipped.push(queueable)\n        break\n      case 'success':\n        queued.push(queueable)\n        break\n    }\n  }\n  return {\n    errored,\n    queued,\n    skipped,\n  }\n}\n\nexport function checkQueueableTimeConstraints({\n  queue,\n  scheduleConfig,\n  stats,\n  taskConfig,\n  workflowConfig,\n}: {\n  queue: string\n  scheduleConfig: ScheduleConfig\n  stats: JobStats\n  taskConfig?: TaskConfig\n  workflowConfig?: WorkflowConfig\n}): false | Queueable {\n  const queueScheduleStats = stats?.stats?.scheduledRuns?.queues?.[queue]\n\n  const lastScheduledRun = taskConfig\n    ? queueScheduleStats?.tasks?.[taskConfig.slug]?.lastScheduledRun\n    : queueScheduleStats?.workflows?.[workflowConfig?.slug ?? '']?.lastScheduledRun\n\n  const nextRun = new Cron(scheduleConfig.cron).nextRun(lastScheduledRun ?? undefined)\n\n  if (!nextRun) {\n    return false\n  }\n  return {\n    scheduleConfig,\n    taskConfig,\n    waitUntil: nextRun,\n    workflowConfig,\n  }\n}\n\nexport async function scheduleQueueable({\n  queueable,\n  req,\n  stats,\n}: {\n  queueable: Queueable\n  req: PayloadRequest\n  stats: JobStats\n}): Promise<{\n  job?: Job<false>\n  status: 'error' | 'skipped' | 'success'\n}> {\n  if (!queueable.taskConfig && !queueable.workflowConfig) {\n    return {\n      status: 'error',\n    }\n  }\n\n  const beforeScheduleFn = queueable.scheduleConfig.hooks?.beforeSchedule\n  const afterScheduleFN = queueable.scheduleConfig.hooks?.afterSchedule\n\n  try {\n    const beforeScheduleResult: Awaited<ReturnType<BeforeScheduleFn>> = await (\n      beforeScheduleFn ?? defaultBeforeSchedule\n    )({\n      // @ts-expect-error we know defaultBeforeSchedule will never call itself => pass null\n      defaultBeforeSchedule: beforeScheduleFn ? defaultBeforeSchedule : null,\n      jobStats: stats,\n      queueable,\n      req,\n    })\n\n    if (!beforeScheduleResult.shouldSchedule) {\n      await (afterScheduleFN ?? defaultAfterSchedule)({\n        // @ts-expect-error we know defaultAfterchedule will never call itself => pass null\n        defaultAfterSchedule: afterScheduleFN ? defaultAfterSchedule : null,\n        jobStats: stats,\n        queueable,\n        req,\n        status: 'skipped',\n      })\n      return {\n        status: 'skipped',\n      }\n    }\n\n    const job = (await req.payload.jobs.queue({\n      input: beforeScheduleResult.input ?? {},\n      meta: {\n        scheduled: true,\n      },\n      queue: queueable.scheduleConfig.queue,\n      req,\n      task: queueable?.taskConfig?.slug,\n      waitUntil: beforeScheduleResult.waitUntil,\n      workflow: queueable.workflowConfig?.slug,\n    } as Parameters<typeof req.payload.jobs.queue>[0])) as unknown as Job<false>\n\n    await (afterScheduleFN ?? defaultAfterSchedule)({\n      // @ts-expect-error we know defaultAfterchedule will never call itself => pass null\n      defaultAfterSchedule: afterScheduleFN ? defaultAfterSchedule : null,\n      job,\n      jobStats: stats,\n      queueable,\n      req,\n      status: 'success',\n    })\n    return {\n      status: 'success',\n    }\n  } catch (error) {\n    await (afterScheduleFN ?? defaultAfterSchedule)({\n      // @ts-expect-error we know defaultAfterchedule will never call itself => pass null\n      defaultAfterSchedule: afterScheduleFN ? defaultAfterSchedule : null,\n      error: error as Error,\n      jobStats: stats,\n      queueable,\n      req,\n      status: 'error',\n    })\n    return {\n      status: 'error',\n    }\n  }\n}\n"],"names":["Cron","jobStatsGlobalSlug","defaultAfterSchedule","defaultBeforeSchedule","getQueuesWithSchedules","handleSchedules","allQueues","queue","_queue","req","jobsConfig","payload","config","jobs","queuesWithSchedules","Object","keys","length","errored","queued","skipped","stats","db","findGlobal","slug","queueables","queueName","schedules","entries","schedulable","queuable","checkQueueableTimeConstraints","scheduleConfig","taskConfig","workflowConfig","push","queueable","status","scheduleQueueable","queueScheduleStats","scheduledRuns","queues","lastScheduledRun","tasks","workflows","nextRun","cron","undefined","waitUntil","beforeScheduleFn","hooks","beforeSchedule","afterScheduleFN","afterSchedule","beforeScheduleResult","jobStats","shouldSchedule","job","input","meta","scheduled","task","workflow","error"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/queues/operations/handleSchedules/index.ts"],"sourcesContent":["import { Cron } from 'croner'\n\nimport type { Job, TaskConfig, WorkflowConfig } from '../../../index.js'\nimport type { PayloadRequest } from '../../../types/index.js'\nimport type { BeforeScheduleFn, Queueable, ScheduleConfig } from '../../config/types/index.js'\n\nimport { type JobStats, jobStatsGlobalSlug } from '../../config/global.js'\nimport { defaultAfterSchedule } from './defaultAfterSchedule.js'\nimport { defaultBeforeSchedule } from './defaultBeforeSchedule.js'\nimport { getQueuesWithSchedules } from './getQueuesWithSchedules.js'\n\nexport type HandleSchedulesResult = {\n  errored: Queueable[]\n  queued: Queueable[]\n  skipped: Queueable[]\n}\n\n/**\n * On vercel, we cannot auto-schedule jobs using a Cron - instead, we'll use this same endpoint that can\n * also be called from Vercel Cron for auto-running jobs.\n *\n * The benefit of doing it like this instead of a separate endpoint is that we can run jobs immediately\n * after they are scheduled\n */\nexport async function handleSchedules({\n  allQueues = false,\n  queue: _queue,\n  req,\n}: {\n  /**\n   * If you want to schedule jobs from all queues, set this to true.\n   * If you set this to true, the `queue` property will be ignored.\n   *\n   * @default false\n   */\n  allQueues?: boolean\n  /**\n   * If you want to only schedule jobs that are set to schedule in a specific queue, set this to the queue name.\n   *\n   * @default jobs from the `default` queue will be executed.\n   */\n  queue?: string\n  req: PayloadRequest\n}): Promise<HandleSchedulesResult> {\n  const queue = _queue ?? 'default'\n  const jobsConfig = req.payload.config.jobs\n  const queuesWithSchedules = getQueuesWithSchedules({\n    jobsConfig,\n  })\n\n  if (Object.keys(queuesWithSchedules).length === 0) {\n    // No schedules defined => return early before fetching the stats global.\n    return {\n      errored: [],\n      queued: [],\n      skipped: [],\n    }\n  }\n\n  const stats: JobStats = await req.payload.db.findGlobal({\n    slug: jobStatsGlobalSlug,\n    req,\n  })\n\n  /**\n   * Almost last step! Tasks and Workflows added here just need to be constraint-checked (e.g max. 1 running task etc.),\n   * before we can queue them\n   */\n  const queueables: Queueable[] = []\n\n  // Need to know when that particular job was last scheduled in that particular queue\n\n  for (const [queueName, { schedules }] of Object.entries(queuesWithSchedules)) {\n    if (!allQueues && queueName !== queue) {\n      // If a queue is specified, only schedule jobs for that queue\n      continue\n    }\n    for (const schedulable of schedules) {\n      const queuable = checkQueueableTimeConstraints({\n        queue: queueName,\n        scheduleConfig: schedulable.scheduleConfig,\n        stats,\n        taskConfig: schedulable.taskConfig,\n        workflowConfig: schedulable.workflowConfig,\n      })\n      if (queuable) {\n        queueables.push(queuable)\n      }\n    }\n  }\n\n  const queued: Queueable[] = []\n  const skipped: Queueable[] = []\n  const errored: Queueable[] = []\n\n  /**\n   * Now queue, but check for constraints (= beforeSchedule) first.\n   * Default constraint (= defaultBeforeSchedule): max. 1 running / scheduled task or workflow per queue\n   */\n  for (const queueable of queueables) {\n    const { status } = await scheduleQueueable({\n      queueable,\n      req,\n      stats,\n    })\n    switch (status) {\n      case 'error':\n        errored.push(queueable)\n        break\n      case 'skipped':\n        skipped.push(queueable)\n        break\n      case 'success':\n        queued.push(queueable)\n        break\n    }\n  }\n  return {\n    errored,\n    queued,\n    skipped,\n  }\n}\n\nexport function checkQueueableTimeConstraints({\n  queue,\n  scheduleConfig,\n  stats,\n  taskConfig,\n  workflowConfig,\n}: {\n  queue: string\n  scheduleConfig: ScheduleConfig\n  stats: JobStats\n  taskConfig?: TaskConfig\n  workflowConfig?: WorkflowConfig\n}): false | Queueable {\n  const queueScheduleStats = stats?.stats?.scheduledRuns?.queues?.[queue]\n\n  const lastScheduledRun = taskConfig\n    ? queueScheduleStats?.tasks?.[taskConfig.slug]?.lastScheduledRun\n    : queueScheduleStats?.workflows?.[workflowConfig?.slug ?? '']?.lastScheduledRun\n\n  const nextRun = new Cron(scheduleConfig.cron).nextRun(lastScheduledRun ?? undefined)\n\n  if (!nextRun) {\n    return false\n  }\n  return {\n    scheduleConfig,\n    taskConfig,\n    waitUntil: nextRun,\n    workflowConfig,\n  }\n}\n\nexport async function scheduleQueueable({\n  queueable,\n  req,\n  stats,\n}: {\n  queueable: Queueable\n  req: PayloadRequest\n  stats: JobStats\n}): Promise<{\n  job?: Job\n  status: 'error' | 'skipped' | 'success'\n}> {\n  if (!queueable.taskConfig && !queueable.workflowConfig) {\n    return {\n      status: 'error',\n    }\n  }\n\n  const beforeScheduleFn = queueable.scheduleConfig.hooks?.beforeSchedule\n  const afterScheduleFN = queueable.scheduleConfig.hooks?.afterSchedule\n\n  try {\n    const beforeScheduleResult: Awaited<ReturnType<BeforeScheduleFn>> = await (\n      beforeScheduleFn ?? defaultBeforeSchedule\n    )({\n      // @ts-expect-error we know defaultBeforeSchedule will never call itself => pass null\n      defaultBeforeSchedule: beforeScheduleFn ? defaultBeforeSchedule : null,\n      jobStats: stats,\n      queueable,\n      req,\n    })\n\n    if (!beforeScheduleResult.shouldSchedule) {\n      await (afterScheduleFN ?? defaultAfterSchedule)({\n        // @ts-expect-error we know defaultAfterchedule will never call itself => pass null\n        defaultAfterSchedule: afterScheduleFN ? defaultAfterSchedule : null,\n        jobStats: stats,\n        queueable,\n        req,\n        status: 'skipped',\n      })\n      return {\n        status: 'skipped',\n      }\n    }\n\n    const job = (await req.payload.jobs.queue({\n      input: beforeScheduleResult.input ?? {},\n      meta: {\n        scheduled: true,\n      },\n      overrideAccess: true,\n      queue: queueable.scheduleConfig.queue,\n      req,\n      task: queueable?.taskConfig?.slug,\n      waitUntil: beforeScheduleResult.waitUntil,\n      workflow: queueable.workflowConfig?.slug,\n    } as Parameters<typeof req.payload.jobs.queue>[0])) as unknown as Job\n\n    await (afterScheduleFN ?? defaultAfterSchedule)({\n      // @ts-expect-error we know defaultAfterchedule will never call itself => pass null\n      defaultAfterSchedule: afterScheduleFN ? defaultAfterSchedule : null,\n      job,\n      jobStats: stats,\n      queueable,\n      req,\n      status: 'success',\n    })\n    return {\n      status: 'success',\n    }\n  } catch (error) {\n    await (afterScheduleFN ?? defaultAfterSchedule)({\n      // @ts-expect-error we know defaultAfterchedule will never call itself => pass null\n      defaultAfterSchedule: afterScheduleFN ? defaultAfterSchedule : null,\n      error: error as Error,\n      jobStats: stats,\n      queueable,\n      req,\n      status: 'error',\n    })\n    return {\n      status: 'error',\n    }\n  }\n}\n"],"names":["Cron","jobStatsGlobalSlug","defaultAfterSchedule","defaultBeforeSchedule","getQueuesWithSchedules","handleSchedules","allQueues","queue","_queue","req","jobsConfig","payload","config","jobs","queuesWithSchedules","Object","keys","length","errored","queued","skipped","stats","db","findGlobal","slug","queueables","queueName","schedules","entries","schedulable","queuable","checkQueueableTimeConstraints","scheduleConfig","taskConfig","workflowConfig","push","queueable","status","scheduleQueueable","queueScheduleStats","scheduledRuns","queues","lastScheduledRun","tasks","workflows","nextRun","cron","undefined","waitUntil","beforeScheduleFn","hooks","beforeSchedule","afterScheduleFN","afterSchedule","beforeScheduleResult","jobStats","shouldSchedule","job","input","meta","scheduled","overrideAccess","task","workflow","error"],"mappings":"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"}

package/dist/queues/operations/runJobs/heartbeat.d.ts

@@ -0,0 +1,13 @@
+import type { PayloadRequest } from '../../../types/index.js';
+import type { RunJobsSilent } from '../../localAPI.js';
+type ProcessingLeaseHeartbeatArgs = {
+    jobIDs: (number | string)[];
+    processingLeaseDuration: number;
+    processingLeaseSafetyBuffer: number;
+    processingToken: string;
+    req: PayloadRequest;
+    silent: RunJobsSilent;
+};
+export declare function startProcessingLeaseHeartbeat(args: ProcessingLeaseHeartbeatArgs): () => void;
+export {};
+//# sourceMappingURL=heartbeat.d.ts.map

package/dist/queues/operations/runJobs/heartbeat.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"heartbeat.d.ts","sourceRoot":"","sources":["../../../../src/queues/operations/runJobs/heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAKtD,KAAK,4BAA4B,GAAG;IAClC,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAC3B,uBAAuB,EAAE,MAAM,CAAA;IAC/B,2BAA2B,EAAE,MAAM,CAAA;IACnC,eAAe,EAAE,MAAM,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,aAAa,CAAA;CACtB,CAAA;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,4BAA4B,GAAG,MAAM,IAAI,CAyB5F"}

package/dist/queues/operations/runJobs/heartbeat.js

@@ -0,0 +1,66 @@
+import { getCurrentDate } from '../../utilities/getCurrentDate.js';
+import { updateJobs } from '../../utilities/updateJob.js';
+export function startProcessingLeaseHeartbeat(args) {
+    const { processingLeaseDuration } = args;
+    const heartbeatInterval = Math.max(Math.floor(processingLeaseDuration / 3), 1);
+    let isStopped = false;
+    let timeout;
+    const scheduleHeartbeat = ()=>{
+        if (isStopped) {
+            return;
+        }
+        timeout = setTimeout(()=>{
+            void sendHeartbeat(args).finally(scheduleHeartbeat);
+        }, heartbeatInterval);
+        timeout.unref?.();
+    };
+    scheduleHeartbeat();
+    return ()=>{
+        isStopped = true;
+        if (timeout) {
+            clearTimeout(timeout);
+        }
+    };
+}
+async function sendHeartbeat({ jobIDs, processingLeaseDuration, processingLeaseSafetyBuffer, processingToken, req, silent }) {
+    const now = getCurrentDate();
+    const minimumProcessingUntil = new Date(now.getTime() + processingLeaseSafetyBuffer).toISOString();
+    const processingUntil = new Date(now.getTime() + processingLeaseDuration).toISOString();
+    try {
+        await updateJobs({
+            data: {
+                processingUntil
+            },
+            req,
+            returning: false,
+            where: {
+                and: [
+                    {
+                        id: {
+                            in: jobIDs
+                        }
+                    },
+                    {
+                        processingToken: {
+                            equals: processingToken
+                        }
+                    },
+                    {
+                        processingUntil: {
+                            greater_than: minimumProcessingUntil
+                        }
+                    }
+                ]
+            }
+        });
+    } catch (error) {
+        if (!silent || typeof silent === 'object' && !silent.error) {
+            req.payload.logger.error({
+                err: error,
+                msg: 'Failed to renew job processing leases'
+            });
+        }
+    }
+}
+
+//# sourceMappingURL=heartbeat.js.map

package/dist/queues/operations/runJobs/heartbeat.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/queues/operations/runJobs/heartbeat.ts"],"sourcesContent":["import type { PayloadRequest } from '../../../types/index.js'\nimport type { RunJobsSilent } from '../../localAPI.js'\n\nimport { getCurrentDate } from '../../utilities/getCurrentDate.js'\nimport { updateJobs } from '../../utilities/updateJob.js'\n\ntype ProcessingLeaseHeartbeatArgs = {\n  jobIDs: (number | string)[]\n  processingLeaseDuration: number\n  processingLeaseSafetyBuffer: number\n  processingToken: string\n  req: PayloadRequest\n  silent: RunJobsSilent\n}\n\nexport function startProcessingLeaseHeartbeat(args: ProcessingLeaseHeartbeatArgs): () => void {\n  const { processingLeaseDuration } = args\n  const heartbeatInterval = Math.max(Math.floor(processingLeaseDuration / 3), 1)\n  let isStopped = false\n  let timeout: ReturnType<typeof setTimeout> | undefined\n\n  const scheduleHeartbeat = () => {\n    if (isStopped) {\n      return\n    }\n\n    timeout = setTimeout(() => {\n      void sendHeartbeat(args).finally(scheduleHeartbeat)\n    }, heartbeatInterval)\n    timeout.unref?.()\n  }\n\n  scheduleHeartbeat()\n\n  return () => {\n    isStopped = true\n    if (timeout) {\n      clearTimeout(timeout)\n    }\n  }\n}\n\nasync function sendHeartbeat({\n  jobIDs,\n  processingLeaseDuration,\n  processingLeaseSafetyBuffer,\n  processingToken,\n  req,\n  silent,\n}: ProcessingLeaseHeartbeatArgs): Promise<void> {\n  const now = getCurrentDate()\n  const minimumProcessingUntil = new Date(now.getTime() + processingLeaseSafetyBuffer).toISOString()\n  const processingUntil = new Date(now.getTime() + processingLeaseDuration).toISOString()\n\n  try {\n    await updateJobs({\n      data: { processingUntil },\n      req,\n      returning: false,\n      where: {\n        and: [\n          { id: { in: jobIDs } },\n          { processingToken: { equals: processingToken } },\n          { processingUntil: { greater_than: minimumProcessingUntil } },\n        ],\n      },\n    })\n  } catch (error) {\n    if (!silent || (typeof silent === 'object' && !silent.error)) {\n      req.payload.logger.error({\n        err: error,\n        msg: 'Failed to renew job processing leases',\n      })\n    }\n  }\n}\n"],"names":["getCurrentDate","updateJobs","startProcessingLeaseHeartbeat","args","processingLeaseDuration","heartbeatInterval","Math","max","floor","isStopped","timeout","scheduleHeartbeat","setTimeout","sendHeartbeat","finally","unref","clearTimeout","jobIDs","processingLeaseSafetyBuffer","processingToken","req","silent","now","minimumProcessingUntil","Date","getTime","toISOString","processingUntil","data","returning","where","and","id","in","equals","greater_than","error","payload","logger","err","msg"],"mappings":"AAGA,SAASA,cAAc,QAAQ,oCAAmC;AAClE,SAASC,UAAU,QAAQ,+BAA8B;AAWzD,OAAO,SAASC,8BAA8BC,IAAkC;IAC9E,MAAM,EAAEC,uBAAuB,EAAE,GAAGD;IACpC,MAAME,oBAAoBC,KAAKC,GAAG,CAACD,KAAKE,KAAK,CAACJ,0BAA0B,IAAI;IAC5E,IAAIK,YAAY;IAChB,IAAIC;IAEJ,MAAMC,oBAAoB;QACxB,IAAIF,WAAW;YACb;QACF;QAEAC,UAAUE,WAAW;YACnB,KAAKC,cAAcV,MAAMW,OAAO,CAACH;QACnC,GAAGN;QACHK,QAAQK,KAAK;IACf;IAEAJ;IAEA,OAAO;QACLF,YAAY;QACZ,IAAIC,SAAS;YACXM,aAAaN;QACf;IACF;AACF;AAEA,eAAeG,cAAc,EAC3BI,MAAM,EACNb,uBAAuB,EACvBc,2BAA2B,EAC3BC,eAAe,EACfC,GAAG,EACHC,MAAM,EACuB;IAC7B,MAAMC,MAAMtB;IACZ,MAAMuB,yBAAyB,IAAIC,KAAKF,IAAIG,OAAO,KAAKP,6BAA6BQ,WAAW;IAChG,MAAMC,kBAAkB,IAAIH,KAAKF,IAAIG,OAAO,KAAKrB,yBAAyBsB,WAAW;IAErF,IAAI;QACF,MAAMzB,WAAW;YACf2B,MAAM;gBAAED;YAAgB;YACxBP;YACAS,WAAW;YACXC,OAAO;gBACLC,KAAK;oBACH;wBAAEC,IAAI;4BAAEC,IAAIhB;wBAAO;oBAAE;oBACrB;wBAAEE,iBAAiB;4BAAEe,QAAQf;wBAAgB;oBAAE;oBAC/C;wBAAEQ,iBAAiB;4BAAEQ,cAAcZ;wBAAuB;oBAAE;iBAC7D;YACH;QACF;IACF,EAAE,OAAOa,OAAO;QACd,IAAI,CAACf,UAAW,OAAOA,WAAW,YAAY,CAACA,OAAOe,KAAK,EAAG;YAC5DhB,IAAIiB,OAAO,CAACC,MAAM,CAACF,KAAK,CAAC;gBACvBG,KAAKH;gBACLI,KAAK;YACP;QACF;IACF;AACF"}

package/dist/queues/operations/runJobs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/queues/operations/runJobs/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAG1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAarD,MAAM,MAAM,WAAW,GAAG;IACxB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,IAAI,CAAA;IACtB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;IACnB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACxC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,wBAAwB,EAAE,MAAM,CAAA;CACjC,CAAA;AAED,eAAO,MAAM,OAAO,GAAU,MAAM,WAAW,KAAG,OAAO,CAAC,aAAa,CA2ctE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/queues/operations/runJobs/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAG1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAcrD,MAAM,MAAM,WAAW,GAAG;IACxB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,IAAI,CAAA;IACtB;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;IACnB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACxC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,wBAAwB,EAAE,MAAM,CAAA;CACjC,CAAA;AAED,eAAO,MAAM,OAAO,SAAgB,WAAW,KAAG,OAAO,CAAC,aAAa,CA+etE,CAAA"}

package/dist/queues/operations/runJobs/index.js

@@ -1,9 +1,11 @@
+import { v4 as uuid } from 'uuid';
 import { Forbidden } from '../../../errors/Forbidden.js';
 import { isolateObjectProperty } from '../../../utilities/isolateObjectProperty.js';
 import { jobsCollectionSlug } from '../../config/collection.js';
-import { JobCancelledError } from '../../errors/index.js';
+import { JobCancelledError, JobRunAbortedError } from '../../errors/index.js';
 import { getCurrentDate } from '../../utilities/getCurrentDate.js';
-import { updateJob, updateJobs } from '../../utilities/updateJob.js';
+import { updateJobs } from '../../utilities/updateJob.js';
+import { startProcessingLeaseHeartbeat } from './heartbeat.js';
 import { getUpdateJobFunction } from './runJob/getUpdateJobFunction.js';
 import { importHandlerPath } from './runJob/importHandlerPath.js';
 import { runJob } from './runJob/index.js';
@@ -21,6 +23,11 @@ export const runJobs = async (args)=>{
             throw new Forbidden(req.t);
         }
     }
+    const now = getCurrentDate();
+    const { duration: processingLeaseDuration, safetyBuffer: processingLeaseSafetyBuffer } = jobsConfig.processingLease;
+    const nowISOString = now.toISOString();
+    const processingUntil = new Date(now.getTime() + processingLeaseDuration).toISOString();
+    const processingToken = uuid();
     const and = [
         {
             completedAt: {
@@ -33,9 +40,18 @@ export const runJobs = async (args)=>{
             }
         },
         {
-            processing: {
-                equals: false
-            }
+            or: [
+                {
+                    processingUntil: {
+                        exists: false
+                    }
+                },
+                {
+                    processingUntil: {
+                        less_than_equal: nowISOString
+                    }
+                }
+            ]
         },
         {
             or: [
@@ -46,13 +62,13 @@ export const runJobs = async (args)=>{
                 },
                 {
                     waitUntil: {
-                        less_than: getCurrentDate().toISOString()
+                        less_than: nowISOString
                     }
                 }
             ]
         }
     ];
-    if (allQueues !== true) {
+    if (!id && allQueues !== true) {
         and.push({
             queue: {
                 equals: queue ?? 'default'
@@ -62,10 +78,16 @@ export const runJobs = async (args)=>{
     if (whereFromProps) {
         and.push(whereFromProps);
     }
-    // Only enforce concurrency controls if the feature is enabled
-    if (jobsConfig.enableConcurrencyControl) {
-        // Find currently running jobs with concurrency keys to enforce exclusive concurrency
-        // Jobs with the same concurrencyKey should not run in parallel
+    if (id) {
+        and.push({
+            id: {
+                equals: id
+            }
+        });
+    }
+    if (jobsConfig.hasConcurrency) {
+        // Find currently running jobs with concurrency keys to enforce exclusive concurrency.
+        // Jobs with the same concurrencyKey should not run in parallel.
         const runningJobsWithConcurrency = await payload.db.find({
             collection: jobsCollectionSlug,
             limit: 0,
@@ -79,8 +101,8 @@ export const runJobs = async (args)=>{
             where: {
                 and: [
                     {
-                        processing: {
-                            equals: true
+                        processingUntil: {
+                            greater_than: nowISOString
                         }
                     },
                     {
@@ -122,23 +144,24 @@ export const runJobs = async (args)=>{
             });
         }
     }
-    // Find all jobs and ensure we set job to processing: true as early as possible to reduce the chance of
-    // the same job being picked up by another worker
+    // Claim jobs before running them so another worker cannot pick up the same jobs.
+    // `processingToken` identifies which jobs were claimed by this runner.
     let jobs = [];
     if (id) {
-        // Only one job to run
-        const job = await updateJob({
-            id,
+        const updatedDocs = await updateJobs({
             data: {
-                processing: true
+                processingToken,
+                processingUntil
             },
+            limit: 1,
             req,
-            returning: true
+            returning: true,
+            where: {
+                and
+            }
         });
-        if (job) {
-            jobs = [
-                job
-            ];
+        if (updatedDocs) {
+            jobs = updatedDocs;
         }
     } else {
         let defaultProcessingOrder = payload.collections[jobsCollectionSlug]?.config.defaultSort ?? 'createdAt';
@@ -156,7 +179,8 @@ export const runJobs = async (args)=>{
         }
         const updatedDocs = await updateJobs({
             data: {
-                processing: true
+                processingToken,
+                processingUntil
             },
             limit,
             req,
@@ -176,10 +200,9 @@ export const runJobs = async (args)=>{
             remainingJobsFromQueried: 0
         };
     }
-    // Only handle concurrency deduplication if the feature is enabled
-    if (jobsConfig.enableConcurrencyControl) {
-        // Handle the case where multiple jobs with the same concurrencyKey were picked up in the same batch
-        // We should only run one job per concurrencyKey, release the others back to pending
+    if (jobsConfig.hasConcurrency) {
+        // Handle the case where multiple jobs with the same concurrencyKey were picked up in the same batch.
+        // We should only run one job per concurrencyKey, releasing the others back to pending.
         const seenConcurrencyKeys = new Set();
         const jobsToRun = [];
         const jobsToRelease = [];
@@ -201,25 +224,39 @@ export const runJobs = async (args)=>{
             const releaseIds = jobsToRelease.map((job)=>job.id);
             await updateJobs({
                 data: {
-                    processing: false
+                    processingUntil: null
                 },
                 req,
                 returning: false,
                 where: {
-                    id: {
-                        in: releaseIds
-                    }
+                    and: [
+                        {
+                            id: {
+                                in: releaseIds
+                            }
+                        },
+                        {
+                            processingToken: {
+                                equals: processingToken
+                            }
+                        },
+                        {
+                            processingUntil: {
+                                greater_than: new Date(getCurrentDate().getTime() + processingLeaseSafetyBuffer).toISOString()
+                            }
+                        }
+                    ]
                 }
             });
         }
         // Use only the filtered jobs going forward
         jobs = jobsToRun;
-    }
-    if (!jobs.length) {
-        return {
-            noJobsRemaining: false,
-            remainingJobsFromQueried: 0
-        };
+        if (!jobs.length) {
+            return {
+                noJobsRemaining: false,
+                remainingJobsFromQueried: 0
+            };
+        }
     }
     if (!silent || typeof silent === 'object' && !silent.info) {
         let newCount = 0;
@@ -259,31 +296,31 @@ export const runJobs = async (args)=>{
                 };
             }
         }
-        if (!workflowConfig) {
-            // Permanently fail jobs whose task/workflow slug is no longer registered in config — they can never complete.
-            const errorMessage = `${job.taskSlug ? `Task '${job.taskSlug}'` : `Workflow '${job.workflowSlug}'`} is not registered in payload.config.jobs.`;
-            if (!silent || typeof silent === 'object' && !silent.error) {
-                payload.logger.error({
-                    msg: `Error running job ${job.workflowSlug || `Task: ${job.taskSlug}`} id: ${job.id} - ${errorMessage}`
+        try {
+            if (!workflowConfig) {
+                // Permanently fail jobs whose task/workflow slug is no longer registered in config — they can never complete.
+                const errorMessage = `${job.taskSlug ? `Task '${job.taskSlug}'` : `Workflow '${job.workflowSlug}'`} is not registered in payload.config.jobs.`;
+                if (!silent || typeof silent === 'object' && !silent.error) {
+                    payload.logger.error({
+                        msg: `Error running job ${job.workflowSlug || `Task: ${job.taskSlug}`} id: ${job.id} - ${errorMessage}`
+                    });
+                }
+                const updateJob = getUpdateJobFunction(job, jobReq);
+                await updateJob({
+                    error: {
+                        message: errorMessage
+                    },
+                    hasError: true,
+                    processingUntil: null,
+                    totalTried: (job.totalTried ?? 0) + 1
                 });
+                return {
+                    id: job.id,
+                    result: {
+                        status: 'error-reached-max-retries'
+                    }
+                };
             }
-            const updateJob = getUpdateJobFunction(job, jobReq);
-            await updateJob({
-                error: {
-                    message: errorMessage
-                },
-                hasError: true,
-                processing: false,
-                totalTried: (job.totalTried ?? 0) + 1
-            });
-            return {
-                id: job.id,
-                result: {
-                    status: 'error-reached-max-retries'
-                }
-            };
-        }
-        try {
             const updateJob = getUpdateJobFunction(job, jobReq);
             // the runner will either be passed to the config
             // OR it will be a path, which we will need to import via eval to avoid
@@ -304,7 +341,7 @@ export const runJobs = async (args)=>{
                             error: errorMessage
                         },
                         hasError: true,
-                        processing: false
+                        processingUntil: null
                     });
                     return {
                         id: job.id,
@@ -348,24 +385,24 @@ export const runJobs = async (args)=>{
                 };
             }
         } catch (error) {
+            if (error instanceof JobRunAbortedError) {
+                return null;
+            }
             if (error instanceof JobCancelledError) {
-                if (!job.error?.cancelled || !job.hasError || job.processing || job.completedAt || job.waitUntil) {
+                if (!job.error?.cancelled || !job.hasError || job.processingUntil || job.completedAt || job.waitUntil) {
                     // When using the local API to cancel jobs, the local API will update the job data for us to ensure the job is cancelled.
                     // But when throwing a JobCancelledError within a task or workflow handler, we are responsible for updating the job data ourselves.
+                    // Use the lease-protected getUpdateJobFunction so an old worker cannot cancel the job after another worker claims it.
+                    const updateJob = getUpdateJobFunction(job, jobReq);
                     await updateJob({
-                        id: job.id,
-                        data: {
-                            completedAt: null,
-                            error: {
-                                cancelled: true,
-                                message: error.message
-                            },
-                            hasError: true,
-                            processing: false,
-                            waitUntil: null
+                        completedAt: null,
+                        error: {
+                            cancelled: true,
+                            message: error.message
                         },
-                        req,
-                        returning: false
+                        hasError: true,
+                        processingUntil: null,
+                        waitUntil: null
                     });
                 }
                 return {
@@ -378,17 +415,29 @@ export const runJobs = async (args)=>{
             throw error;
         }
     };
+    const stopHeartbeat = startProcessingLeaseHeartbeat({
+        jobIDs: jobs.map((job)=>job.id),
+        processingLeaseDuration,
+        processingLeaseSafetyBuffer,
+        processingToken,
+        req,
+        silent
+    });
     let resultsArray = [];
-    if (sequential) {
-        for (const job of jobs){
-            const result = await runSingleJob(job);
-            if (result) {
-                resultsArray.push(result);
+    try {
+        if (sequential) {
+            for (const job of jobs){
+                const result = await runSingleJob(job);
+                if (result) {
+                    resultsArray.push(result);
+                }
             }
+        } else {
+            const jobPromises = jobs.map(runSingleJob);
+            resultsArray = (await Promise.all(jobPromises)).filter((result)=>result !== null);
         }
-    } else {
-        const jobPromises = jobs.map(runSingleJob);
-        resultsArray = await Promise.all(jobPromises);
+    } finally{
+        stopHeartbeat();
     }
     if (jobsConfig.deleteJobOnComplete && successfullyCompletedJobs.length) {
         try {