summaryrefslogtreecommitdiff
path: root/runtime/js
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/js')
-rw-r--r--runtime/js/06_util.js26
-rw-r--r--runtime/js/98_global_scope.js43
-rw-r--r--runtime/js/99_main.js113
3 files changed, 65 insertions, 117 deletions
diff --git a/runtime/js/06_util.js b/runtime/js/06_util.js
index 971957b7e..c9fd4befe 100644
--- a/runtime/js/06_util.js
+++ b/runtime/js/06_util.js
@@ -1,5 +1,7 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+const core = globalThis.Deno.core;
+const ops = core.ops;
const primordials = globalThis.__bootstrap.primordials;
const {
Promise,
@@ -14,18 +16,18 @@ const LogLevel = {
Debug: 4,
};
-let logLevel = 3;
-let logSource = "JS";
+const logSource = "JS";
-function setLogLevel(level, source) {
- logLevel = level;
- if (source) {
- logSource = source;
+let logLevel_ = null;
+function logLevel() {
+ if (logLevel_ === null) {
+ logLevel_ = ops.op_bootstrap_log_level() || 3;
}
+ return logLevel_;
}
function log(...args) {
- if (logLevel >= LogLevel.Debug) {
+ if (logLevel() >= LogLevel.Debug) {
// if we destructure `console` off `globalThis` too early, we don't bind to
// the right console, therefore we don't log anything out.
globalThis.console.error(
@@ -83,12 +85,4 @@ function getterOnly(getter) {
};
}
-export {
- createResolvable,
- getterOnly,
- log,
- nonEnumerable,
- readOnly,
- setLogLevel,
- writable,
-};
+export { createResolvable, getterOnly, log, nonEnumerable, readOnly, writable };
diff --git a/runtime/js/98_global_scope.js b/runtime/js/98_global_scope.js
index 6c650da10..aada57d70 100644
--- a/runtime/js/98_global_scope.js
+++ b/runtime/js/98_global_scope.js
@@ -1,6 +1,7 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
const core = globalThis.Deno.core;
+const ops = core.ops;
const primordials = globalThis.__bootstrap.primordials;
const {
ObjectDefineProperties,
@@ -157,19 +158,19 @@ class Navigator {
const navigator = webidl.createBranded(Navigator);
-let numCpus, userAgent, language;
-
-function setNumCpus(val) {
- numCpus = val;
-}
-
-function setUserAgent(val) {
- userAgent = val;
+function memoizeLazy(f) {
+ let v_ = null;
+ return () => {
+ if (v_ === null) {
+ v_ = f();
+ }
+ return v_;
+ };
}
-function setLanguage(val) {
- language = val;
-}
+const numCpus = memoizeLazy(() => ops.op_bootstrap_numcpus());
+const userAgent = memoizeLazy(() => ops.op_bootstrap_user_agent());
+const language = memoizeLazy(() => ops.op_bootstrap_language());
ObjectDefineProperties(Navigator.prototype, {
hardwareConcurrency: {
@@ -177,7 +178,7 @@ ObjectDefineProperties(Navigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, NavigatorPrototype);
- return numCpus;
+ return numCpus();
},
},
userAgent: {
@@ -185,7 +186,7 @@ ObjectDefineProperties(Navigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, NavigatorPrototype);
- return userAgent;
+ return userAgent();
},
},
language: {
@@ -193,7 +194,7 @@ ObjectDefineProperties(Navigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, NavigatorPrototype);
- return language;
+ return language();
},
},
languages: {
@@ -201,7 +202,7 @@ ObjectDefineProperties(Navigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, NavigatorPrototype);
- return [language];
+ return [language()];
},
},
});
@@ -225,7 +226,7 @@ ObjectDefineProperties(WorkerNavigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, WorkerNavigatorPrototype);
- return numCpus;
+ return numCpus();
},
},
userAgent: {
@@ -233,7 +234,7 @@ ObjectDefineProperties(WorkerNavigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, WorkerNavigatorPrototype);
- return userAgent;
+ return userAgent();
},
},
language: {
@@ -241,7 +242,7 @@ ObjectDefineProperties(WorkerNavigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, WorkerNavigatorPrototype);
- return language;
+ return language();
},
},
languages: {
@@ -249,7 +250,7 @@ ObjectDefineProperties(WorkerNavigator.prototype, {
enumerable: true,
get() {
webidl.assertBranded(this, WorkerNavigatorPrototype);
- return [language];
+ return [language()];
},
},
});
@@ -284,9 +285,7 @@ const workerRuntimeGlobalProperties = {
export {
mainRuntimeGlobalProperties,
- setLanguage,
- setNumCpus,
- setUserAgent,
+ memoizeLazy,
unstableWindowOrWorkerGlobalScope,
windowOrWorkerGlobalScope,
workerRuntimeGlobalProperties,
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index b06cef651..06a7d605d 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -26,7 +26,6 @@ const {
ObjectAssign,
ObjectDefineProperties,
ObjectDefineProperty,
- ObjectFreeze,
ObjectPrototypeIsPrototypeOf,
ObjectSetPrototypeOf,
PromisePrototypeThen,
@@ -50,7 +49,7 @@ import {
getNoColor,
inspectArgs,
quoteString,
- setNoColor,
+ setNoColorFn,
wrapConsole,
} from "ext:deno_console/01_console.js";
import * as performance from "ext:deno_web/15_performance.js";
@@ -67,9 +66,7 @@ import * as webidl from "ext:deno_webidl/00_webidl.js";
import DOMException from "ext:deno_web/01_dom_exception.js";
import {
mainRuntimeGlobalProperties,
- setLanguage,
- setNumCpus,
- setUserAgent,
+ memoizeLazy,
unstableWindowOrWorkerGlobalScope,
windowOrWorkerGlobalScope,
workerRuntimeGlobalProperties,
@@ -241,6 +238,11 @@ function opMainModule() {
return ops.op_main_module();
}
+const opArgs = memoizeLazy(() => ops.op_bootstrap_args());
+const opPid = memoizeLazy(() => ops.op_bootstrap_pid());
+const opPpid = memoizeLazy(() => ops.op_ppid());
+setNoColorFn(() => ops.op_bootstrap_no_color());
+
function formatException(error) {
if (ObjectPrototypeIsPrototypeOf(ErrorPrototype, error)) {
return null;
@@ -327,10 +329,6 @@ function runtimeStart(
v8Version,
tsVersion,
target,
- logLevel,
- noColor,
- isTty,
- source,
) {
core.setMacrotaskCallback(timers.handleTimerMacrotask);
core.setMacrotaskCallback(promiseRejectMacrotaskCallback);
@@ -343,8 +341,6 @@ function runtimeStart(
tsVersion,
);
core.setBuildInfo(target);
- util.setLogLevel(logLevel, source);
- setNoColor(noColor || !isTty);
}
const pendingRejections = [];
@@ -461,25 +457,16 @@ function bootstrapMainRuntime(runtimeOptions) {
const nodeBootstrap = globalThis.nodeBootstrap;
const {
- 0: args,
- 1: cpuCount,
- 2: logLevel,
- 3: denoVersion,
- 4: locale,
- 5: location_,
- 6: noColor,
- 7: isTty,
- 8: tsVersion,
- 9: unstableFlag,
- 10: unstableFeatures,
- 11: pid,
- 12: target,
- 13: v8Version,
- 14: userAgent,
- 15: inspectFlag,
- // 16: enableTestingFeaturesFlag
- 17: hasNodeModulesDir,
- 18: maybeBinaryNpmCommandName,
+ 0: denoVersion,
+ 1: location_,
+ 2: tsVersion,
+ 3: unstableFlag,
+ 4: unstableFeatures,
+ 5: target,
+ 6: v8Version,
+ 7: inspectFlag,
+ 9: hasNodeModulesDir,
+ 10: maybeBinaryNpmCommandName,
} = runtimeOptions;
performance.setTimeOrigin(DateNow());
@@ -538,27 +525,13 @@ function bootstrapMainRuntime(runtimeOptions) {
v8Version,
tsVersion,
target,
- logLevel,
- noColor,
- isTty,
);
- setNumCpus(cpuCount);
- setUserAgent(userAgent);
- setLanguage(locale);
-
- let ppid = undefined;
ObjectDefineProperties(finalDenoNs, {
- pid: util.readOnly(pid),
- ppid: util.getterOnly(() => {
- // lazy because it's expensive
- if (ppid === undefined) {
- ppid = ops.op_ppid();
- }
- return ppid;
- }),
- noColor: util.readOnly(noColor),
- args: util.readOnly(ObjectFreeze(args)),
+ pid: util.getterOnly(opPid),
+ ppid: util.getterOnly(opPpid),
+ noColor: util.getterOnly(getNoColor),
+ args: util.getterOnly(opArgs),
mainModule: util.getterOnly(opMainModule),
});
@@ -593,8 +566,6 @@ function bootstrapMainRuntime(runtimeOptions) {
// `Deno` with `Deno` namespace from "./deno.ts".
ObjectDefineProperty(globalThis, "Deno", util.readOnly(finalDenoNs));
- util.log("args", args);
-
if (nodeBootstrap) {
nodeBootstrap(hasNodeModulesDir, maybeBinaryNpmCommandName);
}
@@ -612,25 +583,16 @@ function bootstrapWorkerRuntime(
const nodeBootstrap = globalThis.nodeBootstrap;
const {
- 0: args,
- 1: cpuCount,
- 2: logLevel,
- 3: denoVersion,
- 4: locale,
- 5: location_,
- 6: noColor,
- 7: isTty,
- 8: tsVersion,
- 9: unstableFlag,
- 10: unstableFeatures,
- 11: pid,
- 12: target,
- 13: v8Version,
- 14: userAgent,
- // 15: inspectFlag,
- 16: enableTestingFeaturesFlag,
- 17: hasNodeModulesDir,
- 18: maybeBinaryNpmCommandName,
+ 0: denoVersion,
+ 1: location_,
+ 2: tsVersion,
+ 3: unstableFlag,
+ 4: unstableFeatures,
+ 5: target,
+ 6: v8Version,
+ 8: enableTestingFeaturesFlag,
+ 9: hasNodeModulesDir,
+ 10: maybeBinaryNpmCommandName,
} = runtimeOptions;
performance.setTimeOrigin(DateNow());
@@ -686,18 +648,11 @@ function bootstrapWorkerRuntime(
v8Version,
tsVersion,
target,
- logLevel,
- noColor,
- isTty,
internalName ?? name,
);
location.setLocationHref(location_);
- setNumCpus(cpuCount);
- setUserAgent(userAgent);
- setLanguage(locale);
-
globalThis.pollForMessages = pollForMessages;
// TODO(bartlomieju): deprecate --unstable
@@ -710,9 +665,9 @@ function bootstrapWorkerRuntime(
}
}
ObjectDefineProperties(finalDenoNs, {
- pid: util.readOnly(pid),
- noColor: util.readOnly(noColor),
- args: util.readOnly(ObjectFreeze(args)),
+ pid: util.getterOnly(opPid),
+ noColor: util.getterOnly(getNoColor),
+ args: util.getterOnly(opArgs),
});
// Setup `Deno` global - we're actually overriding already
// existing global `Deno` with `Deno` namespace from "./deno.ts".
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 08:25:24 +0000