Merge 461adc8ac6 into cb8eb73ef1

package.json

@@ -13,9 +13,9 @@
     "webworker-threads": "^0.7.11"
   },
   "scripts": {
-    "test": "mocha tests/node-test.js -r jscoverage",
+    "test": "mocha tests/node-test.js",
     "report": "mocha tests/node-test.js -r jscoverage --covout=html",
-    "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls",
+    "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter | coveralls",
     "doc": "rm -rf doc;jsdoc src README.md -d doc",
     "compress": "uglifyjs src/md5.js --compress --mangle --comments --output build/md5.min.js",
     "build": "npm run-script compress;npm run-script doc"

src/md5.js

@@ -23,6 +23,10 @@
   } else if (WEB_WORKER) {
     root = self;
   }
+  var btoa = NODE_JS ? function(strOrBuffer){
+    return Buffer.from(strOrBuffer, 'binary').toString('base64');
+  } : window && window.btoa;
+
   var COMMON_JS = !root.JS_MD5_NO_COMMON_JS && typeof module === 'object' && module.exports;
   var AMD = typeof define === 'function' && define.amd;
   var ARRAY_BUFFER = !root.JS_MD5_NO_ARRAY_BUFFER && typeof ArrayBuffer !== 'undefined';
@@ -552,7 +556,11 @@
    * @example
    * hash.toString();
    */
-  Md5.prototype.toString = Md5.prototype.hex;
+  Md5.prototype.toString = function(enc) {
+    if (enc == 'hex') return this.hex();
+    if (enc == 'base64') return btoa(this.digest().reduce((data, byte) => data + String.fromCharCode(byte), ''));
+    return this.hex(); // by default (for not modifying all tests), I'd prefer .digest() by default
+  }
 
   /**
    * @method digest