nodemailer 8.0.2 → 8.0.4

package/lib/smtp-pool/index.js

@@ -51,11 +51,8 @@ class SMTPPool extends EventEmitter {
             component: this.options.component || 'smtp-pool'
         });
 
-        // temporary object
-        let connection = new SMTPConnection(this.options);
-
         this.name = 'SMTP (pool)';
-        this.version = packageData.version + '[client:' + connection.version + ']';
+        this.version = packageData.version + '[client:' + packageData.version + ']';
 
         this._rateLimit = {
             counter: 0,
@@ -123,7 +120,7 @@ class SMTPPool extends EventEmitter {
      */
     close() {
         let connection;
-        let len = this._connections.length;
+        const len = this._connections.length;
         this._closed = true;
 
         // clear rate limit timer if it exists
@@ -164,7 +161,7 @@ class SMTPPool extends EventEmitter {
         }
 
         // make sure that entire queue would be cleaned
-        let invokeCallbacks = () => {
+        const invokeCallbacks = () => {
             if (!this._queue.length) {
                 this.logger.debug(
                     {
@@ -174,7 +171,7 @@ class SMTPPool extends EventEmitter {
                 );
                 return;
             }
-            let entry = this._queue.shift();
+            const entry = this._queue.shift();
             if (entry && typeof entry.callback === 'function') {
                 try {
                     entry.callback(new Error('Connection pool was closed'));
@@ -201,9 +198,6 @@ class SMTPPool extends EventEmitter {
      * an available connection, then use this connection to send the mail
      */
     _processMessages() {
-        let connection;
-        let i, len;
-
         // do nothing if already closed
         if (this._closed) {
             return;
@@ -220,12 +214,7 @@ class SMTPPool extends EventEmitter {
         }
 
         // find first available connection
-        for (i = 0, len = this._connections.length; i < len; i++) {
-            if (this._connections[i].available) {
-                connection = this._connections[i];
-                break;
-            }
-        }
+        let connection = this._connections.find(c => c.available);
 
         if (!connection && this._connections.length < this.options.maxConnections) {
             connection = this._createConnection();
@@ -243,7 +232,7 @@ class SMTPPool extends EventEmitter {
             this.emit('idle');
         }
 
-        let entry = (connection.queueEntry = this._queue.shift());
+        const entry = (connection.queueEntry = this._queue.shift());
         entry.messageId = (connection.queueEntry.mail.message.getHeader('message-id') || '').replace(/[<>\s]/g, '');
 
         connection.available = false;
@@ -294,7 +283,7 @@ class SMTPPool extends EventEmitter {
      * Creates a new pool resource
      */
     _createConnection() {
-        let connection = new PoolResource(this);
+        const connection = new PoolResource(this);
 
         connection.id = ++this._connectionCounter;
 
@@ -331,7 +320,7 @@ class SMTPPool extends EventEmitter {
 
         // resource is terminated with an error
         connection.once('error', err => {
-            if (err.code !== 'EMAXLIMIT') {
+            if (err.code !== errors.EMAXLIMIT) {
                 this.logger.warn(
                     {
                         err,
@@ -450,7 +439,7 @@ class SMTPPool extends EventEmitter {
     }
 
     _requeueEntryOnConnectionClose(connection) {
-        connection.queueEntry.requeueAttempts = connection.queueEntry.requeueAttempts + 1;
+        connection.queueEntry.requeueAttempts += 1;
         this.logger.debug(
             {
                 tnx: 'pool',
@@ -484,7 +473,7 @@ class SMTPPool extends EventEmitter {
      * @param {Object} connection The PoolResource to remove
      */
     _removeConnection(connection) {
-        let index = this._connections.indexOf(connection);
+        const index = this._connections.indexOf(connection);
 
         if (index !== -1) {
             this._connections.splice(index, 1);
@@ -501,7 +490,7 @@ class SMTPPool extends EventEmitter {
             return callback();
         }
 
-        let now = Date.now();
+        const now = Date.now();
 
         if (this._rateLimit.counter < this._rateLimit.limit) {
             return callback();
@@ -511,7 +500,9 @@ class SMTPPool extends EventEmitter {
 
         if (this._rateLimit.checkpoint <= now - this._rateLimit.delta) {
             return this._clearRateLimit();
-        } else if (!this._rateLimit.timeout) {
+        }
+
+        if (!this._rateLimit.timeout) {
             this._rateLimit.timeout = setTimeout(() => this._clearRateLimit(), this._rateLimit.delta - (now - this._rateLimit.checkpoint));
             this._rateLimit.checkpoint = now;
         }
@@ -528,7 +519,7 @@ class SMTPPool extends EventEmitter {
 
         // resume all paused connections
         while (this._rateLimit.waiting.length) {
-            let cb = this._rateLimit.waiting.shift();
+            const cb = this._rateLimit.waiting.shift();
             setImmediate(cb);
         }
     }
@@ -554,7 +545,7 @@ class SMTPPool extends EventEmitter {
             });
         }
 
-        let auth = new PoolResource(this).auth;
+        const auth = new PoolResource(this).auth;
 
         this.getSocket(this.options, (err, socketOptions) => {
             if (err) {
@@ -578,13 +569,10 @@ class SMTPPool extends EventEmitter {
                     options.host || '',
                     options.port || ''
                 );
-                options = shared.assign(false, options);
-                Object.keys(socketOptions).forEach(key => {
-                    options[key] = socketOptions[key];
-                });
+                options = Object.assign(shared.assign(false, options), socketOptions);
             }
 
-            let connection = new SMTPConnection(options);
+            const connection = new SMTPConnection(options);
             let returned = false;
 
             connection.once('error', err => {
@@ -604,7 +592,7 @@ class SMTPPool extends EventEmitter {
                 return callback(new Error('Connection closed'));
             });
 
-            let finalize = () => {
+            const finalize = () => {
                 if (returned) {
                     return;
                 }
@@ -633,7 +621,7 @@ class SMTPPool extends EventEmitter {
                         finalize();
                     });
                 } else if (!auth && connection.allowsAuth && options.forceAuth) {
-                    let err = new Error('Authentication info was not provided');
+                    const err = new Error('Authentication info was not provided');
                     err.code = errors.ENOAUTH;
 
                     returned = true;

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

@@ -23,7 +23,7 @@ class PoolResource extends EventEmitter {
         if (this.options.auth) {
             switch ((this.options.auth.type || '').toString().toUpperCase()) {
                 case 'OAUTH2': {
-                    let oauth2 = new XOAuth2(this.options.auth, this.logger);
+                    const oauth2 = new XOAuth2(this.options.auth, this.logger);
                     oauth2.provisionCallback =
                         (this.pool.mailer && this.pool.mailer.get('oauth2_provision_cb')) || oauth2.provisionCallback;
                     this.auth = {
@@ -90,10 +90,7 @@ class PoolResource extends EventEmitter {
                     options.port || ''
                 );
 
-                options = assign(false, options);
-                Object.keys(socketOptions).forEach(key => {
-                    options[key] = socketOptions[key];
-                });
+                options = Object.assign(assign(false, options), socketOptions);
             }
 
             this.connection = new SMTPConnection(options);
@@ -114,12 +111,12 @@ class PoolResource extends EventEmitter {
                 }
                 returned = true;
 
-                let timer = setTimeout(() => {
+                const timer = setTimeout(() => {
                     if (returned) {
                         return;
                     }
                     // still have not returned, this means we have an unexpected connection close
-                    let err = new Error('Unexpected socket close');
+                    const err = new Error('Unexpected socket close');
                     if (this.connection && this.connection._socket && this.connection._socket.upgrading) {
                         // starttls connection errors
                         err.code = errors.ETLS;
@@ -180,10 +177,10 @@ class PoolResource extends EventEmitter {
             });
         }
 
-        let envelope = mail.message.getEnvelope();
-        let messageId = mail.message.messageId();
+        const 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');
         }
@@ -224,9 +221,8 @@ class PoolResource extends EventEmitter {
             info.messageId = messageId;
 
             setImmediate(() => {
-                let err;
                 if (this.messages >= this.options.maxMessages) {
-                    err = new Error('Resource exhausted');
+                    const err = new Error('Resource exhausted');
                     err.code = errors.EMAXLIMIT;
                     this.connection.close();
                     this.emit('error', err);

package/lib/smtp-transport/index.js

@@ -49,11 +49,8 @@ class SMTPTransport extends EventEmitter {
             component: this.options.component || 'smtp-transport'
         });
 
-        // temporary object
-        let connection = new SMTPConnection(this.options);
-
         this.name = 'SMTP';
-        this.version = packageData.version + '[client:' + connection.version + ']';
+        this.version = packageData.version + '[client:' + packageData.version + ']';
 
         if (this.options.auth) {
             this.auth = this.getAuth({});
@@ -77,24 +74,13 @@ class SMTPTransport extends EventEmitter {
             return this.auth;
         }
 
-        let hasAuth = false;
-        let authData = {};
-
-        if (this.options.auth && typeof this.options.auth === 'object') {
-            Object.keys(this.options.auth).forEach(key => {
-                hasAuth = true;
-                authData[key] = this.options.auth[key];
-            });
-        }
-
-        if (authOpts && typeof authOpts === 'object') {
-            Object.keys(authOpts).forEach(key => {
-                hasAuth = true;
-                authData[key] = authOpts[key];
-            });
-        }
+        const authData = Object.assign(
+            {},
+            this.options.auth && typeof this.options.auth === 'object' ? this.options.auth : {},
+            authOpts && typeof authOpts === 'object' ? authOpts : {}
+        );
 
-        if (!hasAuth) {
+        if (Object.keys(authData).length === 0) {
             return false;
         }
 
@@ -103,7 +89,7 @@ class SMTPTransport extends EventEmitter {
                 if (!authData.service && !authData.user) {
                     return false;
                 }
-                let oauth2 = new XOAuth2(authData, this.logger);
+                const oauth2 = new XOAuth2(authData, this.logger);
                 oauth2.provisionCallback = (this.mailer && this.mailer.get('oauth2_provision_cb')) || oauth2.provisionCallback;
                 oauth2.on('token', token => this.mailer.emit('token', token));
                 oauth2.on('error', err => this.emit('error', err));
@@ -160,13 +146,10 @@ class SMTPTransport extends EventEmitter {
                 );
 
                 // only copy options if we need to modify it
-                options = shared.assign(false, options);
-                Object.keys(socketOptions).forEach(key => {
-                    options[key] = socketOptions[key];
-                });
+                options = Object.assign(shared.assign(false, options), socketOptions);
             }
 
-            let connection = new SMTPConnection(options);
+            const connection = new SMTPConnection(options);
 
             connection.once('error', err => {
                 if (returned) {
@@ -182,13 +165,13 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
 
-                let timer = setTimeout(() => {
+                const timer = setTimeout(() => {
                     if (returned) {
                         return;
                     }
                     returned = true;
                     // still have not returned, this means we have an unexpected connection close
-                    let err = new Error('Unexpected socket close');
+                    const err = new Error('Unexpected socket close');
                     if (connection && connection._socket && connection._socket.upgrading) {
                         // starttls connection errors
                         err.code = errors.ETLS;
@@ -203,11 +186,11 @@ class SMTPTransport extends EventEmitter {
                 }
             });
 
-            let sendMessage = () => {
-                let envelope = mail.message.getEnvelope();
-                let messageId = mail.message.messageId();
+            const sendMessage = () => {
+                const 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');
                 }
@@ -272,7 +255,7 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
 
-                let auth = this.getAuth(mail.data.auth);
+                const auth = this.getAuth(mail.data.auth);
 
                 if (auth && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(auth, err => {
@@ -335,13 +318,10 @@ class SMTPTransport extends EventEmitter {
                     options.port || ''
                 );
 
-                options = shared.assign(false, options);
-                Object.keys(socketOptions).forEach(key => {
-                    options[key] = socketOptions[key];
-                });
+                options = Object.assign(shared.assign(false, options), socketOptions);
             }
 
-            let connection = new SMTPConnection(options);
+            const connection = new SMTPConnection(options);
             let returned = false;
 
             connection.once('error', err => {
@@ -361,7 +341,7 @@ class SMTPTransport extends EventEmitter {
                 return callback(new Error('Connection closed'));
             });
 
-            let finalize = () => {
+            const finalize = () => {
                 if (returned) {
                     return;
                 }
@@ -375,7 +355,7 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
 
-                let authData = this.getAuth({});
+                const authData = this.getAuth({});
 
                 if (authData && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(authData, err => {
@@ -392,7 +372,7 @@ class SMTPTransport extends EventEmitter {
                         finalize();
                     });
                 } else if (!authData && connection.allowsAuth && options.forceAuth) {
-                    let err = new Error('Authentication info was not provided');
+                    const err = new Error('Authentication info was not provided');
                     err.code = errors.ENOAUTH;
 
                     returned = true;

package/lib/stream-transport/index.js

@@ -18,7 +18,7 @@ class StreamTransport {
     constructor(options) {
         options = options || {};
 
-        this.options = options || {};
+        this.options = options;
 
         this.name = 'StreamTransport';
         this.version = packageData.version;
@@ -40,10 +40,10 @@ class StreamTransport {
         // We probably need this in the output
         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');
         }
@@ -91,13 +91,13 @@ class StreamTransport {
                     );
                 });
                 return done(null, {
-                    envelope: mail.data.envelope || mail.message.getEnvelope(),
+                    envelope,
                     messageId,
                     message: stream
                 });
             }
 
-            let chunks = [];
+            const chunks = [];
             let chunklen = 0;
             stream.on('readable', () => {
                 let chunk;
@@ -123,7 +123,7 @@ class StreamTransport {
 
             stream.on('end', () =>
                 done(null, {
-                    envelope: mail.data.envelope || mail.message.getEnvelope(),
+                    envelope,
                     messageId,
                     message: Buffer.concat(chunks, chunklen)
                 })

package/lib/well-known/index.js

@@ -4,16 +4,17 @@ const services = require('./services.json');
 const normalized = {};
 
 Object.keys(services).forEach(key => {
-    let service = services[key];
+    const service = services[key];
+    const normalizedService = normalizeService(service);
 
-    normalized[normalizeKey(key)] = normalizeService(service);
+    normalized[normalizeKey(key)] = normalizedService;
 
     [].concat(service.aliases || []).forEach(alias => {
-        normalized[normalizeKey(alias)] = normalizeService(service);
+        normalized[normalizeKey(alias)] = normalizedService;
     });
 
     [].concat(service.domains || []).forEach(domain => {
-        normalized[normalizeKey(domain)] = normalizeService(service);
+        normalized[normalizeKey(domain)] = normalizedService;
     });
 });
 
@@ -22,11 +23,10 @@ function normalizeKey(key) {
 }
 
 function normalizeService(service) {
-    let filter = ['domains', 'aliases'];
-    let response = {};
+    const response = {};
 
     Object.keys(service).forEach(key => {
-        if (filter.indexOf(key) < 0) {
+        if (!['domains', 'aliases'].includes(key)) {
             response[key] = service[key];
         }
     });

package/lib/xoauth2/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Stream = require('stream').Stream;
+const { Stream } = require('stream');
 const nmfetch = require('../fetch');
 const crypto = require('crypto');
 const shared = require('../shared');
@@ -42,13 +42,13 @@ class XOAuth2 extends Stream {
 
         if (options && options.serviceClient) {
             if (!options.privateKey || !options.user) {
-                let err = new Error('Options "privateKey" and "user" are required for service account!');
+                const err = new Error('Options "privateKey" and "user" are required for service account!');
                 err.code = errors.EOAUTH2;
                 setImmediate(() => this.emit('error', err));
                 return;
             }
 
-            let serviceRequestTimeout = Math.min(Math.max(Number(this.options.serviceRequestTimeout) || 0, 0), 3600);
+            const serviceRequestTimeout = Math.min(Math.max(Number(this.options.serviceRequestTimeout) || 0, 0), 3600);
             this.options.serviceRequestTimeout = serviceRequestTimeout || 5 * 60;
         }
 
@@ -72,7 +72,7 @@ class XOAuth2 extends Stream {
         if (this.options.expires && Number(this.options.expires)) {
             this.expires = this.options.expires;
         } else {
-            let timeout = Math.max(Number(this.options.timeout) || 0, 0);
+            const timeout = Math.max(Number(this.options.timeout) || 0, 0);
             this.expires = (timeout && Date.now() + timeout * 1000) || 0;
         }
 
@@ -123,7 +123,7 @@ class XOAuth2 extends Stream {
                 'Cannot renew access token for %s: No refresh mechanism available',
                 this.options.user
             );
-            let err = new Error("Can't create new access token for user");
+            const err = new Error("Can't create new access token for user");
             err.code = errors.EOAUTH2;
             return callback(err);
         }
@@ -210,8 +210,8 @@ class XOAuth2 extends Stream {
         let loggedUrlOptions;
         if (this.options.serviceClient) {
             // service account - https://developers.google.com/identity/protocols/OAuth2ServiceAccount
-            let iat = Math.floor(Date.now() / 1000); // unix time
-            let tokenData = {
+            const iat = Math.floor(Date.now() / 1000); // unix time
+            const tokenData = {
                 iss: this.options.serviceClient,
                 scope: this.options.scope || 'https://mail.google.com/',
                 sub: this.options.user,
@@ -223,7 +223,7 @@ class XOAuth2 extends Stream {
             try {
                 token = this.jwtSignRS256(tokenData);
             } catch (_err) {
-                let err = new Error("Can't generate token. Check your auth options");
+                const err = new Error("Can't generate token. Check your auth options");
                 err.code = errors.EOAUTH2;
                 return callback(err);
             }
@@ -239,7 +239,7 @@ class XOAuth2 extends Stream {
             };
         } else {
             if (!this.options.refreshToken) {
-                let err = new Error("Can't create new access token for user");
+                const err = new Error("Can't create new access token for user");
                 err.code = errors.EOAUTH2;
                 return callback(err);
             }
@@ -260,10 +260,8 @@ class XOAuth2 extends Stream {
             };
         }
 
-        Object.keys(this.options.customParams).forEach(key => {
-            urlOptions[key] = this.options.customParams[key];
-            loggedUrlOptions[key] = this.options.customParams[key];
-        });
+        Object.assign(urlOptions, this.options.customParams);
+        Object.assign(loggedUrlOptions, this.options.customParams);
 
         this.logger.debug(
             {
@@ -298,19 +296,15 @@ class XOAuth2 extends Stream {
                     'Response: %s',
                     (body || '').toString()
                 );
-                let err = new Error('Invalid authentication response');
+                const err = new Error('Invalid authentication response');
                 err.code = errors.EOAUTH2;
                 return callback(err);
             }
 
-            let logData = {};
-            Object.keys(data).forEach(key => {
-                if (key !== 'access_token') {
-                    logData[key] = data[key];
-                } else {
-                    logData[key] = (data[key] || '').toString().substr(0, 6) + '...';
-                }
-            });
+            const logData = Object.assign({}, data);
+            if (logData.access_token) {
+                logData.access_token = (logData.access_token || '').toString().substr(0, 6) + '...';
+            }
 
             this.logger.debug(
                 {
@@ -331,7 +325,7 @@ class XOAuth2 extends Stream {
                 if (data.error_uri) {
                     errorMessage += ' (' + data.error_uri + ')';
                 }
-                let err = new Error(errorMessage);
+                const err = new Error(errorMessage);
                 err.code = errors.EOAUTH2;
                 return callback(err);
             }
@@ -341,7 +335,7 @@ class XOAuth2 extends Stream {
                 return callback(null, this.accessToken);
             }
 
-            let err = new Error('No access token');
+            const err = new Error('No access token');
             err.code = errors.EOAUTH2;
             return callback(err);
         });
@@ -354,7 +348,7 @@ class XOAuth2 extends Stream {
      * @return {String} Base64 encoded token for IMAP or SMTP login
      */
     buildXOAuth2Token(accessToken) {
-        let authData = ['user=' + (this.options.user || ''), 'auth=Bearer ' + (accessToken || this.accessToken), '', ''];
+        const authData = ['user=' + (this.options.user || ''), 'auth=Bearer ' + (accessToken || this.accessToken), '', ''];
         return Buffer.from(authData.join('\x01'), 'utf-8').toString('base64');
     }
 
@@ -373,10 +367,10 @@ class XOAuth2 extends Stream {
     postRequest(url, payload, params, callback) {
         let returned = false;
 
-        let chunks = [];
+        const chunks = [];
         let chunklen = 0;
 
-        let req = nmfetch(url, {
+        const req = nmfetch(url, {
             method: 'post',
             headers: params.customHeaders,
             body: payload,
@@ -434,7 +428,7 @@ 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);
+        const 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": "8.0.2",
+    "version": "8.0.4",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -10,7 +10,8 @@
         "format:check": "prettier --check \"**/*.{js,json,md}\"",
         "lint": "eslint .",
         "lint:fix": "eslint . --fix",
-        "update": "rm -rf node_modules/ package-lock.json && ncu -u && npm install"
+        "update": "rm -rf node_modules/ package-lock.json && ncu -u && npm install",
+        "test:syntax": "docker run --rm -v \"$PWD:/app:ro\" -w /app node:6-alpine node test/syntax-compat.js"
     },
     "repository": {
         "type": "git",
@@ -26,7 +27,7 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-sesv2": "3.1004.0",
+        "@aws-sdk/client-sesv2": "3.1011.0",
         "bunyan": "1.8.15",
         "c8": "11.0.0",
         "eslint": "10.0.3",