refactor(fetch): share response metadata with resource timing

This commit is contained in:
ldm0
2026-11-18 00:10:43 +08:00
committed by Donough Liu
parent 30b179fbf7
commit 0519dba940
15 changed files with 238 additions and 200 deletions
@@ -1,6 +1,6 @@
use super::ResourcePerformanceEntry;
use crate::types::AsyncSubresourceFetchResponseFilter;
use moli_fetch::{RequestMode, ResponseCacheState, ResponseHead};
use moli_fetch::{FetchResponseMetadata, ResponseCacheState, ResponseHead};
use moli_url::WebOrigin;
use url::Url;
@@ -23,17 +23,12 @@ impl FetchResourceTiming {
pub(crate) fn completed(
&self,
url: &Url,
origin: &WebOrigin,
mode: RequestMode,
head: &ResponseHead,
body_size: usize,
filter: Option<&AsyncSubresourceFetchResponseFilter>,
web_security_disabled: bool,
metadata: &FetchResponseMetadata,
delivery: Option<&AsyncSubresourceFetchResponseFilter>,
) -> ResourcePerformanceEntry {
let network_filter =
crate::network_host::network_response_filter(origin, head, mode, web_security_disabled);
let filter = filter.or(network_filter.as_ref());
let readable = filter.is_none_or(|filter| filter.is_readable());
let readable = metadata.response_type.is_readable();
let mut entry = ResourcePerformanceEntry::from_streaming_network_response(
url.as_str(),
"fetch",
@@ -50,12 +45,12 @@ impl FetchResourceTiming {
entry.response_status = 0.0;
entry.content_type.clear();
}
if filter.is_some_and(|filter| filter.service_worker_metadata().is_some()) {
if delivery.is_some_and(|delivery| delivery.service_worker_metadata().is_some()) {
// Bytes delivered by a Service Worker are not a network transfer
// to this global, even when respondWith forwards a fetched body.
entry.transfer_size = 0.0;
}
if !Self::allows_timing(origin, head, filter) {
if !metadata.timing_allow_passed {
entry.transfer_size = 0.0;
entry.encoded_body_size = 0.0;
entry.decoded_body_size = 0.0;
@@ -63,19 +58,6 @@ impl FetchResourceTiming {
entry
}
fn allows_timing(
origin: &WebOrigin,
head: &ResponseHead,
filter: Option<&AsyncSubresourceFetchResponseFilter>,
) -> bool {
filter
.and_then(|filter| filter.service_worker_metadata())
.map_or_else(
|| head.timing_allow_passed(origin),
|metadata| metadata.timing_allow_passed,
)
}
pub(crate) fn failed(&self, url: &Url) -> ResourcePerformanceEntry {
ResourcePerformanceEntry::from_network_failure(
url.as_str(),
@@ -84,3 +66,62 @@ impl FetchResourceTiming {
)
}
}
#[cfg(test)]
mod tests {
use super::*;
use moli_fetch::FetchResponseType::{Basic, Opaque};
#[test]
fn completed_uses_the_response_snapshot_and_keeps_delivery_separate() {
let timing = FetchResourceTiming {
start_unix_millis: 42.0,
initiator_url: "https://page.test/script.js".to_owned(),
};
let url = Url::parse("https://cross.test/body").unwrap();
let head = ResponseHead {
final_url: url.clone(),
status: 200,
status_text: None,
headers: vec![
("Content-Type".into(), b"text/plain".to_vec()),
("Timing-Allow-Origin".into(), b"*".to_vec()),
],
request_cookie_report: None,
cookie_set_reports: Vec::new(),
redirected: false,
redirect_chain: Vec::new(),
from_cache: false,
cache_state: Default::default(),
negotiated_http_version: None,
};
let delivered = AsyncSubresourceFetchResponseFilter::service_worker(Default::default());
for (kind, tao, service_worker, transfer, size, status) in [
(Basic, true, false, 309.0, 9.0, 200.0),
(Opaque, true, false, 309.0, 9.0, 0.0),
(Basic, false, false, 0.0, 0.0, 200.0),
(Opaque, false, false, 0.0, 0.0, 0.0),
(Basic, true, true, 0.0, 9.0, 200.0),
(Opaque, true, true, 0.0, 9.0, 0.0),
(Basic, false, true, 0.0, 0.0, 200.0),
(Opaque, false, true, 0.0, 0.0, 0.0),
] {
let metadata = FetchResponseMetadata {
response_type: kind,
timing_allow_passed: tao,
..Default::default()
};
let entry = timing.completed(
&url,
&head,
9,
&metadata,
service_worker.then_some(&delivered),
);
assert_eq!(entry.transfer_size, transfer);
assert_eq!(entry.encoded_body_size, size);
assert_eq!(entry.decoded_body_size, size);
assert_eq!(entry.response_status, status);
}
}
}
+3 -4
View File
@@ -155,10 +155,9 @@ pub(crate) use self::response::materialize_response_object;
pub(crate) use self::response::{
FetchResponseRequest, FetchResponseSecurityViolation, MaterializedResponseBody,
MaterializedResponseHead, build_fetch_response_object_for_request_mode,
build_fetch_response_object_from_body_source_for_request_mode_with_metadata,
build_fetch_response_object_from_stream_for_request_mode_with_metadata,
build_filtered_cached_response_object,
build_navigation_preload_response_object_from_stream_for_request_mode,
build_fetch_response_object_from_body_source_with_metadata,
build_fetch_response_object_from_stream_with_metadata, build_filtered_cached_response_object,
build_navigation_preload_response_object_from_stream_with_metadata,
cors_preflight_request_headers, filter_cors_exposed_response_headers,
is_cors_policy_failure_message, materialize_response_object_body,
materialize_response_object_body_preserving_error,
@@ -30,10 +30,9 @@ pub(crate) use self::materialize::materialize_response_object;
pub(crate) use self::materialize::{
FetchResponseRequest, MaterializedResponseBody, MaterializedResponseHead,
build_fetch_response_object_for_request_mode,
build_fetch_response_object_from_body_source_for_request_mode_with_metadata,
build_fetch_response_object_from_stream_for_request_mode_with_metadata,
build_filtered_cached_response_object,
build_navigation_preload_response_object_from_stream_for_request_mode,
build_fetch_response_object_from_body_source_with_metadata,
build_fetch_response_object_from_stream_with_metadata, build_filtered_cached_response_object,
build_navigation_preload_response_object_from_stream_with_metadata,
materialize_response_object_body, materialize_response_object_body_preserving_error,
materialize_response_object_body_with_chunk_callback, materialize_response_object_head,
materialize_response_object_head_for_service_worker_respond_with,
@@ -19,10 +19,8 @@ pub(crate) struct FetchResponseRequest<'a> {
pub(crate) mode: RequestMode,
}
impl FetchResponseRequest<'_> {
fn has_null_body(self, status: u16) -> bool {
matches!(self.method, "HEAD" | "CONNECT") || matches!(status, 101 | 103 | 204 | 205 | 304)
}
fn has_null_body(method: &str, status: u16) -> bool {
matches!(method, "HEAD" | "CONNECT") || matches!(status, 101 | 103 | 204 | 205 | 304)
}
#[derive(WebApiObject)]
@@ -112,21 +110,25 @@ pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode<'s>(
body: moli_fetch::ResponseBody,
) -> v8::Local<'s, v8::Object> {
let metadata = head.fetch_metadata(&request_origin.into(), request.mode);
build_fetch_response_object_from_body_source_for_request_mode_with_metadata(
scope, request, head, body, metadata,
build_fetch_response_object_from_body_source_with_metadata(
scope,
request.method,
head,
body,
&metadata,
)
}
pub(crate) fn build_fetch_response_object_from_body_source_for_request_mode_with_metadata<'s>(
pub(crate) fn build_fetch_response_object_from_body_source_with_metadata<'s>(
scope: &mut v8::PinScope<'s, '_>,
request: FetchResponseRequest<'_>,
method: &str,
head: moli_fetch::ResponseHead,
body: moli_fetch::ResponseBody,
metadata: FetchResponseMetadata,
metadata: &FetchResponseMetadata,
) -> v8::Local<'s, v8::Object> {
let filter = metadata.response_type;
let obj = build_fetch_response_object_head(scope, &head, &metadata, None);
let body_stream = if request.has_null_body(head.status) {
let obj = build_fetch_response_object_head(scope, &head, metadata, None);
let body_stream = if has_null_body(method, head.status) {
None
} else if filtered_response_exposes_body(filter) {
network_body_stream_from_response_body(scope, obj, body)
@@ -146,25 +148,25 @@ pub(crate) fn build_fetch_response_object_from_stream_for_request_mode<'s>(
body_source_id: NetworkBodySourceId,
) -> v8::Local<'s, v8::Object> {
let metadata = head.fetch_metadata(&request_origin.into(), request.mode);
build_fetch_response_object_from_stream_for_request_mode_with_metadata(
build_fetch_response_object_from_stream_with_metadata(
scope,
request,
request.method,
head,
body_source_id,
metadata,
&metadata,
)
}
pub(crate) fn build_fetch_response_object_from_stream_for_request_mode_with_metadata<'s>(
pub(crate) fn build_fetch_response_object_from_stream_with_metadata<'s>(
scope: &mut v8::PinScope<'s, '_>,
request: FetchResponseRequest<'_>,
method: &str,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
metadata: FetchResponseMetadata,
metadata: &FetchResponseMetadata,
) -> v8::Local<'s, v8::Object> {
build_fetch_response_object_from_stream_for_request_mode_with_surface_url(
build_fetch_response_object_from_stream_with_surface_url(
scope,
request,
method,
head,
body_source_id,
None,
@@ -172,17 +174,17 @@ pub(crate) fn build_fetch_response_object_from_stream_for_request_mode_with_meta
)
}
pub(crate) fn build_navigation_preload_response_object_from_stream_for_request_mode<'s>(
pub(crate) fn build_navigation_preload_response_object_from_stream_with_metadata<'s>(
scope: &mut v8::PinScope<'s, '_>,
request_url: &url::Url,
request: FetchResponseRequest<'_>,
method: &str,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
metadata: FetchResponseMetadata,
metadata: &FetchResponseMetadata,
) -> v8::Local<'s, v8::Object> {
build_fetch_response_object_from_stream_for_request_mode_with_surface_url(
build_fetch_response_object_from_stream_with_surface_url(
scope,
request,
method,
head,
body_source_id,
Some(request_url.as_str()),
@@ -190,20 +192,20 @@ pub(crate) fn build_navigation_preload_response_object_from_stream_for_request_m
)
}
fn build_fetch_response_object_from_stream_for_request_mode_with_surface_url<'s>(
fn build_fetch_response_object_from_stream_with_surface_url<'s>(
scope: &mut v8::PinScope<'s, '_>,
request: FetchResponseRequest<'_>,
method: &str,
head: moli_fetch::ResponseHead,
body_source_id: NetworkBodySourceId,
filtered_surface_url: Option<&str>,
metadata: FetchResponseMetadata,
metadata: &FetchResponseMetadata,
) -> v8::Local<'s, v8::Object> {
let filter = metadata.response_type;
let filtered_surface_url = (filter == FetchResponseFilter::OpaqueRedirect)
.then_some(filtered_surface_url)
.flatten();
let obj = build_fetch_response_object_head(scope, &head, &metadata, filtered_surface_url);
if request.has_null_body(head.status) {
let obj = build_fetch_response_object_head(scope, &head, metadata, filtered_surface_url);
if has_null_body(method, head.status) {
// Fetch nulls the internal body, including for filtered responses. Do
// not register a body source: subsequent transport chunks and terminal
// events then have no stream to enqueue into or retain bytes for.
@@ -739,26 +739,28 @@ impl ScriptVm {
trace_fields,
record_started,
);
if let PendingSubresourceContinuation::Fetch(fetch) = &pending.continuation {
let entry = if opaque_response_blocked {
// ORB removes the original headers and body measurements;
// its TAO header cannot re-enable those measurements.
fetch.resource_timing().failed(fetch.initial_request_url(&pending.info.url))
} else {
fetch.resource_timing().completed(
fetch.initial_request_url(&pending.info.url), &pending.request_origin, pending.request_mode,
&response.head(), response.body_bytes().len(), response_filter.as_ref(),
pending.load.request_client().web_security_disabled(),)
};
crate::context_bootstrap::record_resource_performance_entry(scope, entry);
}
let response_head = response.head();
let mut metadata = crate::network_host::fetch_response_metadata(
&pending.request_origin, &response.head(), pending.request_mode, response_filter.as_ref(),
pending.load.request_client().web_security_disabled(),);
&pending.request_origin,
&response_head,
pending.request_mode,
response_filter.as_ref(),
pending.load.request_client().web_security_disabled(),
);
if opaque_response_blocked {
metadata.response_type = crate::types::FetchResponseType::Opaque;
metadata.timing_allow_passed = false;
}
if let PendingSubresourceContinuation::Fetch(fetch) = &pending.continuation {
let entry = fetch.resource_timing().completed(
fetch.initial_request_url(&pending.info.url),
&response_head,
response.body_bytes().len(),
&metadata,
response_filter.as_ref(),
);
crate::context_bootstrap::record_resource_performance_entry(scope, entry);
}
let mut observable_response = response;
if matches!(
pending.info.resource_type,
@@ -787,15 +789,12 @@ impl ScriptVm {
body
};
let response_obj =
crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_metadata(
crate::network_host::build_fetch_response_object_from_body_source_with_metadata(
scope,
crate::network_host::FetchResponseRequest {
method: &response_request_method,
mode: pending.request_mode,
},
&response_request_method,
head,
body,
metadata,
&metadata,
);
if let Some(status_text) = response_status_text.as_deref() {
crate::network_host::set_response_slot_string(
@@ -1052,23 +1052,27 @@ impl ScriptVm {
let mut event_source_parser = None;
let mut event_source_to_open = None;
match &pending.continuation {
match &mut pending.continuation {
PendingSubresourceContinuation::Fetch(fetch) => {
let resolver = fetch
.resolver()
.expect("detached keepalive stream is handled before V8 entry");
let resolver = v8::Local::new(scope, resolver);
let response_obj = crate::network_host::build_fetch_response_object_from_stream_for_request_mode_with_metadata(
let metadata = fetch.response_metadata.insert(
crate::network_host::fetch_response_metadata(
&pending.request_origin,
&started.head,
pending.request_mode,
started.response_filter.as_ref(),
pending.load.request_client().web_security_disabled(),
),
);
let response_obj = crate::network_host::build_fetch_response_object_from_stream_with_metadata(
scope,
crate::network_host::FetchResponseRequest {
method: &started.request_method,
mode: pending.request_mode,
},
&started.request_method,
observable_head,
started.body_source_id,
crate::network_host::fetch_response_metadata(
&pending.request_origin, &started.head, pending.request_mode, started.response_filter.as_ref(),
pending.load.request_client().web_security_disabled(),),
metadata,
);
resolver.resolve(scope, response_obj.into());
}
@@ -1111,7 +1115,7 @@ impl ScriptVm {
PendingTextTrackLoadTerminal::FetchFailed,
),
PendingSubresourceContinuation::FontFace(face) => {
let face = v8::Local::new(scope, face);
let face = v8::Local::new(scope, &*face);
crate::context_bootstrap::finish_font_face_url_load(scope, face, None);
}
PendingSubresourceContinuation::StylesheetSubresource { binding, .. } => {
@@ -1145,7 +1149,7 @@ impl ScriptVm {
),
);
}
let event_source = v8::Local::new(scope, event_source);
let event_source = v8::Local::new(scope, &*event_source);
let last_event_id =
crate::network_host::event_source_last_event_id(scope, event_source);
let reconnect_delay_ms =
@@ -1884,12 +1888,11 @@ impl ScriptVm {
scope,
fetch.resource_timing().completed(
fetch.initial_request_url(&streaming.pending.info.url),
&streaming.pending.request_origin,
streaming.pending.request_mode,
&streaming.head,
response_body_size,
fetch.response_metadata.as_ref().expect("Fetch stream has response metadata"),
streaming.response_filter.as_ref(),
streaming.pending.load.request_client().web_security_disabled(),),
),
);
}
if let PendingSubresourceContinuation::Xhr { xhr, initiator_url, .. } =
@@ -2875,32 +2875,40 @@ fn install_streaming_fetch_response_fixture(
let document_url =
Url::parse("https://streaming-fetch-body-cancel.test/").expect("URL should parse");
let resolver = v8::PromiseResolver::new(scope).expect("resolver should be created");
let head = moli_fetch::ResponseHead {
final_url: request_url.clone(),
status: 200,
status_text: None,
headers: vec![("content-type".to_owned(), b"text/plain".to_vec())],
request_cookie_report: None,
cookie_set_reports: Vec::new(),
redirected: false,
redirect_chain: Vec::new(),
from_cache: false,
cache_state: Default::default(),
negotiated_http_version: None,
};
let request_origin = moli_url::WebOrigin::from_url(&document_url);
let metadata = head.fetch_metadata_with_web_security(
&request_origin,
moli_fetch::RequestMode::Cors,
load_client.web_security_disabled(),
);
let response =
crate::network_host::build_fetch_response_object_from_stream_for_request_mode(
crate::network_host::build_fetch_response_object_from_stream_with_metadata(
scope,
&document_url,
crate::network_host::FetchResponseRequest {
method: "GET",
mode: moli_fetch::RequestMode::Cors,
},
moli_fetch::ResponseHead {
final_url: request_url.clone(),
status: 200,
status_text: None,
headers: vec![("content-type".to_owned(), b"text/plain".to_vec())],
request_cookie_report: None,
cookie_set_reports: Vec::new(),
redirected: false,
redirect_chain: Vec::new(),
from_cache: false,
cache_state: Default::default(),
negotiated_http_version: None,
},
"GET",
head.clone(),
body_source_id,
&metadata,
);
let global = context.global(scope);
let _ = global.set(scope, v8str(scope, global_name).into(), response.into());
let continuation = pending_fetch_continuation(scope, resolver, &context_host.borrow());
let mut continuation =
pending_fetch_continuation(scope, resolver, &context_host.borrow());
if let super::PendingSubresourceContinuation::Fetch(fetch) = &mut continuation {
fetch.response_metadata = Some(metadata);
}
context_host
.borrow_mut()
@@ -2909,7 +2917,7 @@ fn install_streaming_fetch_response_fixture(
pending: super::PendingSubresourceFetchState {
dispatch: None,
redirect_headers: None,
request_origin: moli_url::WebOrigin::from_url(&document_url),
request_origin,
info: crate::types::PendingSubresourceFetchInfo {
internal_id,
network_request_handle,
@@ -2945,19 +2953,7 @@ fn install_streaming_fetch_response_fixture(
request_headers: Vec::new().into(),
request_body: None,
body_source_id,
head: moli_fetch::ResponseHead {
final_url: request_url,
status: 200,
status_text: None,
headers: vec![("content-type".to_owned(), b"text/plain".to_vec())],
request_cookie_report: None,
cookie_set_reports: Vec::new(),
redirected: false,
redirect_chain: Vec::new(),
from_cache: false,
cache_state: Default::default(),
negotiated_http_version: None,
},
head,
network_request_headers: None,
body_capture: crate::types::StreamingSubresourceBody::new(None, None),
event_source_parser: None,
+25 -14
View File
@@ -358,7 +358,7 @@ fn register_pending_window_fetch_for_test(
);
if !matches!(stage, PendingWindowFetchTestStage::Pending) {
let pending = host
let mut pending = host
.take_pending_subresource_fetch(internal_id)
.expect("test Fetch should move from pending into its requested stage");
match stage {
@@ -377,6 +377,29 @@ fn register_pending_window_fetch_for_test(
});
}
PendingWindowFetchTestStage::Streaming => {
let head = moli_fetch::ResponseHead {
status_text: None,
final_url: url.clone(),
status: 200,
headers: Vec::new(),
request_cookie_report: None,
cookie_set_reports: Vec::new(),
redirected: false,
redirect_chain: Vec::new(),
from_cache: false,
cache_state: Default::default(),
negotiated_http_version: None,
};
let metadata = head.fetch_metadata_with_web_security(
&pending.request_origin,
pending.request_mode,
pending.load.request_client().web_security_disabled(),
);
if let crate::types::PendingSubresourceContinuation::Fetch(fetch) =
&mut pending.continuation
{
fetch.response_metadata = Some(metadata);
}
host.record_streaming_subresource_fetch(
crate::types::StreamingSubresourceFetchState {
response_filter: None,
@@ -386,19 +409,7 @@ fn register_pending_window_fetch_for_test(
request_headers: Vec::new().into(),
request_body: None,
body_source_id: 10_000 + internal_id,
head: moli_fetch::ResponseHead {
status_text: None,
final_url: url.clone(),
status: 200,
headers: Vec::new(),
request_cookie_report: None,
cookie_set_reports: Vec::new(),
redirected: false,
redirect_chain: Vec::new(),
from_cache: false,
cache_state: Default::default(),
negotiated_http_version: None,
},
head,
network_request_headers: None,
body_capture: crate::types::StreamingSubresourceBody::new(None, None),
event_source_parser: None,
@@ -1040,9 +1040,9 @@ async fn filtered_response_materialization_preserves_urls_across_clone_and_cache
let scope = &mut scope.init();
let context = unsafe { v8::Local::new(scope, &*context_ptr) };
let scope = &mut v8::ContextScope::new(scope, context);
let response = crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_metadata(
let response = crate::network_host::build_fetch_response_object_from_body_source_with_metadata(
scope,
crate::network_host::FetchResponseRequest { method: "GET", mode: moli_fetch::RequestMode::Cors },
"GET",
moli_fetch::ResponseHead {
final_url: final_url.clone(),
status: 302,
@@ -1057,7 +1057,7 @@ async fn filtered_response_materialization_preserves_urls_across_clone_and_cache
negotiated_http_version: None,
},
moli_fetch::ResponseBody::materialized_bytes(Vec::new()),
moli_fetch_types::FetchResponseMetadata { response_type: filter, url_list: vec![final_url.clone()], timing_allow_passed: false, redirected: false },
&moli_fetch_types::FetchResponseMetadata { response_type: filter, url_list: vec![final_url.clone()], timing_allow_passed: false, redirected: false },
);
let global = context.global(scope);
let _ = global.set(
@@ -1553,16 +1553,16 @@ fn fetched_null_bodies_discard_payloads_without_registering_pending_streams() {
scope, &document_url, request,
moli_fetch::Response::from_head_and_text_body(head, "discard me".to_owned()),
),
"bytes" => crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_metadata(
scope, request, head,
"bytes" => crate::network_host::build_fetch_response_object_from_body_source_with_metadata(
scope, request.method, head,
moli_fetch::ResponseBody::materialized_bytes(b"discard me".to_vec()),
metadata,
&metadata,
),
"stream" => crate::network_host::build_fetch_response_object_from_stream_for_request_mode(
scope, &document_url, request, head, id,
),
"preload" => crate::network_host::build_navigation_preload_response_object_from_stream_for_request_mode(
scope, &document_url, request, head, id, metadata,
"preload" => crate::network_host::build_navigation_preload_response_object_from_stream_with_metadata(
scope, &document_url, request.method, head, id, &metadata,
),
_ => unreachable!(),
};
@@ -663,7 +663,6 @@ pub(crate) struct ServiceWorkerNavigationPreloadResponseStarted {
pub(crate) owner: ServiceWorkerRunOwner,
pub(crate) request_url: Url,
pub(crate) request_method: String,
pub(crate) request_mode: moli_fetch::RequestMode,
pub(crate) body_source_id: NetworkBodySourceId,
pub(crate) response_head: MaterializedServiceWorkerFetchResponseHead,
}
@@ -20,7 +20,6 @@ struct ServiceWorkerNavigationPreloadDispatch {
owner: ServiceWorkerRunOwner,
request_url: url::Url,
request_method: String,
request_mode: moli_fetch::RequestMode,
request_client: ResourceRequestClient,
resource_task_runner: crate::network::RendererResourceTaskRunner,
cancel_handle: moli_fetch::FetchCancelHandle,
@@ -124,7 +123,6 @@ async fn stream_navigation_preload_response(
owner: dispatch.owner.clone(),
request_url: dispatch.request_url,
request_method: dispatch.request_method,
request_mode: dispatch.request_mode,
body_source_id,
response_head,
}) {
@@ -1459,7 +1457,6 @@ impl ServiceWorkerRuntimeService {
}
let request_url = job.request.url.clone();
let request_mode = job.request.request_mode;
let request_method = job.request.method.clone();
let request_client = job.request_client.clone();
let resource_task_runner = job.resource_task_runner.clone();
@@ -1480,7 +1477,6 @@ impl ServiceWorkerRuntimeService {
owner: event.owner.clone(),
request_url,
request_method,
request_mode,
request_client,
resource_task_runner,
cancel_handle,
+2
View File
@@ -214,6 +214,7 @@ impl PendingSubresourceContinuation {
pub(super) struct PendingWindowFetchContinuation {
pub(super) intercepted_request: Option<Box<moli_fetch::Request>>,
pub(super) response_metadata: Option<moli_fetch_types::FetchResponseMetadata>,
promise: PendingWindowFetchPromise,
resource_timing: crate::context_bootstrap::FetchResourceTiming,
keepalive: bool,
@@ -238,6 +239,7 @@ impl PendingWindowFetchContinuation {
) -> Self {
Self {
intercepted_request: None,
response_metadata: None,
promise: PendingWindowFetchPromise::Active(resolver),
resource_timing,
keepalive,
@@ -1161,7 +1161,6 @@ pub(in crate::worker) fn start_worker_streaming_fetch(
pending.request_mode,
pending.load.request_client().web_security_disabled(),
),
pending.request_mode,
pending.request_method.clone(),
observable_head,
))
@@ -1181,19 +1180,15 @@ pub(in crate::worker) fn start_worker_streaming_fetch(
}
return;
}
if let Some((resolver, metadata, request_mode, request_method, observable_head)) =
response_input
{
let response_obj = crate::network_host::build_fetch_response_object_from_stream_for_request_mode_with_metadata(
scope,
crate::network_host::FetchResponseRequest {
method: &request_method,
mode: request_mode,
},
observable_head,
started.body_source_id,
metadata,
);
if let Some((resolver, metadata, request_method, observable_head)) = response_input {
let response_obj =
crate::network_host::build_fetch_response_object_from_stream_with_metadata(
scope,
&request_method,
observable_head,
started.body_source_id,
&metadata,
);
let resolver = v8::Local::new(scope, &resolver);
let _ = resolver.resolve(scope, response_obj.into());
}
@@ -1221,12 +1216,14 @@ pub(in crate::worker) fn finish_worker_streaming_fetch(
scope,
pending.resource_timing.completed(
&pending.request_url,
&request_origin,
pending.request_mode,
&head,
body.len(),
&head.fetch_metadata_with_web_security(
&request_origin,
pending.request_mode,
web_security_disabled,
),
None,
web_security_disabled,
),
);
close_pending_network_body_stream(scope, finished.body_source_id);
@@ -1311,20 +1308,6 @@ pub(in crate::worker) fn drain_worker_fetch_completion_result(
}
};
let entry = if opaque_response_blocked {
pending.resource_timing.failed(&pending.request_url)
} else {
pending.resource_timing.completed(
&pending.request_url,
&request_origin,
pending.request_mode,
&response_head,
response.subresource_response_body().len(),
response_filter.as_ref(),
web_security_disabled,
)
};
crate::context_bootstrap::record_resource_performance_entry(scope, entry);
let mut metadata = crate::network_host::fetch_response_metadata(
&request_origin,
&response_head,
@@ -1336,6 +1319,14 @@ pub(in crate::worker) fn drain_worker_fetch_completion_result(
metadata.response_type = crate::types::FetchResponseType::Opaque;
metadata.timing_allow_passed = false;
}
let entry = pending.resource_timing.completed(
&pending.request_url,
&response_head,
response.subresource_response_body().len(),
&metadata,
response_filter.as_ref(),
);
crate::context_bootstrap::record_resource_performance_entry(scope, entry);
let filtered_headers = if response_filter
.as_ref()
.is_some_and(|filter| filter.is_readable())
@@ -1356,7 +1347,14 @@ pub(in crate::worker) fn drain_worker_fetch_completion_result(
} else {
body
};
let response_obj = crate::network_host::build_fetch_response_object_from_body_source_for_request_mode_with_metadata(scope,crate::network_host::FetchResponseRequest {method:&pending.request_method,mode:pending.request_mode},head,body,metadata);
let response_obj =
crate::network_host::build_fetch_response_object_from_body_source_with_metadata(
scope,
&pending.request_method,
head,
body,
&metadata,
);
let _ = resolver.resolve(scope, response_obj.into());
}
Err(message) => {
@@ -19,7 +19,7 @@ use crate::context_bootstrap::{
use crate::exception_reporting::{V8ExceptionReport, log_unhandled_promise_rejection};
use crate::network_host::{
MaterializedResponseBody, MaterializedResponseHead,
build_navigation_preload_response_object_from_stream_for_request_mode,
build_navigation_preload_response_object_from_stream_with_metadata,
build_service_worker_request_object, close_pending_network_body_stream,
enqueue_pending_network_body_chunk, error_pending_network_body_stream_with_reason,
materialize_response_object_body, materialize_response_object_body_with_chunk_callback,
@@ -2803,16 +2803,13 @@ fn start_service_worker_navigation_preload_response_in_context(
cache_state: Default::default(),
negotiated_http_version: None,
};
let response_object = build_navigation_preload_response_object_from_stream_for_request_mode(
let response_object = build_navigation_preload_response_object_from_stream_with_metadata(
scope,
&started.request_url,
crate::network_host::FetchResponseRequest {
method: &started.request_method,
mode: started.request_mode,
},
&started.request_method,
head,
started.body_source_id,
started.response_head.metadata,
&started.response_head.metadata,
);
let resolver = v8::Local::new(scope, resolver);
let _ = resolver.resolve(scope, response_object.into());
@@ -795,7 +795,6 @@ async fn service_worker_fetch_event_preload_response_resolves_network_response()
),
request_url,
request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: moli_fetch_types::FetchResponseHead {
metadata: moli_fetch_types::FetchResponseMetadata {
@@ -916,7 +915,6 @@ async fn service_worker_fetch_event_preload_response_opaqueredirect_exposes_requ
),
request_url: request_url.clone(),
request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: moli_fetch_types::FetchResponseHead {
metadata: moli_fetch_types::FetchResponseMetadata {
@@ -1091,7 +1089,6 @@ async fn service_worker_fetch_event_preload_response_body_errors_after_response(
),
request_url,
request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: moli_fetch_types::FetchResponseHead {
metadata: moli_fetch_types::FetchResponseMetadata {
@@ -1211,7 +1208,6 @@ async fn service_worker_fetch_event_preload_response_body_completes_after_fetch_
),
request_url,
request_method: "GET".to_owned(),
request_mode: moli_fetch::RequestMode::Navigate,
body_source_id,
response_head: moli_fetch_types::FetchResponseHead {
metadata: moli_fetch_types::FetchResponseMetadata {