util: print External address from inspect

Fixes: #28250 PR-URL: #34398 Backport-PR-URL: #34583 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>

Author: rosaxxny

lib/internal/util/inspect.js

@@ -60,6 +60,7 @@ const{
  kRejected,
  previewEntries,
 getConstructorName: internalGetConstructorName,
+ getExternalValue,
 propertyFilter: {
 ALL_PROPERTIES,
 ONLY_ENUMERABLE
@@ -938,8 +939,10 @@ function formatRaw(ctx, value, recurseTimes, typedArray){
 }
 }else{
 if(keys.length===0&&protoProps===undefined){
-if(isExternal(value))
-returnctx.stylize('[External]','special');
+if(isExternal(value)){
+constaddress=getExternalValue(value).toString(16);
+returnctx.stylize(`[External: ${address}]`,'special');
+}
 return`${getCtxStyle(value,constructor,tag)}{}`;
 }
 braces[0]=`${getCtxStyle(value,constructor,tag)}{`;

src/node_util.cc

@@ -8,8 +8,10 @@ namespace util{
 using v8::ALL_PROPERTIES;
 using v8::Array;
 using v8::ArrayBufferView;
+using v8::BigInt;
 using v8::Boolean;
 using v8::Context;
+using v8::External;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::Global;
@@ -18,6 +20,7 @@ using v8::Integer;
 using v8::Isolate;
 using v8::KeyCollectionMode;
 using v8::Local;
+using v8::MaybeLocal;
 using v8::Object;
 using v8::ONLY_CONFIGURABLE;
 using v8::ONLY_ENUMERABLE;
@@ -67,6 +70,18 @@ static void GetConstructorName(
  args.GetReturnValue().Set(name);
 }
 
+staticvoidGetExternalValue(
+const FunctionCallbackInfo<Value>& args){
+CHECK(args[0]->IsExternal());
+ Isolate* isolate = args.GetIsolate();
+ Local<External> external = args[0].As<External>();
+
+void* ptr = external->Value();
+uint64_t value = reinterpret_cast<uint64_t>(ptr);
+ Local<BigInt> ret = BigInt::NewFromUnsigned(isolate, value);
+ args.GetReturnValue().Set(ret);
+}
+
 staticvoidGetPromiseDetails(const FunctionCallbackInfo<Value>& args){
 // Return undefined if it's not a Promise.
 if (!args[0]->IsPromise())
@@ -296,6 +311,7 @@ void Initialize(Local<Object> target,
  env->SetMethodNoSideEffect(target, "getOwnNonIndexProperties",
  GetOwnNonIndexProperties);
  env->SetMethodNoSideEffect(target, "getConstructorName", GetConstructorName);
+ env->SetMethodNoSideEffect(target, "getExternalValue", GetExternalValue);
  env->SetMethod(target, "sleep", Sleep);
 
  env->SetMethod(target, "arrayBufferViewHasBuffer", ArrayBufferViewHasBuffer);

test/parallel/test-util-inspect.js

@@ -146,8 +146,8 @@ assert.strictEqual(
 "[String: 'hello']{[length]: 5, [Symbol(foo)]: 123 }"
 );
 
-assert.strictEqual(util.inspect((newJSStream())._externalStream),
-'[External]');
+assert.match(util.inspect((newJSStream())._externalStream),
+/^\[External:[0-9a-f]+\]$/);
 
 {
 constregexp=/regexp/;