diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2021-11-28 13:07:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-28 13:07:03 -0500 |
| commit | cc83ad39ce3e8186c8785d47fa4801317c8fac4a (patch) | |
| tree | 7910684a15a0c33992c311b4fb94f9b323f3a7ee /runtime | |
| parent | 96d02deed626f391be0df30b9b08b7ba141db388 (diff) | |
refactor: add deno_fetch::Options for init (#12904)
deno_fetch::init has a lot of parameters and generic on two types
that keeps expanding over time. This refactor adds deno_fetch::Options
struct for more clearly defining the various parameters.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/build.rs | 10 | ||||
| -rw-r--r-- | runtime/web_worker.rs | 18 | ||||
| -rw-r--r-- | runtime/worker.rs | 18 |
3 files changed, 19 insertions, 27 deletions
diff --git a/runtime/build.rs b/runtime/build.rs index b0af848ba..14e2e0362 100644 --- a/runtime/build.rs +++ b/runtime/build.rs @@ -121,15 +121,7 @@ mod not_docs { deno_url::init(), deno_tls::init(), deno_web::init(deno_web::BlobStore::default(), Default::default()), - deno_fetch::init::<Permissions, deno_fetch::DefaultFileFetchHandler>( - "".to_owned(), - None, - None, - None, - None, - None, - deno_fetch::DefaultFileFetchHandler, // No enable_file_fetch - ), + deno_fetch::init::<Permissions>(Default::default()), deno_websocket::init::<Permissions>("".to_owned(), None, None), deno_webstorage::init(None), deno_crypto::init(None), diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs index c7358bc74..5dc627db4 100644 --- a/runtime/web_worker.rs +++ b/runtime/web_worker.rs @@ -318,15 +318,15 @@ impl WebWorker { deno_console::init(), deno_url::init(), deno_web::init(options.blob_store.clone(), Some(main_module.clone())), - deno_fetch::init::<Permissions, deno_fetch::FsFetchHandler>( - options.user_agent.clone(), - options.root_cert_store.clone(), - None, - None, - options.unsafely_ignore_certificate_errors.clone(), - None, - deno_fetch::FsFetchHandler, - ), + deno_fetch::init::<Permissions>(deno_fetch::Options { + user_agent: options.user_agent.clone(), + root_cert_store: options.root_cert_store.clone(), + unsafely_ignore_certificate_errors: options + .unsafely_ignore_certificate_errors + .clone(), + file_fetch_handler: Box::new(deno_fetch::FsFetchHandler), + ..Default::default() + }), deno_websocket::init::<Permissions>( options.user_agent.clone(), options.root_cert_store.clone(), diff --git a/runtime/worker.rs b/runtime/worker.rs index 1588896c8..facbe397b 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -101,15 +101,15 @@ impl MainWorker { options.blob_store.clone(), options.bootstrap.location.clone(), ), - deno_fetch::init::<Permissions, deno_fetch::FsFetchHandler>( - options.user_agent.clone(), - options.root_cert_store.clone(), - None, - None, - options.unsafely_ignore_certificate_errors.clone(), - None, - deno_fetch::FsFetchHandler, - ), + deno_fetch::init::<Permissions>(deno_fetch::Options { + user_agent: options.user_agent.clone(), + root_cert_store: options.root_cert_store.clone(), + unsafely_ignore_certificate_errors: options + .unsafely_ignore_certificate_errors + .clone(), + file_fetch_handler: Box::new(deno_fetch::FsFetchHandler), + ..Default::default() + }), deno_websocket::init::<Permissions>( options.user_agent.clone(), options.root_cert_store.clone(), |