fix: not working with Next.js Edge Runtime

vercel/edge-runtime#813
tksst · Feb 24, 2024 · a6f3f9e · a6f3f9e
1 parent 3652767
commit a6f3f9e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.changeset/fix-not-working-with-nextjs-edge.md b/.changeset/fix-not-working-with-nextjs-edge.md
@@ -0,0 +1,5 @@
+---
+"mobilepass": patch
+---
+
+fix: not working with Next.js Edge Runtime, see https://github.com/vercel/edge-runtime/issues/813
diff --git a/packages/mobilepass/src/lib/utils/crypto.ts b/packages/mobilepass/src/lib/utils/crypto.ts
@@ -2,10 +2,12 @@ export async function sha256(data: BufferSource): Promise<ArrayBuffer> {
     return await crypto.subtle.digest("SHA-256", data);
 }
 
-export async function hmacSHA256(key: BufferSource, data: BufferSource): Promise<ArrayBuffer> {
+export async function hmacSHA256(key: ArrayBuffer, data: ArrayBuffer): Promise<ArrayBuffer> {
     const importedKey = await crypto.subtle.importKey(
         "raw",
-        key,
+        // Next.js Edge Runtime has a bug and wraps with Uint8Array to work around it.
+        // https://github.com/vercel/edge-runtime/issues/813
+        new Uint8Array(key),
         {
             name: "HMAC",
             hash: { name: "SHA-256" },
@@ -14,5 +16,5 @@ export async function hmacSHA256(key: BufferSource, data: BufferSource): Promise
         ["sign"],
     );
 
-    return await crypto.subtle.sign("HMAC", importedKey, data);
+    return await crypto.subtle.sign("HMAC", importedKey, new Uint8Array(data));
 }
diff --git a/packages/mobilepass/src/lib/utils/hotp.ts b/packages/mobilepass/src/lib/utils/hotp.ts
@@ -20,7 +20,7 @@ function truncate(mac: Uint8Array, digits: number): number {
     return value % 10 ** digits;
 }
 
-export async function hotpSHA256(key: ArrayBuffer | ArrayBufferView, counter: number | bigint): Promise<string> {
+export async function hotpSHA256(key: ArrayBuffer, counter: number | bigint): Promise<string> {
     if (counter < 0) {
         throw new RangeError(`counter: ${counter} is not a natural number.`);
     }