fix cfug#360

Author: wendux

package_src/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.1.10
+
+- fix #360
+
 # 2.1.9
 
 - support flutter version>=1.8 (fix #357)

package_src/lib/src/adapter.dart

@@ -86,20 +86,23 @@ class ResponseBody {
     this.headers,
     this.statusMessage,
     this.redirects,
-  }) : stream = Stream.fromIterable(utf8.encode(text).map((e) => Uint8List.fromList([e])).toList());
+  }) : stream = Stream.fromIterable(
+            utf8.encode(text).map((e) => Uint8List.fromList([e])).toList());
 
   ResponseBody.fromBytes(
     List<int> bytes,
     this.statusCode, {
     this.headers,
     this.statusMessage,
     this.redirects,
-  }) : stream = Stream.fromIterable(bytes.map((e) => Uint8List.fromList([e])).toList());
+  }) : stream = Stream.fromIterable(
+            bytes.map((e) => Uint8List.fromList([e])).toList());
 }
 
 /// The default HttpClientAdapter for Dio is [DefaultHttpClientAdapter].
 class DefaultHttpClientAdapter extends HttpClientAdapter {
   Uint8List E;
+
   Future<ResponseBody> fetch(
     RequestOptions options,
     Stream<List<int>> requestStream,
@@ -115,8 +118,9 @@ class DefaultHttpClientAdapter extends HttpClientAdapter {
       //_httpClient.connectionTimeout= Duration(milliseconds: options.connectTimeout);
 //      _httpClient.connectionTimeout =
 //          Duration(milliseconds: options.connectTimeout);
-      requestFuture = _httpClient.openUrl(options.method, options.uri)
-      .timeout(Duration(milliseconds: options.connectTimeout));
+      requestFuture = _httpClient
+          .openUrl(options.method, options.uri)
+          .timeout(Duration(milliseconds: options.connectTimeout));
     } else {
       _httpClient.connectionTimeout = null;
       requestFuture = _httpClient.openUrl(options.method, options.uri);
@@ -146,8 +150,7 @@ class DefaultHttpClientAdapter extends HttpClientAdapter {
     if (options.receiveTimeout > 0) {
       future = future.timeout(Duration(milliseconds: options.receiveTimeout));
     }
-    HttpClientResponse responseStream;
-
+    dynamic responseStream;
     try {
       responseStream = await future;
     } on TimeoutException {
@@ -157,8 +160,22 @@ class DefaultHttpClientAdapter extends HttpClientAdapter {
         type: DioErrorType.RECEIVE_TIMEOUT,
       );
     }
+
+    Stream<Uint8List> stream;
+
+    // https://github.com/dart-lang/co19/issues/383
+    if (responseStream is Stream<Uint8List>) {
+      stream = responseStream;
+    } else {
+      stream = responseStream.transform(
+          StreamTransformer<List<int>, Uint8List>.fromHandlers(
+              handleData: (data, sink) {
+        sink.add(data);
+      }));
+    }
+
     return ResponseBody(
-      responseStream,
+      stream,
       responseStream.statusCode,
       headers: responseStream.headers,
       redirects: responseStream.redirects,

package_src/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dio
 description: A powerful Http client for Dart, which supports Interceptors, FormData, Request Cancellation, File Downloading, Timeout etc.
-version: 2.1.9
+version: 2.1.10
 homepage: https://github.com/flutterchina/dio
 author: wendux <[email protected]>
 

package_src/test/dio_test.dart

@@ -179,6 +179,7 @@ void main() {
       final url = 'http://download.dcloud.net.cn/HBuilder.9.0.2.macosx_64.dmg';
       final savePath = './example/HBuilder.9.0.2.macosx_64.dmg';
       await dio.download(url, savePath, cancelToken: token).catchError((e) {
+        print(e);
         expect(CancelToken.isCancel(e), true);
         if (CancelToken.isCancel(e)) {
           expect(e.type, DioErrorType.CANCEL);