Fixed incorrect result when first bit is 1 of bytes. #18

* Improved performance of input check.

.covignore

@@ -1,2 +0,0 @@
-/node_modules/
-/tests/

.npmignore

@@ -0,0 +1,9 @@
+/node_modules/
+/coverage/
+/.nyc_output/
+/tests/
+/doc/
+.covignore
+.travis.yml
+.npmignore
+bower.json

.travis.yml

@@ -1,21 +1,10 @@
 language: node_js
 node_js:
-  - "0.12.15"
+  - "6.11.4"
-  - "4.5"
+  - "8.6.0"
-  - "6.5.0"
 before_install:
   - npm install coveralls
-  - npm install mocha-lcov-reporter
+after_success: npm run coveralls
-install:
-  - CXX="g++-4.8" CC="gcc-4.8" npm install
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - gcc-4.8
-    - g++-4.8
-script: npm run-script coveralls
 branches:
   only:
     - master

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Change Log
 
+## v0.7.3 / 2017-12-18
+### Fixed
+- incorrect result when first bit is 1 of bytes. #18
+
+## v0.7.2 / 2017-10-31
+### Improved
+- performance of hBytes increment.
+
+## v0.7.1 / 2017-10-29
+### Fixed
+- incorrect result when file size >= 4G.
+
+## v0.7.0 / 2017-10-29
+### Fixed
+- incorrect result when file size >= 512M.
+
+## v0.6.1 / 2017-10-07
+### Fixed
+- ArrayBuffer.isView issue in IE10.
+
+### Improved
+- performance of input check.
+
+## v0.6.0 / 2017-07-28
+### Added
+- support base64 string output.
+
 ## v0.5.0 / 2017-07-14
 ### Added
 - support for web worker. #11

README.md

@@ -65,6 +65,7 @@ md5.array(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248
 md5.digest(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126]
 md5.arrayBuffer(''); // ArrayBuffer
 md5.buffer(''); // ArrayBuffer, deprecated, This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+md5.base64(''); // 1B2M2Y8AsgTpgAmY7PhCfg==
 ```
 
 ## License

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "js-md5",
-  "version": "0.5.0",
+  "version": "0.7.3",
   "main": ["src/md5.js"],
   "ignore": [
     "tests"

doc/Md5_.html

@@ -28,7 +28,7 @@
 
 <header>
     
-        <h2>Md5</h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Md5<span class="signature">()</span><span class="type-signature"></span></h2>
         
     
 </header>
@@ -40,12 +40,14 @@
 
     
 
+    
     <h4 class="name" id="Md5"><span class="type-signature"></span>new Md5<span class="signature">()</span><span class="type-signature"></span></h4>
     
 
     
 
 
+
 <div class="description">
     This is internal class.
 </div>
@@ -91,7 +93,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line162">line 162</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line178">line 178</a>
     </li></ul></dd>
     
 
@@ -125,6 +127,8 @@
 
 
 
+
+    
     </div>
 
     
@@ -140,6 +144,8 @@
     
 
     
+
+    
         <h3 class="subsection-title">Methods</h3>
 
         
@@ -147,12 +153,14 @@
 
     
 
+    
     <h4 class="name" id="array"><span class="type-signature"></span>array<span class="signature">()</span><span class="type-signature"> &rarr; {Array}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as bytes array
 </div>
@@ -198,7 +206,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line556">line 556</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line579">line 579</a>
     </li></ul></dd>
     
 
@@ -252,6 +260,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>hash.array();</code></pre>
@@ -263,12 +273,14 @@
 
     
 
+    
     <h4 class="name" id="arrayBuffer"><span class="type-signature"></span>arrayBuffer<span class="signature">()</span><span class="type-signature"> &rarr; {ArrayBuffer}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as ArrayBuffer
 </div>
@@ -314,7 +326,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line568">line 568</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line591">line 591</a>
     </li></ul></dd>
     
 
@@ -368,6 +380,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>hash.arrayBuffer();</code></pre>
@@ -379,12 +393,134 @@
 
     
 
+    
+    <h4 class="name" id="base64"><span class="type-signature"></span>base64<span class="signature">()</span><span class="type-signature"> &rarr; {String}</span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    Output hash as base64 string
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line626">line 626</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+    <dt class="tag-see">See:</dt>
+    <dd class="tag-see">
+        <ul>
+            <li><a href="md5.html#.base64">md5.base64</a></li>
+        </ul>
+    </dd>
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+<div class="param-desc">
+    base64 string
+</div>
+
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">String</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+    <h5>Example</h5>
+    
+    <pre class="prettyprint"><code>hash.base64();</code></pre>
+
+
+
+        
+            
+
+    
+
+    
     <h4 class="name" id="buffer"><span class="type-signature"></span>buffer<span class="signature">()</span><span class="type-signature"> &rarr; {ArrayBuffer}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as ArrayBuffer
 </div>
@@ -432,7 +568,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line590">line 590</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line613">line 613</a>
     </li></ul></dd>
     
 
@@ -486,6 +622,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>hash.buffer();</code></pre>
@@ -497,12 +635,14 @@
 
     
 
+    
     <h4 class="name" id="digest"><span class="type-signature"></span>digest<span class="signature">()</span><span class="type-signature"> &rarr; {Array}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as bytes array
 </div>
@@ -548,7 +688,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line534">line 534</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line557">line 557</a>
     </li></ul></dd>
     
 
@@ -602,6 +742,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>hash.digest();</code></pre>
@@ -613,12 +755,14 @@
 
     
 
+    
     <h4 class="name" id="hex"><span class="type-signature"></span>hex<span class="signature">()</span><span class="type-signature"> &rarr; {String}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as hex string
 </div>
@@ -664,7 +808,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line489">line 489</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line512">line 512</a>
     </li></ul></dd>
     
 
@@ -718,6 +862,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>hash.hex();</code></pre>
@@ -729,12 +875,14 @@
 
     
 
+    
     <h4 class="name" id="toString"><span class="type-signature"></span>toString<span class="signature">()</span><span class="type-signature"> &rarr; {String}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as hex string
 </div>
@@ -780,7 +928,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line522">line 522</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line545">line 545</a>
     </li></ul></dd>
     
 
@@ -834,6 +982,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>hash.toString();</code></pre>
@@ -845,12 +995,14 @@
 
     
 
+    
     <h4 class="name" id="update"><span class="type-signature"></span>update<span class="signature">(message)</span><span class="type-signature"> &rarr; {<a href="Md5_.html">Md5</a>}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Update hash
 </div>
@@ -954,7 +1106,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line190">line 190</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line206">line 206</a>
     </li></ul></dd>
     
 
@@ -1015,6 +1167,8 @@
     
 
     
+
+    
 </article>
 
 </section>
@@ -1031,7 +1185,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Fri Jul 14 2017 12:58:59 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Dec 18 2017 18:48:59 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/global.html

@@ -94,6 +94,8 @@
     
 
     
+
+    
         <h3 class="subsection-title">Methods</h3>
 
         
@@ -101,12 +103,14 @@
 
     
 
+    
     <h4 class="name" id="md5%08"><span class="type-signature"></span>md5<span class="signature">(message)</span><span class="type-signature"> &rarr; {String}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Md5 hash function, export to global in browsers.
 </div>
@@ -210,7 +214,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line608">line 608</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line659">line 659</a>
     </li></ul></dd>
     
 
@@ -257,9 +261,20 @@
     
 
 
+
+
     <h5>Example</h5>
     
-    <pre class="prettyprint"><code>md5(''); // d41d8cd98f00b204e9800998ecf8427e
+    <pre class="prettyprint"><code>md5(''); // d41d8cd98f00b204e9800998ecf8427e
+md5('The quick brown fox jumps over the lazy dog'); // 9e107d9d372bb6826bd81d3542a419d6
+md5('The quick brown fox jumps over the lazy dog.'); // e4d909c290d0fb1ca068ffaddf22cbd0
+
+// It also supports UTF-8 encoding
+md5('中文'); // a7bac2239fcdcb3a067903d8077c4a07
+
+// It also supports byte `Array`, `Uint8Array`, `ArrayBuffer`
+md5([]); // d41d8cd98f00b204e9800998ecf8427e
+md5(new Uint8Array([])); // d41d8cd98f00b204e9800998ecf8427e</code></pre>
 
 
 
@@ -285,7 +300,7 @@
 <br class="clear">
 
 <footer>
-</div>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Dec 18 2017 18:48:59 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/index.html

@@ -77,7 +77,8 @@ md5.hex(''); // d41d8cd98f00b204e9800998ecf8427e
 md5.array(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126]
 md5.digest(''); // [212, 29, 140, 217, 143, 0, 178, 4, 233, 128, 9, 152, 236, 248, 66, 126]
 md5.arrayBuffer(''); // ArrayBuffer
-md5.buffer(''); // ArrayBuffer, deprecated, This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.</code></pre><h2>License</h2><p>The project is released under the <a href="http://www.opensource.org/licenses/MIT">MIT license</a>.</p>
+md5.buffer(''); // ArrayBuffer, deprecated, This maybe confuse with Buffer in node.js. Please use arrayBuffer instead.
+md5.base64(''); // 1B2M2Y8AsgTpgAmY7PhCfg==</code></pre><h2>License</h2><p>The project is released under the <a href="http://www.opensource.org/licenses/MIT">MIT license</a>.</p>
 <h2>Contact</h2><p>The project's website is located at https://github.com/emn178/js-md5<br>Author: Chen, Yi-Cyuan (emn178@gmail.com)</p></article>
     </section>
 
@@ -95,7 +96,7 @@ md5.buffer(''); // ArrayBuffer, deprecated, This maybe confuse with Buffer in no
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Fri Jul 14 2017 12:58:59 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Dec 18 2017 18:48:59 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/md5.html

@@ -47,7 +47,7 @@
 
     
     <dt class="tag-version">Version:</dt>
-    <dd class="tag-version"><ul class="dummy"><li>0.5.0</li></ul></dd>
+    <dd class="tag-version"><ul class="dummy"><li>0.7.3</li></ul></dd>
     
 
     
@@ -117,6 +117,8 @@
     
 
     
+
+    
         <h3 class="subsection-title">Methods</h3>
 
         
@@ -124,12 +126,14 @@
 
     
 
+    
     <h4 class="name" id=".array"><span class="type-signature">(static) </span>array<span class="signature">(message)</span><span class="type-signature"> &rarr; {Array}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as bytes array
 </div>
@@ -233,7 +237,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line67">line 67</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line74">line 74</a>
     </li></ul></dd>
     
 
@@ -280,6 +284,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>md5.array('The quick brown fox jumps over the lazy dog');</code></pre>
@@ -291,12 +297,14 @@
 
     
 
+    
     <h4 class="name" id=".arrayBuffer"><span class="type-signature">(static) </span>arrayBuffer<span class="signature">(message)</span><span class="type-signature"> &rarr; {ArrayBuffer}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as ArrayBuffer
 </div>
@@ -400,7 +408,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line76">line 76</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line83">line 83</a>
     </li></ul></dd>
     
 
@@ -447,6 +455,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>md5.arrayBuffer('The quick brown fox jumps over the lazy dog');</code></pre>
@@ -458,12 +468,185 @@
 
     
 
+    
+    <h4 class="name" id=".base64"><span class="type-signature">(static) </span>base64<span class="signature">(message)</span><span class="type-signature"> &rarr; {String}</span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    Output hash as base64 string
+</div>
+
+
+
+
+
+
+
+
+
+    <h5>Parameters:</h5>
+    
+
+<table class="params">
+    <thead>
+    <tr>
+        
+        <th>Name</th>
+        
+
+        <th>Type</th>
+
+        
+
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>message</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+|
+
+<span class="param-type">Array</span>
+|
+
+<span class="param-type">Uint8Array</span>
+|
+
+<span class="param-type">ArrayBuffer</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">message to hash</td>
+        </tr>
+
+    
+    </tbody>
+</table>
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line102">line 102</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+<div class="param-desc">
+    base64 string
+</div>
+
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">String</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+    <h5>Example</h5>
+    
+    <pre class="prettyprint"><code>md5.base64('The quick brown fox jumps over the lazy dog');</code></pre>
+
+
+
+        
+            
+
+    
+
+    
     <h4 class="name" id=".buffer"><span class="type-signature">(static) </span>buffer<span class="signature">(message)</span><span class="type-signature"> &rarr; {ArrayBuffer}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as ArrayBuffer
 </div>
@@ -569,7 +752,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line85">line 85</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line92">line 92</a>
     </li></ul></dd>
     
 
@@ -616,6 +799,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>md5.buffer('The quick brown fox jumps over the lazy dog');</code></pre>
@@ -627,12 +812,14 @@
 
     
 
+    
     <h4 class="name" id=".create"><span class="type-signature">(static) </span>create<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Md5_.html">Md5</a>}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Create Md5 object
 </div>
@@ -678,7 +865,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line101">line 101</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line117">line 117</a>
     </li></ul></dd>
     
 
@@ -725,6 +912,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>var hash = md5.create();</code></pre>
@@ -736,12 +925,14 @@
 
     
 
+    
     <h4 class="name" id=".digest"><span class="type-signature">(static) </span>digest<span class="signature">(message)</span><span class="type-signature"> &rarr; {Array}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as bytes array
 </div>
@@ -845,7 +1036,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line58">line 58</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line65">line 65</a>
     </li></ul></dd>
     
 
@@ -892,6 +1083,8 @@
     
 
 
+
+
     <h5>Example</h5>
     
     <pre class="prettyprint"><code>md5.digest('The quick brown fox jumps over the lazy dog');</code></pre>
@@ -903,12 +1096,14 @@
 
     
 
+    
     <h4 class="name" id=".hex"><span class="type-signature">(static) </span>hex<span class="signature">(message)</span><span class="type-signature"> &rarr; {String}</span></h4>
     
 
     
 
 
+
 <div class="description">
     Output hash as hex string
 </div>
@@ -1012,7 +1207,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line47">line 47</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line54">line 54</a>
     </li></ul></dd>
     
 
@@ -1059,9 +1254,14 @@
     
 
 
+
+
     <h5>Example</h5>
     
-    <pre class="prettyprint"><code>md5.hex('The quick brown fox jumps over the lazy dog');
+    <pre class="prettyprint"><code>md5.hex('The quick brown fox jumps over the lazy dog');
+// equal to
+md5('The quick brown fox jumps over the lazy dog');</code></pre>
+
 
 
         
@@ -1076,6 +1276,7 @@
     
 
 
+
 <div class="description">
     Create and update Md5 object
 </div>
@@ -1179,7 +1380,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-    <dt class="tag-source">Source:</dt>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line125">line 125</a>
     </li></ul></dd>
     
 
@@ -1226,9 +1427,14 @@
     
 
 
+
+
     <h5>Example</h5>
     
-    <h5>Example</h5>
+    <pre class="prettyprint"><code>var hash = md5.update('The quick brown fox jumps over the lazy dog');
+// equal to
+var hash = md5.create();
+hash.update('The quick brown fox jumps over the lazy dog');</code></pre>
 
 
 
@@ -1254,7 +1460,7 @@
 <br class="clear">
 
 <footer>
-</nav>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Dec 18 2017 18:48:59 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/md5.js.html

@@ -30,7 +30,7 @@
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5
- * @version 0.5.0
+ * @version 0.7.3
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
  * @copyright Chen, Yi-Cyuan 2014-2017
  * @license MIT
@@ -57,7 +57,8 @@
   var HEX_CHARS = '0123456789abcdef'.split('');
   var EXTRA = [128, 32768, 8388608, -2147483648];
   var SHIFT = [0, 8, 16, 24];
-  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'buffer', 'arrayBuffer'];
+  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'buffer', 'arrayBuffer', 'base64'];
+  var BASE64_ENCODE_CHAR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
 
   var blocks = [], buffer8;
   if (ARRAY_BUFFER) {
@@ -72,6 +73,12 @@
     };
   }
 
+  if (ARRAY_BUFFER && (root.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+    ArrayBuffer.isView = function (obj) {
+      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+
   /**
    * @method hex
    * @memberof md5
@@ -120,6 +127,15 @@
    * @example
    * md5.buffer('The quick brown fox jumps over the lazy dog');
    */
+  /**
+   * @method base64
+   * @memberof md5
+   * @description Output hash as base64 string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} base64 string
+   * @example
+   * md5.base64('The quick brown fox jumps over the lazy dog');
+   */
   var createOutputMethod = function (outputType) {
     return function (message) {
       return new Md5(true).update(message)[outputType]();
@@ -210,7 +226,7 @@
         this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
       }
     }
-    this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = 0;
+    this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = this.hBytes = 0;
     this.finalized = this.hashed = false;
     this.first = true;
   }
@@ -228,23 +244,25 @@
     if (this.finalized) {
       return;
     }
-    var notString = typeof(message) != 'string';
+
-    if (notString) {
+    var notString, type = typeof message;
-      if (message === null || message === undefined) {
+    if (type !== 'string') {
-        throw ERROR;
+      if (type === 'object') {
-      } else if (message.constructor === root.ArrayBuffer) {
+        if (message === null) {
-        message = new Uint8Array(message);
+          throw ERROR;
-      }
+        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
-    }
+          message = new Uint8Array(message);
-    var length = message.length;
+        } else if (!Array.isArray(message)) {
-    if (notString) {
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
-      if (typeof length !== 'number' ||
+            throw ERROR;
-        !Array.isArray(message) && 
+          }
-        !(ARRAY_BUFFER && ArrayBuffer.isView(message))) {
+        }
+      } else {
         throw ERROR;
       }
+      notString = true;
     }
-    var code, index = 0, i, blocks = this.blocks;
+    var code, index = 0, i, length = message.length, blocks = this.blocks;
     var buffer8 = this.buffer8;
 
     while (index < length) {
@@ -320,6 +338,10 @@
         this.start = i;
       }
     }
+    if (this.bytes > 4294967295) {
+      this.hBytes += this.bytes / 4294967296 << 0;
+      this.bytes = this.bytes % 4294967296;
+    }
     return this;
   };
 
@@ -341,6 +363,7 @@
       blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
     }
     blocks[14] = this.bytes << 3;
+    blocks[15] = this.hBytes << 3 | this.bytes >>> 29;
     this.hash();
   };
 
@@ -530,21 +553,21 @@
     var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3;
 
     return HEX_CHARS[(h0 >> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
-       HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
+      HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
-       HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
+      HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
-       HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
+      HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
-       HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
+      HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
-       HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
+      HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
-       HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
+      HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
-       HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
+      HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
-       HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
+      HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
-       HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
+      HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
-       HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
+      HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
-       HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
+      HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
-       HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
+      HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
-       HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
+      HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
-       HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
+      HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
-       HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F];
+      HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F];
   };
 
   /**
@@ -628,6 +651,34 @@
    */
   Md5.prototype.buffer = Md5.prototype.arrayBuffer;
 
+  /**
+   * @method base64
+   * @memberof Md5
+   * @instance
+   * @description Output hash as base64 string
+   * @returns {String} base64 string
+   * @see {@link md5.base64}
+   * @example
+   * hash.base64();
+   */
+  Md5.prototype.base64 = function () {
+    var v1, v2, v3, base64Str = '', bytes = this.array();
+    for (var i = 0; i < 15;) {
+      v1 = bytes[i++];
+      v2 = bytes[i++];
+      v3 = bytes[i++];
+      base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+        BASE64_ENCODE_CHAR[(v1 << 4 | v2 >>> 4) & 63] +
+        BASE64_ENCODE_CHAR[(v2 << 2 | v3 >>> 6) & 63] +
+        BASE64_ENCODE_CHAR[v3 & 63];
+    }
+    v1 = bytes[i];
+    base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+      BASE64_ENCODE_CHAR[(v1 << 4) & 63] +
+      '==';
+    return base64Str;
+  };
+
   var exports = createMethod();
 
   if (COMMON_JS) {
@@ -674,7 +725,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a> on Fri Jul 14 2017 12:58:59 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Mon Dec 18 2017 18:48:59 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/styles/jsdoc-default.css

@@ -78,6 +78,10 @@ article dl {
     margin-bottom: 40px;
 }
 
+article img {
+  max-width: 100%;
+}
+
 section
 {
     display: block;
@@ -218,8 +222,8 @@ thead tr
 th { border-right: 1px solid #aaa; }
 tr > th:last-child { border-right: 1px solid #ddd; }
 
-.ancestors { color: #999; }
+.ancestors, .attribs { color: #999; }
-.ancestors a
+.ancestors a, .attribs a
 {
     color: #999 !important;
     text-decoration: none;

package.json

@@ -1,23 +1,23 @@
 {
   "name": "js-md5",
-  "version": "0.5.0",
+  "version": "0.7.3",
   "description": "A simple MD5 hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/md5.js",
   "devDependencies": {
     "expect.js": "~0.3.1",
-    "jscoverage": "~0.5.9",
     "jsdoc": "^3.4.0",
     "mocha": "~2.3.4",
+    "nyc": "^11.3.0",
     "requirejs": "^2.1.22",
-    "uglifyjs": "~2.4.10",
+    "uglify-js": "^3.1.9",
     "webworker-threads": "^0.7.11"
   },
   "scripts": {
-    "test": "mocha tests/node-test.js -r jscoverage",
+    "test": "nyc mocha tests/node-test.js",
-    "report": "mocha tests/node-test.js -r jscoverage --covout=html",
+    "report": "nyc --reporter=html --reporter=text mocha tests/node-test.js",
-    "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls",
     "doc": "rm -rf doc;jsdoc src README.md -d doc",
-    "compress": "uglifyjs src/md5.js --compress --mangle --comments --output build/md5.min.js",
+    "compress": "uglifyjs src/md5.js -c -m eval --comments --output build/md5.min.js",
     "build": "npm run-script compress;npm run-script doc"
   },
   "repository": {
@@ -36,5 +36,10 @@
   "homepage": "https://github.com/emn178/js-md5",
   "bugs": {
     "url": "https://github.com/emn178/js-md5/issues"
+  },
+  "nyc": {
+    "exclude": [
+      "tests"
+    ]
   }
 }

src/md5.js

@@ -2,7 +2,7 @@
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5
- * @version 0.5.0
+ * @version 0.7.3
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
  * @copyright Chen, Yi-Cyuan 2014-2017
  * @license MIT
@@ -29,7 +29,8 @@
   var HEX_CHARS = '0123456789abcdef'.split('');
   var EXTRA = [128, 32768, 8388608, -2147483648];
   var SHIFT = [0, 8, 16, 24];
-  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'buffer', 'arrayBuffer'];
+  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'buffer', 'arrayBuffer', 'base64'];
+  var BASE64_ENCODE_CHAR = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'.split('');
 
   var blocks = [], buffer8;
   if (ARRAY_BUFFER) {
@@ -44,6 +45,12 @@
     };
   }
 
+  if (ARRAY_BUFFER && (root.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+    ArrayBuffer.isView = function (obj) {
+      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+
   /**
    * @method hex
    * @memberof md5
@@ -92,6 +99,15 @@
    * @example
    * md5.buffer('The quick brown fox jumps over the lazy dog');
    */
+  /**
+   * @method base64
+   * @memberof md5
+   * @description Output hash as base64 string
+   * @param {String|Array|Uint8Array|ArrayBuffer} message message to hash
+   * @returns {String} base64 string
+   * @example
+   * md5.base64('The quick brown fox jumps over the lazy dog');
+   */
   var createOutputMethod = function (outputType) {
     return function (message) {
       return new Md5(true).update(message)[outputType]();
@@ -182,7 +198,7 @@
         this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
       }
     }
-    this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = 0;
+    this.h0 = this.h1 = this.h2 = this.h3 = this.start = this.bytes = this.hBytes = 0;
     this.finalized = this.hashed = false;
     this.first = true;
   }
@@ -200,23 +216,25 @@
     if (this.finalized) {
       return;
     }
-    var notString = typeof(message) != 'string';
+
-    if (notString) {
+    var notString, type = typeof message;
-      if (message === null || message === undefined) {
+    if (type !== 'string') {
-        throw ERROR;
+      if (type === 'object') {
-      } else if (message.constructor === root.ArrayBuffer) {
+        if (message === null) {
-        message = new Uint8Array(message);
+          throw ERROR;
-      }
+        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
-    }
+          message = new Uint8Array(message);
-    var length = message.length;
+        } else if (!Array.isArray(message)) {
-    if (notString) {
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
-      if (typeof length !== 'number' ||
+            throw ERROR;
-        !Array.isArray(message) && 
+          }
-        !(ARRAY_BUFFER && ArrayBuffer.isView(message))) {
+        }
+      } else {
         throw ERROR;
       }
+      notString = true;
     }
-    var code, index = 0, i, blocks = this.blocks;
+    var code, index = 0, i, length = message.length, blocks = this.blocks;
     var buffer8 = this.buffer8;
 
     while (index < length) {
@@ -292,6 +310,10 @@
         this.start = i;
       }
     }
+    if (this.bytes > 4294967295) {
+      this.hBytes += this.bytes / 4294967296 << 0;
+      this.bytes = this.bytes % 4294967296;
+    }
     return this;
   };
 
@@ -313,6 +335,7 @@
       blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
     }
     blocks[14] = this.bytes << 3;
+    blocks[15] = this.hBytes << 3 | this.bytes >>> 29;
     this.hash();
   };
 
@@ -502,21 +525,21 @@
     var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3;
 
     return HEX_CHARS[(h0 >> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
-       HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
+      HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
-       HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
+      HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
-       HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
+      HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
-       HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
+      HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
-       HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
+      HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
-       HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
+      HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
-       HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
+      HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
-       HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
+      HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
-       HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
+      HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
-       HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
+      HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
-       HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
+      HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
-       HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
+      HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
-       HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
+      HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
-       HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
+      HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
-       HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F];
+      HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F];
   };
 
   /**
@@ -600,6 +623,34 @@
    */
   Md5.prototype.buffer = Md5.prototype.arrayBuffer;
 
+  /**
+   * @method base64
+   * @memberof Md5
+   * @instance
+   * @description Output hash as base64 string
+   * @returns {String} base64 string
+   * @see {@link md5.base64}
+   * @example
+   * hash.base64();
+   */
+  Md5.prototype.base64 = function () {
+    var v1, v2, v3, base64Str = '', bytes = this.array();
+    for (var i = 0; i < 15;) {
+      v1 = bytes[i++];
+      v2 = bytes[i++];
+      v3 = bytes[i++];
+      base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+        BASE64_ENCODE_CHAR[(v1 << 4 | v2 >>> 4) & 63] +
+        BASE64_ENCODE_CHAR[(v2 << 2 | v3 >>> 6) & 63] +
+        BASE64_ENCODE_CHAR[v3 & 63];
+    }
+    v1 = bytes[i];
+    base64Str += BASE64_ENCODE_CHAR[v1 >>> 2] +
+      BASE64_ENCODE_CHAR[(v1 << 4) & 63] +
+      '==';
+    return base64Str;
+  };
+
   var exports = createMethod();
 
   if (COMMON_JS) {

tests/node-test.js

@@ -1,56 +1,60 @@
 expect = require('expect.js');
 Worker = require('webworker-threads').Worker;
 
+function unset() {
+  delete require.cache[require.resolve('../src/md5.js')];
+  delete require.cache[require.resolve('./test.js')];
+  md5 = null;
+  BUFFER = undefined;
+  JS_MD5_NO_WINDOW = undefined;
+  JS_MD5_NO_NODE_JS = undefined;
+  JS_MD5_NO_COMMON_JS = undefined;
+  JS_MD5_NO_ARRAY_BUFFER = undefined;
+  JS_MD5_NO_ARRAY_BUFFER_IS_VIEW = undefined;
+  window = undefined;
+}
+
+function runCommonJsTest() {
+  md5 = require('../src/md5.js');
+  require('./test.js');
+  unset();
+}
+
+function runWindowTest() {
+  window = global;
+  require('../src/md5.js');
+  require('./test.js');
+  unset();
+}
+
 // Node.js env
 BUFFER = true;
-md5 = require('../src/md5.js');
+runCommonJsTest();
-require('./test.js');
-
-delete require.cache[require.resolve('../src/md5.js')]
-delete require.cache[require.resolve('./test.js')]
-md5 = null
 
 // Webpack browser env
 JS_MD5_NO_NODE_JS = true;
-BUFFER = false;
+runCommonJsTest();
-window = global;
-md5 = require('../src/md5.js');
-require('./test.js');
-
-delete require.cache[require.resolve('../src/md5.js')];
-delete require.cache[require.resolve('./test.js')];
-md5 = null;
 
 // browser env
 JS_MD5_NO_NODE_JS = true;
 JS_MD5_NO_COMMON_JS = true;
-BUFFER = false;
+runWindowTest();
-window = global;
-require('../src/md5.js');
-require('./test.js');
-
-delete require.cache[require.resolve('../src/md5.js')];
-delete require.cache[require.resolve('./test.js')];
-md5 = null;
 
 // browser env and no array buffer
 JS_MD5_NO_NODE_JS = true;
 JS_MD5_NO_COMMON_JS = true;
 JS_MD5_NO_ARRAY_BUFFER = true;
-BUFFER = false;
+runWindowTest();
-window = global;
-require('../src/md5.js');
-require('./test.js');
 
-delete require.cache[require.resolve('../src/md5.js')];
+// browser env and no isView
-delete require.cache[require.resolve('./test.js')];
+JS_MD5_NO_NODE_JS = true;
-md5 = null;
+JS_MD5_NO_COMMON_JS = true;
+JS_MD5_NO_ARRAY_BUFFER_IS_VIEW = true;
+runWindowTest();
 
 // browser AMD
 JS_MD5_NO_NODE_JS = true;
 JS_MD5_NO_COMMON_JS = true;
-JS_MD5_NO_ARRAY_BUFFER = false;
-BUFFER = false;
 window = global;
 define = function (func) {
   md5 = func();
@@ -59,10 +63,7 @@ define = function (func) {
 define.amd = true;
 
 require('../src/md5.js');
-
+unset();
-delete require.cache[require.resolve('../src/md5.js')];
-delete require.cache[require.resolve('./test.js')];
-md5 = null;
 
 // webworker
 WORKER = 'tests/worker.js';
@@ -70,12 +71,11 @@ SOURCE = 'src/md5.js';
 
 require('./worker-test.js');
 
+delete require.cache[require.resolve('./worker-test.js')];
+
 // cover webworker
 JS_MD5_NO_WINDOW = true;
 JS_MD5_NO_NODE_JS = true;
-JS_MD5_NO_COMMON_JS = false;
-JS_MD5_NO_ARRAY_BUFFER = false;
-BUFFER = false;
 WORKER = './worker.js';
 SOURCE = '../src/md5.js';
 window = global;

tests/test.js

@@ -45,6 +45,43 @@
     }
   };
 
+
+  var base64TestCases = {
+    'ascii': {
+      '1B2M2Y8AsgTpgAmY7PhCfg==': '',
+      'nhB9nTcrtoJr2B01QqQZ1g==': 'The quick brown fox jumps over the lazy dog',
+      '5NkJwpDQ+xygaP+t3yLL0A==': 'The quick brown fox jumps over the lazy dog.'
+    },
+    'ascii more than 64 bytes': {
+      '9jhy73vJeoqOrbpvCIHeUw==': 'The MD5 message-digest algorithm is a widely used cryptographic hash function producing a 128-bit (16-byte) hash value, typically expressed in text format as a 32 digit hexadecimal number. MD5 has been utilized in a wide variety of cryptographic applications, and is also commonly used to verify data integrity.'
+    },
+    'UTF8': {
+      'p7rCI5/NyzoGeQPYB3xKBw==': '中文',
+      '7D7b87BaRJ/CBqATjHOcOw==': 'aécio',
+      'uQhpqvEhIQ9sVjlz+oVWUA==': '𠜎'
+    },
+    'UTF8 more than 64 bytes': {
+      '7c5hWxeebim+IxRbd+u9YQ==': '訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一',
+      'rTbJq2aaC6nORtPOkTTeNA==': '訊息摘要演算法第五版（英語：Message-Digest Algorithm 5，縮寫為MD5），是當前電腦領域用於確保資訊傳輸完整一致而廣泛使用的雜湊演算法之一（又譯雜湊演算法、摘要演算法等），主流程式語言普遍已有MD5的實作。'
+    },
+    'special length': {
+      'oRneY+SyOYQn2gbdeAJjsw==': '0123456780123456780123456780123456780123456780123456780',
+      '3a/YTr5jrrxGJrA3pWnXiw==': '01234567801234567801234567801234567801234567801234567801',
+      'nqBNdDYYeXzkZERbV4WmMA==': '0123456780123456780123456780123456780123456780123456780123456780',
+      'ZY2RSuQsSTiHSy54bM2keQ==': '01234567801234567801234567801234567801234567801234567801234567801234567',
+      'oIOjcQ1oV5Px8XmIv+PBdQ==': '012345678012345678012345678012345678012345678012345678012345678012345678',
+      'KyGoQ8/DHIAmoNg1vJG8mA==': '012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678012345678',
+      '0C696XkmTHnhQVWfyfa2XA==': '012345678901234567',
+      'HO2BGvR+rTdIcvzKnXPdcQ==': '012345678901234567890123456789012345678901234567890123456789',
+      '/7gaJDpg2sRZKTAIc+BShw==': '012345678901234567中文',
+    },
+    'Array': {
+      '1B2M2Y8AsgTpgAmY7PhCfg==': [],
+      'k7iFrf4NoInN9jSQT9WfcQ==': [0],
+      'nhB9nTcrtoJr2B01QqQZ1g==': [84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]
+    }
+  };
+
   if (!(typeof JS_MD5_NO_ARRAY_BUFFER === 'boolean' && JS_MD5_NO_ARRAY_BUFFER)) {
     testCases['Uint8Array'] = {
       '9e107d9d372bb6826bd81d3542a419d6': new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103])
@@ -204,6 +241,30 @@
           });
         });
       });
+
+      context('when large size', function () {
+        var hash = md5.create();
+        hash.bytes = 4294967295;
+        hash.update('any');
+        expect(hash.hBytes).to.be(1);
+      });
+    });
+
+    describe('#bas64', function () {
+      for (var testCaseName in base64TestCases) {
+        var testCase = base64TestCases[testCaseName];
+        context('when ' + testCaseName, function () {
+          for (var hash in testCase) {
+            (function (message, hash) {
+              it('should be equal', function () {
+                expect(md5.base64(message)).to.be(hash);
+                expect(md5.create().update(message).base64()).to.be(hash);
+                expect(md5.update(message).base64()).to.be(hash);
+              });
+            })(testCase[hash], hash);
+          }
+        });
+      }
     });
   });
 })(md5);

tests/worker-test.js

@@ -1,4 +1,4 @@
-(function () {
+(function (Worker, WORKER, SOURCE) {
   var cases = {
     'd41d8cd98f00b204e9800998ecf8427e': '',
     '9e107d9d372bb6826bd81d3542a419d6': 'The quick brown fox jumps over the lazy dog',
@@ -18,4 +18,4 @@
       });
     });
   });
-})();
+})(Worker, WORKER, SOURCE);