🔥 Do not detaches sockets / terminates client stream (#2173)

Fixes #2170

dio/CHANGELOG.md

@@ -5,7 +5,7 @@ See the [Migration Guide][] for the complete breaking changes list.**
 
 ## Unreleased
 
-*None.*
+- Remove sockets detach in `IOHttpClientAdapter`.
 
 ## 5.4.2+1
 

dio/lib/src/adapters/io_adapter.dart

@@ -212,9 +212,6 @@ class IOHttpClientAdapter implements HttpClientAdapter {
           .map((e) => RedirectRecord(e.statusCode, e.method, e.location))
           .toList(),
       statusMessage: responseStream.reasonPhrase,
-      onClose: () {
-        responseStream.detachSocket().then((socket) => socket.destroy());
-      },
     );
   }
 

dio_test/lib/src/test/cancellation_tests.dart

@@ -113,5 +113,17 @@ void cancellationTests(
         ),
       );
     });
+
+    // Regression: https://github.com/cfug/dio/issues/2170
+    test(
+      'not closing sockets with requests that have same hosts',
+      () async {
+        final token = CancelToken();
+        await expectLater(dio.get('/get', cancelToken: token), completes);
+        expectLater(dio.get('/drip?duration=3'), completes);
+        Future.delayed(const Duration(seconds: 1), token.cancel);
+      },
+      testOn: '!browser',
+    );
   });
 }

dio_test/lib/src/test/download_tests.dart

@@ -254,8 +254,12 @@ void downloadTests(
           ]);
           await expectLater(
             dio.downloadUri(
-              Uri.parse('/drip?delay=0&duration=6&numbytes=6').replace(
-                queryParameters: {'count': '3', 'gap': '2'},
+              Uri.parse('/drip').replace(
+                queryParameters: {
+                  'delay': '0',
+                  'duration': '4',
+                  'numbytes': '2',
+                },
               ),
               p.join(tmp.path, 'download_timeout.md'),
               options: Options(receiveTimeout: Duration(seconds: 1)),
@@ -264,10 +268,16 @@ void downloadTests(
           );
 
           // Throws nothing if it constantly gets response bytes.
-          await dio.download(
-            'https://github.com/cfug/flutter.cn/archive/refs/heads/main.zip',
-            p.join(tmp.path, 'main.zip'),
-            options: Options(receiveTimeout: Duration(seconds: 1)),
+          await dio.downloadUri(
+            Uri.parse('/drip').replace(
+              queryParameters: {
+                'delay': '0',
+                'duration': '5',
+                'numbytes': '5',
+              },
+            ),
+            p.join(tmp.path, 'download_timeout.md'),
+            options: Options(receiveTimeout: Duration(seconds: 2)),
           );
         },
         // The download of the main.zip file can be slow,

plugins/http2_adapter/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-*None.*
+- Remove client stream termination in `Http2Adapter`.
 
 ## 2.5.1
 

plugins/http2_adapter/lib/src/http2_adapter.dart

@@ -123,14 +123,14 @@ class Http2Adapter implements HttpClientAdapter {
     // Creates a new outgoing stream.
     final stream = transport.makeRequest(headers);
 
-    cancelFuture?.whenComplete(() {
-      Future(() {
-        stream.terminate();
+    final hasRequestData = requestStream != null;
+    if (hasRequestData) {
+      cancelFuture?.whenComplete(() {
+        stream.outgoingMessages.close();
       });
-    });
+    }
 
     List<Uint8List>? list;
-    final hasRequestData = requestStream != null;
     if (!excludeMethods.contains(options.method) && hasRequestData) {
       list = await requestStream.toList();
       requestStream = Stream.fromIterable(list);
@@ -145,7 +145,7 @@ class Http2Adapter implements HttpClientAdapter {
         requestStreamFuture = requestStreamFuture.timeout(
           sendTimeout,
           onTimeout: () {
-            stream.terminate();
+            stream.outgoingMessages.close();
             throw DioException.sendTimeout(
               timeout: sendTimeout,
               requestOptions: options,
@@ -195,7 +195,6 @@ class Http2Adapter implements HttpClientAdapter {
             );
           } else {
             responseSubscription.cancel().whenComplete(() {
-              stream.terminate();
               responseSink.close();
             });
           }
@@ -277,7 +276,7 @@ class Http2Adapter implements HttpClientAdapter {
       onClose: () {
         responseSubscription.cancel();
         responseSink.close();
-        stream.terminate();
+        stream.outgoingMessages.close();
       },
     );
   }