@c9up/rover 0.1.8 → 0.1.10

package/README.md

@@ -27,7 +27,7 @@ Providers push delivery events (`delivered`, `bounced`, `failed`) to a URL you c
 import { createMailgunWebhookHandler } from '@c9up/rover/webhooks/mailgun'
 import { Emitter } from '@c9up/ream/events'
 
-const emitter = app.container.resolve(Emitter)
+const emitter = await app.container.resolve(Emitter)
 
 router.post(
   '/webhooks/mailgun',

package/dist/BaseMail.d.ts

@@ -3,6 +3,11 @@ export type MailAddress = string | {
     address: string;
     name?: string;
 };
+/** The little a mail needs of a mailer to dispatch itself. */
+export interface MailSender<R> {
+    send(mail: BaseMail): Promise<R>;
+    sendLater(mail: BaseMail): Promise<unknown>;
+}
 /**
  * Abstract base for class-based mail messages (Adonis parity).
  *
@@ -18,12 +23,47 @@ export type MailAddress = string | {
  *   await mail.send(new WelcomeMail(user));
  */
 export declare abstract class BaseMail {
-    protected readonly message: MessageBuilder;
+    #private;
+    /**
+     * The message this mail builds.
+     *
+     * Public, because a test asserts on it from outside —
+     * `mails.assertSent(WelcomeMail, (mail) => mail.message.hasTo(user.email))`
+     * — and a caller may add a recipient before dispatching.
+     */
+    readonly message: MessageBuilder;
     from?: MailAddress;
     replyTo?: MailAddress;
     subject?: string;
+    /**
+     * Whether {@link build} has already run (AdonisJS `built`).
+     *
+     * Without it, building twice replayed `prepare()` against the SAME
+     * `MessageBuilder`, so every recipient and every attachment was added
+     * again — a mail asserted on with `buildWithContents()` and then sent went
+     * out twice to the same address, with the attachment doubled. Building
+     * twice is ordinary: inspect then send, or retry a send at the app level.
+     */
+    built: boolean;
     constructor();
     abstract prepare(): void | Promise<void>;
+    /**
+     * Send this mail through `mailer`.
+     *
+     *   await new WelcomeMail(user).send(mail.use('smtp'))
+     *
+     * The mail object is the dispatchable unit, so it can be handed around and
+     * sent by whoever holds a mailer.
+     */
+    send<R>(mailer: MailSender<R>): Promise<R>;
+    /** Queue this mail for background delivery (Adonis `sendLater`). */
+    sendLater(mailer: MailSender<unknown>): Promise<void>;
+    /**
+     * Build the message AND render its templates ahead of time (Adonis
+     * `buildWithContents`), so the contents can be inspected before sending —
+     * which is what an assertion on the rendered html needs.
+     */
+    buildWithContents(viewsRoot?: string): Promise<MailMessage>;
     build(viewsRoot?: string): Promise<MailMessage>;
 }
 //# sourceMappingURL=BaseMail.d.ts.map

package/dist/BaseMail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseMail.d.ts","sourceRoot":"","sources":["../src/BaseMail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE;;;;;;;;;;;;;GAaG;AACH,8BAAsB,QAAQ;IAC7B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAwB;IAElE,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;;IAUjB,QAAQ,CAAC,OAAO,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAElC,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAmBrD"}
+{"version":3,"file":"BaseMail.d.ts","sourceRoot":"","sources":["../src/BaseMail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEvE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,8DAA8D;AAC9D,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACjC,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC5C;AAED;;;;;;;;;;;;;GAaG;AACH,8BAAsB,QAAQ;;IAC7B;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAwB;IAExD,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;OAQG;IACH,KAAK,UAAS;;IAYd,QAAQ,CAAC,OAAO,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAExC;;;;;;;OAOG;IACG,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAIhD,oEAAoE;IAC9D,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D;;;;OAIG;IACG,iBAAiB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAI3D,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAwBrD"}

package/dist/BaseMail.js

@@ -14,16 +14,62 @@ import { MessageBuilder } from "./MessageBuilder.js";
  *   await mail.send(new WelcomeMail(user));
  */
 export class BaseMail {
+    /**
+     * The message this mail builds.
+     *
+     * Public, because a test asserts on it from outside —
+     * `mails.assertSent(WelcomeMail, (mail) => mail.message.hasTo(user.email))`
+     * — and a caller may add a recipient before dispatching.
+     */
     message = new MessageBuilder();
     from;
     replyTo;
     subject;
+    /**
+     * Whether {@link build} has already run (AdonisJS `built`).
+     *
+     * Without it, building twice replayed `prepare()` against the SAME
+     * `MessageBuilder`, so every recipient and every attachment was added
+     * again — a mail asserted on with `buildWithContents()` and then sent went
+     * out twice to the same address, with the attachment doubled. Building
+     * twice is ordinary: inspect then send, or retry a send at the app level.
+     */
+    built = false;
+    /** The message the first build produced, returned by every later call. */
+    #builtMessage;
     constructor() {
         if (new.target === BaseMail) {
             throw new Error("BaseMail is abstract and cannot be instantiated directly");
         }
     }
+    /**
+     * Send this mail through `mailer`.
+     *
+     *   await new WelcomeMail(user).send(mail.use('smtp'))
+     *
+     * The mail object is the dispatchable unit, so it can be handed around and
+     * sent by whoever holds a mailer.
+     */
+    async send(mailer) {
+        return mailer.send(this);
+    }
+    /** Queue this mail for background delivery (Adonis `sendLater`). */
+    async sendLater(mailer) {
+        await mailer.sendLater(this);
+    }
+    /**
+     * Build the message AND render its templates ahead of time (Adonis
+     * `buildWithContents`), so the contents can be inspected before sending —
+     * which is what an assertion on the rendered html needs.
+     */
+    async buildWithContents(viewsRoot) {
+        return this.build(viewsRoot);
+    }
     async build(viewsRoot) {
+        if (this.built && this.#builtMessage !== undefined) {
+            return this.#builtMessage;
+        }
+        this.built = true;
         if (this.from !== undefined) {
             applyAddress(this.from, (address, name) => this.message.from(address, name));
         }
@@ -36,7 +82,8 @@ export class BaseMail {
         await this.prepare();
         // Forward the owning Mail's per-instance viewsRoot so template
         // resolution doesn't depend on the process-wide mutable global.
-        return this.message.build(viewsRoot);
+        this.#builtMessage = await this.message.build(viewsRoot);
+        return this.#builtMessage;
     }
 }
 function applyAddress(addr, set) {

package/dist/BaseMail.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseMail.js","sourceRoot":"","sources":["../src/BaseMail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIvE;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAgB,QAAQ;IACV,OAAO,GAAmB,IAAI,cAAc,EAAE,CAAC;IAElE,IAAI,CAAe;IACnB,OAAO,CAAe;IACtB,OAAO,CAAU;IAEjB;QACC,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACd,0DAA0D,CAC1D,CAAC;QACH,CAAC;IACF,CAAC;IAID,KAAK,CAAC,KAAK,CAAC,SAAkB;QAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAChC,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAC5C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CACnC,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,+DAA+D;QAC/D,gEAAgE;QAChE,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;CACD;AAED,SAAS,YAAY,CACpB,IAAiB,EACjB,GAA6C;IAE7C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,CAAC;QACV,OAAO;IACR,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"BaseMail.js","sourceRoot":"","sources":["../src/BaseMail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAUvE;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAgB,QAAQ;IAC7B;;;;;;OAMG;IACM,OAAO,GAAmB,IAAI,cAAc,EAAE,CAAC;IAExD,IAAI,CAAe;IACnB,OAAO,CAAe;IACtB,OAAO,CAAU;IAEjB;;;;;;;;OAQG;IACH,KAAK,GAAG,KAAK,CAAC;IACd,0EAA0E;IAC1E,aAAa,CAAe;IAE5B;QACC,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CACd,0DAA0D,CAC1D,CAAC;QACH,CAAC;IACF,CAAC;IAID;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,CAAI,MAAqB;QAClC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,oEAAoE;IACpE,KAAK,CAAC,SAAS,CAAC,MAA2B;QAC1C,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,iBAAiB,CAAC,SAAkB;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAkB;QAC7B,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC,aAAa,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAChC,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAC5C,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CACnC,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,+DAA+D;QAC/D,gEAAgE;QAChE,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC3B,CAAC;CACD;AAED,SAAS,YAAY,CACpB,IAAiB,EACjB,GAA6C;IAE7C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,GAAG,CAAC,IAAI,CAAC,CAAC;QACV,OAAO;IACR,CAAC;IACD,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC"}

package/dist/Mail.d.ts

@@ -1,5 +1,5 @@
 import { BaseMail } from "./BaseMail.js";
-import { type MailAttachment, type MailMessage, MessageBuilder } from "./MessageBuilder.js";
+import { type MailAttachment, type MailMessage, type MessageBodyTemplates, MessageBuilder } from "./MessageBuilder.js";
 import { type BayQueueLike } from "./queue/MailJob.js";
 import { type RetryConfig } from "./retry.js";
 import { FakeMail } from "./testing/FakeMail.js";
@@ -32,6 +32,11 @@ export interface MailSendResult {
 export type MailSendOutcome = MailSendResult | undefined;
 export interface MailTransport {
     send(message: MailMessage): Promise<MailSendOutcome>;
+    /**
+     * Release what this transport holds open — an SMTP connection pool, mostly.
+     * Optional: an HTTP-API transport has nothing to close.
+     */
+    close?(): Promise<void>;
 }
 /**
  * Structural interface for the event bus `Emitter` — peer-dep friendly.
@@ -41,44 +46,50 @@ export interface EmitterLike {
     emit(event: string, data: unknown): void;
 }
 /**
- * Emitted (`mail:sending`) right before the transport `send` runs — no
- * `messageId` yet, since the provider hasn't accepted the message.
+ * What every mail lifecycle event carries, matching `@adonisjs/mail`:
+ * the mailer that handled it, the message itself, and the templates it was
+ * rendered from. A listener migrating over reads `message.to` / `views.html`.
+ *
+ * `transportName` and the flattened recipient lists are rover's own and stay:
+ * the transport name is the same string as `mailerName` under the name rover
+ * used first, and a listener that only wants the addresses should not have to
+ * reach into the message for them.
  */
-export interface MailSendingEvent {
+export type { MessageBodyTemplates };
+export interface MailEventBase {
+    /** AdonisJS name for the mailer that handled the message. */
+    mailerName: string;
+    /** The built message. */
+    message: MailMessage;
+    /** Templates the message was rendered from, empty when it carried none. */
+    views: MessageBodyTemplates;
     to: string[];
     cc: string[];
     bcc: string[];
+    /** rover's original name for {@link MailEventBase.mailerName}. */
     transportName: string;
     timestamp: number;
 }
-export interface MailSentEvent {
+/**
+ * Emitted (`mail:sending`) right before the transport `send` runs — no
+ * `messageId` yet, since the provider hasn't accepted the message.
+ */
+export interface MailSendingEvent extends MailEventBase {
+}
+export interface MailSentEvent extends MailEventBase {
     messageId: string;
-    to: string[];
-    cc: string[];
-    bcc: string[];
-    transportName: string;
-    timestamp: number;
 }
 /**
  * Emitted for the queue lifecycle (`mail:queueing` / `mail:queued`). `jobId` is
  * only present on `mail:queued` (once the job has been accepted by the queue /
  * in-memory messenger).
  */
-export interface MailQueueEvent {
-    to: string[];
-    cc: string[];
-    bcc: string[];
-    transportName: string;
+export interface MailQueueEvent extends MailEventBase {
     queue: string;
     jobId?: string;
-    timestamp: number;
 }
-export interface MailFailedEvent {
+export interface MailFailedEvent extends MailEventBase {
     messageId: string;
-    to: string[];
-    cc: string[];
-    bcc: string[];
-    transportName: string;
     error: {
         code: string;
         message: string;
@@ -86,12 +97,21 @@ export interface MailFailedEvent {
         upstreamStatusRaw?: string;
         attempts: number;
     };
-    timestamp: number;
 }
 export interface MailConfig {
     default: string;
     from: string;
-    transports: Record<string, {
+    transports?: Record<string, {
+        transport: string;
+        retry?: RetryConfig;
+        [key: string]: unknown;
+    }>;
+    /**
+     * AdonisJS spelling of `transports`. Both are accepted and mean the same
+     * thing, so a migrated `config/mail.ts` runs with its imports rewritten and
+     * nothing else.
+     */
+    mailers?: Record<string, {
         transport: string;
         retry?: RetryConfig;
         [key: string]: unknown;
@@ -133,6 +153,11 @@ export declare class SmtpTransport implements MailTransport {
     #private;
     constructor(config: Record<string, unknown>);
     send(message: MailMessage): Promise<MailSendOutcome>;
+    /**
+     * Drain nodemailer's connection pool. Idempotent — nodemailer tolerates a
+     * second close, and a shutdown path may run twice.
+     */
+    close(): Promise<void>;
 }
 /**
  * Log transport — logs emails to console (development).
@@ -159,6 +184,36 @@ export declare class Mail {
         hooks?: MailHooks;
         emitter?: EmitterLike;
     });
+    /**
+     * Send a message that is already built (AdonisJS `sendCompiled`).
+     *
+     * What a queue worker calls: the message was composed and serialised
+     * elsewhere, so there is nothing left to render. An alias of
+     * {@link dispatchMessage}, which is the name ream used first.
+     */
+    sendCompiled(message: MailMessage, transport?: string): Promise<void>;
+    /**
+     * Queue a message that is already built (AdonisJS `sendLaterCompiled`).
+     *
+     * Returns the job id, like {@link sendLater}.
+     */
+    sendLaterCompiled(message: MailMessage, options?: {
+        transport?: string;
+        queue?: string;
+    }): Promise<string>;
+    /**
+     * Hand `sendLater()` a queue after construction (AdonisJS `setMessenger`).
+     *
+     * The constructor takes one too, but a queue is often resolved later than
+     * the mailer — a provider that boots after this one, a test that swaps it.
+     * Without this the only way in was the constructor, so an app migrating
+     * from `mail.setMessenger(queue)` stopped at a TypeError.
+     *
+     * "Messenger" is upstream's word for what rover's config calls `queue`;
+     * they are the same thing, and the method keeps the upstream name so a
+     * migrated call site resolves.
+     */
+    setMessenger(messenger: BayQueueLike): this;
     /** Send an email using the fluent message builder. */
     send(callback: (message: MessageBuilder) => void, transport?: string): Promise<void>;
     /** Send an email using a class-based `BaseMail` instance. */
@@ -181,7 +236,7 @@ export declare class Mail {
      * `overrideRetry` (optional) wins over config-level retry; `MailJobHandler` passes
      * `{ maxAttempts: 1 }` so queue-level and sync-level retries don't compound.
      */
-    dispatchMessage(message: MailMessage, transportName?: string, overrideRetry?: RetryConfig): Promise<void>;
+    dispatchMessage(message: MailMessage, transportName?: string, overrideRetry?: RetryConfig, views?: MessageBodyTemplates): Promise<void>;
     /**
      * Get a `Mailer` bound to a named transport, so `mail.use('mailgun').send(cb)`
      * routes through that transport (Adonis parity). Mailers are cached per name.
@@ -189,6 +244,17 @@ export declare class Mail {
     use(name: string): Mailer;
     /** @internal Resolve the raw transport instance behind a mailer name. */
     transportFor(name: string): MailTransport;
+    /**
+     * Close one transport's open connections (Adonis `close`).
+     *
+     * An SMTP pool keeps sockets alive between sends; a process that exits
+     * without closing them leaves the server holding connections until it times
+     * them out. Unknown or already-closed names are a no-op — shutdown is not
+     * the place to throw.
+     */
+    close(name?: string): Promise<void>;
+    /** Close every built transport (Adonis `closeAll`). What a shutdown hook calls. */
+    closeAll(): Promise<void>;
     /**
      * Enter fake mode. Every subsequent `send()` / `sendLater()` — including via
      * `use(name)` — is captured by the returned `FakeMail` instead of hitting a

package/dist/Mail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Mail.d.ts","sourceRoot":"","sources":["../src/Mail.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Mail.d.ts","sourceRoot":"","sources":["../src/Mail.ts"],"names":[],"mappings":"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"}

package/dist/Mail.js

@@ -79,6 +79,10 @@ export class SmtpTransport {
                 subject: message.subject,
                 html: message.html,
                 text: message.text,
+                // nodemailer reads `watchHtml`; there is no bare `watch` field in
+                // its mail composer, so writing one — as AdonisJS does — never
+                // reaches the wire.
+                watchHtml: message.watchHtml,
                 priority: message.priority,
                 messageId: message.messageId,
                 inReplyTo: message.inReplyTo,
@@ -86,12 +90,20 @@ export class SmtpTransport {
                 headers: Object.keys(message.headers).length
                     ? message.headers
                     : undefined,
+                encoding: message.encoding,
+                // `list` is NOT passed: `build()` already rendered the `List-*`
+                // headers into `headers`, so handing nodemailer the structured form
+                // too would emit each of them twice.
+                icalEvent: message.icalEvent,
                 attachments: message.attachments.length
                     ? message.attachments.map((att) => ({
                         filename: att.filename,
                         content: att.content,
                         contentType: att.contentType,
                         cid: att.cid,
+                        contentDisposition: att.contentDisposition,
+                        encoding: att.encoding,
+                        headers: att.headers,
                     }))
                     : undefined,
             });
@@ -103,6 +115,13 @@ export class SmtpTransport {
             throw wrapSmtpError(err);
         }
     }
+    /**
+     * Drain nodemailer's connection pool. Idempotent — nodemailer tolerates a
+     * second close, and a shutdown path may run twice.
+     */
+    async close() {
+        this.#transporter.close();
+    }
 }
 /**
  * Normalise nodemailer / socket errors into the uniform `MAIL_PROVIDER_ERROR`
@@ -192,7 +211,10 @@ export class Mail {
         if (config.viewsRoot !== undefined) {
             setViewsRoot(config.viewsRoot);
         }
-        for (const [name, transportConfig] of Object.entries(config.transports)) {
+        // `mailers` (AdonisJS) and `transports` (rover) are the same map under two
+        // names; a config that sets both gets both, last name wins per key.
+        const declared = { ...config.transports, ...config.mailers };
+        for (const [name, transportConfig] of Object.entries(declared)) {
             const factory = transportFactories[transportConfig.transport];
             if (!factory) {
                 throw new RoverError("MAIL_UNKNOWN_TRANSPORT", `Unknown mail transport type '${transportConfig.transport}' (configured under name '${name}')`, {
@@ -205,25 +227,55 @@ export class Mail {
             }
         }
         if (options?.queue) {
-            this.#queue = options.queue;
-            this.#queue.register(this.#queueName, new MailJobHandler(this));
+            this.setMessenger(options.queue);
         }
     }
+    /**
+     * Send a message that is already built (AdonisJS `sendCompiled`).
+     *
+     * What a queue worker calls: the message was composed and serialised
+     * elsewhere, so there is nothing left to render. An alias of
+     * {@link dispatchMessage}, which is the name ream used first.
+     */
+    async sendCompiled(message, transport) {
+        await this.dispatchMessage(message, transport);
+    }
+    /**
+     * Queue a message that is already built (AdonisJS `sendLaterCompiled`).
+     *
+     * Returns the job id, like {@link sendLater}.
+     */
+    async sendLaterCompiled(message, options) {
+        // No views: a compiled message was rendered elsewhere, and the templates
+        // that produced it did not travel with it.
+        return this.#enqueue({ message, views: {} }, options);
+    }
+    /**
+     * Hand `sendLater()` a queue after construction (AdonisJS `setMessenger`).
+     *
+     * The constructor takes one too, but a queue is often resolved later than
+     * the mailer — a provider that boots after this one, a test that swaps it.
+     * Without this the only way in was the constructor, so an app migrating
+     * from `mail.setMessenger(queue)` stopped at a TypeError.
+     *
+     * "Messenger" is upstream's word for what rover's config calls `queue`;
+     * they are the same thing, and the method keeps the upstream name so a
+     * migrated call site resolves.
+     */
+    setMessenger(messenger) {
+        this.#queue = messenger;
+        this.#queue.register(this.#queueName, new MailJobHandler(this));
+        return this;
+    }
     async send(arg, transport) {
         const transportName = transport ?? this.#defaultTransport;
         // Fake mode is manager-level: capture the built message (and the source
         // BaseMail, for constructor-based assertions) instead of touching a
         // transport. Still fire the send lifecycle so event wiring stays testable.
         if (this.#fake !== null) {
-            const message = await this.#buildMessage(arg);
+            const { message, views } = await this.#buildMessageWithViews(arg);
             this.#fake.trackSent(message, arg instanceof BaseMail ? arg : undefined);
-            const base = {
-                to: message.to.slice(),
-                cc: message.cc.slice(),
-                bcc: message.bcc.slice(),
-                transportName,
-                timestamp: Date.now(),
-            };
+            const base = this.#eventBase(message, views, transportName);
             this.#fireSending(base);
             this.#fireSent({ ...base, messageId: randomBytes(16).toString("hex") });
             return;
@@ -232,8 +284,8 @@ export class Mail {
         if (!this.#transports.has(transportName)) {
             throw new Error(`Mail transport '${transportName}' not configured`);
         }
-        const message = await this.#buildMessage(arg);
-        await this.dispatchMessage(message, transportName);
+        const { message, views } = await this.#buildMessageWithViews(arg);
+        await this.dispatchMessage(message, transportName, undefined, views);
     }
     /**
      * Enqueue a send. Returns the job id. When a `@c9up/bay` `QueueManager` was
@@ -242,20 +294,21 @@ export class Mail {
      * `MemoryQueueMessenger` — `sendLater()` never throws for a missing queue.
      */
     async sendLater(arg, options) {
-        const message = await this.#buildMessage(arg);
+        const built = await this.#buildMessageWithViews(arg);
+        return this.#enqueue({ ...built, source: arg instanceof BaseMail ? arg : undefined }, options);
+    }
+    /** The queueing half, shared with {@link sendLaterCompiled}. */
+    async #enqueue(built, options) {
+        const { message, views } = built;
         const queueName = options?.queue ?? this.#queueName;
         const transportName = options?.transport ?? this.#defaultTransport;
         const base = {
-            to: message.to.slice(),
-            cc: message.cc.slice(),
-            bcc: message.bcc.slice(),
-            transportName,
+            ...this.#eventBase(message, views, transportName),
             queue: queueName,
-            timestamp: Date.now(),
         };
         // Fake mode: capture into the queued bucket, don't dispatch.
         if (this.#fake !== null) {
-            this.#fake.trackQueued(message, arg instanceof BaseMail ? arg : undefined);
+            this.#fake.trackQueued(message, built.source);
             const jobId = `fake_${randomBytes(12).toString("hex")}`;
             this.#fireQueueing(base);
             this.#fireQueued({ ...base, jobId });
@@ -276,7 +329,12 @@ export class Mail {
      * `overrideRetry` (optional) wins over config-level retry; `MailJobHandler` passes
      * `{ maxAttempts: 1 }` so queue-level and sync-level retries don't compound.
      */
-    async dispatchMessage(message, transportName, overrideRetry) {
+    async dispatchMessage(message, transportName, overrideRetry, 
+    // The templates the message came from, when the caller still knows them.
+    // A message revived from a queue payload does not: the rendered bodies
+    // were serialised, the templates that produced them were not. Empty is
+    // the honest answer there rather than a guess.
+    views = {}) {
         // Defense-in-depth: queue payloads bypass `#buildMessage`, so a
         // malformed message deserialised from storage would otherwise reach
         // the transport with the cryptic provider error A2 was meant to
@@ -294,13 +352,7 @@ export class Mail {
         let lastError;
         // Fire once before the first attempt — `mail:sending` signals intent, not
         // per-retry, matching @adonisjs/mail.
-        this.#fireSending({
-            to: message.to.slice(),
-            cc: message.cc.slice(),
-            bcc: message.bcc.slice(),
-            transportName: name,
-            timestamp: Date.now(),
-        });
+        this.#fireSending(this.#eventBase(message, views, name));
         for (let attempt = 1; attempt <= retry.maxAttempts; attempt += 1) {
             let sendResult;
             try {
@@ -312,13 +364,9 @@ export class Mail {
                 if (!retryable || attempt === retry.maxAttempts) {
                     const annotated = this.#withAttempts(err, attempt);
                     this.#fireFailed({
+                        ...this.#eventBase(message, views, name),
                         messageId: generatedId,
-                        to: message.to.slice(),
-                        cc: message.cc.slice(),
-                        bcc: message.bcc.slice(),
-                        transportName: name,
                         error: errorDescriptor(annotated, attempt),
-                        timestamp: Date.now(),
                     });
                     throw annotated;
                 }
@@ -338,12 +386,8 @@ export class Mail {
             // internally generated correlation id.
             const providerId = providerIdRaw && providerIdRaw.length > 0 ? providerIdRaw : undefined;
             this.#fireSent({
+                ...this.#eventBase(message, views, name),
                 messageId: providerId ?? generatedId,
-                to: message.to.slice(),
-                cc: message.cc.slice(),
-                bcc: message.bcc.slice(),
-                transportName: name,
-                timestamp: Date.now(),
             });
             return;
         }
@@ -406,20 +450,43 @@ export class Mail {
             }
         }
     }
-    async #buildMessage(arg) {
+    /**
+     * Build the message AND report which templates it was rendered from, since
+     * every lifecycle event carries both (AdonisJS `message` + `views`).
+     */
+    async #buildMessageWithViews(arg) {
         let result;
+        let views;
         if (arg instanceof BaseMail) {
             const built = await arg.build(this.#viewsRoot);
             result = built.from ? built : { ...built, from: this.#defaultFrom };
+            views = arg.message.views;
         }
         else {
             const builder = new MessageBuilder();
             builder.from(this.#defaultFrom);
             arg(builder);
             result = await builder.build(this.#viewsRoot);
+            views = builder.views;
         }
         validateMailMessage(result);
-        return result;
+        return { message: result, views };
+    }
+    /**
+     * The fields every lifecycle event shares. One place, so `mail:sending` and
+     * `mail:sent` cannot describe the same message differently.
+     */
+    #eventBase(message, views, mailerName) {
+        return {
+            mailerName,
+            message,
+            views,
+            to: message.to.slice(),
+            cc: message.cc.slice(),
+            bcc: message.bcc.slice(),
+            transportName: mailerName,
+            timestamp: Date.now(),
+        };
     }
     /**
      * Get a `Mailer` bound to a named transport, so `mail.use('mailgun').send(cb)`
@@ -443,6 +510,22 @@ export class Mail {
             throw new Error(`Mail transport '${name}' not configured`);
         return t;
     }
+    /**
+     * Close one transport's open connections (Adonis `close`).
+     *
+     * An SMTP pool keeps sockets alive between sends; a process that exits
+     * without closing them leaves the server holding connections until it times
+     * them out. Unknown or already-closed names are a no-op — shutdown is not
+     * the place to throw.
+     */
+    async close(name) {
+        const transportName = name ?? this.#defaultTransport;
+        await this.#transports.get(transportName)?.close?.();
+    }
+    /** Close every built transport (Adonis `closeAll`). What a shutdown hook calls. */
+    async closeAll() {
+        await Promise.all([...this.#transports.values()].map((transport) => transport.close?.()));
+    }
     /**
      * Enter fake mode. Every subsequent `send()` / `sendLater()` — including via
      * `use(name)` — is captured by the returned `FakeMail` instead of hitting a