From 584511f91d9c5a478c69223027ef746880274398 Mon Sep 17 00:00:00 2001 From: d1snin Date: Mon, 15 Apr 2024 01:07:47 +0300 Subject: [PATCH] fix: use events path under `/api` --- .../commonMain/kotlin/dev/d1s/beam/client/DefaultBeamClient.kt | 2 +- .../src/commonMain/kotlin/dev/d1s/beam/commons/Paths.kt | 2 ++ .../dev/d1s/beam/daemon/configuration/WebSocketEvents.kt | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/beam-client/src/commonMain/kotlin/dev/d1s/beam/client/DefaultBeamClient.kt b/beam-client/src/commonMain/kotlin/dev/d1s/beam/client/DefaultBeamClient.kt index 5fced274..3bd9ceed 100644 --- a/beam-client/src/commonMain/kotlin/dev/d1s/beam/client/DefaultBeamClient.kt +++ b/beam-client/src/commonMain/kotlin/dev/d1s/beam/client/DefaultBeamClient.kt @@ -514,7 +514,7 @@ public class DefaultBeamClient( requireWsBaseUrl() eventHandlingScope.launch { - httpClient.webSocketEvents(reference) { + httpClient.webSocketEvents(reference, path = Paths.EVENTS) { while (true) { val event = try { receiveWebSocketEvent() diff --git a/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/Paths.kt b/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/Paths.kt index 427c16f9..fa530bd5 100644 --- a/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/Paths.kt +++ b/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/Paths.kt @@ -31,6 +31,8 @@ public object Paths { public const val DAEMON_BASE: String = "/api" + public const val EVENTS: String = "/api/events" + public const val GET_DAEMON_STATUS: String = "/api/status" public const val POST_SPACE: String = "/api/spaces" diff --git a/beam-daemon/src/main/kotlin/dev/d1s/beam/daemon/configuration/WebSocketEvents.kt b/beam-daemon/src/main/kotlin/dev/d1s/beam/daemon/configuration/WebSocketEvents.kt index f16926b8..ac6dc95f 100644 --- a/beam-daemon/src/main/kotlin/dev/d1s/beam/daemon/configuration/WebSocketEvents.kt +++ b/beam-daemon/src/main/kotlin/dev/d1s/beam/daemon/configuration/WebSocketEvents.kt @@ -16,6 +16,7 @@ package dev.d1s.beam.daemon.configuration +import dev.d1s.beam.commons.Paths import dev.d1s.exkt.ktor.server.koin.configuration.ApplicationConfigurer import dev.d1s.ktor.events.server.WebSocketEventChannel import dev.d1s.ktor.events.server.WebSocketEvents @@ -35,7 +36,7 @@ object WebSocketEvents : ApplicationConfigurer { } routing { - webSocketEvents() + webSocketEvents(route = Paths.EVENTS) } module.single {