feat(neon_http_client): Do not wrap http.ClientException with Interce…

…ptionException during interception Signed-off-by: provokateurin <[email protected]>
nextcloud · Sep 9, 2024 · 5471fae · 5471fae
1 parent f6b709a
commit 5471fae
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart
@@ -11,6 +11,10 @@ abstract interface class HttpInterceptor {
   ///
   /// Provided requests are not finalized yet. It is an error for an interceptor
   /// to finalize it by executing them.
+  ///
+  /// Exceptions might be thrown during interception.
+  /// If the exception is an [http.ClientException] it will be thrown as is,
+  /// otherwise it wrapped as an `InterceptionException`.
   FutureOr<http.BaseRequest> interceptRequest({required http.BaseRequest request});
 
   /// Whether this interceptor should intercept response.
@@ -19,6 +23,10 @@ abstract interface class HttpInterceptor {
   /// Intercepts the given [response].
   ///
   /// Until package:http 2.0 makes [http.BaseResponseWithUrl] mandatory the request url is used.
+  ///
+  /// Exceptions might be thrown during interception.
+  /// If the exception is an [http.ClientException] it will be thrown as is,
+  /// otherwise it wrapped as an `InterceptionException`.
   FutureOr<http.StreamedResponse> interceptResponse({
     required http.StreamedResponse response,
     required Uri url,

diff --git a/packages/neon_framework/packages/neon_http_client/lib/src/neon_http_client.dart b/packages/neon_framework/packages/neon_http_client/lib/src/neon_http_client.dart
@@ -101,7 +101,11 @@ final class NeonHttpClient with http.BaseClient {
           interceptedRequest = await interceptor.interceptRequest(
             request: interceptedRequest,
           );
-        } catch (_, stackTrace) {
+        } catch (error, stackTrace) {
+          if (error is http.ClientException) {
+            rethrow;
+          }
+
           Error.throwWithStackTrace(
             InterceptionException('Failed to intercept request', request.url),
             stackTrace,
@@ -131,7 +135,11 @@ final class NeonHttpClient with http.BaseClient {
             response: interceptedResponse,
             url: url,
           );
-        } catch (_, stackTrace) {
+        } catch (error, stackTrace) {
+          if (error is http.ClientException) {
+            rethrow;
+          }
+
           Error.throwWithStackTrace(
             InterceptionException('Failed to intercept response', request.url),
             stackTrace,

diff --git a/packages/neon_framework/packages/neon_http_client/test/neon_http_client_test.dart b/packages/neon_framework/packages/neon_http_client/test/neon_http_client_test.dart
@@ -4,6 +4,7 @@ import 'package:http/testing.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:neon_http_client/src/interceptors/interceptors.dart';
 import 'package:neon_http_client/src/neon_http_client.dart';
+import 'package:nextcloud/nextcloud.dart';
 import 'package:test/test.dart';
 
 class _MockCookieStore extends Mock implements CookieStore {}
@@ -137,7 +138,26 @@ void main() {
         ).called(1);
       });
 
-      test('rethrows errors as InterceptionFailure', () async {
+      test('rethrows http.ClientExceptions', () async {
+        final exception = DynamiteStatusCodeException(Response('', 404));
+        when(() => interceptor.shouldInterceptRequest(any())).thenReturn(true);
+        when(
+          () => interceptor.interceptRequest(request: any(named: 'request')),
+        ).thenThrow(exception);
+
+        expect(client.get(uri), throwsA(exception));
+
+        when(() => interceptor.shouldInterceptRequest(any())).thenReturn(true);
+        when(() => interceptor.interceptRequest(request: any(named: 'request'))).thenReturn(fakeRequest());
+        when(() => interceptor.shouldInterceptResponse(any())).thenReturn(true);
+        when(
+          () => interceptor.interceptResponse(response: any(named: 'response'), url: any(named: 'url')),
+        ).thenThrow(exception);
+
+        expect(client.get(uri), throwsA(exception));
+      });
+
+      test('rethrows non-http.ClientExceptions as InterceptionFailure', () async {
         when(() => interceptor.shouldInterceptRequest(any())).thenReturn(true);
         when(
           () => interceptor.interceptRequest(request: any(named: 'request')),