- Added config property for a WoT base URL, which will be used for the URLs of the forms of properties, actions, and events.

- The server is bound to '0.0.0.0' by default, ensuring it is accessible within the cluster (aligning with Spring Boot’s default behavior).
- Adjusted server configuration properties to ensure proper setup of the WebSocket server.

Author: sbussweiler

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

@@ -44,12 +44,13 @@ open class HttpProtocolServer(
     private val wait: Boolean = false,
     private val bindHost: String = "0.0.0.0",
     private val bindPort: Int = 8080,
-    private val createServer: (host: String, port: Int, servient: Servient) -> EmbeddedServer<*, *> = ::defaultServer
+    private val createServer: (host: String, port: Int, servient: Servient) -> EmbeddedServer<*, *> = ::defaultServer,
+    thingDescriptionBaseUrl: String = "localhost"
 ) : ProtocolServer {
     val things: MutableMap<String, ExposedThing> = mutableMapOf()
     var started = false
     private var server: EmbeddedServer<*, *>? = null
-    private var actualAddresses: List<String> = listOf("http://$bindHost:$bindPort")
+    private var actualAddresses: List<String> = listOf("http://$thingDescriptionBaseUrl:$bindPort")
 
     companion object {
         private val log = LoggerFactory.getLogger(HttpProtocolServer::class.java)

kotlin-wot-binding-http/src/test/kotlin/http/HttpProtocolServerTest.kt

@@ -395,7 +395,7 @@ class HttpProtocolServerTest {
         // Assert
         assertTrue(exposedThing.forms.isNotEmpty(), "Expected forms to be added to thing")
 
-        val expectedHref = "http://0.0.0.0:8080/${exposedThing.id}/all/properties"
+        val expectedHref = "http://localhost:8080/${exposedThing.id}/all/properties"
         val form = exposedThing.forms.find { it.href == expectedHref  }
         assertNotNull(form, "Expected form for reading all properties to be added")
         assertEquals(CONTENT_TYPE, form.contentType)
@@ -406,7 +406,7 @@ class HttpProtocolServerTest {
     fun `exposeProperties should add forms for read write properties`() {
         // Arrange
         server.started = true
-        val address = "http://0.0.0.0:8080"
+        val address = "http://localhost:8080"
         // Act
         server.exposeProperties(exposedThing, address, CONTENT_TYPE)
 
@@ -422,7 +422,7 @@ class HttpProtocolServerTest {
     fun `exposeActions should add form for action`() {
         // Arrange
         server.started = true
-        val address = "http://0.0.0.0:8080"
+        val address = "http://localhost:8080"
         // Act
         server.exposeActions(exposedThing, address, CONTENT_TYPE)
 
@@ -439,7 +439,7 @@ class HttpProtocolServerTest {
     fun `exposeEvents should add form for event`() {
         // Arrange
         server.started = true
-        val address = "http://0.0.0.0:8080"
+        val address = "http://localhost:8080"
         // Act
         server.exposeEvents(exposedThing, address, CONTENT_TYPE)
 

kotlin-wot-binding-websocket/src/main/kotlin/websocket/WebSocketProtocolServer.kt

@@ -40,13 +40,14 @@ class WebSocketProtocolServer(
     private val wait: Boolean = false,
     private val bindHost: String = "0.0.0.0",
     private val bindPort: Int = 8080,
-    private val createServer: (host: String, port: Int, servient: Servient) -> EmbeddedServer<*, *> = ::defaultWebSocketServer
+    private val createServer: (host: String, port: Int, servient: Servient) -> EmbeddedServer<*, *> = ::defaultWebSocketServer,
+    thingDescriptionBaseUrl: String = "localhost"
 ) : ProtocolServer {
     private val things: MutableMap<String, ExposedThing> = mutableMapOf()
 
     var started = false
     private var server: EmbeddedServer<*, *>? = null
-    private var actualAddresses: List<String> = listOf("ws://$bindHost:$bindPort")
+    private var actualAddresses: List<String> = listOf("ws://$thingDescriptionBaseUrl:$bindPort")
 
     companion object {
         private val log = LoggerFactory.getLogger(WebSocketProtocolServer::class.java)

kotlin-wot-integration-tests/src/main/resources/application.yaml

@@ -8,6 +8,7 @@ arc:
         url: https://gpt4-uk.openai.azure.com
 
 wot:
+  baseUrl: my-base-url
   servient:
     security:
       credentials:
@@ -18,10 +19,10 @@ wot:
       server:
         enabled: true
         host: localhost
-        port: 8080
+        port: 8181
     http:
       server:
-        enabled: false
+        enabled: true
         host: localhost
         port: 8080
     mqtt:

kotlin-wot-spring-boot-starter/src/main/kotlin/spring/HttpProperties.kt

@@ -3,10 +3,16 @@ package ai.ancf.lmos.wot.spring
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.validation.annotation.Validated
 
-@ConfigurationProperties(prefix = "wot.servient.http.server", ignoreUnknownFields = true)
-@Validated
-data class HttpServerProperties(
+open class ServerProperties (
     var enabled: Boolean = true,
-    var host: String = "localhost",
+    var host: String = "0.0.0.0",
     var port: Int = 8080
-)
+)
+
+@ConfigurationProperties(prefix = "wot.servient.http.server", ignoreUnknownFields = true)
+@Validated
+class HttpServerProperties : ServerProperties()
+
+@ConfigurationProperties(prefix = "wot.servient.websocket.server", ignoreUnknownFields = true)
+@Validated
+class WebsocketProperties : ServerProperties()

kotlin-wot-spring-boot-starter/src/main/kotlin/spring/ServientAutoConfiguration.kt

@@ -22,7 +22,14 @@ import org.springframework.context.annotation.Configuration
 
 
 @AutoConfiguration
-@EnableConfigurationProperties(CredentialsProperties::class, HttpServerProperties::class, MqttServerProperties::class, MqttClientProperties::class)
+@EnableConfigurationProperties(
+    CredentialsProperties::class,
+    WotProperties::class,
+    HttpServerProperties::class,
+    WebsocketProperties::class,
+    MqttServerProperties::class,
+    MqttClientProperties::class
+)
 class ServientAutoConfiguration {
 
     @Bean
@@ -55,8 +62,15 @@ class ServientAutoConfiguration {
             havingValue = "true",
             matchIfMissing = true // By default, enable the server
         )
-        fun webSocketProtocolServer(httpServerProperties: HttpServerProperties): WebSocketProtocolServer {
-            return WebSocketProtocolServer(bindHost = httpServerProperties.host, bindPort = httpServerProperties.port)
+        fun webSocketProtocolServer(
+            websocketProperties: WebsocketProperties,
+            wotProperties: WotProperties
+        ): WebSocketProtocolServer {
+            return WebSocketProtocolServer(
+                bindHost = websocketProperties.host,
+                bindPort = websocketProperties.port,
+                thingDescriptionBaseUrl = wotProperties.baseUrl
+            )
         }
 
         @Bean
@@ -82,8 +96,15 @@ class ServientAutoConfiguration {
             havingValue = "true",
             matchIfMissing = true // By default, enable the server
         )
-        fun httpProtocolServer(httpServerProperties: HttpServerProperties): HttpProtocolServer {
-            return HttpProtocolServer(bindHost = httpServerProperties.host, bindPort = httpServerProperties.port)
+        fun httpProtocolServer(
+            httpServerProperties: HttpServerProperties,
+            wotProperties: WotProperties
+        ): HttpProtocolServer {
+            return HttpProtocolServer(
+                bindHost = httpServerProperties.host,
+                bindPort = httpServerProperties.port,
+                thingDescriptionBaseUrl = wotProperties.baseUrl
+            )
         }
 
         @Bean

kotlin-wot-spring-boot-starter/src/main/kotlin/spring/WotProperties.kt

@@ -0,0 +1,10 @@
+package ai.ancf.lmos.wot.spring
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.validation.annotation.Validated
+
+@ConfigurationProperties(prefix = "wot", ignoreUnknownFields = true)
+@Validated
+data class WotProperties(
+    var baseUrl: String = "localhost"
+)