lib: make lazyDOMException more common

PR-URL: #39105 Reviewed-By: Antoine du Hamel <[email protected]>
nodejs · Jul 11, 2021 · 0e55cb7 · 0e55cb7
1 parent a669a19
commit 0e55cb7
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 32 deletions.
diff --git a/lib/buffer.js b/lib/buffer.js
@@ -75,6 +75,7 @@ const {
 const {
   customInspectSymbol,
   isInsideNodeModules,
+  lazyDOMException,
   normalizeEncoding,
   kIsEncodingSymbol
 } = require('internal/util');
@@ -1208,22 +1209,14 @@ if (internalBinding('config').hasIntl) {
   };
 }
 
-let DOMException;
-
-const lazyInvalidCharError = hideStackFrames((message, name) => {
-  if (DOMException === undefined)
-    DOMException = internalBinding('messaging').DOMException;
-  throw new DOMException('Invalid character', 'InvalidCharacterError');
-});
-
 function btoa(input) {
   // The implementation here has not been performance optimized in any way and
   // should not be.
   // Refs: https://github.com/nodejs/node/pull/38433#issuecomment-828426932
   input = `${input}`;
   for (let n = 0; n < input.length; n++) {
     if (input[n].charCodeAt(0) > 0xff)
-      lazyInvalidCharError();
+      throw lazyDOMException('Invalid character', 'InvalidCharacterError');
   }
   const buf = Buffer.from(input, 'latin1');
   return buf.toString('base64');
@@ -1239,7 +1232,7 @@ function atob(input) {
   input = `${input}`;
   for (let n = 0; n < input.length; n++) {
     if (!kBase64Digits.includes(input[n]))
-      lazyInvalidCharError();
+      throw lazyDOMException('Invalid character', 'InvalidCharacterError');
   }
   return Buffer.from(input, 'base64').toString('latin1');
 }

diff --git a/lib/internal/crypto/aes.js b/lib/internal/crypto/aes.js
@@ -36,7 +36,6 @@ const {
   getArrayBufferOrView,
   hasAnyNotIn,
   jobPromise,
-  lazyDOMException,
   validateByteLength,
   validateKeyOps,
   validateMaxBufferLength,
@@ -45,6 +44,10 @@ const {
   kKeyObject,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const { PromiseReject } = primordials;
 
 const {

diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js
@@ -47,6 +47,10 @@ const {
   isAnyArrayBuffer,
 } = require('internal/util/types');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const {
   KeyObject,
   InternalCryptoKey,
@@ -66,7 +70,6 @@ const {
   getUsagesUnion,
   hasAnyNotIn,
   jobPromise,
-  lazyDOMException,
   toBuf,
   kHandle,
   kKeyObject,

diff --git a/lib/internal/crypto/dsa.js b/lib/internal/crypto/dsa.js
@@ -44,13 +44,16 @@ const {
   getUsagesUnion,
   hasAnyNotIn,
   jobPromise,
-  lazyDOMException,
   normalizeHashName,
   validateKeyOps,
   kKeyObject,
   kHandle,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 function verifyAcceptableDsaKeyUse(name, type, usages) {
   let checkSet;
   switch (type) {

diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -38,14 +38,17 @@ const {
   getUsagesUnion,
   hasAnyNotIn,
   jobPromise,
-  lazyDOMException,
   normalizeHashName,
   validateKeyOps,
   kHandle,
   kKeyObject,
   kNamedCurveAliases,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const {
   generateKeyPair,
 } = require('internal/crypto/keygen');

diff --git a/lib/internal/crypto/hkdf.js b/lib/internal/crypto/hkdf.js
@@ -23,7 +23,6 @@ const { kMaxLength } = require('buffer');
 
 const {
   getArrayBufferOrView,
-  lazyDOMException,
   normalizeHashName,
   toBuf,
   validateByteSource,
@@ -35,6 +34,10 @@ const {
   isKeyObject,
 } = require('internal/crypto/keys');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const {
   isAnyArrayBuffer,
   isArrayBufferView,

diff --git a/lib/internal/crypto/mac.js b/lib/internal/crypto/mac.js
@@ -18,14 +18,17 @@ const {
   getHashLength,
   hasAnyNotIn,
   jobPromise,
-  lazyDOMException,
   normalizeHashName,
   validateBitLength,
   validateKeyOps,
   kHandle,
   kKeyObject,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const {
   codes: {
     ERR_MISSING_OPTION,

diff --git a/lib/internal/crypto/pbkdf2.js b/lib/internal/crypto/pbkdf2.js
@@ -25,11 +25,14 @@ const { ERR_MISSING_OPTION } = require('internal/errors').codes;
 const {
   getArrayBufferOrView,
   getDefaultEncoding,
-  lazyDOMException,
   normalizeHashName,
   kKeyObject,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 function pbkdf2(password, salt, iterations, keylen, digest, callback) {
   if (typeof digest === 'function') {
     callback = digest;

diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
@@ -27,7 +27,7 @@ const {
 
 const {
   lazyDOMException,
-} = require('internal/crypto/util');
+} = require('internal/util');
 
 const { Buffer, kMaxLength } = require('buffer');
 

diff --git a/lib/internal/crypto/rsa.js b/lib/internal/crypto/rsa.js
@@ -40,14 +40,17 @@ const {
   getUsagesUnion,
   hasAnyNotIn,
   jobPromise,
-  lazyDOMException,
   normalizeHashName,
   validateKeyOps,
   validateMaxBufferLength,
   kHandle,
   kKeyObject,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const {
   isUint8Array,
 } = require('internal/util/types');

diff --git a/lib/internal/crypto/scrypt.js b/lib/internal/crypto/scrypt.js
@@ -30,10 +30,13 @@ const {
 const {
   getArrayBufferOrView,
   getDefaultEncoding,
-  lazyDOMException,
   kKeyObject,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const defaults = {
   N: 16384,
   r: 8,

diff --git a/lib/internal/crypto/util.js b/lib/internal/crypto/util.js
@@ -51,6 +51,7 @@ const { Buffer } = require('buffer');
 const {
   cachedResult,
   filterDuplicateStrings,
+  lazyDOMException,
 } = require('internal/util');
 
 const {
@@ -70,13 +71,6 @@ function lazyRequire(name) {
   return ret;
 }
 
-let DOMException;
-const lazyDOMException = hideStackFrames((message, name) => {
-  if (DOMException === undefined)
-    DOMException = internalBinding('messaging').DOMException;
-  return new DOMException(message, name);
-});
-
 var defaultEncoding = 'buffer';
 
 function setDefaultEncoding(val) {
@@ -428,7 +422,6 @@ module.exports = {
   normalizeAlgorithm,
   normalizeHashName,
   hasAnyNotIn,
-  lazyDOMException,
   validateBitLength,
   validateByteLength,
   validateByteSource,

diff --git a/lib/internal/crypto/webcrypto.js b/lib/internal/crypto/webcrypto.js
@@ -49,7 +49,6 @@ const {
 const {
   getArrayBufferOrView,
   hasAnyNotIn,
-  lazyDOMException,
   lazyRequire,
   normalizeAlgorithm,
   normalizeHashName,
@@ -59,6 +58,10 @@ const {
   kKeyObject,
 } = require('internal/crypto/util');
 
+const {
+  lazyDOMException,
+} = require('internal/util');
+
 const {
   getRandomValues,
 } = require('internal/crypto/random');

diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
@@ -74,7 +74,7 @@ const {
   validateString,
 } = require('internal/validators');
 const pathModule = require('path');
-const { promisify } = require('internal/util');
+const { lazyDOMException, promisify } = require('internal/util');
 const { EventEmitterMixin } = require('internal/event_target');
 const { watch } = require('internal/fs/watchers');
 const { isIterable } = require('internal/streams/utils');
@@ -209,8 +209,7 @@ class FileHandle extends EventEmitterMixin(JSTransferable) {
 
   [kTransfer]() {
     if (this[kClosePromise] || this[kRefs] > 1) {
-      const DOMException = internalBinding('messaging').DOMException;
-      throw new DOMException('Cannot transfer FileHandle while in use',
+      throw lazyDOMException('Cannot transfer FileHandle while in use',
                              'DataCloneError');
     }
 

diff --git a/lib/internal/util.js b/lib/internal/util.js
@@ -28,6 +28,7 @@ const {
 } = primordials;
 
 const {
+  hideStackFrames,
   codes: {
     ERR_INVALID_ARG_TYPE,
     ERR_NO_CRYPTO,
@@ -441,6 +442,13 @@ function createDeferredPromise() {
   return { promise, resolve, reject };
 }
 
+let DOMException;
+const lazyDOMException = hideStackFrames((message, name) => {
+  if (DOMException === undefined)
+    DOMException = internalBinding('messaging').DOMException;
+  return new DOMException(message, name);
+});
+
 module.exports = {
   assertCrypto,
   cachedResult,
@@ -457,6 +465,7 @@ module.exports = {
   isError,
   isInsideNodeModules,
   join,
+  lazyDOMException,
   normalizeEncoding,
   once,
   promisify,