lib: refactor to use validate function

Throwing error after checking type is repeated. So replace it with validate function. PR-URL: #46101 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
nodejs · Jan 20, 2023 · 1cfa2e6 · 1cfa2e6
1 parent 1aa4534
commit 1cfa2e6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/lib/_http_client.js b/lib/_http_client.js
@@ -223,11 +223,10 @@ function ClientRequest(input, options, cb) {
   this.maxHeaderSize = maxHeaderSize;
 
   const insecureHTTPParser = options.insecureHTTPParser;
-  if (insecureHTTPParser !== undefined &&
-      typeof insecureHTTPParser !== 'boolean') {
-    throw new ERR_INVALID_ARG_TYPE(
-      'options.insecureHTTPParser', 'boolean', insecureHTTPParser);
+  if (insecureHTTPParser !== undefined) {
+    validateBoolean(insecureHTTPParser, 'options.insecureHTTPParser');
   }
+
   this.insecureHTTPParser = insecureHTTPParser;
 
   if (options.joinDuplicateHeaders !== undefined) {

diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -1224,21 +1224,16 @@ function Server(options, listener) {
 
   validateNumber(this[kHandshakeTimeout], 'options.handshakeTimeout');
 
-  if (this[kSNICallback] && typeof this[kSNICallback] !== 'function') {
-    throw new ERR_INVALID_ARG_TYPE(
-      'options.SNICallback', 'function', options.SNICallback);
+  if (this[kSNICallback]) {
+    validateFunction(this[kSNICallback], 'options.SNICallback');
   }
 
-  if (this[kPskCallback] && typeof this[kPskCallback] !== 'function') {
-    throw new ERR_INVALID_ARG_TYPE(
-      'options.pskCallback', 'function', options.pskCallback);
+  if (this[kPskCallback]) {
+    validateFunction(this[kPskCallback], 'options.pskCallback');
   }
-  if (this[kPskIdentityHint] && typeof this[kPskIdentityHint] !== 'string') {
-    throw new ERR_INVALID_ARG_TYPE(
-      'options.pskIdentityHint',
-      'string',
-      options.pskIdentityHint
-    );
+
+  if (this[kPskIdentityHint]) {
+    validateString(this[kPskIdentityHint], 'options.pskIdentityHint');
   }
 
   // constructor call

diff --git a/lib/async_hooks.js b/lib/async_hooks.js
@@ -18,7 +18,6 @@ const {
 const {
   ERR_ASYNC_CALLBACK,
   ERR_ASYNC_TYPE,
-  ERR_INVALID_ARG_TYPE,
   ERR_INVALID_ASYNC_ID
 } = require('internal/errors').codes;
 const { kEmptyObject } = require('internal/util');
@@ -280,10 +279,8 @@ class AsyncLocalStorage {
     validateObject(options, 'options');
 
     const { onPropagate = null } = options;
-    if (onPropagate !== null && typeof onPropagate !== 'function') {
-      throw new ERR_INVALID_ARG_TYPE('options.onPropagate',
-                                     'function',
-                                     onPropagate);
+    if (onPropagate !== null) {
+      validateFunction(onPropagate, 'options.onPropagate');
     }
 
     this.kResourceStore = Symbol('kResourceStore');