Catch exceptions from http client, related #11

juraj-hrivnak · May 5, 2024 · 0474652 · 0474652
1 parent df01f0b
commit 0474652
Showing 1 changed file with 63 additions and 19 deletions.
diff --git a/src/commonMain/kotlin/teksturepako/pakku/api/http/Http.kt b/src/commonMain/kotlin/teksturepako/pakku/api/http/Http.kt
@@ -18,45 +18,89 @@ open class Http
         url: String, onDownload: (bytesSentTotal: Long, contentLength: Long) -> Unit = { _: Long, _: Long ->}
     ): ByteArray?
     {
-        return client.get(url) {
-            onDownload { bytesSentTotal, contentLength -> onDownload(bytesSentTotal, contentLength) }
+        return try
+        {
+            client.get(url) {
+                onDownload { bytesSentTotal, contentLength -> onDownload(bytesSentTotal, contentLength) }
+            }
+                .debug { println("${this::class.simpleName} $it") }
+                .checkLimit()
+                .bodyIfOK()
+        }
+        catch (e: Exception)
+        {
+            println(
+                "Error: ${this@Http::class.simpleName} " +
+                    "HTTP request failed with exception: (${e.javaClass}) ${e.message}"
+            )
+            null
         }
-            .debug { println("${this::class.simpleName} $it") }
-            .checkLimit()
-            .bodyIfOK()
     }
 
     /**
      * @return A body [String] of a https request or null if status code is not OK.
      */
     open suspend fun requestBody(url: String): String?
     {
-        return client.get(url)
-            .debug { println("${this::class.simpleName} $it") }
-            .checkLimit()
-            .bodyIfOK()
+        return try
+        {
+            client.get(url)
+                .debug { println("${this::class.simpleName} $it") }
+                .checkLimit()
+                .bodyIfOK()
+        }
+        catch (e: Exception)
+        {
+            println(
+                "Error: ${this@Http::class.simpleName} " +
+                        "HTTP request failed with exception: (${e.javaClass}) ${e.message}"
+            )
+            null
+        }
     }
 
     /**
      * @return A body [String] of a https request, with headers provided or null if status code is not OK.
      */
     suspend fun requestBody(url: String, vararg headers: Pair<String, String>): String?
     {
-        return client.get(url) { headers.forEach { this.headers.append(it.first, it.second) } }
-            .debug { println("${this::class.simpleName} $it") }
-            .checkLimit()
-            .bodyIfOK()
+        return try
+        {
+            client.get(url) { headers.forEach { this.headers.append(it.first, it.second) } }
+                .debug { println("${this::class.simpleName} $it") }
+                .checkLimit()
+                .bodyIfOK()
+        }
+        catch (e: Exception)
+        {
+            println(
+                "Error: ${this@Http::class.simpleName} " +
+                        "HTTP request failed with exception: (${e.javaClass}) ${e.message}"
+            )
+            null
+        }
     }
 
     suspend inline fun <reified T> requestBody(url: String, bodyContent: T): String?
     {
-        return client.post(url) {
-            contentType(ContentType.Application.Json)
-            setBody(Json.encodeToString(bodyContent)) // Don't use pretty print
+        return try
+        {
+            client.post(url) {
+                contentType(ContentType.Application.Json)
+                setBody(Json.encodeToString(bodyContent)) // Don't use pretty print
+            }
+                .debug { println("${this::class.simpleName} ${it.call} ${it.request.content}") }
+                .checkLimit()
+                .bodyIfOK()
+        }
+        catch (e: Exception)
+        {
+            println(
+                "Error: ${this@Http::class.simpleName} " +
+                        "HTTP request failed with exception: (${e.javaClass}) ${e.message}"
+            )
+            null
         }
-            .debug { println("${this::class.simpleName} ${it.call} ${it.request.content}") }
-            .checkLimit()
-            .bodyIfOK()
     }
 
     open suspend fun HttpResponse.checkLimit(): HttpResponse = this