foster/denoland-deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-02-01 20:25:12 -05:00
Code Issues Packages 1 Wiki Activity

refactor(ext/fetch): pass opstate in FetchHandler::fetch_file

Browse source
This commit is contained in:
Leo Kettmeir 2021-12-03 14:25:16 +01:00 • committed by GitHub
parent 1947f891db
commit 46794d4e43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/fetch/fs_fetch_handler.rs
View file

@ -10,6 +10,7 @@ use deno_core::futures::FutureExt;
use deno_core::futures::TryFutureExt; use deno_core::futures::TryFutureExt;
use deno_core::url::Url; use deno_core::url::Url;
use deno_core::CancelFuture; use deno_core::CancelFuture;
use deno_core::OpState;
use reqwest::StatusCode; use reqwest::StatusCode;
use std::rc::Rc; use std::rc::Rc;
use tokio_util::io::ReaderStream; use tokio_util::io::ReaderStream;
@ -21,7 +22,8 @@ pub struct FsFetchHandler;
impl FetchHandler for FsFetchHandler { impl FetchHandler for FsFetchHandler {
fn fetch_file( fn fetch_file(
&mut self, &self,
_state: &mut OpState,
url: Url, url: Url,
) -> ( ) -> (
CancelableResponseFuture, CancelableResponseFuture,

13
ext/fetch/lib.rs
View file

@ -67,7 +67,7 @@ pub struct Options {
pub request_builder_hook: Option<fn(RequestBuilder) -> RequestBuilder>, pub request_builder_hook: Option<fn(RequestBuilder) -> RequestBuilder>,
pub unsafely_ignore_certificate_errors: Option<Vec<String>>, pub unsafely_ignore_certificate_errors: Option<Vec<String>>,
pub client_cert_chain_and_key: Option<(String, String)>, pub client_cert_chain_and_key: Option<(String, String)>,
pub file_fetch_handler: Box<dyn FetchHandler>, pub file_fetch_handler: Rc<dyn FetchHandler>,
} }
impl Default for Options { impl Default for Options {
@ -79,7 +79,7 @@ impl Default for Options {
request_builder_hook: None, request_builder_hook: None,
unsafely_ignore_certificate_errors: None, unsafely_ignore_certificate_errors: None,
client_cert_chain_and_key: None, client_cert_chain_and_key: None,
file_fetch_handler: Box::new(DefaultFileFetchHandler), file_fetch_handler: Rc::new(DefaultFileFetchHandler),
} }
} }
} }
@ -134,7 +134,8 @@ pub trait FetchHandler: dyn_clone::DynClone {
// cancelable response result, the optional fetch body resource and the // cancelable response result, the optional fetch body resource and the
// optional cancel handle. // optional cancel handle.
fn fetch_file( fn fetch_file(
&mut self, &self,
state: &mut OpState,
url: Url, url: Url,
) -> ( ) -> (
CancelableResponseFuture, CancelableResponseFuture,
@ -151,7 +152,8 @@ pub struct DefaultFileFetchHandler;
impl FetchHandler for DefaultFileFetchHandler { impl FetchHandler for DefaultFileFetchHandler {
fn fetch_file( fn fetch_file(
&mut self, &self,
_state: &mut OpState,
_url: Url, _url: Url,
) -> ( ) -> (
CancelableResponseFuture, CancelableResponseFuture,
@ -234,8 +236,9 @@ where
let Options { let Options {
file_fetch_handler, .. file_fetch_handler, ..
} = state.borrow_mut::<Options>(); } = state.borrow_mut::<Options>();
let file_fetch_handler = file_fetch_handler.clone();
let (request, maybe_request_body, maybe_cancel_handle) = let (request, maybe_request_body, maybe_cancel_handle) =
file_fetch_handler.fetch_file(url); file_fetch_handler.fetch_file(state, url);
let request_rid = state.resource_table.add(FetchRequestResource(request)); let request_rid = state.resource_table.add(FetchRequestResource(request));
let maybe_request_body_rid = let maybe_request_body_rid =
maybe_request_body.map(|r| state.resource_table.add(r)); maybe_request_body.map(|r| state.resource_table.add(r));

2
runtime/web_worker.rs
View file

@ -371,7 +371,7 @@ impl WebWorker {
unsafely_ignore_certificate_errors: options unsafely_ignore_certificate_errors: options
.unsafely_ignore_certificate_errors .unsafely_ignore_certificate_errors
.clone(), .clone(),
file_fetch_handler: Box::new(deno_fetch::FsFetchHandler), file_fetch_handler: Rc::new(deno_fetch::FsFetchHandler),
..Default::default() ..Default::default()
}), }),
deno_websocket::init::<Permissions>( deno_websocket::init::<Permissions>(

2
runtime/worker.rs
View file

@ -107,7 +107,7 @@ impl MainWorker {
unsafely_ignore_certificate_errors: options unsafely_ignore_certificate_errors: options
.unsafely_ignore_certificate_errors .unsafely_ignore_certificate_errors
.clone(), .clone(),
file_fetch_handler: Box::new(deno_fetch::FsFetchHandler), file_fetch_handler: Rc::new(deno_fetch::FsFetchHandler),
..Default::default() ..Default::default()
}), }),
deno_websocket::init::<Permissions>( deno_websocket::init::<Permissions>(