broaden the possible exceptions from HttpInterceptor.intercept()

Author: martinbonnin

.github/workflows/pr.yml

@@ -87,7 +87,15 @@ jobs:
         with:
           name: tests-integration.zip
           path: diagnostics.zip
-
+  ios-tests:
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - run: xcodebuild -allowProvisioningUpdates -project tests/com.apollographql.iostest/com.apollographql.iostest.xcodeproj -configuration Debug -scheme com.apollographql.iostest -sdk iphoneos -destination name='iPhone 16' test -test-timeouts-enabled YES
   intellij-plugin:
     if: "!startsWith(github.head_ref, 'release-')"
     name: Build IntelliJ Plugin

libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/network/http/HttpInterceptor.kt

@@ -18,10 +18,12 @@ interface HttpInterceptorChain {
 interface HttpInterceptor {
   /**
    * Intercepts the request and returns a response.
-   * Implementation may throw [ApolloException] in case of error. Those errors are typically
-   * caught by the network transport and subsequently exposed in `ApolloResponse.exception`
+   * Implementation may throw in case of error. Those errors are typically
+   * caught by the network transport and subsequently exposed in `ApolloResponse.exception`.
+   * If the exception is not an instance of [ApolloException], it will be wrapped in an
+   * instance of [ApolloNetworkException].
    */
-  @Throws(ApolloException::class, CancellationException::class)
+  @Throws(Throwable::class)
   suspend fun intercept(request: HttpRequest, chain: HttpInterceptorChain): HttpResponse
 
   // TODO: remove dispose

libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/network/http/HttpNetworkTransport.kt

@@ -29,6 +29,7 @@ import com.apollographql.apollo.mpp.currentTimeMillis
 import com.apollographql.apollo.network.NetworkTransport
 import com.benasher44.uuid.Uuid
 import com.benasher44.uuid.uuid4
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.emitAll
@@ -62,20 +63,23 @@ private constructor(
   ): Flow<ApolloResponse<D>> {
     return flow {
       val millisStart = currentTimeMillis()
-      var apolloException: ApolloException? = null
+      var throwable: Throwable? = null
       val httpResponse: HttpResponse? = try {
         DefaultHttpInterceptorChain(
             interceptors = interceptors + engineInterceptor,
             index = 0
         ).proceed(httpRequest)
-      } catch (e: ApolloException) {
-        apolloException = e
+      } catch (t: Throwable) {
+        if (t is CancellationException) {
+          throw t
+        }
+        throwable = t
         null
       }
 
       val responses = when {
         httpResponse == null -> {
-          flowOf(errorResponse(request.operation, apolloException!!))
+          flowOf(errorResponse(request.operation, throwable!!))
         }
 
         httpResponse.statusCode !in 200..299 && !httpResponse.isGraphQLResponse -> {
@@ -212,11 +216,11 @@ private constructor(
             if (jsonMerger == null) {
               jsonMerger = DeferredJsonMerger()
             }
-            val merged = jsonMerger!!.merge(part)
-            val deferredFragmentIds = jsonMerger!!.mergedFragmentIds
-            val isLast = !jsonMerger!!.hasNext
+            val merged = jsonMerger.merge(part)
+            val deferredFragmentIds = jsonMerger.mergedFragmentIds
+            val isLast = !jsonMerger.hasNext
 
-            if (jsonMerger!!.isEmptyPayload) {
+            if (jsonMerger.isEmptyPayload) {
               null
             } else {
               @Suppress("DEPRECATION")

tests/com.apollographql.iostest/com.apollographql.iostestTests/com_apollographql_iostestTests.swift

@@ -7,19 +7,18 @@ struct com_apollographql_iostestTests {
     final class AuthenticationInterceptor: Apollo_runtimeHttpInterceptor {
 
         func intercept(request: HttpRequest, chain: Apollo_runtimeHttpInterceptorChain) async throws -> HttpResponse {
-            throw DefaultApolloException(message: "interceptor error", cause: nil)
-            //try await chain.proceed(request: request)
+            throw NSError(domain: "interceptor error", code: 42, userInfo: ["foo": "bar"])
         }
 
         func dispose() {
             // No op
         }
     }
 
+
+    
     @Test func example() async throws {
         try MainKt.testInterceptor(interceptor: AuthenticationInterceptor())
     }
-
 }
 
-extension DefaultApolloException: Swift.Error {}

tests/shared-framework/src/commonMain/kotlin/Main.kt

@@ -1,10 +1,5 @@
 import com.apollographql.apollo.ApolloClient
-import com.apollographql.apollo.api.http.HttpRequest
-import com.apollographql.apollo.api.http.HttpResponse
-import com.apollographql.apollo.exception.ApolloException
-import com.apollographql.apollo.exception.DefaultApolloException
 import com.apollographql.apollo.network.http.HttpInterceptor
-import com.apollographql.apollo.network.http.HttpInterceptorChain
 import com.apollographql.mockserver.MockServer
 import com.apollographql.mockserver.enqueueError
 import com.example.GetFooQuery
@@ -19,22 +14,13 @@ fun testInterceptor(interceptor: HttpInterceptor) {
       ApolloClient.Builder()
           .serverUrl(mockServer.url())
           .addHttpInterceptor(interceptor)
-          .addHttpInterceptor(object : HttpInterceptor {
-            override suspend fun intercept(
-                request: HttpRequest,
-                chain: HttpInterceptorChain,
-            ): HttpResponse {
-              //throw DefaultApolloException("interceptor#1 error")
-              return chain.proceed(request)
-            }
-
-          })
           .build()
           .use { apolloClient ->
             apolloClient.query(GetFooQuery()).execute().apply {
-              check(exception!!.message!!.contains("interceptor error"))
+              println("exception: ${exception!!.cause!!.message}")
+              check(exception!!.cause!!.message!!.contains("interceptor error"))
             }
           }
     }
   }
-}
+}

…k/src/commonTest/kotlin/test/MainTest.kt …framework/src/jvm/kotlin/test/JvmTest.kttests/shared-framework/src/commonTest/kotlin/test/MainTest.kt renamed to tests/shared-framework/src/jvm/kotlin/test/JvmTest.kt tests/shared-framework/src/commonTest/kotlin/test/MainTest.kt renamed to tests/shared-framework/src/jvm/kotlin/test/JvmTest.kt

@@ -8,15 +8,15 @@ import com.apollographql.apollo.network.http.HttpInterceptorChain
 import testInterceptor
 import kotlin.test.Test
 
-class MainTest {
+class JvmTest {
   @Test
-  fun exceptionTest() {
+  fun throwingInInterceptorIsExposedInResponse() {
     testInterceptor(object : HttpInterceptor {
       override suspend fun intercept(
           request: HttpRequest,
           chain: HttpInterceptorChain,
       ): HttpResponse {
-        throw DefaultApolloException("interceptor error")
+        throw Exception("interceptor error")
       }
     })
   }