runCatching CancellationException issues fixed

Author: AndroidPoet

ktor-boost/src/commonMain/kotlin/KtorDeferredResultExtension.kt

@@ -24,7 +24,7 @@ public suspend inline fun <reified T> HttpClient.getResultAsync(
     noinline block: HttpRequestBuilder.() -> Unit = {},
 ): Deferred<Result<T>> =
     coroutineScope {
-        async { runCatching { get(urlString, block).body() } }
+        async { runSafeSuspendCatching { get(urlString, block).body() } }
     }
 
 /**
@@ -39,7 +39,7 @@ public suspend inline fun <reified T> HttpClient.postResultAsync(
     noinline block: HttpRequestBuilder.() -> Unit = {},
 ): Deferred<Result<T>> =
     coroutineScope {
-        async { runCatching { post(urlString, block).body() } }
+        async { runSafeSuspendCatching { post(urlString, block).body() } }
     }
 
 /**
@@ -54,7 +54,7 @@ public suspend inline fun <reified T> HttpClient.putResultAsync(
     noinline block: HttpRequestBuilder.() -> Unit = {},
 ): Deferred<Result<T>> =
     coroutineScope {
-        async { runCatching { put(urlString, block).body() } }
+        async { runSafeSuspendCatching { put(urlString, block).body() } }
     }
 
 /**
@@ -69,7 +69,7 @@ public suspend inline fun <reified T> HttpClient.deleteResultAsync(
     noinline block: HttpRequestBuilder.() -> Unit = {},
 ): Deferred<Result<T>> =
     coroutineScope {
-        async { runCatching { delete(urlString, block).body() } }
+        async { runSafeSuspendCatching { delete(urlString, block).body() } }
     }
 
 /**
@@ -84,7 +84,7 @@ public suspend inline fun <reified T> HttpClient.patchResultAsync(
     noinline block: HttpRequestBuilder.() -> Unit = {},
 ): Deferred<Result<T>> =
     coroutineScope {
-        async { runCatching { patch(urlString, block).body() } }
+        async { runSafeSuspendCatching { patch(urlString, block).body() } }
     }
 
 /**
@@ -99,7 +99,7 @@ public suspend inline fun <reified T> HttpClient.headResultAsync(
     noinline block: HttpRequestBuilder.() -> Unit = {},
 ): Deferred<Result<T>> =
     coroutineScope {
-        async { runCatching { head(urlString, block).body() } }
+        async { runSafeSuspendCatching { head(urlString, block).body() } }
     }
 
 /**
@@ -114,5 +114,5 @@ public suspend inline fun <reified T> HttpClient.optionsResultAsync(
     noinline block: HttpRequestBuilder.() -> Unit = {},
 ): Deferred<Result<T>> =
     coroutineScope {
-        async { runCatching { options(urlString, block).body() } }
+        async { runSafeSuspendCatching { options(urlString, block).body() } }
     }

ktor-boost/src/commonMain/kotlin/KtorResultExtension.kt

@@ -19,7 +19,7 @@ import io.ktor.client.request.put
 suspend inline fun <reified T> HttpClient.getResult(
     urlString: String,
     noinline block: HttpRequestBuilder.() -> Unit = {},
-): Result<T> = runCatching { get(urlString, block).body() }
+): Result<T> = runSafeSuspendCatching { get(urlString, block).body() }
 
 /**
  * Performs an HTTP POST request synchronously and returns the result as a [Result] of type [T].
@@ -31,7 +31,7 @@ suspend inline fun <reified T> HttpClient.getResult(
 suspend inline fun <reified T> HttpClient.postResult(
     urlString: String,
     noinline block: HttpRequestBuilder.() -> Unit = {},
-): Result<T> = runCatching { post(urlString, block).body() }
+): Result<T> = runSafeSuspendCatching { post(urlString, block).body() }
 
 /**
  * Performs an HTTP PUT request synchronously and returns the result as a [Result] of type [T].
@@ -43,7 +43,7 @@ suspend inline fun <reified T> HttpClient.postResult(
 suspend inline fun <reified T> HttpClient.putResult(
     urlString: String,
     noinline block: HttpRequestBuilder.() -> Unit = {},
-): Result<T> = runCatching { put(urlString, block).body() }
+): Result<T> = runSafeSuspendCatching { put(urlString, block).body() }
 
 /**
  * Performs an HTTP DELETE request synchronously and returns the result as a [Result] of type [T].
@@ -55,7 +55,7 @@ suspend inline fun <reified T> HttpClient.putResult(
 suspend inline fun <reified T> HttpClient.deleteResult(
     urlString: String,
     noinline block: HttpRequestBuilder.() -> Unit = {},
-): Result<T> = runCatching { delete(urlString, block).body() }
+): Result<T> = runSafeSuspendCatching { delete(urlString, block).body() }
 
 /**
  * Performs an HTTP PATCH request synchronously and returns the result as a [Result] of type [T].
@@ -67,7 +67,7 @@ suspend inline fun <reified T> HttpClient.deleteResult(
 suspend inline fun <reified T> HttpClient.patchResult(
     urlString: String,
     noinline block: HttpRequestBuilder.() -> Unit = {},
-): Result<T> = runCatching { patch(urlString, block).body() }
+): Result<T> = runSafeSuspendCatching { patch(urlString, block).body() }
 
 /**
  * Performs an HTTP HEAD request synchronously and returns the result as a [Result] of type [T].
@@ -79,7 +79,7 @@ suspend inline fun <reified T> HttpClient.patchResult(
 suspend inline fun <reified T> HttpClient.headResult(
     urlString: String,
     noinline block: HttpRequestBuilder.() -> Unit = {},
-): Result<T> = runCatching { head(urlString, block).body() }
+): Result<T> = runSafeSuspendCatching { head(urlString, block).body() }
 
 /**
  * Performs an HTTP OPTIONS request synchronously and returns the result as a [Result] of type [T].
@@ -91,4 +91,4 @@ suspend inline fun <reified T> HttpClient.headResult(
 suspend inline fun <reified T> HttpClient.optionsResult(
     urlString: String,
     noinline block: HttpRequestBuilder.() -> Unit = {},
-): Result<T> = runCatching { options(urlString, block).body() }
+): Result<T> = runSafeSuspendCatching { options(urlString, block).body() }

ktor-boost/src/commonTest/kotlin/HttpClientExtensionsTest.kt

@@ -1,7 +1,7 @@
-import io.ktor.client.*
-import io.ktor.client.engine.mock.*
-import io.ktor.client.request.*
-import io.ktor.http.*
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.mock.MockEngine
+import io.ktor.client.engine.mock.respondOk
+import io.ktor.http.HttpMethod
 import kotlinx.coroutines.runBlocking
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -32,6 +32,9 @@ class HttpClientExtensionsTest {
         runBlocking {
             val result = httpClient.getResult<String>("sample_get_url")
 
+            result.onSuccess {
+            }.onFailure {
+            }
             println(result.toString())
 
             assertTrue(result.isSuccess)
@@ -92,7 +95,6 @@ class HttpClientExtensionsTest {
     fun `test headResult extension function`() {
         runBlocking {
             val result = httpClient.headResult<String>("sample_head_url")
-
             assertTrue(result.isSuccess)
             val responseBody = result.getOrNull()
             assertNotNull(responseBody)