nodemailer 4.1.3 → 4.4.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 4.4.0 2017-11-10
+
+- Changed default behavior for attachment option contentTransferEncoding. If it is unset then base64 encoding is used for the attachment. If it is set to false then previous default applies (base64 for most, 7bit for text)
+
+## 4.3.1 2017-10-25
+
+- Fixed a confict with Electron.js where timers do not have unref method
+
+## 4.3.0 2017-10-23
+
+- Added new mail object method `mail.normalize(cb)` that should make creating HTTP API based transports much easier
+
+## 4.2.0 2017-10-13
+
+- Expose streamed messages size and timers in info response
+
 ## v4.1.3 2017-10-06
 
 - Allow generating preview links without calling createTestAccount first

package/lib/base64/index.js

@@ -35,7 +35,10 @@ function wrap(str, lineLength) {
     let pos = 0;
     let chunkLength = lineLength * 1024;
     while (pos < str.length) {
-        let wrappedLines = str.substr(pos, chunkLength).replace(new RegExp('.{' + lineLength + '}', 'g'), '$&\r\n').trim();
+        let wrappedLines = str
+            .substr(pos, chunkLength)
+            .replace(new RegExp('.{' + lineLength + '}', 'g'), '$&\r\n')
+            .trim();
         result.push(wrappedLines);
         pos += chunkLength;
     }

package/lib/dkim/message-parser.js

@@ -144,7 +144,10 @@ class MessageParser extends Transform {
             }
         }
         return lines.filter(line => line.trim()).map(line => ({
-            key: line.substr(0, line.indexOf(':')).trim().toLowerCase(),
+            key: line
+                .substr(0, line.indexOf(':'))
+                .trim()
+                .toLowerCase(),
             line
         }));
     }

package/lib/dkim/sign.js

@@ -70,13 +70,20 @@ function relaxedHeaders(headers, fieldNames, skipFields) {
     let skip = new Set();
     let headerFields = new Map();
 
-    (skipFields || '').toLowerCase().split(':').forEach(field => {
-        skip.add(field.trim());
-    });
-
-    (fieldNames || '').toLowerCase().split(':').filter(field => !skip.has(field.trim())).forEach(field => {
-        includedFields.add(field.trim());
-    });
+    (skipFields || '')
+        .toLowerCase()
+        .split(':')
+        .forEach(field => {
+            skip.add(field.trim());
+        });
+
+    (fieldNames || '')
+        .toLowerCase()
+        .split(':')
+        .filter(field => !skip.has(field.trim()))
+        .forEach(field => {
+            includedFields.add(field.trim());
+        });
 
     for (let i = headers.length - 1; i >= 0; i--) {
         let line = headers[i];
@@ -102,5 +109,9 @@ function relaxedHeaders(headers, fieldNames, skipFields) {
 }
 
 function relaxedHeaderLine(line) {
-    return line.substr(line.indexOf(':') + 1).replace(/\r?\n/g, '').replace(/\s+/g, ' ').trim();
+    return line
+        .substr(line.indexOf(':') + 1)
+        .replace(/\r?\n/g, '')
+        .replace(/\s+/g, ' ')
+        .trim();
 }

package/lib/fetch/cookies.js

@@ -64,7 +64,9 @@ class Cookies {
      * @returns {String} Cookie header or empty string if no matches were found
      */
     get(url) {
-        return this.list(url).map(cookie => cookie.name + '=' + cookie.value).join('; ');
+        return this.list(url)
+            .map(cookie => cookie.name + '=' + cookie.value)
+            .join('; ');
     }
 
     /**
@@ -103,57 +105,63 @@ class Cookies {
     parse(cookieStr) {
         let cookie = {};
 
-        (cookieStr || '').toString().split(';').forEach(cookiePart => {
-            let valueParts = cookiePart.split('=');
-            let key = valueParts.shift().trim().toLowerCase();
-            let value = valueParts.join('=').trim();
-            let domain;
-
-            if (!key) {
-                // skip empty parts
-                return;
-            }
+        (cookieStr || '')
+            .toString()
+            .split(';')
+            .forEach(cookiePart => {
+                let valueParts = cookiePart.split('=');
+                let key = valueParts
+                    .shift()
+                    .trim()
+                    .toLowerCase();
+                let value = valueParts.join('=').trim();
+                let domain;
+
+                if (!key) {
+                    // skip empty parts
+                    return;
+                }
 
-            switch (key) {
-                case 'expires':
-                    value = new Date(value);
-                    // ignore date if can not parse it
-                    if (value.toString() !== 'Invalid Date') {
-                        cookie.expires = value;
-                    }
-                    break;
-
-                case 'path':
-                    cookie.path = value;
-                    break;
-
-                case 'domain':
-                    domain = value.toLowerCase();
-                    if (domain.length && domain.charAt(0) !== '.') {
-                        domain = '.' + domain; // ensure preceeding dot for user set domains
-                    }
-                    cookie.domain = domain;
-                    break;
-
-                case 'max-age':
-                    cookie.expires = new Date(Date.now() + (Number(value) || 0) * 1000);
-                    break;
-
-                case 'secure':
-                    cookie.secure = true;
-                    break;
-
-                case 'httponly':
-                    cookie.httponly = true;
-                    break;
-
-                default:
-                    if (!cookie.name) {
-                        cookie.name = key;
-                        cookie.value = value;
-                    }
-            }
-        });
+                switch (key) {
+                    case 'expires':
+                        value = new Date(value);
+                        // ignore date if can not parse it
+                        if (value.toString() !== 'Invalid Date') {
+                            cookie.expires = value;
+                        }
+                        break;
+
+                    case 'path':
+                        cookie.path = value;
+                        break;
+
+                    case 'domain':
+                        domain = value.toLowerCase();
+                        if (domain.length && domain.charAt(0) !== '.') {
+                            domain = '.' + domain; // ensure preceeding dot for user set domains
+                        }
+                        cookie.domain = domain;
+                        break;
+
+                    case 'max-age':
+                        cookie.expires = new Date(Date.now() + (Number(value) || 0) * 1000);
+                        break;
+
+                    case 'secure':
+                        cookie.secure = true;
+                        break;
+
+                    case 'httponly':
+                        cookie.httponly = true;
+                        break;
+
+                    default:
+                        if (!cookie.name) {
+                            cookie.name = key;
+                            cookie.value = value;
+                        }
+                }
+            });
 
         return cookie;
     }

package/lib/fetch/index.js

@@ -33,7 +33,11 @@ function fetch(url, options) {
 
     let fetchRes = options.fetchRes;
     let parsed = urllib.parse(url);
-    let method = (options.method || '').toString().trim().toUpperCase() || 'GET';
+    let method =
+        (options.method || '')
+            .toString()
+            .trim()
+            .toUpperCase() || 'GET';
     let finished = false;
     let cookies;
     let body;
@@ -99,7 +103,11 @@ function fetch(url, options) {
             headers['Content-Length'] = body.length;
         }
         // if method is not provided, use POST instead of GET
-        method = (options.method || '').toString().trim().toUpperCase() || 'POST';
+        method =
+            (options.method || '')
+                .toString()
+                .trim()
+                .toUpperCase() || 'POST';
     }
 
     let req;

package/lib/json-transport/index.js

@@ -57,7 +57,7 @@ class JSONTransport {
         );
 
         setImmediate(() => {
-            mail.resolveAll((err, data) => {
+            mail.normalize((err, data) => {
                 if (err) {
                     this.logger.error(
                         {
@@ -72,43 +72,11 @@ class JSONTransport {
                     return done(err);
                 }
 
-                data.messageId = messageId;
-
-                ['html', 'text', 'watchHtml'].forEach(key => {
-                    if (data[key] && data[key].content) {
-                        if (typeof data[key].content === 'string') {
-                            data[key] = data[key].content;
-                        } else if (Buffer.isBuffer(data[key].content)) {
-                            data[key] = data[key].content.toString();
-                        }
-                    }
-                });
-
-                if (data.icalEvent && Buffer.isBuffer(data.icalEvent.content)) {
-                    data.icalEvent.content = data.icalEvent.content.toString('base64');
-                    data.icalEvent.encoding = 'base64';
-                }
-
-                if (data.alternatives && data.alternatives.length) {
-                    data.alternatives.forEach(alternative => {
-                        if (alternative && alternative.content && Buffer.isBuffer(alternative.content)) {
-                            alternative.content = alternative.content.toString('base64');
-                            alternative.encoding = 'base64';
-                        }
-                    });
-                }
-
-                if (data.attachments && data.attachments.length) {
-                    data.attachments.forEach(attachment => {
-                        if (attachment && attachment.content && Buffer.isBuffer(attachment.content)) {
-                            attachment.content = attachment.content.toString('base64');
-                            attachment.encoding = 'base64';
-                        }
-                    });
-                }
+                delete data.envelope;
+                delete data.normalizedHeaders;
 
                 return done(null, {
-                    envelope: mail.data.envelope || mail.message.getEnvelope(),
+                    envelope,
                     messageId,
                     message: JSON.stringify(data)
                 });

package/lib/mail-composer/index.js

@@ -41,7 +41,10 @@ class MailComposer {
         } else {
             this.message = this._createContentNode(
                 false,
-                [].concat(this._alternatives || []).concat(this._attachments.attached || []).shift() || {
+                []
+                    .concat(this._alternatives || [])
+                    .concat(this._attachments.attached || [])
+                    .shift() || {
                     contentType: 'text/plain',
                     content: ''
                 }
@@ -91,13 +94,18 @@ class MailComposer {
             data = {
                 contentType: attachment.contentType || mimeFuncs.detectMimeType(attachment.filename || attachment.path || attachment.href || 'bin'),
                 contentDisposition: attachment.contentDisposition || (isMessageNode ? 'inline' : 'attachment'),
-                contentTransferEncoding: attachment.contentTransferEncoding
+                contentTransferEncoding: 'contentTransferEncoding' in attachment ? attachment.contentTransferEncoding : 'base64'
             };
 
             if (attachment.filename) {
                 data.filename = attachment.filename;
             } else if (!isMessageNode && attachment.filename !== false) {
-                data.filename = (attachment.path || attachment.href || '').split('/').pop().split('?').shift() || 'attachment-' + (i + 1);
+                data.filename =
+                    (attachment.path || attachment.href || '')
+                        .split('/')
+                        .pop()
+                        .split('?')
+                        .shift() || 'attachment-' + (i + 1);
                 if (data.filename.indexOf('.') < 0) {
                     data.filename += '.' + mimeFuncs.detectExtension(data.contentType);
                 }
@@ -240,7 +248,12 @@ class MailComposer {
             }
 
             eventObject.filename = false;
-            eventObject.contentType = 'text/calendar; charset="utf-8"; method=' + (eventObject.method || 'PUBLISH').toString().trim().toUpperCase();
+            eventObject.contentType =
+                'text/calendar; charset="utf-8"; method=' +
+                (eventObject.method || 'PUBLISH')
+                    .toString()
+                    .trim()
+                    .toUpperCase();
             if (!eventObject.headers) {
                 eventObject.headers = {};
             }
@@ -257,51 +270,57 @@ class MailComposer {
             html.contentType = 'text/html' + (!html.encoding && mimeFuncs.isPlainText(html.content) ? '' : '; charset=utf-8');
         }
 
-        [].concat(text || []).concat(watchHtml || []).concat(html || []).concat(eventObject || []).concat(this.mail.alternatives || []).forEach(alternative => {
-            let data;
-
-            if (/^data:/i.test(alternative.path || alternative.href)) {
-                alternative = this._processDataUrl(alternative);
-            }
+        []
+            .concat(text || [])
+            .concat(watchHtml || [])
+            .concat(html || [])
+            .concat(eventObject || [])
+            .concat(this.mail.alternatives || [])
+            .forEach(alternative => {
+                let data;
+
+                if (/^data:/i.test(alternative.path || alternative.href)) {
+                    alternative = this._processDataUrl(alternative);
+                }
 
-            data = {
-                contentType: alternative.contentType || mimeFuncs.detectMimeType(alternative.filename || alternative.path || alternative.href || 'txt'),
-                contentTransferEncoding: alternative.contentTransferEncoding
-            };
+                data = {
+                    contentType: alternative.contentType || mimeFuncs.detectMimeType(alternative.filename || alternative.path || alternative.href || 'txt'),
+                    contentTransferEncoding: alternative.contentTransferEncoding
+                };
 
-            if (alternative.filename) {
-                data.filename = alternative.filename;
-            }
+                if (alternative.filename) {
+                    data.filename = alternative.filename;
+                }
 
-            if (/^https?:\/\//i.test(alternative.path)) {
-                alternative.href = alternative.path;
-                alternative.path = undefined;
-            }
+                if (/^https?:\/\//i.test(alternative.path)) {
+                    alternative.href = alternative.path;
+                    alternative.path = undefined;
+                }
 
-            if (alternative.raw) {
-                data.raw = alternative.raw;
-            } else if (alternative.path) {
-                data.content = {
-                    path: alternative.path
-                };
-            } else if (alternative.href) {
-                data.content = {
-                    href: alternative.href
-                };
-            } else {
-                data.content = alternative.content || '';
-            }
+                if (alternative.raw) {
+                    data.raw = alternative.raw;
+                } else if (alternative.path) {
+                    data.content = {
+                        path: alternative.path
+                    };
+                } else if (alternative.href) {
+                    data.content = {
+                        href: alternative.href
+                    };
+                } else {
+                    data.content = alternative.content || '';
+                }
 
-            if (alternative.encoding) {
-                data.encoding = alternative.encoding;
-            }
+                if (alternative.encoding) {
+                    data.encoding = alternative.encoding;
+                }
 
-            if (alternative.headers) {
-                data.headers = alternative.headers;
-            }
+                if (alternative.headers) {
+                    data.headers = alternative.headers;
+                }
 
-            alternatives.push(data);
-        });
+                alternatives.push(data);
+            });
 
         return alternatives;
     }
@@ -337,12 +356,15 @@ class MailComposer {
             this._createRelated(node);
         }
 
-        [].concat((!this._useAlternative && this._alternatives) || []).concat(this._attachments.attached || []).forEach(element => {
-            // if the element is a html node from related subpart then ignore it
-            if (!this._useRelated || element !== this._htmlNode) {
-                this._createContentNode(node, element);
-            }
-        });
+        []
+            .concat((!this._useAlternative && this._alternatives) || [])
+            .concat(this._attachments.attached || [])
+            .forEach(element => {
+                // if the element is a html node from related subpart then ignore it
+                if (!this._useRelated || element !== this._htmlNode) {
+                    this._createContentNode(node, element);
+                }
+            });
 
         return node;
     }
@@ -426,7 +448,10 @@ class MailComposer {
         element.content = element.content || '';
 
         let node;
-        let encoding = (element.encoding || 'utf8').toString().toLowerCase().replace(/[-_\s]/g, '');
+        let encoding = (element.encoding || 'utf8')
+            .toString()
+            .toLowerCase()
+            .replace(/[-_\s]/g, '');
 
         if (!parentNode) {
             node = new MimeNode(element.contentType, {

package/lib/mailer/mail-message.js

@@ -58,7 +58,12 @@ class MailMessage {
         if (this.data.attachments && this.data.attachments.length) {
             this.data.attachments.forEach((attachment, i) => {
                 if (!attachment.filename) {
-                    attachment.filename = (attachment.path || attachment.href || '').split('/').pop().split('?').shift() || 'attachment-' + (i + 1);
+                    attachment.filename =
+                        (attachment.path || attachment.href || '')
+                            .split('/')
+                            .pop()
+                            .split('?')
+                            .shift() || 'attachment-' + (i + 1);
                     if (attachment.filename.indexOf('.') < 0) {
                         attachment.filename += '.' + mimeFuncs.detectExtension(attachment.contentType);
                     }
@@ -130,6 +135,82 @@ class MailMessage {
         setImmediate(() => resolveNext());
     }
 
+    normalize(callback) {
+        let envelope = this.data.envelope || this.message.getEnvelope();
+        let messageId = this.message.messageId();
+
+        this.resolveAll((err, data) => {
+            if (err) {
+                return callback(err);
+            }
+
+            data.envelope = envelope;
+            data.messageId = messageId;
+
+            ['html', 'text', 'watchHtml'].forEach(key => {
+                if (data[key] && data[key].content) {
+                    if (typeof data[key].content === 'string') {
+                        data[key] = data[key].content;
+                    } else if (Buffer.isBuffer(data[key].content)) {
+                        data[key] = data[key].content.toString();
+                    }
+                }
+            });
+
+            if (data.icalEvent && Buffer.isBuffer(data.icalEvent.content)) {
+                data.icalEvent.content = data.icalEvent.content.toString('base64');
+                data.icalEvent.encoding = 'base64';
+            }
+
+            if (data.alternatives && data.alternatives.length) {
+                data.alternatives.forEach(alternative => {
+                    if (alternative && alternative.content && Buffer.isBuffer(alternative.content)) {
+                        alternative.content = alternative.content.toString('base64');
+                        alternative.encoding = 'base64';
+                    }
+                });
+            }
+
+            if (data.attachments && data.attachments.length) {
+                data.attachments.forEach(attachment => {
+                    if (attachment && attachment.content && Buffer.isBuffer(attachment.content)) {
+                        attachment.content = attachment.content.toString('base64');
+                        attachment.encoding = 'base64';
+                    }
+                });
+            }
+
+            data.normalizedHeaders = {};
+            Object.keys(data.headers || {}).forEach(key => {
+                let value = [].concat(data.headers[key] || []).shift();
+                value = (value && value.value) || value;
+                if (value) {
+                    if (['references', 'in-reply-to', 'message-id', 'content-id'].includes(key)) {
+                        value = this.message._encodeHeaderValue(key, value);
+                    }
+                    data.normalizedHeaders[key] = value;
+                }
+            });
+
+            if (data.list && typeof data.list === 'object') {
+                let listHeaders = this._getListHeaders(data.list);
+                listHeaders.forEach(entry => {
+                    data.normalizedHeaders[entry.key] = entry.value.map(val => (val && val.value) || val).join(', ');
+                });
+            }
+
+            if (data.references) {
+                data.normalizedHeaders.references = this.message._encodeHeaderValue('references', data.references);
+            }
+
+            if (data.inReplyTo) {
+                data.normalizedHeaders['in-reply-to'] = this.message._encodeHeaderValue('in-reply-to', data.inReplyTo);
+            }
+
+            return callback(null, data);
+        });
+    }
+
     setMailerHeader() {
         if (!this.message || !this.data.xMailer) {
             return;

package/lib/mime-funcs/index.js

@@ -49,7 +49,11 @@ module.exports = {
      * @return {String} Single or several mime words joined together
      */
     encodeWord(data, mimeWordEncoding, maxLength) {
-        mimeWordEncoding = (mimeWordEncoding || 'Q').toString().toUpperCase().trim().charAt(0);
+        mimeWordEncoding = (mimeWordEncoding || 'Q')
+            .toString()
+            .toUpperCase()
+            .trim()
+            .charAt(0);
         maxLength = maxLength || 0;
 
         let encodedStr;
@@ -62,7 +66,10 @@ module.exports = {
         if (mimeWordEncoding === 'Q') {
             // https://tools.ietf.org/html/rfc2047#section-5 rule (3)
             encodedStr = qp.encode(data).replace(/[^a-z0-9!*+\-/=]/gi, chr => {
-                let ord = chr.charCodeAt(0).toString(16).toUpperCase();
+                let ord = chr
+                    .charCodeAt(0)
+                    .toString(16)
+                    .toUpperCase();
                 if (chr === ' ') {
                     return '_';
                 } else {
@@ -575,7 +582,10 @@ module.exports = {
 
     encodeURICharComponent: chr => {
         let res = '';
-        let ord = chr.charCodeAt(0).toString(16).toUpperCase();
+        let ord = chr
+            .charCodeAt(0)
+            .toString(16)
+            .toUpperCase();
 
         if (ord.length % 2) {
             ord = '0' + ord;

package/lib/mime-funcs/mime-types.js

@@ -2063,7 +2063,11 @@ module.exports = {
         }
 
         let parsed = path.parse(filename);
-        let extension = (parsed.ext.substr(1) || parsed.name || '').split('?').shift().trim().toLowerCase();
+        let extension = (parsed.ext.substr(1) || parsed.name || '')
+            .split('?')
+            .shift()
+            .trim()
+            .toLowerCase();
         let value = defaultMimeType;
 
         if (extensions.has(extension)) {
@@ -2080,7 +2084,10 @@ module.exports = {
         if (!mimeType) {
             return defaultExtension;
         }
-        let parts = (mimeType || '').toLowerCase().trim().split('/');
+        let parts = (mimeType || '')
+            .toLowerCase()
+            .trim()
+            .split('/');
         let rootType = parts.shift().trim();
         let subType = parts.join('/').trim();
 

package/lib/mime-node/index.js

@@ -76,7 +76,11 @@ class MimeNode {
         /**
          * Indicates which encoding should be used for header strings: "Q" or "B"
          */
-        this.textEncoding = (options.textEncoding || '').toString().trim().charAt(0).toUpperCase();
+        this.textEncoding = (options.textEncoding || '')
+            .toString()
+            .trim()
+            .charAt(0)
+            .toUpperCase();
 
         /**
          * Immediate parent for this node (or undefined if not set)
@@ -423,10 +427,16 @@ class MimeNode {
 
     getTransferEncoding() {
         let transferEncoding = false;
-        let contentType = (this.getHeader('Content-Type') || '').toString().toLowerCase().trim();
+        let contentType = (this.getHeader('Content-Type') || '')
+            .toString()
+            .toLowerCase()
+            .trim();
 
         if (this.content) {
-            transferEncoding = (this.getHeader('Content-Transfer-Encoding') || '').toString().toLowerCase().trim();
+            transferEncoding = (this.getHeader('Content-Transfer-Encoding') || '')
+                .toString()
+                .toLowerCase()
+                .trim();
             if (!transferEncoding || !['base64', 'quoted-printable'].includes(transferEncoding)) {
                 if (/^text\//i.test(contentType)) {
                     // If there are no special symbols, no need to modify the text
@@ -1047,7 +1057,10 @@ class MimeNode {
                         [],
                         [].concat(value || '').map(elm => {
                             // eslint-disable-line prefer-spread
-                            elm = (elm || '').toString().replace(/\r?\n|\r/g, ' ').trim();
+                            elm = (elm || '')
+                                .toString()
+                                .replace(/\r?\n|\r/g, ' ')
+                                .trim();
                             return elm.replace(/<[^>]*>/g, str => str.replace(/\s/g, '')).split(/\s+/);
                         })
                     )

package/lib/ses-transport/index.js

@@ -123,7 +123,13 @@ class SESTransport extends EventEmitter {
 
         let delay = Math.max(oldest + 1001, now + 20);
         this.sendingRateTTL = setTimeout(() => this._checkRatedQueue(), now - delay);
-        this.sendingRateTTL.unref();
+
+        try {
+            this.sendingRateTTL.unref();
+        } catch (E) {
+            // Ignore. Happens on envs with non-node timer implementation
+        }
+
         return false;
     }
 

package/lib/shared/index.js

@@ -187,7 +187,10 @@ module.exports.resolveContent = (data, key, callback) => {
 
     let content = (data && data[key] && data[key].content) || data[key];
     let contentStream;
-    let encoding = ((typeof data[key] === 'object' && data[key].encoding) || 'utf8').toString().toLowerCase().replace(/[-_\s]/g, '');
+    let encoding = ((typeof data[key] === 'object' && data[key].encoding) || 'utf8')
+        .toString()
+        .toLowerCase()
+        .replace(/[-_\s]/g, '');
 
     if (!content) {
         return callback(null, content);
@@ -363,7 +366,15 @@ function createDefaultLogger(levels) {
 
         message = util.format(message, ...args);
         message.split(/\r?\n/).forEach(line => {
-            console.log('[%s] %s %s', new Date().toISOString().substr(0, 19).replace(/T/, ' '), levelNames.get(level), prefix + line);
+            console.log(
+                '[%s] %s %s',
+                new Date()
+                    .toISOString()
+                    .substr(0, 19)
+                    .replace(/T/, ' '),
+                levelNames.get(level),
+                prefix + line
+            );
         });
     };
 

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

@@ -78,7 +78,9 @@ function httpProxyClient(proxyUrl, destinationPort, destinationHost, callback) {
                 destinationPort +
                 ' HTTP/1.1\r\n' +
                 // HTTP request headers
-                Object.keys(reqHeaders).map(key => key + ': ' + reqHeaders[key]).join('\r\n') +
+                Object.keys(reqHeaders)
+                    .map(key => key + ': ' + reqHeaders[key])
+                    .join('\r\n') +
                 // End request
                 '\r\n\r\n'
         );

package/lib/smtp-connection/index.js

@@ -45,7 +45,10 @@ class SMTPConnection extends EventEmitter {
     constructor(options) {
         super(options);
 
-        this.id = crypto.randomBytes(8).toString('base64').replace(/\W/g, '');
+        this.id = crypto
+            .randomBytes(8)
+            .toString('base64')
+            .replace(/\W/g, '');
         this.stage = 'init';
 
         this.options = options || {};
@@ -315,7 +318,11 @@ class SMTPConnection extends EventEmitter {
         this._auth = authData || {};
 
         // Select SASL authentication method
-        this._authMethod = (this._auth.method || '').toString().trim().toUpperCase() || false;
+        this._authMethod =
+            (this._auth.method || '')
+                .toString()
+                .trim()
+                .toUpperCase() || false;
         if (!this._authMethod && this._auth.oauth2 && !this._auth.credentials) {
             this._authMethod = 'XOAUTH2';
         } else if (!this._authMethod || (this._authMethod === 'XOAUTH2' && !this._auth.oauth2)) {
@@ -405,15 +412,22 @@ class SMTPConnection extends EventEmitter {
             message.on('error', err => callback(this._formatError(err, 'ESTREAM', false, 'API')));
         }
 
+        let startTime = Date.now();
         this._setEnvelope(envelope, (err, info) => {
             if (err) {
                 return callback(err);
             }
+            let envelopeTime = Date.now();
             let stream = this._createSendStream((err, str) => {
                 if (err) {
                     return callback(err);
                 }
+
+                info.envelopeTime = envelopeTime - startTime;
+                info.messageTime = Date.now() - envelopeTime;
+                info.messageSize = stream.outByteCount;
                 info.response = str;
+
                 return callback(null, info);
             });
             if (typeof message.pipe === 'function') {

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

@@ -35,6 +35,9 @@ class PoolResource extends EventEmitter {
                     break;
                 }
                 default:
+                    if (!this.options.auth.user && !this.options.auth.pass) {
+                        break;
+                    }
                     this.auth = {
                         type: 'LOGIN',
                         user: this.options.auth.user,
@@ -107,7 +110,8 @@ class PoolResource extends EventEmitter {
                     return;
                 }
                 returned = true;
-                setTimeout(() => {
+
+                let timer = setTimeout(() => {
                     if (returned) {
                         return;
                     }
@@ -118,7 +122,13 @@ class PoolResource extends EventEmitter {
                         err.code = 'ETLS';
                     }
                     callback(err);
-                }, 1000).unref();
+                }, 1000);
+
+                try {
+                    timer.unref();
+                } catch (E) {
+                    // Ignore. Happens on envs with non-node timer implementation
+                }
             });
 
             this.connection.connect(() => {

package/lib/smtp-transport/index.js

@@ -179,7 +179,8 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
                 returned = true;
-                setTimeout(() => {
+
+                let timer = setTimeout(() => {
                     if (returned) {
                         return;
                     }
@@ -190,7 +191,13 @@ class SMTPTransport extends EventEmitter {
                         err.code = 'ETLS';
                     }
                     callback(err);
-                }, 1000).unref();
+                }, 1000);
+
+                try {
+                    timer.unref();
+                } catch (E) {
+                    // Ignore. Happens on envs with non-node timer implementation
+                }
             });
 
             let sendMessage = () => {

package/lib/xoauth2/index.js

@@ -41,7 +41,8 @@ class XOAuth2 extends Stream {
 
         if (options && options.serviceClient) {
             if (!options.privateKey || !options.user) {
-                return setImmediate(() => this.emit('error', new Error('Options "privateKey" and "user" are required for service account!')));
+                setImmediate(() => this.emit('error', new Error('Options "privateKey" and "user" are required for service account!')));
+                return;
             }
 
             let serviceRequestTimeout = Math.min(Math.max(Number(this.options.serviceRequestTimeout) || 0, 0), 3600);
@@ -300,7 +301,10 @@ class XOAuth2 extends Stream {
      */
     jwtSignRS256(payload) {
         payload = ['{"alg":"RS256","typ":"JWT"}', JSON.stringify(payload)].map(val => this.toBase64URL(val)).join('.');
-        let signature = crypto.createSign('RSA-SHA256').update(payload).sign(this.options.privateKey);
+        let signature = crypto
+            .createSign('RSA-SHA256')
+            .update(payload)
+            .sign(this.options.privateKey);
         return payload + '.' + this.toBase64URL(signature);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "4.1.3",
+    "version": "4.4.0",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -24,15 +24,15 @@
         "grunt": "^1.0.1",
         "grunt-cli": "^1.2.0",
         "grunt-eslint": "^20.1.0",
-        "grunt-mocha-test": "^0.13.2",
+        "grunt-mocha-test": "^0.13.3",
         "libbase64": "^0.2.0",
         "libmime": "^3.1.0",
         "libqp": "^1.1.0",
-        "mocha": "^3.5.3",
+        "mocha": "^4.0.1",
         "proxy": "^0.2.4",
         "proxy-test-server": "^1.0.0",
-        "sinon": "^3.3.0",
-        "smtp-server": "^3.1.0"
+        "sinon": "^4.1.2",
+        "smtp-server": "^3.3.0"
     },
     "engines": {
         "node": ">=6.0.0"

package/.github/stale.yml

@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

package/.npmignore

@@ -1,9 +0,0 @@
-assets
-test
-examples
-.eslintrc
-.gitignore
-.travis.yml
-Gruntfile.js
-ISSUE_TEMPLATE.md
-CONTRIBUTING.md