diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/examples/hello_runtime.rs | 2 | ||||
| -rw-r--r-- | runtime/ops/web_worker/sync_fetch.rs | 3 | ||||
| -rw-r--r-- | runtime/web_worker.rs | 10 | ||||
| -rw-r--r-- | runtime/worker.rs | 12 |
4 files changed, 13 insertions, 14 deletions
diff --git a/runtime/examples/hello_runtime.rs b/runtime/examples/hello_runtime.rs index f97c045b2..2e930a03f 100644 --- a/runtime/examples/hello_runtime.rs +++ b/runtime/examples/hello_runtime.rs @@ -32,7 +32,7 @@ async fn main() -> Result<(), AnyError> { extensions: vec![], startup_snapshot: None, unsafely_ignore_certificate_errors: None, - root_cert_store: None, + root_cert_store_provider: None, seed: None, source_map_getter: None, format_js_error_fn: None, diff --git a/runtime/ops/web_worker/sync_fetch.rs b/runtime/ops/web_worker/sync_fetch.rs index 2049d5ab8..ba5f325d6 100644 --- a/runtime/ops/web_worker/sync_fetch.rs +++ b/runtime/ops/web_worker/sync_fetch.rs @@ -8,7 +8,6 @@ use deno_core::op; use deno_core::url::Url; use deno_core::OpState; use deno_fetch::data_url::DataUrl; -use deno_fetch::reqwest; use deno_web::BlobStore; use deno_websocket::DomExceptionNetworkError; use hyper::body::Bytes; @@ -41,7 +40,7 @@ pub fn op_worker_sync_fetch( let handle = state.borrow::<WebWorkerInternalHandle>().clone(); assert_eq!(handle.worker_type, WebWorkerType::Classic); - let client = state.borrow::<reqwest::Client>().clone(); + let client = deno_fetch::get_or_create_client_from_state(state)?; // TODO(andreubotella) It's not good to throw an exception related to blob // URLs when none of the script URLs use the blob scheme. diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index 9bc5ba011..b688aae8b 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -37,7 +37,7 @@ use deno_core::SourceMapGetter; use deno_fs::StdFs; use deno_io::Stdio; use deno_kv::sqlite::SqliteDbHandler; -use deno_tls::rustls::RootCertStore; +use deno_tls::RootCertStoreProvider; use deno_web::create_entangled_message_port; use deno_web::BlobStore; use deno_web::MessagePort; @@ -329,7 +329,7 @@ pub struct WebWorkerOptions { pub extensions: Vec<Extension>, pub startup_snapshot: Option<Snapshot>, pub unsafely_ignore_certificate_errors: Option<Vec<String>>, - pub root_cert_store: Option<RootCertStore>, + pub root_cert_store_provider: Option<Arc<dyn RootCertStoreProvider>>, pub seed: Option<u64>, pub module_loader: Rc<dyn ModuleLoader>, pub node_fs: Option<Arc<dyn deno_node::NodeFs>>, @@ -407,7 +407,7 @@ impl WebWorker { deno_fetch::deno_fetch::init_ops::<PermissionsContainer>( deno_fetch::Options { user_agent: options.bootstrap.user_agent.clone(), - root_cert_store: options.root_cert_store.clone(), + root_cert_store_provider: options.root_cert_store_provider.clone(), unsafely_ignore_certificate_errors: options .unsafely_ignore_certificate_errors .clone(), @@ -418,7 +418,7 @@ impl WebWorker { deno_cache::deno_cache::init_ops::<SqliteBackedCache>(create_cache), deno_websocket::deno_websocket::init_ops::<PermissionsContainer>( options.bootstrap.user_agent.clone(), - options.root_cert_store.clone(), + options.root_cert_store_provider.clone(), options.unsafely_ignore_certificate_errors.clone(), ), deno_webstorage::deno_webstorage::init_ops(None).disable(), @@ -429,7 +429,7 @@ impl WebWorker { ), deno_ffi::deno_ffi::init_ops::<PermissionsContainer>(unstable), deno_net::deno_net::init_ops::<PermissionsContainer>( - options.root_cert_store.clone(), + options.root_cert_store_provider.clone(), unstable, options.unsafely_ignore_certificate_errors.clone(), ), diff --git a/runtime/worker.rs b/runtime/worker.rs index 56684e992..0d68a4b51 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -33,7 +33,7 @@ use deno_core::SourceMapGetter; use deno_fs::StdFs; use deno_io::Stdio; use deno_kv::sqlite::SqliteDbHandler; -use deno_tls::rustls::RootCertStore; +use deno_tls::RootCertStoreProvider; use deno_web::BlobStore; use log::debug; @@ -84,7 +84,7 @@ pub struct WorkerOptions { /// V8 snapshot that should be loaded on startup. pub startup_snapshot: Option<Snapshot>, pub unsafely_ignore_certificate_errors: Option<Vec<String>>, - pub root_cert_store: Option<RootCertStore>, + pub root_cert_store_provider: Option<Arc<dyn RootCertStoreProvider>>, pub seed: Option<u64>, /// Implementation of `ModuleLoader` which will be @@ -163,7 +163,7 @@ impl Default for WorkerOptions { cache_storage_dir: Default::default(), broadcast_channel: Default::default(), source_map_getter: Default::default(), - root_cert_store: Default::default(), + root_cert_store_provider: Default::default(), node_fs: Default::default(), npm_resolver: Default::default(), blob_store: Default::default(), @@ -228,7 +228,7 @@ impl MainWorker { deno_fetch::deno_fetch::init_ops::<PermissionsContainer>( deno_fetch::Options { user_agent: options.bootstrap.user_agent.clone(), - root_cert_store: options.root_cert_store.clone(), + root_cert_store_provider: options.root_cert_store_provider.clone(), unsafely_ignore_certificate_errors: options .unsafely_ignore_certificate_errors .clone(), @@ -239,7 +239,7 @@ impl MainWorker { deno_cache::deno_cache::init_ops::<SqliteBackedCache>(create_cache), deno_websocket::deno_websocket::init_ops::<PermissionsContainer>( options.bootstrap.user_agent.clone(), - options.root_cert_store.clone(), + options.root_cert_store_provider.clone(), options.unsafely_ignore_certificate_errors.clone(), ), deno_webstorage::deno_webstorage::init_ops( @@ -252,7 +252,7 @@ impl MainWorker { ), deno_ffi::deno_ffi::init_ops::<PermissionsContainer>(unstable), deno_net::deno_net::init_ops::<PermissionsContainer>( - options.root_cert_store.clone(), + options.root_cert_store_provider.clone(), unstable, options.unsafely_ignore_certificate_errors.clone(), ), |