eclipse-thingweb · RobWin · Mar 3, 2025 · Feb 26, 2025 · Mar 2, 2025 · Mar 2, 2025
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,16 +1,27 @@
 plugins {
     kotlin("jvm") version "2.0.20"
     id("org.jetbrains.kotlinx.kover") version "0.8.3"
+    id("org.cadixdev.licenser") version "0.6.1"
     `maven-publish`
 }
 
 subprojects {
     apply(plugin = "org.jetbrains.kotlin.jvm")
     apply(plugin = "org.jetbrains.kotlinx.kover")
     apply(plugin = "maven-publish")
+    apply(plugin = "org.cadixdev.licenser")
 
     group = "ai.ancf.lmos"
-    version = "0.1.0-SNAPSHOT"
+    version = "0.1.3-SNAPSHOT"
+
+    license {
+        header(rootProject.file("LICENSE"))
+        include("**/*.java")
+        include("**/*.kt")
+        include("**/*.yaml")
+        exclude("**/*.properties")
+    }
+
 
     dependencies {
         testImplementation(kotlin("test"))

diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/HttpClientConfig.kt b/kotlin-wot-binding-http/src/main/kotlin/http/HttpClientConfig.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package http
 
 import ai.ancf.lmos.wot.security.SecurityScheme

diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClient.kt b/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClient.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 
 import ai.ancf.lmos.wot.content.Content
@@ -124,8 +130,15 @@ fun createHttpClient(): HttpClient {
             engine {
                 proxy = ProxyBuilder.http(proxyUrl)
             }
+            install(HttpTimeout) {
+                requestTimeoutMillis = 50000
+            }
         }
     } else {
-        HttpClient(CIO)
+        HttpClient(CIO) {
+            install(HttpTimeout) {
+                requestTimeoutMillis = 50000
+            }
+        }
     }
 }
diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClientFactory.kt b/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolClientFactory.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 
 import ai.anfc.lmos.wot.binding.ProtocolClient

diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt b/kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 
 import ai.ancf.lmos.wot.JsonMapper

diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/HttpsProtocolClientFactory.kt b/kotlin-wot-binding-http/src/main/kotlin/http/HttpsProtocolClientFactory.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 
 /**

diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/routes/AbstractRoute.kt b/kotlin-wot-binding-http/src/main/kotlin/http/routes/AbstractRoute.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http.routes
 
 import ai.ancf.lmos.wot.binding.http.routes.AbstractRoute

diff --git a/kotlin-wot-binding-http/src/main/kotlin/http/routes/ThingsRoute.kt b/kotlin-wot-binding-http/src/main/kotlin/http/routes/ThingsRoute.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http.routes
 
 import ai.ancf.lmos.wot.content.Content

diff --git a/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientFactoryTest.kt b/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientFactoryTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 
 import kotlin.test.Test

diff --git a/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientTest.kt b/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolClientTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 import ai.ancf.lmos.wot.content.Content
 import ai.ancf.lmos.wot.security.BasicSecurityScheme

diff --git a/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolServerTest.kt b/kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolServerTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 
 import ai.ancf.lmos.wot.Servient

diff --git a/kotlin-wot-binding-http/src/test/kotlin/http/HttpsProtocolClientFactoryTest.kt b/kotlin-wot-binding-http/src/test/kotlin/http/HttpsProtocolClientFactoryTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.http
 
 import kotlin.test.Test

diff --git a/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttClientConfig.kt b/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttClientConfig.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import java.util.*

diff --git a/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolClient.kt b/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolClient.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.ancf.lmos.wot.content.Content

diff --git a/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolClientFactory.kt b/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolClientFactory.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.anfc.lmos.wot.binding.ProtocolClient

diff --git a/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolException.kt b/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolException.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 

diff --git a/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolServer.kt b/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolServer.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.ancf.lmos.wot.Servient

diff --git a/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttsProtocolClientFactory.kt b/kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttsProtocolClientFactory.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.anfc.lmos.wot.binding.ProtocolClient

diff --git a/kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolClientFactoryTest.kt b/kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolClientFactoryTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import kotlin.test.Test

diff --git a/kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolClientTest.kt b/kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolClientTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.ancf.lmos.wot.content.Content

diff --git a/kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolServerTest.kt b/kotlin-wot-binding-mqtt/src/test/kotlin/integration/MqttProtocolServerTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.ancf.lmos.wot.JsonMapper

diff --git a/kotlin-wot-binding-websocket/src/main/kotlin/websocket/HttpClientConfig.kt b/kotlin-wot-binding-websocket/src/main/kotlin/websocket/HttpClientConfig.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.websocket
 
 import ai.ancf.lmos.wot.security.SecurityScheme

diff --git a/kotlin-wot-binding-websocket/src/main/kotlin/websocket/Messages.kt b/kotlin-wot-binding-websocket/src/main/kotlin/websocket/Messages.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.websocket
 
 import com.fasterxml.jackson.annotation.*

diff --git a/...n-wot-binding-websocket/src/main/kotlin/websocket/SecureWebSocketProtocolClientFactory.kt b/...n-wot-binding-websocket/src/main/kotlin/websocket/SecureWebSocketProtocolClientFactory.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.websocket
 
 /**

diff --git a/kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolClient.kt b/kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolClient.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.websocket
 
 import ai.ancf.lmos.wot.JsonMapper
@@ -91,6 +97,7 @@ class WebSocketProtocolClient(
             requestAndReply(resource.form, message)
         } finally {
             resourceChannels[resource.name]?.close()
+            resourceChannels.remove(resource.name)
         }
     }
 
@@ -105,7 +112,7 @@ class WebSocketProtocolClient(
         resourceChannels[resource.name] = channel
 
         return channel.consumeAsFlow().onCompletion {
-            resourceChannels.remove(resource.name)
+            unlinkResource(resource, resourceType)
         }
     }
 

diff --git a/kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolClientFactory.kt b/kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolClientFactory.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.websocket
 
 import ai.anfc.lmos.wot.binding.ProtocolClient

diff --git a/kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolServer.kt b/kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolServer.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.websocket
 
 import ai.ancf.lmos.wot.JsonMapper
@@ -206,11 +212,22 @@ fun Application.setupRoutingWithWebSockets(servient: Servient) {
 
         webSocket("/ws") {
             val sessionId = this.call.request.headers["Sec-WebSocket-Key"] ?: UUID.randomUUID().toString()
-            handleWebSocketSession(sessionId, servient)
+            try {
+                handleWebSocketSession(sessionId, servient)
+            } finally {
+                // This will be triggered when the WebSocket connection is closed
+                cleanUp(sessionId, servient)
+            }
         }
     }
 }
 
+fun cleanUp(sessionId: String, servient: Servient)  {
+    servient.things.values.forEach { thing ->
+        thing.unregisterAllListeners(sessionId)
+    }
+}
+
 @WithSpan(kind = SpanKind.SERVER)
 suspend fun DefaultWebSocketServerSession.handleWebSocketSession(
     @SpanAttribute("websocket.session.id") sessionId: String,
@@ -483,6 +500,7 @@ suspend fun DefaultWebSocketServerSession.handleSubscribeEvent(thing: ExposedThi
         }
     }
 }
+
 @WithSpan(kind = SpanKind.SERVER)
 suspend fun DefaultWebSocketServerSession.handleUnsubscribeEvent(thing: ExposedThing, message: UnsubscribeEventMessage, @SpanAttribute("thingId") thingId: String, @SpanAttribute("sessionId") sessionId: String) {
     val eventName = message.event

diff --git a/kotlin-wot-binding-websocket/src/test/kotlin/websocket/WebSocketProtocolClientTest.kt b/kotlin-wot-binding-websocket/src/test/kotlin/websocket/WebSocketProtocolClientTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package websocket
 
 import ai.ancf.lmos.wot.Servient

diff --git a/kotlin-wot-binding-websocket/src/test/kotlin/websocket/WebSocketProtocolServerTest.kt b/kotlin-wot-binding-websocket/src/test/kotlin/websocket/WebSocketProtocolServerTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package websocket
 
 import ai.ancf.lmos.wot.JsonMapper

diff --git a/kotlin-wot-binding-websocket/src/test/kotlin/websocket/WebsocketProtocolClientFactoryTest.kt b/kotlin-wot-binding-websocket/src/test/kotlin/websocket/WebsocketProtocolClientFactoryTest.kt
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: Robert Winkler
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package ai.ancf.lmos.wot.binding.mqtt
 
 import ai.ancf.lmos.wot.binding.websocket.SecureWebSocketProtocolClientFactory