nodemailer 5.1.1 → 6.2.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 6.2.0 2019-05-24
+
+-   Added new option for addressparser: `flatten`. If true then ignores group names and returns a single list of all addresses
+
+## 6.1.1 2019-04-20
+
+-   Fixed regression bug with missing smtp `authMethod` property
+
+## 6.1.0 2019-04-06
+
+-   Added new message property `amp` for providing AMP4EMAIL content
+
+## 6.0.0 2019-03-25
+
+-   SMTPConnection: use removeListener instead of removeAllListeners (xr0master) [ddc4af15]
+    Using removeListener should fix memory leak with Node.js streams
+
 ## 5.1.1 2019-01-09
 
 -   Added missing option argument for custom auth

package/lib/addressparser/index.js

@@ -255,7 +255,9 @@ class Tokenizer {
  * @param {String} str Address field
  * @return {Array} An array of address objects
  */
-function addressparser(str) {
+function addressparser(str, options) {
+    options = options || {};
+
     let tokenizer = new Tokenizer(str);
     let tokens = tokenizer.tokenize();
 
@@ -285,6 +287,21 @@ function addressparser(str) {
         }
     });
 
+    if (options.flatten) {
+        let addresses = [];
+        let walkAddressList = list => {
+            list.forEach(address => {
+                if (address.group) {
+                    return walkAddressList(address.group);
+                } else {
+                    addresses.push(address);
+                }
+            });
+        };
+        walkAddressList(parsedAddresses);
+        return addresses;
+    }
+
     return parsedAddresses;
 }
 

package/lib/mail-composer/index.js

@@ -194,6 +194,7 @@ class MailComposer {
             text,
             html,
             watchHtml,
+            amp,
             icalEvent,
             eventObject;
 
@@ -222,6 +223,17 @@ class MailComposer {
             watchHtml.contentType = 'text/watch-html' + (!watchHtml.encoding && mimeFuncs.isPlainText(watchHtml.content) ? '' : '; charset=utf-8');
         }
 
+        if (this.mail.amp) {
+            if (typeof this.mail.amp === 'object' && (this.mail.amp.content || this.mail.amp.path || this.mail.amp.href || this.mail.amp.raw)) {
+                amp = this.mail.amp;
+            } else {
+                amp = {
+                    content: this.mail.amp
+                };
+            }
+            amp.contentType = 'text/x-amp-html' + (!amp.encoding && mimeFuncs.isPlainText(amp.content) ? '' : '; charset=utf-8');
+        }
+
         // only include the calendar alternative if there are no attachments
         // otherwise you might end up in a blank screen on some clients
         if (this.mail.icalEvent && !(this.mail.attachments && this.mail.attachments.length)) {
@@ -273,6 +285,7 @@ class MailComposer {
         []
             .concat(text || [])
             .concat(watchHtml || [])
+            .concat(amp || [])
             .concat(html || [])
             .concat(eventObject || [])
             .concat(this.mail.alternatives || [])

package/lib/mailer/index.js

@@ -57,7 +57,7 @@ class Mail extends EventEmitter {
         );
 
         // setup emit handlers for the transporter
-        if (typeof transporter.on === 'function') {
+        if (typeof this.transporter.on === 'function') {
             // deprecated log interface
             this.transporter.on('log', log => {
                 this.logger.debug(

package/lib/mailer/mail-message.js

@@ -47,7 +47,7 @@ class MailMessage {
     }
 
     resolveAll(callback) {
-        let keys = [[this.data, 'html'], [this.data, 'text'], [this.data, 'watchHtml'], [this.data, 'icalEvent']];
+        let keys = [[this.data, 'html'], [this.data, 'text'], [this.data, 'watchHtml'], [this.data, 'amp'], [this.data, 'icalEvent']];
 
         if (this.data.alternatives && this.data.alternatives.length) {
             this.data.alternatives.forEach((alternative, i) => {
@@ -147,7 +147,7 @@ class MailMessage {
             data.envelope = envelope;
             data.messageId = messageId;
 
-            ['html', 'text', 'watchHtml'].forEach(key => {
+            ['html', 'text', 'watchHtml', 'amp'].forEach(key => {
                 if (data[key] && data[key].content) {
                     if (typeof data[key].content === 'string') {
                         data[key] = data[key].content;

package/lib/smtp-connection/index.js

@@ -182,6 +182,15 @@ class SMTPConnection extends EventEmitter {
          * @private
          */
         this._closing = false;
+
+        /**
+         * Callbacks for socket's listeners
+         */
+        this._onSocketData = (chunk) => this._onData(chunk);
+        this._onSocketError = (error) => this._onError(error, 'ESOCKET', false, 'CONN');
+        this._onSocketClose = () => this._onClose();
+        this._onSocketEnd = () => this._onEnd();
+        this._onSocketTimeout = () => this._onTimeout();
     }
 
     /**
@@ -220,9 +229,7 @@ class SMTPConnection extends EventEmitter {
                 this._onError('Connection timeout', 'ETIMEDOUT', false, 'CONN');
             }, this.options.connectionTimeout || CONNECTION_TIMEOUT);
 
-            this._socket.on('error', err => {
-                this._onError(err, 'ECONNECTION', false, 'CONN');
-            });
+            this._socket.on('error', this._onSocketError);
         };
 
         if (this.options.connection) {
@@ -683,17 +690,17 @@ class SMTPConnection extends EventEmitter {
         this.stage = 'connected';
 
         // clear existing listeners for the socket
-        this._socket.removeAllListeners('data');
-        this._socket.removeAllListeners('timeout');
-        this._socket.removeAllListeners('close');
-        this._socket.removeAllListeners('end');
+        this._socket.removeListener('data', this._onSocketData);
+        this._socket.removeListener('timeout', this._onSocketTimeout);
+        this._socket.removeListener('close', this._onSocketClose);
+        this._socket.removeListener('end', this._onSocketEnd);
 
-        this._socket.on('data', chunk => this._onData(chunk));
-        this._socket.once('close', errored => this._onClose(errored));
-        this._socket.once('end', () => this._onEnd());
+        this._socket.on('data', this._onSocketData);
+        this._socket.once('close', this._onSocketClose);
+        this._socket.once('end', this._onSocketEnd);
 
         this._socket.setTimeout(this.options.socketTimeout || SOCKET_TIMEOUT);
-        this._socket.on('timeout', () => this._onTimeout());
+        this._socket.on('timeout', this._onSocketTimeout);
 
         this._greetingTimeout = setTimeout(() => {
             // if still waiting for greeting, give up
@@ -857,8 +864,8 @@ class SMTPConnection extends EventEmitter {
         // apparently a 'finish' event set that would be cleared as well
 
         // we can safely keep 'error', 'end', 'close' etc. events
-        this._socket.removeAllListeners('data'); // incoming data is going to be gibberish from this point onwards
-        this._socket.removeAllListeners('timeout'); // timeout will be re-set for the new socket object
+        this._socket.removeListener('data', this._onSocketData); // incoming data is going to be gibberish from this point onwards
+        this._socket.removeListener('timeout', this._onSocketTimeout); // timeout will be re-set for the new socket object
 
         let socketPlain = this._socket;
         let opts = {
@@ -876,21 +883,21 @@ class SMTPConnection extends EventEmitter {
             () => {
                 this.secure = true;
                 this.upgrading = false;
-                this._socket.on('data', chunk => this._onData(chunk));
+                this._socket.on('data', this._onSocketData);
 
-                socketPlain.removeAllListeners('close');
-                socketPlain.removeAllListeners('end');
+                socketPlain.removeListener('close', this._onSocketClose);
+                socketPlain.removeListener('end', this._onSocketEnd);
 
                 return callback(null, true);
             }
         );
 
-        this._socket.on('error', err => this._onError(err, 'ESOCKET', false, 'CONN'));
-        this._socket.once('close', errored => this._onClose(errored));
-        this._socket.once('end', () => this._onEnd());
+        this._socket.on('error', this._onSocketError);
+        this._socket.once('close', this._onSocketClose);
+        this._socket.once('end', this._onSocketEnd);
 
         this._socket.setTimeout(this.options.socketTimeout || SOCKET_TIMEOUT); // 10 min.
-        this._socket.on('timeout', () => this._onTimeout());
+        this._socket.on('timeout', this._onSocketTimeout);
 
         // resume in case the socket was paused
         socketPlain.resume();

package/lib/smtp-pool/pool-resource.js

@@ -46,7 +46,7 @@ class PoolResource extends EventEmitter {
                             pass: this.options.auth.pass,
                             options: this.options.auth.options
                         },
-                        method: (this.options.auth.method || '').trim().toUpperCase() || false
+                        method: (this.options.auth.method || '').trim().toUpperCase() || this.options.authMethod || false
                     };
             }
         }

package/lib/smtp-transport/index.js

@@ -121,7 +121,7 @@ class SMTPTransport extends EventEmitter {
                         pass: authData.pass,
                         options: authData.options
                     },
-                    method: (authData.method || '').trim().toUpperCase() || false
+                    method: (authData.method || '').trim().toUpperCase() || this.options.authMethod || false
                 };
         }
     }

package/lib/well-known/services.json

@@ -67,10 +67,7 @@
         "aliases": ["Outlook", "Outlook.com", "Hotmail.com"],
         "domains": ["hotmail.com", "outlook.com"],
         "host": "smtp.live.com",
-        "port": 587,
-        "tls": {
-            "ciphers": "SSLv3"
-        }
+        "port": 587
     },
 
     "iCloud": {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "5.1.1",
+    "version": "6.2.1",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -23,19 +23,19 @@
         "bunyan": "1.8.12",
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "3.3.0",
-        "grunt": "1.0.3",
+        "eslint-config-prettier": "4.3.0",
+        "grunt": "1.0.4",
         "grunt-cli": "1.3.2",
         "grunt-eslint": "21.0.0",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.0.3",
-        "libmime": "4.0.1",
+        "libmime": "4.1.3",
         "libqp": "1.1.0",
-        "mocha": "5.2.0",
+        "mocha": "6.1.4",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "0.2.4",
         "proxy-test-server": "1.0.0",
-        "sinon": "7.2.2",
+        "sinon": "7.3.2",
         "smtp-server": "3.5.0"
     },
     "engines": {