nodemailer 6.8.0 → 6.9.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 6.9.1 2023-01-27
+
+-   Fix base64 encoding for emoji bytes in encoded words
+
+## 6.9.0 2023-01-12
+
+-   Do not throw if failed to resolve IPv4 addresses
+-   Include EHLO extensions in the send response
+-   fix sendMail function: callback should be optional
+
 ## 6.8.0 2022-09-28
 
 -   Add DNS timeout (huksley)

package/README.md

@@ -20,6 +20,10 @@ This project is supported by [Forward Email](https://forwardemail.net) – the 1
 
 ---
 
+This project is supported by [Opensense](https://www.opensense.com) - The beautiful email signature management company for Office 365 and Google Workspace.
+
+---
+
 ## Having an issue?
 
 #### First review the docs

package/lib/fetch/index.js

@@ -7,6 +7,7 @@ const zlib = require('zlib');
 const PassThrough = require('stream').PassThrough;
 const Cookies = require('./cookies');
 const packageData = require('../../package.json');
+const net = require('net');
 
 const MAX_REDIRECTS = 5;
 
@@ -131,6 +132,10 @@ function nmfetch(url, options) {
         });
     }
 
+    if (parsed.protocol === 'https:' && parsed.hostname && parsed.hostname !== reqOptions.host && !net.isIP(parsed.hostname) && !reqOptions.servername) {
+        reqOptions.servername = parsed.hostname;
+    }
+
     try {
         req = handler.request(reqOptions);
     } catch (E) {

package/lib/mailer/index.js

@@ -137,7 +137,7 @@ class Mail extends EventEmitter {
      * @param {Object} data E-data description
      * @param {Function?} callback Callback to run once the sending succeeded or failed
      */
-    sendMail(data, callback) {
+    sendMail(data, callback = null) {
         let promise;
 
         if (!callback) {

package/lib/mime-funcs/index.js

@@ -84,6 +84,12 @@ module.exports = {
                 let lpart = '';
                 for (let i = 0, len = encodedStr.length; i < len; i++) {
                     let chr = encodedStr.charAt(i);
+
+                    if (/[\ud83c\ud83d\ud83e]/.test(chr) && i < len - 1) {
+                        // composite emoji byte, so add the next byte as well
+                        chr += encodedStr.charAt(++i);
+                    }
+
                     // check if we can add this character to the existing string
                     // without breaking byte length limit
                     if (Buffer.byteLength(lpart + chr) <= maxLength || i === 0) {

package/lib/shared/index.js

@@ -216,8 +216,7 @@ module.exports.resolveHostname = (options, callback) => {
 
                     if (addresses && addresses.length && !address) {
                         // there are addresses but none can be used
-                        let err = new Error(`Can not use IPv${addresses[0].family} addresses with current network`);
-                        return callback(err);
+                        console.warn(`Failed to resolve IPv${addresses[0].family} addresses with current network`);
                     }
 
                     if (!address && cached) {

package/lib/smtp-connection/index.js

@@ -14,7 +14,7 @@ const shared = require('../shared');
 const CONNECTION_TIMEOUT = 2 * 60 * 1000; // how much to wait for the connection to be established
 const SOCKET_TIMEOUT = 10 * 60 * 1000; // how much to wait for socket inactivity before disconnecting the client
 const GREETING_TIMEOUT = 30 * 1000; // how much to wait after connection is established but SMTP greeting is not receieved
-const DNS_TIMEOUT = 30 * 1000; // how much to wait for resolveHostname 
+const DNS_TIMEOUT = 30 * 1000; // how much to wait for resolveHostname
 
 /**
  * Generates a SMTP connection object
@@ -1264,6 +1264,12 @@ class SMTPConnection extends EventEmitter {
             return;
         }
 
+        this._ehloLines = str
+            .split(/\r?\n/)
+            .map(line => line.replace(/^\d+[ -]/, '').trim())
+            .filter(line => line)
+            .slice(1);
+
         // Detect if the server supports STARTTLS
         if (!this.secure && !this.options.ignoreTLS && (/[ -]STARTTLS\b/im.test(str) || this.options.requireTLS)) {
             this._sendCommand('STARTTLS');
@@ -1661,6 +1667,10 @@ class SMTPConnection extends EventEmitter {
             rejected: this._envelope.rejected
         };
 
+        if (this._ehloLines && this._ehloLines.length) {
+            response.ehlo = this._ehloLines;
+        }
+
         if (this._envelope.rejectedErrors.length) {
             response.rejectedErrors = this._envelope.rejectedErrors;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.8.0",
+    "version": "6.9.1",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -20,24 +20,24 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.180.0",
-        "aws-sdk": "2.1225.0",
+        "@aws-sdk/client-ses": "3.259.0",
+        "aws-sdk": "2.1303.0",
         "bunyan": "1.8.15",
-        "chai": "4.3.6",
+        "chai": "4.3.7",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.5.0",
+        "eslint-config-prettier": "8.6.0",
         "grunt": "1.5.3",
         "grunt-cli": "1.4.3",
-        "grunt-eslint": "24.0.0",
+        "grunt-eslint": "24.0.1",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.2.1",
-        "libmime": "5.1.0",
-        "libqp": "1.1.0",
-        "mocha": "10.0.0",
+        "libmime": "5.2.0",
+        "libqp": "2.0.1",
+        "mocha": "10.2.0",
         "nodemailer-ntlm-auth": "1.0.3",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "sinon": "14.0.0",
+        "sinon": "15.0.1",
         "smtp-server": "3.11.0"
     },
     "engines": {