@maestro-js/mail 1.0.0-alpha.19 → 1.0.0-alpha.2

package/dist/index.d.ts

@@ -218,12 +218,11 @@ interface SesClientAdapter {
     }): Promise<{
         MessageId?: string;
     }>;
-    configurationSetName: string;
 }
 interface SesMailDriver extends MailDriver {
     toMailEvent(event: SesWebhookEvent): MailEvent | null;
 }
-declare function sesMailDriver(ses: SesClientAdapter): SesMailDriver;
+declare function sesMailDriver(ses: SesClientAdapter, configurationSetName: string): SesMailDriver;
 
 interface IcsAttachmentOptions {
     filename?: string;
@@ -394,7 +393,7 @@ declare namespace Mail {
             /** Logger for recording sent envelopes and webhook events */
             logger: Log.Logger<[MailLogMessage]>;
             /** Queue service for {@link queue} and {@link later} delivery */
-            queue?: Queue.QueueService;
+            queueService: Queue.QueueService;
             /** Optional callback invoked when a send fails, before the error is rethrown */
             onMessageSendFailure?(envelope: Envelope, error: unknown): unknown;
         }

package/dist/index.js

@@ -145,7 +145,7 @@ var sesToMaestroEventMapping = {
   Click: "click",
   Subscription: "unsubscribe"
 };
-function sesMailDriver(ses) {
+function sesMailDriver(ses, configurationSetName) {
   async function send(envelope) {
     assert3.ok(envelope.from, "missing from address");
     function getsComposerAddr(addresses) {
@@ -200,7 +200,7 @@ function sesMailDriver(ses) {
           input: {
             RawMessage: { Data: rawBuffer },
             Destinations: [recipient],
-            ConfigurationSetName: ses.configurationSetName,
+            ConfigurationSetName: configurationSetName,
             Tags: messageTags.length ? messageTags : void 0
           }
         };
@@ -320,10 +320,12 @@ function parseIsoToDurationObject(iso) {
 
 // src/index.ts
 import assert5 from "assert";
+import { Log as Log2 } from "@maestro-js/log";
 
 // src/stub-mail-driver.ts
 import assert4 from "assert";
 import { randomUUID } from "crypto";
+import "@maestro-js/log";
 function stubMailDriver({ logger } = {}) {
   async function send(envelope) {
     assert4.ok(envelope.from, "missing from address");
@@ -348,16 +350,16 @@ function stubMailDriver({ logger } = {}) {
 import { ServiceRegistry } from "@maestro-js/service-registry";
 var EMPTY_ENVELOPE = /* @__PURE__ */ Symbol("EMPTY_ENVELOPE");
 function create(config) {
-  const queueService = config.queue;
-  const mailQueue = queueService?.create({
+  const queueService = config.queueService;
+  const mailQueue = queueService.create({
     name: ["Maestro.Mail", config.name].filter(Boolean).join("."),
-    async handle(envelope) {
+    async workFn(envelope) {
       return send(envelope);
     }
   });
-  const mailableQueue = queueService?.create({
+  const mailableQueue = queueService.create({
     name: ["Maestro.Mailable", config.name].filter(Boolean).join("."),
-    async handle(props) {
+    async workFn(props) {
       const mailable2 = mailableRegistry.get(props.mailableName);
       if (!mailable2) {
         throw new Error(`No mailable found with name ${props.mailableName}`);
@@ -416,16 +418,10 @@ function create(config) {
     }
   }
   function queue(envelope) {
-    if (!mailQueue) {
-      throw new Error("Queueing not configured for Mail");
-    }
-    mailQueue.dispatch(envelope);
+    mailQueue.addMessage(envelope, { scheduledDate: null });
   }
   function later(envelope, scheduledDate) {
-    if (!mailQueue) {
-      throw new Error("Queueing not configured for Mail");
-    }
-    mailQueue.dispatchWithDelay(envelope, scheduledDate);
+    mailQueue.addMessage(envelope, { scheduledDate });
   }
   async function sendMailable(props) {
     const mailable2 = mailableRegistry.get(props.mailableName);
@@ -450,14 +446,7 @@ function create(config) {
     }
   }
   async function queueMailable(props, options) {
-    if (!mailableQueue) {
-      throw new Error("Queueing not configured for Mail");
-    }
-    if (options.scheduledDate) {
-      await mailableQueue.dispatchWithDelay(props, options.scheduledDate);
-    } else {
-      await mailableQueue.dispatch(props);
-    }
+    await mailableQueue.addMessage(props, options);
   }
   function formatEnvelope(envelope) {
     function formatAddress(mailAddress) {
@@ -469,6 +458,13 @@ function create(config) {
     const formattedToUniq = [...new Set(formattedTo.map((f) => typeof f === "string" ? f : f.email))].map(
       (email) => formattedTo.find((t) => typeof t === "string" ? t === email : t.email === email)
     );
+    if (formattedToUniq.length !== formattedTo.length) {
+      Log2.warn({
+        message: "Addresses were not unique in the request. Duplicate email addresses have been removed",
+        original: formattedTo,
+        modified: formattedToUniq
+      });
+    }
     return {
       ...envelope,
       to: formattedToUniq,

package/package.json

@@ -12,21 +12,18 @@
     "ics": "^3.8.1",
     "iso-fns2": "npm:iso-fns@2.0.0-alpha.26",
     "nodemailer": "^7.0.5",
-    "@maestro-js/helpers": "1.0.0-alpha.19",
-    "@maestro-js/service-registry": "1.0.0-alpha.19"
-  },
-  "peerDependencies": {
-    "@maestro-js/log": "1.0.0-alpha.19"
+    "@maestro-js/helpers": "1.0.0-alpha.2",
+    "@maestro-js/log": "1.0.0-alpha.2",
+    "@maestro-js/service-registry": "1.0.0-alpha.2"
   },
   "devDependencies": {
     "@react-email/render": "0.0.7",
     "@types/node": "^22.19.11",
     "@types/nodemailer": "^6.4.17",
     "@types/react": "^19.0.0",
-    "@maestro-js/log": "1.0.0-alpha.19",
-    "@maestro-js/queue": "1.0.0-alpha.19"
+    "@maestro-js/queue": "1.0.0-alpha.2"
   },
-  "version": "1.0.0-alpha.19",
+  "version": "1.0.0-alpha.2",
   "publishConfig": {
     "access": "restricted"
   },