nodemailer 8.0.2 → 8.0.4

package/lib/fetch/cookies.js

@@ -25,8 +25,8 @@ class Cookies {
      * @param {String} url Current URL
      */
     set(cookieStr, url) {
-        let urlparts = urllib.parse(url || '');
-        let cookie = this.parse(cookieStr);
+        const urlparts = urllib.parse(url || '');
+        const cookie = this.parse(cookieStr);
         let domain;
 
         if (cookie.domain) {
@@ -76,15 +76,13 @@ class Cookies {
      * @returns {Array} An array of cookie objects
      */
     list(url) {
-        let result = [];
-        let i;
-        let cookie;
+        const result = [];
 
-        for (i = this.cookies.length - 1; i >= 0; i--) {
-            cookie = this.cookies[i];
+        for (let i = this.cookies.length - 1; i >= 0; i--) {
+            const cookie = this.cookies[i];
 
             if (this.isExpired(cookie)) {
-                this.cookies.splice(i, i);
+                this.cookies.splice(i, 1);
                 continue;
             }
 
@@ -103,14 +101,14 @@ class Cookies {
      * @returns {Object} Cookie object
      */
     parse(cookieStr) {
-        let cookie = {};
+        const cookie = {};
 
         (cookieStr || '')
             .toString()
             .split(';')
             .forEach(cookiePart => {
-                let valueParts = cookiePart.split('=');
-                let key = valueParts.shift().trim().toLowerCase();
+                const valueParts = cookiePart.split('=');
+                const key = valueParts.shift().trim().toLowerCase();
                 let value = valueParts.join('=').trim();
                 let domain;
 
@@ -171,7 +169,7 @@ class Cookies {
      * @returns {Boolean} true if cookie is valid for specifiec URL
      */
     match(cookie, url) {
-        let urlparts = urllib.parse(url || '');
+        const urlparts = urllib.parse(url || '');
 
         // check if hostname matches
         // .foo.com also matches subdomains, foo.com does not
@@ -183,7 +181,7 @@ class Cookies {
         }
 
         // check if path matches
-        let path = this.getPath(urlparts.pathname);
+        const path = this.getPath(urlparts.pathname);
         if (path.substr(0, cookie.path.length) !== cookie.path) {
             return false;
         }
@@ -202,16 +200,13 @@ class Cookies {
      * @param {Object} cookie Cookie value to be stored
      */
     add(cookie) {
-        let i;
-        let len;
-
         // nothing to do here
         if (!cookie || !cookie.name) {
             return false;
         }
 
         // overwrite if has same params
-        for (i = 0, len = this.cookies.length; i < len; i++) {
+        for (let i = 0, len = this.cookies.length; i < len; i++) {
             if (this.compare(this.cookies[i], cookie)) {
                 // check if the cookie needs to be removed instead
                 if (this.isExpired(cookie)) {
@@ -240,7 +235,7 @@ class Cookies {
      * @returns {Boolean} True, if the cookies are the same
      */
     compare(a, b) {
-        return a.name === b.name && a.path === b.path && a.domain === b.domain && a.secure === b.secure && a.httponly === a.httponly;
+        return a.name === b.name && a.path === b.path && a.domain === b.domain && a.secure === b.secure && a.httponly === b.httponly;
     }
 
     /**

package/lib/fetch/index.js

@@ -4,7 +4,7 @@ const http = require('http');
 const https = require('https');
 const urllib = require('url');
 const zlib = require('zlib');
-const PassThrough = require('stream').PassThrough;
+const { PassThrough } = require('stream');
 const Cookies = require('./cookies');
 const packageData = require('../../package.json');
 const net = require('net');
@@ -33,16 +33,16 @@ function nmfetch(url, options) {
         options.cookie = false;
     }
 
-    let fetchRes = options.fetchRes;
-    let parsed = urllib.parse(url);
+    const fetchRes = options.fetchRes;
+    const parsed = urllib.parse(url);
     let method = (options.method || '').toString().trim().toUpperCase() || 'GET';
     let finished = false;
     let cookies;
     let body;
 
-    let handler = parsed.protocol === 'https:' ? https : http;
+    const handler = parsed.protocol === 'https:' ? https : http;
 
-    let headers = {
+    const headers = {
         'accept-encoding': 'gzip,deflate',
         'user-agent': 'nodemailer/' + packageData.version
     };
@@ -90,7 +90,7 @@ function nmfetch(url, options) {
                     body = Buffer.from(
                         Object.keys(options.body)
                             .map(key => {
-                                let value = options.body[key].toString().trim();
+                                const value = options.body[key].toString().trim();
                                 return encodeURIComponent(key) + '=' + encodeURIComponent(value);
                             })
                             .join('&')
@@ -117,7 +117,7 @@ function nmfetch(url, options) {
     }
 
     let req;
-    let reqOptions = {
+    const reqOptions = {
         method,
         host: parsed.hostname,
         path: parsed.path,
@@ -128,9 +128,7 @@ function nmfetch(url, options) {
     };
 
     if (options.tls) {
-        Object.keys(options.tls).forEach(key => {
-            reqOptions[key] = options.tls[key];
-        });
+        Object.assign(reqOptions, options.tls);
     }
 
     if (
@@ -162,7 +160,7 @@ function nmfetch(url, options) {
             }
             finished = true;
             req.abort();
-            let err = new Error('Request Timeout');
+            const err = new Error('Request Timeout');
             err.code = errors.EFETCH;
             err.sourceUrl = url;
             fetchRes.emit('error', err);
@@ -204,7 +202,7 @@ function nmfetch(url, options) {
             options.redirects++;
             if (options.redirects > options.maxRedirects) {
                 finished = true;
-                let err = new Error('Maximum redirect count exceeded');
+                const err = new Error('Maximum redirect count exceeded');
                 err.code = errors.EFETCH;
                 err.sourceUrl = url;
                 fetchRes.emit('error', err);
@@ -222,7 +220,7 @@ function nmfetch(url, options) {
 
         if (res.statusCode >= 300 && !options.allowErrorResponse) {
             finished = true;
-            let err = new Error('Invalid status code ' + res.statusCode);
+            const err = new Error('Invalid status code ' + res.statusCode);
             err.code = errors.EFETCH;
             err.sourceUrl = url;
             fetchRes.emit('error', err);
@@ -263,9 +261,8 @@ function nmfetch(url, options) {
             try {
                 if (typeof body.pipe === 'function') {
                     return body.pipe(req);
-                } else {
-                    req.write(body);
                 }
+                req.write(body);
             } catch (err) {
                 finished = true;
                 err.code = errors.EFETCH;

package/lib/json-transport/index.js

@@ -13,7 +13,7 @@ class JSONTransport {
     constructor(options) {
         options = options || {};
 
-        this.options = options || {};
+        this.options = options;
 
         this.name = 'JSONTransport';
         this.version = packageData.version;
@@ -33,10 +33,10 @@ class JSONTransport {
         // Sendmail strips this header line by itself
         mail.message.keepBcc = true;
 
-        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');
         }

package/lib/mail-composer/index.js

@@ -4,7 +4,7 @@
 
 const MimeNode = require('../mime-node');
 const mimeFuncs = require('../mime-funcs');
-const parseDataURI = require('../shared').parseDataURI;
+const { parseDataURI } = require('../shared');
 
 /**
  * Creates the object for composing a MimeNode instance out from the mail options
@@ -59,7 +59,7 @@ class MailComposer {
 
         // Add headers to the root node, always overrides custom headers
         ['from', 'sender', 'to', 'cc', 'bcc', 'reply-to', 'in-reply-to', 'references', 'subject', 'message-id', 'date'].forEach(header => {
-            let key = header.replace(/-(\w)/g, (o, c) => c.toUpperCase());
+            const key = header.replace(/-(\w)/g, (o, c) => c.toUpperCase());
             if (this.mail[key]) {
                 this.message.setHeader(header, this.mail[key]);
             }
@@ -84,20 +84,18 @@ class MailComposer {
      */
     getAttachments(findRelated) {
         let icalEvent, eventObject;
-        let attachments = [].concat(this.mail.attachments || []).map((attachment, i) => {
-            let data;
-
+        const attachments = [].concat(this.mail.attachments || []).map((attachment, i) => {
             if (/^data:/i.test(attachment.path || attachment.href)) {
                 attachment = this._processDataUrl(attachment);
             }
 
-            let contentType =
+            const contentType =
                 attachment.contentType || mimeFuncs.detectMimeType(attachment.filename || attachment.path || attachment.href || 'bin');
 
-            let isImage = /^image\//i.test(contentType);
-            let isMessageNode = /^message\//i.test(contentType);
+            const isImage = /^image\//i.test(contentType);
+            const isMessageNode = /^message\//i.test(contentType);
 
-            let contentDisposition =
+            const contentDisposition =
                 attachment.contentDisposition || (isMessageNode || (isImage && attachment.cid) ? 'inline' : 'attachment');
 
             let contentTransferEncoding;
@@ -111,7 +109,7 @@ class MailComposer {
                 contentTransferEncoding = 'base64'; // the default
             }
 
-            data = {
+            const data = {
                 contentType,
                 contentDisposition,
                 contentTransferEncoding
@@ -173,10 +171,7 @@ class MailComposer {
                 };
             }
 
-            eventObject = {};
-            Object.keys(icalEvent).forEach(key => {
-                eventObject[key] = icalEvent[key];
-            });
+            eventObject = Object.assign({}, icalEvent);
 
             eventObject.contentType = 'application/ics';
             if (!eventObject.headers) {
@@ -192,12 +187,12 @@ class MailComposer {
                 attached: attachments.concat(eventObject || []),
                 related: []
             };
-        } else {
-            return {
-                attached: attachments.filter(attachment => !attachment.cid).concat(eventObject || []),
-                related: attachments.filter(attachment => !!attachment.cid)
-            };
         }
+
+        return {
+            attached: attachments.filter(attachment => !attachment.cid).concat(eventObject || []),
+            related: attachments.filter(attachment => !!attachment.cid)
+        };
     }
 
     /**
@@ -206,13 +201,8 @@ class MailComposer {
      * @returns {Array} An array of alternative elements. Includes the `text` and `html` values as well
      */
     getAlternatives() {
-        let alternatives = [],
-            text,
-            html,
-            watchHtml,
-            amp,
-            icalEvent,
-            eventObject;
+        const alternatives = [];
+        let text, html, watchHtml, amp, icalEvent, eventObject;
 
         if (this.mail.text) {
             if (
@@ -269,10 +259,7 @@ class MailComposer {
                 };
             }
 
-            eventObject = {};
-            Object.keys(icalEvent).forEach(key => {
-                eventObject[key] = icalEvent[key];
-            });
+            eventObject = Object.assign({}, icalEvent);
 
             if (eventObject.content && typeof eventObject.content === 'object') {
                 // we are going to have the same attachment twice, so mark this to be
@@ -310,13 +297,11 @@ class MailComposer {
             .concat(eventObject || [])
             .concat(this.mail.alternatives || [])
             .forEach(alternative => {
-                let data;
-
                 if (/^data:/i.test(alternative.path || alternative.href)) {
                     alternative = this._processDataUrl(alternative);
                 }
 
-                data = {
+                const data = {
                     contentType:
                         alternative.contentType ||
                         mimeFuncs.detectMimeType(alternative.filename || alternative.path || alternative.href || 'txt'),
@@ -368,26 +353,22 @@ class MailComposer {
      * @returns {Object} MimeNode node element
      */
     _createMixed(parentNode) {
-        let node;
-
-        if (!parentNode) {
-            node = new MimeNode('multipart/mixed', {
-                baseBoundary: this.mail.baseBoundary,
-                textEncoding: this.mail.textEncoding,
-                boundaryPrefix: this.mail.boundaryPrefix,
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        } else {
-            node = parentNode.createChild('multipart/mixed', {
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        }
+        const node = parentNode
+            ? parentNode.createChild('multipart/mixed', {
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              })
+            : new MimeNode('multipart/mixed', {
+                  baseBoundary: this.mail.baseBoundary,
+                  textEncoding: this.mail.textEncoding,
+                  boundaryPrefix: this.mail.boundaryPrefix,
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              });
 
         if (this._useAlternative) {
             this._createAlternative(node);
@@ -416,26 +397,22 @@ class MailComposer {
      * @returns {Object} MimeNode node element
      */
     _createAlternative(parentNode) {
-        let node;
-
-        if (!parentNode) {
-            node = new MimeNode('multipart/alternative', {
-                baseBoundary: this.mail.baseBoundary,
-                textEncoding: this.mail.textEncoding,
-                boundaryPrefix: this.mail.boundaryPrefix,
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        } else {
-            node = parentNode.createChild('multipart/alternative', {
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        }
+        const node = parentNode
+            ? parentNode.createChild('multipart/alternative', {
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              })
+            : new MimeNode('multipart/alternative', {
+                  baseBoundary: this.mail.baseBoundary,
+                  textEncoding: this.mail.textEncoding,
+                  boundaryPrefix: this.mail.boundaryPrefix,
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              });
 
         this._alternatives.forEach(alternative => {
             if (this._useRelated && this._htmlNode === alternative) {
@@ -455,26 +432,22 @@ class MailComposer {
      * @returns {Object} MimeNode node element
      */
     _createRelated(parentNode) {
-        let node;
-
-        if (!parentNode) {
-            node = new MimeNode('multipart/related; type="text/html"', {
-                baseBoundary: this.mail.baseBoundary,
-                textEncoding: this.mail.textEncoding,
-                boundaryPrefix: this.mail.boundaryPrefix,
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        } else {
-            node = parentNode.createChild('multipart/related; type="text/html"', {
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        }
+        const node = parentNode
+            ? parentNode.createChild('multipart/related; type="text/html"', {
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              })
+            : new MimeNode('multipart/related; type="text/html"', {
+                  baseBoundary: this.mail.baseBoundary,
+                  textEncoding: this.mail.textEncoding,
+                  boundaryPrefix: this.mail.boundaryPrefix,
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              });
 
         this._createContentNode(node, this._htmlNode);
 
@@ -494,33 +467,30 @@ class MailComposer {
         element = element || {};
         element.content = element.content || '';
 
-        let node;
-        let encoding = (element.encoding || 'utf8')
+        const encoding = (element.encoding || 'utf8')
             .toString()
             .toLowerCase()
             .replace(/[-_\s]/g, '');
 
-        if (!parentNode) {
-            node = new MimeNode(element.contentType, {
-                filename: element.filename,
-                baseBoundary: this.mail.baseBoundary,
-                textEncoding: this.mail.textEncoding,
-                boundaryPrefix: this.mail.boundaryPrefix,
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        } else {
-            node = parentNode.createChild(element.contentType, {
-                filename: element.filename,
-                textEncoding: this.mail.textEncoding,
-                disableUrlAccess: this.mail.disableUrlAccess,
-                disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey,
-                newline: this.mail.newline
-            });
-        }
+        const node = parentNode
+            ? parentNode.createChild(element.contentType, {
+                  filename: element.filename,
+                  textEncoding: this.mail.textEncoding,
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              })
+            : new MimeNode(element.contentType, {
+                  filename: element.filename,
+                  baseBoundary: this.mail.baseBoundary,
+                  textEncoding: this.mail.textEncoding,
+                  boundaryPrefix: this.mail.boundaryPrefix,
+                  disableUrlAccess: this.mail.disableUrlAccess,
+                  disableFileAccess: this.mail.disableFileAccess,
+                  normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                  newline: this.mail.newline
+              });
 
         // add custom headers
         if (element.headers) {

package/lib/mailer/index.js

@@ -106,17 +106,17 @@ class Mail extends EventEmitter {
                         this.getSocket = false;
                     }
                     return this.transporter[method](...args);
-                } else {
-                    this.logger.warn(
-                        {
-                            tnx: 'transport',
-                            methodName: method
-                        },
-                        'Non existing method %s called for transport',
-                        method
-                    );
-                    return false;
                 }
+
+                this.logger.warn(
+                    {
+                        tnx: 'transport',
+                        methodName: method
+                    },
+                    'Non existing method %s called for transport',
+                    method
+                );
+                return false;
             };
         });
 
@@ -157,7 +157,7 @@ class Mail extends EventEmitter {
             this.getSocket = false;
         }
 
-        let mail = new MailMessage(this, data);
+        const mail = new MailMessage(this, data);
 
         this.logger.debug(
             {
@@ -207,7 +207,7 @@ class Mail extends EventEmitter {
 
                 if (mail.data.dkim || this.dkim) {
                     mail.message.processFunc(input => {
-                        let dkim = mail.data.dkim ? new DKIM(mail.data.dkim) : this.dkim;
+                        const dkim = mail.data.dkim ? new DKIM(mail.data.dkim) : this.dkim;
                         this.logger.debug(
                             {
                                 tnx: 'DKIM',
@@ -259,8 +259,8 @@ class Mail extends EventEmitter {
             return callback();
         }
 
-        let userPlugins = this._userPlugins[step] || [];
-        let defaultPlugins = this._defaultPlugins[step] || [];
+        const userPlugins = this._userPlugins[step] || [];
+        const defaultPlugins = this._defaultPlugins[step] || [];
 
         if (userPlugins.length) {
             this.logger.debug(
@@ -281,7 +281,7 @@ class Mail extends EventEmitter {
 
         let pos = 0;
         let block = 'default';
-        let processPlugins = () => {
+        const processPlugins = () => {
             let curplugins = block === 'default' ? defaultPlugins : userPlugins;
             if (pos >= curplugins.length) {
                 if (block === 'default' && userPlugins.length) {
@@ -292,7 +292,7 @@ class Mail extends EventEmitter {
                     return callback();
                 }
             }
-            let plugin = curplugins[pos++];
+            const plugin = curplugins[pos++];
             plugin(mail, err => {
                 if (err) {
                     return callback(err);
@@ -310,11 +310,11 @@ class Mail extends EventEmitter {
      * @param {String} proxyUrl Proxy configuration url
      */
     setupProxy(proxyUrl) {
-        let proxy = urllib.parse(proxyUrl);
+        const proxy = urllib.parse(proxyUrl);
 
         // setup socket handler for the mailer object
         this.getSocket = (options, callback) => {
-            let protocol = proxy.protocol.replace(/:$/, '').toLowerCase();
+            const protocol = proxy.protocol.replace(/:$/, '').toLowerCase();
 
             if (this.meta.has('proxy_handler_' + protocol)) {
                 return this.meta.get('proxy_handler_' + protocol)(proxy, options, callback);
@@ -342,11 +342,11 @@ class Mail extends EventEmitter {
                         err.code = errors.EPROXY;
                         return callback(err);
                     }
-                    let connect = ipaddress => {
-                        let proxyV2 = !!this.meta.get('proxy_socks_module').SocksClient;
-                        let socksClient = proxyV2 ? this.meta.get('proxy_socks_module').SocksClient : this.meta.get('proxy_socks_module');
-                        let proxyType = Number(proxy.protocol.replace(/\D/g, '')) || 5;
-                        let connectionOpts = {
+                    const connect = ipaddress => {
+                        const proxyV2 = !!this.meta.get('proxy_socks_module').SocksClient;
+                        const socksClient = proxyV2 ? this.meta.get('proxy_socks_module').SocksClient : this.meta.get('proxy_socks_module');
+                        const proxyType = Number(proxy.protocol.replace(/\D/g, '')) || 5;
+                        const connectionOpts = {
                             proxy: {
                                 ipaddress,
                                 port: Number(proxy.port),
@@ -360,8 +360,8 @@ class Mail extends EventEmitter {
                         };
 
                         if (proxy.auth) {
-                            let username = decodeURIComponent(proxy.auth.split(':').shift());
-                            let password = decodeURIComponent(proxy.auth.split(':').pop());
+                            const username = decodeURIComponent(proxy.auth.split(':').shift());
+                            const password = decodeURIComponent(proxy.auth.split(':').pop());
                             if (proxyV2) {
                                 connectionOpts.proxy.userId = username;
                                 connectionOpts.proxy.password = password;
@@ -415,7 +415,7 @@ class Mail extends EventEmitter {
             html = (html || '')
                 .toString()
                 .replace(/(<img\b[^<>]{0,1024} src\s{0,20}=[\s"']{0,20})(data:([^;]+);[^"'>\s]+)/gi, (match, prefix, dataUri, mimeType) => {
-                    let cid = crypto.randomBytes(10).toString('hex') + '@localhost';
+                    const cid = crypto.randomBytes(10).toString('hex') + '@localhost';
                     if (!mail.data.attachments) {
                         mail.data.attachments = [];
                     }