switch to base32-encoding to support cjs

webrecorder · Aug 18, 2024 · 4b34de0 · 4b34de0
1 parent 8b08ca8
commit 4b34de0
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 66 deletions.
diff --git a/dist/index.all.js b/dist/index.all.js
diff --git a/dist/index.all.js.map b/dist/index.all.js.map
diff --git a/dist/index.cjs b/dist/index.cjs
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/node/index.cjs b/dist/node/index.cjs
diff --git a/dist/node/index.js b/dist/node/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,8 @@
     "test": "NODE_OPTIONS=--experimental-vm-modules npx jest --collectCoverage"
   },
   "dependencies": {
-    "base32-encode": "^2.0.0",
+    "@types/base32-encoding": "^1.0.2",
+    "base32-encoding": "^1.0.0",
     "hash-wasm": "^4.11.0",
     "pako": "^1.0.11",
     "tempy": "^3.1.0",

diff --git a/src/lib/warcserializer.ts b/src/lib/warcserializer.ts
@@ -1,5 +1,4 @@
-//import base32 from "hi-base32";
-import base32Encode from "base32-encode";
+import base32 from "base32-encoding";
 import pako from "pako";
 
 import { createSHA256, createSHA1 } from "hash-wasm";
@@ -189,7 +188,7 @@ export class WARCSerializer extends BaseAsyncIterReader
     return (
       this.digestAlgoPrefix + 
       (this.digestBase32
-        ? base32Encode(hasher.digest("binary"), "RFC4648")
+        ? base32Encode(hasher.digest("binary"))
         : hasher.digest("hex"))
     );
   }
@@ -264,3 +263,7 @@ export class WARCSerializer extends BaseAsyncIterReader
   }
 }
 
+function base32Encode(buff: Uint8Array) : string {
+  return base32.stringify(buff, "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567");
+}
+