improved cdp exception

Author: nathanfallet

README.md

@@ -39,7 +39,7 @@ To use kdriver, add the following to your `build.gradle.kts`:
 
 ```kotlin
 dependencies {
-    implementation("dev.kdriver:core:0.1.17")
+    implementation("dev.kdriver:core:0.1.18")
 }
 ```
 

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 allprojects {
     group = "dev.kdriver"
-    version = "0.1.17"
+    version = "0.1.18"
 
     repositories {
         mavenCentral()

cdp/src/commonMain/kotlin/dev/kdriver/cdp/CDPErrorException.kt

@@ -0,0 +1,13 @@
+package dev.kdriver.cdp
+
+/***
+ * An error returned from the browser.
+ */
+class CDPException(
+    val method: String,
+    val code: Int,
+    val originalMessage: String,
+    val data: String?,
+) : Exception(
+    "Error while calling a command $method: $originalMessage${data?.let { "($it)" } ?: ""} (code: $code)"
+)

cdp/src/commonMain/kotlin/dev/kdriver/cdp/CDPException.kt

@@ -17,7 +17,7 @@ sealed class Message {
      */
     @Serializable
     class Response(
-        val id: Int,
+        val id: Long,
         val result: JsonElement? = null,
         val error: ResponseError? = null,
     ) : Message() {
@@ -33,10 +33,10 @@ sealed class Message {
         ) {
 
             /**
-             * Throw this error as [CDPErrorException].
+             * Throw this error as [CDPException].
              */
-            fun throwAsException() {
-                throw CDPErrorException(code, message, data)
+            fun throwAsException(method: String) {
+                throw CDPException(method, code, message, data)
             }
 
         }

cdp/src/commonMain/kotlin/dev/kdriver/cdp/Message.kt

@@ -10,7 +10,7 @@ import kotlinx.serialization.json.JsonElement
  */
 @Serializable
 class Request(
-    val id: Int,
+    val id: Long,
     val method: String,
     val params: JsonElement?,
 )

cdp/src/commonMain/kotlin/dev/kdriver/cdp/Request.kt

@@ -69,7 +69,7 @@ open class Connection(
     }
 
     private val currentIdMutex = Mutex()
-    private var currentID = 0
+    private var currentId = 0L
 
     private var allMessages = MutableSharedFlow<Message>(extraBufferCapacity = eventsBufferSize)
 
@@ -94,12 +94,12 @@ open class Connection(
 
     override suspend fun callCommand(method: String, parameter: JsonElement?): JsonElement? {
         connect()
-        val requestID = currentIdMutex.withLock { currentID++ }
-        val jsonString = Json.encodeToString(Request(requestID, method, parameter))
+        val requestId = currentIdMutex.withLock { currentId++ }
+        val jsonString = Json.encodeToString(Request(requestId, method, parameter))
         wsSession?.send(jsonString)
         logger.debug("WS > CDP: ${jsonString.take(debugStringLimit)}")
-        val result = responses.first { it.id == requestID }
-        result.error?.throwAsException()
+        val result = responses.first { it.id == requestId }
+        result.error?.throwAsException(method)
         return result.result
     }