chore: Removed Response class and return value directly and throw exception for exception handling

Author: LeeGodSRC

src/main/kotlin/dev/imanity/bbbapi/BBBClient.kt

@@ -1,5 +1,8 @@
 package dev.imanity.bbbapi
 
+import dev.imanity.bbbapi.exception.RequestErrorException
+import dev.imanity.bbbapi.exception.RequestRateLimitedException
+import dev.imanity.bbbapi.exception.RequestThrowsException
 import dev.imanity.bbbapi.model.Token
 import dev.imanity.bbbapi.request.*
 import io.ktor.client.*
@@ -22,7 +25,7 @@ class BBBClient(private val token: Token) : Closeable {
         }
     }
 
-    suspend fun <T : Any> execute(request: Request<T>, wait: Boolean = true): Response<T> {
+    suspend fun <T : Any> execute(request: Request<T>, wait: Boolean = true): T {
         while (wait) {
             val stall = throttler.stall(request.method)
             if (stall <= 0) {
@@ -31,15 +34,20 @@ class BBBClient(private val token: Token) : Closeable {
 
             delay(stall)
 
-            val response = this.executeRequest(request)
-            if (response.type == Type.RATE_LIMITED) {
-                if (request.method == Method.GET) {
-                    throttler.read = response.rateLimitTime
+            val response = kotlin.runCatching {
+                this.executeRequest(request)
+            }.getOrElse {
+                if (it is RequestRateLimitedException) {
+                    if (request.method == Method.GET) {
+                        throttler.read = it.retryAfter
+                    } else {
+                        throttler.write = it.retryAfter
+                    }
+                    null
                 } else {
-                    throttler.write = response.rateLimitTime
+                    throw it
                 }
-                continue
-            }
+            } ?: continue
 
             return response
         }
@@ -57,7 +65,7 @@ class BBBClient(private val token: Token) : Closeable {
 
         request.decode(httpResponse)
     }.getOrElse {
-        Response(Type.EXCEPTION, null, null, it, 0)
+        throw RequestThrowsException(it)
     }
 
     private suspend fun get(request: Request<*>) = httpClient.get(request.url) {
@@ -94,13 +102,13 @@ class BBBClient(private val token: Token) : Closeable {
 
 }
 
-suspend inline fun <reified T : Any> decodeResponse(response: HttpResponse): Response<T> {
+suspend inline fun <reified T : Any> decodeResponse(response: HttpResponse): T {
     val body = response.body<ResponseBody<T>>()
     return if (response.headers.contains("Retry-After")) {
-        Response.rateLimit(response.headers["Retry-After"]!!.toLong())
+        throw RequestRateLimitedException(response.headers["Retry-After"]!!.toLong())
     } else if (body.result == "error") {
-        Response.error(body.error!!)
+        throw RequestErrorException(body.error!!)
     } else {
-        Response.success(body.data!!)
+        body.data!!
     }
 }

src/main/kotlin/dev/imanity/bbbapi/request/BBBClientRequestExtensions.kt

@@ -7,6 +7,6 @@ abstract class Request<T>(urlPath: String,
                       val body: Any?) {
     val url = "https://api.builtbybit.com/v1/$urlPath"
 
-    abstract suspend fun decode(httpResponse: HttpResponse): Response<T>
+    abstract suspend fun decode(httpResponse: HttpResponse): T
 
 }

src/main/kotlin/dev/imanity/bbbapi/request/Request.kt

@@ -6,7 +6,7 @@ import dev.imanity.bbbapi.request.Response
 import io.ktor.client.statement.*
 
 class HealthRequest: Request<String>("health", Method.GET, null) {
-    override suspend fun decode(httpResponse: HttpResponse): Response<String> {
+    override suspend fun decode(httpResponse: HttpResponse): String {
         return dev.imanity.bbbapi.decodeResponse(httpResponse)
     }
 

src/main/kotlin/dev/imanity/bbbapi/request/impl/HealthRequest.kt

@@ -15,7 +15,7 @@ data class ListUnreadAlertsRequest(
     Method.GET,
     null
 ) {
-    override suspend fun decode(httpResponse: HttpResponse): Response<Array<Alert>> {
+    override suspend fun decode(httpResponse: HttpResponse): Array<Alert> {
         return decodeResponse(httpResponse)
     }
 }

src/main/kotlin/dev/imanity/bbbapi/request/impl/alert/ListUnreadAlertsRequest.kt

@@ -15,7 +15,7 @@ data class MarkUnreadAlertsAsReadRequest(
         "read" to read
     )
 ) {
-    override suspend fun decode(httpResponse: HttpResponse): Response<Unit> {
+    override suspend fun decode(httpResponse: HttpResponse) {
         return decodeResponse(httpResponse)
     }
 }

src/main/kotlin/dev/imanity/bbbapi/request/impl/alert/MarkUnreadAlertsAsReadRequest.kt

@@ -15,7 +15,7 @@ data class ListUnreadConversationsRequest(
     Method.GET,
     null
 ) {
-    override suspend fun decode(httpResponse: HttpResponse): Response<Array<Conversation>> {
+    override suspend fun decode(httpResponse: HttpResponse): Array<Conversation> {
         return decodeResponse(httpResponse)
     }
 }

src/main/kotlin/dev/imanity/bbbapi/request/impl/conversation/ListUnreadConversationsRequest.kt

@@ -39,7 +39,7 @@ data class StartConversationRequest(
         return result
     }
 
-    override suspend fun decode(httpResponse: HttpResponse): Response<Int> {
+    override suspend fun decode(httpResponse: HttpResponse): Int {
         return decodeResponse(httpResponse)
     }
 }

src/main/kotlin/dev/imanity/bbbapi/request/impl/conversation/StartConversationRequest.kt

@@ -16,7 +16,7 @@ data class ListUnreadConversationRepliesRequest(
     Method.GET,
     null
 ) {
-    override suspend fun decode(httpResponse: HttpResponse): Response<Array<Reply>> {
+    override suspend fun decode(httpResponse: HttpResponse): Array<Reply> {
         return decodeResponse(httpResponse)
     }
 }

src/main/kotlin/dev/imanity/bbbapi/request/impl/conversation/reply/ListUnreadConversationRepliesRequest.kt

@@ -16,7 +16,7 @@ data class ReplyToUnreadConversationRequest(
         "message" to message,
     ),
 ) {
-    override suspend fun decode(httpResponse: HttpResponse): Response<Int> {
+    override suspend fun decode(httpResponse: HttpResponse): Int {
         return decodeResponse(httpResponse)
     }
 }