@bernierllc/email-service 4.0.1 → 4.0.3

package/dist/email-service.js

@@ -178,19 +178,26 @@ export class EmailService {
             }
             // Create delivery record
             const deliveryId = this.generateId();
-            const deliveryRecord = {
+            const deliveryData = {
                 id: deliveryId,
-                to: Array.isArray(request.to) ? request.to[0].toString() : request.to,
-                from: typeof request.from === 'string' ? request.from : request.from.email,
+                message_id: '',
+                to_address: Array.isArray(request.to) ? request.to[0].toString() : request.to,
+                from_address: typeof request.from === 'string' ? request.from : request.from.email,
                 subject,
                 provider,
                 status: DeliveryStatus.SENDING,
-                templateId: request.templateId,
-                metadata: request.metadata,
-                createdAt: new Date(),
-                updatedAt: new Date()
+                template_id: request.templateId || null,
+                metadata: request.metadata ? JSON.stringify(request.metadata) : null,
+                sent_at: null,
+                delivered_at: null,
+                opened_at: null,
+                clicked_at: null,
+                bounced_at: null,
+                error: null,
+                created_at: new Date().toISOString(),
+                updated_at: new Date().toISOString()
             };
-            await this.db.insert('email_deliveries', deliveryRecord);
+            await this.db.insert('email_deliveries', deliveryData);
             // Send email with retry logic
             const toEmail = Array.isArray(request.to)
                 ? (typeof request.to[0] === 'string' ? request.to[0] : request.to[0].email)
@@ -211,11 +218,11 @@ export class EmailService {
             const result = await this.sendWithRetry(sender, emailMessage, deliveryId, provider);
             // Update delivery record
             await this.db.update('email_deliveries', deliveryId, {
-                messageId: result.messageId,
+                message_id: result.messageId || '',
                 status: result.success ? DeliveryStatus.SENT : DeliveryStatus.FAILED,
-                sentAt: result.success ? new Date() : undefined,
-                error: result.errorMessage,
-                updatedAt: new Date()
+                sent_at: result.success ? new Date().toISOString() : null,
+                error: result.errorMessage || null,
+                updated_at: new Date().toISOString()
             });
             this.logger.info(`Email sent via ${provider}`, { deliveryId, messageId: result.messageId });
             return {
@@ -274,8 +281,9 @@ export class EmailService {
         try {
             const id = this.generateId();
             const now = new Date();
-            // Extract variables from template
-            const variables = this.extractVariables(request.html);
+            // Extract variables from all template parts
+            const allContent = [request.subject, request.html, request.text].filter(Boolean).join(' ');
+            const variables = this.extractVariables(allContent);
             const template = {
                 id,
                 name: request.name,
@@ -288,8 +296,15 @@ export class EmailService {
                 updatedAt: now
             };
             await this.db.insert('email_templates', {
-                ...template,
-                variables: JSON.stringify(variables)
+                id,
+                name: request.name,
+                subject: request.subject,
+                html: request.html,
+                text: request.text || null,
+                variables: JSON.stringify(variables),
+                version: 1,
+                created_at: now.toISOString(),
+                updated_at: now.toISOString()
             });
             if (this.config.templates?.cacheEnabled) {
                 this.templateCache.set(id, template);
@@ -329,14 +344,17 @@ export class EmailService {
             throw new TemplateError(`Template ${id} not found`);
         }
         const html = update.html || existing.html;
-        const variables = this.extractVariables(html);
+        const subject = update.subject || existing.subject;
+        const text = update.text || existing.text;
+        const allContent = [subject, html, text].filter(Boolean).join(' ');
+        const variables = this.extractVariables(allContent);
         const updated = await this.db.update('email_templates', id, {
             subject: update.subject || existing.subject,
             html,
             text: update.text || existing.text,
             variables: JSON.stringify(variables),
             version: existing.version + 1,
-            updatedAt: new Date()
+            updated_at: new Date().toISOString()
         });
         // Invalidate cache
         this.templateCache.delete(id);
@@ -388,15 +406,15 @@ export class EmailService {
     async trackOpen(deliveryId) {
         await this.db.update('email_deliveries', deliveryId, {
             status: DeliveryStatus.OPENED,
-            openedAt: new Date(),
-            updatedAt: new Date()
+            opened_at: new Date().toISOString(),
+            updated_at: new Date().toISOString()
         });
     }
     async trackClick(deliveryId) {
         await this.db.update('email_deliveries', deliveryId, {
             status: DeliveryStatus.CLICKED,
-            clickedAt: new Date(),
-            updatedAt: new Date()
+            clicked_at: new Date().toISOString(),
+            updated_at: new Date().toISOString()
         });
     }
     async getDeliveryStats(startDate, endDate) {
@@ -457,9 +475,9 @@ export class EmailService {
             lists: JSON.stringify(request.lists || []),
             tags: request.tags ? JSON.stringify(request.tags) : null,
             metadata: request.metadata ? JSON.stringify(request.metadata) : null,
-            subscribedAt: now,
-            createdAt: now,
-            updatedAt: now
+            subscribed_at: now.toISOString(),
+            created_at: now.toISOString(),
+            updated_at: now.toISOString()
         });
         this.logger.info(`Subscriber created: ${request.email}`, { id });
         return this.parseSubscriber(subscriber);
@@ -470,7 +488,7 @@ export class EmailService {
     }
     async updateSubscriber(id, update) {
         const updateData = {
-            updatedAt: new Date()
+            updated_at: new Date().toISOString()
         };
         if (update.name !== undefined)
             updateData.name = update.name;
@@ -492,8 +510,8 @@ export class EmailService {
         }
         await this.db.update('subscribers', subscriber.id, {
             status: 'unsubscribed',
-            unsubscribedAt: new Date(),
-            updatedAt: new Date()
+            unsubscribed_at: new Date().toISOString(),
+            updated_at: new Date().toISOString()
         });
         this.logger.info(`Subscriber unsubscribed: ${email}`);
         return true;
@@ -513,14 +531,22 @@ export class EmailService {
     async createList(name, description) {
         const id = this.generateId();
         const now = new Date();
-        return await this.db.insert('subscriber_lists', {
+        const record = await this.db.insert('subscriber_lists', {
             id,
             name,
             description,
-            subscriberCount: 0,
-            createdAt: now,
-            updatedAt: now
+            subscriber_count: 0,
+            created_at: now.toISOString(),
+            updated_at: now.toISOString()
         });
+        return {
+            id: record.id,
+            name: record.name,
+            description: record.description,
+            subscriberCount: record.subscriber_count,
+            createdAt: new Date(record.created_at),
+            updatedAt: new Date(record.updated_at)
+        };
     }
     // ===== Webhooks =====
     registerWebhookHandler(event, handler) {
@@ -610,7 +636,21 @@ export class EmailService {
                     ...config.customData
                 }
             };
-            const emailResult = await this.send(emailRequest);
+            let emailResult;
+            try {
+                emailResult = await this.send(emailRequest);
+            }
+            catch (sendError) {
+                const sendErr = sendError instanceof Error ? sendError : new Error(String(sendError));
+                this.logger.error('Failed to send magic link email', sendErr);
+                return {
+                    success: false,
+                    magicLink,
+                    token,
+                    expiresAt,
+                    error: sendErr.message
+                };
+            }
             this.logger.info(`Magic link email sent`, {
                 recipient: config.recipient,
                 purpose: config.purpose,
@@ -627,7 +667,7 @@ export class EmailService {
         }
         catch (error) {
             const err = error instanceof Error ? error : new Error(String(error));
-            this.logger.error('Failed to send magic link email', err);
+            this.logger.error('Failed to generate magic link', err);
             return {
                 success: false,
                 error: err.message

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import type { DatabaseConfig } from '@bernierllc/database-adapter';
 import type { QueueOptions } from '@bernierllc/queue-manager';
 import type { TemplateContext } from '@bernierllc/template-engine';
-export type EmailProvider = 'sendgrid' | 'mailgun' | 'ses' | 'smtp';
+export type EmailProvider = 'sendgrid' | 'mailgun' | 'ses' | 'smtp' | 'postmark' | 'mandrill' | 'smtp2go';
 export interface ProviderConfig {
     type: EmailProvider;
     apiKey?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bernierllc/email-service",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "Comprehensive email service orchestrating template management, multi-provider delivery, tracking, and subscriber management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -26,19 +26,19 @@
   "author": "Bernier LLC",
   "license": "PROPRIETARY",
   "dependencies": {
-    "@bernierllc/email-sender": "5.1.1",
-    "@bernierllc/database-adapter": "1.2.1",
-    "@bernierllc/logger": "1.3.1",
-    "@bernierllc/queue-manager": "1.2.1",
-    "@bernierllc/retry-metrics": "0.2.1",
-    "@bernierllc/retry-policy": "0.3.1",
-    "@bernierllc/retry-state": "0.2.1",
-    "@bernierllc/webhook-validator": "1.0.4",
-    "@bernierllc/template-engine": "0.4.1",
-    "@bernierllc/email-parser": "0.4.0",
-    "@bernierllc/email-validator": "3.0.1",
-    "@bernierllc/config-manager": "1.0.6",
-    "@bernierllc/crypto-utils": "1.0.7"
+    "@bernierllc/database-adapter": "1.2.2",
+    "@bernierllc/email-parser": "0.4.1",
+    "@bernierllc/email-sender": "5.2.1",
+    "@bernierllc/email-validator": "3.0.2",
+    "@bernierllc/logger": "1.3.2",
+    "@bernierllc/queue-manager": "1.2.2",
+    "@bernierllc/retry-metrics": "0.2.2",
+    "@bernierllc/retry-policy": "0.3.2",
+    "@bernierllc/retry-state": "0.2.2",
+    "@bernierllc/template-engine": "0.4.2",
+    "@bernierllc/config-manager": "1.0.7",
+    "@bernierllc/webhook-validator": "1.0.5",
+    "@bernierllc/crypto-utils": "1.0.8"
   },
   "peerDependencies": {
     "@sendgrid/mail": "^8.0.0",
@@ -80,7 +80,7 @@
     "prebuild": "npm run clean",
     "clean": "rm -rf dist",
     "test": "jest",
-    "test:run": "jest --watchAll=false",
+    "test:run": "jest --watchAll=false --forceExit",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
     "lint": "eslint src --ext .ts"