Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/internal/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -105,6 +105,7 @@ const before_symbol = Symbol('before');
const after_symbol = Symbol('after');
const destroy_symbol = Symbol('destroy');
const promise_resolve_symbol = Symbol('promiseResolve');
const async_local_storage_context_symbol = Symbol('kAsyncLocalStorageContext');
const emitBeforeNative = emitHookFactory(before_symbol, 'emitBeforeNative');
const emitAfterNative = emitHookFactory(after_symbol, 'emitAfterNative');
const emitDestroyNative = emitHookFactory(destroy_symbol, 'emitDestroyNative');
Expand DownExpand Up@@ -584,7 +585,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,
Expand Down
30 changes: 22 additions & 8 deletions lib/internal/async_local_storage/async_hooks.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,11 @@ const {
const {
validateObject,
} = require('internal/validators');
const {
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

const {
AsyncResource,
Expand All@@ -23,6 +28,11 @@ const RunScope = require('internal/async_local_storage/run_scope');
const { kEmptyObject } = require('internal/util');

const storageList = [];

function getOrCreateResourceStore(resource) {
return resource[async_local_storage_context_symbol] ??= { __proto__: null };
}

const storageHook = createHook({
init(asyncId, type, triggerAsyncId, resource) {
const currentResource = executionAsyncResource();
Expand DownExpand Up@@ -91,16 +101,18 @@ class AsyncLocalStorage {

// Propagate the context from a parent resource to a child one
_propagate(resource, triggerResource, type) {
const store = triggerResource[this.kResourceStore];
const store = triggerResource[async_local_storage_context_symbol]?.[this.kResourceStore];
if (this.enabled) {
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}
}

enterWith(store) {
this._enable();
const resource = executionAsyncResource();
resource[this.kResourceStore] = store;
const resourceStore = getOrCreateResourceStore(resource);
resourceStore[this.kResourceStore] = store;
}

run(store, callback, ...args) {
Expand All@@ -112,14 +124,15 @@ class AsyncLocalStorage {
this._enable();

const resource = executionAsyncResource();
const oldStore = resource[this.kResourceStore];
const resourceStore = getOrCreateResourceStore(resource);
const oldStore = resourceStore[this.kResourceStore];

resource[this.kResourceStore] = store;
resourceStore[this.kResourceStore] = store;

try {
return ReflectApply(callback, null, args);
} finally {
resource[this.kResourceStore] = oldStore;
resourceStore[this.kResourceStore] = oldStore;
}
}

Expand All@@ -138,10 +151,11 @@ class AsyncLocalStorage {
getStore() {
if (this.enabled) {
const resource = executionAsyncResource();
if (!(this.kResourceStore in resource)) {
const resourceStore = resource[async_local_storage_context_symbol];
if (resourceStore === undefined || !(this.kResourceStore in resourceStore)) {
return this.#defaultValue;
}
return resource[this.kResourceStore];
return resourceStore[this.kResourceStore];
}
return this.#defaultValue;
}
Expand Down
90 changes: 79 additions & 11 deletions lib/internal/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -87,6 +87,9 @@ const {
immediateInfo,
timeoutInfo,
} = binding;
const {
enqueueMicrotask,
} = internalBinding('task_queue');

const {
getDefaultTriggerAsyncId,
Expand All@@ -97,6 +100,9 @@ const {
emitBefore,
emitAfter,
emitDestroy,
symbols: {
async_local_storage_context_symbol,
},
} = require('internal/async_hooks');

// Symbols for storing async id state.
Expand DownExpand Up@@ -125,6 +131,39 @@ const AsyncContextFrame = require('internal/async_context_frame');

const async_context_frame = Symbol('kAsyncContextFrame');

function removeStoresFromResource(resource) {

@FlarnaFlarnaJun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be extended to somthing like this to cover also the async context frame variant of ALS:

functionremoveStoresFromResource(resource){if(AsyncContextFrame.enabled){if(resource[async_context_frame]!==undefined){resource[async_context_frame]=undefined;}}else{if(resource[async_local_storage_context_symbol]!==undefined){resource[async_local_storage_context_symbol]=undefined;}}}

if (AsyncContextFrame.enabled) {
if (resource[async_context_frame] !== undefined) {
resource[async_context_frame] = undefined;
}
} else if (resource[async_local_storage_context_symbol] !== undefined) {
resource[async_local_storage_context_symbol] = undefined;
}
}

function cleanTimer(timer) {
removeStoresFromResource(timer);
timer._onTimeout = undefined;
timer._timerArgs = undefined;
}

function cleanImmediate(immediate) {
removeStoresFromResource(immediate);
immediate._onImmediate = undefined;
immediate._argv = undefined;
}

function enqueueRemoveStoresFromResource(resource) {
enqueueMicrotask(() => removeStoresFromResource(resource));
}

function enqueueRemoveStoresIfNotReinserted(resource) {
enqueueMicrotask(() => {
if (!resource._idleNext && !resource._idlePrev)
removeStoresFromResource(resource);
});
}

// *Must* match Environment::ImmediateInfo::Fields in src/env.h.
const kCount = 0;
const kRefCount = 1;
Expand DownExpand Up@@ -528,14 +567,22 @@ function getTimerCallbacks(runNextTicks) {
const asyncId = immediate[async_id_symbol];
emitBefore(asyncId, immediate[trigger_async_id_symbol], immediate);

let threw = true;
try {
const argv = 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);

Expand DownExpand Up@@ -607,6 +654,8 @@ function getTimerCallbacks(runNextTicks) {
if (!timer._destroyed) {
timer._destroyed = true;

cleanTimer(timer);

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

Expand All@@ -629,26 +678,42 @@ function getTimerCallbacks(runNextTicks) {
start = binding.getLibuvNow();
}

let threw = true;
try {
const args = 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);
} else if (!timer._idleNext && !timer._idlePrev && !timer._destroyed) {
timer._destroyed = true;

if (timer[kHasPrimitive])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
} else if (!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])
delete knownTimersById[asyncId];

if (timer[kRefed])
timeoutInfo[0]--;

emitDestroy(asyncId);
}
}
}

Expand DownExpand Up@@ -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,
Comment thread
Flarna marked this conversation as resolved.
Timeout,
Immediate,
cleanImmediate,
cleanTimer,
kRefed,
kHasPrimitive,
initAsyncResource,
Expand Down
12 changes: 10 additions & 2 deletions lib/timers.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,8 @@ const {
async_id_symbol,
Timeout,
Immediate,
cleanTimer,
cleanImmediate,
decRefCount,
immediateInfoFields: {
kCount,
Expand DownExpand Up@@ -69,9 +71,12 @@ const {

// Remove a timer. Cancels the timeout and resets the relevant timer properties.
function unenroll(item) {
if (item._destroyed)
if (item._destroyed) {
cleanTimer(item);
return;
}

const wasEnrolled = item._idleNext !== null || item._idlePrev !== null;
item._destroyed = true;

if (item[kHasPrimitive])
Expand DownExpand Up@@ -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;
}
Expand DownExpand Up@@ -238,7 +246,7 @@ function clearImmediate(immediate) {

emitDestroy(immediate[async_id_symbol]);

immediate._onImmediate = null;
cleanImmediate(immediate);

immediateQueue.remove(immediate);
}
Expand Down
Loading
Loading