libmime 4.1.3 → 5.0.0

package/.eslintrc

@@ -1,6 +1,7 @@
 {
     "rules": {
-        "indent": 0
+        "indent": 0,
+        "no-prototype-builtins": 0
     },
-    "extends":    "nodemailer"
+    "extends": "nodemailer"
 }

package/.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [andris9] # enable once enrolled
+custom: ['https://www.paypal.me/nodemailer']

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,24 @@
 # Changelog
 
+## v5.0.0 2020-07-22
+
+-   Removed optional node-iconv support
+-   Bumped dependencies
+-   Updated Travis test matrix, dropped Node 8
+
+## v4.2.1 2019-10-28
+
+-   Replace jconv with more recent encoding-japanese
+
+## v4.2.0 2019-10-28
+
+-   Use jconv module to parse ISO-2022-JP by default
+
+## v4.1.4 2019-10-28
+
+-   decodeWords should also decode empty content part [WeiAnAn](9bbcfd2)
+-   fix decode base64 ending with = [WeiAnAn](6e656e2)
+
 ## v4.1.0 2019-05-01
 
 -   Experimental support for node-iconv

package/lib/charset.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const iconv = require('iconv-lite');
+const encodingJapanese = require('encoding-japanese');
 const charsets = require('./charsets');
 
 /**
@@ -25,10 +26,9 @@ const charset = (module.exports = {
      *
      * @param {Buffer} buf Binary data to be decoded
      * @param {String} [fromCharset='UTF-8'] Binary data is decoded into string using this charset
-     * @param {Function} [Iconv] node-iconv function
      * @return {String} Decded string
      */
-    decode(buf, fromCharset, Iconv) {
+    decode(buf, fromCharset) {
         fromCharset = charset.normalizeCharset(fromCharset || 'UTF-8');
 
         if (/^(us-)?ascii|utf-8|7bit$/i.test(fromCharset)) {
@@ -36,10 +36,25 @@ const charset = (module.exports = {
         }
 
         try {
-            if (typeof Iconv === 'function') {
-                let decoder = new Iconv(fromCharset, 'UTF-8');
-                return decoder.convert(buf).toString();
+            if (/^jis|^iso-?2022-?jp|^EUCJP/i.test(fromCharset)) {
+                if (typeof buf === 'string') {
+                    buf = Buffer.from(buf);
+                }
+                try {
+                    let output = encodingJapanese.convert(buf, {
+                        to: 'UNICODE',
+                        from: fromCharset,
+                        type: 'string'
+                    });
+                    if (typeof output === 'string') {
+                        output = Buffer.from(output);
+                    }
+                    return output;
+                } catch (err) {
+                    // ignore, defaults to iconv-lite on error
+                }
             }
+
             return iconv.decode(buf, fromCharset);
         } catch (err) {
             // enforce utf-8, data loss might occur
@@ -54,7 +69,7 @@ const charset = (module.exports = {
      * @param {String} [fromCharset='UTF-8'] Source encoding for the string
      * @return {Buffer} UTF-8 encoded typed array
      */
-    convert(data, fromCharset, Iconv) {
+    convert(data, fromCharset) {
         fromCharset = charset.normalizeCharset(fromCharset || 'UTF-8');
 
         let bufString;
@@ -64,7 +79,7 @@ const charset = (module.exports = {
                 return data;
             }
 
-            bufString = charset.decode(data, fromCharset, Iconv);
+            bufString = charset.decode(data, fromCharset);
             return charset.encode(bufString);
         }
         return charset.encode(data);

package/lib/libmime.js

@@ -112,11 +112,7 @@ class Libmime {
      * @return {String} Single or several mime words joined together
      */
     encodeWord(data, mimeWordEncoding, maxLength) {
-        mimeWordEncoding = (mimeWordEncoding || 'Q')
-            .toString()
-            .toUpperCase()
-            .trim()
-            .charAt(0);
+        mimeWordEncoding = (mimeWordEncoding || 'Q').toString().toUpperCase().trim().charAt(0);
         maxLength = maxLength || 0;
 
         let encodedStr;
@@ -129,10 +125,7 @@ class Libmime {
         if (mimeWordEncoding === 'Q') {
             // https://tools.ietf.org/html/rfc2047#section-5 rule (3)
             encodedStr = libqp.encode(data).replace(/[^a-z0-9!*+\-/=]/gi, chr => {
-                let ord = chr
-                    .charCodeAt(0)
-                    .toString(16)
-                    .toUpperCase();
+                let ord = chr.charCodeAt(0).toString(16).toUpperCase();
                 if (chr === ' ') {
                     return '_';
                 } else {
@@ -223,13 +216,18 @@ class Libmime {
             }
             str = Buffer.from(bytes);
         } else if (encoding === 'B') {
-            str = Buffer.from(str, 'base64');
+            str = Buffer.concat(
+                str
+                    .split('=')
+                    .filter(s => s !== '') // filter empty string
+                    .map(str => Buffer.from(str, 'base64'))
+            );
         } else {
             // keep as is, convert Buffer to unicode string, assume utf8
             str = Buffer.from(str);
         }
 
-        return libcharset.decode(str, charset, this.config.Iconv);
+        return libcharset.decode(str, charset);
     }
 
     /**
@@ -249,7 +247,7 @@ class Libmime {
 
         maxLength = maxLength || 0;
 
-        let decodedValue = libcharset.decode(libcharset.convert(data || '', fromCharset, this.config.Iconv), this.config.Iconv);
+        let decodedValue = libcharset.decode(libcharset.convert(data || '', fromCharset));
         let encodedValue;
 
         let firstMatch = decodedValue.match(/(?:^|\s)([^\s]*[\u0080-\uFFFF])/);
@@ -289,7 +287,7 @@ class Libmime {
             (str || '')
                 .toString()
                 // find base64 words that can be joined
-                .replace(/(=\?([^?]+)\?[Bb]\?[^?]+[^^=]\?=)\s*(?==\?([^?]+)\?[Bb]\?[^?]+\?=)/g, (match, left, chLeft, chRight) => {
+                .replace(/(=\?([^?]+)\?[Bb]\?[^?]*\?=)\s*(?==\?([^?]+)\?[Bb]\?[^?]*\?=)/g, (match, left, chLeft, chRight) => {
                     // only mark b64 chunks to be joined if charsets match
                     if (libcharset.normalizeCharset(chLeft || '') === libcharset.normalizeCharset(chRight || '')) {
                         // set a joiner marker
@@ -298,7 +296,7 @@ class Libmime {
                     return match;
                 })
                 // find QP words that can be joined
-                .replace(/(=\?([^?]+)\?[Qq]\?[^?]+\?=)\s*(?==\?([^?]+)\?[Qq]\?[^?]+\?=)/g, (match, left, chLeft, chRight) => {
+                .replace(/(=\?([^?]+)\?[Qq]\?[^?]*\?=)\s*(?==\?([^?]+)\?[Qq]\?[^?]*\?=)/g, (match, left, chLeft, chRight) => {
                     // only mark QP chunks to be joined if charsets match
                     if (libcharset.normalizeCharset(chLeft || '') === libcharset.normalizeCharset(chRight || '')) {
                         // set a joiner marker
@@ -309,9 +307,9 @@ class Libmime {
                 // join base64 encoded words
                 .replace(/(\?=)?__\x00JOIN\x00__(=\?([^?]+)\?[QqBb]\?)?/g, '')
                 // remove spaces between mime encoded words
-                .replace(/(=\?[^?]+\?[QqBb]\?[^?]+\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]+\?=)/g, '$1')
+                .replace(/(=\?[^?]+\?[QqBb]\?[^?]*\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]*\?=)/g, '$1')
                 // decode words
-                .replace(/=\?([\w_\-*]+)\?([QqBb])\?([^?]+)\?=/g, (m, charset, encoding, text) => this.decodeWord(charset, encoding, text))
+                .replace(/=\?([\w_\-*]+)\?([QqBb])\?([^?]*)\?=/g, (m, charset, encoding, text) => this.decodeWord(charset, encoding, text))
         );
     }
 
@@ -718,10 +716,7 @@ class Libmime {
      * @return {String} File extension
      */
     detectExtension(mimeType) {
-        mimeType = (mimeType || '')
-            .toString()
-            .toLowerCase()
-            .replace(/\s/g, '');
+        mimeType = (mimeType || '').toString().toLowerCase().replace(/\s/g, '');
         if (!(mimeType in mimetypes.list)) {
             return 'bin';
         }
@@ -751,13 +746,7 @@ class Libmime {
      * @return {String} File extension
      */
     detectMimeType(extension) {
-        extension = (extension || '')
-            .toString()
-            .toLowerCase()
-            .replace(/\s/g, '')
-            .replace(/^\./g, '')
-            .split('.')
-            .pop();
+        extension = (extension || '').toString().toLowerCase().replace(/\s/g, '').replace(/^\./g, '').split('.').pop();
 
         if (!(extension in mimetypes.extensions)) {
             return 'application/octet-stream';
@@ -877,10 +866,7 @@ class Libmime {
 
     encodeURICharComponent(chr) {
         let res = '';
-        let ord = chr
-            .charCodeAt(0)
-            .toString(16)
-            .toUpperCase();
+        let ord = chr.charCodeAt(0).toString(16).toUpperCase();
 
         if (ord.length % 2) {
             ord = '0' + ord;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "libmime",
     "description": "Encode and decode quoted printable and base64 strings",
-    "version": "4.1.3",
+    "version": "5.0.0",
     "main": "lib/libmime",
     "homepage": "https://github.com/andris9/libmime",
     "repository": {
@@ -19,19 +19,19 @@
         "test": "grunt"
     },
     "dependencies": {
-        "iconv-lite": "0.4.24",
-        "libbase64": "1.0.3",
+        "encoding-japanese": "1.0.30",
+        "iconv-lite": "0.6.2",
+        "libbase64": "1.2.1",
         "libqp": "1.1.0"
     },
     "devDependencies": {
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "4.3.0",
-        "grunt": "1.0.4",
+        "eslint-config-prettier": "6.11.0",
+        "grunt": "1.2.1",
         "grunt-cli": "1.3.2",
-        "grunt-eslint": "21.0.0",
+        "grunt-eslint": "23.0.0",
         "grunt-mocha-test": "0.13.3",
-        "iconv": "^2.3.4",
-        "mocha": "6.1.4"
+        "mocha": "8.0.1"
     }
 }