Initial WebSocketProtocolServer and Tests for Properties and Actions

Author: Robert Winkler

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt

@@ -266,7 +266,7 @@ fun Application.setupRouting(servient: Servient) {
                     val contentListener = ContentListener { content: Content ->
                         call.respondBytes { content.body }
                     }
-                    thing.handleObserveProperty(propertyName, contentListener)
+                    thing.handleObserveProperty(propertyName = propertyName, listener = contentListener)
                 }
                 delete("/observable") {
                     val id = call.parameters["id"] ?: return@delete call.response.status(HttpStatusCode.BadRequest)
@@ -276,7 +276,7 @@ fun Application.setupRouting(servient: Servient) {
                     val contentListener = ContentListener { content: Content ->
                         call.respondBytes { content.body }
                     }
-                    thing.handleUnobserveProperty(propertyName, contentListener)
+                    thing.handleUnobserveProperty(propertyName = propertyName)
                 }
                 get {
                     val id = call.parameters["id"] ?: return@get call.response.status(HttpStatusCode.BadRequest)
@@ -336,7 +336,7 @@ fun Application.setupRouting(servient: Servient) {
                 val contentListener = ContentListener { content: Content ->
                     call.respondBytes { content.body }
                 }
-                thing.handleSubscribeEvent(eventName, contentListener)
+                thing.handleSubscribeEvent(eventName = eventName, listener = contentListener)
                 call.response.status(HttpStatusCode.OK)
             }
             delete("/events/{name}") {
@@ -347,7 +347,7 @@ fun Application.setupRouting(servient: Servient) {
                 val contentListener = ContentListener { content: Content ->
                     call.respondBytes { content.body }
                 }
-                thing.handleUnsubscribeEvent(eventName, contentListener)
+                thing.handleUnsubscribeEvent(eventName = eventName)
                 call.response.status(HttpStatusCode.OK)
             }
         }

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolServer.kt

@@ -115,7 +115,7 @@ class MqttProtocolServer(
                 property.forms += observableForm
                 log.debug("Assign '{}' to observe Property '{}'", observableHref, name)
 
-                val observeListener: suspend (Content) -> Unit = suspend@{ content ->
+                val observeListener = ContentListener { content ->
                     log.debug("MqttServer at $baseUrl publishing to Property topic '$observableTopic'")
                     val buffer = content.body
                     val publishMessage = Mqtt5Publish.builder()
@@ -126,7 +126,7 @@ class MqttProtocolServer(
                         .build()
                     client.publish(publishMessage).await()
                 }
-                thing.handleObserveProperty(name, observeListener)
+                thing.handleObserveProperty(propertyName = name, listener = observeListener)
             }
         }
     }
@@ -160,7 +160,7 @@ class MqttProtocolServer(
             event.forms += (form)
             log.debug("Assigned '{}' to Event '{}'", href, name)
 
-            thing.handleSubscribeEvent(name, { content ->
+            thing.handleSubscribeEvent(eventName = name, listener = { content ->
                 log.debug("MqttServer at $baseUrl publishing to Events topic '$topic")
                 val publishMessage = Mqtt5Publish.builder()
                     .topic(topic)
@@ -323,7 +323,7 @@ class MqttProtocolServer(
         val contentListener = ContentListener { content ->
             respondToTopic(content, message.topic)
         }
-        thing.handleSubscribeEvent(eventName, contentListener)
+        thing.handleSubscribeEvent(eventName = eventName, listener = contentListener)
     }
 
     private suspend fun respondToTopic(content: Content?, responseTopic: MqttTopic) {

kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolServerTest.kt

@@ -173,27 +173,27 @@ class MqttProtocolServerTest {
    }
 
 
-      @Test
-      fun `subscribe to event and verify publishing`() = runTest {
-
-          val events = protocolClient.subscribeResource(Form(
-              "${brokerUrl}/${exposedThing.id}/events/$EVENT_NAME",
-              "application/json"
-          ))
-
-          events.test(timeout = 5.seconds) {
-              // Trigger event
-              exposedThing.emitEvent(EVENT_NAME, "\"testEvent\"".toInteractionInputValue())
-
-              // Verify that the event is emitted in the flow
-              val content = awaitItem()
-              val stringValue = ContentManager.contentToValue(content, StringSchema()) as DataSchemaValue.StringValue
-              assertEquals("\"testEvent\"", stringValue.value)
-
-              // Optionally verify no further emissions or complete the flow
-              cancelAndIgnoreRemainingEvents()
-          }
-      }
+    @Test
+    fun `subscribe to event and verify publishing`() = runTest {
+
+        val events = protocolClient.subscribeResource(Form(
+          "${brokerUrl}/${exposedThing.id}/events/$EVENT_NAME",
+          "application/json"
+        ))
+
+        events.test(timeout = 5.seconds) {
+          // Trigger event
+          exposedThing.emitEvent(EVENT_NAME, "\"testEvent\"".toInteractionInputValue())
+
+          // Verify that the event is emitted in the flow
+          val content = awaitItem()
+          val stringValue = ContentManager.contentToValue(content, StringSchema()) as DataSchemaValue.StringValue
+          assertEquals("\"testEvent\"", stringValue.value)
+
+          // Optionally verify no further emissions or complete the flow
+          cancelAndIgnoreRemainingEvents()
+        }
+    }
 
     @Test
     fun `subscribe to property change and verify publishing`() = runTest {

kotlin-wot-binding-websocket/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     implementation("io.ktor:ktor-client-cio")
     implementation("io.ktor:ktor-client-auth")
     implementation("io.ktor:ktor-client-logging")
+    implementation("io.ktor:ktor-server-call-logging")
     implementation("io.ktor:ktor-serialization-jackson")
     //implementation("io.insert-koin:koin-ktor:4.0.0")
     testImplementation("io.ktor:ktor-server-test-host")