nodemailer 6.4.18 → 6.5.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 6.5.0 2021-02-26
+
+-   Pass through textEncoding to subnodes
+-   Added support for AWS SES v3 SDK
+-   Fixed tests
+
 ## 6.4.18 2021-02-11
 
 -   Updated README

package/lib/mail-composer/index.js

@@ -475,6 +475,7 @@ class MailComposer {
         } 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

package/lib/mime-node/index.js

@@ -451,7 +451,7 @@ class MimeNode {
                         transferEncoding = this._getTextEncoding(this.content) === 'Q' ? 'quoted-printable' : 'base64';
                     } else {
                         // we can not check content for a stream, so either use preferred encoding or fallback to QP
-                        transferEncoding = this.transferEncoding === 'B' ? 'base64' : 'quoted-printable';
+                        transferEncoding = this.textEncoding === 'B' ? 'base64' : 'quoted-printable';
                     }
                 } else if (!/^(multipart|message)\//i.test(contentType)) {
                     transferEncoding = transferEncoding || 'base64';

package/lib/ses-transport/index.js

@@ -239,36 +239,64 @@ class SESTransport extends EventEmitter {
                     sesMessage[key] = mail.data.ses[key];
                 });
 
-                this.ses.sendRawEmail(sesMessage, (err, data) => {
-                    if (err) {
-                        this.logger.error(
-                            {
-                                err,
-                                tnx: 'send'
-                            },
-                            'Send error for %s: %s',
-                            messageId,
-                            err.message
-                        );
-                        statObject.pending = false;
-                        return callback(err);
+                let ses = (this.ses.aws ? this.ses.ses : this.ses) || {};
+                let aws = this.ses.aws || {};
+
+                let getRegion = cb => {
+                    if (ses.config && typeof ses.config.region === 'function') {
+                        // promise
+                        return ses.config
+                            .region()
+                            .then(region => cb(null, region))
+                            .catch(err => cb(err));
                     }
+                    return cb(null, (ses.config && ses.config.region) || 'us-east-1');
+                };
 
-                    let region = (this.ses.config && this.ses.config.region) || 'us-east-1';
-                    if (region === 'us-east-1') {
-                        region = 'email';
+                getRegion((err, region) => {
+                    if (err || !region) {
+                        region = 'us-east-1';
                     }
 
-                    statObject.pending = false;
-                    callback(null, {
-                        envelope: {
-                            from: envelope.from,
-                            to: envelope.to
-                        },
-                        messageId: '<' + data.MessageId + (!/@/.test(data.MessageId) ? '@' + region + '.amazonses.com' : '') + '>',
-                        response: data.MessageId,
-                        raw
-                    });
+                    let sendPromise;
+                    if (typeof ses.send === 'function' && aws.SendRawEmailCommand) {
+                        // v3 API
+                        sendPromise = ses.send(new aws.SendRawEmailCommand(sesMessage));
+                    } else {
+                        // v2 API
+                        sendPromise = ses.sendRawEmail(sesMessage).promise();
+                    }
+
+                    sendPromise
+                        .then(data => {
+                            if (region === 'us-east-1') {
+                                region = 'email';
+                            }
+
+                            statObject.pending = false;
+                            callback(null, {
+                                envelope: {
+                                    from: envelope.from,
+                                    to: envelope.to
+                                },
+                                messageId: '<' + data.MessageId + (!/@/.test(data.MessageId) ? '@' + region + '.amazonses.com' : '') + '>',
+                                response: data.MessageId,
+                                raw
+                            });
+                        })
+                        .catch(err => {
+                            this.logger.error(
+                                {
+                                    err,
+                                    tnx: 'send'
+                                },
+                                'Send error for %s: %s',
+                                messageId,
+                                err.message
+                            );
+                            statObject.pending = false;
+                            callback(err);
+                        });
                 });
             })
         );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.4.18",
+    "version": "6.5.0",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -23,7 +23,7 @@
         "bunyan": "1.8.15",
         "chai": "4.3.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "7.2.0",
+        "eslint-config-prettier": "8.1.0",
         "grunt": "1.3.0",
         "grunt-cli": "1.3.2",
         "grunt-eslint": "23.0.0",
@@ -31,7 +31,7 @@
         "libbase64": "1.2.1",
         "libmime": "5.0.0",
         "libqp": "1.1.0",
-        "mocha": "8.2.1",
+        "mocha": "8.3.0",
         "nodemailer-ntlm-auth": "1.0.1",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
@@ -40,6 +40,5 @@
     },
     "engines": {
         "node": ">=6.0.0"
-    },
-    "dependencies": {}
+    }
 }