net,http2: merge setTimeout code

PR-URL: #25084 Refs: #19060 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]>

Author: ZYSzys

lib/internal/http2/core.js

@@ -110,13 +110,11 @@ const{
  onStreamRead,
  kAfterAsyncWrite,
  kMaybeDestroy,
- kUpdateTimer
+ kUpdateTimer,
+ kSession,
+ setStreamTimeout
 }=require('internal/stream_base_commons');
-const{
- kTimeout,
- setUnrefTimeout,
- validateTimerDuration
-}=require('internal/timers');
+const{ kTimeout }=require('internal/timers');
 const{ isArrayBufferView }=require('internal/util/types');
 
 const{ FileHandle }=internalBinding('fs');
@@ -163,7 +161,6 @@ const kSelectPadding = Symbol('select-padding');
 constkSentHeaders=Symbol('sent-headers');
 constkSentTrailers=Symbol('sent-trailers');
 constkServer=Symbol('server');
-constkSession=Symbol('session');
 constkState=Symbol('state');
 constkType=Symbol('type');
 constkWriteGeneric=Symbol('write-generic');
@@ -2546,35 +2543,7 @@ const setTimeout ={
 configurable: true,
 enumerable: true,
 writable: true,
-value: function(msecs,callback){
-if(this.destroyed)
-return;
-
-// Type checking identical to timers.enroll()
-msecs=validateTimerDuration(msecs);
-
-// Attempt to clear an existing timer lear in both cases -
-// even if it will be rescheduled we don't want to leak an existing timer.
-clearTimeout(this[kTimeout]);
-
-if(msecs===0){
-if(callback!==undefined){
-if(typeofcallback!=='function')
-thrownewERR_INVALID_CALLBACK();
-this.removeListener('timeout',callback);
-}
-}else{
-this[kTimeout]=setUnrefTimeout(this._onTimeout.bind(this),msecs);
-if(this[kSession])this[kSession][kUpdateTimer]();
-
-if(callback!==undefined){
-if(typeofcallback!=='function')
-thrownewERR_INVALID_CALLBACK();
-this.once('timeout',callback);
-}
-}
-returnthis;
-}
+value: setStreamTimeout
 };
 Object.defineProperty(Http2Stream.prototype,'setTimeout',setTimeout);
 Object.defineProperty(Http2Session.prototype,'setTimeout',setTimeout);

lib/internal/stream_base_commons.js

@@ -11,12 +11,23 @@ const{
  streamBaseState
 }=internalBinding('stream_wrap');
 const{UV_EOF}=internalBinding('uv');
-const{ errnoException }=require('internal/errors');
+const{
+codes: {
+ERR_INVALID_CALLBACK
+},
+ errnoException
+}=require('internal/errors');
 const{ owner_symbol }=require('internal/async_hooks').symbols;
+const{
+ kTimeout,
+ setUnrefTimeout,
+ validateTimerDuration
+}=require('internal/timers');
 
 constkMaybeDestroy=Symbol('kMaybeDestroy');
 constkUpdateTimer=Symbol('kUpdateTimer');
 constkAfterAsyncWrite=Symbol('kAfterAsyncWrite');
+constkSession=Symbol('session');
 
 functionhandleWriteReq(req,data,encoding){
 const{ handle }=req;
@@ -178,6 +189,38 @@ function onStreamRead(arrayBuffer){
 }
 }
 
+functionsetStreamTimeout(msecs,callback){
+if(this.destroyed)
+return;
+
+this.timeout=msecs;
+
+// Type checking identical to timers.enroll()
+msecs=validateTimerDuration(msecs);
+
+// Attempt to clear an existing timer in both cases -
+// even if it will be rescheduled we don't want to leak an existing timer.
+clearTimeout(this[kTimeout]);
+
+if(msecs===0){
+if(callback!==undefined){
+if(typeofcallback!=='function')
+thrownewERR_INVALID_CALLBACK();
+this.removeListener('timeout',callback);
+}
+}else{
+this[kTimeout]=setUnrefTimeout(this._onTimeout.bind(this),msecs);
+if(this[kSession])this[kSession][kUpdateTimer]();
+
+if(callback!==undefined){
+if(typeofcallback!=='function')
+thrownewERR_INVALID_CALLBACK();
+this.once('timeout',callback);
+}
+}
+returnthis;
+}
+
 module.exports={
  createWriteWrap,
  writevGeneric,
@@ -186,4 +229,6 @@ module.exports ={
  kAfterAsyncWrite,
  kMaybeDestroy,
  kUpdateTimer,
+ kSession,
+ setStreamTimeout
 };

lib/net.js

@@ -63,7 +63,8 @@ const{
  writeGeneric,
  onStreamRead,
  kAfterAsyncWrite,
- kUpdateTimer
+ kUpdateTimer,
+ setStreamTimeout
 }=require('internal/stream_base_commons');
 const{
 codes: {
@@ -89,11 +90,7 @@ const kLastWriteQueueSize = Symbol('lastWriteQueueSize');
 letcluster;
 letdns;
 
-const{
- kTimeout,
- setUnrefTimeout,
- validateTimerDuration
-}=require('internal/timers');
+const{ kTimeout }=require('internal/timers');
 
 functionnoop(){}
 
@@ -405,28 +402,7 @@ function writeAfterFIN(chunk, encoding, cb){
 }
 }
 
-Socket.prototype.setTimeout=function(msecs,callback){
-this.timeout=msecs;
-// Type checking identical to timers.enroll()
-msecs=validateTimerDuration(msecs);
-
-// Attempt to clear an existing timer in both cases -
-// even if it will be rescheduled we don't want to leak an existing timer.
-clearTimeout(this[kTimeout]);
-
-if(msecs===0){
-if(callback){
-this.removeListener('timeout',callback);
-}
-}else{
-this[kTimeout]=setUnrefTimeout(this._onTimeout.bind(this),msecs);
-
-if(callback){
-this.once('timeout',callback);
-}
-}
-returnthis;
-};
+Socket.prototype.setTimeout=setStreamTimeout;
 
 
 Socket.prototype._onTimeout=function(){