Merge pull request #74 from efirestone/firestone/serialization-fix

fix: Fix serialization of commands

README.md

@@ -1,6 +1,6 @@
 
 ![GitHub Actions status](https://github.com/efirestone/hassle/workflows/Latest%20push/badge.svg)
-![LINE](https://img.shields.io/badge/line--coverage-32.63%25-red.svg)
+![LINE](https://img.shields.io/badge/line--coverage-46.07%25-orange.svg)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.codellyrandom.hassle/hassle/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.codellyrandom.hassle/hassle)
 
 # Hassle

build.gradle.kts

@@ -73,6 +73,7 @@ kotlin {
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test"))
+                implementation(kotlin("reflect"))
             }
         }
         val jvmMain by getting {

src/commonMain/kotlin/com/codellyrandom/hassle/HomeAssistantApiClientImpl.kt

@@ -35,6 +35,7 @@ import kotlinx.atomicfu.atomic
 import kotlinx.coroutines.CoroutineScope
 import kotlin.collections.set
 import kotlin.reflect.KType
+import kotlin.reflect.typeOf
 import kotlinx.serialization.json.Json as SerializationJson
 
 internal typealias SensorsByApiName = MutableMap<EntityId, Sensor<*>>
@@ -170,7 +171,7 @@ internal class HomeAssistantApiClientImpl(
     }
 
     override suspend fun <C : Command, T : Any> await(command: C, commandType: KType, resultType: KType): T {
-        val id = send(command)
+        val id = send(command, commandType)
         return session!!.consumeSingleMessage(id, resultType)
     }
 
@@ -184,10 +185,14 @@ internal class HomeAssistantApiClientImpl(
      * @param command the command to send
      * @return The ID of the command that was sent.
      */
-    internal suspend fun <C : Command> send(command: C): Int {
+    internal suspend inline fun <reified C : Command> send(command: C): Int {
+        return send(command, typeOf<C>())
+    }
+
+    internal suspend fun <C : Command> send(command: C, commandType: KType): Int {
         val id = commandId.incrementAndGet()
         val commandWithId = command.copy(id) // has to be called within single thread to prevent race conditions
-        mapper.toJson(commandWithId).let { serializedCommand ->
+        mapper.toJson(commandWithId, commandType).let { serializedCommand ->
             // TODO: Reconnect if session is missing
             session!!.callWebSocketApi(serializedCommand)
                 .also { logger.i { "Called hass api with message: $serializedCommand" } }

src/commonMain/kotlin/com/codellyrandom/hassle/communicating/CommandImpl.kt

@@ -35,25 +35,28 @@ internal class SubscribeEventsCommand(
     override var id: Int? = null,
     @SerialName("event_type")
     val eventType: EventType,
-    val type: String = "subscribe_events",
 ) : CommandImpl(id) {
-    override fun copy(id: Int?) = SubscribeEventsCommand(id = id, eventType = eventType, type = type)
+    val type: String = "subscribe_events"
+
+    override fun copy(id: Int?) = SubscribeEventsCommand(id = id, eventType = eventType)
 }
 
 @Serializable
 internal class GetStatesCommand(
     override var id: Int? = null,
-    val type: String = "get_states",
 ) : CommandImpl(id) {
-    override fun copy(id: Int?) = GetStatesCommand(id = id, type = type)
+    val type: String = "get_states"
+
+    override fun copy(id: Int?) = GetStatesCommand(id = id)
 }
 
 @Serializable
 internal class GetServicesCommand(
     override var id: Int? = null,
-    val type: String = "get_services",
 ) : CommandImpl(id) {
-    override fun copy(id: Int?) = GetServicesCommand(id = id, type = type)
+    val type: String = "get_services"
+
+    override fun copy(id: Int?) = GetServicesCommand(id = id)
 }
 
 // - Service Command
@@ -63,8 +66,9 @@ internal sealed class ServiceCommand(
     override var id: Int? = null,
     var domain: Domain,
     var service: Service,
-    val type: String = "call_service",
 ) : CommandImpl(id) {
+    val type: String = "call_service"
+
     @Serializable
     class Target(
         @SerialName("entity_id")

src/commonMain/kotlin/com/codellyrandom/hassle/core/boot/servicestore/ServicesResponse.kt

@@ -8,5 +8,5 @@ data class ServicesResponse(
     val id: Int,
     val type: String,
     val success: Boolean,
-    val result: Map<String, JsonObject>,
+    val result: Map<String, JsonObject> = mapOf(),
 )

src/commonMain/kotlin/com/codellyrandom/hassle/core/boot/statehandling/StatesResponse.kt

@@ -8,5 +8,5 @@ class StatesResponse(
     val id: Int,
     val type: String,
     val success: Boolean,
-    val result: Array<JsonObject>,
+    val result: Array<JsonObject> = arrayOf(),
 )

src/commonMain/kotlin/com/codellyrandom/hassle/extending/serviceCalls/notifications/MobileNotifications.kt

@@ -31,7 +31,6 @@ suspend fun HomeAssistantApiClient.requestLocationUpdate(vararg devices: Device)
 
 @Serializable
 class MobileNotificationData {
-    lateinit var subtitle: String
     private val push: PushData = PushData()
     var apnsHeaders: ApnsHeaders? = null
     var presentationOptions: List<PresentationOptions>? = null