From e84e1d607bd158dde576d2def8ebadfdd63630e1 Mon Sep 17 00:00:00 2001 From: ms2300 Date: Sun, 23 Sep 2018 21:12:51 -0700 Subject: Initial implementation of asynchronous blob url fetching --- components/net/blob_loader.rs | 87 ++++++------------------------------------- 1 file changed, 12 insertions(+), 75 deletions(-) (limited to 'components/net/blob_loader.rs') diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs index e6d64acc16e..50c5455808d 100644 --- a/components/net/blob_loader.rs +++ b/components/net/blob_loader.rs @@ -3,6 +3,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::filemanager_thread::FileManager; +use fetch::methods::DoneChannel; use headers_core::HeaderMapExt; use headers_ext::{ContentLength, ContentType}; use http::header::{self, HeaderValue}; @@ -11,18 +12,21 @@ use ipc_channel::ipc; use mime::{self, Mime}; use net_traits::blob_url_store::parse_blob_url; use net_traits::filemanager_thread::ReadFileProgress; +use net_traits::response::{Response, ResponseBody}; use net_traits::{http_percent_encode, NetworkError}; use servo_url::ServoUrl; +use std::sync::mpsc::channel; // TODO: Check on GET // https://w3c.github.io/FileAPI/#requestResponseModel /// https://fetch.spec.whatwg.org/#concept-basic-fetch (partial) -// TODO: make async. -pub fn load_blob_sync( +pub fn load_blob_async( url: ServoUrl, filemanager: FileManager, -) -> Result<(HeaderMap, Vec), NetworkError> { + response: &Response, + done_chan: &mut DoneChannel +) -> Result<(), NetworkError> { let (id, origin) = match parse_blob_url(&url) { Ok((id, origin)) => (id, origin), Err(()) => { @@ -31,78 +35,11 @@ pub fn load_blob_sync( }, }; - let (sender, receiver) = ipc::channel().unwrap(); + let (sender, receiver) = channel(); + *done_chan = Some((sender.clone(), receiver)); + *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]); let check_url_validity = true; - filemanager.read_file(sender, id, check_url_validity, origin); + filemanager.fetch_file(sender, id, check_url_validity, origin, response); - let blob_buf = match receiver.recv().unwrap() { - Ok(ReadFileProgress::Meta(blob_buf)) => blob_buf, - Ok(_) => { - return Err(NetworkError::Internal( - "Invalid filemanager reply".to_string(), - )); - }, - Err(e) => { - return Err(NetworkError::Internal(format!("{:?}", e))); - }, - }; - - let content_type: Mime = blob_buf.type_string.parse().unwrap_or(mime::TEXT_PLAIN); - let charset = content_type.get_param(mime::CHARSET); - - let mut headers = HeaderMap::new(); - - if let Some(name) = blob_buf.filename { - let charset = charset - .map(|c| c.as_ref().into()) - .unwrap_or("us-ascii".to_owned()); - // TODO(eijebong): Replace this once the typed header is there - headers.insert( - header::CONTENT_DISPOSITION, - HeaderValue::from_bytes( - format!( - "inline; {}", - if charset.to_lowercase() == "utf-8" { - format!( - "filename=\"{}\"", - String::from_utf8(name.as_bytes().into()).unwrap() - ) - } else { - format!( - "filename*=\"{}\"''{}", - charset, - http_percent_encode(name.as_bytes()) - ) - } - ) - .as_bytes(), - ) - .unwrap(), - ); - } - - // Basic fetch, Step 4. - headers.typed_insert(ContentLength(blob_buf.size as u64)); - // Basic fetch, Step 5. - headers.typed_insert(ContentType::from(content_type.clone())); - - let mut bytes = blob_buf.bytes; - loop { - match receiver.recv().unwrap() { - Ok(ReadFileProgress::Partial(ref mut new_bytes)) => { - bytes.append(new_bytes); - }, - Ok(ReadFileProgress::EOF) => { - return Ok((headers, bytes)); - }, - Ok(_) => { - return Err(NetworkError::Internal( - "Invalid filemanager reply".to_string(), - )); - }, - Err(e) => { - return Err(NetworkError::Internal(format!("{:?}", e))); - }, - } - } + Ok(()) } -- cgit v1.2.3 From 2f3affcfc870c8fc45b7bbe56a59d6bca2eed880 Mon Sep 17 00:00:00 2001 From: ms2300 Date: Tue, 25 Sep 2018 14:24:43 -0700 Subject: Blob url's changes now build and test --- components/net/blob_loader.rs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'components/net/blob_loader.rs') diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs index 50c5455808d..64d918224a6 100644 --- a/components/net/blob_loader.rs +++ b/components/net/blob_loader.rs @@ -13,9 +13,9 @@ use mime::{self, Mime}; use net_traits::blob_url_store::parse_blob_url; use net_traits::filemanager_thread::ReadFileProgress; use net_traits::response::{Response, ResponseBody}; -use net_traits::{http_percent_encode, NetworkError}; +use net_traits::{http_percent_encode, NetworkError, ResourceFetchTiming}; use servo_url::ServoUrl; -use std::sync::mpsc::channel; +use servo_channel::channel; // TODO: Check on GET // https://w3c.github.io/FileAPI/#requestResponseModel @@ -24,22 +24,21 @@ use std::sync::mpsc::channel; pub fn load_blob_async( url: ServoUrl, filemanager: FileManager, - response: &Response, done_chan: &mut DoneChannel -) -> Result<(), NetworkError> { +)-> Response { let (id, origin) = match parse_blob_url(&url) { Ok((id, origin)) => (id, origin), Err(()) => { - let e = format!("Invalid blob URL format {:?}", url); - return Err(NetworkError::Internal(e)); - }, + return Response::network_error(NetworkError::Internal("Invalid blob url".into())); + } }; + let mut response = Response::new(url, ResourceFetchTiming::new(request.timing_type())); let (sender, receiver) = channel(); *done_chan = Some((sender.clone(), receiver)); *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]); let check_url_validity = true; - filemanager.fetch_file(sender, id, check_url_validity, origin, response); + filemanager.fetch_file(sender, id, check_url_validity, origin, &mut response); - Ok(()) + response } -- cgit v1.2.3 From 8538634210988adabd5d75c8ff28cabd59a06baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Wed, 7 Nov 2018 15:00:49 +0100 Subject: Finish asynchronous blob url fetching --- components/net/blob_loader.rs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'components/net/blob_loader.rs') diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs index 64d918224a6..ae8f09879a4 100644 --- a/components/net/blob_loader.rs +++ b/components/net/blob_loader.rs @@ -2,20 +2,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +use crate::fetch::methods::{Data, DoneChannel}; use crate::filemanager_thread::FileManager; -use fetch::methods::DoneChannel; -use headers_core::HeaderMapExt; -use headers_ext::{ContentLength, ContentType}; -use http::header::{self, HeaderValue}; -use http::HeaderMap; -use ipc_channel::ipc; -use mime::{self, Mime}; use net_traits::blob_url_store::parse_blob_url; -use net_traits::filemanager_thread::ReadFileProgress; use net_traits::response::{Response, ResponseBody}; -use net_traits::{http_percent_encode, NetworkError, ResourceFetchTiming}; -use servo_url::ServoUrl; +use net_traits::{NetworkError, ResourceFetchTiming}; use servo_channel::channel; +use servo_url::ServoUrl; // TODO: Check on GET // https://w3c.github.io/FileAPI/#requestResponseModel @@ -24,13 +17,13 @@ use servo_channel::channel; pub fn load_blob_async( url: ServoUrl, filemanager: FileManager, - done_chan: &mut DoneChannel -)-> Response { + done_chan: &mut DoneChannel, +) -> Response { let (id, origin) = match parse_blob_url(&url) { Ok((id, origin)) => (id, origin), Err(()) => { return Response::network_error(NetworkError::Internal("Invalid blob url".into())); - } + }, }; let mut response = Response::new(url, ResourceFetchTiming::new(request.timing_type())); @@ -38,7 +31,11 @@ pub fn load_blob_async( *done_chan = Some((sender.clone(), receiver)); *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]); let check_url_validity = true; - filemanager.fetch_file(sender, id, check_url_validity, origin, &mut response); + if let Err(err) = filemanager.fetch_file(&sender, id, check_url_validity, origin, &mut response) + { + let _ = sender.send(Data::Done); + return Response::network_error(NetworkError::Internal(err)); + }; response } -- cgit v1.2.3 From a84442864d64242903a2b55c170b7f889ab4ab32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Sat, 10 Nov 2018 11:57:47 +0100 Subject: Add support fo byte range requests for blob URLs --- components/net/blob_loader.rs | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 components/net/blob_loader.rs (limited to 'components/net/blob_loader.rs') diff --git a/components/net/blob_loader.rs b/components/net/blob_loader.rs deleted file mode 100644 index ae8f09879a4..00000000000 --- a/components/net/blob_loader.rs +++ /dev/null @@ -1,41 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ - -use crate::fetch::methods::{Data, DoneChannel}; -use crate::filemanager_thread::FileManager; -use net_traits::blob_url_store::parse_blob_url; -use net_traits::response::{Response, ResponseBody}; -use net_traits::{NetworkError, ResourceFetchTiming}; -use servo_channel::channel; -use servo_url::ServoUrl; - -// TODO: Check on GET -// https://w3c.github.io/FileAPI/#requestResponseModel - -/// https://fetch.spec.whatwg.org/#concept-basic-fetch (partial) -pub fn load_blob_async( - url: ServoUrl, - filemanager: FileManager, - done_chan: &mut DoneChannel, -) -> Response { - let (id, origin) = match parse_blob_url(&url) { - Ok((id, origin)) => (id, origin), - Err(()) => { - return Response::network_error(NetworkError::Internal("Invalid blob url".into())); - }, - }; - - let mut response = Response::new(url, ResourceFetchTiming::new(request.timing_type())); - let (sender, receiver) = channel(); - *done_chan = Some((sender.clone(), receiver)); - *response.body.lock().unwrap() = ResponseBody::Receiving(vec![]); - let check_url_validity = true; - if let Err(err) = filemanager.fetch_file(&sender, id, check_url_validity, origin, &mut response) - { - let _ = sender.send(Data::Done); - return Response::network_error(NetworkError::Internal(err)); - }; - - response -} -- cgit v1.2.3