foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

refactor: don't expose worker ops to user code (#22276)

Browse source
This commit is contained in:
Bartek Iwańczuk 2024-02-06 00:58:06 +01:00 committed by GitHub
parent b94dabdb81
commit 6853633f7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
runtime/js/99_main.js
View file

@ -14,6 +14,11 @@ import {
op_ppid, op_ppid,
op_set_format_exception_callback, op_set_format_exception_callback,
op_snapshot_options, op_snapshot_options,
op_worker_close,
op_worker_get_type,
op_worker_post_message,
op_worker_recv_message,
op_worker_sync_fetch,
} from "ext:core/ops"; } from "ext:core/ops";
const { const {
ArrayPrototypeFilter, ArrayPrototypeFilter,
@ -223,7 +228,7 @@ function workerClose() {
} }
isClosing = true; isClosing = true;
ops.op_worker_close(); op_worker_close();
} }
function postMessage(message, transferOrOptions = {}) { function postMessage(message, transferOrOptions = {}) {
@ -252,15 +257,13 @@ function postMessage(message, transferOrOptions = {}) {
} }
const { transfer } = options; const { transfer } = options;
const data = messagePort.serializeJsMessageData(message, transfer); const data = messagePort.serializeJsMessageData(message, transfer);
ops.op_worker_post_message(data); op_worker_post_message(data);
} }
let isClosing = false; let isClosing = false;
let globalDispatchEvent; let globalDispatchEvent;
async function pollForMessages() { async function pollForMessages() {
const { op_worker_recv_message } = core.ensureFastOps();
if (!globalDispatchEvent) { if (!globalDispatchEvent) {
globalDispatchEvent = FunctionPrototypeBind( globalDispatchEvent = FunctionPrototypeBind(
globalThis.dispatchEvent, globalThis.dispatchEvent,
@ -309,7 +312,7 @@ async function pollForMessages() {
let loadedMainWorkerScript = false; let loadedMainWorkerScript = false;
function importScripts(...urls) { function importScripts(...urls) {
if (ops.op_worker_get_type() === "module") { if (op_worker_get_type() === "module") {
throw new TypeError("Can't import scripts in a module worker."); throw new TypeError("Can't import scripts in a module worker.");
} }
@ -329,7 +332,7 @@ function importScripts(...urls) {
// imported scripts, so we use `loadedMainWorkerScript` to distinguish them. // imported scripts, so we use `loadedMainWorkerScript` to distinguish them.
// TODO(andreubotella) Refactor worker creation so the main script isn't // TODO(andreubotella) Refactor worker creation so the main script isn't
// loaded with `importScripts()`. // loaded with `importScripts()`.
const scripts = ops.op_worker_sync_fetch( const scripts = op_worker_sync_fetch(
parsedUrls, parsedUrls,
!loadedMainWorkerScript, !loadedMainWorkerScript,
); );
@ -595,11 +598,6 @@ const NOT_IMPORTED_OPS = [
"op_test_op_sanitizer_report", "op_test_op_sanitizer_report",
"op_void_async", "op_void_async",
"op_void_sync", "op_void_sync",
"op_worker_close",
"op_worker_get_type",
"op_worker_post_message",
"op_worker_recv_message",
"op_worker_sync_fetch",
"op_ws_send_pong", "op_ws_send_pong",
"op_jupyter_broadcast", "op_jupyter_broadcast",
"op_format_file_name", "op_format_file_name",

1
runtime/snapshot.rs
View file

@ -253,6 +253,7 @@ pub fn create_runtime_snapshot(
ops::tty::deno_tty::init_ops(), ops::tty::deno_tty::init_ops(),
ops::http::deno_http_runtime::init_ops(), ops::http::deno_http_runtime::init_ops(),
ops::bootstrap::deno_bootstrap::init_ops(Some(snapshot_options)), ops::bootstrap::deno_bootstrap::init_ops(Some(snapshot_options)),
ops::web_worker::deno_web_worker::init_ops(),
]; ];
for extension in &mut extensions { for extension in &mut extensions {

5
runtime/worker.rs
View file

@ -430,6 +430,11 @@ impl MainWorker {
enable_testing_features, enable_testing_features,
), ),
runtime::init_ops_and_esm(), runtime::init_ops_and_esm(),
// NOTE(bartlomieju): this is done, just so that ops from this extension
// are available and importing them in `99_main.js` doesn't cause an
// error because they're not defined. Trying to use these ops in non-worker
// context will cause a panic.
ops::web_worker::deno_web_worker::init_ops_and_esm().disable(),
]; ];
#[cfg(__runtime_js_sources)] #[cfg(__runtime_js_sources)]