kif/portal
10
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add wss support

Browse source
This commit is contained in:
Lars Westermann 2019-06-10 20:22:53 +02:00
parent 43e5bac871
commit 4f352de0d2
Signed by: lars.westermann
GPG key ID: 9D417FA5BB9D5E1D
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commonMain/kotlin/de/kif/common/DateFormat.kt
View file

@ -31,7 +31,7 @@ fun formatTimeDiff(time: Long, now: Long): String {
hours > 1L -> { hours > 1L -> {
val nowHour = DateFormat("HH") val nowHour = DateFormat("HH")
.withLocale(KlockLocale.german) .withLocale(KlockLocale.german)
.format(now).toInt() ?: 0 .format(now).toIntOrNull() ?: 0
val ht = DateFormat("HH:mm") val ht = DateFormat("HH:mm")
.withLocale(KlockLocale.german) .withLocale(KlockLocale.german)

7
src/jsMain/kotlin/de/kif/frontend/WebSocketClient.kt
View file

@ -11,8 +11,11 @@ import org.w3c.dom.events.Event
import kotlin.browser.window import kotlin.browser.window
class WebSocketClient() { class WebSocketClient() {
val prefix = js("prefix") private val prefix = js("prefix")
private val url = "ws://${window.location.host}$prefix/"
private val useSsl = "https" in window.location.protocol
private val wsProtocol = if (useSsl) "wss" else "ws"
private val url = "$wsProtocol://${window.location.host}$prefix/websocket"
private lateinit var ws: WebSocket private lateinit var ws: WebSocket
private var reconnect = false private var reconnect = false

2
src/jvmMain/kotlin/de/kif/backend/util/PushService.kt
View file

@ -28,7 +28,7 @@ object PushService {
} }
fun Route.pushService() { fun Route.pushService() {
webSocket("/") { webSocket("/websocket") {
PushService.clients += this PushService.clients += this
try { try {