fix cfug#18, cfug#14, cfug#23

Author: duwen

.idea/libraries/Dart_Packages.xml

@@ -507,7 +507,7 @@ dio.cookieJar=new PersistCookieJar("./cookies");
 `PersistCookieJar` is a cookie manager which implements the standard cookie policy declared in RFC. `PersistCookieJar` persists the cookies in files, so if the application exit, the cookies always exist unless call `delete` explicitly.
 
 
-More details about [cookie_jar](https://github.com/flutterchina/)  see : https://github.com/flutterchina/cookie_jar .
+More details about [cookie_jar](https://github.com/flutterchina/cookie_jar)  see : https://github.com/flutterchina/cookie_jar .
 
 ## Copyright & License
 

.idea/workspace.xml

@@ -18,7 +18,7 @@ import 'package:dio/src/TransFormer.dart';
 /// such as response data is compressed with gzip.
 typedef OnDownloadProgress(int received, int total);
 
-typedef OnHttpClientCreate(HttpClient client);
+typedef dynamic OnHttpClientCreate(HttpClient client);
 
 /// A powerful Http client for Dart, which supports Interceptors,
 /// Global configuration, FormData, File downloading etc. and Dio is
@@ -175,7 +175,7 @@ class Dio {
         OnDownloadProgress onProgress,
         CancelToken cancelToken,
         data,
-        bool flush: false,
+        @deprecated bool flush: false,
         Options options,
       }) async {
     // We set the `responseType` to [ResponseType.STREAM] to retrieve the
@@ -216,11 +216,11 @@ class Dio {
         new Duration(
             milliseconds: options.receiveTimeout),
         onTimeout: (EventSink sink) {
-          return new Future<Response>
-              .error(new DioError(
+          sink.addError(new DioError(
               message: "Receiving data timeout[${options.receiveTimeout}ms]",
               type: DioErrorType.RECEIVE_TIMEOUT
           ));
+          sink.close();
         },
       );
     }
@@ -282,7 +282,8 @@ class Dio {
   _configHttpClient(HttpClient httpClient, [bool isDefault = false]) {
     httpClient.idleTimeout = new Duration(seconds: isDefault ? 3 : 0);
     if (onHttpClientCreate != null) {
-      onHttpClientCreate(httpClient);
+     //user can return a new HttpClient instance
+     httpClient= onHttpClientCreate(httpClient)??httpClient;
     }
   }
 
@@ -407,9 +408,7 @@ class Dio {
 
       Future<Response<T>> future = _checkIfNeedEnqueue<T>(interceptor.response, () {
         _checkCancelled(cancelToken);
-        if ((response.statusCode >= HttpStatus.OK &&
-            response.statusCode < HttpStatus.MULTIPLE_CHOICES) ||
-            response.statusCode == HttpStatus.NOT_MODIFIED) {
+        if (options.validateStatus(response.statusCode)) {
           return _listenCancelForAsyncTask<Response<T>>(
               cancelToken, _onSuccess<T>(ret));
         } else {
@@ -492,6 +491,8 @@ class Dio {
       _setHeaders(options, request);
 
       request.write(data);
+    }else{
+      _setHeaders(options, request);
     }
   }
 
@@ -533,17 +534,18 @@ class Dio {
     return _transFutureStatusIfNecessary<T>(err);
   }
 
-  _mergeOptions(Options opt) {
+  Options _mergeOptions(Options opt) {
     opt.method ??= options.method ?? "GET";
     opt.method = opt.method.toUpperCase();
-    opt.headers.addAll(options.headers);
+    opt.headers=(new Map.from(options.headers))..addAll(opt.headers);
     opt.baseUrl ??= options.baseUrl ?? "";
     opt.connectTimeout ??= options.connectTimeout ?? 0;
     opt.receiveTimeout ??= options.receiveTimeout ?? 0;
     opt.responseType ??= options.responseType ?? ResponseType.JSON;
     opt.data ??= options.data;
-    opt.extra.addAll(options.extra);
+    opt.extra=(new Map.from(options.extra))..addAll(opt.extra);
     opt.contentType ??= options.contentType ?? ContentType.JSON;
+    opt.validateStatus??=options.validateStatus;
   }
 
   Options _checkOptions(method, options) {

README.md

@@ -14,23 +14,60 @@ enum ResponseType {
   PLAIN
 }
 
+typedef bool ValidateStatus(int status);
+
 /**
  * The Options class describes the http request information and configuration.
  */
-class Options{
-  Options({this.method,
+class Options {
+  Options({
+    this.method,
     this.baseUrl,
     this.connectTimeout,
     this.receiveTimeout,
+    this.path,
     this.data,
     this.extra,
     this.headers,
     this.responseType,
-    this.contentType}) {
+    this.contentType,
+    this.validateStatus
+  }) {
     // set the default user-agent with Dio version
     this.headers = headers ?? {};
     this.contentType;
     this.extra = extra ?? {};
+    this.validateStatus ??=
+        (int status) => status >= 200 && status < 300 || status == 304;
+  }
+
+  /// Create a new Option from current instance with merging attributes.
+  Options merge({
+    String method,
+    String baseUrl,
+    String path,
+    int connectTimeout,
+    int receiveTimeout,
+    var data,
+    Map<String, dynamic> extra,
+    Map<String, dynamic> headers,
+    ResponseType responseType,
+    ContentType contentType,
+    ValidateStatus validateStatus
+  }) {
+    return new Options(
+      method: method??this.method,
+      baseUrl: baseUrl??this.baseUrl,
+      path: path??this.path,
+      connectTimeout: connectTimeout??this.connectTimeout,
+      receiveTimeout: receiveTimeout??this.receiveTimeout,
+      data: data??this.data,
+      extra: extra??this.extra??{},
+      headers: headers??this.headers??{},
+      responseType: responseType??this.responseType,
+      contentType: contentType??this.contentType,
+      validateStatus: validateStatus??this.validateStatus
+    );
   }
 
   /// Http method.
@@ -76,6 +113,12 @@ class Options{
   /// If you want to receive the response data with String, use `PLAIN`.
   ResponseType responseType;
 
+  /// `validateStatus` defines whether the request is successful for a given
+  /// HTTP response status code. If `validateStatus` returns `true` ,
+  /// the request will be perceived as successful; otherwise, considered as failed.
+  ValidateStatus validateStatus;
+
   /// Custom field that you can retrieve it later in [Interceptor]、[TransFormer] and the [Response] object.
   Map<String, dynamic> extra;
+
 }

issue_template.md

@@ -66,10 +66,10 @@ abstract class TransFormer {
 class DefaultTransformer extends TransFormer {
 
   Future transformRequest(Options options) async {
-    var data = options.data;
+    var data = options.data??"";
     if (data is! String) {
       if (options.contentType.mimeType == ContentType.JSON.mimeType) {
-        return JSON.encode(options.data);
+        return json.encode(options.data);
       } else if (data is Map) {
         return TransFormer.urlEncodeMap(data);
       }
@@ -89,18 +89,18 @@ class DefaultTransformer extends TransFormer {
       stream = stream.timeout(
           new Duration(milliseconds: options.receiveTimeout),
           onTimeout: (EventSink sink) {
-            return new Future<Response>.error(
-                new DioError(
-                  message: "Receiving data timeout[${options
-                      .receiveTimeout}ms]",
-                  type: DioErrorType.RECEIVE_TIMEOUT,
-                ));
+            sink.addError( new DioError(
+              message: "Receiving data timeout[${options
+                  .receiveTimeout}ms]",
+              type: DioErrorType.RECEIVE_TIMEOUT,
+            ));
+            sink.close();
           });
     }
-    String responseBody = await stream.transform(UTF8.decoder).join();
+    String responseBody = await stream.transform(utf8.decoder).join();
     if (options.responseType == ResponseType.JSON &&
-        response.headers.contentType.mimeType == ContentType.JSON.mimeType) {
-      return JSON.decode(responseBody);
+        response.headers.contentType?.mimeType == ContentType.JSON.mimeType) {
+      return json.decode(responseBody);
     }
     return responseBody;
   }

lib/src/Dio.dart

@@ -4,11 +4,11 @@ version: 0.0.9
 homepage: https://github.com/flutterchina/dio
 author: wendux <[email protected]>
 
-environment:
-  sdk: '>=1.20.1 <2.0.0'
+#environment:
+#  sdk: '>=1.9.0'
 
 dependencies:
-  cookie_jar: ^0.0.3
+  cookie_jar: ^0.0.4
 
 dev_dependencies:
   test: "^0.12.0"