v6.6.0

nodemailer · Apr 28, 2021 · 058d414 · 058d414
1 parent 91108d7
commit 058d414
Show file tree

Hide file tree

Showing 14 changed files with 88 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 6.6.0 2021-04-28
+
+-   Added new option `newline` for MailComposer
+
 ## 6.5.0 2021-02-26
 
 -   Pass through textEncoding to subnodes

diff --git a/examples/mailcomposer.js b/examples/mailcomposer.js
@@ -9,7 +9,8 @@ const mailOptions = {
         from: 'Daemon <deamon@kreata.ee>',
         to: 'mailer@kreata.ee, Mailer <mailer2@kreata.ee>'
     },
-    text: 'Test message'
+    text: 'Test\n 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ö\r\nsage',
+    newline: '\r\n'
 };
 
 async function main() {

diff --git a/lib/mail-composer/index.js b/lib/mail-composer/index.js
@@ -31,7 +31,7 @@ class MailComposer {
 
         // Compose MIME tree
         if (this.mail.raw) {
-            this.message = new MimeNode().setRaw(this.mail.raw);
+            this.message = new MimeNode('message/rfc822', { newline: this.mail.newline }).setRaw(this.mail.raw);
         } else if (this._useMixed) {
             this.message = this._createMixed();
         } else if (this._useAlternative) {
@@ -345,13 +345,15 @@ class MailComposer {
                 boundaryPrefix: this.mail.boundaryPrefix,
                 disableUrlAccess: this.mail.disableUrlAccess,
                 disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey
+                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
+                normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                newline: this.mail.newline
             });
         }
 
@@ -391,13 +393,15 @@ class MailComposer {
                 boundaryPrefix: this.mail.boundaryPrefix,
                 disableUrlAccess: this.mail.disableUrlAccess,
                 disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey
+                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
+                normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                newline: this.mail.newline
             });
         }
 
@@ -428,13 +432,15 @@ class MailComposer {
                 boundaryPrefix: this.mail.boundaryPrefix,
                 disableUrlAccess: this.mail.disableUrlAccess,
                 disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey
+                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
+                normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                newline: this.mail.newline
             });
         }
 
@@ -470,15 +476,17 @@ class MailComposer {
                 boundaryPrefix: this.mail.boundaryPrefix,
                 disableUrlAccess: this.mail.disableUrlAccess,
                 disableFileAccess: this.mail.disableFileAccess,
-                normalizeHeaderKey: this.mail.normalizeHeaderKey
+                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
+                normalizeHeaderKey: this.mail.normalizeHeaderKey,
+                newline: this.mail.newline
             });
         }
 

diff --git a/lib/mime-node/index.js b/lib/mime-node/index.js
@@ -16,6 +16,9 @@ const addressparser = require('../addressparser');
 const fetch = require('../fetch');
 const LastNewline = require('./last-newline');
 
+const LeWindows = require('./le-windows');
+const LeUnix = require('./le-unix');
+
 /**
  * Creates a new mime tree node. Assumes 'multipart/*' as the content type
  * if it is a branch, anything else counts as leaf. If rootNode is missing from
@@ -92,6 +95,11 @@ class MimeNode {
          */
         this.hostname = options.hostname;
 
+        /**
+         * If set to 'win' then uses \r\n, if 'linux' then \n. If not set (or `raw` is used) then newlines are kept as is.
+         */
+        this.newline = options.newline;
+
         /**
          * An array for possible child nodes
          */
@@ -626,6 +634,15 @@ class MimeNode {
             outputStream = transform(outputStream);
         }
 
+        if (this.newline) {
+            const winbreak = ['win', 'windows', 'dos', '\r\n'].includes(this.newline.toString().toLowerCase());
+            const newlineTransform = winbreak ? new LeWindows() : new LeUnix();
+
+            const stream = outputStream.pipe(newlineTransform);
+            outputStream.on('error', err => stream.emit('error', err));
+            return stream;
+        }
+
         return outputStream;
     }
 

diff --git a/lib/sendmail-transport/le-unix.js → lib/mime-node/le-unix.js b/lib/sendmail-transport/le-unix.js → lib/mime-node/le-unix.js
diff --git a/lib/sendmail-transport/le-windows.js → lib/mime-node/le-windows.js b/lib/sendmail-transport/le-windows.js → lib/mime-node/le-windows.js
diff --git a/lib/sendmail-transport/index.js b/lib/sendmail-transport/index.js
@@ -2,8 +2,6 @@
 
 const spawn = require('child_process').spawn;
 const packageData = require('../../package.json');
-const LeWindows = require('./le-windows');
-const LeUnix = require('./le-unix');
 const shared = require('../shared');
 
 /**
@@ -68,7 +66,6 @@ class SendmailTransport {
         let args;
         let sendmail;
         let returned;
-        let transform;
 
         const hasInvalidAddresses = []
             .concat(envelope.from || [])
@@ -187,10 +184,8 @@ class SendmailTransport {
                 recipients.join(', ')
             );
 
-            transform = this.winbreak ? new LeWindows() : new LeUnix();
             let sourceStream = mail.message.createReadStream();
-
-            transform.once('error', err => {
+            sourceStream.once('error', err => {
                 this.logger.error(
                     {
                         err,
@@ -205,8 +200,7 @@ class SendmailTransport {
                 callback(err);
             });
 
-            sourceStream.once('error', err => transform.emit('error', err));
-            sourceStream.pipe(transform).pipe(sendmail.stdin);
+            sourceStream.pipe(sendmail.stdin);
         } else {
             return callback(new Error('sendmail was not found'));
         }

diff --git a/lib/ses-transport/index.js b/lib/ses-transport/index.js
@@ -3,7 +3,7 @@
 const EventEmitter = require('events');
 const packageData = require('../../package.json');
 const shared = require('../shared');
-const LeWindows = require('../sendmail-transport/le-windows');
+const LeWindows = require('../mime-node/le-windows');
 
 /**
  * Generates a Transport object for AWS SES

diff --git a/lib/stream-transport/index.js b/lib/stream-transport/index.js
@@ -2,8 +2,6 @@
 
 const packageData = require('../../package.json');
 const shared = require('../shared');
-const LeWindows = require('../sendmail-transport/le-windows');
-const LeUnix = require('../sendmail-transport/le-unix');
 
 /**
  * Generates a Transport object for streaming
@@ -61,15 +59,10 @@ class StreamTransport {
         );
 
         setImmediate(() => {
-            let sourceStream;
             let stream;
-            let transform;
 
             try {
-                transform = this.winbreak ? new LeWindows() : new LeUnix();
-                sourceStream = mail.message.createReadStream();
-                stream = sourceStream.pipe(transform);
-                sourceStream.on('error', err => stream.emit('error', err));
+                stream = mail.message.createReadStream();
             } catch (E) {
                 this.logger.error(
                     {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.5.0",
+    "version": "6.6.0",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -21,21 +21,21 @@
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
         "bunyan": "1.8.15",
-        "chai": "4.3.0",
+        "chai": "4.3.4",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.1.0",
-        "grunt": "1.3.0",
-        "grunt-cli": "1.3.2",
+        "eslint-config-prettier": "8.3.0",
+        "grunt": "1.4.0",
+        "grunt-cli": "1.4.2",
         "grunt-eslint": "23.0.0",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.2.1",
         "libmime": "5.0.0",
         "libqp": "1.1.0",
-        "mocha": "8.3.0",
+        "mocha": "8.3.2",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "sinon": "9.2.4",
+        "sinon": "10.0.0",
         "smtp-server": "3.8.0"
     },
     "engines": {

diff --git a/test/sendmail/le-unix.test.js b/test/sendmail/le-unix.test.js
@@ -3,7 +3,7 @@
 
 'use strict';
 
-const LeUnix = require('../../lib/sendmail-transport/le-unix');
+const LeUnix = require('../../lib/mime-node/le-unix');
 const chai = require('chai');
 const expect = chai.expect;
 

diff --git a/test/sendmail/le-windows-test.js b/test/sendmail/le-windows-test.js
@@ -3,7 +3,7 @@
 
 'use strict';
 
-const LeWindows = require('../../lib/sendmail-transport/le-windows');
+const LeWindows = require('../../lib/mime-node/le-windows');
 const chai = require('chai');
 const expect = chai.expect;
 

diff --git a/test/sendmail/sendmail-test.js b/test/sendmail/sendmail-test.js
@@ -11,6 +11,7 @@ const PassThrough = require('stream').PassThrough;
 const EventEmitter = require('events').EventEmitter;
 const sinon = require('sinon');
 const SendmailTransport = require('../../lib/sendmail-transport');
+const MailComposer = require('../../lib/mail-composer');
 chai.config.includeStack = true;
 
 class MockBuilder {
@@ -68,18 +69,16 @@ describe('Sendmail Transport Tests', function () {
         client.send(
             {
                 data: {},
-                message: new MockBuilder(
-                    {
-                        from: 'test@valid.sender',
-                        to: 'test@valid.recipient'
-                    },
-                    'message\r\nline 2'
-                )
+                message: new MailComposer({
+                    from: 'test@valid.sender',
+                    to: 'test@valid.recipient',
+                    newline: '\n',
+                    raw: Buffer.from('message\r\nline 2')
+                }).compile()
             },
-            function (err, data) {
+            function (err) {
                 expect(err).to.not.exist;
-                expect(data.messageId).to.equal('<test>');
-                expect(output).to.equal('message\nline 2');
+                expect(output).to.equal('message\nline 2\n');
                 client._spawn.restore();
                 done();
             }