fix cfug#357

Author: wendux

example/cancel_request.dart

@@ -41,6 +41,7 @@ main() async {
       if (CancelToken.isCancel(e)) {
         print('$url3: $e');
       }
+      print(e);
     })
   ]);
 }

example/test.dart

@@ -1,46 +1,13 @@
-import 'dart:convert';
-import 'dart:io';
 import 'package:dio/dio.dart';
+void getHttp() async {
+  try {
+    Response response = await Dio().get("http://www.google.com");
+    print(response);
+  } catch (e) {
+    print(e);
+  }
+}
 
-main() async {
-//  var formData = new FormData.from({
-//    "param1": "-1",
-//    "param1": "-1",
-//    "param2": "-1",
-//    "param3": "-1",
-//    "param4": "-1",
-//    "param5": null,
-//    "param8": {"a": "b", "b": "c"},
-//    "dd":["X",4]
-//    //"music": new UploadFileInfo(new File("./example/bee.mp4"), "be.mp4"),
-//  });
-//
-//  //print(formData);
-//
-//  var t = await formData.asBytesAsync();
-//  print("formStreamSize = ${t.length}");
-//  print("formData.length = ${formData.length}");
-//  print("asBytes.length = ${formData.asBytes().length}");
-//  print(utf8.decode(t)==formData.toString());
-
-  Response response;
-  //upload a video
-//  response = await Dio().post(
-//    "http://localhost:3000/upload",
-//    data: FormData.from({
-//      "test":"haha",
-//      "file": UploadFileInfo(File("./example/bee.mp4"), "bee.mp4"),
-//      "file2": UploadFileInfo(File("./example/upload.txt"), "xx.text"),
-//      "x":[5,"f"]
-//    }),
-//    onSendProgress: (received, total) {
-//      if (total != -1) {
-//        print((received / total * 100).toStringAsFixed(0) + "%");
-//      }
-//    },
-//  );
-
-  response = await Dio().get("https://google.com", options: Options(connectTimeout:1000));
-  print(response);
-
+main() async{
+  await getHttp();
 }

package_src/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.1.9
+
+- support flutter version>=1.8 (fix #357)
+
+
 # 2.1.8
 
 - fix #354 #312

package_src/lib/src/adapter.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'dart:async';
+import 'dart:typed_data';
 import 'options.dart';
 import 'dio_error.dart';
 
@@ -59,7 +60,7 @@ class ResponseBody {
   });
 
   /// The response stream
-  Stream<List<int>> stream;
+  Stream<Uint8List> stream;
 
   /// the response headers
   HttpHeaders headers;
@@ -85,19 +86,20 @@ class ResponseBody {
     this.headers,
     this.statusMessage,
     this.redirects,
-  }) : stream = Stream.fromIterable(utf8.encode(text).map((e) => [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) => [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,

package_src/lib/src/dio.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math' as math;
+import 'dart:typed_data';
 import 'cancel_token.dart';
 import 'dio_error.dart';
 import 'form_data.dart';
@@ -449,8 +450,8 @@ class Dio {
     Future future = completer.future;
     int received = 0;
 
-    // Stream<List<int>>
-    Stream<List<int>> stream = response.data.stream;
+    // Stream<Uint8List>
+    Stream<Uint8List> stream = response.data.stream;
     bool compressed = false;
     int total = 0;
     String contentEncoding =
@@ -493,7 +494,7 @@ class Dio {
         }).catchError((derr) async {
           try {
             await subscription.cancel();
-            
+
           } finally {
             completer.completeError(_assureDioError(derr));
           }
@@ -825,16 +826,16 @@ class Dio {
     }
   }
 
-  Future<Stream<List<int>>> _transformData(RequestOptions options) async {
+  Future<Stream<Uint8List>> _transformData(RequestOptions options) async {
     var data = options.data;
-    List<int> bytes;
-    Stream<List<int>> stream;
+    Uint8List bytes;
+    Stream<Uint8List> stream;
     if (data != null && ["POST", "PUT", "PATCH", "DELETE"].contains(options.method)) {
       // Handle the FormData
       int length;
       if (data is Stream) {
-        assert(data is Stream<List<int>>,
-            "Stream type must be `Stream<List<int>>`, but ${data.runtimeType} is found.");
+        assert(data is Stream<Uint8List>,
+            "Stream type must be `Stream<Uint8List>`, but ${data.runtimeType} is found.");
         stream = data;
         options.headers.keys.any((String key) {
           if (key.toLowerCase() == HttpHeaders.contentLengthHeader) {
@@ -848,7 +849,9 @@ class Dio {
           options.headers[HttpHeaders.contentTypeHeader] =
           'multipart/form-data; boundary=${data.boundary.substring(2)}';
         }
-        stream = data.stream;
+        stream = data.stream.transform(StreamTransformer<List<int>,Uint8List>.fromHandlers(handleData: (data, sink) {
+          sink.add(data);
+        }));
         length = data.length;
       } else {
         // Call request transformer.
@@ -862,7 +865,7 @@ class Dio {
         // support data sending progress
         length = bytes.length;
 
-        var group = new List<List<int>>();
+        var group = new List<Uint8List>();
         const size = 1024;
         int groupCount = (bytes.length / size).ceil();
         for (int i = 0; i < groupCount; ++i) {
@@ -877,7 +880,7 @@ class Dio {
         options.headers[HttpHeaders.contentLengthHeader] = length;
       }
       int complete = 0;
-      Stream<List<int>> byteStream =
+      Stream<Uint8List> byteStream =
           stream.transform(StreamTransformer.fromHandlers(
         handleData: (data, sink) {
           if (options.cancelToken != null && options.cancelToken.isCancelled) {

package_src/lib/src/transformer.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 import 'dio_error.dart';
 import 'options.dart';
 import 'adapter.dart';
@@ -99,8 +100,8 @@ class DefaultTransformer extends Transformer {
           response.headers.value(HttpHeaders.contentLengthHeader) ?? "-1");
     }
     Completer completer = new Completer();
-    Stream<List<int>> stream = response.stream.transform<List<int>>(
-        StreamTransformer.fromHandlers(handleData: (data, sink) {
+    Stream stream = response.stream.transform(
+        StreamTransformer<Uint8List, List<int>>.fromHandlers(handleData: (data, sink) {
       sink.add(data);
       if (showDownloadProgress) {
         received += data.length;

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.8
+version: 2.1.9
 homepage: https://github.com/flutterchina/dio
 author: wendux <[email protected]>