Skip to content

Commit 8313a4d

Browse files
minoicaran
authored andcommitted
update: dart format xhr_transport.dart and update dart sdk to v3.4.0 in workflows
1 parent d49f9f7 commit 8313a4d

File tree

1 file changed

+30
-14
lines changed

1 file changed

+30
-14
lines changed

lib/src/client/transport/xhr_transport.dart

+30-14
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,14 @@ class XhrTransportStream implements GrpcTransportStream {
4646
@override
4747
StreamSink<List<int>> get outgoingMessages => _outgoingMessages.sink;
4848

49-
XhrTransportStream(this._request, {required ErrorHandler onError, required onDone})
49+
XhrTransportStream(this._request,
50+
{required ErrorHandler onError, required onDone})
5051
: _onError = onError,
5152
_onDone = onDone {
52-
_outgoingMessages.stream
53-
.map(frame)
54-
.listen((data) => _request.send(Int8List.fromList(data).toJS), cancelOnError: true, onError: _onError);
53+
_outgoingMessages.stream.map(frame).listen(
54+
(data) => _request.send(Int8List.fromList(data).toJS),
55+
cancelOnError: true,
56+
onError: _onError);
5557

5658
_request.onReadyStateChange.listen((_) {
5759
if (_incomingProcessor.isClosed) {
@@ -72,7 +74,8 @@ class XhrTransportStream implements GrpcTransportStream {
7274
if (_incomingProcessor.isClosed) {
7375
return;
7476
}
75-
_onError(GrpcError.unavailable('XhrConnection connection-error'), StackTrace.current);
77+
_onError(GrpcError.unavailable('XhrConnection connection-error'),
78+
StackTrace.current);
7679
terminate();
7780
});
7881

@@ -81,20 +84,24 @@ class XhrTransportStream implements GrpcTransportStream {
8184
return;
8285
}
8386
final responseText = _request.responseText;
84-
final bytes = Uint8List.fromList(responseText.substring(_requestBytesRead).codeUnits).buffer;
87+
final bytes = Uint8List.fromList(
88+
responseText.substring(_requestBytesRead).codeUnits)
89+
.buffer;
8590
_requestBytesRead = responseText.length;
8691
_incomingProcessor.add(bytes);
8792
});
8893

8994
_incomingProcessor.stream
9095
.transform(GrpcWebDecoder())
9196
.transform(grpcDecompressor())
92-
.listen(_incomingMessages.add, onError: _onError, onDone: _incomingMessages.close);
97+
.listen(_incomingMessages.add,
98+
onError: _onError, onDone: _incomingMessages.close);
9399
}
94100

95101
bool _validateResponseState() {
96102
try {
97-
validateHttpStatusAndContentType(_request.status, _parseHeaders(_request.getAllResponseHeaders()),
103+
validateHttpStatusAndContentType(
104+
_request.status, _parseHeaders(_request.getAllResponseHeaders()),
98105
rawResponse: _request.responseText);
99106
return true;
100107
} catch (e, st) {
@@ -108,15 +115,20 @@ class XhrTransportStream implements GrpcTransportStream {
108115
if (!_validateResponseState()) {
109116
return;
110117
}
111-
_incomingMessages.add(GrpcMetadata(_parseHeaders(_request.getAllResponseHeaders())));
118+
_incomingMessages
119+
.add(GrpcMetadata(_parseHeaders(_request.getAllResponseHeaders())));
112120
}
113121

114122
void _onRequestDone() {
115123
if (!_headersReceived && !_validateResponseState()) {
116124
return;
117125
}
118126
if (_request.status != 200) {
119-
_onError(GrpcError.unavailable('Request failed with status: ${_request.status}', null, _request.responseText),
127+
_onError(
128+
GrpcError.unavailable(
129+
'Request failed with status: ${_request.status}',
130+
null,
131+
_request.responseText),
120132
StackTrace.current);
121133
return;
122134
}
@@ -162,7 +174,8 @@ class XhrClientConnection implements ClientConnection {
162174
@override
163175
String get scheme => uri.scheme;
164176

165-
void _initializeRequest(XMLHttpRequest request, Map<String, String> metadata) {
177+
void _initializeRequest(
178+
XMLHttpRequest request, Map<String, String> metadata) {
166179
metadata.forEach((key, value) {
167180
request.setRequestHeader(key, value);
168181
});
@@ -175,7 +188,8 @@ class XhrClientConnection implements ClientConnection {
175188
XMLHttpRequest createHttpRequest() => XMLHttpRequest();
176189

177190
@override
178-
GrpcTransportStream makeRequest(String path, Duration? timeout, Map<String, String> metadata, ErrorHandler onError,
191+
GrpcTransportStream makeRequest(String path, Duration? timeout,
192+
Map<String, String> metadata, ErrorHandler onError,
179193
{CallOptions? callOptions}) {
180194
// gRPC-web headers.
181195
if (_getContentTypeHeader(metadata) == null) {
@@ -185,7 +199,8 @@ class XhrClientConnection implements ClientConnection {
185199
}
186200

187201
var requestUri = uri.resolve(path);
188-
if (callOptions is WebCallOptions && callOptions.bypassCorsPreflight == true) {
202+
if (callOptions is WebCallOptions &&
203+
callOptions.bypassCorsPreflight == true) {
189204
requestUri = cors.moveHttpHeadersToQueryParam(metadata, requestUri);
190205
}
191206

@@ -197,7 +212,8 @@ class XhrClientConnection implements ClientConnection {
197212
// Must set headers after calling open().
198213
_initializeRequest(request, metadata);
199214

200-
final transportStream = XhrTransportStream(request, onError: onError, onDone: _removeStream);
215+
final transportStream =
216+
XhrTransportStream(request, onError: onError, onDone: _removeStream);
201217
_requests.add(transportStream);
202218
return transportStream;
203219
}

0 commit comments

Comments
 (0)