@mavogel/awscdk-rootmail 0.1.14 → 0.1.16

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

@@ -19,6 +19,8 @@ export interface SMTPPoolOptions extends SMTPTransportOptions {
     rateDelta?: number | undefined;
     /** How many times a message is requeued when its connection closes while sending, defaults to 5, a negative value means unlimited */
     maxRequeues?: number | undefined;
+    /** Time in milliseconds a connection may stay idle before it is closed, defaults to 4 minutes, 0 keeps it open until the server closes it */
+    idleTimeout?: number | undefined;
 }
 /**
  * The pool options once the constructor has applied the defaults
@@ -27,6 +29,7 @@ export type SMTPPoolResolvedOptions = SMTPPoolOptions & {
     maxConnections: number;
     maxMessages: number;
     maxRequeues: number;
+    idleTimeout: number;
 };
 /**
  * Result of a message sent through the pool, same as for the SMTP transport

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

@@ -42,6 +42,9 @@ class SMTPPool extends EventEmitter {
         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;
+        // below the 5 minutes RFC 5321 asks servers to wait at least, the connection is closed by us
+        // and not by the server in the middle of handing it a message
+        this.options.idleTimeout = typeof this.options.idleTimeout === 'number' ? this.options.idleTimeout : 4 * 60 * 1000;
         this.logger = shared.getLogger(this.options, {
             component: this.options.component || 'smtp-pool'
         });
@@ -448,7 +451,9 @@ class SMTPPool extends EventEmitter {
         // the error paths hand over the error alone
         const done = callback;
         const auth = new PoolResource(this).auth;
-        this.getSocket(this.options, (err, socketOptions) => {
+        // the proxy handshake, if any, counts against connectionTimeout as well
+        const connectStartedAt = Date.now();
+        this.getSocket(Object.assign({}, this.options, { connectStartedAt }), (err, socketOptions) => {
             if (err) {
                 return done(err);
             }
@@ -465,6 +470,7 @@ class SMTPPool extends EventEmitter {
                 options = Object.assign(shared.assign(false, options), socketOptions);
             }
             const connection = new SMTPConnection(options);
+            connection._connectStartedAt = connectStartedAt;
             let returned = false;
             connection.once('error', err => {
                 if (returned) {

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

@@ -52,6 +52,8 @@ export default class PoolResource extends EventEmitter {
         this.messages = 0;
         this.available = true;
         this._failed = false;
+        this._sending = false;
+        this._idleTimer = false;
     }
     /**
      * Emits 'error' for the first failure only. A dead resource can report the same failure more
@@ -71,7 +73,9 @@ export default class PoolResource extends EventEmitter {
      * @param callback Callback function to run once the connection is established or failed
      */
     connect(callback) {
-        this.pool.getSocket(this.options, (err, socketOptions) => {
+        // the proxy handshake, if any, counts against connectionTimeout as well
+        const connectStartedAt = Date.now();
+        this.pool.getSocket(Object.assign({}, this.options, { connectStartedAt }), (err, socketOptions) => {
             if (err) {
                 // 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
@@ -93,7 +97,21 @@ export default class PoolResource extends EventEmitter {
                 options = Object.assign(assign(false, options), socketOptions);
             }
             this.connection = new SMTPConnection(options);
-            this.connection.on('error', err => {
+            this.connection._connectStartedAt = connectStartedAt;
+            this.connection.on('error', (err) => {
+                if (this._sending) {
+                    // the send callback gets the same error and decides what it means for the message
+                    return;
+                }
+                if (this._connected && errors.isTransientError(err)) {
+                    // the server ended a connection that had nothing in flight, usually after it
+                    // was idle for a while. The 'end' that follows closes this resource
+                    this.logger.info({
+                        tnx: 'pool',
+                        cid: this.id
+                    }, 'Connection #%s was closed by the server: %s', this.id, err.message);
+                    return;
+                }
                 this._fail(err);
                 if (returned) {
                     return;
@@ -171,9 +189,39 @@ export default class PoolResource extends EventEmitter {
         if (mail.data.requireTLSExtensionEnabled) {
             envelope.requireTLSExtensionEnabled = mail.data.requireTLSExtensionEnabled;
         }
-        this.connection.send(envelope, mail.message.createReadStream(), (err, info) => {
+        this._sending = true;
+        // a connection that sent messages before may have been dropped by the server in between
+        const reused = this.messages > 0;
+        const messageStream = mail.message.createReadStream();
+        this.connection.send(envelope, messageStream, (err, info) => {
+            this._sending = false;
             this.messages++;
             if (err) {
+                if (reused && messageStream.readableDidRead === false && errors.isTransientError(err)) {
+                    // Not a byte of the message was sent, so it can go out over another
+                    // connection. The pool requeues the message when this resource closes
+                    this.logger.info({
+                        tnx: 'pool',
+                        cid: this.id,
+                        messageId
+                    }, 'Connection #%s was closed by the server before message %s was sent: %s', this.id, messageId, err.message);
+                    this.connection.close();
+                    return;
+                }
+                if ((err.code === errors.EENVELOPE || err.code === errors.EMESSAGE) &&
+                    err.responseCode !== 421 &&
+                    !this.connection._destroyed) {
+                    // The server refused this message, the connection itself is fine. Reset the
+                    // session and keep using it instead of opening a new one
+                    this.connection.reset(resetErr => {
+                        if (resetErr) {
+                            this.connection.close();
+                            return;
+                        }
+                        this._release();
+                    });
+                    return callback(err);
+                }
                 this.connection.close();
                 this._fail(err);
                 return callback(err);
@@ -183,28 +231,69 @@ export default class PoolResource extends EventEmitter {
                 to: envelope.to
             };
             info.messageId = messageId;
-            setImmediate(() => {
-                if (this.messages >= this.options.maxMessages) {
-                    const err = new Error('Resource exhausted');
-                    err.code = errors.EMAXLIMIT;
-                    this.connection.close();
-                    this._fail(err);
-                }
-                else {
-                    this.pool._checkRateLimit(() => {
-                        this.available = true;
-                        this.emit('available');
-                    });
-                }
-            });
+            setImmediate(() => this._release());
             callback(null, info);
         });
     }
+    /**
+     * Makes the connection available for the next message, or closes it once it has sent
+     * maxMessages messages
+     *
+     * @internal
+     */
+    _release() {
+        if (this.messages >= this.options.maxMessages) {
+            const err = new Error('Resource exhausted');
+            err.code = errors.EMAXLIMIT;
+            this.connection.close();
+            this._fail(err);
+            return;
+        }
+        this.pool._checkRateLimit(() => {
+            this.available = true;
+            this._startIdleTimer();
+            this.emit('available');
+        });
+    }
+    /** @internal */
+    _startIdleTimer() {
+        if (!this.options.idleTimeout || this.options.idleTimeout < 0) {
+            return;
+        }
+        // one timer per connection, restarted every time the connection becomes available. A
+        // connection that is busy when it fires is simply not closed
+        if (this._idleTimer && typeof this._idleTimer.refresh === 'function') {
+            this._idleTimer.refresh();
+            return;
+        }
+        clearTimeout(this._idleTimer);
+        this._idleTimer = setTimeout(() => {
+            if (!this.available) {
+                return;
+            }
+            this.logger.debug({
+                tnx: 'pool',
+                cid: this.id
+            }, 'Closing connection #%s after it was idle for %sms', this.id, this.options.idleTimeout);
+            // not handed another message while it says goodbye
+            this.available = false;
+            this.connection.quit();
+        }, this.options.idleTimeout);
+        if (typeof this._idleTimer.unref === 'function') {
+            this._idleTimer.unref();
+        }
+    }
+    /** @internal */
+    _stopIdleTimer() {
+        clearTimeout(this._idleTimer);
+        this._idleTimer = false;
+    }
     /**
      * Closes the connection
      */
     close() {
         this._connected = false;
+        this._stopIdleTimer();
         if (this.auth && this.auth.oauth2) {
             this.auth.oauth2.removeAllListeners();
         }

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

@@ -104,7 +104,9 @@ class SMTPTransport extends EventEmitter {
      * @param callback Callback function
      */
     send(mail, callback) {
-        this.getSocket(this.options, (err, socketOptions) => {
+        // the proxy handshake, if any, counts against connectionTimeout as well
+        const connectStartedAt = Date.now();
+        this.getSocket(Object.assign({}, this.options, { connectStartedAt }), (err, socketOptions) => {
             if (err) {
                 return callback(err);
             }
@@ -123,6 +125,7 @@ class SMTPTransport extends EventEmitter {
                 options = Object.assign(shared.assign(false, options), socketOptions);
             }
             const connection = new SMTPConnection(options);
+            connection._connectStartedAt = connectStartedAt;
             let perCallAuth;
             const cleanupPerCallAuth = () => {
                 if (perCallAuth && perCallAuth !== this.auth && perCallAuth.oauth2) {
@@ -228,7 +231,9 @@ class SMTPTransport extends EventEmitter {
         }
         // the error paths hand over the error alone
         const done = callback;
-        this.getSocket(this.options, (err, socketOptions) => {
+        // the proxy handshake, if any, counts against connectionTimeout as well
+        const connectStartedAt = Date.now();
+        this.getSocket(Object.assign({}, this.options, { connectStartedAt }), (err, socketOptions) => {
             if (err) {
                 return done(err);
             }
@@ -245,6 +250,7 @@ class SMTPTransport extends EventEmitter {
                 options = Object.assign(shared.assign(false, options), socketOptions);
             }
             const connection = new SMTPConnection(options);
+            connection._connectStartedAt = connectStartedAt;
             let returned = false;
             let perCallAuth;
             const cleanupPerCallAuth = () => {

package/node_modules/nodemailer/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "10.0.16",
+    "version": "10.1.0",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "type": "module",
     "main": "./dist/cjs/nodemailer.js",

package/node_modules/uuid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uuid",
-  "version": "14.0.2",
+  "version": "14.0.3",
   "description": "RFC9562 UUIDs",
   "type": "module",
   "funding": [
@@ -40,20 +40,20 @@
     "!**/test"
   ],
   "devDependencies": {
-    "@biomejs/biome": "2.4.10",
-    "@commitlint/cli": "20.5.0",
-    "@commitlint/config-conventional": "20.5.0",
-    "bundlewatch": "0.4.1",
-    "commander": "14.0.3",
-    "globals": "17.4.0",
-    "jest": "30.3.0",
-    "lefthook": "1.11.13",
-    "lint-staged": "16.4.0",
+    "@biomejs/biome": "2.5.13",
+    "@commitlint/cli": "21.2.2",
+    "@commitlint/config-conventional": "21.2.2",
+    "bundlewatch": "0.4.2",
+    "commander": "15.0.0",
+    "globals": "17.12.0",
+    "jest": "30.5.1",
+    "lefthook": "2.1.12",
+    "lint-staged": "17.5.1",
     "neostandard": "0.13.0",
-    "npm-run-all2": "8.0.4",
-    "prettier": "3.8.3",
-    "publint": "0.3.21",
-    "release-please": "17.3.0",
+    "npm-run-all2": "9.0.3",
+    "prettier": "3.9.6",
+    "publint": "0.3.24",
+    "release-please": "17.11.2",
     "runmd": "2.1.1",
     "standard-version": "9.5.0",
     "typescript": "5.4.3"
@@ -84,12 +84,12 @@
     "lint": "npm run biome:check",
     "md": "runmd --watch --output=README.md README_js.md",
     "prepack": "npm run build -- --no-pack",
-    "prepare": "lefthook install",
+    "prepare": "if [ -d .git ]; then npx lefthook install; fi",
     "prepublishOnly": "npm run build",
     "pretest:benchmark": "npm run build",
     "pretest:browser": "./scripts/iodd && npm run build && npm-run-all --parallel examples:browser:**",
     "pretest:node": "npm run build",
-    "pretest": "npm run build",
+    "pretest": "if [ -d .git ]; then npm run build; fi",
     "release": "standard-version --no-verify",
     "test:benchmark": "cd examples/benchmark && npm test",
     "test:browser": "wdio run ./wdio.conf.js",
@@ -111,5 +111,5 @@
       "postchangelog": "biome format --write CHANGELOG.md"
     }
   },
-  "packageManager": "npm@11.12.1"
+  "packageManager": "npm@12.0.2"
 }

package/package.json

@@ -78,16 +78,16 @@
     "constructs": "^10.5.1"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.1148.0",
-    "@aws-sdk/client-route-53": "^3.1148.0",
-    "@aws-sdk/client-s3": "^3.1148.0",
-    "@aws-sdk/client-ses": "^3.1148.0",
-    "@aws-sdk/client-ssm": "^3.1148.0",
-    "@mavogel/mvc-projen": "^0.0.53",
+    "@aws-sdk/client-cloudwatch-logs": "^3.1149.0",
+    "@aws-sdk/client-route-53": "^3.1149.0",
+    "@aws-sdk/client-s3": "^3.1149.0",
+    "@aws-sdk/client-ses": "^3.1149.0",
+    "@aws-sdk/client-ssm": "^3.1149.0",
+    "@mavogel/mvc-projen": "^0.0.54",
     "cdk-nag": "^3.0.1",
     "constructs": "^10.5.1",
-    "mailparser": "^3.9.37",
-    "uuid": "^14.0.2"
+    "mailparser": "^3.9.38",
+    "uuid": "^14.0.3"
   },
   "bundledDependencies": [
     "@aws-sdk/client-cloudwatch-logs",
@@ -121,7 +121,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.14",
+  "version": "0.1.16",
   "jest": {
     "coverageProvider": "v8",
     "transformIgnorePatterns": [