summaryrefslogtreecommitdiff
path: root/runtime/js/99_main.js
diff options
context:
space:
mode:
authorBartek Iwańczuk <biwanczuk@gmail.com>2023-03-27 16:25:17 +0200
committerGitHub <noreply@github.com>2023-03-27 14:25:17 +0000
commit357bcfcf79fee92195e37bb3f05e247908f207c5 (patch)
tree0eddf89fc6b0971498bf56586a35bffa9a103efb /runtime/js/99_main.js
parent2b389ecf62f296712f0a3da488451ba6f19b43f7 (diff)
Revert "refactor: remove Deno[Deno.internal].nodeUnstable namespace (… (#18458)
…#18449)" This reverts commit d1a9c4cd7ce0c19ddf9c7c52c0d35d6124a7677d. Appears this made CI very flaky on macOS, but I can't repeat it locally yet
Diffstat (limited to 'runtime/js/99_main.js')
-rw-r--r--runtime/js/99_main.js64
1 files changed, 64 insertions, 0 deletions
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index bc67a5897..d043f485e 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -45,6 +45,7 @@ import * as version from "ext:runtime/01_version.ts";
import * as os from "ext:runtime/30_os.js";
import * as timers from "ext:deno_web/02_timers.js";
import * as colors from "ext:deno_console/01_colors.js";
+import * as net from "ext:deno_net/01_net.js";
import {
inspectArgs,
quoteString,
@@ -58,6 +59,7 @@ import { denoNs, denoNsUnstable } from "ext:runtime/90_deno_ns.js";
import { errors } from "ext:runtime/01_errors.js";
import * as webidl from "ext:deno_webidl/00_webidl.js";
import DOMException from "ext:deno_web/01_dom_exception.js";
+import * as flash from "ext:deno_flash/01_http.js";
import {
mainRuntimeGlobalProperties,
setLanguage,
@@ -453,6 +455,27 @@ function bootstrapMainRuntime(runtimeOptions) {
setUserAgent(runtimeOptions.userAgent);
setLanguage(runtimeOptions.locale);
+ // These have to initialized here and not in `90_deno_ns.js` because
+ // the op function that needs to be passed will be invalidated by creating
+ // a snapshot
+ ObjectAssign(internals, {
+ nodeUnstable: {
+ serve: flash.createServe(ops.op_node_unstable_flash_serve),
+ upgradeHttpRaw: flash.upgradeHttpRaw,
+ listenDatagram: net.createListenDatagram(
+ ops.op_node_unstable_net_listen_udp,
+ ops.op_node_unstable_net_listen_unixpacket,
+ ),
+ },
+ });
+
+ // FIXME(bartlomieju): temporarily add whole `Deno.core` to
+ // `Deno[Deno.internal]` namespace. It should be removed and only necessary
+ // methods should be left there.
+ ObjectAssign(internals, {
+ core,
+ });
+
ObjectDefineProperties(finalDenoNs, {
pid: util.readOnly(runtimeOptions.pid),
ppid: util.readOnly(runtimeOptions.ppid),
@@ -463,6 +486,16 @@ function bootstrapMainRuntime(runtimeOptions) {
if (runtimeOptions.unstableFlag) {
ObjectAssign(finalDenoNs, denoNsUnstable);
+ // These have to initialized here and not in `90_deno_ns.js` because
+ // the op function that needs to be passed will be invalidated by creating
+ // a snapshot
+ ObjectAssign(finalDenoNs, {
+ serve: flash.createServe(ops.op_flash_serve),
+ listenDatagram: net.createListenDatagram(
+ ops.op_net_listen_udp,
+ ops.op_net_listen_unixpacket,
+ ),
+ });
}
// Setup `Deno` global - we're actually overriding already existing global
@@ -540,8 +573,39 @@ function bootstrapWorkerRuntime(
globalThis.pollForMessages = pollForMessages;
+ // These have to initialized here and not in `90_deno_ns.js` because
+ // the op function that needs to be passed will be invalidated by creating
+ // a snapshot
+ ObjectAssign(internals, {
+ nodeUnstable: {
+ serve: flash.createServe(ops.op_node_unstable_flash_serve),
+ upgradeHttpRaw: flash.upgradeHttpRaw,
+ listenDatagram: net.createListenDatagram(
+ ops.op_node_unstable_net_listen_udp,
+ ops.op_node_unstable_net_listen_unixpacket,
+ ),
+ },
+ });
+
+ // FIXME(bartlomieju): temporarily add whole `Deno.core` to
+ // `Deno[Deno.internal]` namespace. It should be removed and only necessary
+ // methods should be left there.
+ ObjectAssign(internals, {
+ core,
+ });
+
if (runtimeOptions.unstableFlag) {
ObjectAssign(finalDenoNs, denoNsUnstable);
+ // These have to initialized here and not in `90_deno_ns.js` because
+ // the op function that needs to be passed will be invalidated by creating
+ // a snapshot
+ ObjectAssign(finalDenoNs, {
+ serve: flash.createServe(ops.op_flash_serve),
+ listenDatagram: net.createListenDatagram(
+ ops.op_net_listen_udp,
+ ops.op_net_listen_unixpacket,
+ ),
+ });
}
ObjectDefineProperties(finalDenoNs, {
pid: util.readOnly(runtimeOptions.pid),