libmime 4.2.0 → 4.2.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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

package/lib/charset.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const iconv = require('iconv-lite');
-const jconv = require('jconv');
+const encodingJapanese = require('encoding-japanese');
 const charsets = require('./charsets');
 
 /**
@@ -43,7 +43,22 @@ const charset = (module.exports = {
             }
 
             if (/^jis|^iso-?2022-?jp|^EUCJP/i.test(fromCharset)) {
-                return jconv.decode(buf, 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);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "libmime",
     "description": "Encode and decode quoted printable and base64 strings",
-    "version": "4.2.0",
+    "version": "4.2.1",
     "main": "lib/libmime",
     "homepage": "https://github.com/andris9/libmime",
     "repository": {
@@ -19,8 +19,8 @@
         "test": "grunt"
     },
     "dependencies": {
+        "encoding-japanese": "1.0.30",
         "iconv-lite": "0.5.0",
-        "jconv": "^0.1.5",
         "libbase64": "1.2.1",
         "libqp": "1.1.0"
     },
@@ -32,7 +32,7 @@
         "grunt-cli": "1.3.2",
         "grunt-eslint": "22.0.0",
         "grunt-mocha-test": "0.13.3",
-        "iconv": "^2.3.5",
+        "iconv": "2.3.5",
         "mocha": "6.2.2"
     }
 }