diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/js/11_workers.js | 19 | ||||
| -rw-r--r-- | runtime/js/99_main.js | 29 | ||||
| -rw-r--r-- | runtime/ops/worker_host.rs | 7 | ||||
| -rw-r--r-- | runtime/web_worker.rs | 34 |
4 files changed, 26 insertions, 63 deletions
diff --git a/runtime/js/11_workers.js b/runtime/js/11_workers.js index 87949c1c0..948542d1c 100644 --- a/runtime/js/11_workers.js +++ b/runtime/js/11_workers.js @@ -27,7 +27,6 @@ specifier, hasSourceCode, sourceCode, - useDenoNamespace, permissions, name, workerType, @@ -38,7 +37,6 @@ permissions: serializePermissions(permissions), sourceCode, specifier, - useDenoNamespace, workerType, }); } @@ -79,20 +77,6 @@ type = "classic", } = options; - let namespace; - let permissions; - if (typeof deno == "object") { - namespace = deno.namespace ?? false; - permissions = deno.permissions ?? undefined; - } else { - // Assume `deno: boolean | undefined`. - // TODO(Soremwar) - // `deno: boolean` is kept for backwards compatibility with the previous - // worker options implementation. Remove for 2.0 - namespace = !!deno; - permissions = undefined; - } - const workerType = webidl.converters["WorkerType"](type); if ( @@ -120,8 +104,7 @@ specifier, hasSourceCode, sourceCode, - namespace, - permissions, + deno?.permissions, name, workerType, ); diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index cf2525b06..b469a29dc 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -26,7 +26,6 @@ delete Object.prototype.__proto__; PromisePrototypeThen, TypeError, } = window.__bootstrap.primordials; - const infra = window.__bootstrap.infra; const util = window.__bootstrap.util; const eventTarget = window.__bootstrap.eventTarget; const globalInterfaces = window.__bootstrap.globalInterfaces; @@ -627,7 +626,6 @@ delete Object.prototype.__proto__; function bootstrapWorkerRuntime( runtimeOptions, name, - useDenoNamespace, internalName, ) { if (hasBootstrapped) { @@ -697,23 +695,18 @@ delete Object.prototype.__proto__; close: core.close, ...denoNs, }; - if (useDenoNamespace) { - if (unstableFlag) { - ObjectAssign(finalDenoNs, denoNsUnstable); - } - ObjectDefineProperties(finalDenoNs, { - pid: util.readOnly(pid), - noColor: util.readOnly(noColor), - args: util.readOnly(ObjectFreeze(args)), - }); - // Setup `Deno` global - we're actually overriding already - // existing global `Deno` with `Deno` namespace from "./deno.ts". - ObjectDefineProperty(globalThis, "Deno", util.readOnly(finalDenoNs)); - ObjectFreeze(globalThis.Deno.core); - } else { - delete globalThis.Deno; - infra.assert(globalThis.Deno === undefined); + if (unstableFlag) { + ObjectAssign(finalDenoNs, denoNsUnstable); } + ObjectDefineProperties(finalDenoNs, { + pid: util.readOnly(pid), + noColor: util.readOnly(noColor), + args: util.readOnly(ObjectFreeze(args)), + }); + // Setup `Deno` global - we're actually overriding already + // existing global `Deno` with `Deno` namespace from "./deno.ts". + ObjectDefineProperty(globalThis, "Deno", util.readOnly(finalDenoNs)); + ObjectFreeze(globalThis.Deno.core); } ObjectDefineProperties(globalThis, { diff --git a/runtime/ops/worker_host.rs b/runtime/ops/worker_host.rs index f8831d4e9..d869e5871 100644 --- a/runtime/ops/worker_host.rs +++ b/runtime/ops/worker_host.rs @@ -36,7 +36,6 @@ pub struct CreateWebWorkerArgs { pub parent_permissions: Permissions, pub permissions: Permissions, pub main_module: ModuleSpecifier, - pub use_deno_namespace: bool, pub worker_type: WebWorkerType, pub maybe_exit_code: Option<Arc<AtomicI32>>, } @@ -133,7 +132,6 @@ pub struct CreateWorkerArgs { permissions: Option<ChildPermissionsArg>, source_code: String, specifier: String, - use_deno_namespace: bool, worker_type: WebWorkerType, } @@ -150,10 +148,6 @@ fn op_create_worker( None }; let args_name = args.name; - let use_deno_namespace = args.use_deno_namespace; - if use_deno_namespace { - super::check_unstable(state, "Worker.deno.namespace"); - } let worker_type = args.worker_type; if let WebWorkerType::Classic = worker_type { if let TestingFeaturesEnabled(false) = state.borrow() { @@ -216,7 +210,6 @@ fn op_create_worker( parent_permissions, permissions: worker_permissions, main_module: module_specifier.clone(), - use_deno_namespace, worker_type, maybe_exit_code, }); diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 9582d0f7f..a2f2ffc5d 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -312,7 +312,6 @@ pub struct WebWorker { pub js_runtime: JsRuntime, pub name: String, internal_handle: WebWorkerInternalHandle, - pub use_deno_namespace: bool, pub worker_type: WebWorkerType, pub main_module: ModuleSpecifier, poll_for_messages_fn: Option<v8::Global<v8::Value>>, @@ -329,7 +328,6 @@ pub struct WebWorkerOptions { pub preload_module_cb: Arc<ops::worker_host::PreloadModuleCb>, pub format_js_error_fn: Option<Arc<FormatJsErrorFn>>, pub source_map_getter: Option<Box<dyn SourceMapGetter>>, - pub use_deno_namespace: bool, pub worker_type: WebWorkerType, pub maybe_inspector_server: Option<Arc<InspectorServer>>, pub get_error_class_fn: Option<GetErrorClassFn>, @@ -413,30 +411,28 @@ impl WebWorker { options.format_js_error_fn.clone(), ), // Extensions providing Deno.* features - ops::fs_events::init().enabled(options.use_deno_namespace), - ops::fs::init().enabled(options.use_deno_namespace), + ops::fs_events::init(), + ops::fs::init(), ops::io::init(), - ops::io::init_stdio(options.stdio).enabled(options.use_deno_namespace), - deno_tls::init().enabled(options.use_deno_namespace), + ops::io::init_stdio(options.stdio), + deno_tls::init(), deno_net::init::<Permissions>( options.root_cert_store.clone(), unstable, options.unsafely_ignore_certificate_errors.clone(), - ) - .enabled(options.use_deno_namespace), + ), ops::os::init(Some( options .maybe_exit_code .expect("Worker has access to OS ops but exit code was not passed."), - )) - .enabled(options.use_deno_namespace), - ops::permissions::init().enabled(options.use_deno_namespace), - ops::process::init().enabled(options.use_deno_namespace), - ops::spawn::init().enabled(options.use_deno_namespace), - ops::signal::init().enabled(options.use_deno_namespace), - ops::tty::init().enabled(options.use_deno_namespace), - deno_http::init().enabled(options.use_deno_namespace), - ops::http::init().enabled(options.use_deno_namespace), + )), + ops::permissions::init(), + ops::process::init(), + ops::spawn::init(), + ops::signal::init(), + ops::tty::init(), + deno_http::init(), + ops::http::init(), // Permissions ext (worker specific state) perm_ext, ]; @@ -479,7 +475,6 @@ impl WebWorker { js_runtime, name, internal_handle, - use_deno_namespace: options.use_deno_namespace, worker_type: options.worker_type, main_module, poll_for_messages_fn: None, @@ -492,10 +487,9 @@ impl WebWorker { // Instead of using name for log we use `worker-${id}` because // WebWorkers can have empty string as name. let script = format!( - "bootstrap.workerRuntime({}, \"{}\", {}, \"{}\")", + "bootstrap.workerRuntime({}, \"{}\", \"{}\")", options.as_json(), self.name, - self.use_deno_namespace, self.id ); self |