@nocobase/plugin-workflow-mailer 2.2.16 → 2.2.18

package/dist/node_modules/nodemailer/lib/smtp-pool/index.js

@@ -5,6 +5,7 @@ const PoolResource = require('./pool-resource');
 const SMTPConnection = require('../smtp-connection');
 const wellKnown = require('../well-known');
 const shared = require('../shared');
+const errors = require('../errors');
 const packageData = require('../../package.json');
 
 /**
@@ -50,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,
@@ -122,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
@@ -163,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(
                     {
@@ -173,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'));
@@ -200,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;
@@ -219,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();
@@ -242,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;
@@ -293,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;
 
@@ -330,8 +320,8 @@ class SMTPPool extends EventEmitter {
 
         // resource is terminated with an error
         connection.once('error', err => {
-            if (err.code !== 'EMAXLIMIT') {
-                this.logger.error(
+            if (err.code !== errors.EMAXLIMIT) {
+                this.logger.warn(
                     {
                         err,
                         tnx: 'pool',
@@ -406,6 +396,10 @@ class SMTPPool extends EventEmitter {
                     this._continueProcessing();
                 }, 50);
             } else {
+                if (!this._closed && this.idling && !this._connections.length) {
+                    this.emit('clear');
+                }
+
                 this._continueProcessing();
             }
         });
@@ -445,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',
@@ -479,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);
@@ -496,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();
@@ -506,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;
         }
@@ -523,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);
         }
     }
@@ -549,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) {
@@ -573,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 => {
@@ -599,7 +592,7 @@ class SMTPPool extends EventEmitter {
                 return callback(new Error('Connection closed'));
             });
 
-            let finalize = () => {
+            const finalize = () => {
                 if (returned) {
                     return;
                 }
@@ -628,8 +621,8 @@ class SMTPPool extends EventEmitter {
                         finalize();
                     });
                 } else if (!auth && connection.allowsAuth && options.forceAuth) {
-                    let err = new Error('Authentication info was not provided');
-                    err.code = 'NoAuth';
+                    const err = new Error('Authentication info was not provided');
+                    err.code = errors.ENOAUTH;
 
                     returned = true;
                     connection.close();

package/dist/node_modules/nodemailer/lib/smtp-pool/pool-resource.js

@@ -3,6 +3,7 @@
 const SMTPConnection = require('../smtp-connection');
 const assign = require('../shared').assign;
 const XOAuth2 = require('../xoauth2');
+const errors = require('../errors');
 const EventEmitter = require('events');
 
 /**
@@ -22,8 +23,9 @@ 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);
-                    oauth2.provisionCallback = (this.pool.mailer && this.pool.mailer.get('oauth2_provision_cb')) || oauth2.provisionCallback;
+                    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 = {
                         type: 'OAUTH2',
                         user: this.options.auth.user,
@@ -88,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);
@@ -112,22 +111,22 @@ 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 = 'ETLS';
+                        err.code = errors.ETLS;
                     }
                     callback(err);
                 }, 1000);
 
                 try {
                     timer.unref();
-                } catch (E) {
+                } catch (_E) {
                     // Ignore. Happens on envs with non-node timer implementation
                 }
             });
@@ -178,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');
         }
@@ -201,6 +200,11 @@ class PoolResource extends EventEmitter {
             envelope.dsn = mail.data.dsn;
         }
 
+        // RFC 8689: Pass requireTLSExtensionEnabled to envelope for MAIL FROM parameter
+        if (mail.data.requireTLSExtensionEnabled) {
+            envelope.requireTLSExtensionEnabled = mail.data.requireTLSExtensionEnabled;
+        }
+
         this.connection.send(envelope, mail.message.createReadStream(), (err, info) => {
             this.messages++;
 
@@ -217,10 +221,9 @@ class PoolResource extends EventEmitter {
             info.messageId = messageId;
 
             setImmediate(() => {
-                let err;
                 if (this.messages >= this.options.maxMessages) {
-                    err = new Error('Resource exhausted');
-                    err.code = 'EMAXLIMIT';
+                    const err = new Error('Resource exhausted');
+                    err.code = errors.EMAXLIMIT;
                     this.connection.close();
                     this.emit('error', err);
                 } else {

package/dist/node_modules/nodemailer/lib/smtp-transport/index.js

@@ -5,6 +5,7 @@ const SMTPConnection = require('../smtp-connection');
 const wellKnown = require('../well-known');
 const shared = require('../shared');
 const XOAuth2 = require('../xoauth2');
+const errors = require('../errors');
 const packageData = require('../../package.json');
 
 /**
@@ -48,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({});
@@ -73,27 +71,22 @@ class SMTPTransport extends EventEmitter {
 
     getAuth(authOpts) {
         if (!authOpts) {
+            if (this.auth && this.auth.oauth2 && this.mailer) {
+                // Transport-level auth is resolved in the constructor, before the Mail wrapper
+                // assigns `this.mailer`, so a provision callback registered with
+                // `transporter.set('oauth2_provision_cb', ...)` has to be re-checked here
+                this.auth.oauth2.provisionCallback = this.mailer.get('oauth2_provision_cb') || this.auth.oauth2.provisionCallback;
+            }
             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 : {},
+            typeof authOpts === 'object' ? authOpts : {}
+        );
 
-        if (!hasAuth) {
+        if (Object.keys(authData).length === 0) {
             return false;
         }
 
@@ -102,7 +95,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));
@@ -159,19 +152,25 @@ 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);
+
+            let perCallAuth;
+            const cleanupPerCallAuth = () => {
+                if (perCallAuth && perCallAuth !== this.auth && perCallAuth.oauth2) {
+                    perCallAuth.oauth2.removeAllListeners();
+                }
+                perCallAuth = null;
+            };
 
             connection.once('error', err => {
                 if (returned) {
                     return;
                 }
                 returned = true;
+                cleanupPerCallAuth();
                 connection.close();
                 return callback(err);
             });
@@ -181,32 +180,33 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
 
-                let timer = setTimeout(() => {
+                const timer = setTimeout(() => {
                     if (returned) {
                         return;
                     }
                     returned = true;
+                    cleanupPerCallAuth();
                     // 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 = 'ETLS';
+                        err.code = errors.ETLS;
                     }
                     callback(err);
                 }, 1000);
 
                 try {
                     timer.unref();
-                } catch (E) {
+                } catch (_E) {
                     // Ignore. Happens on envs with non-node timer implementation
                 }
             });
 
-            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');
                 }
@@ -215,6 +215,11 @@ class SMTPTransport extends EventEmitter {
                     envelope.dsn = mail.data.dsn;
                 }
 
+                // RFC 8689: Pass requireTLSExtensionEnabled to envelope for MAIL FROM parameter
+                if (mail.data.requireTLSExtensionEnabled) {
+                    envelope.requireTLSExtensionEnabled = mail.data.requireTLSExtensionEnabled;
+                }
+
                 this.logger.info(
                     {
                         tnx: 'send',
@@ -227,6 +232,7 @@ class SMTPTransport extends EventEmitter {
 
                 connection.send(envelope, mail.message.createReadStream(), (err, info) => {
                     returned = true;
+                    cleanupPerCallAuth();
                     connection.close();
                     if (err) {
                         this.logger.error(
@@ -266,13 +272,11 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
 
-                let auth = this.getAuth(mail.data.auth);
+                perCallAuth = this.getAuth(mail.data.auth);
 
-                if (auth && (connection.allowsAuth || options.forceAuth)) {
-                    connection.login(auth, err => {
-                        if (auth && auth !== this.auth && auth.oauth2) {
-                            auth.oauth2.removeAllListeners();
-                        }
+                if (perCallAuth && (connection.allowsAuth || options.forceAuth)) {
+                    connection.login(perCallAuth, err => {
+                        cleanupPerCallAuth();
                         if (returned) {
                             return;
                         }
@@ -329,20 +333,25 @@ 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;
+            let perCallAuth;
+            const cleanupPerCallAuth = () => {
+                if (perCallAuth && perCallAuth !== this.auth && perCallAuth.oauth2) {
+                    perCallAuth.oauth2.removeAllListeners();
+                }
+                perCallAuth = null;
+            };
 
             connection.once('error', err => {
                 if (returned) {
                     return;
                 }
                 returned = true;
+                cleanupPerCallAuth();
                 connection.close();
                 return callback(err);
             });
@@ -352,14 +361,16 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
                 returned = true;
+                cleanupPerCallAuth();
                 return callback(new Error('Connection closed'));
             });
 
-            let finalize = () => {
+            const finalize = () => {
                 if (returned) {
                     return;
                 }
                 returned = true;
+                cleanupPerCallAuth();
                 connection.quit();
                 return callback(null, true);
             };
@@ -369,10 +380,11 @@ class SMTPTransport extends EventEmitter {
                     return;
                 }
 
-                let authData = this.getAuth({});
+                perCallAuth = this.getAuth({});
 
-                if (authData && (connection.allowsAuth || options.forceAuth)) {
-                    connection.login(authData, err => {
+                if (perCallAuth && (connection.allowsAuth || options.forceAuth)) {
+                    connection.login(perCallAuth, err => {
+                        cleanupPerCallAuth();
                         if (returned) {
                             return;
                         }
@@ -385,11 +397,12 @@ class SMTPTransport extends EventEmitter {
 
                         finalize();
                     });
-                } else if (!authData && connection.allowsAuth && options.forceAuth) {
-                    let err = new Error('Authentication info was not provided');
-                    err.code = 'NoAuth';
+                } else if (!perCallAuth && connection.allowsAuth && options.forceAuth) {
+                    const err = new Error('Authentication info was not provided');
+                    err.code = errors.ENOAUTH;
 
                     returned = true;
+                    cleanupPerCallAuth();
                     connection.close();
                     return callback(err);
                 } else {

package/dist/node_modules/nodemailer/lib/stream-transport/index.js

@@ -2,6 +2,8 @@
 
 const packageData = require('../../package.json');
 const shared = require('../shared');
+const LeWindows = require('../mime-node/le-windows');
+const LeUnix = require('../mime-node/le-unix');
 
 /**
  * Generates a Transport object for streaming
@@ -18,7 +20,7 @@ class StreamTransport {
     constructor(options) {
         options = options || {};
 
-        this.options = options || {};
+        this.options = options;
 
         this.name = 'StreamTransport';
         this.version = packageData.version;
@@ -40,10 +42,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.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');
         }
@@ -63,6 +65,13 @@ class StreamTransport {
 
             try {
                 stream = mail.message.createReadStream();
+                if (this.options.newline) {
+                    // apply the transport-level line ending transform; the message-level
+                    // `newline` option is handled by MimeNode in createReadStream()
+                    const sourceStream = stream;
+                    stream = sourceStream.pipe(this.winbreak ? new LeWindows() : new LeUnix());
+                    sourceStream.once('error', err => stream.emit('error', err));
+                }
             } catch (E) {
                 this.logger.error(
                     {
@@ -91,13 +100,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 +132,7 @@ class StreamTransport {
 
             stream.on('end', () =>
                 done(null, {
-                    envelope: mail.data.envelope || mail.message.getEnvelope(),
+                    envelope,
                     messageId,
                     message: Buffer.concat(chunks, chunklen)
                 })

package/dist/node_modules/nodemailer/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];
         }
     });