From 27d504079a5460100d50946cb8455b1738a816f1 Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sun, 14 Sep 2025 20:32:23 +0200
Subject: [PATCH] Fix critical error handling and race condition issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔴 Critical fixes:
- Fix race condition: processImmediately now properly fails if job creation fails
- Fix silent job failures: job creation failures now throw errors instead of warnings
- Ensure atomic operations: either email + job succeed together, or both fail

⚠️ Improvements:
- Simplify error handling in processEmailJob to be more consistent
- Add proper validation for missing PayloadCMS jobs configuration
- Make error messages more descriptive and actionable
---
 src/jobs/processEmailJob.ts |  8 +-----
 src/sendEmail.ts            | 56 +++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/jobs/processEmailJob.ts b/src/jobs/processEmailJob.ts
index ddfd766..39137ae 100644
--- a/src/jobs/processEmailJob.ts
+++ b/src/jobs/processEmailJob.ts
@@ -64,13 +64,7 @@ export const processEmailJob = {
         }
       }
     } catch (error) {
-      // Re-throw Error instances to preserve stack trace and error context
-      if (error instanceof Error) {
-        throw error
-      } else {
-        // Only wrap non-Error values
-        throw new Error(`Failed to process email ${emailId}: ${String(error)}`)
-      }
+      throw new Error(`Failed to process email ${emailId}: ${error instanceof Error ? error.message : String(error)}`)
     }
   }
 }
diff --git a/src/sendEmail.ts b/src/sendEmail.ts
index c6e95ef..3b3cafd 100644
--- a/src/sendEmail.ts
+++ b/src/sendEmail.ts
@@ -145,36 +145,44 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
   // Create an individual job for this email
   const queueName = options.queue || mailingConfig.queue || 'default'
 
-  let jobId: string | undefined
-
-  if (payload.jobs) {
-    try {
-      const job = await payload.jobs.queue({
-        queue: queueName,
-        task: 'process-email',
-        input: {
-          emailId: String(email.id)
-        },
-        // If scheduled, set the waitUntil date
-        waitUntil: emailData.scheduledAt ? new Date(emailData.scheduledAt) : undefined
-      })
-
-      jobId = String(job.id)
-    } catch (error) {
-      console.warn(`Failed to create job for email ${email.id}:`, error)
-      // Don't fail the entire sendEmail operation if job creation fails
+  if (!payload.jobs) {
+    if (options.processImmediately) {
+      throw new Error('PayloadCMS jobs not configured - cannot process email immediately')
+    } else {
+      console.warn('PayloadCMS jobs not configured - emails will not be processed automatically')
+      return email as TEmail
     }
-  } else {
-    console.warn('PayloadCMS jobs not configured - emails will not be processed automatically')
   }
 
-  // If processImmediately is true and we have a job, process it now
-  if (options.processImmediately && jobId) {
+  let jobId: string
+  try {
+    const job = await payload.jobs.queue({
+      queue: queueName,
+      task: 'process-email',
+      input: {
+        emailId: String(email.id)
+      },
+      // If scheduled, set the waitUntil date
+      waitUntil: emailData.scheduledAt ? new Date(emailData.scheduledAt) : undefined
+    })
+
+    jobId = String(job.id)
+  } catch (error) {
+    if (options.processImmediately) {
+      // If immediate processing was requested, job creation failure is critical
+      throw new Error(`Failed to create job for immediate processing of email ${email.id}: ${error instanceof Error ? error.message : String(error)}`)
+    } else {
+      // For regular queued emails, job creation failure is still critical
+      throw new Error(`Failed to create processing job for email ${email.id}: ${error instanceof Error ? error.message : String(error)}`)
+    }
+  }
+
+  // If processImmediately is true, process the job now
+  if (options.processImmediately) {
     try {
       await processJobById(payload, jobId)
     } catch (error) {
-      console.warn(`Failed to process email ${email.id} immediately:`, error)
-      // Don't fail the entire sendEmail operation if immediate processing fails
+      throw new Error(`Failed to process email ${email.id} immediately: ${error instanceof Error ? error.message : String(error)}`)
     }
   }