Merge pull request #59 from xtr-dev/dev

Dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtr-dev/payload-mailing",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Template-based email system with scheduling and job processing for PayloadCMS",
   "type": "module",
   "main": "dist/index.js",

src/sendEmail.ts

@@ -139,7 +139,6 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
   // If processImmediately is true, get the job from the relationship and process it now
   if (options.processImmediately) {
     const logger = createContextLogger(payload, 'IMMEDIATE')
-    logger.debug(`Starting immediate processing for email ${email.id}`)
 
     if (!payload.jobs) {
       throw new Error('PayloadCMS jobs not configured - cannot process email immediately')
@@ -153,7 +152,6 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
     const startTime = Date.now()
     let jobId: string | undefined
 
-    logger.debug(`Polling for job creation (max ${maxAttempts} attempts, ${maxTotalTime}ms timeout)`)
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       // Check total timeout before continuing
@@ -178,20 +176,19 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
         id: email.id,
       })
 
-      logger.debug(`Attempt ${attempt + 1}/${maxAttempts}: Found ${emailWithJobs.jobs?.length || 0} jobs for email ${email.id}`)
 
       if (emailWithJobs.jobs && emailWithJobs.jobs.length > 0) {
         // Job found! Get the first job ID (should only be one for a new email)
-        jobId = Array.isArray(emailWithJobs.jobs)
-          ? String(emailWithJobs.jobs[0])
-          : String(emailWithJobs.jobs)
-        logger.info(`Found job ID: ${jobId}`)
+        const firstJob = Array.isArray(emailWithJobs.jobs) ? emailWithJobs.jobs[0] : emailWithJobs.jobs
+        jobId = typeof firstJob === 'string' ? firstJob : String(firstJob.id || firstJob)
         break
       }
 
       // Log on later attempts to help with debugging (reduced threshold)
       if (attempt >= 1) {
-        logger.debug(`Waiting for job creation for email ${email.id}, attempt ${attempt + 1}/${maxAttempts}`)
+        if (attempt >= 2) {
+          logger.debug(`Waiting for job creation for email ${email.id}, attempt ${attempt + 1}/${maxAttempts}`)
+        }
       }
     }
 
@@ -213,10 +210,9 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
       )
     }
 
-    logger.info(`Starting job execution for job ${jobId}`)
     try {
       await processJobById(payload, jobId)
-      logger.info(`Successfully processed email ${email.id} immediately`)
+      logger.debug(`Successfully processed email ${email.id} immediately`)
     } catch (error) {
       logger.error(`Failed to process email ${email.id} immediately:`, error)
       throw new Error(`Failed to process email ${email.id} immediately: ${String(error)}`)

src/utils/emailProcessor.ts

@@ -37,16 +37,11 @@ export async function processEmailById(payload: Payload, emailId: string): Promi
  * @returns Promise that resolves when job is processed
  */
 export async function processJobById(payload: Payload, jobId: string): Promise<void> {
-  const logger = createContextLogger(payload, 'PROCESSOR')
-  logger.debug(`Starting processJobById for job ${jobId}`)
-
   if (!payload.jobs) {
     throw new Error('PayloadCMS jobs not configured - cannot process job immediately')
   }
 
   try {
-    logger.debug(`Running job ${jobId} with payload.jobs.run()`)
-
     // Run a specific job by its ID (using where clause to find the job)
     const result = await payload.jobs.run({
       where: {
@@ -55,9 +50,8 @@ export async function processJobById(payload: Payload, jobId: string): Promise<v
         }
       }
     })
-
-    logger.info(`Job ${jobId} execution completed`, { result })
   } catch (error) {
+    const logger = createContextLogger(payload, 'PROCESSOR')
     logger.error(`Job ${jobId} execution failed:`, error)
     throw new Error(`Failed to process job ${jobId}: ${String(error)}`)
   }

src/utils/jobScheduler.ts

@@ -49,15 +49,12 @@ export async function ensureEmailJob(
   const queueName = options?.queueName || mailingContext?.config?.queue || 'default'
 
   const logger = createContextLogger(payload, 'JOB_SCHEDULER')
-  logger.debug(`Ensuring job for email ${normalizedEmailId}`)
-  logger.debug(`Queue: ${queueName}, scheduledAt: ${options?.scheduledAt || 'immediate'}`)
 
   // First, optimistically try to create the job
   // If it fails due to uniqueness constraint, then check for existing jobs
   // This approach minimizes the race condition window
 
   try {
-    logger.debug(`Attempting to create new job for email ${normalizedEmailId}`)
     // Attempt to create job - rely on database constraints for duplicate prevention
     const job = await payload.jobs.queue({
       queue: queueName,
@@ -69,31 +66,22 @@ export async function ensureEmailJob(
     })
 
     logger.info(`Auto-scheduled processing job ${job.id} for email ${normalizedEmailId}`)
-    logger.debug(`Job details`, {
-      jobId: job.id,
-      emailId: normalizedEmailId,
-      scheduledAt: options?.scheduledAt || 'immediate',
-      task: 'process-email',
-      queue: queueName
-    })
 
     return {
       jobIds: [job.id],
       created: true
     }
   } catch (createError) {
-    logger.warn(`Job creation failed for email ${normalizedEmailId}: ${String(createError)}`)
 
     // Job creation failed - likely due to duplicate constraint or system issue
 
     // Check if duplicate jobs exist (handles race condition where another process created job)
     const existingJobs = await findExistingJobs(payload, normalizedEmailId)
 
-    logger.debug(`Found ${existingJobs.totalDocs} existing jobs after creation failure`)
 
     if (existingJobs.totalDocs > 0) {
       // Found existing jobs - return them (race condition handled successfully)
-      logger.info(`Using existing jobs for email ${normalizedEmailId}: ${existingJobs.docs.map(j => j.id).join(', ')}`)
+      logger.debug(`Using existing jobs for email ${normalizedEmailId}: ${existingJobs.docs.map(j => j.id).join(', ')}`)
       return {
         jobIds: existingJobs.docs.map(job => job.id),
         created: false
@@ -109,7 +97,7 @@ export async function ensureEmailJob(
 
     if (isLikelyUniqueConstraint) {
       // This should not happen if our check above worked, but provide a clear error
-      logger.error(`Unique constraint violation but no existing jobs found for email ${normalizedEmailId}`)
+      logger.warn(`Unique constraint violation but no existing jobs found for email ${normalizedEmailId}`)
       throw new Error(
         `Database uniqueness constraint violation for email ${normalizedEmailId}, but no existing jobs found. ` +
         `This indicates a potential data consistency issue. Original error: ${errorMessage}`
@@ -117,7 +105,7 @@ export async function ensureEmailJob(
     }
 
     // Non-constraint related error
-    logger.error(`Non-constraint job creation error for email ${normalizedEmailId}: ${errorMessage}`)
+    logger.error(`Job creation error for email ${normalizedEmailId}: ${errorMessage}`)
     throw new Error(`Failed to create job for email ${normalizedEmailId}: ${errorMessage}`)
   }
 }