nodemailer 4.6.8 → 4.7.0

package/.prettierrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+    printWidth: 160,
+    tabWidth: 4,
+    singleQuote: true
+};

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 4.7.0 2018-11-19
+
+-   Cleaned up List-\* header generation
+-   Fixed 'full' return option for DSN (klaronix) [23b93a3b]
+-   Support promises `for mailcomposer.build()`
+
 ## 4.6.8 2018-08-15
 
 -   Use first IP address from DNS resolution when using a proxy (Limbozz) [d4ca847c]

package/lib/base64/index.js

@@ -87,8 +87,8 @@ class Encoder extends Transform {
         }
 
         if (chunk.length % 3) {
-            this._remainingBytes = chunk.slice(chunk.length - chunk.length % 3);
-            chunk = chunk.slice(0, chunk.length - chunk.length % 3);
+            this._remainingBytes = chunk.slice(chunk.length - (chunk.length % 3));
+            chunk = chunk.slice(0, chunk.length - (chunk.length % 3));
         } else {
             this._remainingBytes = false;
         }

package/lib/mailer/mail-message.js

@@ -256,26 +256,45 @@ class MailMessage {
         // make sure an url looks like <protocol:url>
         return Object.keys(listData).map(key => ({
             key: 'list-' + key.toLowerCase().trim(),
-            value: [].concat(listData[key] || []).map(value => {
-                if (typeof value === 'string') {
-                    return this._formatListUrl(value);
-                }
-                return {
-                    prepared: true,
-                    value: []
-                        .concat(value || [])
-                        .map(value => {
-                            if (typeof value === 'string') {
-                                return this._formatListUrl(value);
+            value: [].concat(listData[key] || []).map(value => ({
+                prepared: true,
+                foldLines: true,
+                value: []
+                    .concat(value || [])
+                    .map(value => {
+                        if (typeof value === 'string') {
+                            value = {
+                                url: value
+                            };
+                        }
+
+                        if (value && value.url) {
+                            if (key.toLowerCase().trim() === 'id') {
+                                // List-ID: "comment" <domain>
+                                let comment = value.comment || '';
+                                if (mimeFuncs.isPlainText(comment)) {
+                                    comment = '"' + comment + '"';
+                                } else {
+                                    comment = mimeFuncs.encodeWord(comment);
+                                }
+
+                                return (value.comment ? comment + ' ' : '') + this._formatListUrl(value.url).replace(/^<[^:]+\/{,2}/, '');
                             }
-                            if (value && value.url) {
-                                return this._formatListUrl(value.url) + (value.comment ? ' (' + value.comment + ')' : '');
+
+                            // List-*: <http://domain> (comment)
+                            let comment = value.comment || '';
+                            if (!mimeFuncs.isPlainText(comment)) {
+                                comment = mimeFuncs.encodeWord(comment);
                             }
-                            return '';
-                        })
-                        .join(', ')
-                };
-            })
+
+                            return this._formatListUrl(value.url) + (value.comment ? ' (' + comment + ')' : '');
+                        }
+
+                        return '';
+                    })
+                    .filter(value => value)
+                    .join(', ')
+            }))
         }));
     }
 

package/lib/mime-funcs/index.js

@@ -78,7 +78,7 @@ module.exports = {
             });
         } else if (mimeWordEncoding === 'B') {
             encodedStr = typeof data === 'string' ? data : base64.encode(data);
-            maxLength = maxLength ? Math.max(3, (maxLength - maxLength % 4) / 4 * 3) : 0;
+            maxLength = maxLength ? Math.max(3, ((maxLength - (maxLength % 4)) / 4) * 3) : 0;
         }
 
         if (maxLength && (mimeWordEncoding !== 'B' ? encodedStr : base64.encode(data)).length > maxLength) {

package/lib/mime-node/index.js

@@ -1,4 +1,4 @@
-/* eslint no-undefined: 0, prefer-spread: 0 */
+/* eslint no-undefined: 0, prefer-spread: 0, no-control-regex: 0 */
 
 'use strict';
 
@@ -7,6 +7,7 @@ const os = require('os');
 const fs = require('fs');
 const punycode = require('punycode');
 const PassThrough = require('stream').PassThrough;
+const shared = require('../shared');
 
 const mimeFuncs = require('../mime-funcs');
 const qp = require('../qp');
@@ -391,6 +392,14 @@ class MimeNode {
     }
 
     build(callback) {
+        let promise;
+
+        if (!callback && typeof Promise === 'function') {
+            promise = new Promise((resolve, reject) => {
+                callback = shared.callbackPromise(resolve, reject);
+            });
+        }
+
         let stream = this.createReadStream();
         let buf = [];
         let buflen = 0;
@@ -426,6 +435,8 @@ class MimeNode {
             }
             return callback(null, Buffer.concat(buf, buflen));
         });
+
+        return promise;
     }
 
     getTransferEncoding() {
@@ -513,7 +524,11 @@ class MimeNode {
 
             if (options.prepared) {
                 // header value is
-                headers.push(key + ': ' + value);
+                if (options.foldLines) {
+                    headers.push(mimeFuncs.foldLines(key + ': ' + value));
+                } else {
+                    headers.push(key + ': ' + value);
+                }
                 return;
             }
 
@@ -703,9 +718,12 @@ class MimeNode {
                     if (['quoted-printable', 'base64'].includes(transferEncoding)) {
                         contentStream = new (transferEncoding === 'base64' ? base64 : qp).Encoder(options);
 
-                        contentStream.pipe(outputStream, {
-                            end: false
-                        });
+                        contentStream.pipe(
+                            outputStream,
+                            {
+                                end: false
+                            }
+                        );
                         contentStream.once('end', finalize);
                         contentStream.once('error', err => callback(err));
 
@@ -714,9 +732,12 @@ class MimeNode {
                     } else {
                         // anything that is not QP or Base54 passes as-is
                         localStream = this._getStream(this.content);
-                        localStream.pipe(outputStream, {
-                            end: false
-                        });
+                        localStream.pipe(
+                            outputStream,
+                            {
+                                end: false
+                            }
+                        );
                         localStream.once('end', finalize);
                     }
 
@@ -773,9 +794,12 @@ class MimeNode {
                 }
 
                 let raw = this._getStream(this._raw);
-                raw.pipe(outputStream, {
-                    end: false
-                });
+                raw.pipe(
+                    outputStream,
+                    {
+                        end: false
+                    }
+                );
                 raw.on('error', err => outputStream.emit('error', err));
                 raw.on('end', finalize);
             });

package/lib/smtp-connection/http-proxy-client.js

@@ -57,73 +57,76 @@ function httpProxyClient(proxyUrl, destinationPort, destinationHost, callback) {
         callback(err);
     };
 
-    socket = connect(options, () => {
-        if (finished) {
-            return;
-        }
-
-        let reqHeaders = {
-            Host: destinationHost + ':' + destinationPort,
-            Connection: 'close'
-        };
-        if (proxy.auth) {
-            reqHeaders['Proxy-Authorization'] = 'Basic ' + Buffer.from(proxy.auth).toString('base64');
-        }
-
-        socket.write(
-            // HTTP method
-            'CONNECT ' +
-                destinationHost +
-                ':' +
-                destinationPort +
-                ' HTTP/1.1\r\n' +
-                // HTTP request headers
-                Object.keys(reqHeaders)
-                    .map(key => key + ': ' + reqHeaders[key])
-                    .join('\r\n') +
-                // End request
-                '\r\n\r\n'
-        );
-
-        let headers = '';
-        let onSocketData = chunk => {
-            let match;
-            let remainder;
-
+    socket = connect(
+        options,
+        () => {
             if (finished) {
                 return;
             }
 
-            headers += chunk.toString('binary');
-            if ((match = headers.match(/\r\n\r\n/))) {
-                socket.removeListener('data', onSocketData);
+            let reqHeaders = {
+                Host: destinationHost + ':' + destinationPort,
+                Connection: 'close'
+            };
+            if (proxy.auth) {
+                reqHeaders['Proxy-Authorization'] = 'Basic ' + Buffer.from(proxy.auth).toString('base64');
+            }
 
-                remainder = headers.substr(match.index + match[0].length);
-                headers = headers.substr(0, match.index);
-                if (remainder) {
-                    socket.unshift(Buffer.from(remainder, 'binary'));
+            socket.write(
+                // HTTP method
+                'CONNECT ' +
+                    destinationHost +
+                    ':' +
+                    destinationPort +
+                    ' HTTP/1.1\r\n' +
+                    // HTTP request headers
+                    Object.keys(reqHeaders)
+                        .map(key => key + ': ' + reqHeaders[key])
+                        .join('\r\n') +
+                    // End request
+                    '\r\n\r\n'
+            );
+
+            let headers = '';
+            let onSocketData = chunk => {
+                let match;
+                let remainder;
+
+                if (finished) {
+                    return;
                 }
 
-                // proxy connection is now established
-                finished = true;
+                headers += chunk.toString('binary');
+                if ((match = headers.match(/\r\n\r\n/))) {
+                    socket.removeListener('data', onSocketData);
 
-                // check response code
-                match = headers.match(/^HTTP\/\d+\.\d+ (\d+)/i);
-                if (!match || (match[1] || '').charAt(0) !== '2') {
-                    try {
-                        socket.destroy();
-                    } catch (E) {
-                        // ignore
+                    remainder = headers.substr(match.index + match[0].length);
+                    headers = headers.substr(0, match.index);
+                    if (remainder) {
+                        socket.unshift(Buffer.from(remainder, 'binary'));
                     }
-                    return callback(new Error('Invalid response from proxy' + ((match && ': ' + match[1]) || '')));
-                }
 
-                socket.removeListener('error', tempSocketErr);
-                return callback(null, socket);
-            }
-        };
-        socket.on('data', onSocketData);
-    });
+                    // proxy connection is now established
+                    finished = true;
+
+                    // check response code
+                    match = headers.match(/^HTTP\/\d+\.\d+ (\d+)/i);
+                    if (!match || (match[1] || '').charAt(0) !== '2') {
+                        try {
+                            socket.destroy();
+                        } catch (E) {
+                            // ignore
+                        }
+                        return callback(new Error('Invalid response from proxy' + ((match && ': ' + match[1]) || '')));
+                    }
+
+                    socket.removeListener('error', tempSocketErr);
+                    return callback(null, socket);
+                }
+            };
+            socket.on('data', onSocketData);
+        }
+    );
 
     socket.once('error', tempSocketErr);
 }

package/lib/smtp-connection/index.js

@@ -223,10 +223,14 @@ class SMTPConnection extends EventEmitter {
             // socket object is set up but not yet connected
             this._socket = this.options.socket;
             try {
-                this._socket.connect(this.port, this.host, () => {
-                    this._socket.setKeepAlive(true);
-                    this._onConnect();
-                });
+                this._socket.connect(
+                    this.port,
+                    this.host,
+                    () => {
+                        this._socket.setKeepAlive(true);
+                        this._onConnect();
+                    }
+                );
             } catch (E) {
                 return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
             }
@@ -238,20 +242,28 @@ class SMTPConnection extends EventEmitter {
                 });
             }
             try {
-                this._socket = tls.connect(this.port, this.host, opts, () => {
-                    this._socket.setKeepAlive(true);
-                    this._onConnect();
-                });
+                this._socket = tls.connect(
+                    this.port,
+                    this.host,
+                    opts,
+                    () => {
+                        this._socket.setKeepAlive(true);
+                        this._onConnect();
+                    }
+                );
             } catch (E) {
                 return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
             }
         } else {
             // connect using plaintext
             try {
-                this._socket = net.connect(opts, () => {
-                    this._socket.setKeepAlive(true);
-                    this._onConnect();
-                });
+                this._socket = net.connect(
+                    opts,
+                    () => {
+                        this._socket.setKeepAlive(true);
+                        this._onConnect();
+                    }
+                );
             } catch (E) {
                 return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
             }
@@ -578,19 +590,6 @@ class SMTPConnection extends EventEmitter {
 
         err = this._formatError(err, type, data, command);
 
-        let entry = {
-            err
-        };
-        if (type) {
-            entry.errorType = type;
-        }
-        if (data) {
-            entry.errorData = data;
-        }
-        if (command) {
-            entry.command = command;
-        }
-
         this.logger.error(data, err.message);
 
         this.emit('error', err);
@@ -703,16 +702,19 @@ class SMTPConnection extends EventEmitter {
         });
 
         this.upgrading = true;
-        this._socket = tls.connect(opts, () => {
-            this.secure = true;
-            this.upgrading = false;
-            this._socket.on('data', chunk => this._onData(chunk));
+        this._socket = tls.connect(
+            opts,
+            () => {
+                this.secure = true;
+                this.upgrading = false;
+                this._socket.on('data', chunk => this._onData(chunk));
 
-            socketPlain.removeAllListeners('close');
-            socketPlain.removeAllListeners('end');
+                socketPlain.removeAllListeners('close');
+                socketPlain.removeAllListeners('end');
 
-            return callback(null, true);
-        });
+                return callback(null, true);
+            }
+        );
 
         this._socket.on('error', err => this._onError(err, 'ESOCKET', false, 'CONN'));
         this._socket.once('close', errored => this._onClose(errored));
@@ -897,7 +899,7 @@ class SMTPConnection extends EventEmitter {
                     break;
                 case 'FULL':
                 case 'BODY':
-                    ret = 'full';
+                    ret = 'FULL';
                     break;
             }
         }
@@ -967,9 +969,12 @@ class SMTPConnection extends EventEmitter {
             });
         }
 
-        dataStream.pipe(this._socket, {
-            end: false
-        });
+        dataStream.pipe(
+            this._socket,
+            {
+                end: false
+            }
+        );
 
         if (this.options.debug) {
             logStream = new PassThrough();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "4.6.8",
+    "version": "4.7.0",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -21,10 +21,11 @@
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
         "bunyan": "^1.8.12",
-        "chai": "^4.1.2",
+        "chai": "^4.2.0",
         "eslint-config-nodemailer": "^1.2.0",
+        "eslint-config-prettier": "^3.3.0",
         "grunt": "^1.0.3",
-        "grunt-cli": "^1.2.0",
+        "grunt-cli": "^1.3.2",
         "grunt-eslint": "^21.0.0",
         "grunt-mocha-test": "^0.13.3",
         "libbase64": "^1.0.3",
@@ -33,8 +34,8 @@
         "mocha": "^5.2.0",
         "proxy": "^0.2.4",
         "proxy-test-server": "^1.0.0",
-        "sinon": "^6.1.5",
-        "smtp-server": "^3.4.6"
+        "sinon": "^7.1.1",
+        "smtp-server": "^3.4.7"
     },
     "engines": {
         "node": ">=6.0.0"