Better exception for failed StructMapper deserialization

pebble-dev · Feb 16, 2021 · 6dd0699 · 6dd0699
1 parent 00bc922
commit 6dd0699
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/commonMain/kotlin/io/rebble/libpebblecommon/structmapper/StructMapper.kt b/src/commonMain/kotlin/io/rebble/libpebblecommon/structmapper/StructMapper.kt
@@ -35,8 +35,13 @@ class StructMapper: Mappable {
     }
 
     override fun fromBytes(bytes: DataBuffer) {
-        getStruct().forEach {
-            it.fromBytes(bytes)
+        getStruct().forEachIndexed { i: Int, mappable: Mappable ->
+            try {
+                mappable.fromBytes(bytes)
+            }catch (e: Exception) {
+                throw PacketDecodeException("Unable to deserialize mappable ${mappable::class.simpleName} at index $i (${mappable})", e)
+            }
+
         }
     }