payload 4.0.0-internal.cd69eef → 4.0.0-internal.d1cc1d3

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 {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/queues/operations/runJobs/index.ts"],"sourcesContent":["import type { Job } from '../../../index.js'\nimport type { PayloadRequest, Sort, Where } from '../../../types/index.js'\nimport type { WorkflowJSON } from '../../config/types/workflowJSONTypes.js'\nimport type { WorkflowConfig, WorkflowHandler } from '../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../localAPI.js'\nimport type { RunJobResult } from './runJob/index.js'\n\nimport { Forbidden } from '../../../errors/Forbidden.js'\nimport { isolateObjectProperty } from '../../../utilities/isolateObjectProperty.js'\nimport { jobsCollectionSlug } from '../../config/collection.js'\nimport { JobCancelledError } from '../../errors/index.js'\nimport { getCurrentDate } from '../../utilities/getCurrentDate.js'\nimport { updateJob, updateJobs } from '../../utilities/updateJob.js'\nimport { getUpdateJobFunction } from './runJob/getUpdateJobFunction.js'\nimport { importHandlerPath } from './runJob/importHandlerPath.js'\nimport { runJob } from './runJob/index.js'\nimport { runJSONJob } from './runJSONJob/index.js'\n\nexport type RunJobsArgs = {\n  /**\n   * If you want to run 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   * ID of the job to run\n   */\n  id?: number | string\n  /**\n   * The maximum number of jobs to run in this invocation\n   *\n   * @default 10\n   */\n  limit?: number\n  overrideAccess?: boolean\n  /**\n   * Adjust the job processing order\n   *\n   * FIFO would equal `createdAt` and LIFO would equal `-createdAt`.\n   *\n   * @default all jobs for all queues will be executed in FIFO order.\n   */\n  processingOrder?: Sort\n  /**\n   * If you want to run jobs from 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  /**\n   * By default, jobs are run in parallel.\n   * If you want to run them in sequence, set this to true.\n   */\n  sequential?: boolean\n  /**\n   * If set to true, the job system will not log any output to the console (for both info and error logs).\n   * Can be an option for more granular control over logging.\n   *\n   * This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n   *\n   * @default false\n   */\n  silent?: RunJobsSilent\n  where?: Where\n}\n\nexport type RunJobsResult = {\n  jobStatus?: Record<string, RunJobResult>\n  /**\n   * If this is true, there for sure are no jobs remaining, regardless of the limit\n   */\n  noJobsRemaining?: boolean\n  /**\n   * Out of the jobs that were queried & processed (within the set limit), how many are remaining and retryable?\n   */\n  remainingJobsFromQueried: number\n}\n\nexport const runJobs = async (args: RunJobsArgs): Promise<RunJobsResult> => {\n  const {\n    id,\n    allQueues = false,\n    limit = 10,\n    overrideAccess,\n    processingOrder,\n    queue = 'default',\n    req,\n    req: {\n      payload,\n      payload: {\n        config: { jobs: jobsConfig },\n      },\n    },\n    sequential,\n    silent = false,\n    where: whereFromProps,\n  } = args\n\n  if (!overrideAccess) {\n    /**\n     * By default, jobsConfig.access.run will be `defaultAccess` which is a function that returns `true` if the user is logged in.\n     */\n    const accessFn = jobsConfig?.access?.run ?? (() => true)\n    const hasAccess = await accessFn({ req })\n    if (!hasAccess) {\n      throw new Forbidden(req.t)\n    }\n  }\n  const and: Where[] = [\n    {\n      completedAt: {\n        exists: false,\n      },\n    },\n    {\n      hasError: {\n        not_equals: true,\n      },\n    },\n    {\n      processing: {\n        equals: false,\n      },\n    },\n    {\n      or: [\n        {\n          waitUntil: {\n            exists: false,\n          },\n        },\n        {\n          waitUntil: {\n            less_than: getCurrentDate().toISOString(),\n          },\n        },\n      ],\n    },\n  ]\n\n  if (allQueues !== true) {\n    and.push({\n      queue: {\n        equals: queue ?? 'default',\n      },\n    })\n  }\n\n  if (whereFromProps) {\n    and.push(whereFromProps)\n  }\n\n  // Only enforce concurrency controls if the feature is enabled\n  if (jobsConfig.enableConcurrencyControl) {\n    // Find currently running jobs with concurrency keys to enforce exclusive concurrency\n    // Jobs with the same concurrencyKey should not run in parallel\n    const runningJobsWithConcurrency = await payload.db.find({\n      collection: jobsCollectionSlug,\n      limit: 0,\n      pagination: false,\n      req: { transactionID: undefined },\n      select: {\n        concurrencyKey: true,\n      },\n      where: {\n        and: [{ processing: { equals: true } }, { concurrencyKey: { exists: true } }],\n      },\n    })\n\n    const runningConcurrencyKeys = new Set<string>()\n    if (runningJobsWithConcurrency?.docs) {\n      for (const doc of runningJobsWithConcurrency.docs) {\n        const concurrencyKey = (doc as Job).concurrencyKey\n        if (concurrencyKey) {\n          runningConcurrencyKeys.add(concurrencyKey)\n        }\n      }\n    }\n\n    // Exclude jobs whose concurrencyKey is already running\n    if (runningConcurrencyKeys.size > 0) {\n      and.push({\n        or: [\n          // Jobs without a concurrency key can always run\n          { concurrencyKey: { exists: false } },\n          // Jobs with a concurrency key that is not currently running can run\n          { concurrencyKey: { not_in: [...runningConcurrencyKeys] } },\n        ],\n      })\n    }\n  }\n\n  // Find all jobs and ensure we set job to processing: true as early as possible to reduce the chance of\n  // the same job being picked up by another worker\n  let jobs: Job[] = []\n\n  if (id) {\n    // Only one job to run\n    const job = await updateJob({\n      id,\n      data: {\n        processing: true,\n      },\n      req,\n      returning: true,\n    })\n    if (job) {\n      jobs = [job]\n    }\n  } else {\n    let defaultProcessingOrder: Sort =\n      payload.collections[jobsCollectionSlug]?.config.defaultSort ?? 'createdAt'\n\n    const processingOrderConfig = jobsConfig.processingOrder\n    if (typeof processingOrderConfig === 'function') {\n      defaultProcessingOrder = await processingOrderConfig(args)\n    } else if (typeof processingOrderConfig === 'object' && !Array.isArray(processingOrderConfig)) {\n      if (\n        !allQueues &&\n        queue &&\n        processingOrderConfig.queues &&\n        processingOrderConfig.queues[queue]\n      ) {\n        defaultProcessingOrder = processingOrderConfig.queues[queue]\n      } else if (processingOrderConfig.default) {\n        defaultProcessingOrder = processingOrderConfig.default\n      }\n    } else if (typeof processingOrderConfig === 'string') {\n      defaultProcessingOrder = processingOrderConfig\n    }\n    const updatedDocs = await updateJobs({\n      data: {\n        processing: true,\n      },\n      limit,\n      req,\n      returning: true,\n      sort: processingOrder ?? defaultProcessingOrder,\n      where: { and },\n    })\n\n    if (updatedDocs) {\n      jobs = updatedDocs\n    }\n  }\n\n  if (!jobs.length) {\n    return {\n      noJobsRemaining: true,\n      remainingJobsFromQueried: 0,\n    }\n  }\n\n  // Only handle concurrency deduplication if the feature is enabled\n  if (jobsConfig.enableConcurrencyControl) {\n    // Handle the case where multiple jobs with the same concurrencyKey were picked up in the same batch\n    // We should only run one job per concurrencyKey, release the others back to pending\n    const seenConcurrencyKeys = new Set<string>()\n    const jobsToRun: Job[] = []\n    const jobsToRelease: Job[] = []\n\n    for (const job of jobs) {\n      if (job.concurrencyKey) {\n        if (seenConcurrencyKeys.has(job.concurrencyKey)) {\n          // This job has the same concurrencyKey as another job we're already running\n          jobsToRelease.push(job)\n        } else {\n          seenConcurrencyKeys.add(job.concurrencyKey)\n          jobsToRun.push(job)\n        }\n      } else {\n        jobsToRun.push(job)\n      }\n    }\n\n    // Release duplicate concurrencyKey jobs back to pending state\n    if (jobsToRelease.length > 0) {\n      const releaseIds = jobsToRelease.map((job) => job.id)\n      await updateJobs({\n        data: { processing: false },\n        req,\n        returning: false,\n        where: { id: { in: releaseIds } },\n      })\n    }\n\n    // Use only the filtered jobs going forward\n    jobs = jobsToRun\n  }\n\n  if (!jobs.length) {\n    return {\n      noJobsRemaining: false,\n      remainingJobsFromQueried: 0,\n    }\n  }\n\n  if (!silent || (typeof silent === 'object' && !silent.info)) {\n    let newCount = 0\n    let retryCount = 0\n\n    for (const job of jobs) {\n      if (job.totalTried > 0) {\n        retryCount++\n      } else {\n        newCount++\n      }\n    }\n\n    payload.logger.info({\n      msg: `Running ${jobs.length} jobs.`,\n      new: newCount,\n      retrying: retryCount,\n    })\n  }\n\n  const successfullyCompletedJobs: (number | string)[] = []\n\n  const runSingleJob = async (\n    job: Job,\n  ): Promise<{\n    id: number | string\n    result: RunJobResult\n  }> => {\n    if (!job.workflowSlug && !job.taskSlug) {\n      throw new Error('Job must have either a workflowSlug or a taskSlug')\n    }\n    const jobReq = isolateObjectProperty(req, 'transactionID')\n\n    let workflowConfig: undefined | WorkflowConfig = undefined\n\n    if (job.workflowSlug && jobsConfig.workflows?.length) {\n      workflowConfig = jobsConfig.workflows.find(({ slug }) => slug === job.workflowSlug)\n    } else if (job.taskSlug && jobsConfig.tasks?.length) {\n      const taskExists = jobsConfig.tasks.some(({ slug }) => slug === job.taskSlug)\n      if (taskExists) {\n        workflowConfig = {\n          slug: 'singleTask',\n          handler: async ({ job, tasks }) => {\n            await tasks[job.taskSlug as string]!('1', {\n              input: job.input,\n            })\n          },\n        }\n      }\n    }\n\n    if (!workflowConfig) {\n      // Permanently fail jobs whose task/workflow slug is no longer registered in config — they can never complete.\n      const errorMessage = `${job.taskSlug ? `Task '${job.taskSlug}'` : `Workflow '${job.workflowSlug}'`} is not registered in payload.config.jobs.`\n\n      if (!silent || (typeof silent === 'object' && !silent.error)) {\n        payload.logger.error({\n          msg: `Error running job ${job.workflowSlug || `Task: ${job.taskSlug}`} id: ${job.id} - ${errorMessage}`,\n        })\n      }\n\n      const updateJob = getUpdateJobFunction(job, jobReq)\n      await updateJob({\n        error: { message: errorMessage },\n        hasError: true,\n        processing: false,\n        totalTried: (job.totalTried ?? 0) + 1,\n      })\n\n      return {\n        id: job.id,\n        result: {\n          status: 'error-reached-max-retries',\n        },\n      }\n    }\n\n    try {\n      const updateJob = getUpdateJobFunction(job, jobReq)\n\n      // the runner will either be passed to the config\n      // OR it will be a path, which we will need to import via eval to avoid\n      // Next.js compiler dynamic import expression errors\n      let workflowHandler: WorkflowHandler | WorkflowJSON\n      if (\n        typeof workflowConfig.handler === 'function' ||\n        (typeof workflowConfig.handler === 'object' && Array.isArray(workflowConfig.handler))\n      ) {\n        workflowHandler = workflowConfig.handler\n      } else {\n        workflowHandler = await importHandlerPath<typeof workflowHandler>(workflowConfig.handler)\n\n        if (!workflowHandler) {\n          const jobLabel = job.workflowSlug || `Task: ${job.taskSlug}`\n          const errorMessage = `Can't find runner while importing with the path ${workflowConfig.handler} in job type ${jobLabel}.`\n          if (!silent || (typeof silent === 'object' && !silent.error)) {\n            payload.logger.error(errorMessage)\n          }\n\n          await updateJob({\n            error: {\n              error: errorMessage,\n            },\n            hasError: true,\n            processing: false,\n          })\n\n          return {\n            id: job.id,\n            result: {\n              status: 'error-reached-max-retries',\n            },\n          }\n        }\n      }\n\n      if (typeof workflowHandler === 'function') {\n        const result = await runJob({\n          job,\n          req: jobReq,\n          silent,\n          updateJob,\n          workflowConfig,\n          workflowHandler,\n        })\n\n        if (result.status === 'success') {\n          successfullyCompletedJobs.push(job.id)\n        }\n\n        return { id: job.id, result }\n      } else {\n        const result = await runJSONJob({\n          job,\n          req: jobReq,\n          silent,\n          updateJob,\n          workflowConfig,\n          workflowHandler,\n        })\n\n        if (result.status === 'success') {\n          successfullyCompletedJobs.push(job.id)\n        }\n\n        return { id: job.id, result }\n      }\n    } catch (error) {\n      if (error instanceof JobCancelledError) {\n        if (\n          !(job.error as Record<string, unknown> | undefined)?.cancelled ||\n          !job.hasError ||\n          job.processing ||\n          job.completedAt ||\n          job.waitUntil\n        ) {\n          // When using the local API to cancel jobs, the local API will update the job data for us to ensure the job is cancelled.\n          // But when throwing a JobCancelledError within a task or workflow handler, we are responsible for updating the job data ourselves.\n          await updateJob({\n            id: job.id,\n            data: {\n              completedAt: null,\n              error: {\n                cancelled: true,\n                message: error.message,\n              },\n              hasError: true,\n              processing: false,\n              waitUntil: null,\n            },\n            req,\n            returning: false,\n          })\n        }\n\n        return {\n          id: job.id,\n          result: {\n            status: 'error-reached-max-retries',\n          },\n        }\n      }\n      throw error\n    }\n  }\n\n  let resultsArray: { id: number | string; result: RunJobResult }[] = []\n  if (sequential) {\n    for (const job of jobs) {\n      const result = await runSingleJob(job)\n      if (result) {\n        resultsArray.push(result)\n      }\n    }\n  } else {\n    const jobPromises = jobs.map(runSingleJob)\n    resultsArray = (await Promise.all(jobPromises)) as {\n      id: number | string\n      result: RunJobResult\n    }[]\n  }\n\n  if (jobsConfig.deleteJobOnComplete && successfullyCompletedJobs.length) {\n    try {\n      await payload.db.deleteMany({\n        collection: jobsCollectionSlug,\n        where: { id: { in: successfullyCompletedJobs } },\n      })\n    } catch (err) {\n      if (!silent || (typeof silent === 'object' && !silent.error)) {\n        payload.logger.error({\n          err,\n          msg: `Failed to delete jobs ${successfullyCompletedJobs.join(', ')} on complete`,\n        })\n      }\n    }\n  }\n\n  const resultsObject: RunJobsResult['jobStatus'] = resultsArray.reduce(\n    (acc, cur) => {\n      if (cur !== null) {\n        // Check if there's a valid result to include\n        acc[cur.id] = cur.result\n      }\n      return acc\n    },\n    {} as Record<string, RunJobResult>,\n  )\n\n  let remainingJobsFromQueried = 0\n  for (const jobID in resultsObject) {\n    const jobResult = resultsObject[jobID]\n    if (jobResult?.status === 'error') {\n      remainingJobsFromQueried++ // Can be retried\n    }\n  }\n\n  return {\n    jobStatus: resultsObject,\n    remainingJobsFromQueried,\n  }\n}\n"],"names":["Forbidden","isolateObjectProperty","jobsCollectionSlug","JobCancelledError","getCurrentDate","updateJob","updateJobs","getUpdateJobFunction","importHandlerPath","runJob","runJSONJob","runJobs","args","id","allQueues","limit","overrideAccess","processingOrder","queue","req","payload","config","jobs","jobsConfig","sequential","silent","where","whereFromProps","accessFn","access","run","hasAccess","t","and","completedAt","exists","hasError","not_equals","processing","equals","or","waitUntil","less_than","toISOString","push","enableConcurrencyControl","runningJobsWithConcurrency","db","find","collection","pagination","transactionID","undefined","select","concurrencyKey","runningConcurrencyKeys","Set","docs","doc","add","size","not_in","job","data","returning","defaultProcessingOrder","collections","defaultSort","processingOrderConfig","Array","isArray","queues","default","updatedDocs","sort","length","noJobsRemaining","remainingJobsFromQueried","seenConcurrencyKeys","jobsToRun","jobsToRelease","has","releaseIds","map","in","info","newCount","retryCount","totalTried","logger","msg","new","retrying","successfullyCompletedJobs","runSingleJob","workflowSlug","taskSlug","Error","jobReq","workflowConfig","workflows","slug","tasks","taskExists","some","handler","input","errorMessage","error","message","result","status","workflowHandler","jobLabel","cancelled","resultsArray","jobPromises","Promise","all","deleteJobOnComplete","deleteMany","err","join","resultsObject","reduce","acc","cur","jobID","jobResult","jobStatus"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/queues/operations/runJobs/index.ts"],"sourcesContent":["import { v4 as uuid } from 'uuid'\n\nimport type { Job } from '../../../index.js'\nimport type { PayloadRequest, Sort, Where } from '../../../types/index.js'\nimport type { WorkflowJSON } from '../../config/types/workflowJSONTypes.js'\nimport type { WorkflowConfig, WorkflowHandler } from '../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../localAPI.js'\nimport type { RunJobResult } from './runJob/index.js'\n\nimport { Forbidden } from '../../../errors/Forbidden.js'\nimport { isolateObjectProperty } from '../../../utilities/isolateObjectProperty.js'\nimport { jobsCollectionSlug } from '../../config/collection.js'\nimport { JobCancelledError, JobRunAbortedError } from '../../errors/index.js'\nimport { getCurrentDate } from '../../utilities/getCurrentDate.js'\nimport { updateJobs } from '../../utilities/updateJob.js'\nimport { startProcessingLeaseHeartbeat } from './heartbeat.js'\nimport { getUpdateJobFunction } from './runJob/getUpdateJobFunction.js'\nimport { importHandlerPath } from './runJob/importHandlerPath.js'\nimport { runJob } from './runJob/index.js'\nimport { runJSONJob } from './runJSONJob/index.js'\n\nexport type RunJobsArgs = {\n  /**\n   * If you want to run 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   * ID of the job to run\n   */\n  id?: number | string\n  /**\n   * The maximum number of jobs to run in this invocation\n   *\n   * @default 10\n   */\n  limit?: number\n  overrideAccess?: boolean\n  /**\n   * Adjust the job processing order\n   *\n   * FIFO would equal `createdAt` and LIFO would equal `-createdAt`.\n   *\n   * @default all jobs for all queues will be executed in FIFO order.\n   */\n  processingOrder?: Sort\n  /**\n   * If you want to run jobs from 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  /**\n   * By default, jobs are run in parallel.\n   * If you want to run them in sequence, set this to true.\n   */\n  sequential?: boolean\n  /**\n   * If set to true, the job system will not log any output to the console (for both info and error logs).\n   * Can be an option for more granular control over logging.\n   *\n   * This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n   *\n   * @default false\n   */\n  silent?: RunJobsSilent\n  where?: Where\n}\n\nexport type RunJobsResult = {\n  jobStatus?: Record<string, RunJobResult>\n  /**\n   * If this is true, there for sure are no jobs remaining, regardless of the limit\n   */\n  noJobsRemaining?: boolean\n  /**\n   * Out of the jobs that were queried & processed (within the set limit), how many are remaining and retryable?\n   */\n  remainingJobsFromQueried: number\n}\n\nexport const runJobs = async (args: RunJobsArgs): Promise<RunJobsResult> => {\n  const {\n    id,\n    allQueues = false,\n    limit = 10,\n    overrideAccess,\n    processingOrder,\n    queue = 'default',\n    req,\n    req: {\n      payload,\n      payload: {\n        config: { jobs: jobsConfig },\n      },\n    },\n    sequential,\n    silent = false,\n    where: whereFromProps,\n  } = args\n\n  if (!overrideAccess) {\n    /**\n     * By default, jobsConfig.access.run will be `defaultAccess` which is a function that returns `true` if the user is logged in.\n     */\n    const accessFn = jobsConfig?.access?.run ?? (() => true)\n    const hasAccess = await accessFn({ req })\n    if (!hasAccess) {\n      throw new Forbidden(req.t)\n    }\n  }\n  const now = getCurrentDate()\n  const { duration: processingLeaseDuration, safetyBuffer: processingLeaseSafetyBuffer } =\n    jobsConfig.processingLease\n  const nowISOString = now.toISOString()\n  const processingUntil = new Date(now.getTime() + processingLeaseDuration).toISOString()\n  const processingToken = uuid()\n  const and: Where[] = [\n    {\n      completedAt: {\n        exists: false,\n      },\n    },\n    {\n      hasError: {\n        not_equals: true,\n      },\n    },\n    {\n      or: [\n        { processingUntil: { exists: false } },\n        { processingUntil: { less_than_equal: nowISOString } },\n      ],\n    },\n    {\n      or: [\n        {\n          waitUntil: {\n            exists: false,\n          },\n        },\n        {\n          waitUntil: {\n            less_than: nowISOString,\n          },\n        },\n      ],\n    },\n  ]\n\n  if (!id && allQueues !== true) {\n    and.push({\n      queue: {\n        equals: queue ?? 'default',\n      },\n    })\n  }\n\n  if (whereFromProps) {\n    and.push(whereFromProps)\n  }\n\n  if (id) {\n    and.push({ id: { equals: id } })\n  }\n\n  if (jobsConfig.hasConcurrency) {\n    // Find currently running jobs with concurrency keys to enforce exclusive concurrency.\n    // Jobs with the same concurrencyKey should not run in parallel.\n    const runningJobsWithConcurrency = await payload.db.find({\n      collection: jobsCollectionSlug,\n      limit: 0,\n      pagination: false,\n      req: { transactionID: undefined },\n      select: {\n        concurrencyKey: true,\n      },\n      where: {\n        and: [\n          { processingUntil: { greater_than: nowISOString } },\n          { concurrencyKey: { exists: true } },\n        ],\n      },\n    })\n\n    const runningConcurrencyKeys = new Set<string>()\n    if (runningJobsWithConcurrency?.docs) {\n      for (const doc of runningJobsWithConcurrency.docs) {\n        const concurrencyKey = (doc as Job).concurrencyKey\n        if (concurrencyKey) {\n          runningConcurrencyKeys.add(concurrencyKey)\n        }\n      }\n    }\n\n    // Exclude jobs whose concurrencyKey is already running\n    if (runningConcurrencyKeys.size > 0) {\n      and.push({\n        or: [\n          // Jobs without a concurrency key can always run\n          { concurrencyKey: { exists: false } },\n          // Jobs with a concurrency key that is not currently running can run\n          { concurrencyKey: { not_in: [...runningConcurrencyKeys] } },\n        ],\n      })\n    }\n  }\n\n  // Claim jobs before running them so another worker cannot pick up the same jobs.\n  // `processingToken` identifies which jobs were claimed by this runner.\n  let jobs: Job[] = []\n\n  if (id) {\n    const updatedDocs = await updateJobs({\n      data: {\n        processingToken,\n        processingUntil,\n      },\n      limit: 1,\n      req,\n      returning: true,\n      where: { and },\n    })\n    if (updatedDocs) {\n      jobs = updatedDocs\n    }\n  } else {\n    let defaultProcessingOrder: Sort =\n      payload.collections[jobsCollectionSlug]?.config.defaultSort ?? 'createdAt'\n\n    const processingOrderConfig = jobsConfig.processingOrder\n    if (typeof processingOrderConfig === 'function') {\n      defaultProcessingOrder = await processingOrderConfig(args)\n    } else if (typeof processingOrderConfig === 'object' && !Array.isArray(processingOrderConfig)) {\n      if (\n        !allQueues &&\n        queue &&\n        processingOrderConfig.queues &&\n        processingOrderConfig.queues[queue]\n      ) {\n        defaultProcessingOrder = processingOrderConfig.queues[queue]\n      } else if (processingOrderConfig.default) {\n        defaultProcessingOrder = processingOrderConfig.default\n      }\n    } else if (typeof processingOrderConfig === 'string') {\n      defaultProcessingOrder = processingOrderConfig\n    }\n    const updatedDocs = await updateJobs({\n      data: {\n        processingToken,\n        processingUntil,\n      },\n      limit,\n      req,\n      returning: true,\n      sort: processingOrder ?? defaultProcessingOrder,\n      where: { and },\n    })\n\n    if (updatedDocs) {\n      jobs = updatedDocs\n    }\n  }\n\n  if (!jobs.length) {\n    return {\n      noJobsRemaining: true,\n      remainingJobsFromQueried: 0,\n    }\n  }\n\n  if (jobsConfig.hasConcurrency) {\n    // Handle the case where multiple jobs with the same concurrencyKey were picked up in the same batch.\n    // We should only run one job per concurrencyKey, releasing the others back to pending.\n    const seenConcurrencyKeys = new Set<string>()\n    const jobsToRun: Job[] = []\n    const jobsToRelease: Job[] = []\n\n    for (const job of jobs) {\n      if (job.concurrencyKey) {\n        if (seenConcurrencyKeys.has(job.concurrencyKey)) {\n          // This job has the same concurrencyKey as another job we're already running\n          jobsToRelease.push(job)\n        } else {\n          seenConcurrencyKeys.add(job.concurrencyKey)\n          jobsToRun.push(job)\n        }\n      } else {\n        jobsToRun.push(job)\n      }\n    }\n\n    // Release duplicate concurrencyKey jobs back to pending state\n    if (jobsToRelease.length > 0) {\n      const releaseIds = jobsToRelease.map((job) => job.id)\n      await updateJobs({\n        data: { processingUntil: null },\n        req,\n        returning: false,\n        where: {\n          and: [\n            { id: { in: releaseIds } },\n            { processingToken: { equals: processingToken } },\n            {\n              processingUntil: {\n                greater_than: new Date(\n                  getCurrentDate().getTime() + processingLeaseSafetyBuffer,\n                ).toISOString(),\n              },\n            },\n          ],\n        },\n      })\n    }\n\n    // Use only the filtered jobs going forward\n    jobs = jobsToRun\n\n    if (!jobs.length) {\n      return {\n        noJobsRemaining: false,\n        remainingJobsFromQueried: 0,\n      }\n    }\n  }\n\n  if (!silent || (typeof silent === 'object' && !silent.info)) {\n    let newCount = 0\n    let retryCount = 0\n\n    for (const job of jobs) {\n      if (job.totalTried > 0) {\n        retryCount++\n      } else {\n        newCount++\n      }\n    }\n\n    payload.logger.info({\n      msg: `Running ${jobs.length} jobs.`,\n      new: newCount,\n      retrying: retryCount,\n    })\n  }\n\n  const successfullyCompletedJobs: (number | string)[] = []\n\n  const runSingleJob = async (\n    job: Job,\n  ): Promise<{\n    id: number | string\n    result: RunJobResult\n  } | null> => {\n    if (!job.workflowSlug && !job.taskSlug) {\n      throw new Error('Job must have either a workflowSlug or a taskSlug')\n    }\n    const jobReq = isolateObjectProperty(req, 'transactionID')\n\n    let workflowConfig: undefined | WorkflowConfig = undefined\n\n    if (job.workflowSlug && jobsConfig.workflows?.length) {\n      workflowConfig = jobsConfig.workflows.find(({ slug }) => slug === job.workflowSlug)\n    } else if (job.taskSlug && jobsConfig.tasks?.length) {\n      const taskExists = jobsConfig.tasks.some(({ slug }) => slug === job.taskSlug)\n      if (taskExists) {\n        workflowConfig = {\n          slug: 'singleTask',\n          handler: async ({ job, tasks }) => {\n            await tasks[job.taskSlug as string]!('1', {\n              input: job.input,\n            })\n          },\n        }\n      }\n    }\n\n    try {\n      if (!workflowConfig) {\n        // Permanently fail jobs whose task/workflow slug is no longer registered in config — they can never complete.\n        const errorMessage = `${job.taskSlug ? `Task '${job.taskSlug}'` : `Workflow '${job.workflowSlug}'`} is not registered in payload.config.jobs.`\n\n        if (!silent || (typeof silent === 'object' && !silent.error)) {\n          payload.logger.error({\n            msg: `Error running job ${job.workflowSlug || `Task: ${job.taskSlug}`} id: ${job.id} - ${errorMessage}`,\n          })\n        }\n\n        const updateJob = getUpdateJobFunction(job, jobReq)\n        await updateJob({\n          error: { message: errorMessage },\n          hasError: true,\n          processingUntil: null,\n          totalTried: (job.totalTried ?? 0) + 1,\n        })\n\n        return {\n          id: job.id,\n          result: {\n            status: 'error-reached-max-retries',\n          },\n        }\n      }\n\n      const updateJob = getUpdateJobFunction(job, jobReq)\n\n      // the runner will either be passed to the config\n      // OR it will be a path, which we will need to import via eval to avoid\n      // Next.js compiler dynamic import expression errors\n      let workflowHandler: WorkflowHandler | WorkflowJSON\n      if (\n        typeof workflowConfig.handler === 'function' ||\n        (typeof workflowConfig.handler === 'object' && Array.isArray(workflowConfig.handler))\n      ) {\n        workflowHandler = workflowConfig.handler\n      } else {\n        workflowHandler = await importHandlerPath<typeof workflowHandler>(workflowConfig.handler)\n\n        if (!workflowHandler) {\n          const jobLabel = job.workflowSlug || `Task: ${job.taskSlug}`\n          const errorMessage = `Can't find runner while importing with the path ${workflowConfig.handler} in job type ${jobLabel}.`\n          if (!silent || (typeof silent === 'object' && !silent.error)) {\n            payload.logger.error(errorMessage)\n          }\n\n          await updateJob({\n            error: {\n              error: errorMessage,\n            },\n            hasError: true,\n            processingUntil: null,\n          })\n\n          return {\n            id: job.id,\n            result: {\n              status: 'error-reached-max-retries',\n            },\n          }\n        }\n      }\n\n      if (typeof workflowHandler === 'function') {\n        const result = await runJob({\n          job,\n          req: jobReq,\n          silent,\n          updateJob,\n          workflowConfig,\n          workflowHandler,\n        })\n\n        if (result.status === 'success') {\n          successfullyCompletedJobs.push(job.id)\n        }\n\n        return { id: job.id, result }\n      } else {\n        const result = await runJSONJob({\n          job,\n          req: jobReq,\n          silent,\n          updateJob,\n          workflowConfig,\n          workflowHandler,\n        })\n\n        if (result.status === 'success') {\n          successfullyCompletedJobs.push(job.id)\n        }\n\n        return { id: job.id, result }\n      }\n    } catch (error) {\n      if (error instanceof JobRunAbortedError) {\n        return null\n      }\n      if (error instanceof JobCancelledError) {\n        if (\n          !(job.error as Record<string, unknown> | undefined)?.cancelled ||\n          !job.hasError ||\n          job.processingUntil ||\n          job.completedAt ||\n          job.waitUntil\n        ) {\n          // When using the local API to cancel jobs, the local API will update the job data for us to ensure the job is cancelled.\n          // But when throwing a JobCancelledError within a task or workflow handler, we are responsible for updating the job data ourselves.\n          // Use the lease-protected getUpdateJobFunction so an old worker cannot cancel the job after another worker claims it.\n          const updateJob = getUpdateJobFunction(job, jobReq)\n          await updateJob({\n            completedAt: null,\n            error: {\n              cancelled: true,\n              message: error.message,\n            },\n            hasError: true,\n            processingUntil: null,\n            waitUntil: null,\n          })\n        }\n\n        return {\n          id: job.id,\n          result: {\n            status: 'error-reached-max-retries',\n          },\n        }\n      }\n      throw error\n    }\n  }\n\n  const stopHeartbeat = startProcessingLeaseHeartbeat({\n    jobIDs: jobs.map((job) => job.id),\n    processingLeaseDuration,\n    processingLeaseSafetyBuffer,\n    processingToken,\n    req,\n    silent,\n  })\n\n  let resultsArray: { id: number | string; result: RunJobResult }[] = []\n  try {\n    if (sequential) {\n      for (const job of jobs) {\n        const result = await runSingleJob(job)\n        if (result) {\n          resultsArray.push(result)\n        }\n      }\n    } else {\n      const jobPromises = jobs.map(runSingleJob)\n      resultsArray = (await Promise.all(jobPromises)).filter((result) => result !== null)\n    }\n  } finally {\n    stopHeartbeat()\n  }\n\n  if (jobsConfig.deleteJobOnComplete && successfullyCompletedJobs.length) {\n    try {\n      await payload.db.deleteMany({\n        collection: jobsCollectionSlug,\n        where: { id: { in: successfullyCompletedJobs } },\n      })\n    } catch (err) {\n      if (!silent || (typeof silent === 'object' && !silent.error)) {\n        payload.logger.error({\n          err,\n          msg: `Failed to delete jobs ${successfullyCompletedJobs.join(', ')} on complete`,\n        })\n      }\n    }\n  }\n\n  const resultsObject: RunJobsResult['jobStatus'] = resultsArray.reduce(\n    (acc, cur) => {\n      if (cur !== null) {\n        // Check if there's a valid result to include\n        acc[cur.id] = cur.result\n      }\n      return acc\n    },\n    {} as Record<string, RunJobResult>,\n  )\n\n  let remainingJobsFromQueried = 0\n  for (const jobID in resultsObject) {\n    const jobResult = resultsObject[jobID]\n    if (jobResult?.status === 'error') {\n      remainingJobsFromQueried++ // Can be retried\n    }\n  }\n\n  return {\n    jobStatus: resultsObject,\n    remainingJobsFromQueried,\n  }\n}\n"],"names":["v4","uuid","Forbidden","isolateObjectProperty","jobsCollectionSlug","JobCancelledError","JobRunAbortedError","getCurrentDate","updateJobs","startProcessingLeaseHeartbeat","getUpdateJobFunction","importHandlerPath","runJob","runJSONJob","runJobs","args","id","allQueues","limit","overrideAccess","processingOrder","queue","req","payload","config","jobs","jobsConfig","sequential","silent","where","whereFromProps","accessFn","access","run","hasAccess","t","now","duration","processingLeaseDuration","safetyBuffer","processingLeaseSafetyBuffer","processingLease","nowISOString","toISOString","processingUntil","Date","getTime","processingToken","and","completedAt","exists","hasError","not_equals","or","less_than_equal","waitUntil","less_than","push","equals","hasConcurrency","runningJobsWithConcurrency","db","find","collection","pagination","transactionID","undefined","select","concurrencyKey","greater_than","runningConcurrencyKeys","Set","docs","doc","add","size","not_in","updatedDocs","data","returning","defaultProcessingOrder","collections","defaultSort","processingOrderConfig","Array","isArray","queues","default","sort","length","noJobsRemaining","remainingJobsFromQueried","seenConcurrencyKeys","jobsToRun","jobsToRelease","job","has","releaseIds","map","in","info","newCount","retryCount","totalTried","logger","msg","new","retrying","successfullyCompletedJobs","runSingleJob","workflowSlug","taskSlug","Error","jobReq","workflowConfig","workflows","slug","tasks","taskExists","some","handler","input","errorMessage","error","updateJob","message","result","status","workflowHandler","jobLabel","cancelled","stopHeartbeat","jobIDs","resultsArray","jobPromises","Promise","all","filter","deleteJobOnComplete","deleteMany","err","join","resultsObject","reduce","acc","cur","jobID","jobResult","jobStatus"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJSONJob/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,4CAA4C,CAAA;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAOtD,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,cAAc,CAAA;IACnB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,cAAc,EAAE,cAAc,CAAA;IAC9B,eAAe,EAAE,YAAY,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,sEAOpB,IAAI,KAAG,OAAO,CAAC,gBAAgB,CAwGjC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/queues/operations/runJobs/runJSONJob/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,4CAA4C,CAAA;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAOtD,KAAK,IAAI,GAAG;IACV,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,cAAc,CAAA;IACnB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,iBAAiB,CAAA;IAC5B,cAAc,EAAE,cAAc,CAAA;IAC9B,eAAe,EAAE,YAAY,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,sEAOpB,IAAI,KAAG,OAAO,CAAC,gBAAgB,CA4GjC,CAAA"}

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

@@ -1,5 +1,5 @@
 import { handleWorkflowError } from '../../../errors/handleWorkflowError.js';
-import { WorkflowError } from '../../../errors/index.js';
+import { JobCancelledError, JobRunAbortedError, WorkflowError } from '../../../errors/index.js';
 import { getCurrentDate } from '../../../utilities/getCurrentDate.js';
 import { getRunTaskFunction } from '../runJob/getRunTaskFunction.js';
 export const runJSONJob = async ({ job, req, silent = false, updateJob, workflowConfig, workflowHandler })=>{
@@ -41,6 +41,9 @@ export const runJSONJob = async ({ job, req, silent = false, updateJob, workflow
             }
         }));
     } catch (error) {
+        if (error instanceof JobCancelledError || error instanceof JobRunAbortedError) {
+            throw error;
+        }
         const { hasFinalError } = await handleWorkflowError({
             error: error instanceof WorkflowError ? error : new WorkflowError({
                 job,
@@ -77,14 +80,14 @@ export const runJSONJob = async ({ job, req, silent = false, updateJob, workflow
     if (workflowCompleted) {
         await updateJob({
             completedAt: getCurrentDate().toISOString(),
-            processing: false,
+            processingUntil: null,
             totalTried: (job.totalTried ?? 0) + 1
         });
         return {
             status: 'success'
         };
     } else {
-        // Retry the job - no need to bump processing or totalTried as this does not count as a retry. A condition of a different task might have just opened up!
+        // Retry the job - no need to bump processingUntil or totalTried as this does not count as a retry. A condition of a different task might have just opened up!
         return await runJSONJob({
             job,
             req,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJSONJob/index.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\nimport type { WorkflowJSON, WorkflowStep } from '../../../config/types/workflowJSONTypes.js'\nimport type { WorkflowConfig } from '../../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../../localAPI.js'\nimport type { UpdateJobFunction } from '../runJob/getUpdateJobFunction.js'\nimport type { JobRunStatus } from '../runJob/index.js'\n\nimport { handleWorkflowError } from '../../../errors/handleWorkflowError.js'\nimport { WorkflowError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getRunTaskFunction } from '../runJob/getRunTaskFunction.js'\n\ntype Args = {\n  job: Job\n  req: PayloadRequest\n  /**\n   * If set to true, the job system will not log any output to the console (for both info and error logs).\n   * Can be an option for more granular control over logging.\n   *\n   * This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n   *\n   * @default false\n   */\n  silent?: RunJobsSilent\n  updateJob: UpdateJobFunction\n  workflowConfig: WorkflowConfig\n  workflowHandler: WorkflowJSON\n}\n\nexport type RunJSONJobResult = {\n  status: JobRunStatus\n}\n\nexport const runJSONJob = async ({\n  job,\n  req,\n  silent = false,\n  updateJob,\n  workflowConfig,\n  workflowHandler,\n}: Args): Promise<RunJSONJobResult> => {\n  const stepsToRun: WorkflowStep<string>[] = []\n\n  for (const step of workflowHandler) {\n    if ('task' in step) {\n      if (job?.taskStatus?.[step.task]?.[step.id]?.complete) {\n        continue\n      }\n    } else {\n      if (job?.taskStatus?.['inline']?.[step.id]?.complete) {\n        continue\n      }\n    }\n    if (step.condition && !step.condition({ job })) {\n      continue\n    }\n    stepsToRun.push(step)\n  }\n\n  const tasks = getRunTaskFunction(job, workflowConfig, req, false, updateJob)\n  const inlineTask = getRunTaskFunction(job, workflowConfig, req, true, updateJob)\n\n  // Run the job\n  try {\n    await Promise.all(\n      stepsToRun.map(async (step) => {\n        if ('task' in step) {\n          await tasks[step.task]!(step.id, {\n            input: step.input ? step.input({ job }) : {},\n            retries: step.retries,\n          })\n        } else {\n          await inlineTask(step.id, {\n            retries: step.retries,\n            task: step.inlineTask as any, // TODO: Fix type\n          })\n        }\n      }),\n    )\n  } catch (error) {\n    const { hasFinalError } = await handleWorkflowError({\n      error:\n        error instanceof WorkflowError\n          ? error\n          : new WorkflowError({\n              job,\n              message:\n                typeof error === 'object' && error && 'message' in error\n                  ? (error.message as string)\n                  : 'An unhandled error occurred',\n              workflowConfig,\n            }),\n      silent,\n\n      req,\n      updateJob,\n    })\n\n    return {\n      status: hasFinalError ? 'error-reached-max-retries' : 'error',\n    }\n  }\n\n  // Check if workflow has completed\n  let workflowCompleted = false\n  for (const [slug, map] of Object.entries(job.taskStatus)) {\n    for (const [id, taskStatus] of Object.entries(map)) {\n      if (taskStatus.complete) {\n        const step = workflowHandler.find((step) => {\n          if ('task' in step) {\n            return step.task === slug && step.id === id\n          } else {\n            return step.id === id && slug === 'inline'\n          }\n        })\n        if (step?.completesJob) {\n          workflowCompleted = true\n          break\n        }\n      }\n    }\n  }\n\n  if (workflowCompleted) {\n    await updateJob({\n      completedAt: getCurrentDate().toISOString(),\n      processing: false,\n      totalTried: (job.totalTried ?? 0) + 1,\n    })\n\n    return {\n      status: 'success',\n    }\n  } else {\n    // Retry the job - no need to bump processing or totalTried as this does not count as a retry. A condition of a different task might have just opened up!\n    return await runJSONJob({\n      job,\n      req,\n      silent,\n      updateJob,\n      workflowConfig,\n      workflowHandler,\n    })\n  }\n}\n"],"names":["handleWorkflowError","WorkflowError","getCurrentDate","getRunTaskFunction","runJSONJob","job","req","silent","updateJob","workflowConfig","workflowHandler","stepsToRun","step","taskStatus","task","id","complete","condition","push","tasks","inlineTask","Promise","all","map","input","retries","error","hasFinalError","message","status","workflowCompleted","slug","Object","entries","find","completesJob","completedAt","toISOString","processing","totalTried"],"mappings":"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"}
+{"version":3,"sources":["../../../../../src/queues/operations/runJobs/runJSONJob/index.ts"],"sourcesContent":["import type { Job } from '../../../../index.js'\nimport type { PayloadRequest } from '../../../../types/index.js'\nimport type { WorkflowJSON, WorkflowStep } from '../../../config/types/workflowJSONTypes.js'\nimport type { WorkflowConfig } from '../../../config/types/workflowTypes.js'\nimport type { RunJobsSilent } from '../../../localAPI.js'\nimport type { UpdateJobFunction } from '../runJob/getUpdateJobFunction.js'\nimport type { JobRunStatus } from '../runJob/index.js'\n\nimport { handleWorkflowError } from '../../../errors/handleWorkflowError.js'\nimport { JobCancelledError, JobRunAbortedError, WorkflowError } from '../../../errors/index.js'\nimport { getCurrentDate } from '../../../utilities/getCurrentDate.js'\nimport { getRunTaskFunction } from '../runJob/getRunTaskFunction.js'\n\ntype Args = {\n  job: Job\n  req: PayloadRequest\n  /**\n   * If set to true, the job system will not log any output to the console (for both info and error logs).\n   * Can be an option for more granular control over logging.\n   *\n   * This will not automatically affect user-configured logs (e.g. if you call `console.log` or `payload.logger.info` in your job code).\n   *\n   * @default false\n   */\n  silent?: RunJobsSilent\n  updateJob: UpdateJobFunction\n  workflowConfig: WorkflowConfig\n  workflowHandler: WorkflowJSON\n}\n\nexport type RunJSONJobResult = {\n  status: JobRunStatus\n}\n\nexport const runJSONJob = async ({\n  job,\n  req,\n  silent = false,\n  updateJob,\n  workflowConfig,\n  workflowHandler,\n}: Args): Promise<RunJSONJobResult> => {\n  const stepsToRun: WorkflowStep<string>[] = []\n\n  for (const step of workflowHandler) {\n    if ('task' in step) {\n      if (job?.taskStatus?.[step.task]?.[step.id]?.complete) {\n        continue\n      }\n    } else {\n      if (job?.taskStatus?.['inline']?.[step.id]?.complete) {\n        continue\n      }\n    }\n    if (step.condition && !step.condition({ job })) {\n      continue\n    }\n    stepsToRun.push(step)\n  }\n\n  const tasks = getRunTaskFunction(job, workflowConfig, req, false, updateJob)\n  const inlineTask = getRunTaskFunction(job, workflowConfig, req, true, updateJob)\n\n  // Run the job\n  try {\n    await Promise.all(\n      stepsToRun.map(async (step) => {\n        if ('task' in step) {\n          await tasks[step.task]!(step.id, {\n            input: step.input ? step.input({ job }) : {},\n            retries: step.retries,\n          })\n        } else {\n          await inlineTask(step.id, {\n            retries: step.retries,\n            task: step.inlineTask,\n          })\n        }\n      }),\n    )\n  } catch (error) {\n    if (error instanceof JobCancelledError || error instanceof JobRunAbortedError) {\n      throw error\n    }\n\n    const { hasFinalError } = await handleWorkflowError({\n      error:\n        error instanceof WorkflowError\n          ? error\n          : new WorkflowError({\n              job,\n              message:\n                typeof error === 'object' && error && 'message' in error\n                  ? (error.message as string)\n                  : 'An unhandled error occurred',\n              workflowConfig,\n            }),\n      silent,\n\n      req,\n      updateJob,\n    })\n\n    return {\n      status: hasFinalError ? 'error-reached-max-retries' : 'error',\n    }\n  }\n\n  // Check if workflow has completed\n  let workflowCompleted = false\n  for (const [slug, map] of Object.entries(job.taskStatus)) {\n    for (const [id, taskStatus] of Object.entries(map)) {\n      if (taskStatus.complete) {\n        const step = workflowHandler.find((step) => {\n          if ('task' in step) {\n            return step.task === slug && step.id === id\n          } else {\n            return step.id === id && slug === 'inline'\n          }\n        })\n        if (step?.completesJob) {\n          workflowCompleted = true\n          break\n        }\n      }\n    }\n  }\n\n  if (workflowCompleted) {\n    await updateJob({\n      completedAt: getCurrentDate().toISOString(),\n      processingUntil: null,\n      totalTried: (job.totalTried ?? 0) + 1,\n    })\n\n    return {\n      status: 'success',\n    }\n  } else {\n    // Retry the job - no need to bump processingUntil or totalTried as this does not count as a retry. A condition of a different task might have just opened up!\n    return await runJSONJob({\n      job,\n      req,\n      silent,\n      updateJob,\n      workflowConfig,\n      workflowHandler,\n    })\n  }\n}\n"],"names":["handleWorkflowError","JobCancelledError","JobRunAbortedError","WorkflowError","getCurrentDate","getRunTaskFunction","runJSONJob","job","req","silent","updateJob","workflowConfig","workflowHandler","stepsToRun","step","taskStatus","task","id","complete","condition","push","tasks","inlineTask","Promise","all","map","input","retries","error","hasFinalError","message","status","workflowCompleted","slug","Object","entries","find","completesJob","completedAt","toISOString","processingUntil","totalTried"],"mappings":"AAQA,SAASA,mBAAmB,QAAQ,yCAAwC;AAC5E,SAASC,iBAAiB,EAAEC,kBAAkB,EAAEC,aAAa,QAAQ,2BAA0B;AAC/F,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,kBAAkB,QAAQ,kCAAiC;AAuBpE,OAAO,MAAMC,aAAa,OAAO,EAC/BC,GAAG,EACHC,GAAG,EACHC,SAAS,KAAK,EACdC,SAAS,EACTC,cAAc,EACdC,eAAe,EACV;IACL,MAAMC,aAAqC,EAAE;IAE7C,KAAK,MAAMC,QAAQF,gBAAiB;QAClC,IAAI,UAAUE,MAAM;YAClB,IAAIP,KAAKQ,YAAY,CAACD,KAAKE,IAAI,CAAC,EAAE,CAACF,KAAKG,EAAE,CAAC,EAAEC,UAAU;gBACrD;YACF;QACF,OAAO;YACL,IAAIX,KAAKQ,YAAY,CAAC,SAAS,EAAE,CAACD,KAAKG,EAAE,CAAC,EAAEC,UAAU;gBACpD;YACF;QACF;QACA,IAAIJ,KAAKK,SAAS,IAAI,CAACL,KAAKK,SAAS,CAAC;YAAEZ;QAAI,IAAI;YAC9C;QACF;QACAM,WAAWO,IAAI,CAACN;IAClB;IAEA,MAAMO,QAAQhB,mBAAmBE,KAAKI,gBAAgBH,KAAK,OAAOE;IAClE,MAAMY,aAAajB,mBAAmBE,KAAKI,gBAAgBH,KAAK,MAAME;IAEtE,cAAc;IACd,IAAI;QACF,MAAMa,QAAQC,GAAG,CACfX,WAAWY,GAAG,CAAC,OAAOX;YACpB,IAAI,UAAUA,MAAM;gBAClB,MAAMO,KAAK,CAACP,KAAKE,IAAI,CAAC,CAAEF,KAAKG,EAAE,EAAE;oBAC/BS,OAAOZ,KAAKY,KAAK,GAAGZ,KAAKY,KAAK,CAAC;wBAAEnB;oBAAI,KAAK,CAAC;oBAC3CoB,SAASb,KAAKa,OAAO;gBACvB;YACF,OAAO;gBACL,MAAML,WAAWR,KAAKG,EAAE,EAAE;oBACxBU,SAASb,KAAKa,OAAO;oBACrBX,MAAMF,KAAKQ,UAAU;gBACvB;YACF;QACF;IAEJ,EAAE,OAAOM,OAAO;QACd,IAAIA,iBAAiB3B,qBAAqB2B,iBAAiB1B,oBAAoB;YAC7E,MAAM0B;QACR;QAEA,MAAM,EAAEC,aAAa,EAAE,GAAG,MAAM7B,oBAAoB;YAClD4B,OACEA,iBAAiBzB,gBACbyB,QACA,IAAIzB,cAAc;gBAChBI;gBACAuB,SACE,OAAOF,UAAU,YAAYA,SAAS,aAAaA,QAC9CA,MAAME,OAAO,GACd;gBACNnB;YACF;YACNF;YAEAD;YACAE;QACF;QAEA,OAAO;YACLqB,QAAQF,gBAAgB,8BAA8B;QACxD;IACF;IAEA,kCAAkC;IAClC,IAAIG,oBAAoB;IACxB,KAAK,MAAM,CAACC,MAAMR,IAAI,IAAIS,OAAOC,OAAO,CAAC5B,IAAIQ,UAAU,EAAG;QACxD,KAAK,MAAM,CAACE,IAAIF,WAAW,IAAImB,OAAOC,OAAO,CAACV,KAAM;YAClD,IAAIV,WAAWG,QAAQ,EAAE;gBACvB,MAAMJ,OAAOF,gBAAgBwB,IAAI,CAAC,CAACtB;oBACjC,IAAI,UAAUA,MAAM;wBAClB,OAAOA,KAAKE,IAAI,KAAKiB,QAAQnB,KAAKG,EAAE,KAAKA;oBAC3C,OAAO;wBACL,OAAOH,KAAKG,EAAE,KAAKA,MAAMgB,SAAS;oBACpC;gBACF;gBACA,IAAInB,MAAMuB,cAAc;oBACtBL,oBAAoB;oBACpB;gBACF;YACF;QACF;IACF;IAEA,IAAIA,mBAAmB;QACrB,MAAMtB,UAAU;YACd4B,aAAalC,iBAAiBmC,WAAW;YACzCC,iBAAiB;YACjBC,YAAY,AAAClC,CAAAA,IAAIkC,UAAU,IAAI,CAAA,IAAK;QACtC;QAEA,OAAO;YACLV,QAAQ;QACV;IACF,OAAO;QACL,8JAA8J;QAC9J,OAAO,MAAMzB,WAAW;YACtBC;YACAC;YACAC;YACAC;YACAC;YACAC;QACF;IACF;AACF,EAAC"}

package/dist/queues/operations/runJobs/runJob/getRunTaskFunction.js

@@ -1,5 +1,5 @@
 import ObjectIdImport from 'bson-objectid';
-import { JobCancelledError, TaskError } from '../../../errors/index.js';
+import { JobCancelledError, JobRunAbortedError, TaskError } from '../../../errors/index.js';
 import { getCurrentDate } from '../../../utilities/getCurrentDate.js';
 import { getTaskHandlerFromConfig } from './importHandlerPath.js';
 const ObjectId = 'default' in ObjectIdImport ? ObjectIdImport.default : ObjectIdImport;
@@ -75,8 +75,8 @@ export const getRunTaskFunction = (job, workflowConfig, req, isInline, updateJob
                     })
                 }))?.output;
             } catch (err) {
-                if (err instanceof JobCancelledError) {
-                    // Re-throw JobCancelledError to be handled by the top-level error handler
+                if (err instanceof JobCancelledError || err instanceof JobRunAbortedError) {
+                    // Job run aborts are handled by the top-level runner.
                     throw err;
                 }
                 throw new TaskError({
@@ -106,9 +106,9 @@ export const getRunTaskFunction = (job, workflowConfig, req, isInline, updateJob
                 id: new ObjectId().toHexString(),
                 completedAt: getCurrentDate().toISOString(),
                 executedAt: executedAt.toISOString(),
-                input,
+                input: input ?? {},
                 output,
-                parent: jobConfig.addParentToTaskLog ? parent : undefined,
+                parent,
                 state: 'succeeded',
                 taskID,
                 taskSlug