nodemailer 6.9.2 → 6.9.3

package/.ncurc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    upgrade: true,
+    reject: [
+        // API changes break existing tests
+        'proxy'
+    ]
+};

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 6.9.3 2023-05-29
+
+-   Specified license identifier (was defined as MIT, actual value MIT-0)
+-   If SMTP server disconnects with a message, process it and include as part of the response error
+
 ## 6.9.2 2023-05-11
 
 -   Fix uncaught exception on invalid attachment content payload

package/README.md

@@ -90,7 +90,7 @@ If you are having issues with Nodemailer, then the best way to find help would b
 
 ### License
 
-Nodemailer is licensed under the **MIT license**
+Nodemailer is licensed under the **MIT No Attribution license**
 
 ---
 

package/lib/smtp-connection/index.js

@@ -817,6 +817,20 @@ class SMTPConnection extends EventEmitter {
      * @event
      */
     _onClose() {
+        let serverResponse = false;
+
+        if (this._remainder && this._remainder.trim()) {
+            if (this.options.debug || this.options.transactionLog) {
+                this.logger.debug(
+                    {
+                        tnx: 'server'
+                    },
+                    this._remainder.replace(/\r?\n$/, '')
+                );
+            }
+            this.lastServerResponse = serverResponse = this._remainder.trim();
+        }
+
         this.logger.info(
             {
                 tnx: 'network'
@@ -825,9 +839,11 @@ class SMTPConnection extends EventEmitter {
         );
 
         if (this.upgrading && !this._destroyed) {
-            return this._onError(new Error('Connection closed unexpectedly'), 'ETLS', false, 'CONN');
+            return this._onError(new Error('Connection closed unexpectedly'), 'ETLS', serverResponse, 'CONN');
         } else if (![this._actionGreeting, this.close].includes(this._responseActions[0]) && !this._destroyed) {
-            return this._onError(new Error('Connection closed unexpectedly'), 'ECONNECTION', false, 'CONN');
+            return this._onError(new Error('Connection closed unexpectedly'), 'ECONNECTION', serverResponse, 'CONN');
+        } else if (/^[45]\d{2}\b/.test(serverResponse)) {
+            return this._onError(new Error('Connection closed unexpectedly'), 'ECONNECTION', serverResponse, 'CONN');
         }
 
         this._destroy();
@@ -944,14 +960,14 @@ class SMTPConnection extends EventEmitter {
 
         if (!str.trim()) {
             // skip unexpected empty lines
-            setImmediate(() => this._processResponse(true));
+            setImmediate(() => this._processResponse());
         }
 
         let action = this._responseActions.shift();
 
         if (typeof action === 'function') {
             action.call(this, str);
-            setImmediate(() => this._processResponse(true));
+            setImmediate(() => this._processResponse());
         } else {
             return this._onError(new Error('Unexpected Response'), 'EPROTOCOL', str, 'CONN');
         }

package/lib/well-known/services.json

@@ -42,6 +42,14 @@
         "secure": true
     },
 
+    "Forward Email": {
+        "aliases": ["FE", "ForwardEmail"],
+        "domains": ["forwardemail.net"],
+        "host": "smtp.forwardemail.net",
+        "port": 465,
+        "secure": true
+    },
+
     "GandiMail": {
         "aliases": ["Gandi", "Gandi Mail"],
         "host": "mail.gandi.net",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.9.2",
+    "version": "6.9.3",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -14,14 +14,14 @@
         "Nodemailer"
     ],
     "author": "Andris Reinman",
-    "license": "MIT",
+    "license": "MIT-0",
     "bugs": {
         "url": "https://github.com/nodemailer/nodemailer/issues"
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.329.0",
-        "aws-sdk": "2.1376.0",
+        "@aws-sdk/client-ses": "3.341.0",
+        "aws-sdk": "2.1386.0",
         "bunyan": "1.8.15",
         "chai": "4.3.7",
         "eslint-config-nodemailer": "1.2.0",
@@ -37,8 +37,8 @@
         "nodemailer-ntlm-auth": "1.0.3",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "sinon": "15.0.4",
-        "smtp-server": "3.11.0"
+        "sinon": "15.1.0",
+        "smtp-server": "3.12.0"
     },
     "engines": {
         "node": ">=6.0.0"