summaryrefslogtreecommitdiff
path: root/ext/node
diff options
context:
space:
mode:
authorsnek <snek@deno.com>2024-08-02 08:14:35 -0700
committerGitHub <noreply@github.com>2024-08-02 08:14:35 -0700
commit3a1a1cc030fb7fc90d51ee27162466d6ac924926 (patch)
treeb23cc115bbe39d25eb8ff7dc410700b7f42cf46d /ext/node
parentb82a2f114c7c936bf4398669453513ace478cb1d (diff)
feat: async context (#24402)
We are switching to ContinuationPreservedEmbedderData. This allows adding async context tracking to the various async operations that deno provides. Fixes: https://github.com/denoland/deno/issues/7010 Fixes: https://github.com/denoland/deno/issues/22886 Fixes: https://github.com/denoland/deno/issues/24368
Diffstat (limited to 'ext/node')
-rw-r--r--ext/node/lib.rs10
-rw-r--r--ext/node/polyfills/_next_tick.ts15
-rw-r--r--ext/node/polyfills/async_hooks.ts341
3 files changed, 90 insertions, 276 deletions
diff --git a/ext/node/lib.rs b/ext/node/lib.rs
index a4a757996..74c528b0c 100644
--- a/ext/node/lib.rs
+++ b/ext/node/lib.rs
@@ -181,15 +181,6 @@ fn op_node_build_os() -> String {
env!("TARGET").split('-').nth(2).unwrap().to_string()
}
-#[op2(fast)]
-fn op_node_is_promise_rejected(value: v8::Local<v8::Value>) -> bool {
- let Ok(promise) = v8::Local::<v8::Promise>::try_from(value) else {
- return false;
- };
-
- promise.state() == v8::PromiseState::Rejected
-}
-
#[op2]
#[string]
fn op_npm_process_state(state: &mut OpState) -> Result<String, AnyError> {
@@ -350,7 +341,6 @@ deno_core::extension!(deno_node,
ops::os::op_cpus<P>,
ops::os::op_homedir<P>,
op_node_build_os,
- op_node_is_promise_rejected,
op_npm_process_state,
ops::require::op_require_init_paths,
ops::require::op_require_node_module_paths<P>,
diff --git a/ext/node/polyfills/_next_tick.ts b/ext/node/polyfills/_next_tick.ts
index 5915c750e..5d895012e 100644
--- a/ext/node/polyfills/_next_tick.ts
+++ b/ext/node/polyfills/_next_tick.ts
@@ -5,6 +5,10 @@
// deno-lint-ignore-file prefer-primordials
import { core } from "ext:core/mod.js";
+import {
+ getAsyncContext,
+ setAsyncContext,
+} from "ext:runtime/01_async_context.js";
import { validateFunction } from "ext:deno_node/internal/validators.mjs";
import { _exiting } from "ext:deno_node/_process/exiting.ts";
@@ -13,6 +17,7 @@ import { FixedQueue } from "ext:deno_node/internal/fixed_queue.ts";
interface Tock {
callback: (...args: Array<unknown>) => void;
args: Array<unknown>;
+ snapshot: unknown;
}
let nextTickEnabled = false;
@@ -23,7 +28,7 @@ export function enableNextTick() {
const queue = new FixedQueue();
export function processTicksAndRejections() {
- let tock;
+ let tock: Tock;
do {
// deno-lint-ignore no-cond-assign
while (tock = queue.shift()) {
@@ -31,9 +36,11 @@ export function processTicksAndRejections() {
// const asyncId = tock[async_id_symbol];
// emitBefore(asyncId, tock[trigger_async_id_symbol], tock);
+ const oldContext = getAsyncContext();
try {
- const callback = (tock as Tock).callback;
- if ((tock as Tock).args === undefined) {
+ setAsyncContext(tock.snapshot);
+ const callback = tock.callback;
+ if (tock.args === undefined) {
callback();
} else {
const args = (tock as Tock).args;
@@ -58,6 +65,7 @@ export function processTicksAndRejections() {
// FIXME(bartlomieju): Deno currently doesn't support async hooks
// if (destroyHooksExist())
// emitDestroy(asyncId);
+ setAsyncContext(oldContext);
}
// FIXME(bartlomieju): Deno currently doesn't support async hooks
@@ -143,6 +151,7 @@ export function nextTick<T extends Array<unknown>>(
// FIXME(bartlomieju): Deno currently doesn't support async hooks
// [async_id_symbol]: asyncId,
// [trigger_async_id_symbol]: triggerAsyncId,
+ snapshot: getAsyncContext(),
callback,
args: args_,
};
diff --git a/ext/node/polyfills/async_hooks.ts b/ext/node/polyfills/async_hooks.ts
index f94b8d2c6..ad720d936 100644
--- a/ext/node/polyfills/async_hooks.ts
+++ b/ext/node/polyfills/async_hooks.ts
@@ -1,191 +1,34 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
// Copyright Joyent and Node contributors. All rights reserved. MIT license.
-// This implementation is inspired by "workerd" AsyncLocalStorage implementation:
-// https://github.com/cloudflare/workerd/blob/77fd0ed6ddba184414f0216508fc62b06e716cab/src/workerd/api/node/async-hooks.c++#L9
-
// TODO(petamoriken): enable prefer-primordials for node polyfills
// deno-lint-ignore-file prefer-primordials
-import { core } from "ext:core/mod.js";
-import { op_node_is_promise_rejected } from "ext:core/ops";
+import { primordials } from "ext:core/mod.js";
+import {
+ AsyncVariable,
+ getAsyncContext,
+ setAsyncContext,
+} from "ext:runtime/01_async_context.js";
import { validateFunction } from "ext:deno_node/internal/validators.mjs";
import { newAsyncId } from "ext:deno_node/internal/async_hooks.ts";
-function assert(cond: boolean) {
- if (!cond) throw new Error("Assertion failed");
-}
-const asyncContextStack: AsyncContextFrame[] = [];
-
-function pushAsyncFrame(frame: AsyncContextFrame) {
- asyncContextStack.push(frame);
-}
-
-function popAsyncFrame() {
- if (asyncContextStack.length > 0) {
- asyncContextStack.pop();
- }
-}
-
-let rootAsyncFrame: AsyncContextFrame | undefined = undefined;
-let promiseHooksSet = false;
-
-const asyncContext = Symbol("asyncContext");
-
-function setPromiseHooks() {
- if (promiseHooksSet) {
- return;
- }
- promiseHooksSet = true;
-
- const init = (promise: Promise<unknown>) => {
- const currentFrame = AsyncContextFrame.current();
- if (!currentFrame.isRoot()) {
- if (typeof promise[asyncContext] !== "undefined") {
- throw new Error("Promise already has async context");
- }
- AsyncContextFrame.attachContext(promise);
- }
- };
- const before = (promise: Promise<unknown>) => {
- const maybeFrame = promise[asyncContext];
- if (maybeFrame) {
- pushAsyncFrame(maybeFrame);
- } else {
- pushAsyncFrame(AsyncContextFrame.getRootAsyncContext());
- }
- };
- const after = (promise: Promise<unknown>) => {
- popAsyncFrame();
- if (!op_node_is_promise_rejected(promise)) {
- // @ts-ignore promise async context
- promise[asyncContext] = undefined;
- }
- };
- const resolve = (promise: Promise<unknown>) => {
- const currentFrame = AsyncContextFrame.current();
- if (
- !currentFrame.isRoot() && op_node_is_promise_rejected(promise) &&
- typeof promise[asyncContext] === "undefined"
- ) {
- AsyncContextFrame.attachContext(promise);
- }
- };
-
- core.setPromiseHooks(init, before, after, resolve);
-}
-
-class AsyncContextFrame {
- storage: StorageEntry[];
- constructor(
- maybeParent?: AsyncContextFrame | null,
- maybeStorageEntry?: StorageEntry | null,
- isRoot = false,
- ) {
- this.storage = [];
-
- setPromiseHooks();
-
- const propagate = (parent: AsyncContextFrame) => {
- parent.storage = parent.storage.filter((entry) => !entry.key.isDead());
- parent.storage.forEach((entry) => this.storage.push(entry.clone()));
-
- if (maybeStorageEntry) {
- const existingEntry = this.storage.find((entry) =>
- entry.key === maybeStorageEntry.key
- );
- if (existingEntry) {
- existingEntry.value = maybeStorageEntry.value;
- } else {
- this.storage.push(maybeStorageEntry);
- }
- }
- };
-
- if (!isRoot) {
- if (maybeParent) {
- propagate(maybeParent);
- } else {
- propagate(AsyncContextFrame.current());
- }
- }
- }
-
- static tryGetContext(promise: Promise<unknown>) {
- // @ts-ignore promise async context
- return promise[asyncContext];
- }
-
- static attachContext(promise: Promise<unknown>) {
- // @ts-ignore promise async context
- promise[asyncContext] = AsyncContextFrame.current();
- }
-
- static getRootAsyncContext() {
- if (typeof rootAsyncFrame !== "undefined") {
- return rootAsyncFrame;
- }
-
- rootAsyncFrame = new AsyncContextFrame(null, null, true);
- return rootAsyncFrame;
- }
-
- static current() {
- if (asyncContextStack.length === 0) {
- return AsyncContextFrame.getRootAsyncContext();
- }
-
- return asyncContextStack[asyncContextStack.length - 1];
- }
-
- static create(
- maybeParent?: AsyncContextFrame | null,
- maybeStorageEntry?: StorageEntry | null,
- ) {
- return new AsyncContextFrame(maybeParent, maybeStorageEntry);
- }
-
- static wrap(
- fn: () => unknown,
- maybeFrame: AsyncContextFrame | undefined,
- // deno-lint-ignore no-explicit-any
- thisArg: any,
- ) {
- // deno-lint-ignore no-explicit-any
- return (...args: any) => {
- const frame = maybeFrame || AsyncContextFrame.current();
- Scope.enter(frame);
- try {
- return fn.apply(thisArg, args);
- } finally {
- Scope.exit();
- }
- };
- }
-
- get(key: StorageKey) {
- assert(!key.isDead());
- this.storage = this.storage.filter((entry) => !entry.key.isDead());
- const entry = this.storage.find((entry) => entry.key === key);
- if (entry) {
- return entry.value;
- }
- return undefined;
- }
-
- isRoot() {
- return AsyncContextFrame.getRootAsyncContext() == this;
- }
-}
+const {
+ ObjectDefineProperties,
+ ReflectApply,
+ FunctionPrototypeBind,
+ ArrayPrototypeUnshift,
+ ObjectFreeze,
+} = primordials;
export class AsyncResource {
- frame: AsyncContextFrame;
type: string;
+ #snapshot: unknown;
#asyncId: number;
constructor(type: string) {
this.type = type;
- this.frame = AsyncContextFrame.current();
+ this.#snapshot = getAsyncContext();
this.#asyncId = newAsyncId();
}
@@ -198,35 +41,38 @@ export class AsyncResource {
thisArg: unknown,
...args: unknown[]
) {
- Scope.enter(this.frame);
-
+ const previousContext = getAsyncContext();
try {
- return fn.apply(thisArg, args);
+ setAsyncContext(this.#snapshot);
+ return ReflectApply(fn, thisArg, args);
} finally {
- Scope.exit();
+ setAsyncContext(previousContext);
}
}
emitDestroy() {}
- bind(fn: (...args: unknown[]) => unknown, thisArg = this) {
+ bind(fn: (...args: unknown[]) => unknown, thisArg) {
validateFunction(fn, "fn");
- const frame = AsyncContextFrame.current();
- const bound = AsyncContextFrame.wrap(fn, frame, thisArg);
-
- Object.defineProperties(bound, {
+ let bound;
+ if (thisArg === undefined) {
+ // deno-lint-ignore no-this-alias
+ const resource = this;
+ bound = function (...args) {
+ ArrayPrototypeUnshift(args, fn, this);
+ return ReflectApply(resource.runInAsyncScope, resource, args);
+ };
+ } else {
+ bound = FunctionPrototypeBind(this.runInAsyncScope, this, fn, thisArg);
+ }
+ ObjectDefineProperties(bound, {
"length": {
+ __proto__: null,
configurable: true,
enumerable: false,
value: fn.length,
writable: false,
},
- "asyncResource": {
- configurable: true,
- enumerable: true,
- value: this,
- writable: true,
- },
});
return bound;
}
@@ -236,95 +82,54 @@ export class AsyncResource {
type?: string,
thisArg?: AsyncResource,
) {
- type = type || fn.name;
- return (new AsyncResource(type || "AsyncResource")).bind(fn, thisArg);
- }
-}
-
-class Scope {
- static enter(maybeFrame?: AsyncContextFrame) {
- if (maybeFrame) {
- pushAsyncFrame(maybeFrame);
- } else {
- pushAsyncFrame(AsyncContextFrame.getRootAsyncContext());
- }
- }
-
- static exit() {
- popAsyncFrame();
- }
-}
-
-class StorageEntry {
- key: StorageKey;
- value: unknown;
- constructor(key: StorageKey, value: unknown) {
- this.key = key;
- this.value = value;
- }
-
- clone() {
- return new StorageEntry(this.key, this.value);
- }
-}
-
-class StorageKey {
- #dead = false;
-
- reset() {
- this.#dead = true;
- }
-
- isDead() {
- return this.#dead;
+ type = type || fn.name || "bound-anonymous-fn";
+ return (new AsyncResource(type)).bind(fn, thisArg);
}
}
-const fnReg = new FinalizationRegistry((key: StorageKey) => {
- key.reset();
-});
-
export class AsyncLocalStorage {
- #key;
-
- constructor() {
- this.#key = new StorageKey();
- fnReg.register(this, this.#key);
- }
+ #variable = new AsyncVariable();
+ enabled = false;
// deno-lint-ignore no-explicit-any
run(store: any, callback: any, ...args: any[]): any {
- const frame = AsyncContextFrame.create(
- null,
- new StorageEntry(this.#key, store),
- );
- Scope.enter(frame);
- let res;
+ this.enabled = true;
+ const previous = this.#variable.enter(store);
try {
- res = callback(...args);
+ return ReflectApply(callback, null, args);
} finally {
- Scope.exit();
+ setAsyncContext(previous);
}
- return res;
}
// deno-lint-ignore no-explicit-any
exit(callback: (...args: unknown[]) => any, ...args: any[]): any {
- return this.run(undefined, callback, args);
+ if (!this.enabled) {
+ return ReflectApply(callback, null, args);
+ }
+ this.enabled = false;
+ try {
+ return ReflectApply(callback, null, args);
+ } finally {
+ this.enabled = true;
+ }
}
// deno-lint-ignore no-explicit-any
getStore(): any {
- const currentFrame = AsyncContextFrame.current();
- return currentFrame.get(this.#key);
+ if (!this.enabled) {
+ return undefined;
+ }
+ return this.#variable.get();
}
enterWith(store: unknown) {
- const frame = AsyncContextFrame.create(
- null,
- new StorageEntry(this.#key, store),
- );
- Scope.enter(frame);
+ this.enabled = true;
+ this.#variable.enter(store);
+ }
+
+ disable() {
+ this.enabled = false;
}
static bind(fn: (...args: unknown[]) => unknown) {
@@ -335,14 +140,24 @@ export class AsyncLocalStorage {
return AsyncLocalStorage.bind((
cb: (...args: unknown[]) => unknown,
...args: unknown[]
- ) => cb(...args));
+ ) => ReflectApply(cb, null, args));
}
}
export function executionAsyncId() {
- return 1;
+ return 0;
+}
+
+export function triggerAsyncId() {
+ return 0;
}
+export function executionAsyncResource() {
+ return {};
+}
+
+export const asyncWrapProviders = ObjectFreeze({ __proto__: null });
+
class AsyncHook {
enable() {
}
@@ -355,12 +170,12 @@ export function createHook() {
return new AsyncHook();
}
-// Placing all exports down here because the exported classes won't export
-// otherwise.
export default {
- // Embedder API
- AsyncResource,
- executionAsyncId,
- createHook,
AsyncLocalStorage,
+ createHook,
+ executionAsyncId,
+ triggerAsyncId,
+ executionAsyncResource,
+ asyncWrapProviders,
+ AsyncResource,
};