src: return uint32 for guessHandleType

PR-URL: #48349 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>

Author: anonrig

lib/dgram.js

@@ -38,7 +38,6 @@ const{
  _createSocketHandle,
  newHandle,
 }=require('internal/dgram');
-const{ guessHandleType }=internalBinding('util');
 const{
 ERR_BUFFER_OUT_OF_BOUNDS,
 ERR_INVALID_ARG_TYPE,
@@ -59,7 +58,7 @@ const{
  validatePort,
 }=require('internal/validators');
 const{ Buffer }=require('buffer');
-const{ deprecate }=require('internal/util');
+const{ deprecate, guessHandleType}=require('internal/util');
 const{ isArrayBufferView }=require('internal/util/types');
 constEventEmitter=require('events');
 const{

lib/internal/bootstrap/switches/is_main_thread.js

@@ -42,7 +42,7 @@ process.on('removeListener', stopListeningIfSignal);
 // ---- keep the attachment of the wrappers above so that it's easier to ----
 // ---- compare the setups side-by-side -----
 
-const{ guessHandleType }=internalBinding('util');
+const{ guessHandleType }=require('internal/util');
 
 functioncreateWritableStdioStream(fd){
 letstream;

lib/internal/dgram.js

@@ -7,7 +7,7 @@ const{
 
 const{ codes }=require('internal/errors');
 const{UDP}=internalBinding('udp_wrap');
-const{ guessHandleType }=internalBinding('util');
+const{ guessHandleType }=require('internal/util');
 const{
  isInt32,
  validateFunction,

lib/internal/util.js

@@ -54,6 +54,7 @@ const{
 const{ signals }=internalBinding('constants').os;
 const{
 isArrayBufferDetached: _isArrayBufferDetached,
+guessHandleType: _guessHandleType,
 privateSymbols: {
  arrow_message_private_symbol,
  decorated_private_symbol,
@@ -789,6 +790,13 @@ function setupCoverageHooks(dir){
 returncoverageDirectory;
 }
 
+
+consthandleTypes=['TCP','TTY','UDP','FILE','PIPE','UNKNOWN'];
+functionguessHandleType(fd){
+consttype=_guessHandleType(fd);
+returnhandleTypes[type];
+}
+
 module.exports={
  getLazy,
  assertCrypto,
@@ -812,6 +820,7 @@ module.exports ={
  getInternalGlobal,
  getSystemErrorMap,
  getSystemErrorName,
+ guessHandleType,
  isArrayBufferDetached,
  isError,
  isInsideNodeModules,

lib/net.js

@@ -59,7 +59,6 @@ const{
 }=internalBinding('uv');
 
 const{ Buffer }=require('buffer');
-const{ guessHandleType }=internalBinding('util');
 const{ ShutdownWrap }=internalBinding('stream_wrap');
 const{
 TCP,
@@ -111,7 +110,7 @@ const{
 }=require('internal/errors');
 const{ isUint8Array }=require('internal/util/types');
 const{ queueMicrotask }=require('internal/process/task_queues');
-const{ kEmptyObject }=require('internal/util');
+const{ kEmptyObject, guessHandleType}=require('internal/util');
 const{
  validateAbortSignal,
  validateBoolean,

src/node_util.cc

@@ -289,32 +289,37 @@ static void GuessHandleType(const FunctionCallbackInfo<Value>& args){
 CHECK_GE(fd, 0);
 
  uv_handle_type t = uv_guess_handle(fd);
-constchar* type = nullptr;
+// TODO(anonrig): We can use an enum here and then create the array in the
+// binding, which will remove the hard-coding in C++ and JS land.
+uint32_t type{0};
 
+// Currently, the return type of this function corresponds to the index of the
+// array defined in the JS land. This is done as an optimization to reduce the
+// string serialization overhead.
 switch (t){
 case UV_TCP:
- type = "TCP";
+ type = 0;
 break;
 case UV_TTY:
- type = "TTY";
+ type = 1;
 break;
 case UV_UDP:
- type = "UDP";
+ type = 2;
 break;
 case UV_FILE:
- type = "FILE";
+ type = 3;
 break;
 case UV_NAMED_PIPE:
- type = "PIPE";
+ type = 4;
 break;
 case UV_UNKNOWN_HANDLE:
- type = "UNKNOWN";
+ type = 5;
 break;
 default:
 ABORT();
  }
 
- args.GetReturnValue().Set(OneByteString(env->isolate(), type));
+ args.GetReturnValue().Set(type);
 }
 
 staticvoidToUSVString(const FunctionCallbackInfo<Value>& args){