Better error handling

Author: emyfops

common/src/main/kotlin/com/lambda/command/commands/CapeCommand.kt

@@ -25,7 +25,8 @@ import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
 import com.lambda.network.CapeManager.updateCape
 import com.lambda.network.NetworkManager
-import com.lambda.threading.runSafe
+import com.lambda.util.Communication.info
+import com.lambda.util.Communication.logError
 import com.lambda.util.extension.CommandBuilder
 
 object CapeCommand : LambdaCommand(
@@ -44,9 +45,10 @@ object CapeCommand : LambdaCommand(
                 }
 
                 execute {
-                    runSafe {
-                        val cape = id().value()
-                        updateCape(cape)
+                    val cape = id().value()
+                    updateCape(cape) { error ->
+                        if (error != null) logError("Could not update your cape", error)
+                        else info("Updated your cape to $cape")
                     }
                 }
             }

common/src/main/kotlin/com/lambda/network/CapeManager.kt

@@ -36,13 +36,11 @@ import net.minecraft.client.texture.NativeImageBackedTexture
 import java.io.ByteArrayOutputStream
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
-import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.extension
 import kotlin.io.path.inputStream
 import kotlin.io.path.nameWithoutExtension
 import kotlin.io.path.walk
 
-@OptIn(ExperimentalPathApi::class)
 @Suppress("JavaIoSerializableObjectMustHaveReadResolve")
 object CapeManager : ConcurrentHashMap<UUID, String>(), Loadable {
     /**
@@ -55,22 +53,26 @@ object CapeManager : ConcurrentHashMap<UUID, String>(), Loadable {
 
     /**
      * Sets the current player's cape
+     *
+     * @param block Lambda called once the coroutine completes, it contains the throwable if any
      */
-    fun updateCape(cape: String, block: () -> Unit = {}) = runIO {
-        setCape(cape)
-    }.invokeOnCompletion { block() }
+    fun updateCape(cape: String, block: (Throwable?) -> Unit = {}) = runIO {
+        setCape(cape).getOrThrow()
+    }.invokeOnCompletion { block(it) }
 
     /**
      * Fetches the cape of the given player id
+     *
+     * @param block Lambda called once the coroutine completes, it contains the throwable if any
      */
-    fun SafeContext.fetchCape(uuid: UUID, block: () -> Unit = {}) = runIO {
+    fun SafeContext.fetchCape(uuid: UUID, block: (Throwable?) -> Unit = {}) = runIO {
         val cape = getCape(uuid).getOrThrow()
 
         mc.textureManager.get(cape.identifier) ?: download(cape)
         put(uuid, cape.id)
-    }.invokeOnCompletion { block() }
+    }.invokeOnCompletion { block(it) }
 
-    private fun SafeContext.download(cape: Cape, block: () -> Unit = {}) = runIO {
+    private fun SafeContext.download(cape: Cape, block: (Throwable?) -> Unit = {}) = runIO {
         val destination = capes.resolveFile("${cape.id}.png")
         val output = ByteArrayOutputStream()
 
@@ -84,7 +86,7 @@ object CapeManager : ConcurrentHashMap<UUID, String>(), Loadable {
         val id = cape.identifier
 
         mc.textureManager.registerTexture(id, native)
-    }.invokeOnCompletion { block() }
+    }.invokeOnCompletion { block(it) }
 
     override fun load() = "Loaded ${images.size} cached capes"
 

common/src/main/kotlin/com/lambda/network/api/v1/endpoints/SetCape.kt

@@ -33,8 +33,10 @@ import io.ktor.http.*
  * response: [Unit] or error
  */
 suspend fun setCape(id: String) = runCatching {
-	LambdaHttp.put("$apiUrl/api/${apiVersion.value}/cape?id=$id") {
+	val resp = LambdaHttp.put("$apiUrl/api/${apiVersion.value}/cape?id=$id") {
 		bearerAuth(NetworkManager.accessToken)
 		contentType(ContentType.Application.Json)
 	}
+
+	check(resp.status == HttpStatusCode.OK)
 }