Merge pull request #46 from xtr-dev/dev

Dev

.gitignore

@@ -4,4 +4,6 @@ node_modules/
 payload-docs
 dist/
 /dev/payload.db
+/dev/dev.db
+dev.db
 tsconfig.tsbuildinfo

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

README.md

@@ -382,16 +382,7 @@ await retryFailedEmails(payload)
 
 ## PayloadCMS Integration
 
-The plugin provides both tasks and workflows for email processing:
-
-### Tasks vs Workflows
-
-- **Tasks**: Simple job execution, good for background processing
-- **Workflows**: More advanced with UI, status tracking, and immediate processing options
-
-### Task Integration
-
-The plugin provides a ready-to-use PayloadCMS task for queuing template emails:
+The plugin provides PayloadCMS tasks for email processing:
 
 ### 1. Add the task to your Payload config
 
@@ -464,25 +455,13 @@ The task can also be triggered from the Payload admin panel with a user-friendly
 - ✅ **Error Handling**: Comprehensive error reporting
 - ✅ **Queue Management**: Leverage Payload's job queue system
 
-### Workflow Integration
+### Immediate Processing
 
-For advanced features, use the workflow instead:
+The send email task now supports immediate processing. Enable the `processImmediately` option to send emails instantly:
 
 ```typescript
-import { sendEmailWorkflow } from '@xtr-dev/payload-mailing'
-
-export default buildConfig({
-  jobs: {
-    workflows: [sendEmailWorkflow]
-  }
-})
-```
-
-**Key advantage**: Optional `processImmediately` option to send emails instantly instead of queuing.
-
-```typescript
-await payload.workflows.queue({
-  workflow: 'send-email',
+await payload.jobs.queue({
+  task: 'send-email',
   input: {
     processImmediately: true, // Send immediately (default: false)
     templateSlug: 'welcome-email',
@@ -492,6 +471,11 @@ await payload.workflows.queue({
 })
 ```
 
+**Benefits**:
+- No separate workflow needed
+- Unified task interface
+- Optional immediate processing when needed
+
 ## Job Processing
 
 The plugin automatically adds a unified email processing job to PayloadCMS:

dev/.env.local

@@ -0,0 +1,2 @@
+USE_MEMORY_DB=true
+PAYLOAD_SECRET=YOUR_SECRET_HERE

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>
+  )
+}

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>
+  )
+}

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>
           )}
 

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 }
     )

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) {

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')
+}

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)
      */

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,22 +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',
         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
@@ -286,6 +270,3 @@ const buildConfigWithMemoryDB = async () => {
       outputFile: path.resolve(dirname, 'payload-types.ts'),
     },
   })
-}
-
-export default buildConfigWithMemoryDB()

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)
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtr-dev/payload-mailing",
-  "version": "0.3.1",
+  "version": "0.4.6",
   "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",

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'),
-  }
-});

src/collections/Emails.ts

@@ -4,7 +4,7 @@ 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,6 +164,24 @@ 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,
+          },
+        }
+      },
+    },
   ],
   timestamps: true,
   // indexes: [

src/index.ts

@@ -11,13 +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'
-
-// Workflows (includes the send email workflow)
-export { mailingWorkflows, sendEmailWorkflow } from './workflows/index.js'
-export type { SendEmailWorkflowInput } from './workflows/sendEmailWorkflow.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'
@@ -30,4 +26,7 @@ export {
   processEmails,
   retryFailedEmails,
   parseAndValidateEmails,
-} from './utils/helpers.js'
+} from './utils/helpers.js'
+
+// Email processing utilities
+export { processEmailById, processAllEmails } from './utils/emailProcessor.js'

src/jobs/index.ts

@@ -1,14 +1,16 @@
 import { processEmailsJob } from './processEmailsTask.js'
-import { sendEmailJob } from './sendEmailTask.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 = [
-  processEmailsJob,
-  sendEmailJob,
+  processEmailsJob, // Kept for backward compatibility and batch processing if needed
+  processEmailJob,  // New individual email processing job
 ]
 
 // Re-export everything from individual job files
 export * from './processEmailsTask.js'
-export * from './sendEmailTask.js'
+export * from './processEmailJob.js'

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

src/jobs/processEmailsTask.ts

@@ -1,5 +1,5 @@
 import type { PayloadRequest, Payload } from 'payload'
-import type { MailingService } from '../services/MailingService.js'
+import { processAllEmails } from '../utils/emailProcessor.js'
 
 /**
  * Data passed to the process emails task
@@ -14,24 +14,13 @@ export interface ProcessEmailsTaskData {
  */
 export const processEmailsTaskHandler = async (
   job: { data: ProcessEmailsTaskData },
-  context: { req: PayloadRequest; mailingService: MailingService }
+  context: { req: PayloadRequest }
 ) => {
-  const { mailingService } = context
+  const { req } = context
+  const payload = (req as any).payload
 
-  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')
-  } catch (error) {
-    console.error('❌ Email queue processing failed:', error)
-    throw error
-  }
+  // Use the shared email processing logic
+  await processAllEmails(payload)
 }
 
 /**
@@ -49,10 +38,10 @@ export const processEmailsTask = {
       throw new Error('Mailing plugin not properly initialized')
     }
 
-    // Use the existing mailing service from context
+    // Use the task handler
     await processEmailsTaskHandler(
       job as { data: ProcessEmailsTaskData },
-      { req, mailingService: mailingContext.service }
+      { req }
     )
 
     return {
@@ -92,4 +81,4 @@ export const scheduleEmailsJob = async (
   } catch (error) {
     console.error('Failed to schedule email processing job:', error)
   }
-}
+}

src/jobs/sendEmailTask.ts

@@ -1,227 +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
-}
-
-/**
- * Job definition for sending emails
- * Can be used through Payload's job queue system to send emails programmatically
- */
-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

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 {}
-}

src/plugin.ts

@@ -3,8 +3,7 @@ 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 { mailingWorkflows } from './workflows/index.js'
+import { mailingJobs } from './jobs/index.js'
 
 
 export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Config): Config => {
@@ -87,10 +86,6 @@ export const mailingPlugin = (pluginConfig: MailingPluginConfig) => (config: Con
         ...(config.jobs?.tasks || []),
         ...mailingJobs,
       ],
-      workflows: [
-        ...(config.jobs?.workflows || []),
-        ...mailingWorkflows,
-      ],
     },
     onInit: async (payload: any) => {
       if (pluginConfig.initOrder === 'after' && config.onInit) {
@@ -111,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)
       }

src/sendEmail.ts

@@ -1,6 +1,7 @@
 import { Payload } from 'payload'
 import { getMailing, renderTemplate, parseAndValidateEmails } from './utils/helpers.js'
 import { BaseEmailDocument } from './types/index.js'
+import { processJobById } from './utils/emailProcessor.js'
 
 // Options for sending emails
 export interface SendEmailOptions<T extends BaseEmailDocument = BaseEmailDocument> {
@@ -13,6 +14,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 +42,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>
 
@@ -139,6 +142,58 @@ export const sendEmail = async <TEmail extends BaseEmailDocument = BaseEmailDocu
     throw new Error('Failed to create email: invalid response from database')
   }
 
+  // Create an individual job for this email
+  const queueName = options.queue || mailingConfig.queue || 'default'
+
+  if (!payload.jobs) {
+    if (options.processImmediately) {
+      throw new Error('PayloadCMS jobs not configured - cannot process email immediately')
+    } else {
+      console.warn('PayloadCMS jobs not configured - emails will not be processed automatically')
+      return email as TEmail
+    }
+  }
+
+  let jobId: string
+  try {
+    const job = await payload.jobs.queue({
+      queue: queueName,
+      task: 'process-email',
+      input: {
+        emailId: String(email.id)
+      },
+      // If scheduled, set the waitUntil date
+      waitUntil: emailData.scheduledAt ? new Date(emailData.scheduledAt) : undefined
+    })
+
+    jobId = String(job.id)
+  } catch (error) {
+    // Clean up the orphaned email since job creation failed
+    try {
+      await payload.delete({
+        collection: collectionSlug,
+        id: email.id
+      })
+    } catch (deleteError) {
+      console.error(`Failed to clean up orphaned email ${email.id} after job creation failure:`, deleteError)
+    }
+
+    // Throw the original job creation error
+    const errorMsg = `Failed to create processing job for email ${email.id}: ${String(error)}`
+    throw new Error(errorMsg)
+  }
+
+  // If processImmediately is true, process the job now
+  if (options.processImmediately) {
+    try {
+      await processJobById(payload, jobId)
+    } catch (error) {
+      // For immediate processing failures, we could consider cleanup, but the job exists and could be retried later
+      // So we'll leave the email and job in place for potential retry
+      throw new Error(`Failed to process email ${email.id} immediately: ${String(error)}`)
+    }
+  }
+
   return email as TEmail
 }
 

src/services/MailingService.ts

@@ -321,9 +321,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,

src/types/index.ts

@@ -76,7 +76,6 @@ export interface MailingPluginConfig {
   templateEngine?: TemplateEngine
   richTextEditor?: RichTextField['editor']
   beforeSend?: BeforeSendHook
-  onReady?: (payload: any) => Promise<void>
   initOrder?: 'before' | 'after'
 }
 

src/utils/emailProcessor.ts

@@ -0,0 +1,86 @@
+import type { Payload } from 'payload'
+
+/**
+ * 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> {
+  if (!payload.jobs) {
+    throw new Error('PayloadCMS jobs not configured - cannot process job immediately')
+  }
+
+  try {
+    // Run a specific job by its ID (using where clause to find the job)
+    await payload.jobs.run({
+      where: {
+        id: {
+          equals: jobId
+        }
+      }
+    })
+  } catch (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()
+}

src/workflows/index.ts

@@ -1,11 +0,0 @@
-import { sendEmailWorkflow } from './sendEmailWorkflow.js'
-
-/**
- * All mailing-related workflows that get registered with Payload
- */
-export const mailingWorkflows = [
-  sendEmailWorkflow,
-]
-
-// Re-export everything from individual workflow files
-export * from './sendEmailWorkflow.js'

src/workflows/sendEmailWorkflow.ts

@@ -1,291 +0,0 @@
-import { sendEmail } from '../sendEmail.js'
-import { BaseEmailDocument } from '../types/index.js'
-
-export interface SendEmailWorkflowInput {
-  // 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
-
-  // Workflow-specific option
-  processImmediately?: boolean // If true, process the email immediately instead of waiting for the queue
-
-  // Allow any additional fields that users might have in their email collection
-  [key: string]: any
-}
-
-/**
- * Transforms workflow input into sendEmail options by separating template and data fields
- */
-function transformWorkflowInputToSendEmailOptions(workflowInput: SendEmailWorkflowInput) {
-  const sendEmailOptions: any = {
-    data: {}
-  }
-
-  // If using template mode, set template options
-  if (workflowInput.templateSlug) {
-    sendEmailOptions.template = {
-      slug: workflowInput.templateSlug,
-      variables: workflowInput.variables || {}
-    }
-  }
-
-  // Standard email fields that should be copied to data
-  const standardFields = ['to', 'cc', 'bcc', 'from', 'fromName', 'replyTo', 'subject', 'html', 'text', 'scheduledAt', 'priority']
-
-  // Fields that should not be copied to data
-  const excludedFields = ['templateSlug', 'variables', 'processImmediately']
-
-  // Copy standard fields to data
-  standardFields.forEach(field => {
-    if (workflowInput[field] !== undefined) {
-      sendEmailOptions.data[field] = workflowInput[field]
-    }
-  })
-
-  // Copy any additional custom fields
-  Object.keys(workflowInput).forEach(key => {
-    if (!excludedFields.includes(key) && !standardFields.includes(key)) {
-      sendEmailOptions.data[key] = workflowInput[key]
-    }
-  })
-
-  return sendEmailOptions
-}
-
-/**
- * Workflow for sending emails with optional immediate processing
- * Can be used through Payload's workflow system to send emails programmatically
- */
-export const sendEmailWorkflow = {
-  slug: 'send-email',
-  label: 'Send Email',
-  inputSchema: [
-    {
-      name: 'processImmediately',
-      type: 'checkbox' as const,
-      label: 'Process Immediately',
-      defaultValue: false,
-      admin: {
-        description: 'Process and send the email immediately instead of waiting for the queue processor'
-      }
-    },
-    {
-      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',
-        condition: (data: any) => !data.processImmediately
-      }
-    },
-    {
-      name: 'priority',
-      type: 'number' as const,
-      label: 'Priority',
-      min: 1,
-      max: 10,
-      defaultValue: 5,
-      admin: {
-        description: 'Email priority (1 = highest, 10 = lowest)'
-      }
-    }
-  ],
-  handler: async ({ job, req }: any) => {
-    const { input, id, taskStatus } = job
-    const { payload } = req
-
-    // Cast input to our expected type
-    const workflowInput = input as SendEmailWorkflowInput
-    const shouldProcessImmediately = workflowInput.processImmediately || false
-
-    try {
-      console.log(`📧 Workflow ${id}: Creating email...`)
-
-      // Transform workflow input into sendEmail options
-      const sendEmailOptions = transformWorkflowInputToSendEmailOptions(workflowInput)
-
-      // Create the email in the database
-      const email = await sendEmail<BaseEmailDocument>(payload, sendEmailOptions)
-
-      console.log(`✅ Workflow ${id}: Email created with ID: ${email.id}`)
-
-      // Update task status with email ID
-      if (taskStatus) {
-        await taskStatus.update({
-          data: {
-            emailId: email.id,
-            status: 'created'
-          }
-        })
-      }
-
-      // If processImmediately is true, process the email now
-      if (shouldProcessImmediately) {
-        console.log(`⚡ Workflow ${id}: Processing email immediately...`)
-
-        // Get the mailing service from context
-        const mailingContext = payload.mailing
-        if (!mailingContext || !mailingContext.service) {
-          throw new Error('Mailing plugin not properly initialized')
-        }
-
-        // Process just this specific email
-        await mailingContext.service.processEmailItem(String(email.id))
-
-        console.log(`✅ Workflow ${id}: Email processed and sent immediately`)
-
-        // Update task status
-        if (taskStatus) {
-          await taskStatus.update({
-            data: {
-              emailId: email.id,
-              status: 'sent',
-              processedImmediately: true
-            }
-          })
-        }
-      } else {
-        // Update task status for queued email
-        if (taskStatus) {
-          await taskStatus.update({
-            data: {
-              emailId: email.id,
-              status: 'queued',
-              processedImmediately: false
-            }
-          })
-        }
-      }
-
-    } catch (error) {
-      console.error(`❌ Workflow ${id}: Failed to process email:`, error)
-
-      // Update task status with error
-      if (taskStatus) {
-        await taskStatus.update({
-          data: {
-            status: 'failed',
-            error: error instanceof Error ? error.message : String(error)
-          }
-        })
-      }
-
-      if (error instanceof Error) {
-        throw new Error(`Failed to process email: ${error.message}`, { cause: error })
-      } else {
-        throw new Error(`Failed to process email: ${String(error)}`)
-      }
-    }
-  }
-}
-
-export default sendEmailWorkflow