@mavogel/awscdk-rootmail 0.1.8 → 0.1.9

package/node_modules/nodemailer/dist/cjs/smtp-pool/index.d.ts

@@ -17,7 +17,7 @@ export interface SMTPPoolOptions extends SMTPTransportOptions {
     rateLimit?: number | undefined;
     /** Time window for rateLimit in milliseconds, defaults to 1000 */
     rateDelta?: number | undefined;
-    /** How many times a message is requeued when its connection closes while sending, unlimited when not set or negative */
+    /** How many times a message is requeued when its connection closes while sending, defaults to 5, a negative value means unlimited */
     maxRequeues?: number | undefined;
 }
 /**
@@ -26,6 +26,7 @@ export interface SMTPPoolOptions extends SMTPTransportOptions {
 export type SMTPPoolResolvedOptions = SMTPPoolOptions & {
     maxConnections: number;
     maxMessages: number;
+    maxRequeues: number;
 };
 /**
  * Result of a message sent through the pool, same as for the SMTP transport
@@ -80,7 +81,7 @@ declare class SMTPPool extends EventEmitter {
     /**
      * The Mail instance using this transport, assigned by Mail
      */
-    mailer?: Mail<SMTPPoolSentMessageInfo> | undefined;
+    mailer?: Mail<SMTPPoolSentMessageInfo, SMTPPoolOptions> | undefined;
     constructor(options?: SMTPPoolOptions | string);
     /**
      * Placeholder function for creating proxy sockets. This method immediatelly returns
@@ -96,7 +97,7 @@ declare class SMTPPool extends EventEmitter {
      * @param mail Mail object
      * @param callback Callback function
      */
-    send(mail: MailMessage, callback: SMTPPoolSendCallback): boolean;
+    send(mail: MailMessage<SMTPPoolSentMessageInfo>, callback: SMTPPoolSendCallback): boolean;
     /**
      * Closes all connections in the pool. If there is a message being sent, the connection
      * is closed later
@@ -109,9 +110,14 @@ declare class SMTPPool extends EventEmitter {
     /**
      * Verifies SMTP configuration
      *
-     * @param callback Callback function
+     * @returns Promise that resolves to true if the configuration is usable
      */
     verify(): Promise<true>;
+    /**
+     * Verifies SMTP configuration
+     *
+     * @param callback Callback function
+     */
     verify(callback: VerifyCallback): void;
 }
 /**
@@ -122,4 +128,6 @@ declare namespace SMTPPool {
     type MailOptions = SendMailOptions;
     type SentMessageInfo = SMTPPoolSentMessageInfo;
 }
+/** The same aliases as module level exports, for `import * as SMTPPool` and `import SMTPPool = require()` */
+export type { SMTPPoolOptions as Options, SendMailOptions as MailOptions, SMTPPoolSentMessageInfo as SentMessageInfo };
 export default SMTPPool;

package/node_modules/nodemailer/dist/cjs/smtp-pool/index.js

@@ -43,6 +43,10 @@ const index_js_2 = __importDefault(require("../well-known/index.js"));
 const shared = __importStar(require("../shared/index.js"));
 const errors = __importStar(require("../errors.js"));
 const packageData = __importStar(require("../package-info.js"));
+/** First delay before a requeued message is retried, doubled on every further requeue */
+const REQUEUE_BASE_DELAY = 50;
+/** Upper bound for the requeue delay */
+const REQUEUE_MAX_DELAY = 2000;
 /**
  * Creates a SMTP pool transport object for Nodemailer
  *
@@ -74,6 +78,8 @@ class SMTPPool extends node_events_1.EventEmitter {
         );
         this.options.maxConnections = this.options.maxConnections || 5;
         this.options.maxMessages = this.options.maxMessages || 100;
+        // a default bound, a server that closes every connection before the greeting would otherwise be retried forever
+        this.options.maxRequeues = typeof this.options.maxRequeues === 'number' ? this.options.maxRequeues : 5;
         this.logger = shared.getLogger(this.options, {
             component: this.options.component || 'smtp-pool'
         });
@@ -117,6 +123,10 @@ class SMTPPool extends node_events_1.EventEmitter {
      */
     send(mail, callback) {
         if (this._closed) {
+            // Mail.sendMail ignores the return value, so without a callback its promise would never settle
+            const err = new Error('Connection pool was closed');
+            err.code = errors.ECONNECTION;
+            setImmediate(() => callback(err));
             return false;
         }
         this._queue.push({
@@ -330,15 +340,22 @@ class SMTPPool extends node_events_1.EventEmitter {
                 // Note that we must wait a bit.. because the callback of the 'error' handler might be called
                 // in the next event loop
                 setTimeout(() => {
+                    let delay = 0;
                     if (connection.queueEntry) {
                         if (this._shouldRequeuOnConnectionClose(connection.queueEntry)) {
-                            this._requeueEntryOnConnectionClose(connection);
+                            delay = this._requeueEntryOnConnectionClose(connection);
                         }
                         else {
                             this._failDeliveryOnConnectionClose(connection);
                         }
                     }
-                    this._continueProcessing();
+                    if (delay) {
+                        // back off, a server that keeps dropping connections is not hammered
+                        setTimeout(() => this._continueProcessing(), delay);
+                    }
+                    else {
+                        this._continueProcessing();
+                    }
                 }, 50);
             }
             else {
@@ -353,7 +370,7 @@ class SMTPPool extends node_events_1.EventEmitter {
     }
     /** @internal */
     _shouldRequeuOnConnectionClose(queueEntry) {
-        if (this.options.maxRequeues === undefined || this.options.maxRequeues < 0) {
+        if (this.options.maxRequeues < 0) {
             return true;
         }
         return queueEntry.requeueAttempts < this.options.maxRequeues;
@@ -362,7 +379,9 @@ class SMTPPool extends node_events_1.EventEmitter {
     _failDeliveryOnConnectionClose(connection) {
         if (connection.queueEntry && connection.queueEntry.callback) {
             try {
-                connection.queueEntry.callback(new Error('Reached maximum number of retries after connection was closed'));
+                const err = new Error('Reached maximum number of retries after connection was closed');
+                err.code = errors.ECONNECTION;
+                connection.queueEntry.callback(err);
             }
             catch (E) {
                 this.logger.error({
@@ -377,6 +396,7 @@ class SMTPPool extends node_events_1.EventEmitter {
     }
     /** @internal */
     _requeueEntryOnConnectionClose(connection) {
+        const delay = Math.min(REQUEUE_BASE_DELAY * 2 ** connection.queueEntry.requeueAttempts, REQUEUE_MAX_DELAY);
         connection.queueEntry.requeueAttempts += 1;
         this.logger.debug({
             tnx: 'pool',
@@ -386,6 +406,7 @@ class SMTPPool extends node_events_1.EventEmitter {
         }, 'Re-queued message <%s> for #%s. Attempt: #%s', connection.queueEntry.messageId, connection.id, connection.queueEntry.requeueAttempts);
         this._queue.unshift(connection.queueEntry);
         connection.queueEntry = false;
+        return delay;
     }
     /**
      * Continue to process message if the pool hasn't closed
@@ -462,10 +483,12 @@ class SMTPPool extends node_events_1.EventEmitter {
                 callback = shared.callbackPromise(resolve, reject);
             });
         }
+        // the error paths hand over the error alone
+        const done = callback;
         const auth = new pool_resource_js_1.default(this).auth;
         this.getSocket(this.options, (err, socketOptions) => {
             if (err) {
-                return callback(err);
+                return done(err);
             }
             let options = this.options;
             if (socketOptions && socketOptions.connection) {
@@ -487,14 +510,14 @@ class SMTPPool extends node_events_1.EventEmitter {
                 }
                 returned = true;
                 connection.close();
-                return callback(err);
+                return done(err);
             });
             connection.once('end', () => {
                 if (returned) {
                     return;
                 }
                 returned = true;
-                return callback(new Error('Connection closed'));
+                return done(new Error('Connection closed'));
             });
             const finalize = () => {
                 if (returned) {
@@ -502,12 +525,17 @@ class SMTPPool extends node_events_1.EventEmitter {
                 }
                 returned = true;
                 connection.quit();
-                return callback(null, true);
+                return done(null, true);
             };
-            connection.connect(() => {
+            connection.connect(err => {
                 if (returned) {
                     return;
                 }
+                if (err) {
+                    returned = true;
+                    connection.close();
+                    return done(err);
+                }
                 if (auth && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(auth, err => {
                         if (returned) {
@@ -516,7 +544,7 @@ class SMTPPool extends node_events_1.EventEmitter {
                         if (err) {
                             returned = true;
                             connection.close();
-                            return callback(err);
+                            return done(err);
                         }
                         finalize();
                     });
@@ -526,7 +554,7 @@ class SMTPPool extends node_events_1.EventEmitter {
                     err.code = errors.ENOAUTH;
                     returned = true;
                     connection.close();
-                    return callback(err);
+                    return done(err);
                 }
                 else {
                     finalize();

package/node_modules/nodemailer/dist/cjs/smtp-pool/pool-resource.js

@@ -66,7 +66,7 @@ class PoolResource extends node_events_1.EventEmitter {
                         method: 'XOAUTH2'
                     };
                     oauth2.on('token', (token) => this.pool.mailer.emit('token', token));
-                    oauth2.on('error', err => this.emit('error', err));
+                    oauth2.on('error', err => this._fail(err));
                     break;
                 }
                 default:
@@ -89,6 +89,19 @@ class PoolResource extends node_events_1.EventEmitter {
         this._connected = false;
         this.messages = 0;
         this.available = true;
+        this._failed = false;
+    }
+    /**
+     * Emits 'error' for the first failure only. A dead resource can report the same failure more
+     * than once (the connection error, then the send callback), the pool handles it once
+     * @internal
+     */
+    _fail(err) {
+        if (this._failed) {
+            return;
+        }
+        this._failed = true;
+        this.emit('error', err);
     }
     /**
      * Initiates a connection to the SMTP server
@@ -101,7 +114,7 @@ class PoolResource extends node_events_1.EventEmitter {
                 // nothing was connected, so no 'close' event is coming that would free the
                 // slot this resource holds in the pool, report the failure the way a failed
                 // login does
-                this.emit('error', err);
+                this._fail(err);
                 return callback(err);
             }
             let returned = false;
@@ -118,8 +131,8 @@ class PoolResource extends node_events_1.EventEmitter {
                 options = Object.assign((0, index_js_2.assign)(false, options), socketOptions);
             }
             this.connection = new index_js_1.default(options);
-            this.connection.once('error', err => {
-                this.emit('error', err);
+            this.connection.on('error', err => {
+                this._fail(err);
                 if (returned) {
                     return;
                 }
@@ -128,35 +141,18 @@ class PoolResource extends node_events_1.EventEmitter {
             });
             this.connection.once('end', () => {
                 this.close();
-                if (returned) {
-                    return;
-                }
                 returned = true;
-                const timer = setTimeout(() => {
-                    if (returned) {
-                        return;
-                    }
-                    // still have not returned, this means we have an unexpected connection close
-                    const err = new Error('Unexpected socket close');
-                    if (this.connection &&
-                        this.connection._socket &&
-                        this.connection._socket.upgrading) {
-                        // starttls connection errors
-                        err.code = errors.ETLS;
-                    }
-                    callback(err);
-                }, 1000);
-                try {
-                    timer.unref();
-                }
-                catch (_E) {
-                    // Ignore. Happens on envs with non-node timer implementation
-                }
             });
-            this.connection.connect(() => {
+            this.connection.connect(err => {
                 if (returned) {
                     return;
                 }
+                if (err) {
+                    // a close before the greeting, the 'end' that follows closes this resource
+                    // and the pool requeues or fails the entry, bounded by maxRequeues
+                    returned = true;
+                    return;
+                }
                 if (this.auth && (this.connection.allowsAuth || options.forceAuth)) {
                     this.connection.login(this.auth, err => {
                         if (returned) {
@@ -165,7 +161,7 @@ class PoolResource extends node_events_1.EventEmitter {
                         returned = true;
                         if (err) {
                             this.connection.close();
-                            this.emit('error', err);
+                            this._fail(err);
                             return callback(err);
                         }
                         this._connected = true;
@@ -217,7 +213,7 @@ class PoolResource extends node_events_1.EventEmitter {
             this.messages++;
             if (err) {
                 this.connection.close();
-                this.emit('error', err);
+                this._fail(err);
                 return callback(err);
             }
             info.envelope = {
@@ -230,7 +226,7 @@ class PoolResource extends node_events_1.EventEmitter {
                     const err = new Error('Resource exhausted');
                     err.code = errors.EMAXLIMIT;
                     this.connection.close();
-                    this.emit('error', err);
+                    this._fail(err);
                 }
                 else {
                     this.pool._checkRateLimit(() => {

package/node_modules/nodemailer/dist/cjs/smtp-transport/index.d.ts

@@ -4,7 +4,7 @@ import * as shared from '../shared/index.js';
 import { type XOAuth2Options } from '../xoauth2/index.js';
 import type { ResultCallback } from '../errors.js';
 import type MailMessage from '../mailer/mail-message.js';
-import type { default as Mail, SentMessageInfo, SendMailOptions, TransportOptions, VerifyCallback } from '../mailer/index.js';
+import type { default as Mail, GetSocketCallback, SentMessageInfo, SendMailOptions, TransportOptions, VerifyCallback } from '../mailer/index.js';
 import type { MimeNodeEnvelope } from '../mime-node/index.js';
 /**
  * Authentication settings, either from the transport options or from the message data.
@@ -38,9 +38,10 @@ export interface SMTPTransportAuth extends SMTPConnectionAuth {
 /**
  * Receives the socket details from getSocket, false when a new socket should be opened. The
  * object is merged into the connection options, a proxy handler provides the connected socket
- * as `connection`
+ * as `connection`. The same callback type Mail hands to a transport, so that the SMTP
+ * transports stay assignable to the Transport interface
  */
-export type SMTPTransportGetSocketCallback = (err: Error | null, socketOptions?: SMTPConnectionOptions | false) => void;
+export type SMTPTransportGetSocketCallback = GetSocketCallback;
 /**
  * Custom socket provider, replaces the getSocket method of the transport
  */
@@ -78,6 +79,8 @@ export interface SMTPSentMessageInfo extends SMTPConnectionSendInfo, SentMessage
     accepted: string[];
     /** Recipients the server rejected */
     rejected: string[];
+    /** Final server response for the message */
+    response: string;
 }
 /**
  * Callback for send()
@@ -101,7 +104,7 @@ declare class SMTPTransport extends EventEmitter {
     /**
      * The Mail instance using this transport, assigned by Mail
      */
-    mailer?: Mail<SMTPSentMessageInfo> | undefined;
+    mailer?: Mail<SMTPSentMessageInfo, SMTPTransportOptions> | undefined;
     constructor(options?: SMTPTransportOptions | string);
     /**
      * Placeholder function for creating proxy sockets. This method immediatelly returns
@@ -118,13 +121,18 @@ declare class SMTPTransport extends EventEmitter {
      * @param mail Mail object
      * @param callback Callback function
      */
-    send(mail: MailMessage, callback: SMTPTransportSendCallback): void;
+    send(mail: MailMessage<SMTPSentMessageInfo>, callback: SMTPTransportSendCallback): void;
     /**
      * Verifies SMTP configuration
      *
-     * @param callback Callback function
+     * @returns Promise that resolves to true if the configuration is usable
      */
     verify(): Promise<true>;
+    /**
+     * Verifies SMTP configuration
+     *
+     * @param callback Callback function
+     */
     verify(callback: VerifyCallback): void;
     /**
      * Releases resources
@@ -139,5 +147,10 @@ declare namespace SMTPTransport {
     type MailOptions = SendMailOptions;
     type SentMessageInfo = SMTPSentMessageInfo;
     type AuthenticationType = SMTPTransportAuth;
+    type AuthenticationTypeLogin = SMTPTransportAuth;
+    type AuthenticationTypeOAuth2 = SMTPTransportAuth;
+    type AuthenticationTypeCustom = SMTPTransportAuth;
 }
+/** The same aliases as module level exports, for `import * as SMTPTransport` and `import SMTPTransport = require()` */
+export type { SMTPTransportOptions as Options, SendMailOptions as MailOptions, SMTPSentMessageInfo as SentMessageInfo, SMTPTransportAuth as AuthenticationType, SMTPTransportAuth as AuthenticationTypeLogin, SMTPTransportAuth as AuthenticationTypeOAuth2, SMTPTransportAuth as AuthenticationTypeCustom };
 export default SMTPTransport;

package/node_modules/nodemailer/dist/cjs/smtp-transport/index.js

@@ -177,31 +177,6 @@ class SMTPTransport extends node_events_1.EventEmitter {
                 connection.close();
                 return callback(err);
             });
-            connection.once('end', () => {
-                if (returned) {
-                    return;
-                }
-                const timer = setTimeout(() => {
-                    if (returned) {
-                        return;
-                    }
-                    returned = true;
-                    cleanupPerCallAuth();
-                    // still have not returned, this means we have an unexpected connection close
-                    const err = new Error('Unexpected socket close');
-                    if (connection && connection._socket && connection._socket.upgrading) {
-                        // starttls connection errors
-                        err.code = errors.ETLS;
-                    }
-                    callback(err);
-                }, 1000);
-                try {
-                    timer.unref();
-                }
-                catch (_E) {
-                    // Ignore. Happens on envs with non-node timer implementation
-                }
-            });
             const sendMessage = () => {
                 const envelope = mail.message.getEnvelope();
                 const messageId = mail.message.messageId();
@@ -221,6 +196,10 @@ class SMTPTransport extends node_events_1.EventEmitter {
                     messageId
                 }, 'Sending message %s to <%s>', messageId, recipients.join(', '));
                 connection.send(envelope, mail.message.createReadStream(), (err, info) => {
+                    if (returned) {
+                        // the connection error handler has already reported this send
+                        return;
+                    }
                     returned = true;
                     cleanupPerCallAuth();
                     connection.close();
@@ -247,10 +226,16 @@ class SMTPTransport extends node_events_1.EventEmitter {
                     }
                 });
             };
-            connection.connect(() => {
+            connection.connect(err => {
                 if (returned) {
                     return;
                 }
+                if (err) {
+                    // the server closed the connection before the greeting
+                    returned = true;
+                    connection.close();
+                    return callback(err);
+                }
                 perCallAuth = this.getAuth(mail.data.auth);
                 if (perCallAuth && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(perCallAuth, err => {
@@ -279,9 +264,11 @@ class SMTPTransport extends node_events_1.EventEmitter {
                 callback = shared.callbackPromise(resolve, reject);
             });
         }
+        // the error paths hand over the error alone
+        const done = callback;
         this.getSocket(this.options, (err, socketOptions) => {
             if (err) {
-                return callback(err);
+                return done(err);
             }
             let options = this.options;
             if (socketOptions && socketOptions.connection) {
@@ -311,7 +298,7 @@ class SMTPTransport extends node_events_1.EventEmitter {
                 returned = true;
                 cleanupPerCallAuth();
                 connection.close();
-                return callback(err);
+                return done(err);
             });
             connection.once('end', () => {
                 if (returned) {
@@ -319,7 +306,7 @@ class SMTPTransport extends node_events_1.EventEmitter {
                 }
                 returned = true;
                 cleanupPerCallAuth();
-                return callback(new Error('Connection closed'));
+                return done(new Error('Connection closed'));
             });
             const finalize = () => {
                 if (returned) {
@@ -328,12 +315,17 @@ class SMTPTransport extends node_events_1.EventEmitter {
                 returned = true;
                 cleanupPerCallAuth();
                 connection.quit();
-                return callback(null, true);
+                return done(null, true);
             };
-            connection.connect(() => {
+            connection.connect(err => {
                 if (returned) {
                     return;
                 }
+                if (err) {
+                    returned = true;
+                    connection.close();
+                    return done(err);
+                }
                 perCallAuth = this.getAuth({});
                 if (perCallAuth && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(perCallAuth, err => {
@@ -344,7 +336,7 @@ class SMTPTransport extends node_events_1.EventEmitter {
                         if (err) {
                             returned = true;
                             connection.close();
-                            return callback(err);
+                            return done(err);
                         }
                         finalize();
                     });
@@ -355,7 +347,7 @@ class SMTPTransport extends node_events_1.EventEmitter {
                     returned = true;
                     cleanupPerCallAuth();
                     connection.close();
-                    return callback(err);
+                    return done(err);
                 }
                 else {
                     finalize();

package/node_modules/nodemailer/dist/cjs/stream-transport/index.d.ts

@@ -60,4 +60,6 @@ declare namespace StreamTransport {
     type MailOptions = SendMailOptions;
     type SentMessageInfo = StreamSentMessageInfo;
 }
+/** The same aliases as module level exports, for `import * as StreamTransport` and `import StreamTransport = require()` */
+export type { StreamTransportOptions as Options, SendMailOptions as MailOptions, StreamSentMessageInfo as SentMessageInfo };
 export default StreamTransport;

package/node_modules/nodemailer/dist/cjs/well-known/services.js

@@ -314,6 +314,12 @@ exports.services = {
         "host": "mailosaur.io",
         "port": 25
     },
+    "MailSenpai": {
+        "description": "MailSenpai (SMTP Senpai, EU)",
+        "host": "relay.mailsenpai.com",
+        "port": 2525,
+        "secure": false
+    },
     "Mailtrap": {
         "description": "Mailtrap",
         "host": "live.smtp.mailtrap.io",

package/node_modules/nodemailer/dist/cjs/xoauth2/index.d.ts

@@ -1,6 +1,7 @@
 import { Stream } from 'node:stream';
 import crypto from 'node:crypto';
 import * as shared from '../shared/index.js';
+import type { ResultCallback } from '../errors.js';
 import type { OutgoingHttpHeaders } from 'node:http';
 /**
  * Receives the result of a provisionCallback run: an error, or the new access token and
@@ -13,9 +14,11 @@ export type XOAuth2ProvisionResultCallback = (err: Error | null, accessToken?: s
  */
 export type XOAuth2ProvisionCallback = (user: string, renew: boolean, callback: XOAuth2ProvisionResultCallback) => void;
 /**
- * Receives an access token, or the error that prevented generating one
+ * Receives an access token, or the error that prevented generating one. Declared with a
+ * required token, the way @types/nodemailer declared it, the error path hands over the
+ * error alone
  */
-export type XOAuth2TokenCallback = (err: Error | null, accessToken?: string) => void;
+export type XOAuth2TokenCallback = (err: Error | null, accessToken: string) => void;
 /**
  * A private key accepted by crypto.createSign().sign()
  */
@@ -58,6 +61,8 @@ export interface XOAuth2Options {
     component?: string | undefined;
     /** Extra headers for the token request */
     customHeaders?: OutgoingHttpHeaders | undefined;
+    /** Timeout for the token request in milliseconds, defaults to 60000, 0 disables it */
+    requestTimeout?: number | undefined;
     /** Extra form fields for the token request */
     customParams?: {
         [key: string]: any;
@@ -79,7 +84,7 @@ export interface XOAuth2Token {
  */
 export interface XOAuth2QueuedRequest {
     renew: boolean;
-    callback: XOAuth2TokenCallback;
+    callback: ResultCallback<string>;
 }
 /**
  * XOAUTH2 access_token generator for Gmail.
@@ -181,11 +186,16 @@ declare class XOAuth2 extends Stream {
         [key: string]: any;
     }): string;
 }
+/** The extra request settings of the token request, the customHeaders and customParams options */
+export type XOAuth2RequestParams = Pick<XOAuth2Options, 'customHeaders' | 'customParams'>;
 /**
  * Type aliases in the layout of @types/nodemailer, so `XOAuth2.Options` style references keep working
  */
 declare namespace XOAuth2 {
     type Options = XOAuth2Options;
     type Token = XOAuth2Token;
+    type RequestParams = XOAuth2RequestParams;
 }
+/** The same aliases as module level exports, for `import * as XOAuth2` and `import XOAuth2 = require()` */
+export type { XOAuth2Options as Options, XOAuth2Token as Token, XOAuth2RequestParams as RequestParams };
 export default XOAuth2;