Add some code comments

nsleejian · Feb 21, 2019 · d6452af · d6452af
1 parent 3f0042d
commit d6452af
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/example/test.dart b/example/test.dart
@@ -2,10 +2,15 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 
 main() async {
-  var dio = new Dio(BaseOptions(connectTimeout: 50));
-  dio.interceptors.add(LogInterceptor(responseBody: true));
+  var dio = new Dio(
+    BaseOptions(
+      //connectTimeout: 5000,
+      baseUrl: "http://www.dtworkroom.com/doris/1/2.0.0/",
+    ),
+  );
+  dio.interceptors.add(LogInterceptor());
   await dio.get(
-    "http://www.dtworkroom.com/doris/1/2.0.0/test",
+    "/test",
     queryParameters: {"kk": "tt"},
     options: Options(
       headers: {HttpHeaders.acceptEncodingHeader: "*"},

diff --git a/package_src/lib/src/adapter.dart b/package_src/lib/src/adapter.dart
@@ -84,11 +84,17 @@ class DefaultHttpClientAdapter extends HttpClientAdapter {
   ) async {
     _configHttpClient();
     Future requestFuture;
+
     if (options.connectTimeout > 0) {
+      // Because there is a bug in [httpClient.connectionTimeout] now, we replace it
+      // with `Future.timeout()` when it comes.
+      // Bug issue: https://github.com/dart-lang/sdk/issues/34980.
+      //_httpClient.connectionTimeout= Duration(milliseconds: options.connectTimeout);
       requestFuture = _httpClient
           .openUrl(options.method, options.uri)
-          .timeout(new Duration(milliseconds: options.connectTimeout));
+          .timeout(Duration(milliseconds: options.connectTimeout));
     } else {
+      _httpClient.connectionTimeout = null;
       requestFuture = _httpClient.openUrl(options.method, options.uri);
     }
 
@@ -103,6 +109,8 @@ class DefaultHttpClientAdapter extends HttpClientAdapter {
         message: "Connecting timeout[${options.connectTimeout}ms]",
         type: DioErrorType.CONNECT_TIMEOUT,
       );
+    } catch (e) {
+      print(e);
     }
     request.followRedirects = options.followRedirects;
 
@@ -119,10 +127,9 @@ class DefaultHttpClientAdapter extends HttpClientAdapter {
     );
   }
 
-
   void _configHttpClient() {
     if (_httpClient == null) _httpClient = new HttpClient();
-    _httpClient.idleTimeout = new Duration(seconds: 3);
+    _httpClient.idleTimeout = Duration(seconds: 3);
     if (onHttpClientCreate != null) {
       //user can return a new HttpClient instance
       _httpClient = onHttpClientCreate(_httpClient) ?? _httpClient;

diff --git a/package_src/lib/src/interceptors/cookie_mgr.dart b/package_src/lib/src/interceptors/cookie_mgr.dart
@@ -31,7 +31,7 @@ class CookieManager extends Interceptor {
     var cookies = cookieJar.loadForRequest(options.uri)
       ..addAll(options.cookies);
     String cookie = getCookies(cookies);
-    if (cookie.isNotEmpty) options.headers["cookie"] = cookie;
+    if (cookie.isNotEmpty) options.headers[HttpHeaders.cookieHeader] = cookie;
   }
 
   @override