tinyhmacmd5 0.0.5 → 0.0.7

package/README.md

@@ -2,7 +2,9 @@
 
 A tiny JavaScript HMAC-MD5 implementation.
 
-The minified browser bundle ([`browser.min.js`](browser.min.js)) is only 1029 bytes.
+The minified browser bundle ([`browser.min.js`](browser.min.js)) is only 965 bytes.
+
+Preview: https://bddjr.github.io/tinyhmacmd5/
 
 ## Setup
 

package/browser.min.js

@@ -1,2 +1,2 @@
-/** @license https://github.com/bddjr/tinyhmacmd5/blob/HEAD/LICENSE */
-{let r="length",e=16,n=2**32,t=1732584193,o=271733878,a=~t,f=~o,u=Math,i=u.floor,l=[738695,669989,770404,703814],d=Array(64),s=(s,v)=>{var y,c,g,h,A,w=0,b=i((v+64)/512)*e+14,m=[t,f,a,o],p=[...m],x=r=>m[3&++A];for(s[i(v/32)]|=128<<v%32,s[b]=0|v,s[b+1]=0|v/n;w<s[r];w+=e){for(A=b=0;b<64;A-=6)m[3&A]=(c=x(),g=x(),h=x(),0|((c=((y=b>>4)?y>1?y>2?g^(c|~h):c^g^h:c&h|g&~h:c&g|~c&h)+(0|s[w+(b*(29521>>4*y)+(1296>>4*y)&15)])+(g=l[y]>>b%4*5&31,d[b++]??=0|n*u.abs(u.sin(b)))+x())<<g|c>>>32-g)+x());for(A=4;A;)p[--A]=m[A]=0|p[A]+m[A]}return m},v=e=>{for(var n=e[r],t=[];n;)t[i(--n/4)]|=e[n]<<n%4*8;return t},y=r=>"string"==typeof r?(new TextEncoder).encode(r):r;var md5=(n,t,o)=>{var a,f=v(n=y(n)),u=8*n[r],i=e,l=new Uint8Array(e),d=r=>{for(f.unshift(...Array(e));i;)f[--i]=16843009*r^a[i];i=e};for(null!=t&&((a=v(t=y(t)))[r]>e&&(a=s(a,8*t[r])),d(54),f=s(f,512+u),d(92),u=640),f=s(f,u);i;)l[--i]=f[i>>2]>>>i%4*8;return o?l:l.reduce((r,n)=>r+(n>>4&&"")+n.toString(e),"")}}
+/** @license https://bddjr.github.io/tinyhmacmd5/lic */
+{let r=1732584193,e=271733878,t=~r,n=~e,o=[],f=(f,a,h=0,i,l,u,d,c,g=[r,n,t,e],s=[...g],y=r=>g[3&++c])=>{for(f[a+64>>>9<<4|14]=0|a,f[a>>>5]|=128<<a%32;h<f.length;h+=16){for(c=i=0;i<64;c-=6)g[3&c]=0|((l=0|(l=y(),u=y(),d=y(),((a=i>>4<<2)?a>4?a>8?u^(l|~d):l^u^d:l&d|u&~d:l&u|~l&d)+(0|f[h+(i*(29521>>a)+(1296>>a)&15)])+(u="',16%).4$+07&*/5".charCodeAt(a+i%4)-32,o[63-i++]??=0|2**32*Math.abs(Math.sin(i)))+y()))<<u|l>>>32-u)+y();for(c=4;c;)s[--c]=g[c]=0|s[c]+g[c]}return g},a=(r,e,t=("string"==typeof r?r=(new TextEncoder).encode(r):r).length,n=[],o=8*t)=>{for(;t;)n[e+(--t>>>2)]|=r[t]<<t%4*8;return[n,o]};var md5=(r,e,t)=>{var n=16,o=null!=e,[h,i]=a(r,o*n),l=new Uint8Array(n);if(o){let[r,t]=a(e,0),o=e=>{for(;n;)h[--n]=16843009*e^r[n];n=16};t>512&&(r=f(r,t)),o(54),(h=f(h,512+i)).unshift(...Array(16)),o(92),i=640}for(h=f(h,i);n;)l[--n]=h[n>>2]>>>n%4*8;return t?l:l.reduce((r,e)=>r+(e>>4&&"")+e.toString(16),"")}}

package/main.d.ts

@@ -9,8 +9,8 @@
  * @param {boolean} [raw] If true, the hash is returned as raw bytes (Uint8Array); otherwise, as a hex string.
  * @returns {string | Uint8Array<ArrayBuffer>} The MD5 (or HMAC‑MD5) digest, either as a hex string or a Uint8Array.
  */
-var md5: {
+declare var md5: {
     (data: string | Uint8Array, key?: string | Uint8Array | null, raw?: false): string;
-    (data: string | Uint8Array, key?: string | Uint8Array | null, raw: true): Uint8Array<ArrayBuffer>;
+    (data: string | Uint8Array, key: string | Uint8Array | null | undefined, raw: true): Uint8Array<ArrayBuffer>;
 };
 export default md5;

package/main.js

@@ -1,85 +1,73 @@
-/** @license https://github.com/bddjr/tinyhmacmd5/blob/HEAD/LICENSE */
+/** @license https://bddjr.github.io/tinyhmacmd5/lic */
 
 // Adapted from https://github.com/blueimp/JavaScript-MD5
 
-/** @type {"length"} */
-let $length = "length"
-
-/** @type {16} */
-let $16 = 16
-
-let $2_32 = 2 ** 32
-
 let A = 1732584193
   , D = 271733878
   , C = ~A
   , B = ~D
 
-let $Math = Math
-
-let floor = $Math.floor
-
-/** @type {number[]} */
-let S = [
-  738695, // 7, 12, 17, 22
-  669989, // 5,  9, 14, 20
-  770404, // 4, 11, 16, 23
-  703814, // 6, 10, 15, 21
-]
-
 /** @type {number[]} MD5 constants cached in memory */
-let K = Array(64)
+let K = []
 
 /**
  * Calculate the MD5 of an array of little-endian words, and a bit length.
  *
  * @param {number[]} x Array of little-endian words
- * @param {number} bitLen Bit length
- * @returns {[number, number, number, number]} MD5 Array
+ * @param {number} l Bit length
+ * 
+ * @param {number} [j]
+ * @param {number} [t0]
+ * @param {number} [t1]
+ * @param {number} [t2]
+ * @param {number} [oi]
+ * 
+ * @returns {number[]} MD5 Array
  */
-let binlMD5 = (x, bitLen) => {
-  var i = 0
-    , j = floor((bitLen + 64) / 512) * $16 + 14
-    , l
-    , t0
-    , t1
-    , t2
-
-  /** @type {number} */
-  var oi
-
-  /** @type {[number, number, number, number]} */
-  var output = [A, B, C, D]
-    , oldOutput = [...output]
-    , o = (/**@type {*}*/ _) => output[++oi & 3]
+let binlMD5 = (
+  x,
+  l,
+  // var:
+  i = 0,
+  j,
+  t0,
+  t1,
+  t2,
+  oi,
+  output = [A, B, C, D],
+  oldOutput = [...output],
+  o = (
+    /** @param {*} [_] */
+    _ => output[++oi & 3]
+  ),
+) => {
 
   // append padding
-  x[floor(bitLen / 32)] |= 0x80 << bitLen % 32;
-  x[j] = 0 | bitLen;
-  x[j + 1] = 0 | bitLen / $2_32;
+  x[l + 64 >>> 9 << 4 | 14] = 0 | l;
+  x[l >>> 5] |= 0x80 << l % 32;
 
-  for (; i < x[$length]; i += $16) {
+  for (; i < x.length; i += 16) {
     for (oi = j = 0; j < 64; oi -= 6) {
       output[oi & 3] = (
-        t0 = (
+        t0 = 0 | (
           (
             t0 = o(),
             t1 = o(),
             t2 = o(),
-            (l = j >> 4)
-              ? l > 1
-                ? l > 2
-                  ? t1 ^ (t0 | ~t2)  // 3
-                  : t0 ^ t1 ^ t2     // 2
-                : t0 & t2 | t1 & ~t2 // 1
-              : t0 & t1 | ~t0 & t2   // 0
+            (l = j >> 4 << 2)
+              ? l > 4
+                ? l > 8
+                  ? t1 ^ (t0 | ~t2)  // Round 4: II
+                  : t0 ^ t1 ^ t2     // Round 3: HH
+                : t0 & t2 | t1 & ~t2 // Round 2: GG
+              : t0 & t1 | ~t0 & t2   // Round 1: FF
           ) +
           (
-            0 | x[i + (j * (0x7351 >> l * 4) + (0x0510 >> l * 4) & 15)]
+            0 | x[i + (j * (0x7351 >> l) + (0x0510 >> l) & 15)]
           ) +
           (
-            t1 = S[l] >> j % 4 * 5 & 31,
-            K[j++] ??= 0 | $2_32 * $Math.abs($Math.sin(j))
+            t1 = "',16%).4$+07&*/5".charCodeAt(l + j % 4) - 32,
+            K[63 - j++] ??= 0 | 2 ** 32 * Math.abs(Math.sin(j))
           ) +
           o()
         ),
@@ -96,29 +84,31 @@ let binlMD5 = (x, bitLen) => {
 /**
  * Convert bytes to an array of little-endian words
  *
- * @param {Uint8Array} input Raw bytes
- * @returns {number[]} Array of little-endian words
+ * @param {string | Uint8Array} input
+ * @param {number} padLen
+ * 
+ * @param {number[]} [output]
+ * 
+ * @returns {[number[], number]}
  */
-let bytesToBinl = (input) => {
-  var i = input[$length]
-  /** @type {number[]} */
-  var output = []
+let inputToBinl = (
+  input,
+  padLen,
+  // var:
+  i = (
+    typeof input == 'string'
+      ? input = new TextEncoder().encode(input)
+      : input
+  ).length,
+  output = [],
+  bitLen = 8 * i,
+) => {
   for (; i;) {
-    output[floor(--i / 4)] |= input[i] << i % 4 * 8
+    output[padLen + (--i >>> 2)] |= /**@type {Uint8Array}*/(input)[i] << i % 4 * 8
   }
-  return output
+  return [output, bitLen]
 }
 
-/**
- * @param {string | Uint8Array} input 
- * @returns {Uint8Array}
- */
-let inputToBytes = (input) => (
-  typeof input == 'string'
-    ? new TextEncoder().encode(input)
-    : input
-)
-
 /**
  * @overload
  * @param {string | Uint8Array} data
@@ -129,7 +119,7 @@ let inputToBytes = (input) => (
 /**
  * @overload
  * @param {string | Uint8Array} data
- * @param {string | Uint8Array | null} [key]
+ * @param {string | Uint8Array | null | undefined} key
  * @param {true} raw
  * @returns {Uint8Array<ArrayBuffer>}
  */
@@ -145,30 +135,28 @@ let inputToBytes = (input) => (
  * @returns {string | Uint8Array<ArrayBuffer>} The MD5 (or HMAC‑MD5) digest, either as a hex string or a Uint8Array.
  */
 var md5 = (data, key, raw) => {
-  var bdata = bytesToBinl(data = inputToBytes(data))
-    , bitLen = data[$length] * 8
-    , i = $16
-    , out = new Uint8Array($16)
-  /** @type {*} */
-  var bkey
-    , pad = (/**@type {number}*/ x) => {
-      bdata.unshift(...Array($16))
-      for (; i;) {
-        bdata[--i] = 0x01010101 * x ^ bkey[i]
-      }
-      i = $16
-    }
+  var i = 16
+    , hasKey = key != null
+    , [bdata, bitLen] = inputToBinl(data, /**@type {*}*/(hasKey) * i)
+    , out = new Uint8Array(i)
 
-  if (key != null) {
+  if (hasKey) {
     // HMAC
-    bkey = bytesToBinl(key = inputToBytes(key))
-    if (bkey[$length] > $16) {
-      bkey = binlMD5(bkey, key[$length] * 8)
+    let [bkey, keyBitlen] = inputToBinl(key, 0)
+      , pad = (/**@type {number}*/ x) => {
+        for (; i;) {
+          bdata[--i] = 0x01010101 * x ^ bkey[i]
+        }
+        i = 16
+      }
+    if (keyBitlen > 512) {
+      bkey = binlMD5(bkey, keyBitlen)
     }
     pad(0x36)
     bdata = binlMD5(bdata, 512 + bitLen)
+    bdata.unshift(...Array(16))
     pad(0x5c)
-    bitLen = 512 + 128
+    bitLen = 640
   }
 
   bdata = binlMD5(bdata, bitLen)
@@ -180,7 +168,7 @@ var md5 = (data, key, raw) => {
 
   return raw
     ? out
-    : out.reduce((p, v) => p + (v >> 4 && '') + v.toString($16), '')
+    : out.reduce((p, v) => p + (v >> 4 && '') + v.toString(16), '')
 }
 
 export default md5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tinyhmacmd5",
-  "version": "0.0.5",
-  "description": "A tiny JavaScript HMAC-MD5 implementation. The minified browser bundle is only 1029 bytes.",
+  "version": "0.0.7",
+  "description": "A tiny JavaScript HMAC-MD5 implementation. The minified browser bundle is only 965 bytes.",
   "author": "bddjr",
   "license": "MIT",
   "type": "module",
@@ -13,6 +13,7 @@
     "main.d.ts",
     "browser.min.js"
   ],
+  "homepage": "https://bddjr.github.io/tinyhmacmd5/",
   "keywords": [
     "md5",
     "hmac",
@@ -31,10 +32,11 @@
   "devDependencies": {
     "es-check": "^9.6.4",
     "terser": "^5.49.0",
-    "tinyhmacmd5": "link:"
+    "tinyhmacmd5": "link:",
+    "typescript": "^7.0.2"
   },
   "scripts": {
-    "build": "node scripts/build.mjs && es-check es2021 --module --checkFeatures main.js browser.min.js",
+    "build": "tsc && node scripts/build.mjs && es-check es2021 --module --checkFeatures main.js browser.min.js",
     "test": "pnpm build && node scripts/test.mjs"
   }
 }