Removed redundant ManualCancellationException

Author: Mr3zee

krpc/krpc-client/src/commonMain/kotlin/kotlinx/rpc/krpc/client/KrpcClient.kt

@@ -484,7 +484,7 @@ public abstract class KrpcClient : RpcClient, KrpcEndpoint {
         } catch (e: CancellationException) {
             internalScope.ensureActive()
 
-            failure = ManualCancellationException(e)
+            failure = e
 
             // stop the flow and its coroutine, other flows are not affected
             throw e

krpc/krpc-core/src/commonMain/kotlin/kotlinx/rpc/krpc/internal/ExceptionUtils.kt

@@ -13,7 +13,11 @@ public fun serializeException(cause: Throwable): SerializedException {
     val message = cause.message ?: "Unknown exception"
     val stacktrace = cause.stackElements()
     val serializedCause = cause.cause?.let { serializeException(it) }
-    val className = cause::class.rpcInternalTypeName ?: ""
+    val className = if (cause is CancellationException || cause is kotlin.coroutines.cancellation.CancellationException) {
+        CancellationException::class.rpcInternalTypeName ?: "kotlinx.coroutines.CancellationException"
+    } else {
+        cause::class.rpcInternalTypeName ?: ""
+    }
 
     return SerializedException(cause.toString(), message, stacktrace, serializedCause, className)
 }
@@ -22,16 +26,15 @@ internal expect fun Throwable.stackElements(): List<StackElement>
 
 internal expect fun SerializedException.deserializeUnsafe(): Throwable
 
-internal fun SerializedException.nonJvmManualCancellationExceptionDeserialize(): ManualCancellationException? {
-    if (className == ManualCancellationException::class.rpcInternalTypeName) {
-        val cancellation = cause?.deserializeUnsafe()
-            ?: error("ManualCancellationException must have a cause")
+internal fun SerializedException.cancellationExceptionDeserialize(): CancellationException? {
+    if (className == CancellationException::class.rpcInternalTypeName
+        || className == kotlin.coroutines.cancellation.CancellationException::class.rpcInternalTypeName
+    ) {
+        val cause = this@cancellationExceptionDeserialize.cause?.deserializeUnsafe()
 
-        return ManualCancellationException(
-            CancellationException(
-                message = cancellation.message,
-                cause = cancellation.cause,
-            )
+        return CancellationException(
+            message = message,
+            cause = cause,
         )
     }
 
@@ -44,29 +47,19 @@ public fun SerializedException.deserialize(): Throwable {
         deserializeUnsafe()
     }
 
-    val result = if (cause.isFailure) {
+    return if (cause.isFailure) {
         cause.exceptionOrNull()!!
     } else {
-        val ex = cause.getOrNull()!!
-        if (ex is ManualCancellationException) {
-            ex.cause
-        } else {
-            ex
-        }
+        cause.getOrNull()!!
     }
-
-    return result
 }
 
-@InternalRpcApi
-public class ManualCancellationException(override val cause: CancellationException): RuntimeException()
-
 internal expect class DeserializedException(
     toStringMessage: String,
     message: String,
     stacktrace: List<StackElement>,
     cause: SerializedException?,
-    className: String
+    className: String,
 ) : Throwable {
     override val message: String
 }

krpc/krpc-core/src/jsMain/kotlin/kotlinx/rpc/krpc/internal/ExceptionUtils.js.kt

@@ -23,6 +23,6 @@ internal actual class DeserializedException actual constructor(
 internal actual fun Throwable.stackElements(): List<StackElement> = emptyList()
 
 internal actual fun SerializedException.deserializeUnsafe(): Throwable {
-    return nonJvmManualCancellationExceptionDeserialize()
+    return cancellationExceptionDeserialize()
         ?: DeserializedException(toStringMessage, message, stacktrace, cause, className)
 }

krpc/krpc-core/src/jvmMain/kotlin/kotlinx/rpc/krpc/internal/ExceptionUtils.jvm.kt

@@ -37,6 +37,11 @@ internal actual fun Throwable.stackElements(): List<StackElement> = stackTrace.m
 }
 
 internal actual fun SerializedException.deserializeUnsafe(): Throwable {
+    val cancellationException = cancellationExceptionDeserialize()
+    if (cancellationException != null) {
+        return cancellationException
+    }
+
     try {
         val clazz = Class.forName(className)
         val fieldsCount = clazz.fieldsCountOrDefault(throwableFields)

krpc/krpc-core/src/nativeMain/kotlin/kotlinx/rpc/krpc/internal/ExceptionUtils.native.kt

@@ -22,6 +22,6 @@ internal actual class DeserializedException actual constructor(
 internal actual fun Throwable.stackElements(): List<StackElement> = emptyList()
 
 internal actual fun SerializedException.deserializeUnsafe(): Throwable {
-    return nonJvmManualCancellationExceptionDeserialize()
+    return cancellationExceptionDeserialize()
         ?: DeserializedException(toStringMessage, message, stacktrace, cause, className)
 }

krpc/krpc-core/src/wasmJsMain/kotlin/kotlinx/rpc/krpc/internal/ExceptionUtils.wasm.kt

@@ -23,6 +23,6 @@ internal actual class DeserializedException actual constructor(
 internal actual fun Throwable.stackElements(): List<StackElement> = emptyList()
 
 internal actual fun SerializedException.deserializeUnsafe(): Throwable {
-    return nonJvmManualCancellationExceptionDeserialize()
+    return cancellationExceptionDeserialize()
         ?: DeserializedException(toStringMessage, message, stacktrace, cause, className)
 }

krpc/krpc-core/src/wasmWasiMain/kotlin/kotlinx/rpc/krpc/internal/ExceptionUtils.wasmWasi.kt

@@ -20,6 +20,6 @@ internal actual class DeserializedException actual constructor(
 internal actual fun Throwable.stackElements(): List<StackElement> = emptyList()
 
 internal actual fun SerializedException.deserializeUnsafe(): Throwable {
-    return nonJvmManualCancellationExceptionDeserialize()
+    return cancellationExceptionDeserialize()
         ?: DeserializedException(toStringMessage, message, stacktrace, cause, className)
 }

krpc/krpc-server/src/commonMain/kotlin/kotlinx/rpc/krpc/server/internal/KrpcServerService.kt

@@ -193,7 +193,7 @@ internal class KrpcServerService<@Rpc T : Any>(
                     throw cause
                 }
 
-                failure = ManualCancellationException(cause)
+                failure = cause
 
                 throw cause
             } catch (cause: Throwable) {
@@ -332,7 +332,7 @@ internal class KrpcServerService<@Rpc T : Any>(
                 throw cause
             }
 
-            failure = ManualCancellationException(cause)
+            failure = cause
 
             throw cause
         } catch (cause: Throwable) {