util: improve performance inspecting proxies

This makes sure we do not retrieve the handler in case it's not required. This improves the performance a tiny bit for these cases. PR-URL: #30767 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Denys Otrishko <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Author: BridgeAR

benchmark/util/inspect-proxy.js

@@ -4,7 +4,7 @@ const util = require('util');
 constcommon=require('../common.js');
 
 constbench=common.createBenchmark(main,{
-n: [2e4],
+n: [1e5],
 showProxy: [0,1],
 isProxy: [0,1]
 });

lib/internal/util/inspect.js

@@ -638,12 +638,12 @@ function formatValue(ctx, value, recurseTimes, typedArray){
 constcontext=value;
 // Always check for proxies to prevent side effects and to prevent triggering
 // any proxy handlers.
-constproxy=getProxyDetails(value);
+constproxy=getProxyDetails(value,!!ctx.showProxy);
 if(proxy!==undefined){
 if(ctx.showProxy){
 returnformatProxy(ctx,proxy,recurseTimes);
 }
-value=proxy[0];
+value=proxy;
 }
 
 // Provide a hook for user-specified inspect functions.

src/node_util.cc

@@ -91,15 +91,23 @@ static void GetProxyDetails(const FunctionCallbackInfo<Value>& args){
 if (!args[0]->IsProxy())
 return;
 
+CHECK(args[1]->IsBoolean());
+
  Local<Proxy> proxy = args[0].As<Proxy>();
 
- Local<Value> ret[] ={
- proxy->GetTarget(),
- proxy->GetHandler()
- };
+if (args[1]->IsTrue()){
+ Local<Value> ret[] ={
+ proxy->GetTarget(),
+ proxy->GetHandler()
+ };
 
- args.GetReturnValue().Set(
-Array::New(args.GetIsolate(), ret, arraysize(ret)));
+ args.GetReturnValue().Set(
+Array::New(args.GetIsolate(), ret, arraysize(ret)));
+ } else{
+ Local<Value> ret = proxy->GetTarget();
+
+ args.GetReturnValue().Set(ret);
+ }
 }
 
 staticvoidPreviewEntries(const FunctionCallbackInfo<Value>& args){

test/parallel/test-util-inspect-proxy.js

@@ -43,10 +43,13 @@ util.inspect(proxyObj, opts);
 
 // getProxyDetails is an internal method, not intended for public use.
 // This is here to test that the internals are working correctly.
-constdetails=processUtil.getProxyDetails(proxyObj);
+letdetails=processUtil.getProxyDetails(proxyObj,true);
 assert.strictEqual(target,details[0]);
 assert.strictEqual(handler,details[1]);
 
+details=processUtil.getProxyDetails(proxyObj,false);
+assert.strictEqual(target,details);
+
 assert.strictEqual(
 util.inspect(proxyObj,opts),
 'Proxy [\n'+
@@ -105,7 +108,7 @@ const expected6 = 'Proxy [\n' +
 ' ]\n'+
 ']';
 assert.strictEqual(
-util.inspect(proxy1,{showProxy: true,depth: null}),
+util.inspect(proxy1,{showProxy: 1,depth: null}),
 expected1);
 assert.strictEqual(util.inspect(proxy2,opts),expected2);
 assert.strictEqual(util.inspect(proxy3,opts),expected3);