Merge pull request #57 from xtr-dev/dev

Fix TypeScript build error in jobScheduler.ts
2025-12-10 08:13:23 +00:00 · 2025-09-20 19:04:46 +02:00 · 2025-09-20 19:02:38 +02:00 · 2025-09-20 19:01:01 +02:00 · 2025-09-20 18:57:18 +02:00 · 2025-09-19 09:59:28 +02:00
31 changed files with 1687 additions and 1591 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ node_modules/
 payload-docs
 dist/
 /dev/payload.db
+/dev/dev.db
+dev.db
 tsconfig.tsbuildinfo
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -126,9 +126,10 @@ When you start the dev server, look for these messages:
 🎯 Test interface will be available at: /mailing-test

 ✅ Example email templates created successfully
-PayloadCMS Mailing Plugin initialized successfully
 ```

+**Note**: The plugin initializes silently on success (no "initialized successfully" message). If you see no errors, the plugin loaded correctly.
+
 ## Troubleshooting

 ### Server won't start
--- a/README.md
+++ b/README.md
--- a/dev/.env.local
+++ b/dev/.env.local
@@ -0,0 +1,2 @@
+USE_MEMORY_DB=true
+PAYLOAD_SECRET=YOUR_SECRET_HERE
--- a/dev/app/(frontend)/dashboard/page.tsx
+++ b/dev/app/(frontend)/dashboard/page.tsx
@@ -0,0 +1,310 @@
+'use client'
+
+import { useState, useEffect } from 'react'
+import Link from 'next/link'
+
+interface EmailStats {
+  total: number
+  sent: number
+  pending: number
+  failed: number
+  processing: number
+}
+
+export default function HomePage() {
+  const [emailStats, setEmailStats] = useState<EmailStats>({
+    total: 0,
+    sent: 0,
+    pending: 0,
+    failed: 0,
+    processing: 0
+  })
+  const [loading, setLoading] = useState<boolean>(true)
+
+  useEffect(() => {
+    fetchEmailStats()
+  }, [])
+
+  const fetchEmailStats = async () => {
+    try {
+      const response = await fetch('/api/test-email')
+      const data = await response.json()
+
+      if (data.outbox?.emails) {
+        const emails = data.outbox.emails
+        const stats: EmailStats = {
+          total: emails.length,
+          sent: emails.filter((email: any) => email.status === 'sent').length,
+          pending: emails.filter((email: any) => email.status === 'pending').length,
+          failed: emails.filter((email: any) => email.status === 'failed').length,
+          processing: emails.filter((email: any) => email.status === 'processing').length
+        }
+        setEmailStats(stats)
+      }
+    } catch (error) {
+      console.error('Error fetching email statistics:', error)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const StatCard = ({ label, value, color, description }: { label: string; value: number; color: string; description: string }) => (
+    <div style={{
+      backgroundColor: 'white',
+      border: '1px solid #e5e7eb',
+      borderRadius: '12px',
+      padding: '24px',
+      textAlign: 'center',
+      boxShadow: '0 1px 3px rgba(0, 0, 0, 0.1)',
+    }}>
+      <div style={{
+        fontSize: '3rem',
+        fontWeight: 'bold',
+        color: color,
+        marginBottom: '8px'
+      }}>
+        {value}
+      </div>
+      <div style={{
+        fontSize: '1.1rem',
+        fontWeight: '600',
+        color: '#374151',
+        marginBottom: '4px'
+      }}>
+        {label}
+      </div>
+      <div style={{
+        fontSize: '0.875rem',
+        color: '#6b7280'
+      }}>
+        {description}
+      </div>
+    </div>
+  )
+
+  return (
+    <div style={{
+      backgroundColor: '#f9fafb',
+      padding: '40px 20px',
+      minHeight: 'calc(100vh - 80px)'
+    }}>
+      <div style={{
+        maxWidth: '1200px',
+        margin: '0 auto'
+      }}>
+        {/* Header */}
+        <div style={{ textAlign: 'center', marginBottom: '48px' }}>
+          <h1 style={{
+            fontSize: '3rem',
+            fontWeight: 'bold',
+            color: '#1f2937',
+            marginBottom: '16px'
+          }}>
+            📧 PayloadCMS Mailing Plugin
+          </h1>
+          <p style={{
+            fontSize: '1.25rem',
+            color: '#6b7280',
+            marginBottom: '24px'
+          }}>
+            Development Dashboard
+          </p>
+
+          <div style={{ display: 'flex', gap: '16px', justifyContent: 'center', flexWrap: 'wrap' }}>
+            <Link
+              href="/admin"
+              style={{
+                backgroundColor: '#3b82f6',
+                color: 'white',
+                padding: '12px 24px',
+                borderRadius: '8px',
+                textDecoration: 'none',
+                fontWeight: '500',
+                transition: 'background-color 0.2s'
+              }}
+            >
+              📊 Admin Panel
+            </Link>
+            <Link
+              href="/mailing-test"
+              style={{
+                backgroundColor: '#10b981',
+                color: 'white',
+                padding: '12px 24px',
+                borderRadius: '8px',
+                textDecoration: 'none',
+                fontWeight: '500',
+                transition: 'background-color 0.2s'
+              }}
+            >
+              🧪 Test Interface
+            </Link>
+          </div>
+        </div>
+
+        {/* Email Statistics */}
+        <div style={{ marginBottom: '48px' }}>
+          <div style={{
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            marginBottom: '24px'
+          }}>
+            <h2 style={{
+              fontSize: '2rem',
+              fontWeight: 'bold',
+              color: '#1f2937'
+            }}>
+              Email Statistics
+            </h2>
+            <button
+              onClick={fetchEmailStats}
+              disabled={loading}
+              style={{
+                backgroundColor: loading ? '#9ca3af' : '#6b7280',
+                color: 'white',
+                padding: '8px 16px',
+                borderRadius: '6px',
+                border: 'none',
+                cursor: loading ? 'not-allowed' : 'pointer',
+                fontWeight: '500'
+              }}
+            >
+              {loading ? 'Loading...' : 'Refresh'}
+            </button>
+          </div>
+
+          {loading ? (
+            <div style={{ textAlign: 'center', padding: '48px' }}>
+              <div style={{ color: '#6b7280', fontSize: '1.1rem' }}>Loading email statistics...</div>
+            </div>
+          ) : (
+            <div style={{
+              display: 'grid',
+              gridTemplateColumns: 'repeat(auto-fit, minmax(250px, 1fr))',
+              gap: '24px'
+            }}>
+              <StatCard
+                label="Total Emails"
+                value={emailStats.total}
+                color="#1f2937"
+                description="All emails in the system"
+              />
+              <StatCard
+                label="Successfully Sent"
+                value={emailStats.sent}
+                color="#10b981"
+                description="Delivered successfully"
+              />
+              <StatCard
+                label="Pending"
+                value={emailStats.pending}
+                color="#f59e0b"
+                description="Waiting to be sent"
+              />
+              <StatCard
+                label="Failed"
+                value={emailStats.failed}
+                color="#ef4444"
+                description="Failed to send"
+              />
+              {emailStats.processing > 0 && (
+                <StatCard
+                  label="Processing"
+                  value={emailStats.processing}
+                  color="#3b82f6"
+                  description="Currently being sent"
+                />
+              )}
+            </div>
+          )}
+        </div>
+
+        {/* Quick Actions */}
+        <div style={{
+          backgroundColor: 'white',
+          borderRadius: '12px',
+          padding: '32px',
+          border: '1px solid #e5e7eb',
+          boxShadow: '0 1px 3px rgba(0, 0, 0, 0.1)'
+        }}>
+          <h3 style={{
+            fontSize: '1.5rem',
+            fontWeight: 'bold',
+            color: '#1f2937',
+            marginBottom: '16px'
+          }}>
+            Quick Actions
+          </h3>
+          <div style={{
+            display: 'grid',
+            gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))',
+            gap: '16px'
+          }}>
+            <div style={{ padding: '16px', backgroundColor: '#f9fafb', borderRadius: '8px' }}>
+              <h4 style={{ marginBottom: '8px', color: '#1f2937' }}>🎯 Test Email Sending</h4>
+              <p style={{ color: '#6b7280', marginBottom: '12px', fontSize: '0.9rem' }}>
+                Send test emails using templates with the interactive testing interface.
+              </p>
+              <Link
+                href="/mailing-test"
+                style={{
+                  color: '#3b82f6',
+                  textDecoration: 'none',
+                  fontWeight: '500'
+                }}
+              >
+                Open Test Interface →
+              </Link>
+            </div>
+
+            <div style={{ padding: '16px', backgroundColor: '#f9fafb', borderRadius: '8px' }}>
+              <h4 style={{ marginBottom: '8px', color: '#1f2937' }}>📝 Manage Templates</h4>
+              <p style={{ color: '#6b7280', marginBottom: '12px', fontSize: '0.9rem' }}>
+                Create and edit email templates in the Payload admin interface.
+              </p>
+              <Link
+                href="/admin/collections/email-templates"
+                style={{
+                  color: '#3b82f6',
+                  textDecoration: 'none',
+                  fontWeight: '500'
+                }}
+              >
+                Manage Templates →
+              </Link>
+            </div>
+
+            <div style={{ padding: '16px', backgroundColor: '#f9fafb', borderRadius: '8px' }}>
+              <h4 style={{ marginBottom: '8px', color: '#1f2937' }}>📬 Email Queue</h4>
+              <p style={{ color: '#6b7280', marginBottom: '12px', fontSize: '0.9rem' }}>
+                View and manage the email outbox and delivery status.
+              </p>
+              <Link
+                href="/admin/collections/emails"
+                style={{
+                  color: '#3b82f6',
+                  textDecoration: 'none',
+                  fontWeight: '500'
+                }}
+              >
+                View Email Queue →
+              </Link>
+            </div>
+          </div>
+        </div>
+
+        {/* Footer */}
+        <div style={{
+          textAlign: 'center',
+          marginTop: '48px',
+          padding: '24px',
+          color: '#6b7280',
+          fontSize: '0.875rem'
+        }}>
+          PayloadCMS Mailing Plugin Development Environment
+        </div>
+      </div>
+    </div>
+  )
+}
--- a/dev/app/(frontend)/layout.tsx
+++ b/dev/app/(frontend)/layout.tsx
@@ -0,0 +1,24 @@
+import type { Metadata } from 'next'
+
+export const metadata: Metadata = {
+  title: 'PayloadCMS Mailing Plugin - Development',
+  description: 'Development environment for PayloadCMS Mailing Plugin',
+}
+
+export default function FrontendLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <html lang="en">
+      <body style={{
+        margin: 0,
+        padding: 0,
+        fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif'
+      }}>
+        {children}
+      </body>
+    </html>
+  )
+}
--- a/dev/app/(frontend)/mailing-test/page.tsx
+++ b/dev/app/(frontend)/mailing-test/page.tsx
@@ -33,6 +33,8 @@ export default function MailingTestPage() {
  const [selectedTemplate, setSelectedTemplate] = useState<string>('')
  const [toEmail, setToEmail] = useState<string>('test@example.com')
  const [variables, setVariables] = useState<Record<string, any>>({})
+  const [jsonVariables, setJsonVariables] = useState<string>('{}')
+  const [jsonError, setJsonError] = useState<string>('')
  const [emailType, setEmailType] = useState<'send' | 'schedule'>('send')
  const [scheduleDate, setScheduleDate] = useState<string>('')
  const [loading, setLoading] = useState<boolean>(false)
@@ -58,6 +60,23 @@ export default function MailingTestPage() {
    const template = templates.find(t => t.slug === templateSlug)
    if (template?.previewData) {
      setVariables(template.previewData)
+      setJsonVariables(JSON.stringify(template.previewData, null, 2))
+    } else {
+      setVariables({})
+      setJsonVariables('{}')
+    }
+    setJsonError('')
+  }
+
+  const handleJsonVariablesChange = (jsonString: string) => {
+    setJsonVariables(jsonString)
+    setJsonError('')
+
+    try {
+      const parsed = JSON.parse(jsonString)
+      setVariables(parsed)
+    } catch (error) {
+      setJsonError(error instanceof Error ? error.message : 'Invalid JSON')
    }
  }

@@ -67,6 +86,11 @@ export default function MailingTestPage() {
      return
    }

+    if (jsonError) {
+      setMessage('Please fix the JSON syntax error before sending')
+      return
+    }
+
    setLoading(true)
    setMessage('')

@@ -88,7 +112,8 @@ export default function MailingTestPage() {
      const result = await response.json()
      
      if (result.success) {
-        setMessage(`✅ ${result.message} (ID: ${result.emailId})`)
+        const statusIcon = result.status === 'sent' ? '📧' : '📫'
+        setMessage(`✅ ${statusIcon} ${result.message} (ID: ${result.emailId})`)
        fetchData() // Refresh email queue
      } else {
        setMessage(`❌ Error: ${result.error}`)
@@ -204,28 +229,43 @@ export default function MailingTestPage() {
            </div>
          )}

-          {selectedTemplateData?.variables && (
+          {selectedTemplate && (
            <div style={{ marginBottom: '15px' }}>
-              <h3>Template Variables:</h3>
-              {selectedTemplateData.variables.map(variable => (
-                <div key={variable.name} style={{ marginBottom: '10px' }}>
-                  <label style={{ display: 'block', marginBottom: '5px' }}>
-                    {variable.name} {variable.required && <span style={{ color: 'red' }}>*</span>}
-                    {variable.description && <small style={{ color: '#666' }}> - {variable.description}</small>}
-                  </label>
-                  <input
-                    type={variable.type === 'number' ? 'number' : variable.type === 'date' ? 'datetime-local' : 'text'}
-                    value={variables[variable.name] || ''}
-                    onChange={(e) => setVariables({
-                      ...variables,
-                      [variable.name]: variable.type === 'number' ? Number(e.target.value) : 
-                                     variable.type === 'boolean' ? e.target.checked : 
-                                     e.target.value
-                    })}
-                    style={{ width: '100%', padding: '8px', borderRadius: '4px', border: '1px solid #ddd' }}
-                  />
+              <label style={{ display: 'block', marginBottom: '5px' }}>
+                <strong>Template Variables (JSON):</strong>
+                {selectedTemplateData?.variables && (
+                  <small style={{ color: '#666', marginLeft: '8px' }}>
+                    Available variables: {selectedTemplateData.variables.map(v => v.name).join(', ')}
+                  </small>
+                )}
+              </label>
+              <textarea
+                value={jsonVariables}
+                onChange={(e) => handleJsonVariablesChange(e.target.value)}
+                placeholder='{\n  "firstName": "John",\n  "siteName": "MyApp",\n  "createdAt": "2023-01-01T00:00:00Z"\n}'
+                style={{
+                  width: '100%',
+                  height: '150px',
+                  padding: '8px',
+                  borderRadius: '4px',
+                  border: jsonError ? '2px solid #dc3545' : '1px solid #ddd',
+                  fontFamily: 'monaco, "Courier New", monospace',
+                  fontSize: '13px',
+                  resize: 'vertical'
+                }}
+              />
+              {jsonError && (
+                <div style={{
+                  color: '#dc3545',
+                  fontSize: '12px',
+                  marginTop: '5px',
+                  padding: '5px',
+                  backgroundColor: '#f8d7da',
+                  borderRadius: '4px'
+                }}>
+                  Invalid JSON: {jsonError}
                </div>
-              ))}
+              )}
            </div>
          )}

--- a/dev/app/api/process-emails/route.ts
+++ b/dev/app/api/process-emails/route.ts
@@ -4,24 +4,25 @@ import config from '@payload-config'
 export async function POST(request: Request) {
  try {
    const payload = await getPayload({ config })
-    
-    // Queue the combined email queue processing job
-    const job = await payload.jobs.queue({
-      task: 'process-email-queue',
-      input: {},
+
+    // Run jobs in the default queue (the plugin already schedules email processing on init)
+    const results = await payload.jobs.run({
+      queue: 'default',
    })
-    
+
+    const processedCount = Array.isArray(results) ? results.length : (results ? 1 : 0)
+
    return Response.json({
      success: true,
-      message: 'Email queue processing job queued successfully (will process both pending and failed emails)',
-      jobId: job.id,
+      message: `Email queue processing completed. Processed ${processedCount} jobs.`,
+      processedJobs: processedCount,
    })
  } catch (error) {
    console.error('Process emails error:', error)
    return Response.json(
-      { 
+      {
        error: 'Failed to process emails',
-        details: error instanceof Error ? error.message : 'Unknown error' 
+        details: error instanceof Error ? error.message : 'Unknown error'
      },
      { status: 500 }
    )
--- a/dev/app/api/test-email/route.ts
+++ b/dev/app/api/test-email/route.ts
@@ -8,6 +8,22 @@ export async function POST(request: Request) {
    const body = await request.json()
    const { type = 'send', templateSlug, to, variables, scheduledAt, subject, html, text } = body

+    // Validate required fields
+    if (!to) {
+      return Response.json(
+        { error: 'Recipient email address (to) is required' },
+        { status: 400 }
+      )
+    }
+
+    // Validate email has either template or direct content
+    if (!templateSlug && (!subject || !html)) {
+      return Response.json(
+        { error: 'Either templateSlug or both subject and html must be provided' },
+        { status: 400 }
+      )
+    }
+
    // Use the new sendEmail API
    const emailOptions: any = {
      data: {
@@ -39,12 +55,21 @@ export async function POST(request: Request) {
      emailOptions.data.scheduledAt = scheduledAt ? new Date(scheduledAt) : new Date(Date.now() + 60000)
    }

+    // Set processImmediately for "send now" type
+    const processImmediately = (type === 'send' && !scheduledAt)
+    emailOptions.processImmediately = processImmediately
+
    const result = await sendEmail(payload, emailOptions)

    return Response.json({
      success: true,
      emailId: result.id,
-      message: scheduledAt ? 'Email scheduled successfully' : 'Email queued successfully',
+      message: processImmediately ? 'Email sent successfully' :
+               scheduledAt ? 'Email scheduled successfully' :
+               'Email queued successfully',
+      status: processImmediately ? 'sent' :
+              scheduledAt ? 'scheduled' :
+              'queued'
    })
  } catch (error) {
    console.error('Test email error:', error)
@@ -82,8 +107,8 @@ export async function GET() {
        total: totalDocs,
      },
      mailing: {
-        pluginActive: !!(payload as any).mailing,
-        service: !!(payload as any).mailing?.service,
+        pluginActive: 'mailing' in payload && !!payload.mailing,
+        service: 'mailing' in payload && payload.mailing && 'service' in payload.mailing && !!payload.mailing.service,
      },
    })
  } catch (error) {
--- a/dev/app/page.tsx
+++ b/dev/app/page.tsx
@@ -0,0 +1,11 @@
+import { Metadata } from 'next'
+import {redirect} from "next/navigation.js"
+
+export const metadata: Metadata = {
+  title: 'PayloadCMS Mailing Plugin - Development',
+  description: 'Development environment for PayloadCMS Mailing Plugin',
+}
+
+export default function HomePage() {
+  redirect('/dashboard')
+}
--- a/dev/payload-types.ts
+++ b/dev/payload-types.ts
@@ -90,7 +90,7 @@ export interface Config {
    'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
  };
  db: {
-    defaultIDType: string;
+    defaultIDType: number;
  };
  globals: {};
  globalsSelect: {};
@@ -100,7 +100,7 @@ export interface Config {
  };
  jobs: {
    tasks: {
-      processEmails: ProcessEmailsJob;
+      'process-emails': ProcessEmailsTask;
      'send-email': TaskSendEmail;
      inline: {
        input: unknown;
@@ -133,7 +133,7 @@ export interface UserAuthOperations {
 * via the `definition` "users".
 */
 export interface User {
-  id: string;
+  id: number;
  firstName?: string | null;
  lastName?: string | null;
  updatedAt: string;
@@ -159,7 +159,7 @@ export interface User {
 * via the `definition` "posts".
 */
 export interface Post {
-  id: string;
+  id: number;
  updatedAt: string;
  createdAt: string;
 }
@@ -168,7 +168,7 @@ export interface Post {
 * via the `definition` "media".
 */
 export interface Media {
-  id: string;
+  id: number;
  updatedAt: string;
  createdAt: string;
  url?: string | null;
@@ -186,7 +186,7 @@ export interface Media {
 * via the `definition` "email-templates".
 */
 export interface EmailTemplate {
-  id: string;
+  id: number;
  /**
   * A descriptive name for this email template
   */
@@ -227,11 +227,11 @@ export interface EmailTemplate {
 * via the `definition` "emails".
 */
 export interface Email {
-  id: string;
+  id: number;
  /**
   * Email template used (optional if custom content provided)
   */
-  template?: (string | null) | EmailTemplate;
+  template?: (number | null) | EmailTemplate;
  /**
   * Recipient email addresses
   */
@@ -316,7 +316,7 @@ export interface Email {
 * via the `definition` "payload-jobs".
 */
 export interface PayloadJob {
-  id: string;
+  id: number;
  /**
   * Input data provided to the job
   */
@@ -363,7 +363,7 @@ export interface PayloadJob {
    | {
        executedAt: string;
        completedAt: string;
-        taskSlug: 'inline' | 'processEmails' | 'send-email';
+        taskSlug: 'inline' | 'process-emails' | 'send-email';
        taskID: string;
        input?:
          | {
@@ -396,7 +396,7 @@ export interface PayloadJob {
        id?: string | null;
      }[]
    | null;
-  taskSlug?: ('inline' | 'processEmails' | 'send-email') | null;
+  taskSlug?: ('inline' | 'process-emails' | 'send-email') | null;
  queue?: string | null;
  waitUntil?: string | null;
  processing?: boolean | null;
@@ -408,36 +408,36 @@ export interface PayloadJob {
 * via the `definition` "payload-locked-documents".
 */
 export interface PayloadLockedDocument {
-  id: string;
+  id: number;
  document?:
    | ({
        relationTo: 'users';
-        value: string | User;
+        value: number | User;
      } | null)
    | ({
        relationTo: 'posts';
-        value: string | Post;
+        value: number | Post;
      } | null)
    | ({
        relationTo: 'media';
-        value: string | Media;
+        value: number | Media;
      } | null)
    | ({
        relationTo: 'email-templates';
-        value: string | EmailTemplate;
+        value: number | EmailTemplate;
      } | null)
    | ({
        relationTo: 'emails';
-        value: string | Email;
+        value: number | Email;
      } | null)
    | ({
        relationTo: 'payload-jobs';
-        value: string | PayloadJob;
+        value: number | PayloadJob;
      } | null);
  globalSlug?: string | null;
  user: {
    relationTo: 'users';
-    value: string | User;
+    value: number | User;
  };
  updatedAt: string;
  createdAt: string;
@@ -447,10 +447,10 @@ export interface PayloadLockedDocument {
 * via the `definition` "payload-preferences".
 */
 export interface PayloadPreference {
-  id: string;
+  id: number;
  user: {
    relationTo: 'users';
-    value: string | User;
+    value: number | User;
  };
  key?: string | null;
  value?:
@@ -470,7 +470,7 @@ export interface PayloadPreference {
 * via the `definition` "payload-migrations".
 */
 export interface PayloadMigration {
-  id: string;
+  id: number;
  name?: string | null;
  batch?: number | null;
  updatedAt: string;
@@ -628,9 +628,9 @@ export interface PayloadMigrationsSelect<T extends boolean = true> {
 }
 /**
 * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "ProcessEmailsJob".
+ * via the `definition` "ProcessEmailsTask".
 */
-export interface ProcessEmailsJob {
+export interface ProcessEmailsTask {
  input?: unknown;
  output?: unknown;
 }
@@ -640,6 +640,10 @@ export interface ProcessEmailsJob {
 */
 export interface TaskSendEmail {
  input: {
+    /**
+     * Process and send the email immediately instead of waiting for the queue processor
+     */
+    processImmediately?: boolean | null;
    /**
     * Use a template (leave empty for direct email)
     */
--- a/dev/payload.config.ts
+++ b/dev/payload.config.ts
@@ -1,4 +1,4 @@
-import { mongooseAdapter } from '@payloadcms/db-mongodb'
+import { sqliteAdapter } from '@payloadcms/db-sqlite'
 import { lexicalEditor } from '@payloadcms/richtext-lexical'
 import {
  FixedToolbarFeature,
@@ -6,7 +6,6 @@ import {
  HorizontalRuleFeature,
  InlineToolbarFeature,
 } from '@payloadcms/richtext-lexical'
-import { MongoMemoryReplSet } from 'mongodb-memory-server'
 import path from 'path'
 import { buildConfig } from 'payload'
 import sharp from 'sharp'
@@ -24,36 +23,7 @@ if (!process.env.ROOT_DIR) {
  process.env.ROOT_DIR = dirname
 }

-const buildConfigWithMemoryDB = async () => {
-  // Use in-memory MongoDB for development and testing
-  if (process.env.NODE_ENV === 'test' || process.env.USE_MEMORY_DB === 'true' || !process.env.DATABASE_URI) {
-    console.log('🚀 Starting MongoDB in-memory database...')
-
-    const memoryDB = await MongoMemoryReplSet.create({
-      replSet: {
-        count: 1, // Single instance for dev (faster startup)
-        dbName: process.env.NODE_ENV === 'test' ? 'payloadmemory' : 'payload-mailing-dev',
-        storageEngine: 'wiredTiger',
-      },
-    })
-
-    const uri = `${memoryDB.getUri()}&retryWrites=true`
-    process.env.DATABASE_URI = uri
-
-    console.log('✅ MongoDB in-memory database started')
-    console.log(`📊 Database URI: ${uri.replace(/mongodb:\/\/[^@]*@/, 'mongodb://***@')}`)
-
-    // Graceful shutdown
-    process.on('SIGINT', async () => {
-      console.log('🛑 Stopping MongoDB in-memory database...')
-      await memoryDB.stop()
-      process.exit(0)
-    })
-  } else {
-    console.log(`🔗 Using external MongoDB: ${process.env.DATABASE_URI?.replace(/mongodb:\/\/[^@]*@/, 'mongodb://***@')}`)
-  }
-
-  return buildConfig({
+export default buildConfig({
    admin: {
      importMap: {
        baseDir: path.resolve(dirname),
@@ -122,31 +92,36 @@ const buildConfigWithMemoryDB = async () => {
        },
      },
    ],
-    db: mongooseAdapter({
-      ensureIndexes: true,
-      url: process.env.DATABASE_URI || '',
+    db: sqliteAdapter({
+      client: {
+        url: process.env.DATABASE_URI || 'file:./dev.db',
+      },
    }),
    editor: lexicalEditor(),
    email: testEmailAdapter,
    onInit: async (payload) => {
      await seed(payload)
    },
+    jobs: {
+      jobsCollectionOverrides: c => {
+        if (c.defaultJobsCollection.admin) c.defaultJobsCollection.admin.hidden = false
+        return c.defaultJobsCollection
+      },
+      autoRun: [
+        {
+          cron: '*/1 * * * *', // every minute
+          limit: 10, // limit jobs to process each run
+          queue: 'default', // name of the queue
+        },
+      ],
+    },
    plugins: [
      mailingPlugin({
        defaultFrom: 'noreply@test.com',
        initOrder: 'after',
-        transport: {
-          host: 'localhost',
-          port: 1025, // MailHog port for dev
-          secure: false,
-          auth: {
-            user: 'test',
-            pass: 'test',
-          },
-        },
        retryAttempts: 3,
        retryDelay: 60000, // 1 minute for dev
-        queue: 'email-queue',
+        queue: 'default',

        // Example: Collection overrides for customization
        // Uncomment and modify as needed for your use case
@@ -295,6 +270,3 @@ const buildConfigWithMemoryDB = async () => {
      outputFile: path.resolve(dirname, 'payload-types.ts'),
    },
  })
-}
-
-export default buildConfigWithMemoryDB()
--- a/dev/start-dev.js
+++ b/dev/start-dev.js
@@ -3,26 +3,14 @@
 // Development startup script for PayloadCMS Mailing Plugin
 // This ensures proper environment setup and provides helpful information

-console.log('🚀 PayloadCMS Mailing Plugin - Development Mode')
-console.log('=' .repeat(50))
-
 // Set development environment
 process.env.NODE_ENV = process.env.NODE_ENV || 'development'

-// Enable in-memory MongoDB by default for development
+// Set default SQLite database for development
 if (!process.env.DATABASE_URI) {
-  process.env.USE_MEMORY_DB = 'true'
-  console.log('📦 Using in-memory MongoDB (no installation required)')
-} else {
-  console.log(`🔗 Using external MongoDB: ${process.env.DATABASE_URI}`)
+  process.env.DATABASE_URI = 'file:./dev.db'
 }

-console.log('')
-console.log('🔧 Starting development server...')
-console.log('📧 Mailing plugin configured with test transport')
-console.log('🎯 Test interface will be available at: /mailing-test')
-console.log('')
-
 // Import and start Next.js
 import('next/dist/cli/next-dev.js')
  .then(({ nextDev }) => {
@@ -35,11 +23,9 @@ import('next/dist/cli/next-dev.js')

 // Handle graceful shutdown
 process.on('SIGTERM', () => {
-  console.log('\n🛑 Shutting down development server...')
  process.exit(0)
 })

 process.on('SIGINT', () => {
-  console.log('\n🛑 Shutting down development server...')
  process.exit(0)
 })
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@xtr-dev/payload-mailing",
-  "version": "0.1.22",
+  "version": "0.4.10",
  "description": "Template-based email system with scheduling and job processing for PayloadCMS",
  "type": "module",
  "main": "dist/index.js",
@@ -23,9 +23,6 @@
    "dev:generate-importmap": "npm run dev:payload generate:importmap",
    "dev:generate-types": "npm run dev:payload generate:types",
    "dev:payload": "cross-env PAYLOAD_CONFIG_PATH=./dev/payload.config.ts payload",
-    "payload": "cross-env NODE_OPTIONS=--no-deprecation payload",
-    "generate:importmap": "npm run payload generate:importmap",
-    "generate:types": "npm run payload generate:types",
    "lint": "eslint",
    "lint:fix": "eslint ./src --fix",
    "prepublishOnly": "npm run clean && npm run build",
--- a/payload.config.ts
+++ b/payload.config.ts
@@ -1,31 +0,0 @@
-/**
- * This config is only used to generate types.
- */
-
-import { BaseDatabaseAdapter, buildConfig, Payload} from 'payload'
-import Emails from "./src/collections/Emails.js"
-import {createEmailTemplatesCollection} from "./src/collections/EmailTemplates.js"
-import path from "path"
-import { fileURLToPath } from 'url'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-export default buildConfig({
-  collections: [
-    Emails,
-    createEmailTemplatesCollection()
-  ],
-  db: {
-    allowIDOnCreate: undefined,
-    defaultIDType: 'number',
-    init: function (args: { payload: Payload; }): BaseDatabaseAdapter {
-      throw new Error('Function not implemented.');
-    },
-    name: undefined
-  },
-  secret: '',
-  typescript: {
-    outputFile: path.resolve(__dirname, 'src/payload-types.ts'),
-  }
-});
--- a/src/collections/Emails.ts
+++ b/src/collections/Emails.ts
@@ -1,10 +1,12 @@
 import type { CollectionConfig } from 'payload'
+import { findExistingJobs, ensureEmailJob, updateEmailJobRelationship } from '../utils/jobScheduler.js'
+import { createContextLogger } from '../utils/logger.js'

 const Emails: CollectionConfig = {
  slug: 'emails',
  admin: {
    useAsTitle: 'subject',
-    defaultColumns: ['subject', 'to', 'status', 'scheduledAt', 'sentAt'],
+    defaultColumns: ['subject', 'to', 'status', 'jobs', 'scheduledAt', 'sentAt'],
    group: 'Mailing',
    description: 'Email delivery and status tracking',
  },
@@ -164,22 +166,76 @@ const Emails: CollectionConfig = {
        description: 'Email priority (1=highest, 10=lowest)',
      },
    },
+    {
+      name: 'jobs',
+      type: 'relationship',
+      relationTo: 'payload-jobs',
+      hasMany: true,
+      admin: {
+        description: 'Processing jobs associated with this email',
+        allowCreate: false,
+        readOnly: true,
+      },
+      filterOptions: ({ id }) => {
+        return {
+          'input.emailId': {
+            equals: id,
+          },
+        }
+      },
+    },
  ],
+  hooks: {
+    // Simple approach: Only use afterChange hook for job management
+    // This avoids complex interaction between hooks and ensures document ID is always available
+    afterChange: [
+      async ({ doc, previousDoc, req, operation }) => {
+        // Skip if:
+        // 1. Email is not pending status
+        // 2. Jobs are not configured
+        // 3. Email already has jobs (unless status just changed to pending)
+
+        const shouldSkip =
+          doc.status !== 'pending' ||
+          !req.payload.jobs ||
+          (doc.jobs?.length > 0 && previousDoc?.status === 'pending')
+
+        if (shouldSkip) {
+          return
+        }
+
+        try {
+          // Ensure a job exists for this email
+          // This function handles:
+          // - Checking for existing jobs (duplicate prevention)
+          // - Creating new job if needed
+          // - Returning all job IDs
+          const result = await ensureEmailJob(req.payload, doc.id, {
+            scheduledAt: doc.scheduledAt,
+          })
+
+          // Update the email's job relationship if we have jobs
+          // This handles both new jobs and existing jobs that weren't in the relationship
+          if (result.jobIds.length > 0) {
+            await updateEmailJobRelationship(req.payload, doc.id, result.jobIds, 'emails')
+          }
+        } catch (error) {
+          // Log error but don't throw - we don't want to fail the email operation
+          const logger = createContextLogger(req.payload, 'EMAILS_HOOK')
+          logger.error(`Failed to ensure job for email ${doc.id}:`, error)
+        }
+      }
+    ]
+  },
  timestamps: true,
-  // indexes: [
-  //   {
-  //     fields: {
-  //       status: 1,
-  //       scheduledAt: 1,
-  //     },
-  //   },
-  //   {
-  //     fields: {
-  //       priority: -1,
-  //       createdAt: 1,
-  //     },
-  //   },
-  // ],
+  indexes: [
+    {
+      fields: ['status', 'scheduledAt'],
+    },
+    {
+      fields: ['priority', 'createdAt'],
+    },
+  ],
 }

 export default Emails
--- a/src/index.ts
+++ b/src/index.ts
@@ -11,9 +11,9 @@ export { MailingService } from './services/MailingService.js'
 export { default as EmailTemplates, createEmailTemplatesCollection } from './collections/EmailTemplates.js'
 export { default as Emails } from './collections/Emails.js'

-// Jobs (includes the send email task)
-export { mailingJobs, sendEmailJob } from './jobs/index.js'
-export type { SendEmailTaskInput } from './jobs/sendEmailTask.js'
+// Jobs (includes the individual email processing job)
+export { mailingJobs } from './jobs/index.js'
+export type { ProcessEmailJobInput } from './jobs/processEmailJob.js'

 // Main email sending function
 export { sendEmail, type SendEmailOptions } from './sendEmail.js'
@@ -26,4 +26,12 @@ export {
  processEmails,
  retryFailedEmails,
  parseAndValidateEmails,
-} from './utils/helpers.js'
+  sanitizeDisplayName,
+  sanitizeFromName,
+} from './utils/helpers.js'
+
+// Email processing utilities
+export { processEmailById, processJobById, processAllEmails } from './utils/emailProcessor.js'
+
+// Job scheduling utilities
+export { findExistingJobs, ensureEmailJob, updateEmailJobRelationship } from './utils/jobScheduler.js'
--- a/src/jobs/index.ts
+++ b/src/jobs/index.ts
@@ -1,35 +1,16 @@
-import { processEmailsJob, ProcessEmailsJobData } from './processEmailsJob.js'
-import { sendEmailJob } from './sendEmailTask.js'
-import { MailingService } from '../services/MailingService.js'
+import { processEmailsJob } from './processEmailsTask.js'
+import { processEmailJob } from './processEmailJob.js'

+/**
+ * All mailing-related jobs that get registered with Payload
+ *
+ * Note: The sendEmailJob has been removed as each email now gets its own individual processEmailJob
+ */
 export const mailingJobs = [
-  {
-    slug: 'processEmails',
-    handler: async ({ job, req }: { job: any; req: any }) => {
-      // Get mailing context from payload
-      const payload = (req as any).payload
-      const mailingContext = payload.mailing
-      if (!mailingContext) {
-        throw new Error('Mailing plugin not properly initialized')
-      }
-
-      // Use the existing mailing service from context
-      await processEmailsJob(
-        job as { data: ProcessEmailsJobData },
-        { req, mailingService: mailingContext.service }
-      )
-
-      return {
-        output: {
-          success: true,
-          message: 'Email queue processing completed successfully'
-        }
-      }
-    },
-    interfaceName: 'ProcessEmailsJob',
-  },
-  sendEmailJob,
+  processEmailsJob, // Kept for backward compatibility and batch processing if needed
+  processEmailJob,  // New individual email processing job
 ]

-export * from './processEmailsJob.js'
-export * from './sendEmailTask.js'
+// Re-export everything from individual job files
+export * from './processEmailsTask.js'
+export * from './processEmailJob.js'
--- a/src/jobs/processEmailJob.ts
+++ b/src/jobs/processEmailJob.ts
@@ -0,0 +1,72 @@
+import type { PayloadRequest } from 'payload'
+import { processEmailById } from '../utils/emailProcessor.js'
+
+/**
+ * Data passed to the individual email processing job
+ */
+export interface ProcessEmailJobInput {
+  /**
+   * The ID of the email to process
+   */
+  emailId: string | number
+}
+
+/**
+ * Job definition for processing a single email
+ * This replaces the batch processing approach with individual email jobs
+ */
+export const processEmailJob = {
+  slug: 'process-email',
+  label: 'Process Individual Email',
+  inputSchema: [
+    {
+      name: 'emailId',
+      type: 'text' as const,
+      required: true,
+      label: 'Email ID',
+      admin: {
+        description: 'The ID of the email to process and send'
+      }
+    }
+  ],
+  outputSchema: [
+    {
+      name: 'success',
+      type: 'checkbox' as const
+    },
+    {
+      name: 'emailId',
+      type: 'text' as const
+    },
+    {
+      name: 'status',
+      type: 'text' as const
+    }
+  ],
+  handler: async ({ input, req }: { input: ProcessEmailJobInput; req: PayloadRequest }) => {
+    const payload = (req as any).payload
+    const { emailId } = input
+
+    if (!emailId) {
+      throw new Error('Email ID is required for processing')
+    }
+
+    try {
+      // Process the individual email
+      await processEmailById(payload, String(emailId))
+
+      return {
+        output: {
+          success: true,
+          emailId: String(emailId),
+          status: 'sent',
+          message: `Email ${emailId} processed successfully`
+        }
+      }
+    } catch (error) {
+      throw new Error(`Failed to process email ${emailId}: ${String(error)}`)
+    }
+  }
+}
+
+export default processEmailJob
--- a/src/jobs/processEmailsJob.ts
+++ b/src/jobs/processEmailsJob.ts
@@ -1,50 +0,0 @@
-import type { PayloadRequest } from 'payload'
-import { MailingService } from '../services/MailingService.js'
-
-export interface ProcessEmailsJobData {
-  // No type needed - always processes both pending and failed emails
-}
-
-export const processEmailsJob = async (
-  job: { data: ProcessEmailsJobData },
-  context: { req: PayloadRequest; mailingService: MailingService }
-) => {
-  const { mailingService } = context
-
-  try {
-    console.log('🔄 Processing email queue (pending + failed emails)...')
-
-    // Process pending emails first
-    await mailingService.processEmails()
-
-    // Then retry failed emails
-    await mailingService.retryFailedEmails()
-
-    console.log('✅ Email queue processing completed successfully (pending and failed emails)')
-  } catch (error) {
-    console.error('❌ Email queue processing failed:', error)
-    throw error
-  }
-}
-
-export const scheduleEmailsJob = async (
-  payload: any,
-  queueName: string,
-  delay?: number
-) => {
-  if (!payload.jobs) {
-    console.warn('PayloadCMS jobs not configured - emails will not be processed automatically')
-    return
-  }
-
-  try {
-    await payload.jobs.queue({
-      queue: queueName,
-      task: 'processEmails',
-      input: {},
-      waitUntil: delay ? new Date(Date.now() + delay) : undefined,
-    })
-  } catch (error) {
-    console.error('Failed to schedule email processing job:', error)
-  }
-}
--- a/src/jobs/processEmailsTask.ts
+++ b/src/jobs/processEmailsTask.ts
@@ -0,0 +1,87 @@
+import type { PayloadRequest, Payload } from 'payload'
+import { processAllEmails } from '../utils/emailProcessor.js'
+import { createContextLogger } from '../utils/logger.js'
+
+/**
+ * Data passed to the process emails task
+ */
+export interface ProcessEmailsTaskData {
+  // Currently no data needed - always processes both pending and failed emails
+}
+
+/**
+ * Handler function for processing emails
+ * Used internally by the task definition
+ */
+export const processEmailsTaskHandler = async (
+  job: { data: ProcessEmailsTaskData },
+  context: { req: PayloadRequest }
+) => {
+  const { req } = context
+  const payload = (req as any).payload
+
+  // Use the shared email processing logic
+  await processAllEmails(payload)
+}
+
+/**
+ * Task definition for processing emails
+ * This is what gets registered with Payload's job system
+ */
+export const processEmailsTask = {
+  slug: 'process-emails',
+  handler: async ({ job, req }: { job: any; req: any }) => {
+    // Get mailing context from payload
+    const payload = (req as any).payload
+    const mailingContext = payload.mailing
+
+    if (!mailingContext) {
+      throw new Error('Mailing plugin not properly initialized')
+    }
+
+    // Use the task handler
+    await processEmailsTaskHandler(
+      job as { data: ProcessEmailsTaskData },
+      { req }
+    )
+
+    return {
+      output: {
+        success: true,
+        message: 'Email queue processing completed successfully'
+      }
+    }
+  },
+  interfaceName: 'ProcessEmailsTask',
+}
+
+// For backward compatibility, export as processEmailsJob
+export const processEmailsJob = processEmailsTask
+
+/**
+ * Helper function to schedule an email processing job
+ * Used by the plugin during initialization and can be used by developers
+ */
+export const scheduleEmailsJob = async (
+  payload: Payload,
+  queueName: string,
+  delay?: number
+) => {
+  if (!payload.jobs) {
+    const logger = createContextLogger(payload, 'SCHEDULER')
+    logger.warn('PayloadCMS jobs not configured - emails will not be processed automatically')
+    return
+  }
+
+  try {
+    await payload.jobs.queue({
+      queue: queueName,
+      task: 'process-emails',
+      input: {},
+      waitUntil: delay ? new Date(Date.now() + delay) : undefined,
+    } as any)
+  } catch (error) {
+    const logger = createContextLogger(payload, 'SCHEDULER')
+    logger.error('Failed to schedule email processing job:', error)
+  }
+}
--- a/src/jobs/sendEmailTask.ts
+++ b/src/jobs/sendEmailTask.ts
@@ -1,223 +0,0 @@
-import { sendEmail } from '../sendEmail.js'
-import { BaseEmailDocument } from '../types/index.js'
-
-export interface SendEmailTaskInput {
-  // Template mode fields
-  templateSlug?: string
-  variables?: Record<string, any>
-
-  // Direct email mode fields
-  subject?: string
-  html?: string
-  text?: string
-
-  // Common fields
-  to: string | string[]
-  cc?: string | string[]
-  bcc?: string | string[]
-  from?: string
-  fromName?: string
-  replyTo?: string
-  scheduledAt?: string | Date // ISO date string or Date object
-  priority?: number
-
-  // Allow any additional fields that users might have in their email collection
-  [key: string]: any
-}
-
-/**
- * Transforms task input into sendEmail options by separating template and data fields
- */
-function transformTaskInputToSendEmailOptions(taskInput: SendEmailTaskInput) {
-  const sendEmailOptions: any = {
-    data: {}
-  }
-
-  // If using template mode, set template options
-  if (taskInput.templateSlug) {
-    sendEmailOptions.template = {
-      slug: taskInput.templateSlug,
-      variables: taskInput.variables || {}
-    }
-  }
-
-  // Standard email fields that should be copied to data
-  const standardFields = ['to', 'cc', 'bcc', 'from', 'fromName', 'replyTo', 'subject', 'html', 'text', 'scheduledAt', 'priority']
-
-  // Template-specific fields that should not be copied to data
-  const templateFields = ['templateSlug', 'variables']
-
-  // Copy standard fields to data
-  standardFields.forEach(field => {
-    if (taskInput[field] !== undefined) {
-      sendEmailOptions.data[field] = taskInput[field]
-    }
-  })
-
-  // Copy any additional custom fields that aren't template or standard fields
-  Object.keys(taskInput).forEach(key => {
-    if (!templateFields.includes(key) && !standardFields.includes(key)) {
-      sendEmailOptions.data[key] = taskInput[key]
-    }
-  })
-
-  return sendEmailOptions
-}
-
-export const sendEmailJob = {
-  slug: 'send-email',
-  label: 'Send Email',
-  inputSchema: [
-    {
-      name: 'templateSlug',
-      type: 'text' as const,
-      label: 'Template Slug',
-      admin: {
-        description: 'Use a template (leave empty for direct email)',
-        condition: (data: any) => !data.subject && !data.html
-      }
-    },
-    {
-      name: 'variables',
-      type: 'json' as const,
-      label: 'Template Variables',
-      admin: {
-        description: 'JSON object with variables for template rendering',
-        condition: (data: any) => Boolean(data.templateSlug)
-      }
-    },
-    {
-      name: 'subject',
-      type: 'text' as const,
-      label: 'Subject',
-      admin: {
-        description: 'Email subject (required if not using template)',
-        condition: (data: any) => !data.templateSlug
-      }
-    },
-    {
-      name: 'html',
-      type: 'textarea' as const,
-      label: 'HTML Content',
-      admin: {
-        description: 'HTML email content (required if not using template)',
-        condition: (data: any) => !data.templateSlug
-      }
-    },
-    {
-      name: 'text',
-      type: 'textarea' as const,
-      label: 'Text Content',
-      admin: {
-        description: 'Plain text email content (optional)',
-        condition: (data: any) => !data.templateSlug
-      }
-    },
-    {
-      name: 'to',
-      type: 'text' as const,
-      required: true,
-      label: 'To (Email Recipients)',
-      admin: {
-        description: 'Comma-separated list of email addresses'
-      }
-    },
-    {
-      name: 'cc',
-      type: 'text' as const,
-      label: 'CC (Carbon Copy)',
-      admin: {
-        description: 'Optional comma-separated list of CC email addresses'
-      }
-    },
-    {
-      name: 'bcc',
-      type: 'text' as const,
-      label: 'BCC (Blind Carbon Copy)',
-      admin: {
-        description: 'Optional comma-separated list of BCC email addresses'
-      }
-    },
-    {
-      name: 'from',
-      type: 'text' as const,
-      label: 'From Email',
-      admin: {
-        description: 'Optional sender email address (uses default if not provided)'
-      }
-    },
-    {
-      name: 'fromName',
-      type: 'text' as const,
-      label: 'From Name',
-      admin: {
-        description: 'Optional sender display name (e.g., "John Doe")'
-      }
-    },
-    {
-      name: 'replyTo',
-      type: 'text' as const,
-      label: 'Reply To',
-      admin: {
-        description: 'Optional reply-to email address'
-      }
-    },
-    {
-      name: 'scheduledAt',
-      type: 'date' as const,
-      label: 'Schedule For',
-      admin: {
-        description: 'Optional date/time to schedule email for future delivery'
-      }
-    },
-    {
-      name: 'priority',
-      type: 'number' as const,
-      label: 'Priority',
-      min: 1,
-      max: 10,
-      defaultValue: 5,
-      admin: {
-        description: 'Email priority (1 = highest, 10 = lowest)'
-      }
-    }
-  ],
-  outputSchema: [
-    {
-      name: 'id',
-      type: 'text' as const
-    }
-  ],
-  handler: async ({ input, payload }: any) => {
-    // Cast input to our expected type
-    const taskInput = input as SendEmailTaskInput
-
-    try {
-      // Transform task input into sendEmail options using helper function
-      const sendEmailOptions = transformTaskInputToSendEmailOptions(taskInput)
-
-      // Use the sendEmail helper to create the email
-      const email = await sendEmail<BaseEmailDocument>(payload, sendEmailOptions)
-
-      return {
-        output: {
-          success: true,
-          id: email.id,
-        }
-      }
-
-    } catch (error) {
-      if (error instanceof Error) {
-        // Preserve original error and stack trace
-        const wrappedError = new Error(`Failed to queue email: ${error.message}`)
-        wrappedError.stack = error.stack
-        wrappedError.cause = error
-        throw wrappedError
-      } else {
-        throw new Error(`Failed to queue email: ${String(error)}`)
-      }
-    }
-  }
-}
-
-export default sendEmailJob
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -1,436 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * This file was automatically generated by Payload.
- * DO NOT MODIFY IT BY HAND. Instead, modify your source Payload config,
- * and re-run `payload generate:types` to regenerate this file.
- */
-
-/**
- * Supported timezones in IANA format.
- *
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "supportedTimezones".
- */
-export type SupportedTimezones =
-  | 'Pacific/Midway'
-  | 'Pacific/Niue'
-  | 'Pacific/Honolulu'
-  | 'Pacific/Rarotonga'
-  | 'America/Anchorage'
-  | 'Pacific/Gambier'
-  | 'America/Los_Angeles'
-  | 'America/Tijuana'
-  | 'America/Denver'
-  | 'America/Phoenix'
-  | 'America/Chicago'
-  | 'America/Guatemala'
-  | 'America/New_York'
-  | 'America/Bogota'
-  | 'America/Caracas'
-  | 'America/Santiago'
-  | 'America/Buenos_Aires'
-  | 'America/Sao_Paulo'
-  | 'Atlantic/South_Georgia'
-  | 'Atlantic/Azores'
-  | 'Atlantic/Cape_Verde'
-  | 'Europe/London'
-  | 'Europe/Berlin'
-  | 'Africa/Lagos'
-  | 'Europe/Athens'
-  | 'Africa/Cairo'
-  | 'Europe/Moscow'
-  | 'Asia/Riyadh'
-  | 'Asia/Dubai'
-  | 'Asia/Baku'
-  | 'Asia/Karachi'
-  | 'Asia/Tashkent'
-  | 'Asia/Calcutta'
-  | 'Asia/Dhaka'
-  | 'Asia/Almaty'
-  | 'Asia/Jakarta'
-  | 'Asia/Bangkok'
-  | 'Asia/Shanghai'
-  | 'Asia/Singapore'
-  | 'Asia/Tokyo'
-  | 'Asia/Seoul'
-  | 'Australia/Brisbane'
-  | 'Australia/Sydney'
-  | 'Pacific/Guam'
-  | 'Pacific/Noumea'
-  | 'Pacific/Auckland'
-  | 'Pacific/Fiji';
-
-export interface Config {
-  auth: {
-    users: UserAuthOperations;
-  };
-  blocks: {};
-  collections: {
-    emails: Email;
-    'email-templates': EmailTemplate;
-    users: User;
-    'payload-locked-documents': PayloadLockedDocument;
-    'payload-preferences': PayloadPreference;
-    'payload-migrations': PayloadMigration;
-  };
-  collectionsJoins: {};
-  collectionsSelect: {
-    emails: EmailsSelect<false> | EmailsSelect<true>;
-    'email-templates': EmailTemplatesSelect<false> | EmailTemplatesSelect<true>;
-    users: UsersSelect<false> | UsersSelect<true>;
-    'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
-    'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
-    'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
-  };
-  db: {
-    defaultIDType: number;
-  };
-  globals: {};
-  globalsSelect: {};
-  locale: null;
-  user: User & {
-    collection: 'users';
-  };
-  jobs: {
-    tasks: unknown;
-    workflows: unknown;
-  };
-}
-export interface UserAuthOperations {
-  forgotPassword: {
-    email: string;
-    password: string;
-  };
-  login: {
-    email: string;
-    password: string;
-  };
-  registerFirstUser: {
-    email: string;
-    password: string;
-  };
-  unlock: {
-    email: string;
-    password: string;
-  };
-}
-/**
- * Email delivery and status tracking
- *
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "emails".
- */
-export interface Email {
-  id: number;
-  /**
-   * Email template used (optional if custom content provided)
-   */
-  template?: (number | null) | EmailTemplate;
-  /**
-   * Recipient email addresses
-   */
-  to: string[];
-  /**
-   * CC email addresses
-   */
-  cc?: string[] | null;
-  /**
-   * BCC email addresses
-   */
-  bcc?: string[] | null;
-  /**
-   * Sender email address (optional, uses default if not provided)
-   */
-  from?: string | null;
-  /**
-   * Sender display name (optional, e.g., "John Doe" for "John Doe <john@example.com>")
-   */
-  fromName?: string | null;
-  /**
-   * Reply-to email address
-   */
-  replyTo?: string | null;
-  /**
-   * Email subject line
-   */
-  subject: string;
-  /**
-   * Rendered HTML content of the email
-   */
-  html: string;
-  /**
-   * Plain text version of the email
-   */
-  text?: string | null;
-  /**
-   * Template variables used to render this email
-   */
-  variables?:
-    | {
-        [k: string]: unknown;
-      }
-    | unknown[]
-    | string
-    | number
-    | boolean
-    | null;
-  /**
-   * When this email should be sent (leave empty for immediate)
-   */
-  scheduledAt?: string | null;
-  /**
-   * When this email was actually sent
-   */
-  sentAt?: string | null;
-  /**
-   * Current status of this email
-   */
-  status: 'pending' | 'processing' | 'sent' | 'failed';
-  /**
-   * Number of send attempts made
-   */
-  attempts?: number | null;
-  /**
-   * When the last send attempt was made
-   */
-  lastAttemptAt?: string | null;
-  /**
-   * Last error message if send failed
-   */
-  error?: string | null;
-  /**
-   * Email priority (1=highest, 10=lowest)
-   */
-  priority?: number | null;
-  updatedAt: string;
-  createdAt: string;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "email-templates".
- */
-export interface EmailTemplate {
-  id: number;
-  /**
-   * A descriptive name for this email template
-   */
-  name: string;
-  /**
-   * Unique identifier for this template (e.g., "welcome-email", "password-reset")
-   */
-  slug: string;
-  /**
-   * Email subject line. You can use Handlebars variables like {{firstName}} or {{siteName}}.
-   */
-  subject: string;
-  /**
-   * Email content with rich text formatting. Supports Handlebars variables like {{firstName}} and helpers like {{formatDate createdAt "long"}}. Content is converted to HTML and plain text automatically.
-   */
-  content: {
-    root: {
-      type: string;
-      children: {
-        type: string;
-        version: number;
-        [k: string]: unknown;
-      }[];
-      direction: ('ltr' | 'rtl') | null;
-      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
-      indent: number;
-      version: number;
-    };
-    [k: string]: unknown;
-  };
-  updatedAt: string;
-  createdAt: string;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "users".
- */
-export interface User {
-  id: number;
-  updatedAt: string;
-  createdAt: string;
-  email: string;
-  resetPasswordToken?: string | null;
-  resetPasswordExpiration?: string | null;
-  salt?: string | null;
-  hash?: string | null;
-  loginAttempts?: number | null;
-  lockUntil?: string | null;
-  sessions?:
-    | {
-        id: string;
-        createdAt?: string | null;
-        expiresAt: string;
-      }[]
-    | null;
-  password?: string | null;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "payload-locked-documents".
- */
-export interface PayloadLockedDocument {
-  id: number;
-  document?:
-    | ({
-        relationTo: 'emails';
-        value: number | Email;
-      } | null)
-    | ({
-        relationTo: 'email-templates';
-        value: number | EmailTemplate;
-      } | null)
-    | ({
-        relationTo: 'users';
-        value: number | User;
-      } | null);
-  globalSlug?: string | null;
-  user: {
-    relationTo: 'users';
-    value: number | User;
-  };
-  updatedAt: string;
-  createdAt: string;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "payload-preferences".
- */
-export interface PayloadPreference {
-  id: number;
-  user: {
-    relationTo: 'users';
-    value: number | User;
-  };
-  key?: string | null;
-  value?:
-    | {
-        [k: string]: unknown;
-      }
-    | unknown[]
-    | string
-    | number
-    | boolean
-    | null;
-  updatedAt: string;
-  createdAt: string;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "payload-migrations".
- */
-export interface PayloadMigration {
-  id: number;
-  name?: string | null;
-  batch?: number | null;
-  updatedAt: string;
-  createdAt: string;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "emails_select".
- */
-export interface EmailsSelect<T extends boolean = true> {
-  template?: T;
-  to?: T;
-  cc?: T;
-  bcc?: T;
-  from?: T;
-  fromName?: T;
-  replyTo?: T;
-  subject?: T;
-  html?: T;
-  text?: T;
-  variables?: T;
-  scheduledAt?: T;
-  sentAt?: T;
-  status?: T;
-  attempts?: T;
-  lastAttemptAt?: T;
-  error?: T;
-  priority?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "email-templates_select".
- */
-export interface EmailTemplatesSelect<T extends boolean = true> {
-  name?: T;
-  slug?: T;
-  subject?: T;
-  content?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "users_select".
- */
-export interface UsersSelect<T extends boolean = true> {
-  updatedAt?: T;
-  createdAt?: T;
-  email?: T;
-  resetPasswordToken?: T;
-  resetPasswordExpiration?: T;
-  salt?: T;
-  hash?: T;
-  loginAttempts?: T;
-  lockUntil?: T;
-  sessions?:
-    | T
-    | {
-        id?: T;
-        createdAt?: T;
-        expiresAt?: T;
-      };
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "payload-locked-documents_select".
- */
-export interface PayloadLockedDocumentsSelect<T extends boolean = true> {
-  document?: T;
-  globalSlug?: T;
-  user?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "payload-preferences_select".
- */
-export interface PayloadPreferencesSelect<T extends boolean = true> {
-  user?: T;
-  key?: T;
-  value?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "payload-migrations_select".
- */
-export interface PayloadMigrationsSelect<T extends boolean = true> {
-  name?: T;
-  batch?: T;
-  updatedAt?: T;
-  createdAt?: T;
-}
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "auth".
- */
-export interface Auth {
-  [k: string]: unknown;
-}
-
-
-declare module 'payload' {
-  export interface GeneratedTypes extends Config {}
-}
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -3,18 +3,12 @@ import { MailingPluginConfig, MailingContext } from './types/index.js'
 import { MailingService } from './services/MailingService.js'
 import { createEmailTemplatesCollection } from './collections/EmailTemplates.js'
 import Emails from './collections/Emails.js'
-import { mailingJobs, scheduleEmailsJob } from './jobs/index.js'
+import { mailingJobs } from './jobs/index.js'


 export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Config): Config => {
  const queueName = pluginConfig.queue || 'default'

-  // Validate queueName
-  if (!queueName || typeof queueName !== 'string') {
-    throw new Error('Invalid queue configuration: queue must be a non-empty string')
-  }
-
-
  // Handle templates collection configuration
  const templatesConfig = pluginConfig.collections?.templates
  const templatesSlug = typeof templatesConfig === 'string' ? templatesConfig : 'email-templates'
@@ -112,21 +106,6 @@ export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Con
        },
      } as MailingContext

-      console.log('PayloadCMS Mailing Plugin initialized successfully')
-
-      // Schedule the initial email processing job
-      try {
-        await scheduleEmailsJob(payload, queueName, 60000) // Schedule in 1 minute
-        console.log(`🔄 Scheduled initial email processing job in queue: ${queueName}`)
-      } catch (error) {
-        console.error('Failed to schedule email processing job:', error)
-      }
-
-      // Call onReady callback if provided
-      if (pluginConfig.onReady) {
-        await pluginConfig.onReady(payload)
-      }
-
      if (pluginConfig.initOrder !== 'after' && config.onInit) {
        await config.onInit(payload)
      }
--- a/src/sendEmail.ts
+++ b/src/sendEmail.ts
@@ -1,6 +1,8 @@
 import { Payload } from 'payload'
-import { getMailing, renderTemplate, parseAndValidateEmails } from './utils/helpers.js'
+import { getMailing, renderTemplate, parseAndValidateEmails, sanitizeFromName } from './utils/helpers.js'
 import { BaseEmailDocument } from './types/index.js'
+import { processJobById } from './utils/emailProcessor.js'
+import { createContextLogger } from './utils/logger.js'

 // Options for sending emails
 export interface SendEmailOptions<T extends BaseEmailDocument = BaseEmailDocument> {
@@ -13,6 +15,8 @@ export interface SendEmailOptions<T extends BaseEmailDocument = BaseEmailDocumen
  data?: Partial<T>
  // Common options
  collectionSlug?: string // defaults to 'emails'
+  processImmediately?: boolean // if true, creates job and processes it immediately
+  queue?: string // queue name for the job, defaults to mailing config queue
 }

 /**
@@ -39,8 +43,8 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
  payload: Payload,
  options: SendEmailOptions<TEmail>
 ): Promise<TEmail> => {
-  const mailing = getMailing(payload)
-  const collectionSlug = options.collectionSlug || mailing.collections.emails || 'emails'
+  const mailingConfig = getMailing(payload)
+  const collectionSlug = options.collectionSlug || mailingConfig.collections.emails || 'emails'

  let emailData: Partial<TEmail> = { ...options.data } as Partial<TEmail>

@@ -101,15 +105,7 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
  }

  // Sanitize fromName to prevent header injection
-  if (emailData.fromName) {
-    emailData.fromName = emailData.fromName
-      .trim()
-      // Remove/replace newlines and carriage returns to prevent header injection
-      .replace(/[\r\n]/g, ' ')
-      // Remove control characters (except space and printable characters)
-      .replace(/[\x00-\x1F\x7F-\x9F]/g, '')
-      // Note: We don't escape quotes here as that's handled in MailingService
-  }
+  emailData.fromName = sanitizeFromName(emailData.fromName as string)

  // Normalize Date objects to ISO strings for consistent database storage
  if (emailData.scheduledAt instanceof Date) {
@@ -129,6 +125,7 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
  }

  // Create the email in the collection with proper typing
+  // The hooks will automatically create and populate the job relationship
  const email = await payload.create({
    collection: collectionSlug,
    data: emailData
@@ -139,6 +136,93 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
    throw new Error('Failed to create email: invalid response from database')
  }

+  // 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')
+    }
+
+    // Poll for the job with optimized backoff and timeout protection
+    // This handles the async nature of hooks and ensures we wait for job creation
+    const maxAttempts = 5 // Reduced from 10 to minimize delay
+    const initialDelay = 25 // Reduced from 50ms for faster response
+    const maxTotalTime = 3000 // 3 second total timeout
+    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
+      if (Date.now() - startTime > maxTotalTime) {
+        throw new Error(
+          `Job polling timed out after ${maxTotalTime}ms for email ${email.id}. ` +
+          `The auto-scheduling may have failed or is taking longer than expected.`
+        )
+      }
+
+      // Calculate delay with exponential backoff (25ms, 50ms, 100ms, 200ms, 400ms)
+      // Cap at 400ms per attempt for better responsiveness
+      const delay = Math.min(initialDelay * Math.pow(2, attempt), 400)
+
+      if (attempt > 0) {
+        await new Promise(resolve => setTimeout(resolve, delay))
+      }
+
+      // Refetch the email to check for jobs
+      const emailWithJobs = await payload.findByID({
+        collection: collectionSlug,
+        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}`)
+        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 (!jobId) {
+      // Distinguish between different failure scenarios for better error handling
+      const timeoutMsg = Date.now() - startTime >= maxTotalTime
+      const errorType = timeoutMsg ? 'POLLING_TIMEOUT' : 'JOB_NOT_FOUND'
+
+      const baseMessage = timeoutMsg
+        ? `Job polling timed out after ${maxTotalTime}ms for email ${email.id}`
+        : `No processing job found for email ${email.id} after ${maxAttempts} attempts (${Date.now() - startTime}ms)`
+
+      throw new Error(
+        `${errorType}: ${baseMessage}. ` +
+        `This indicates the email was created but job auto-scheduling failed. ` +
+        `The email exists in the database but immediate processing cannot proceed. ` +
+        `You may need to: 1) Check job queue configuration, 2) Verify database hooks are working, ` +
+        `3) Process the email later using processEmailById('${email.id}').`
+      )
+    }
+
+    logger.info(`Starting job execution for job ${jobId}`)
+    try {
+      await processJobById(payload, jobId)
+      logger.info(`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)}`)
+    }
+  }
+
  return email as TEmail
 }

--- a/src/services/MailingService.ts
+++ b/src/services/MailingService.ts
@@ -1,23 +1,21 @@
 import { Payload } from 'payload'
 import { Liquid } from 'liquidjs'
-import nodemailer, { Transporter } from 'nodemailer'
 import {
  MailingPluginConfig,
  TemplateVariables,
  MailingService as IMailingService,
-  MailingTransportConfig,
  BaseEmail, BaseEmailTemplate, BaseEmailDocument, BaseEmailTemplateDocument
 } from '../types/index.js'
 import { serializeRichTextToHTML, serializeRichTextToText } from '../utils/richTextSerializer.js'
+import { sanitizeDisplayName } from '../utils/helpers.js'

 export class MailingService implements IMailingService {
  public payload: Payload
  private config: MailingPluginConfig
-  private transporter!: Transporter | any
+  private emailAdapter: any
  private templatesCollection: string
  private emailsCollection: string
  private liquid: Liquid | null | false = null
-  private transporterInitialized = false

  constructor(payload: Payload, config: MailingPluginConfig) {
    this.payload = payload
@@ -29,50 +27,28 @@ export class MailingService implements IMailingService {
    const emailsConfig = config.collections?.emails
    this.emailsCollection = typeof emailsConfig === 'string' ? emailsConfig : 'emails'

-    this.initializeTransporter()
-  }
-
-  private initializeTransporter(): void {
-    if (this.transporterInitialized) return
-
-    if (this.config.transport) {
-      if ('sendMail' in this.config.transport) {
-        this.transporter = this.config.transport
-      } else {
-        this.transporter = nodemailer.createTransport(this.config.transport as MailingTransportConfig)
-      }
-    } else if (this.payload.email && 'sendMail' in this.payload.email) {
-      // Use Payload's configured mailer (cast to any to handle different adapter types)
-      this.transporter = this.payload.email as any
-    } else {
-      throw new Error('Email transport configuration is required either in plugin config or Payload config')
+    // Use Payload's configured email adapter
+    if (!this.payload.email) {
+      throw new Error('Payload email configuration is required. Please configure email in your Payload config.')
    }
-
-    this.transporterInitialized = true
+    this.emailAdapter = this.payload.email
  }

  private ensureInitialized(): void {
    if (!this.payload || !this.payload.db) {
      throw new Error('MailingService payload not properly initialized')
    }
-    if (!this.transporterInitialized) {
-      this.initializeTransporter()
+    if (!this.emailAdapter) {
+      throw new Error('Email adapter not configured. Please ensure Payload has email configured.')
    }
  }

  /**
   * Sanitizes a display name for use in email headers to prevent header injection
-   * and ensure proper formatting
+   * Uses the centralized sanitization utility with quote escaping for headers
   */
  private sanitizeDisplayName(name: string): string {
-    return name
-      .trim()
-      // Remove/replace newlines and carriage returns to prevent header injection
-      .replace(/[\r\n]/g, ' ')
-      // Remove control characters (except space and printable characters)
-      .replace(/[\x00-\x1F\x7F-\x9F]/g, '')
-      // Escape quotes to prevent malformed headers
-      .replace(/"/g, '\\"')
+    return sanitizeDisplayName(name, true) // escapeQuotes = true for email headers
  }

  /**
@@ -243,7 +219,7 @@ export class MailingService implements IMailingService {
    }
  }

-  private async processEmailItem(emailId: string): Promise<void> {
+  async processEmailItem(emailId: string): Promise<void> {
    try {
      await this.payload.update({
        collection: this.emailsCollection as any,
@@ -302,7 +278,8 @@ export class MailingService implements IMailingService {
        }
      }

-      await this.transporter.sendMail(mailOptions)
+      // Send email using Payload's email adapter
+      await this.emailAdapter.sendEmail(mailOptions)

      await this.payload.update({
        collection: this.emailsCollection as any,
@@ -338,9 +315,9 @@ export class MailingService implements IMailingService {
    const email = await this.payload.findByID({
      collection: this.emailsCollection as any,
      id: emailId,
-    }) as BaseEmail
+    })

-    const newAttempts = (email.attempts || 0) + 1
+    const newAttempts = ((email as any).attempts || 0) + 1

    await this.payload.update({
      collection: this.emailsCollection as any,
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,6 +1,5 @@
 import { Payload } from 'payload'
 import type { CollectionConfig, RichTextField } from 'payload'
-import { Transporter } from 'nodemailer'

 // JSON value type that matches Payload's JSON field type
 export type JSONValue = string | number | boolean | { [k: string]: unknown } | unknown[] | null | undefined
@@ -70,7 +69,6 @@ export interface MailingPluginConfig {
  }
  defaultFrom?: string
  defaultFromName?: string
-  transport?: Transporter | MailingTransportConfig
  queue?: string
  retryAttempts?: number
  retryDelay?: number
@@ -78,21 +76,9 @@ export interface MailingPluginConfig {
  templateEngine?: TemplateEngine
  richTextEditor?: RichTextField['editor']
  beforeSend?: BeforeSendHook
-  onReady?: (payload: any) => Promise<void>
  initOrder?: 'before' | 'after'
 }

-export interface MailingTransportConfig {
-  host: string
-  port: number
-  secure?: boolean
-  auth?: {
-    user: string
-    pass: string
-  }
-}
-
-
 export interface QueuedEmail {
  id: string
  template?: string | null
@@ -124,6 +110,7 @@ export interface TemplateVariables {

 export interface MailingService {
  processEmails(): Promise<void>
+  processEmailItem(emailId: string): Promise<void>
  retryFailedEmails(): Promise<void>
  renderTemplate(templateSlug: string, variables: TemplateVariables): Promise<{ html: string; text: string; subject: string }>
 }
--- a/src/utils/emailProcessor.ts
+++ b/src/utils/emailProcessor.ts
@@ -0,0 +1,95 @@
+import type { Payload } from 'payload'
+import { createContextLogger } from './logger.js'
+
+/**
+ * Processes a single email by ID using the mailing service
+ * @param payload Payload instance
+ * @param emailId The ID of the email to process
+ * @returns Promise that resolves when email is processed
+ */
+export async function processEmailById(payload: Payload, emailId: string): Promise<void> {
+  // Get mailing context from payload
+  const mailingContext = (payload as any).mailing
+
+  if (!mailingContext) {
+    throw new Error(
+      'Mailing plugin not found on payload instance. ' +
+      'Ensure the mailingPlugin is properly configured in your Payload config plugins array.'
+    )
+  }
+
+  if (!mailingContext.service) {
+    throw new Error(
+      'Mailing service not available. ' +
+      'The plugin may not have completed initialization. ' +
+      'Check that email configuration is properly set up in your Payload config.'
+    )
+  }
+
+  // Process the specific email
+  await mailingContext.service.processEmailItem(emailId)
+}
+
+/**
+ * Processes a job immediately by finding and executing it
+ * @param payload Payload instance
+ * @param jobId The ID of the job to run immediately
+ * @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: {
+        id: {
+          equals: jobId
+        }
+      }
+    })
+
+    logger.info(`Job ${jobId} execution completed`, { result })
+  } catch (error) {
+    logger.error(`Job ${jobId} execution failed:`, error)
+    throw new Error(`Failed to process job ${jobId}: ${String(error)}`)
+  }
+}
+
+/**
+ * Processes all pending and failed emails using the mailing service
+ * @param payload Payload instance
+ * @returns Promise that resolves when all emails are processed
+ */
+export async function processAllEmails(payload: Payload): Promise<void> {
+  // Get mailing context from payload
+  const mailingContext = (payload as any).mailing
+
+  if (!mailingContext) {
+    throw new Error(
+      'Mailing plugin not found on payload instance. ' +
+      'Ensure the mailingPlugin is properly configured in your Payload config plugins array.'
+    )
+  }
+
+  if (!mailingContext.service) {
+    throw new Error(
+      'Mailing service not available. ' +
+      'The plugin may not have completed initialization. ' +
+      'Check that email configuration is properly set up in your Payload config.'
+    )
+  }
+
+  // Process pending emails first
+  await mailingContext.service.processEmails()
+
+  // Then retry failed emails
+  await mailingContext.service.retryFailedEmails()
+}
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -36,6 +36,44 @@ export const parseAndValidateEmails = (emails: string | string[] | null | undefi
  return emailList
 }

+/**
+ * Sanitize display names to prevent email header injection
+ * Removes newlines, carriage returns, and control characters
+ * @param displayName - The display name to sanitize
+ * @param escapeQuotes - Whether to escape quotes (for email headers)
+ * @returns Sanitized display name
+ */
+export const sanitizeDisplayName = (displayName: string, escapeQuotes = false): string => {
+  if (!displayName) return displayName
+
+  let sanitized = displayName
+    .trim()
+    // Remove/replace newlines and carriage returns to prevent header injection
+    .replace(/[\r\n]/g, ' ')
+    // Remove control characters (except space and printable characters)
+    .replace(/[\x00-\x1F\x7F-\x9F]/g, '')
+
+  // Escape quotes if needed (for email headers)
+  if (escapeQuotes) {
+    sanitized = sanitized.replace(/"/g, '\\"')
+  }
+
+  return sanitized
+}
+
+/**
+ * Sanitize and validate fromName for emails
+ * Wrapper around sanitizeDisplayName for consistent fromName handling
+ * @param fromName - The fromName to sanitize
+ * @returns Sanitized fromName or undefined if empty after sanitization
+ */
+export const sanitizeFromName = (fromName: string | null | undefined): string | undefined => {
+  if (!fromName) return undefined
+
+  const sanitized = sanitizeDisplayName(fromName, false)
+  return sanitized.length > 0 ? sanitized : undefined
+}
+
 export const getMailing = (payload: Payload) => {
  const mailing = (payload as any).mailing
  if (!mailing) {
--- a/src/utils/jobScheduler.ts
+++ b/src/utils/jobScheduler.ts
@@ -0,0 +1,160 @@
+import type { Payload } from 'payload'
+import { createContextLogger } from './logger.js'
+
+/**
+ * Finds existing processing jobs for an email
+ */
+export async function findExistingJobs(
+  payload: Payload,
+  emailId: string | number
+): Promise<{ docs: any[], totalDocs: number }> {
+  return await payload.find({
+    collection: 'payload-jobs',
+    where: {
+      'input.emailId': {
+        equals: String(emailId),
+      },
+      task: {
+        equals: 'process-email',
+      },
+    },
+    limit: 10,
+  })
+}
+
+/**
+ * Ensures a processing job exists for an email
+ * Creates one if it doesn't exist, or returns existing job IDs
+ *
+ * This function is idempotent and safe for concurrent calls:
+ * - Uses atomic check-and-create pattern with retry logic
+ * - Multiple concurrent calls will only create one job
+ * - Database-level uniqueness prevents duplicate jobs
+ * - Race conditions are handled with exponential backoff retry
+ */
+export async function ensureEmailJob(
+  payload: Payload,
+  emailId: string | number,
+  options?: {
+    scheduledAt?: string | Date
+    queueName?: string
+  }
+): Promise<{ jobIds: (string | number)[], created: boolean }> {
+  if (!payload.jobs) {
+    throw new Error('PayloadCMS jobs not configured - cannot create email job')
+  }
+
+  const normalizedEmailId = String(emailId)
+  const mailingContext = (payload as any).mailing
+  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,
+      task: 'process-email',
+      input: {
+        emailId: normalizedEmailId
+      },
+      waitUntil: options?.scheduledAt ? new Date(options.scheduledAt) : undefined
+    })
+
+    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(', ')}`)
+      return {
+        jobIds: existingJobs.docs.map(job => job.id),
+        created: false
+      }
+    }
+
+    // No existing jobs found - this is a genuine error
+    // Enhanced error context for better debugging
+    const errorMessage = String(createError)
+    const isLikelyUniqueConstraint = errorMessage.toLowerCase().includes('duplicate') ||
+                                     errorMessage.toLowerCase().includes('unique') ||
+                                     errorMessage.toLowerCase().includes('constraint')
+
+    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}`)
+      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}`
+      )
+    }
+
+    // Non-constraint related error
+    logger.error(`Non-constraint job creation error for email ${normalizedEmailId}: ${errorMessage}`)
+    throw new Error(`Failed to create job for email ${normalizedEmailId}: ${errorMessage}`)
+  }
+}
+
+/**
+ * Updates an email document to include job IDs in the relationship field
+ */
+export async function updateEmailJobRelationship(
+  payload: Payload,
+  emailId: string | number,
+  jobIds: (string | number)[],
+  collectionSlug: string = 'emails'
+): Promise<void> {
+  try {
+    const normalizedEmailId = String(emailId)
+    const normalizedJobIds = jobIds.map(id => String(id))
+
+    // Get current jobs to avoid overwriting
+    const currentEmail = await payload.findByID({
+      collection: collectionSlug,
+      id: normalizedEmailId,
+    })
+
+    const currentJobs = (currentEmail.jobs || []).map((job: any) => String(job))
+    const allJobs = [...new Set([...currentJobs, ...normalizedJobIds])] // Deduplicate with normalized strings
+
+    await payload.update({
+      collection: collectionSlug,
+      id: normalizedEmailId,
+      data: {
+        jobs: allJobs
+      }
+    })
+  } catch (error) {
+    const normalizedEmailId = String(emailId)
+    const logger = createContextLogger(payload, 'JOB_SCHEDULER')
+    logger.error(`Failed to update email ${normalizedEmailId} with job relationship:`, error)
+    throw error
+  }
+}
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -0,0 +1,48 @@
+import type { Payload } from 'payload'
+
+let pluginLogger: any = null
+
+/**
+ * Get or create the plugin logger instance
+ * Uses PAYLOAD_MAILING_LOG_LEVEL environment variable to configure log level
+ * Defaults to 'info' if not set
+ */
+export function getPluginLogger(payload: Payload) {
+  if (!pluginLogger && payload.logger) {
+    const logLevel = process.env.PAYLOAD_MAILING_LOG_LEVEL || 'info'
+
+    pluginLogger = payload.logger.child({
+      level: logLevel,
+      plugin: '@xtr-dev/payload-mailing'
+    })
+
+    // Log the configured log level on first initialization
+    pluginLogger.info(`Logger initialized with level: ${logLevel}`)
+  }
+
+  // Fallback to console if logger not available (shouldn't happen in normal operation)
+  if (!pluginLogger) {
+    return {
+      debug: (...args: any[]) => console.log('[MAILING DEBUG]', ...args),
+      info: (...args: any[]) => console.log('[MAILING INFO]', ...args),
+      warn: (...args: any[]) => console.warn('[MAILING WARN]', ...args),
+      error: (...args: any[]) => console.error('[MAILING ERROR]', ...args),
+    }
+  }
+
+  return pluginLogger
+}
+
+/**
+ * Create a context-specific logger for a particular operation
+ */
+export function createContextLogger(payload: Payload, context: string) {
+  const logger = getPluginLogger(payload)
+
+  return {
+    debug: (message: string, ...args: any[]) => logger.debug(`[${context}] ${message}`, ...args),
+    info: (message: string, ...args: any[]) => logger.info(`[${context}] ${message}`, ...args),
+    warn: (message: string, ...args: any[]) => logger.warn(`[${context}] ${message}`, ...args),
+    error: (message: string, ...args: any[]) => logger.error(`[${context}] ${message}`, ...args),
+  }
+}