Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce duplicate response header parsing in browser client #1095

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Reduce duplicate response header parsing in browser client #1095

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
479fb02
Reduce duplicate response header parsing in browser client
parlough Dec 29, 2023
fc286c8
Merge branch 'master' into misc/browser-client-reduce-response-header…
parlough Jan 11, 2024
3d0c56f
Nearby cleanup
parlough Jan 11, 2024
6d20d3d
Merge branch 'master' into misc/browser-client-reduce-response-header…
parlough Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 18 additions & 15 deletions pkgs/http/lib/src/browser_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ class BrowserClient extends BaseClient {
..open(request.method, '${request.url}', true)
..responseType = 'arraybuffer'
..withCredentials = withCredentials;
for (var header in request.headers.entries) {
xhr.setRequestHeader(header.key, header.value);
for (var MapEntry(key: headerName, :value) in request.headers.entries) {
xhr.setRequestHeader(headerName, value);
}

var completer = Completer<StreamedResponse>();

unawaited(xhr.onLoad.first.then((_) {
if (xhr.responseHeaders['content-length'] case final contentLengthHeader
when contentLengthHeader != null &&
!_digitRegex.hasMatch(contentLengthHeader)) {
var responseHeaders = xhr.responseHeaders;
if (responseHeaders['content-length'] case final contentLengthHeader?
when !_digitRegex.hasMatch(contentLengthHeader)) {
completer.completeError(ClientException(
'Invalid content-length header [$contentLengthHeader].',
request.url,
Expand All @@ -82,20 +82,23 @@ class BrowserClient extends BaseClient {
var responseUrl = xhr.responseURL;
var url = responseUrl.isNotEmpty ? Uri.parse(responseUrl) : request.url;
completer.complete(StreamedResponseV2(
ByteStream.fromBytes(body), xhr.status,
contentLength: body.length,
request: request,
url: url,
headers: xhr.responseHeaders,
reasonPhrase: xhr.statusText));
ByteStream.fromBytes(body),
xhr.status,
contentLength: body.length,
request: request,
url: url,
headers: responseHeaders,
reasonPhrase: xhr.statusText,
));
}));

unawaited(xhr.onError.first.then((_) {
// Unfortunately, the underlying XMLHttpRequest API doesn't expose any
// specific information about the error itself.
completer.completeError(
ClientException('XMLHttpRequest error.', request.url),
StackTrace.current);
ClientException('XMLHttpRequest error.', request.url),
StackTrace.current,
);
}));

xhr.send(bytes.toJS);
Expand Down Expand Up @@ -137,8 +140,8 @@ extension on XMLHttpRequest {
}
var key = header.substring(0, splitIdx).toLowerCase();
var value = header.substring(splitIdx + 2);
if (headers.containsKey(key)) {
headers[key] = '${headers[key]}, $value';
if (headers[key] case final existingValue?) {
headers[key] = '$existingValue, $value';
} else {
headers[key] = value;
}
Expand Down