cfug · ueman · Jan 19, 2022 · Jan 26, 2022 · Jan 26, 2022 · Jan 26, 2022
diff --git a/.github/workflows/dio.yml b/.github/workflows/dio.yml
@@ -44,7 +44,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ stable, beta, dev, 2.12.1 ]
+        sdk: [ stable, beta, 2.12.1 ]
+        platform: [ vm, chrome ]
     defaults:
       run:
         working-directory: dio
@@ -54,12 +55,12 @@ jobs:
         with:
           sdk: ${{ matrix.sdk }}
       - run: pub get
-      - run: dart test --chain-stack-traces
+      - run: dart test --chain-stack-traces --platform=${{ matrix.platform }}
       - name: Upload test report
         uses: actions/upload-artifact@v2
-        if: always() && matrix.sdk == 'stable'
+        if: always()
         with:
-          name: test-results
+          name: test-results-${{ matrix.sdk }}-${{ matrix.platform }}
           path: dio/build/reports/test-results.json
 
   publish-dry-run:

diff --git a/.github/workflows/example-app.yml b/.github/workflows/example-app.yml
@@ -19,7 +19,7 @@ jobs:
         working-directory: example_flutter_app
     steps:
       - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v2.2.1
+      - uses: subosito/flutter-action@v2.3.0
         with:
           cache: true
           channel: stable
@@ -34,7 +34,7 @@ jobs:
         working-directory: example_flutter_app
     steps:
       - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v2.2.1
+      - uses: subosito/flutter-action@v2.3.0
         with:
           cache: true
           channel: stable
@@ -48,7 +48,7 @@ jobs:
         working-directory: example_flutter_app
     steps:
       - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v2.2.1
+      - uses: subosito/flutter-action@v2.3.0
         with:
           cache: true
           channel: stable

diff --git a/.github/workflows/plugin_cookie_manager.yml b/.github/workflows/plugin_cookie_manager.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ stable, beta, dev, 2.12.1 ]
+        sdk: [ stable, beta, 2.12.1 ]
     defaults:
       run:
         working-directory: plugins/cookie_manager
@@ -57,7 +57,7 @@ jobs:
       - run: dart test --chain-stack-traces
       - name: Upload test report
         uses: actions/upload-artifact@v2
-        if: always() && matrix.sdk == 'stable'
+        if: always()
         with:
-          name: test-results
+          name: test-results-${{ matrix.sdk }}
           path: plugins/cookie_manager/build/reports/test-results.json
diff --git a/.github/workflows/plugin_http2_adapter.yml b/.github/workflows/plugin_http2_adapter.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [ stable, beta, dev, 2.12.1 ]
+        sdk: [ stable, beta, 2.12.1 ]
     defaults:
       run:
         working-directory: plugins/http2_adapter
@@ -57,7 +57,7 @@ jobs:
       - run: dart test --chain-stack-traces
       - name: Upload test report
         uses: actions/upload-artifact@v2
-        if: always() && matrix.sdk == 'stable'
+        if: always()
         with:
-          name: test-results
+          name: test-results-${{ matrix.sdk }}
           path: plugins/http2_adapter/build/reports/test-results.json
diff --git a/.github/workflows/test-report.yml b/.github/workflows/test-report.yml
@@ -14,10 +14,24 @@ jobs:
   report:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v2
+      - name: Download and Extract Artifacts
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: |
+          mkdir -p artifacts && cd artifacts
+
+          artifacts_url=${{ github.event.workflow_run.artifacts_url }}
+
+          gh api "$artifacts_url" -q '.artifacts[] | [.name, .archive_download_url] | @tsv' | while read artifact
+          do
+            IFS=$'\t' read name url <<< "$artifact"
+            gh api $url > "$name.zip"
+            unzip -d "$name" "$name.zip"
+          done
       - name: Publish test reports
         uses: dorny/test-reporter@v1
         with:
           name: ${{ github.event.workflow_run.workflow.name }} Test results
-          artifact: test-results
-          path: '**/*.json'
+          path: 'artifacts/**/test-results.json'
           reporter: dart-json
diff --git a/README-ZH.md b/README-ZH.md
@@ -13,7 +13,7 @@ dio是一个强大的Dart Http请求库，支持Restful API、FormData、拦截
 
 ```yaml
 dependencies:
-  dio: ^4.0.5-beta1
+  dio: ^4.0.6
 ```
 
 > 如果你是dio 3.x 用户，想了解4.0的变更，请参考 [4.x更新列表](./migration_to_4.x.md)!
@@ -39,11 +39,12 @@ void getHttp() async {
 
 | Plugins                                                      | Status                                                       | Description                                                  |
 | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| [dio_cookie_manager](https://github.com/flutterchina/dio/tree/master/plugins/cookie_manager) | [![Pub](https://img.shields.io/pub/v/dio_http2_adapter.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_http2_adapter) | A cookie manager for Dio                                     |
-| [dio_http2_adapter](https://github.com/flutterchina/dio/tree/master/plugins/http2_adapter) | [![Pub](https://img.shields.io/pub/v/dio_cookie_manager.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_cookie_manager) | A Dio HttpClientAdapter which support Http/2.0               |
+| [dio_cookie_manager](https://github.com/flutterchina/dio/tree/master/plugins/cookie_manager) | [![Pub](https://img.shields.io/pub/v/dio_cookie_manager.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_cookie_manager) | A cookie manager for Dio                                     |
+| [dio_http2_adapter](https://github.com/flutterchina/dio/tree/master/plugins/http2_adapter) | [![Pub](https://img.shields.io/pub/v/dio_http2_adapter.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_http2_adapter) | A Dio HttpClientAdapter which support Http/2.0               |
 | [dio_smart_retry](https://github.com/rodion-m/dio_smart_retry) | [![Pub](https://img.shields.io/pub/v/dio_smart_retry.svg?style=flat-square)](https://pub.dev/packages/dio_smart_retry) | Flexible retry library for Dio               |
 | [http_certificate_pinning](https://github.com/diefferson/http_certificate_pinning) | [![Pub](https://img.shields.io/pub/v/http_certificate_pinning.svg?style=flat-square)](https://pub.dev/packages/http_certificate_pinning) | Https Certificate pinning for Flutter             |
 | [curl_logger_dio_interceptor](https://github.com/OwnWeb/curl_logger_dio_interceptor) | [![Pub](https://img.shields.io/pub/v/curl_logger_dio_interceptor.svg?style=flat-square)](https://pub.dev/packages/curl_logger_dio_interceptor) | A Flutter curl-command generator for Dio.             |
+| [dio_cache_interceptor](https://github.com/llfbandit/dio_cache_interceptor) | [![Pub](https://img.shields.io/pub/v/dio_cache_interceptor.svg?style=flat-square)](https://pub.dev/packages/dio_cache_interceptor) | Dio HTTP cache interceptor with multiple stores respecting HTTP directives (or not)             |
 | [dio_http_cache](https://github.com/hurshi/dio-http-cache) | [![Pub](https://img.shields.io/pub/v/dio_http_cache.svg?style=flat-square)](https://pub.dev/packages/dio_http_cache) | A simple cache library for Dio like Rxcache in Android             |
 | [pretty_dio_logger](https://github.com/Milad-Akarie/pretty_dio_logger) | [![Pub](https://img.shields.io/pub/v/pretty_dio_logger.svg?style=flat-square)](https://pub.dev/packages/pretty_dio_logger) | Pretty Dio logger is a Dio interceptor that logs network calls in a pretty, easy to read format.            |
 

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ A powerful Http client for Dart, which supports Interceptors, Global configurati
 
 ```yaml
 dependencies:
-  dio: ^4.0.5-beta1
+  dio: ^4.0.6
 ```
 > Already know Dio 3 and just want to learn about what's new in Dio 4? Check out the [Migration Guide](./migration_to_4.x.md)!
 
@@ -38,11 +38,12 @@ void getHttp() async {
 
 | Plugins                                                      | Status                                                       | Description                                                  |
 | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| [dio_cookie_manager](https://github.com/flutterchina/dio/tree/master/plugins/cookie_manager) | [![Pub](https://img.shields.io/pub/v/dio_http2_adapter.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_http2_adapter) | A cookie manager for Dio                                     |
-| [dio_http2_adapter](https://github.com/flutterchina/dio/tree/master/plugins/http2_adapter) | [![Pub](https://img.shields.io/pub/v/dio_cookie_manager.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_cookie_manager) | A Dio HttpClientAdapter which support Http/2.0               |
+| [dio_cookie_manager](https://github.com/flutterchina/dio/tree/master/plugins/cookie_manager) | [![Pub](https://img.shields.io/pub/v/dio_cookie_manager.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_cookie_manager) | A cookie manager for Dio                                     |
+| [dio_http2_adapter](https://github.com/flutterchina/dio/tree/master/plugins/http2_adapter) | [![Pub](https://img.shields.io/pub/v/dio_http2_adapter.svg?style=flat-square)](https://pub.dartlang.org/packages/dio_http2_adapter) | A Dio HttpClientAdapter which support Http/2.0               |
 | [dio_smart_retry](https://github.com/rodion-m/dio_smart_retry) | [![Pub](https://img.shields.io/pub/v/dio_smart_retry.svg?style=flat-square)](https://pub.dev/packages/dio_smart_retry) | Flexible retry library for Dio               |
 | [http_certificate_pinning](https://github.com/diefferson/http_certificate_pinning) | [![Pub](https://img.shields.io/pub/v/http_certificate_pinning.svg?style=flat-square)](https://pub.dev/packages/http_certificate_pinning) | Https Certificate pinning for Flutter             |
 | [curl_logger_dio_interceptor](https://github.com/OwnWeb/curl_logger_dio_interceptor) | [![Pub](https://img.shields.io/pub/v/curl_logger_dio_interceptor.svg?style=flat-square)](https://pub.dev/packages/curl_logger_dio_interceptor) | A Flutter curl-command generator for Dio.             |
+| [dio_cache_interceptor](https://github.com/llfbandit/dio_cache_interceptor) | [![Pub](https://img.shields.io/pub/v/dio_cache_interceptor.svg?style=flat-square)](https://pub.dev/packages/dio_cache_interceptor) | Dio HTTP cache interceptor with multiple stores respecting HTTP directives (or not)             |
 | [dio_http_cache](https://github.com/hurshi/dio-http-cache) | [![Pub](https://img.shields.io/pub/v/dio_http_cache.svg?style=flat-square)](https://pub.dev/packages/dio_http_cache) | A simple cache library for Dio like Rxcache in Android             |
 | [pretty_dio_logger](https://github.com/Milad-Akarie/pretty_dio_logger) | [![Pub](https://img.shields.io/pub/v/pretty_dio_logger.svg?style=flat-square)](https://pub.dev/packages/pretty_dio_logger) | Pretty Dio logger is a Dio interceptor that logs network calls in a pretty, easy to read format.            |
 
@@ -71,9 +72,9 @@ Welcome to submit Dio's third-party plugins and related libraries [here](https:/
 
 - [Sending FormData](#sending-formdata)
 
-- [Transformer](#Transformer)
+- [Transformer](#transformer)
 
-- [Set proxy and HttpClient config](#set-proxy-and-httpclient-config)
+- [Using proxy](#using-proxy)
 
 - [Https certificate verification](#https-certificate-verification)
 

diff --git a/dio/CHANGELOG.md b/dio/CHANGELOG.md
@@ -1,17 +1,23 @@
-# Unreleased
-- require Dart `2.12.1` which fixes exception handling for secure socket connections (https://github.com/dart-lang/sdk/issues/45214)  
-- `ResponseBody.statusCode` is now non-nullable
-- Only delete file if it exists when downloading.
-
 # Unreleased 5.0
-- add option to instantiate a `HttpClientAdapter`, which is platform independent
 
-# 4.0.5-beta1
+- Add option to instantiate a `HttpClientAdapter`, which is platform independent
+
+# 4.0.6
+
+- fix #1452
+
+# 4.0.5
+
+- require Dart `2.12.1` which fixes exception handling for secure socket connections (https://github.com/dart-lang/sdk/issues/45214)
+- Only delete file if it exists when downloading.
+- Fix `BrowserHttpClientAdapter` canceled hangs
+- Correct JSON MIME Type detection
 - [Web] support send/receive progress in web platform
 - refactor timeout logic
 - use 'arraybuffer' instead of 'blob' for xhr requests in web platform
 
 # 4.0.4
+
 - Fix fetching null data in a response
 
 # 4.0.3
@@ -247,4 +253,4 @@ First Stable version for 2.x
 
 ## 0.0.1
 
-- Initial version, created by Stagehand
+- Initial version, created by Stagehand
diff --git a/dio/README-ZH.md b/dio/README-ZH.md
@@ -13,7 +13,7 @@ dio是一个强大的Dart Http请求库，支持Restful API、FormData、拦截
 
 ```yaml
 dependencies:
-  dio: ^4.0.5-beta1
+  dio: ^4.0.6
 ```
 
 > 如果你是dio 3.x 用户，想了解4.0的变更，请参考 [4.x更新列表](./migration_to_4.x.md)!
@@ -44,6 +44,7 @@ void getHttp() async {
 | [dio_smart_retry](https://github.com/rodion-m/dio_smart_retry) | [![Pub](https://img.shields.io/pub/v/dio_smart_retry.svg?style=flat-square)](https://pub.dev/packages/dio_smart_retry) | Flexible retry library for Dio               |
 | [http_certificate_pinning](https://github.com/diefferson/http_certificate_pinning) | [![Pub](https://img.shields.io/pub/v/http_certificate_pinning.svg?style=flat-square)](https://pub.dev/packages/http_certificate_pinning) | Https Certificate pinning for Flutter             |
 | [curl_logger_dio_interceptor](https://github.com/OwnWeb/curl_logger_dio_interceptor) | [![Pub](https://img.shields.io/pub/v/curl_logger_dio_interceptor.svg?style=flat-square)](https://pub.dev/packages/curl_logger_dio_interceptor) | A Flutter curl-command generator for Dio.             |
+| [dio_cache_interceptor](https://github.com/llfbandit/dio_cache_interceptor) | [![Pub](https://img.shields.io/pub/v/dio_cache_interceptor.svg?style=flat-square)](https://pub.dev/packages/dio_cache_interceptor) | Dio HTTP cache interceptor with multiple stores respecting HTTP directives (or not)             |
 | [dio_http_cache](https://github.com/hurshi/dio-http-cache) | [![Pub](https://img.shields.io/pub/v/dio_http_cache.svg?style=flat-square)](https://pub.dev/packages/dio_http_cache) | A simple cache library for Dio like Rxcache in Android             |
 | [pretty_dio_logger](https://github.com/Milad-Akarie/pretty_dio_logger) | [![Pub](https://img.shields.io/pub/v/pretty_dio_logger.svg?style=flat-square)](https://pub.dev/packages/pretty_dio_logger) | Pretty Dio logger is a Dio interceptor that logs network calls in a pretty, easy to read format.            |
 

diff --git a/dio/README.md b/dio/README.md
@@ -12,7 +12,7 @@ A powerful Http client for Dart, which supports Interceptors, Global configurati
 
 ```yaml
 dependencies:
-  dio: ^4.0.5-beta1
+  dio: ^4.0.6
 ```
 > Already know Dio 3 and just want to learn about what's new in Dio 4? Check out the [Migration Guide](./migration_to_4.x.md)!
 
@@ -43,6 +43,7 @@ void getHttp() async {
 | [dio_smart_retry](https://github.com/rodion-m/dio_smart_retry) | [![Pub](https://img.shields.io/pub/v/dio_smart_retry.svg?style=flat-square)](https://pub.dev/packages/dio_smart_retry) | Flexible retry library for Dio               |
 | [http_certificate_pinning](https://github.com/diefferson/http_certificate_pinning) | [![Pub](https://img.shields.io/pub/v/http_certificate_pinning.svg?style=flat-square)](https://pub.dev/packages/http_certificate_pinning) | Https Certificate pinning for Flutter             |
 | [curl_logger_dio_interceptor](https://github.com/OwnWeb/curl_logger_dio_interceptor) | [![Pub](https://img.shields.io/pub/v/curl_logger_dio_interceptor.svg?style=flat-square)](https://pub.dev/packages/curl_logger_dio_interceptor) | A Flutter curl-command generator for Dio.             |
+| [dio_cache_interceptor](https://github.com/llfbandit/dio_cache_interceptor) | [![Pub](https://img.shields.io/pub/v/dio_cache_interceptor.svg?style=flat-square)](https://pub.dev/packages/dio_cache_interceptor) | Dio HTTP cache interceptor with multiple stores respecting HTTP directives (or not)             |
 | [dio_http_cache](https://github.com/hurshi/dio-http-cache) | [![Pub](https://img.shields.io/pub/v/dio_http_cache.svg?style=flat-square)](https://pub.dev/packages/dio_http_cache) | A simple cache library for Dio like Rxcache in Android             |
 | [pretty_dio_logger](https://github.com/Milad-Akarie/pretty_dio_logger) | [![Pub](https://img.shields.io/pub/v/pretty_dio_logger.svg?style=flat-square)](https://pub.dev/packages/pretty_dio_logger) | Pretty Dio logger is a Dio interceptor that logs network calls in a pretty, easy to read format.            |
 

diff --git a/dio/lib/src/adapter.dart b/dio/lib/src/adapter.dart
@@ -68,10 +68,10 @@ class ResponseBody {
   Stream<Uint8List> stream;
 
   /// the response headers
-  Map<String, List<String>> headers;
+  late Map<String, List<String>> headers;
 
   /// Http status code
-  int statusCode;
+  int? statusCode;
 
   /// Returns the reason phrase associated with the status code.
   /// The reason phrase must be set before the body is written