Merge pull request #624 from Clasherzz/client_cancellation

fix:cancellation_issue

Author: animator

packages/apidash_core/lib/services/http_client_manager.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:collection';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/io_client.dart';
@@ -15,7 +14,7 @@ class HttpClientManager {
   static final HttpClientManager _instance = HttpClientManager._internal();
   static const int _maxCancelledRequests = 100;
   final Map<String, http.Client> _clients = {};
-  final Queue<String> _cancelledRequests = Queue();
+  final Set<String> _cancelledRequests = {};
 
   factory HttpClientManager() {
     return _instance;
@@ -38,9 +37,9 @@ class HttpClientManager {
       _clients[requestId]?.close();
       _clients.remove(requestId);
 
-      _cancelledRequests.addLast(requestId);
-      while (_cancelledRequests.length > _maxCancelledRequests) {
-        _cancelledRequests.removeFirst();
+      _cancelledRequests.add(requestId);
+      if (_cancelledRequests.length > _maxCancelledRequests) {
+        _cancelledRequests.remove(_cancelledRequests.first);
       }
     }
   }
@@ -49,6 +48,10 @@ class HttpClientManager {
     return _cancelledRequests.contains(requestId);
   }
 
+  void removeCancelledRequest(String requestId) {
+    _cancelledRequests.remove(requestId);
+  }
+
   void closeClient(String requestId) {
     if (_clients.containsKey(requestId)) {
       _clients[requestId]?.close();

packages/apidash_core/lib/services/http_service.dart

@@ -19,6 +19,9 @@ Future<(HttpResponse?, Duration?, String?)> sendHttpRequest(
   SupportedUriSchemes defaultUriScheme = kDefaultUriScheme,
   bool noSSL = false,
 }) async {
+  if(httpClientManager.wasRequestCancelled(requestId)){
+    httpClientManager.removeCancelledRequest(requestId);
+  }
   final client = httpClientManager.createClient(requestId, noSSL: noSSL);
 
   (Uri?, String?) uriRec = getValidRequestUri(
@@ -71,7 +74,8 @@ Future<(HttpResponse?, Duration?, String?)> sendHttpRequest(
               }
             }
             http.StreamedResponse multiPartResponse =
-                await multiPartRequest.send();
+                await client.send(multiPartRequest);
+
             stopwatch.stop();
             http.Response convertedMultiPartResponse =
                 await convertStreamedResponse(multiPartResponse);