crypto: fix CryptoKey prototype WPT

PR-URL: #45857 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Jan 24, 2023 · 7a97f3f · 7a97f3f
1 parent 6963c96
commit 7a97f3f
Showing 1 changed file with 33 additions and 32 deletions.
diff --git a/lib/internal/crypto/keys.js b/lib/internal/crypto/keys.js
@@ -56,7 +56,7 @@ const {
 } = require('internal/util/types');
 
 const {
-  JSTransferable,
+  makeTransferable,
   kClone,
   kDeserialize,
 } = require('internal/worker/js_transferable');
@@ -630,14 +630,12 @@ function isKeyObject(obj) {
 }
 
 // Our implementation of CryptoKey is a simple wrapper around a KeyObject
-// that adapts it to the standard interface. This implementation also
-// extends the JSTransferable class, allowing the CryptoKey to be cloned
-// to Workers.
+// that adapts it to the standard interface.
 // TODO(@jasnell): Embedder environments like electron may have issues
 // here similar to other things like URL. A chromium provided CryptoKey
 // will not be recognized as a Node.js CryptoKey, and vice versa. It
 // would be fantastic if we could find a way of making those interop.
-class CryptoKey extends JSTransferable {
+class CryptoKey {
   constructor() {
     throw new ERR_ILLEGAL_CONSTRUCTOR();
   }
@@ -682,30 +680,6 @@ class CryptoKey extends JSTransferable {
       throw new ERR_INVALID_THIS('CryptoKey');
     return ArrayFrom(this[kKeyUsages]);
   }
-
-  [kClone]() {
-    const keyObject = this[kKeyObject];
-    const algorithm = this.algorithm;
-    const extractable = this.extractable;
-    const usages = this.usages;
-
-    return {
-      data: {
-        keyObject,
-        algorithm,
-        usages,
-        extractable,
-      },
-      deserializeInfo: 'internal/crypto/keys:InternalCryptoKey'
-    };
-  }
-
-  [kDeserialize]({ keyObject, algorithm, usages, extractable }) {
-    this[kKeyObject] = keyObject;
-    this[kAlgorithm] = algorithm;
-    this[kKeyUsages] = usages;
-    this[kExtractable] = extractable;
-  }
 }
 
 ObjectDefineProperties(CryptoKey.prototype, {
@@ -718,23 +692,50 @@ ObjectDefineProperties(CryptoKey.prototype, {
 // All internal code must use new InternalCryptoKey to create
 // CryptoKey instances. The CryptoKey class is exposed to end
 // user code but is not permitted to be constructed directly.
-class InternalCryptoKey extends JSTransferable {
+// Using makeTransferable also allows the CryptoKey to be
+// cloned to Workers.
+class InternalCryptoKey {
   constructor(
     keyObject,
     algorithm,
     keyUsages,
     extractable) {
-    super();
     // Using symbol properties here currently instead of private
     // properties because (for now) the performance penalty of
     // private fields is still too high.
     this[kKeyObject] = keyObject;
     this[kAlgorithm] = algorithm;
     this[kExtractable] = extractable;
     this[kKeyUsages] = keyUsages;
+
+    // eslint-disable-next-line no-constructor-return
+    return makeTransferable(this);
   }
-}
 
+  [kClone]() {
+    const keyObject = this[kKeyObject];
+    const algorithm = this.algorithm;
+    const extractable = this.extractable;
+    const usages = this.usages;
+
+    return {
+      data: {
+        keyObject,
+        algorithm,
+        usages,
+        extractable,
+      },
+      deserializeInfo: 'internal/crypto/keys:InternalCryptoKey'
+    };
+  }
+
+  [kDeserialize]({ keyObject, algorithm, usages, extractable }) {
+    this[kKeyObject] = keyObject;
+    this[kAlgorithm] = algorithm;
+    this[kKeyUsages] = usages;
+    this[kExtractable] = extractable;
+  }
+}
 InternalCryptoKey.prototype.constructor = CryptoKey;
 ObjectSetPrototypeOf(InternalCryptoKey.prototype, CryptoKey.prototype);