timers: do not retain a reference to the async store after firing

After firing timers, we can clean them up by iterating over all active
stores and setting the relevant symbols to undefined.
Fixes#53408
Signed-off-by: Matteo Collina <hello@matteocollina.com>
PR-URL: #53443
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Paolo Insogna <paolo@cowtech.it>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>

Author: mcollina

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }

lib/internal/async_hooks.js

@@ -104,6 +104,7 @@ const before_symbol = Symbol('before');
 constafter_symbol=Symbol('after');
 constdestroy_symbol=Symbol('destroy');
 constpromise_resolve_symbol=Symbol('promiseResolve');
+constasync_local_storage_context_symbol=Symbol('kAsyncLocalStorageContext');
 constemitBeforeNative=emitHookFactory(before_symbol,'emitBeforeNative');
 constemitAfterNative=emitHookFactory(after_symbol,'emitAfterNative');
 constemitDestroyNative=emitHookFactory(destroy_symbol,'emitDestroyNative');
@@ -594,7 +595,8 @@ module.exports = {
 symbols: {
  async_id_symbol, trigger_async_id_symbol,
  init_symbol, before_symbol, after_symbol, destroy_symbol,
- promise_resolve_symbol, owner_symbol,
+ promise_resolve_symbol, async_local_storage_context_symbol,
+ owner_symbol,
 },
 constants: {
  kInit, kBefore, kAfter, kDestroy, kTotals, kPromiseResolve,

lib/internal/async_local_storage/async_hooks.js

@@ -12,6 +12,11 @@ const {
 const{
  validateObject,
 }=require('internal/validators');
+const{
+symbols: {
+ async_local_storage_context_symbol,
+},
+}=require('internal/async_hooks');
 
 const{
  AsyncResource,
@@ -20,6 +25,11 @@ const {
 }=require('async_hooks');
 
 conststorageList=[];
+
+functiongetOrCreateResourceStore(resource){
+returnresource[async_local_storage_context_symbol]??={__proto__: null};
+}
+
 conststorageHook=createHook({
 init(asyncId,type,triggerAsyncId,resource){
 constcurrentResource=executionAsyncResource();
@@ -88,16 +98,18 @@ class AsyncLocalStorage {
 
 // Propagate the context from a parent resource to a child one
 _propagate(resource,triggerResource,type){
-conststore=triggerResource[this.kResourceStore];
+conststore=triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
 if(this.enabled){
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 }
 
 enterWith(store){
 this._enable();
 constresource=executionAsyncResource();
-resource[this.kResourceStore]=store;
+constresourceStore=getOrCreateResourceStore(resource);
+resourceStore[this.kResourceStore]=store;
 }
 
 run(store,callback, ...args){
@@ -109,14 +121,15 @@ class AsyncLocalStorage {
 this._enable();
 
 constresource=executionAsyncResource();
-constoldStore=resource[this.kResourceStore];
+constresourceStore=getOrCreateResourceStore(resource);
+constoldStore=resourceStore[this.kResourceStore];
 
-resource[this.kResourceStore]=store;
+resourceStore[this.kResourceStore]=store;
 
 try{
 returnReflectApply(callback,null,args);
 }finally{
-resource[this.kResourceStore]=oldStore;
+resourceStore[this.kResourceStore]=oldStore;
 }
 }
 
@@ -135,10 +148,11 @@ class AsyncLocalStorage {
 getStore(){
 if(this.enabled){
 constresource=executionAsyncResource();
-if(!(this.kResourceStoreinresource)){
+constresourceStore=resource[async_local_storage_context_symbol];
+if(resourceStore===undefined||!(this.kResourceStoreinresourceStore)){
 returnthis.#defaultValue;
 }
-returnresource[this.kResourceStore];
+returnresourceStore[this.kResourceStore];
 }
 returnthis.#defaultValue;
 }

lib/internal/timers.js

@@ -87,6 +87,9 @@ const {
  immediateInfo,
  timeoutInfo,
 }=binding;
+const{
+ enqueueMicrotask,
+}=internalBinding('task_queue');
 
 const{
  getDefaultTriggerAsyncId,
@@ -97,6 +100,9 @@ const {
  emitBefore,
  emitAfter,
  emitDestroy,
+symbols: {
+ async_local_storage_context_symbol,
+},
 }=require('internal/async_hooks');
 
 // Symbols for storing async id state.
@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');
 
 constasync_context_frame=Symbol('kAsyncContextFrame');
 
+functionremoveStoresFromResource(resource){
+if(AsyncContextFrame.enabled){
+if(resource[async_context_frame]!==undefined){
+resource[async_context_frame]=undefined;
+}
+}elseif(resource[async_local_storage_context_symbol]!==undefined){
+resource[async_local_storage_context_symbol]=undefined;
+}
+}
+
+functioncleanTimer(timer){
+removeStoresFromResource(timer);
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+}
+
+functioncleanImmediate(immediate){
+removeStoresFromResource(immediate);
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+}
+
+functionenqueueRemoveStoresFromResource(resource){
+enqueueMicrotask(()=>removeStoresFromResource(resource));
+}
+
+functionenqueueRemoveStoresIfNotReinserted(resource){
+enqueueMicrotask(()=>{
+if(!resource._idleNext&&!resource._idlePrev)
+removeStoresFromResource(resource);
+});
+}
+
 // *Must* match Environment::ImmediateInfo::Fields in src/env.h.
 constkCount=0;
 constkRefCount=1;
@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
 constasyncId=immediate[async_id_symbol];
 emitBefore(asyncId,immediate[trigger_async_id_symbol],immediate);
 
+letthrew=true;
 try{
 constargv=immediate._argv;
 if(!argv)
 immediate._onImmediate();
 else
 immediate._onImmediate(...argv);
+threw=false;
 }finally{
-immediate._onImmediate=null;
+if(threw){
+immediate._onImmediate=undefined;
+immediate._argv=undefined;
+enqueueRemoveStoresFromResource(immediate);
+}else{
+cleanImmediate(immediate);
+}
 
 emitDestroy(asyncId);
 
@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
 if(!timer._destroyed){
 timer._destroyed=true;
 
+cleanTimer(timer);
+
 if(timer[kHasPrimitive])
 deleteknownTimersById[asyncId];
 
@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
 start=binding.getLibuvNow();
 }
 
+letthrew=true;
 try{
 constargs=timer._timerArgs;
 if(args===undefined)
 timer._onTimeout();
 else
 ReflectApply(timer._onTimeout,timer,args);
+threw=false;
 }finally{
 if(timer._repeat&&timer._idleTimeout!==-1){
 timer._idleTimeout=timer._repeat;
 insert(timer,timer._idleTimeout,start);
-}elseif(!timer._idleNext&&!timer._idlePrev&&!timer._destroyed){
-timer._destroyed=true;
-
-if(timer[kHasPrimitive])
-deleteknownTimersById[asyncId];
-
-if(timer[kRefed])
-timeoutInfo[0]--;
-
-emitDestroy(asyncId);
+}elseif(!timer._idleNext&&!timer._idlePrev){
+if(timer._destroyed){
+timer._onTimeout=undefined;
+timer._timerArgs=undefined;
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+}else{
+if(threw)
+enqueueRemoveStoresIfNotReinserted(timer);
+else
+removeStoresFromResource(timer);
+
+timer._destroyed=true;
+
+if(timer[kHasPrimitive])
+deleteknownTimersById[asyncId];
+
+if(timer[kRefed])
+timeoutInfo[0]--;
+
+emitDestroy(asyncId);
+}
 }
 }
 
@@ -728,8 +793,11 @@ module.exports = {
 kTimeout: Symbol('timeout'),// For hiding Timeouts on other internals.
  async_id_symbol,
  trigger_async_id_symbol,
+ async_context_frame,
  Timeout,
  Immediate,
+ cleanImmediate,
+ cleanTimer,
  kRefed,
  kHasPrimitive,
  initAsyncResource,

lib/timers.js

@@ -38,6 +38,8 @@ const {
  async_id_symbol,
  Timeout,
  Immediate,
+ cleanTimer,
+ cleanImmediate,
  decRefCount,
 immediateInfoFields: {
  kCount,
@@ -69,9 +71,12 @@ const {
 
 // Remove a timer. Cancels the timeout and resets the relevant timer properties.
 functionunenroll(item){
-if(item._destroyed)
+if(item._destroyed){
+cleanTimer(item);
 return;
+}
 
+constwasEnrolled=item._idleNext!==null||item._idlePrev!==null;
 item._destroyed=true;
 
 if(item[kHasPrimitive])
@@ -99,6 +104,9 @@ function unenroll(item) {
 decRefCount();
 }
 
+if(wasEnrolled)
+cleanTimer(item);
+
 // If active is called later, then we want to make sure not to insert again
 item._idleTimeout=-1;
 }
@@ -238,7 +246,7 @@ function clearImmediate(immediate) {
 
 emitDestroy(immediate[async_id_symbol]);
 
-immediate._onImmediate=null;
+cleanImmediate(immediate);
 
 immediateQueue.remove(immediate);
 }