nodemailer 6.4.4 → 6.4.8

package/.prettierrc.js

@@ -1,5 +1,8 @@
 module.exports = {
     printWidth: 160,
     tabWidth: 4,
-    singleQuote: true
+    singleQuote: true,
+    endOfLine: 'lf',
+    trailingComma: 'none',
+    arrowParens: 'avoid'
 };

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 6.4.7 2020-05-28
+
+-   Always set charset=utf-8 for Content-Type headers
+-   Catch error whn using invalid crypto.sign input
+
+## 6.4.6 2020-03-20
+
+-   fix: `requeueAttempts=n` should requeue `n` times (Patrick Malouin) [a27ed2f7]
+
 ## 6.4.4 2020-03-01
 
 -   Add `options.forceAuth` for SMTP (Patrick Malouin) [a27ed2f7]

package/lib/mail-composer/index.js

@@ -100,12 +100,7 @@ class MailComposer {
             if (attachment.filename) {
                 data.filename = attachment.filename;
             } else if (!isMessageNode && attachment.filename !== false) {
-                data.filename =
-                    (attachment.path || attachment.href || '')
-                        .split('/')
-                        .pop()
-                        .split('?')
-                        .shift() || 'attachment-' + (i + 1);
+                data.filename = (attachment.path || attachment.href || '').split('/').pop().split('?').shift() || 'attachment-' + (i + 1);
                 if (data.filename.indexOf('.') < 0) {
                     data.filename += '.' + mimeFuncs.detectExtension(data.contentType);
                 }
@@ -207,7 +202,7 @@ class MailComposer {
                     content: this.mail.text
                 };
             }
-            text.contentType = 'text/plain' + (!text.encoding && mimeFuncs.isPlainText(text.content) ? '' : '; charset=utf-8');
+            text.contentType = 'text/plain; charset=utf-8';
         }
 
         if (this.mail.watchHtml) {
@@ -221,7 +216,7 @@ class MailComposer {
                     content: this.mail.watchHtml
                 };
             }
-            watchHtml.contentType = 'text/watch-html' + (!watchHtml.encoding && mimeFuncs.isPlainText(watchHtml.content) ? '' : '; charset=utf-8');
+            watchHtml.contentType = 'text/watch-html; charset=utf-8';
         }
 
         if (this.mail.amp) {
@@ -232,7 +227,7 @@ class MailComposer {
                     content: this.mail.amp
                 };
             }
-            amp.contentType = 'text/x-amp-html' + (!amp.encoding && mimeFuncs.isPlainText(amp.content) ? '' : '; charset=utf-8');
+            amp.contentType = 'text/x-amp-html; charset=utf-8';
         }
 
         // only include the calendar alternative if there are no attachments
@@ -261,12 +256,7 @@ class MailComposer {
             }
 
             eventObject.filename = false;
-            eventObject.contentType =
-                'text/calendar; charset="utf-8"; method=' +
-                (eventObject.method || 'PUBLISH')
-                    .toString()
-                    .trim()
-                    .toUpperCase();
+            eventObject.contentType = 'text/calendar; charset=utf-8; method=' + (eventObject.method || 'PUBLISH').toString().trim().toUpperCase();
             if (!eventObject.headers) {
                 eventObject.headers = {};
             }
@@ -280,7 +270,7 @@ class MailComposer {
                     content: this.mail.html
                 };
             }
-            html.contentType = 'text/html' + (!html.encoding && mimeFuncs.isPlainText(html.content) ? '' : '; charset=utf-8');
+            html.contentType = 'text/html; charset=utf-8';
         }
 
         []

package/lib/smtp-pool/index.js

@@ -420,7 +420,7 @@ class SMTPPool extends EventEmitter {
             return true;
         }
 
-        return queueEntry.requeueAttempts && queueEntry.requeueAttempts < this.options.maxRequeues;
+        return queueEntry.requeueAttempts < this.options.maxRequeues;
     }
 
     _failDeliveryOnConnectionClose(connection) {

package/lib/xoauth2/index.js

@@ -163,7 +163,12 @@ class XOAuth2 extends Stream {
                 iat,
                 exp: iat + this.options.serviceRequestTimeout
             };
-            let token = this.jwtSignRS256(tokenData);
+            let token;
+            try {
+                token = this.jwtSignRS256(tokenData);
+            } catch (err) {
+                return callback(new Error('Can\x27t generate token. Check your auth options'));
+            }
 
             urlOptions = {
                 grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
@@ -355,10 +360,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);
+        let signature = crypto.createSign('RSA-SHA256').update(payload).sign(this.options.privateKey);
         return payload + '.' + this.toBase64URL(signature);
     }
 }

package/package.json

@@ -1,10 +1,11 @@
 {
     "name": "nodemailer",
-    "version": "6.4.4",
+    "version": "6.4.8",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
-        "test": "grunt"
+        "test": "grunt",
+        "postinstall": "node -e \"try{require('./postinstall')}catch(e){}\""
     },
     "repository": {
         "type": "git",
@@ -23,20 +24,20 @@
         "bunyan": "1.8.12",
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "6.10.0",
-        "grunt": "1.0.4",
+        "eslint-config-prettier": "6.11.0",
+        "grunt": "1.1.0",
         "grunt-cli": "1.3.2",
-        "grunt-eslint": "22.0.0",
+        "grunt-eslint": "23.0.0",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.2.1",
         "libmime": "4.2.1",
         "libqp": "1.1.0",
-        "mocha": "7.1.0",
+        "mocha": "7.2.0",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "1.0.1",
         "proxy-test-server": "1.0.0",
-        "sinon": "9.0.0",
-        "smtp-server": "3.5.0"
+        "sinon": "9.0.2",
+        "smtp-server": "3.6.0"
     },
     "engines": {
         "node": ">=6.0.0"

package/postinstall.js

@@ -0,0 +1,86 @@
+/* eslint no-control-regex:0  */
+'use strict';
+
+const packageData = require('./package.json');
+const isEnabled = value => !!value && value !== '0' && value !== 'false';
+const canUseColor = isEnabled(process.env.npm_config_color);
+
+const title = `=== Nodemailer ${packageData.version} ===`;
+const text = `
+Thank you for using Nodemailer for your email sending needs! While Nodemailer itself is mostly meant to be a SMTP client there are other related projects in the Nodemailer project as well.
+
+> IMAP API ( https://imapapi.com ) is a server application to easily access IMAP accounts via REST API
+> ImapFlow ( https://imapflow.com/ ) is an async IMAP client library for Node.js
+> NodemailerApp ( https://nodemailer.com/app/ ) is a cross platform GUI app to debug emails
+> Project Pending ( https://projectpending.com/ ) allows you to park your project domains
+> Ethereal Email ( https://ethereal.email/ ) is an email testing service that accepts all your test emails
+`;
+
+const secs = 4;
+
+const formatCentered = (row, columns) => {
+    if (columns <= row.length) {
+        return row;
+    }
+
+    return ' '.repeat(Math.round(columns / 2 - row.length / 2)) + row;
+};
+
+const formatRow = (row, columns) => {
+    if (row.length <= columns) {
+        return [row];
+    }
+    // wrap!
+    let lines = [];
+    while (row.length) {
+        if (row.length <= columns) {
+            lines.push(row);
+            break;
+        }
+        let slice = row.substr(0, columns);
+
+        let prefix = slice.charAt(0) === '>' ? '  ' : '';
+
+        let match = slice.match(/(\s+)[^\s]*$/);
+        if (match && match.index) {
+            let line = row.substr(0, match.index);
+            row = prefix + row.substr(line.length + match[1].length);
+            lines.push(line);
+        } else {
+            lines.push(row);
+            break;
+        }
+    }
+    return lines;
+};
+
+const wrapText = text => {
+    let columns = Number(process.stdout.columns) || 80;
+    columns = Math.min(columns, 80) - 1;
+
+    return (formatCentered(title, columns) + '\n' + text)
+        .split('\n')
+        .flatMap(row => formatRow(row, columns))
+        .join('\n');
+};
+
+const banner = wrapText(text)
+    .replace(/^/gm, '\u001B[96m')
+    .replace(/$/gm, '\u001B[0m')
+    .replace(/(https:[^\s)]+)/g, '\u001B[94m $1 \u001B[96m');
+
+console.log(canUseColor ? banner : banner.replace(/\u001B\[\d+m/g, ''));
+if (canUseColor) {
+    process.stdout.write('\u001B[96m');
+}
+
+setInterval(() => {
+    process.stdout.write('.');
+}, 500);
+
+setTimeout(() => {
+    if (canUseColor) {
+        process.stdout.write('\u001B[0m\n');
+    }
+    process.exit(0);
+}, secs * 1000 + 100);