🔀 resolve merge conflicts

Author: techouse

lib/extensions/uri.dart

@@ -4,20 +4,20 @@ import 'package:http_interceptor/utils/utils.dart';
 /// Extends `Uri` to allow adding parameters to already created instances.
 extension AddParameters on Uri {
   /// Returns a new [Uri] instance based on `this` and adds [parameters].
-  Uri addParameters([Map<String, dynamic>? parameters]) {
-    if (parameters?.isNotEmpty ?? false) {
-      String finalUrl = buildUrlString(
-        "$origin$path",
-        {
-          ...queryParametersAll,
-          ...?parameters,
-        },
-      );
-      if (fragment.isNotEmpty) {
-        finalUrl += '#$fragment';
-      }
-      return finalUrl.toUri();
-    }
-    return this;
-  }
+  Uri addParameters([Map<String, dynamic>? parameters]) =>
+      parameters?.isNotEmpty ?? false
+          ? (StringBuffer()
+                ..writeAll([
+                  buildUrlString(
+                    "$origin$path",
+                    {
+                      ...queryParametersAll,
+                      ...?parameters,
+                    },
+                  ),
+                  if (fragment.isNotEmpty) '#$fragment',
+                ]))
+              .toString()
+              .toUri()
+          : this;
 }

lib/http/intercepted_client.dart

@@ -262,43 +262,49 @@ class InterceptedClient extends BaseClient {
   void _checkResponseSuccess(Uri url, Response response) {
     if (response.statusCode < 400) return;
     final StringBuffer message = StringBuffer()
-      ..write("Request to $url failed with status ${response.statusCode}");
-    if (response.reasonPhrase != null) {
-      message.write(": ${response.reasonPhrase}");
-    }
+      ..writeAll([
+        "Request to $url failed with status ${response.statusCode}",
+        if (response.reasonPhrase != null) ": ${response.reasonPhrase}",
+      ]);
+
     throw ClientException("$message.", url);
   }
 
   /// Attempts to perform the request and intercept the data
   /// of the response
-  Future<BaseResponse> _attemptRequest(BaseRequest request,
-      {bool isStream = false}) async {
+  Future<BaseResponse> _attemptRequest(
+    BaseRequest request, {
+    bool isStream = false,
+  }) async {
     _retryCount = 0; // Reset retry count for each new request
     return _attemptRequestWithRetries(request, isStream: isStream);
   }
 
   /// Internal method that handles the actual request with retry logic
-  Future<BaseResponse> _attemptRequestWithRetries(BaseRequest request,
-      {bool isStream = false}) async {
+  Future<BaseResponse> _attemptRequestWithRetries(
+    BaseRequest request, {
+    bool isStream = false,
+  }) async {
     BaseResponse response;
+
     try {
       // Intercept request
       final BaseRequest interceptedRequest = await _interceptRequest(request);
 
-      StreamedResponse stream;
+      late final StreamedResponse stream;
+
       if (requestTimeout == null) {
         stream = await _inner.send(interceptedRequest);
       } else {
         // Use a completer to properly handle timeout and cancellation
-        final completer = Completer<StreamedResponse>();
+        final Completer<StreamedResponse> completer = Completer();
         final Future<StreamedResponse> requestFuture =
             _inner.send(interceptedRequest);
 
         // Set up timeout with proper cleanup
-        Timer? timeoutTimer;
         bool isCompleted = false;
 
-        timeoutTimer = Timer(requestTimeout!, () {
+        final Timer timeoutTimer = Timer(requestTimeout!, () {
           if (!isCompleted) {
             isCompleted = true;
             if (onRequestTimeout != null) {
@@ -337,15 +343,15 @@ class InterceptedClient extends BaseClient {
 
         // Handle the actual request completion
         requestFuture.then((streamResponse) {
-          timeoutTimer?.cancel();
+          timeoutTimer.cancel();
           if (!isCompleted) {
             isCompleted = true;
             if (!completer.isCompleted) {
               completer.complete(streamResponse);
             }
           }
         }).catchError((error) {
-          timeoutTimer?.cancel();
+          timeoutTimer.cancel();
           if (!isCompleted) {
             isCompleted = true;
             if (!completer.isCompleted) {
@@ -429,7 +435,8 @@ class InterceptedClient extends BaseClient {
     StackTrace? stackTrace,
   }) async {
     for (InterceptorContract interceptor in interceptors) {
-      if (await interceptor.shouldInterceptError()) {
+      if (await interceptor.shouldInterceptError(
+          request: request, response: response)) {
         await interceptor.interceptError(
           request: request,
           response: response,

lib/models/interceptor_contract.dart

@@ -38,10 +38,15 @@ abstract class InterceptorContract {
   FutureOr<bool> shouldInterceptResponse({required BaseResponse response}) =>
       true;
 
+  /// Intercepts the response.
   FutureOr<BaseResponse> interceptResponse({required BaseResponse response});
 
   /// Checks if the error should be intercepted.
-  FutureOr<bool> shouldInterceptError() => true;
+  FutureOr<bool> shouldInterceptError({
+    BaseRequest? request,
+    BaseResponse? response,
+  }) =>
+      true;
 
   /// Intercepts the error response.
   FutureOr<void> interceptError({