RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 01:18:12 +00:00
Code Issues Activity Actions

LibWeb: Handover the fetch response's internal body data upon completion

Browse source 
These is a normative change to the Fetch spec. See:
9003266
b5a587b
This commit is contained in:
Timothy Flynn 2023-05-26 09:42:26 -04:00 • committed by Andreas Kling
parent 258f3ea952
commit 6406a561ef
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibWeb/Fetch/Fetching/Fetching.cpp
View file

@ -628,20 +628,23 @@ WebIDL::ExceptionOr<void> fetch_response_handover(JS::Realm& realm, Infrastructu
}); });
} }
// 5. If response’s body is null, then run processResponseEndOfBody. // 5. Let internalResponse be response, if response is a network error; otherwise response’s internal response.
if (!response.body().has_value()) { auto internal_response = response.is_network_error() ? JS::NonnullGCPtr { response } : response.unsafe_response();
// 6. If internalResponse’s body is null, then run processResponseEndOfBody.
if (!internal_response->body().has_value()) {
process_response_end_of_body(); process_response_end_of_body();
} }
// 6. Otherwise: // 7. Otherwise:
else { else {
// FIXME: 1. Let transformStream be a new TransformStream. // FIXME: 1. Let transformStream be a new TransformStream.
// FIXME: 2. Let identityTransformAlgorithm be an algorithm which, given chunk, enqueues chunk in transformStream. // FIXME: 2. Let identityTransformAlgorithm be an algorithm which, given chunk, enqueues chunk in transformStream.
// FIXME: 3. Set up transformStream with transformAlgorithm set to identityTransformAlgorithm and flushAlgorithm set // FIXME: 3. Set up transformStream with transformAlgorithm set to identityTransformAlgorithm and flushAlgorithm set
// to processResponseEndOfBody. // to processResponseEndOfBody.
// FIXME: 4. Set response’s body’s stream to the result of response’s body’s stream piped through transformStream. // FIXME: 4. Set internalResponse’s body’s stream to the result of internalResponse’s body’s stream piped through transformStream.
} }
// 7. If fetchParams’s process response consume body is non-null, then: // 8. If fetchParams’s process response consume body is non-null, then:
if (fetch_params.algorithms()->process_response_consume_body().has_value()) { if (fetch_params.algorithms()->process_response_consume_body().has_value()) {
// 1. Let processBody given nullOrBytes be this step: run fetchParams’s process response consume body given // 1. Let processBody given nullOrBytes be this step: run fetchParams’s process response consume body given
// response and nullOrBytes. // response and nullOrBytes.
@ -655,17 +658,17 @@ WebIDL::ExceptionOr<void> fetch_response_handover(JS::Realm& realm, Infrastructu
(*fetch_params.algorithms()->process_response_consume_body())(response, Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag {}); (*fetch_params.algorithms()->process_response_consume_body())(response, Infrastructure::FetchAlgorithms::ConsumeBodyFailureTag {});
}; };
// 3. If response’s body is null, then queue a fetch task to run processBody given null, with fetchParams’s // 3. If internalResponse's body is null, then queue a fetch task to run processBody given null, with
// task destination. // fetchParams’s task destination.
if (!response.body().has_value()) { if (!internal_response->body().has_value()) {
Infrastructure::queue_fetch_task(task_destination, [process_body = move(process_body)]() { Infrastructure::queue_fetch_task(task_destination, [process_body = move(process_body)]() {
process_body({}); process_body({});
}); });
} }
// 4. Otherwise, fully read response’s body given processBody, processBodyError, and fetchParams’s task // 4. Otherwise, fully read internalResponse body given processBody, processBodyError, and fetchParams’s task
// destination. // destination.
else { else {
TRY(response.body()->fully_read(realm, move(process_body), move(process_body_error), fetch_params.task_destination())); TRY(internal_response->body()->fully_read(realm, move(process_body), move(process_body_error), fetch_params.task_destination()));
} }
} }