nodemailer 8.0.2 → 8.0.4

package/lib/sendmail-transport/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const spawn = require('child_process').spawn;
+const { spawn } = require('child_process');
 const packageData = require('../../package.json');
 const shared = require('../shared');
 const errors = require('../errors');
@@ -24,30 +24,26 @@ class SendmailTransport {
         // use a reference to spawn for mocking purposes
         this._spawn = spawn;
 
-        this.options = options || {};
+        this.options = options;
 
         this.name = 'Sendmail';
         this.version = packageData.version;
 
         this.path = 'sendmail';
         this.args = false;
-        this.winbreak = false;
 
         this.logger = shared.getLogger(this.options, {
             component: this.options.component || 'sendmail'
         });
 
-        if (options) {
-            if (typeof options === 'string') {
-                this.path = options;
-            } else if (typeof options === 'object') {
-                if (options.path) {
-                    this.path = options.path;
-                }
-                if (Array.isArray(options.args)) {
-                    this.args = options.args;
-                }
-                this.winbreak = ['win', 'windows', 'dos', '\r\n'].includes((options.newline || '').toString().toLowerCase());
+        if (typeof options === 'string') {
+            this.path = options;
+        } else if (typeof options === 'object') {
+            if (options.path) {
+                this.path = options.path;
+            }
+            if (Array.isArray(options.args)) {
+                this.args = options.args;
             }
         }
     }
@@ -62,10 +58,8 @@ class SendmailTransport {
         // Sendmail strips this header line by itself
         mail.message.keepBcc = true;
 
-        let envelope = mail.data.envelope || mail.message.getEnvelope();
-        let messageId = mail.message.messageId();
-        let args;
-        let sendmail;
+        const envelope = mail.data.envelope || mail.message.getEnvelope();
+        const messageId = mail.message.messageId();
         let returned;
 
         const hasInvalidAddresses = []
@@ -73,19 +67,17 @@ class SendmailTransport {
             .concat(envelope.to || [])
             .some(addr => /^-/.test(addr));
         if (hasInvalidAddresses) {
-            let err = new Error('Can not send mail. Invalid envelope addresses.');
+            const err = new Error('Can not send mail. Invalid envelope addresses.');
             err.code = errors.ESENDMAIL;
             return done(err);
         }
 
-        if (this.args) {
-            // force -i to keep single dots
-            args = ['-i'].concat(this.args).concat(envelope.to);
-        } else {
-            args = ['-i'].concat(envelope.from ? ['-f', envelope.from] : []).concat(envelope.to);
-        }
+        // force -i to keep single dots
+        const args = this.args
+            ? ['-i'].concat(this.args).concat(envelope.to)
+            : ['-i'].concat(envelope.from ? ['-f', envelope.from] : []).concat(envelope.to);
 
-        let callback = err => {
+        const callback = err => {
             if (returned) {
                 // ignore any additional responses, already done
                 return;
@@ -94,16 +86,16 @@ class SendmailTransport {
             if (typeof done === 'function') {
                 if (err) {
                     return done(err);
-                } else {
-                    return done(null, {
-                        envelope: mail.data.envelope || mail.message.getEnvelope(),
-                        messageId,
-                        response: 'Messages queued for delivery'
-                    });
                 }
+                return done(null, {
+                    envelope,
+                    messageId,
+                    response: 'Messages queued for delivery'
+                });
             }
         };
 
+        let sendmail;
         try {
             sendmail = this._spawn(this.path, args);
         } catch (E) {
@@ -138,12 +130,9 @@ class SendmailTransport {
                 if (!code) {
                     return callback();
                 }
-                let err;
-                if (code === 127) {
-                    err = new Error('Sendmail command not found, process exited with code ' + code);
-                } else {
-                    err = new Error('Sendmail exited with code ' + code);
-                }
+                const err = new Error(
+                    code === 127 ? 'Sendmail command not found, process exited with code ' + code : 'Sendmail exited with code ' + code
+                );
                 err.code = errors.ESENDMAIL;
 
                 this.logger.error(
@@ -174,7 +163,7 @@ class SendmailTransport {
                 callback(err);
             });
 
-            let recipients = [].concat(envelope.to || []);
+            const recipients = [].concat(envelope.to || []);
             if (recipients.length > 3) {
                 recipients.push('...and ' + recipients.splice(2).length + ' more');
             }
@@ -188,7 +177,7 @@ class SendmailTransport {
                 recipients.join(', ')
             );
 
-            let sourceStream = mail.message.createReadStream();
+            const sourceStream = mail.message.createReadStream();
             sourceStream.once('error', err => {
                 this.logger.error(
                     {
@@ -206,7 +195,7 @@ class SendmailTransport {
 
             sourceStream.pipe(sendmail.stdin);
         } else {
-            let err = new Error('sendmail was not found');
+            const err = new Error('sendmail was not found');
             err.code = errors.ESENDMAIL;
             return callback(err);
         }

package/lib/ses-transport/index.js

@@ -17,7 +17,7 @@ class SESTransport extends EventEmitter {
         super();
         options = options || {};
 
-        this.options = options || {};
+        this.options = options;
         this.ses = this.options.SES;
 
         this.name = 'SESTransport';
@@ -46,21 +46,16 @@ class SESTransport extends EventEmitter {
      * @param {Function} callback Callback function to run when the sending is completed
      */
     send(mail, callback) {
-        let statObject = {
-            ts: Date.now(),
-            pending: true
-        };
-
         let fromHeader = mail.message._headers.find(header => /^from$/i.test(header.key));
         if (fromHeader) {
-            let mimeNode = new MimeNode('text/plain');
+            const mimeNode = new MimeNode('text/plain');
             fromHeader = mimeNode._convertAddresses(mimeNode._parseAddresses(fromHeader.value));
         }
 
-        let envelope = mail.data.envelope || mail.message.getEnvelope();
-        let messageId = mail.message.messageId();
+        const envelope = mail.data.envelope || mail.message.getEnvelope();
+        const messageId = mail.message.messageId();
 
-        let recipients = [].concat(envelope.to || []);
+        const recipients = [].concat(envelope.to || []);
         if (recipients.length > 3) {
             recipients.push('...and ' + recipients.splice(2).length + ' more');
         }
@@ -74,7 +69,7 @@ class SESTransport extends EventEmitter {
             recipients.join(', ')
         );
 
-        let getRawMessage = next => {
+        const getRawMessage = next => {
             // do not use Message-ID and Date in DKIM signature
             if (!mail.data._dkim) {
                 mail.data._dkim = {};
@@ -85,9 +80,9 @@ class SESTransport extends EventEmitter {
                 mail.data._dkim.skipFields = 'date:message-id';
             }
 
-            let sourceStream = mail.message.createReadStream();
-            let stream = sourceStream.pipe(new LeWindows());
-            let chunks = [];
+            const sourceStream = mail.message.createReadStream();
+            const stream = sourceStream.pipe(new LeWindows());
+            const chunks = [];
             let chunklen = 0;
 
             stream.on('readable', () => {
@@ -100,9 +95,7 @@ class SESTransport extends EventEmitter {
 
             sourceStream.once('error', err => stream.emit('error', err));
 
-            stream.once('error', err => {
-                next(err);
-            });
+            stream.once('error', err => next(err));
 
             stream.once('end', () => next(null, Buffer.concat(chunks, chunklen)));
         };
@@ -120,26 +113,24 @@ class SESTransport extends EventEmitter {
                         messageId,
                         err.message
                     );
-                    statObject.pending = false;
                     return callback(err);
                 }
 
-                let sesMessage = {
-                    Content: {
-                        Raw: {
-                            // required
-                            Data: raw // required
+                const sesMessage = Object.assign(
+                    {
+                        Content: {
+                            Raw: {
+                                // required
+                                Data: raw // required
+                            }
+                        },
+                        FromEmailAddress: fromHeader || envelope.from,
+                        Destination: {
+                            ToAddresses: envelope.to
                         }
                     },
-                    FromEmailAddress: fromHeader ? fromHeader : envelope.from,
-                    Destination: {
-                        ToAddresses: envelope.to
-                    }
-                };
-
-                Object.keys(mail.data.ses || {}).forEach(key => {
-                    sesMessage[key] = mail.data.ses[key];
-                });
+                    mail.data.ses || {}
+                );
 
                 this.getRegion((err, region) => {
                     if (err || !region) {
@@ -155,7 +146,6 @@ class SESTransport extends EventEmitter {
                                 region = 'email';
                             }
 
-                            statObject.pending = true;
                             callback(null, {
                                 envelope: {
                                     from: envelope.from,
@@ -176,7 +166,6 @@ class SESTransport extends EventEmitter {
                                 messageId,
                                 err.message
                             );
-                            statObject.pending = false;
                             callback(err);
                         });
                 });

package/lib/shared/index.js

@@ -30,34 +30,28 @@ try {
 module.exports.networkInterfaces = networkInterfaces;
 
 const isFamilySupported = (family, allowInternal) => {
-    let networkInterfaces = module.exports.networkInterfaces;
-    if (!networkInterfaces) {
+    const ifaces = module.exports.networkInterfaces;
+    if (!ifaces) {
         // hope for the best
         return true;
     }
 
-    const familySupported =
-        // crux that replaces Object.values(networkInterfaces) as Object.values is not supported in nodejs v6
-        Object.keys(networkInterfaces)
-            .map(key => networkInterfaces[key])
-            // crux that replaces .flat() as it is not supported in older Node versions (v10 and older)
-            .reduce((acc, val) => acc.concat(val), [])
-            .filter(i => !i.internal || allowInternal)
-            .filter(i => i.family === 'IPv' + family || i.family === family).length > 0;
-
-    return familySupported;
+    return Object.keys(ifaces)
+        .map(key => ifaces[key])
+        .reduce((acc, val) => acc.concat(val), [])
+        .filter(i => !i.internal || allowInternal)
+        .some(i => i.family === 'IPv' + family || i.family === family);
 };
 
-const resolver = (family, hostname, options, callback) => {
+const resolve = (family, hostname, options, callback) => {
     options = options || {};
-    const familySupported = isFamilySupported(family, options.allowInternalNetworkInterfaces);
 
-    if (!familySupported) {
+    if (!isFamilySupported(family, options.allowInternalNetworkInterfaces)) {
         return callback(null, []);
     }
 
-    const resolver = dns.Resolver ? new dns.Resolver(options) : dns;
-    resolver['resolve' + family](hostname, (err, addresses) => {
+    const dnsResolver = dns.Resolver ? new dns.Resolver(options) : dns;
+    dnsResolver['resolve' + family](hostname, (err, addresses) => {
         if (err) {
             switch (err.code) {
                 case dns.NODATA:
@@ -82,15 +76,10 @@ const formatDNSValue = (value, extra) => {
         return Object.assign({}, extra || {});
     }
 
-    let addresses = value.addresses || [];
+    const addresses = value.addresses || [];
 
     // Select a random address from available addresses, or null if none
-    let host = null;
-    if (addresses.length === 1) {
-        host = addresses[0];
-    } else if (addresses.length > 1) {
-        host = addresses[Math.floor(Math.random() * addresses.length)];
-    }
+    const host = addresses.length > 0 ? addresses[Math.floor(Math.random() * addresses.length)] : null;
 
     return Object.assign(
         {
@@ -112,7 +101,7 @@ module.exports.resolveHostname = (options, callback) => {
 
     if (!options.host || net.isIP(options.host)) {
         // nothing to do here
-        let value = {
+        const value = {
             addresses: [options.host],
             servername: options.servername || false
         };
@@ -164,14 +153,14 @@ module.exports.resolveHostname = (options, callback) => {
     let ipv4Error = null;
     let ipv6Error = null;
 
-    resolver(4, options.host, options, (err, addresses) => {
+    resolve(4, options.host, options, (err, addresses) => {
         if (err) {
             ipv4Error = err;
         } else {
             ipv4Addresses = addresses || [];
         }
 
-        resolver(6, options.host, options, (err, addresses) => {
+        resolve(6, options.host, options, (err, addresses) => {
             if (err) {
                 ipv6Error = err;
             } else {
@@ -179,10 +168,10 @@ module.exports.resolveHostname = (options, callback) => {
             }
 
             // Combine addresses: IPv4 first, then IPv6
-            let allAddresses = ipv4Addresses.concat(ipv6Addresses);
+            const allAddresses = ipv4Addresses.concat(ipv6Addresses);
 
             if (allAddresses.length) {
-                let value = {
+                const value = {
                     addresses: allAddresses,
                     servername: options.servername || options.host
                 };
@@ -240,7 +229,7 @@ module.exports.resolveHostname = (options, callback) => {
                     }
 
                     // Get all supported addresses from dns.lookup
-                    let supportedAddresses = addresses
+                    const supportedAddresses = addresses
                         ? addresses.filter(addr => isFamilySupported(addr.family)).map(addr => addr.address)
                         : [];
 
@@ -259,7 +248,7 @@ module.exports.resolveHostname = (options, callback) => {
                         );
                     }
 
-                    let value = {
+                    const value = {
                         addresses: supportedAddresses.length ? supportedAddresses : [options.host],
                         servername: options.servername || options.host
                     };
@@ -304,95 +293,78 @@ module.exports.resolveHostname = (options, callback) => {
  */
 module.exports.parseConnectionUrl = str => {
     str = str || '';
-    let options = {};
-
-    [urllib.parse(str, true)].forEach(url => {
-        let auth;
-
-        switch (url.protocol) {
-            case 'smtp:':
-                options.secure = false;
-                break;
-            case 'smtps:':
-                options.secure = true;
-                break;
-            case 'direct:':
-                options.direct = true;
-                break;
-        }
+    const options = {};
+    const url = urllib.parse(str, true);
+
+    switch (url.protocol) {
+        case 'smtp:':
+            options.secure = false;
+            break;
+        case 'smtps:':
+            options.secure = true;
+            break;
+        case 'direct:':
+            options.direct = true;
+            break;
+    }
 
-        if (!isNaN(url.port) && Number(url.port)) {
-            options.port = Number(url.port);
-        }
+    if (!isNaN(url.port) && Number(url.port)) {
+        options.port = Number(url.port);
+    }
 
-        if (url.hostname) {
-            options.host = url.hostname;
-        }
+    if (url.hostname) {
+        options.host = url.hostname;
+    }
 
-        if (url.auth) {
-            auth = url.auth.split(':');
+    if (url.auth) {
+        const auth = url.auth.split(':');
+        options.auth = {
+            user: auth.shift(),
+            pass: auth.join(':')
+        };
+    }
 
-            if (!options.auth) {
-                options.auth = {};
-            }
+    Object.keys(url.query || {}).forEach(key => {
+        let obj = options;
+        let lKey = key;
+        let value = url.query[key];
 
-            options.auth.user = auth.shift();
-            options.auth.pass = auth.join(':');
+        if (!isNaN(value)) {
+            value = Number(value);
         }
 
-        Object.keys(url.query || {}).forEach(key => {
-            let obj = options;
-            let lKey = key;
-            let value = url.query[key];
-
-            if (!isNaN(value)) {
-                value = Number(value);
-            }
-
-            switch (value) {
-                case 'true':
-                    value = true;
-                    break;
-                case 'false':
-                    value = false;
-                    break;
-            }
+        switch (value) {
+            case 'true':
+                value = true;
+                break;
+            case 'false':
+                value = false;
+                break;
+        }
 
-            // tls is nested object
-            if (key.indexOf('tls.') === 0) {
-                lKey = key.substr(4);
-                if (!options.tls) {
-                    options.tls = {};
-                }
-                obj = options.tls;
-            } else if (key.indexOf('.') >= 0) {
-                // ignore nested properties besides tls
-                return;
+        // tls is nested object
+        if (key.indexOf('tls.') === 0) {
+            lKey = key.substr(4);
+            if (!options.tls) {
+                options.tls = {};
             }
+            obj = options.tls;
+        } else if (key.indexOf('.') >= 0) {
+            // ignore nested properties besides tls
+            return;
+        }
 
-            if (!(lKey in obj)) {
-                obj[lKey] = value;
-            }
-        });
+        if (!(lKey in obj)) {
+            obj[lKey] = value;
+        }
     });
 
     return options;
 };
 
 module.exports._logFunc = (logger, level, defaults, data, message, ...args) => {
-    let entry = {};
-
-    Object.keys(defaults || {}).forEach(key => {
-        if (key !== 'level') {
-            entry[key] = defaults[key];
-        }
-    });
-
-    Object.keys(data || {}).forEach(key => {
-        if (key !== 'level') {
-            entry[key] = data[key];
-        }
-    });
+    const entry = Object.assign({}, defaults || {}, data || {});
+    delete entry.level;
 
     logger[level](entry, message, ...args);
 };
@@ -407,8 +379,8 @@ module.exports._logFunc = (logger, level, defaults, data, message, ...args) => {
 module.exports.getLogger = (options, defaults) => {
     options = options || {};
 
-    let response = {};
-    let levels = ['trace', 'debug', 'info', 'warn', 'error', 'fatal'];
+    const response = {};
+    const levels = ['trace', 'debug', 'info', 'warn', 'error', 'fatal'];
 
     if (!options.logger) {
         // use vanity logger
@@ -418,12 +390,7 @@ module.exports.getLogger = (options, defaults) => {
         return response;
     }
 
-    let logger = options.logger;
-
-    if (options.logger === true) {
-        // create console logger
-        logger = createDefaultLogger(levels);
-    }
+    const logger = options.logger === true ? createDefaultLogger(levels) : options.logger;
 
     levels.forEach(level => {
         response[level] = (data, message, ...args) => {
@@ -443,8 +410,8 @@ module.exports.getLogger = (options, defaults) => {
  */
 module.exports.callbackPromise = (resolve, reject) =>
     function () {
-        let args = Array.from(arguments);
-        let err = args.shift();
+        const args = Array.from(arguments);
+        const err = args.shift();
         if (err) {
             reject(err);
         } else {
@@ -546,8 +513,7 @@ 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')
+    const encoding = ((typeof data[key] === 'object' && data[key].encoding) || 'utf8')
         .toString()
         .toLowerCase()
         .replace(/[-_\s]/g, '');
@@ -572,10 +538,9 @@ module.exports.resolveContent = (data, key, callback) => {
                 callback(null, value);
             });
         } else if (/^https?:\/\//i.test(content.path || content.href)) {
-            contentStream = nmfetch(content.path || content.href);
-            return resolveStream(contentStream, callback);
+            return resolveStream(nmfetch(content.path || content.href), callback);
         } else if (/^data:/i.test(content.path || content.href)) {
-            let parsedDataUri = module.exports.parseDataURI(content.path || content.href);
+            const parsedDataUri = module.exports.parseDataURI(content.path || content.href);
 
             if (!parsedDataUri || !parsedDataUri.data) {
                 return callback(null, Buffer.from(0));
@@ -600,21 +565,15 @@ module.exports.resolveContent = (data, key, callback) => {
  * Copies properties from source objects to target objects
  */
 module.exports.assign = function (/* target, ... sources */) {
-    let args = Array.from(arguments);
-    let target = args.shift() || {};
+    const args = Array.from(arguments);
+    const target = args.shift() || {};
 
     args.forEach(source => {
         Object.keys(source || {}).forEach(key => {
             if (['tls', 'auth'].includes(key) && source[key] && typeof source[key] === 'object') {
                 // tls and auth are special keys that need to be enumerated separately
                 // other objects are passed as is
-                if (!target[key]) {
-                    // ensure that target has this key
-                    target[key] = {};
-                }
-                Object.keys(source[key]).forEach(subKey => {
-                    target[key][subKey] = source[key][subKey];
-                });
+                target[key] = Object.assign(target[key] || {}, source[key]);
             } else {
                 target[key] = source[key];
             }
@@ -631,10 +590,10 @@ module.exports.encodeXText = str => {
     if (!/[^\x21-\x2A\x2C-\x3C\x3E-\x7E]/.test(str)) {
         return str;
     }
-    let buf = Buffer.from(str);
+    const buf = Buffer.from(str);
     let result = '';
     for (let i = 0, len = buf.length; i < len; i++) {
-        let c = buf[i];
+        const c = buf[i];
         if (c < 0x21 || c > 0x7e || c === 0x2b || c === 0x3d) {
             result += '+' + (c < 0x10 ? '0' : '') + c.toString(16).toUpperCase();
         } else {
@@ -652,7 +611,7 @@ module.exports.encodeXText = str => {
  */
 function resolveStream(stream, callback) {
     let responded = false;
-    let chunks = [];
+    const chunks = [];
     let chunklen = 0;
 
     stream.on('error', err => {
@@ -695,13 +654,8 @@ function resolveStream(stream, callback) {
  * @returns {Object} Bunyan logger instance
  */
 function createDefaultLogger(levels) {
-    let levelMaxLen = 0;
-    let levelNames = new Map();
-    levels.forEach(level => {
-        if (level.length > levelMaxLen) {
-            levelMaxLen = level.length;
-        }
-    });
+    const levelMaxLen = levels.reduce((max, level) => Math.max(max, level.length), 0);
+    const levelNames = new Map();
 
     levels.forEach(level => {
         let levelName = level.toUpperCase();
@@ -711,7 +665,7 @@ function createDefaultLogger(levels) {
         levelNames.set(level, levelName);
     });
 
-    let print = (level, entry, message, ...args) => {
+    const print = (level, entry, message, ...args) => {
         let prefix = '';
         if (entry) {
             if (entry.tnx === 'server') {
@@ -735,7 +689,7 @@ function createDefaultLogger(levels) {
         });
     };
 
-    let logger = {};
+    const logger = {};
     levels.forEach(level => {
         logger[level] = print.bind(null, level);
     });