use node's webcrypto when available (#326)

vercel · May 9, 2023 · a373606 · a373606 · vercel · May 9, 2023
1 parent d2a2f60
commit a373606
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 7 deletions.
diff --git a/.changeset/cold-geckos-serve.md b/.changeset/cold-geckos-serve.md
@@ -0,0 +1,5 @@
+---
+'@edge-runtime/primitives': minor
+---
+
+use node's webcrypto when available
diff --git a/packages/primitives/src/primitives/index.js b/packages/primitives/src/primitives/index.js
@@ -1,6 +1,7 @@
 // @ts-check
 
 const path = require('path')
+const nodeCrypto = require('crypto')
 
 function load() {
   /** @type {Record<string, any>} */
@@ -104,13 +105,34 @@ function load() {
     WebSocket: fetchImpl.WebSocket,
   })
 
-  const cryptoImpl = require('./crypto')
-  Object.assign(context, {
-    crypto: cryptoImpl.crypto,
-    Crypto: cryptoImpl.Crypto,
-    CryptoKey: cryptoImpl.CryptoKey,
-    SubtleCrypto: cryptoImpl.SubtleCrypto,
-  })
+  if (typeof SubtleCrypto !== 'undefined') {
+    Object.assign(context, {
+      crypto: globalThis.crypto,
+      Crypto: globalThis.Crypto,
+      CryptoKey: globalThis.CryptoKey,
+      SubtleCrypto: globalThis.SubtleCrypto,
+    })
+  // @ts-ignore
+  } else if (nodeCrypto.webcrypto) {
+    Object.assign(context, {
+      // @ts-ignore
+      crypto: nodeCrypto.webcrypto,
+      // @ts-ignore
+      Crypto: nodeCrypto.webcrypto.constructor,
+      // @ts-ignore
+      CryptoKey: nodeCrypto.webcrypto.CryptoKey,
+      // @ts-ignore
+      SubtleCrypto: nodeCrypto.webcrypto.subtle.constructor,
+    })
+  } else {
+    const cryptoImpl = require('./crypto')
+    Object.assign(context, {
+      crypto: cryptoImpl.crypto,
+      Crypto: cryptoImpl.Crypto,
+      CryptoKey: cryptoImpl.CryptoKey,
+      SubtleCrypto: cryptoImpl.SubtleCrypto,
+    })
+  }
 
   return context
 }

diff --git a/packages/vm/tests/integration/crypto.test.ts b/packages/vm/tests/integration/crypto.test.ts
@@ -40,3 +40,30 @@ function toHex(buffer: ArrayBuffer) {
     .map((b) => b.toString(16).padStart(2, '0'))
     .join('')
 }
+
+const nodeMajorVersion = parseInt(process.versions.node.split('.')[0])
+if (nodeMajorVersion >= 16) {
+  test('Ed25519', async () => {
+    const vm = new EdgeVM()
+
+    function fn() {
+      return crypto.subtle.generateKey('Ed25519', false, ['sign', 'verify'])
+    }
+
+    const kp = await vm.evaluate(`(${fn})()`)
+    expect(kp).toHaveProperty('privateKey')
+    expect(kp).toHaveProperty('publicKey')
+  })
+
+  test('X25519', async () => {
+    const vm = new EdgeVM()
+
+    function fn() {
+      return crypto.subtle.generateKey('X25519', false, ['deriveBits', 'deriveKey'])
+    }
+
+    const kp = await vm.evaluate(`(${fn})()`)
+    expect(kp).toHaveProperty('privateKey')
+    expect(kp).toHaveProperty('publicKey')
+  })
+}