Revert "lib: use helper for readability"

RaisinTen · danielleadams · commit 4bcff4c5f844 · 2022-01-31T22:53:54.000-05:00
This reverts commit 937bbc5. PR-URL: #40741 Fixes: #40693 Reviewed-By: Stephen Belanger <admin@stephenbelanger.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
diff --git a/lib/internal/js_stream_socket.js b/lib/internal/js_stream_socket.js
@@ -22,41 +22,52 @@ const kCurrentWriteRequest = Symbol('kCurrentWriteRequest');
 const kCurrentShutdownRequest = Symbol('kCurrentShutdownRequest');
 const kPendingShutdownRequest = Symbol('kPendingShutdownRequest');
 
-function checkReusedHandle(self) {
-  let socket = self[owner_symbol];
+function isClosing() {
+  let socket = this[owner_symbol];
 
-  if (socket.constructor.name === 'ReusedHandle')
+  if (socket.constructor.name === 'ReusedHandle') {
     socket = socket.handle;
-
-  return socket;
-}
-
-function isClosing() {
-  const socket = checkReusedHandle(this);
+  }
 
   return socket.isClosing();
 }
 
 function onreadstart() {
-  const socket = checkReusedHandle(this);
+  let socket = this[owner_symbol];
+
+  if (socket.constructor.name === 'ReusedHandle') {
+    socket = socket.handle;
+  }
 
   return socket.readStart();
 }
 
 function onreadstop() {
-  const socket = checkReusedHandle(this);
+  let socket = this[owner_symbol];
+
+  if (socket.constructor.name === 'ReusedHandle') {
+    socket = socket.handle;
+  }
 
   return socket.readStop();
 }
 
 function onshutdown(req) {
-  const socket = checkReusedHandle(this);
+  let socket = this[owner_symbol];
+
+  if (socket.constructor.name === 'ReusedHandle') {
+    socket = socket.handle;
+  }
 
   return socket.doShutdown(req);
 }
 
 function onwrite(req, bufs) {
-  const socket = checkReusedHandle(this);
+  let socket = this[owner_symbol];
+
+  if (socket.constructor.name === 'ReusedHandle') {
+    socket = socket.handle;
+  }
 
   return socket.doWrite(req, bufs);
 }
