@@ -46,12 +46,14 @@ class XhrTransportStream implements GrpcTransportStream {
46
46
@override
47
47
StreamSink <List <int >> get outgoingMessages => _outgoingMessages.sink;
48
48
49
- XhrTransportStream (this ._request, {required ErrorHandler onError, required onDone})
49
+ XhrTransportStream (this ._request,
50
+ {required ErrorHandler onError, required onDone})
50
51
: _onError = onError,
51
52
_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);
55
57
56
58
_request.onReadyStateChange.listen ((_) {
57
59
if (_incomingProcessor.isClosed) {
@@ -72,7 +74,8 @@ class XhrTransportStream implements GrpcTransportStream {
72
74
if (_incomingProcessor.isClosed) {
73
75
return ;
74
76
}
75
- _onError (GrpcError .unavailable ('XhrConnection connection-error' ), StackTrace .current);
77
+ _onError (GrpcError .unavailable ('XhrConnection connection-error' ),
78
+ StackTrace .current);
76
79
terminate ();
77
80
});
78
81
@@ -81,20 +84,24 @@ class XhrTransportStream implements GrpcTransportStream {
81
84
return ;
82
85
}
83
86
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;
85
90
_requestBytesRead = responseText.length;
86
91
_incomingProcessor.add (bytes);
87
92
});
88
93
89
94
_incomingProcessor.stream
90
95
.transform (GrpcWebDecoder ())
91
96
.transform (grpcDecompressor ())
92
- .listen (_incomingMessages.add, onError: _onError, onDone: _incomingMessages.close);
97
+ .listen (_incomingMessages.add,
98
+ onError: _onError, onDone: _incomingMessages.close);
93
99
}
94
100
95
101
bool _validateResponseState () {
96
102
try {
97
- validateHttpStatusAndContentType (_request.status, _parseHeaders (_request.getAllResponseHeaders ()),
103
+ validateHttpStatusAndContentType (
104
+ _request.status, _parseHeaders (_request.getAllResponseHeaders ()),
98
105
rawResponse: _request.responseText);
99
106
return true ;
100
107
} catch (e, st) {
@@ -108,15 +115,20 @@ class XhrTransportStream implements GrpcTransportStream {
108
115
if (! _validateResponseState ()) {
109
116
return ;
110
117
}
111
- _incomingMessages.add (GrpcMetadata (_parseHeaders (_request.getAllResponseHeaders ())));
118
+ _incomingMessages
119
+ .add (GrpcMetadata (_parseHeaders (_request.getAllResponseHeaders ())));
112
120
}
113
121
114
122
void _onRequestDone () {
115
123
if (! _headersReceived && ! _validateResponseState ()) {
116
124
return ;
117
125
}
118
126
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),
120
132
StackTrace .current);
121
133
return ;
122
134
}
@@ -162,7 +174,8 @@ class XhrClientConnection implements ClientConnection {
162
174
@override
163
175
String get scheme => uri.scheme;
164
176
165
- void _initializeRequest (XMLHttpRequest request, Map <String , String > metadata) {
177
+ void _initializeRequest (
178
+ XMLHttpRequest request, Map <String , String > metadata) {
166
179
metadata.forEach ((key, value) {
167
180
request.setRequestHeader (key, value);
168
181
});
@@ -175,7 +188,8 @@ class XhrClientConnection implements ClientConnection {
175
188
XMLHttpRequest createHttpRequest () => XMLHttpRequest ();
176
189
177
190
@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,
179
193
{CallOptions ? callOptions}) {
180
194
// gRPC-web headers.
181
195
if (_getContentTypeHeader (metadata) == null ) {
@@ -185,7 +199,8 @@ class XhrClientConnection implements ClientConnection {
185
199
}
186
200
187
201
var requestUri = uri.resolve (path);
188
- if (callOptions is WebCallOptions && callOptions.bypassCorsPreflight == true ) {
202
+ if (callOptions is WebCallOptions &&
203
+ callOptions.bypassCorsPreflight == true ) {
189
204
requestUri = cors.moveHttpHeadersToQueryParam (metadata, requestUri);
190
205
}
191
206
@@ -197,7 +212,8 @@ class XhrClientConnection implements ClientConnection {
197
212
// Must set headers after calling open().
198
213
_initializeRequest (request, metadata);
199
214
200
- final transportStream = XhrTransportStream (request, onError: onError, onDone: _removeStream);
215
+ final transportStream =
216
+ XhrTransportStream (request, onError: onError, onDone: _removeStream);
201
217
_requests.add (transportStream);
202
218
return transportStream;
203
219
}
0 commit comments