@mavogel/awscdk-rootmail 0.1.7 → 0.1.9

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

@@ -28,7 +28,7 @@ export default class PoolResource extends 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:
@@ -51,6 +51,19 @@ export default class PoolResource extends 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
@@ -63,7 +76,7 @@ export default class PoolResource extends 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;
@@ -80,8 +93,8 @@ export default class PoolResource extends EventEmitter {
                 options = Object.assign(assign(false, options), socketOptions);
             }
             this.connection = new SMTPConnection(options);
-            this.connection.once('error', err => {
-                this.emit('error', err);
+            this.connection.on('error', err => {
+                this._fail(err);
                 if (returned) {
                     return;
                 }
@@ -90,35 +103,18 @@ export default class PoolResource extends 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) {
@@ -127,7 +123,7 @@ export default class PoolResource extends EventEmitter {
                         returned = true;
                         if (err) {
                             this.connection.close();
-                            this.emit('error', err);
+                            this._fail(err);
                             return callback(err);
                         }
                         this._connected = true;
@@ -179,7 +175,7 @@ export default class PoolResource extends EventEmitter {
             this.messages++;
             if (err) {
                 this.connection.close();
-                this.emit('error', err);
+                this._fail(err);
                 return callback(err);
             }
             info.envelope = {
@@ -192,7 +188,7 @@ export default class PoolResource extends 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/esm/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/esm/smtp-transport/index.js

@@ -139,31 +139,6 @@ class SMTPTransport extends 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();
@@ -183,6 +158,10 @@ class SMTPTransport extends 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();
@@ -209,10 +188,16 @@ class SMTPTransport extends 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 => {
@@ -241,9 +226,11 @@ class SMTPTransport extends 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) {
@@ -273,7 +260,7 @@ class SMTPTransport extends EventEmitter {
                 returned = true;
                 cleanupPerCallAuth();
                 connection.close();
-                return callback(err);
+                return done(err);
             });
             connection.once('end', () => {
                 if (returned) {
@@ -281,7 +268,7 @@ class SMTPTransport extends EventEmitter {
                 }
                 returned = true;
                 cleanupPerCallAuth();
-                return callback(new Error('Connection closed'));
+                return done(new Error('Connection closed'));
             });
             const finalize = () => {
                 if (returned) {
@@ -290,12 +277,17 @@ class SMTPTransport extends 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 => {
@@ -306,7 +298,7 @@ class SMTPTransport extends EventEmitter {
                         if (err) {
                             returned = true;
                             connection.close();
-                            return callback(err);
+                            return done(err);
                         }
                         finalize();
                     });
@@ -317,7 +309,7 @@ class SMTPTransport extends EventEmitter {
                     returned = true;
                     cleanupPerCallAuth();
                     connection.close();
-                    return callback(err);
+                    return done(err);
                 }
                 else {
                     finalize();

package/node_modules/nodemailer/dist/esm/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/esm/well-known/services.js

@@ -311,6 +311,12 @@ export const 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/esm/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;

package/node_modules/nodemailer/dist/esm/xoauth2/index.js

@@ -36,12 +36,14 @@ class XOAuth2 extends Stream {
     constructor(options, logger) {
         super();
         this.options = options || {};
+        this.configError = false;
         if (options && options.serviceClient) {
             if (!options.privateKey || !options.user) {
+                // reported through getToken() rather than an 'error' event: the transports forward
+                // that event up to the Mail object, where nothing may be listening
                 const err = new Error('Options "privateKey" and "user" are required for service account!');
                 err.code = errors.EOAUTH2;
-                setImmediate(() => this.emit('error', err));
-                return;
+                this.configError = err;
             }
             const serviceRequestTimeout = Math.min(Math.max(Number(this.options.serviceRequestTimeout) || 0, 0), 3600);
             this.options.serviceRequestTimeout = serviceRequestTimeout || 5 * 60;
@@ -73,6 +75,11 @@ class XOAuth2 extends Stream {
      * @param callback Callback function with error object and token string
      */
     getToken(renew, callback) {
+        // the error paths hand over the error alone
+        const done = callback;
+        if (this.configError) {
+            return done(this.configError);
+        }
         if (!renew && this.accessToken && (!this.expires || this.expires > Date.now())) {
             this.logger.debug({
                 tnx: 'OAUTH2',
@@ -98,11 +105,11 @@ class XOAuth2 extends Stream {
             }, 'Cannot renew access token for %s: No refresh mechanism available', this.options.user);
             const err = new Error("Can't create new access token for user");
             err.code = errors.EOAUTH2;
-            return callback(err);
+            return done(err);
         }
         // If renewal already in progress, queue this request instead of starting another
         if (this.renewing) {
-            this.renewalQueue.push({ renew, callback });
+            this.renewalQueue.push({ renew, callback: done });
             return;
         }
         this.renewing = true;
@@ -127,7 +134,7 @@ class XOAuth2 extends Stream {
                 }, 'Generated new Access Token for %s', this.options.user);
             }
             // Complete original request
-            callback(err, accessToken);
+            done(err, accessToken);
         };
         if (this.provisionCallback) {
             this.provisionCallback(this.options.user, !!renew, (err, accessToken, expires) => {
@@ -166,6 +173,8 @@ class XOAuth2 extends Stream {
      * @param callback Callback function with error object and token string
      */
     generateToken(callback) {
+        // the error paths hand over the error alone
+        const done = callback;
         let urlOptions;
         let loggedUrlOptions;
         if (this.options.serviceClient) {
@@ -186,7 +195,7 @@ class XOAuth2 extends Stream {
             catch (_err) {
                 const err = new Error("Can't generate token. Check your auth options");
                 err.code = errors.EOAUTH2;
-                return callback(err);
+                return done(err);
             }
             urlOptions = {
                 grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
@@ -201,7 +210,7 @@ class XOAuth2 extends Stream {
             if (!this.options.refreshToken) {
                 const err = new Error("Can't create new access token for user");
                 err.code = errors.EOAUTH2;
-                return callback(err);
+                return done(err);
             }
             // web app - https://developers.google.com/identity/protocols/OAuth2WebServer
             urlOptions = {
@@ -227,13 +236,13 @@ class XOAuth2 extends Stream {
         this.postRequest(this.options.accessUrl, urlOptions, this.options, (error, body) => {
             let data;
             if (error) {
-                return callback(error);
+                return done(error);
             }
             try {
                 data = JSON.parse(body.toString());
             }
             catch (E) {
-                return callback(E);
+                return done(E);
             }
             if (!data || typeof data !== 'object') {
                 this.logger.debug({
@@ -243,7 +252,7 @@ class XOAuth2 extends Stream {
                 }, 'Response: %s', (body || '').toString());
                 const err = new Error('Invalid authentication response');
                 err.code = errors.EOAUTH2;
-                return callback(err);
+                return done(err);
             }
             const logData = Object.assign({}, data);
             if (logData.access_token) {
@@ -265,7 +274,7 @@ class XOAuth2 extends Stream {
                 }
                 const err = new Error(errorMessage);
                 err.code = errors.EOAUTH2;
-                return callback(err);
+                return done(err);
             }
             if (data.access_token) {
                 this.updateToken(data.access_token, data.expires_in);
@@ -273,7 +282,7 @@ class XOAuth2 extends Stream {
             }
             const err = new Error('No access token');
             err.code = errors.EOAUTH2;
-            return callback(err);
+            return done(err);
         });
     }
     /**
@@ -307,7 +316,10 @@ class XOAuth2 extends Stream {
             method: 'post',
             headers: params.customHeaders,
             body: payload,
-            allowErrorResponse: true
+            allowErrorResponse: true,
+            // unset falls back to the fetch default, a stalled token endpoint would otherwise keep
+            // `renewing` set and queue every later request
+            timeout: params.requestTimeout
         };
         // OAuth2 token endpoints are credential-bearing. src/fetch already
         // validates certs by default; pin rejectUnauthorized:true here so the

package/node_modules/nodemailer/dist/well-known/services.json

@@ -279,6 +279,13 @@
         "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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "10.0.10",
+    "version": "10.0.14",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "type": "module",
     "main": "./dist/cjs/nodemailer.js",
@@ -9,6 +9,9 @@
             "lib/well-known/services.json": [
                 "dist/well-known/services.json"
             ],
+            "lib/well-known/services": [
+                "dist/well-known/services.json"
+            ],
             "lib/*": [
                 "dist/cjs/*/index.d.ts",
                 "dist/cjs/*.d.ts"
@@ -97,6 +100,7 @@
             "require": "./dist/cjs/well-known/index.js"
         },
         "./lib/well-known/services.json": "./dist/well-known/services.json",
+        "./lib/well-known/services": "./dist/well-known/services.json",
         "./lib/xoauth2": {
             "import": "./dist/esm/xoauth2/index.js",
             "require": "./dist/cjs/xoauth2/index.js"
@@ -147,24 +151,24 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-sesv2": "3.1131.0",
+        "@aws-sdk/client-sesv2": "3.1146.0",
         "@types/node": "20.19.43",
         "bunyan": "1.8.15",
         "c8": "12.0.0",
-        "eslint": "10.10.0",
+        "eslint": "10.12.0",
         "eslint-config-prettier": "10.1.8",
-        "globals": "17.12.0",
-        "libbase64": "1.3.0",
-        "libmime": "5.4.3",
-        "libqp": "2.1.1",
-        "mailauth": "5.0.3",
-        "prettier": "3.9.6",
+        "globals": "17.13.0",
+        "libbase64": "1.3.1",
+        "libmime": "5.4.6",
+        "libqp": "2.1.2",
+        "mailauth": "7.1.0",
+        "prettier": "3.9.9",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "smtp-server": "3.19.11",
-        "tsx": "4.23.13",
+        "smtp-server": "3.19.16",
+        "tsx": "4.23.15",
         "typescript": "6.0.3",
-        "typescript-eslint": "8.70.0"
+        "typescript-eslint": "8.71.0"
     },
     "engines": {
         "node": ">=20.0.0"