timers: fix refresh for expired timers

Expired timers were not being refresh correctly and
would always act as unrefed if refresh was called.
PR-URL: #27345
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: apapirovski

lib/internal/timers.js

@@ -209,21 +209,23 @@ Timeout.prototype.refresh = function() {
 Timeout.prototype.unref=function(){
 if(this[kRefed]){
 this[kRefed]=false;
-decRefCount();
+if(!this._destroyed)
+decRefCount();
 }
 returnthis;
 };
 
 Timeout.prototype.ref=function(){
-if(this[kRefed]===false){
+if(!this[kRefed]){
 this[kRefed]=true;
-incRefCount();
+if(!this._destroyed)
+incRefCount();
 }
 returnthis;
 };
 
 Timeout.prototype.hasRef=function(){
-return!!this[kRefed];
+returnthis[kRefed];
 };
 
 functionTimersList(expiry,msecs){
@@ -317,12 +319,16 @@ function insertGuarded(item, refed, start) {
 
 insert(item,msecs,start);
 
-if(!item[async_id_symbol]||item._destroyed){
+constisDestroyed=item._destroyed;
+if(isDestroyed||!item[async_id_symbol]){
 item._destroyed=false;
 initAsyncResource(item,'Timeout');
 }
 
-if(refed===!item[kRefed]){
+if(isDestroyed){
+if(refed)
+incRefCount();
+}elseif(refed===!item[kRefed]){
 if(refed)
 incRefCount();
 else
@@ -519,13 +525,14 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=timer[async_id_symbol];
 
 if(!timer._onTimeout){
-if(timer[kRefed])
-refCount--;
-timer[kRefed]=null;
-
-if(destroyHooksExist()&&!timer._destroyed){
-emitDestroy(asyncId);
+if(!timer._destroyed){
 timer._destroyed=true;
+
+if(timer[kRefed])
+refCount--;
+
+if(destroyHooksExist())
+emitDestroy(asyncId);
 }
 continue;
 }
@@ -546,15 +553,14 @@ function getTimerCallbacks(runNextTicks) {
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev){
+}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
+timer._destroyed=true;
+
 if(timer[kRefed])
 refCount--;
-timer[kRefed]=null;
 
-if(destroyHooksExist()&&!timer._destroyed){
+if(destroyHooksExist())
 emitDestroy(asyncId);
-}
-timer._destroyed=true;
 }
 }
 

lib/timers.js

@@ -64,13 +64,14 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
+if(item._destroyed)
+return;
+
+item._destroyed=true;
+
 // Fewer checks may be possible, but these cover everything.
-if(destroyHooksExist()&&
-item[async_id_symbol]!==undefined&&
-!item._destroyed){
+if(destroyHooksExist()&&item[async_id_symbol]!==undefined)
 emitDestroy(item[async_id_symbol]);
-}
-item._destroyed=true;
 
 L.remove(item);
 
@@ -91,7 +92,6 @@ function unenroll(item) {
 
 decRefCount();
 }
-item[kRefed]=null;
 
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;

test/parallel/test-timers-refresh.js

@@ -72,6 +72,20 @@ const { inspect } = require('util');
 strictEqual(timer.refresh(),timer);
 }
 
+// regular timer
+{
+letcalled=false;
+consttimer=setTimeout(common.mustCall(()=>{
+if(!called){
+called=true;
+process.nextTick(common.mustCall(()=>{
+timer.refresh();
+strictEqual(timer.hasRef(),true);
+}));
+}
+},2),1);
+}
+
 // interval
 {
 letcalled=0;