feat(client): configure the entire server url rather than just host a…

…nd port
d1snin · Apr 6, 2023 · 0ecb146 · 0ecb146
1 parent 23b52aa
commit 0ecb146
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/e2e/src/jvmTest/kotlin/dev/d1s/ktor/events/configuration/TestClient.kt b/e2e/src/jvmTest/kotlin/dev/d1s/ktor/events/configuration/TestClient.kt
@@ -28,7 +28,6 @@ val webSocketClient = HttpClient(CIO) {
     }
 
     install(WebSocketEvents) {
-        host = "localhost"
-        port = TEST_SERVER_PORT
+        url = "ws://localhost:$TEST_SERVER_PORT"
     }
 }
diff --git a/...s-client/src/commonMain/kotlin/dev/d1s/ktor/events/client/WebSocketEventHandlerBuilder.kt b/...s-client/src/commonMain/kotlin/dev/d1s/ktor/events/client/WebSocketEventHandlerBuilder.kt
@@ -23,6 +23,7 @@ import io.ktor.client.*
 import io.ktor.client.plugins.*
 import io.ktor.client.plugins.websocket.*
 import io.ktor.client.request.*
+import io.ktor.http.*
 
 /**
  * Opens a [block] with [DefaultClientWebSocketSession] associated with the given [event reference][reference] and optional [path].
@@ -53,10 +54,12 @@ public suspend fun HttpClient.webSocketEvents(
         parameter(Routes.PRINCIPAL_QUERY_PARAMETER, reference.principal)
     }
 
+    val url = URLBuilder(webSocketEventsConfiguration.requiredBaseUrl).apply {
+        path(path)
+    }.buildString()
+
     webSocket(
-        host = webSocketEventsConfiguration.requiredHost,
-        port = webSocketEventsConfiguration.requiredPort,
-        path = path,
+        urlString = url,
         request = requestConfiguration
     ) {
         block()

diff --git a/...s-events-client/src/commonMain/kotlin/dev/d1s/ktor/events/client/WebSocketEventsPlugin.kt b/...s-events-client/src/commonMain/kotlin/dev/d1s/ktor/events/client/WebSocketEventsPlugin.kt
@@ -32,23 +32,15 @@ public val WebSocketEvents: ClientPlugin<WebSocketEventsConfiguration> =
 
 public class WebSocketEventsConfiguration {
 
-    public var host: String? = null
+    public var url: String? = null
 
-    public var port: Int? = null
-
-    internal val requiredHost
-        get() = requireNotNull(host) {
-            "Host is not configured."
-        }
-
-    internal val requiredPort
-        get() = requireNotNull(port) {
-            "Port is not configured."
+    internal val requiredBaseUrl
+        get() = requireNotNull(url) {
+            "URL is not configured."
         }
 
     internal fun validate() {
-        requiredHost
-        requiredPort
+        requiredBaseUrl
     }
 }