✨ Introduce ClosableBaseClient

pkgs/cronet_http/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.0-wip
+
+* Implements `ClosableBaseClient`.
+* Expose `CronetEngine.close` and `CronetClient.close`.
+
 ## 1.4.0
 
 * Add a new `CronetStreamedResponse` class that provides additional information

pkgs/cronet_http/lib/src/cronet_client.dart

@@ -81,6 +81,8 @@ enum CacheMode {
 /// An environment that can be used to make HTTP requests.
 class CronetEngine {
   late final jb.CronetEngine _engine;
+
+  bool get isClosed => _isClosed;
   bool _isClosed = false;
 
   CronetEngine._(this._engine);
@@ -351,9 +353,12 @@ jb.UrlRequestCallbackProxy$UrlRequestCallbackInterface _urlRequestCallbacks(
 /// A HTTP [Client] based on the
 /// [Cronet](https://developer.android.com/guide/topics/connectivity/cronet)
 /// network stack.
-class CronetClient extends BaseClient {
+class CronetClient extends ClosableBaseClient {
   static final _executor = jb.Executors.newCachedThreadPool();
   CronetEngine? _engine;
+
+  @override
+  bool get isClosed => _isClosed;
   bool _isClosed = false;
 
   /// Indicates that [CronetClient] is responsible for closing [_engine].
@@ -414,7 +419,7 @@ class CronetClient extends BaseClient {
     final engine = _engine ?? CronetEngine.build();
     _engine = engine;
 
-    if (engine._isClosed) {
+    if (engine.isClosed) {
       throw ClientException(
           'HTTP request failed. CronetEngine is already closed.', request.url);
     }

pkgs/cupertino_http/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.0-wip
+
+* Implements `ClosableBaseClient`.
+* Expose `CronetEngine.close` and `CronetClient.close`.
+
 ## 2.3.0-wip
 
 * Add the ability to abort requests.

pkgs/cupertino_http/lib/src/cupertino_client.dart

@@ -94,9 +94,11 @@ class _TaskTracker {
 ///   }
 /// }
 /// ```
-class CupertinoClient extends BaseClient {
+class CupertinoClient extends ClosableBaseClient {
   static final Map<URLSessionTask, _TaskTracker> _tasks = {};
 
+  @override
+  bool get isClosed => _urlSession == null;
   URLSession? _urlSession;
 
   CupertinoClient._(this._urlSession);

pkgs/http/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.0-wip
+
+* Introduce `ClosableBaseClient` specifically for clients that can be closed.## 0.2.0-wip
+* Expose `IOClient.close` and `BrowserClient.close`.
+
 ## 1.5.0-beta.2
 
 * Fixed a bug in `IOClient` where the `HttpClient`'s response stream was

pkgs/http/lib/src/base_client.dart

@@ -106,3 +106,10 @@ abstract mixin class BaseClient implements Client {
   @override
   void close() {}
 }
+
+abstract class ClosableBaseClient extends BaseClient {
+  bool get isClosed;
+
+  @override
+  void close();
+}

pkgs/http/lib/src/browser_client.dart

@@ -50,14 +50,17 @@ external JSPromise<Response> _fetch(
 ///
 /// Responses are streamed but requests are not. A request will only be sent
 /// once all the data is available.
-class BrowserClient extends BaseClient {
+class BrowserClient extends ClosableBaseClient {
   /// Whether to send credentials such as cookies or authorization headers for
   /// cross-site requests.
   ///
   /// Defaults to `false`.
   bool withCredentials = false;
 
+  @override
+  bool get isClosed => _isClosed;
   bool _isClosed = false;
+
   final _openRequestAbortControllers = <AbortController>[];
 
   /// Sends an HTTP request and asynchronously returns the response.

pkgs/http/lib/src/io_client.dart

@@ -82,10 +82,14 @@ class _IOStreamedResponseV2 extends IOStreamedResponse
 ///   // would be caught by this handler.
 /// }
 /// ```
-class IOClient extends BaseClient {
+class IOClient extends ClosableBaseClient {
   /// The underlying `dart:io` HTTP client.
   HttpClient? _inner;
 
+  @override
+  bool get isClosed => _isClosed;
+  bool _isClosed = false;
+
   /// Create a new `dart:io`-based HTTP [Client].
   ///
   /// If [inner] is provided then it can be used to provide configuration
@@ -103,7 +107,7 @@ class IOClient extends BaseClient {
   /// Sends an HTTP request and asynchronously returns the response.
   @override
   Future<IOStreamedResponse> send(BaseRequest request) async {
-    if (_inner == null) {
+    if (_inner == null || _isClosed) {
       throw ClientException(
           'HTTP request failed. Client is already closed.', request.url);
     }
@@ -243,5 +247,6 @@ class IOClient extends BaseClient {
       _inner!.close(force: true);
       _inner = null;
     }
+    _isClosed = true;
   }
 }

pkgs/ok_http/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0-wip
+
+* Implements `ClosableBaseClient`.
+* Expose `OkHttpClient.close`.
+
 ## 0.1.1-wip
 
 - `OkHttpClient` now receives an `OkHttpClientConfiguration` to configure the client on a per-call basis.

pkgs/ok_http/lib/src/ok_http_client.dart

@@ -213,8 +213,11 @@ Future<String?> choosePrivateKeyAlias({
 ///   }
 /// }
 /// ```
-class OkHttpClient extends BaseClient {
+class OkHttpClient extends ClosableBaseClient {
   late bindings.OkHttpClient _client;
+
+  @override
+  bool get isClosed => _isClosed;
   bool _isClosed = false;
 
   /// The configuration for this client, applied on a per-call basis.