kscience/controls-kt
8
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases 1 Wiki Activity

Replace even id counter with uuid

Browse Source
This commit is contained in:
Alexander Nozik 2020-11-03 22:25:02 +03:00
parent f0acbbb8cc
commit 32c29240d2
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magix/magix-server/src/main/kotlin/hep/dataforge/magix/server/magixModule.kt
View File

@ -27,6 +27,9 @@ import kotlinx.coroutines.flow.*
import kotlinx.html.* import kotlinx.html.*
import kotlinx.serialization.KSerializer import kotlinx.serialization.KSerializer
import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonElement
import ru.mipt.npm.ktor.sse.SseEvent
import ru.mipt.npm.ktor.sse.writeSseFlow
import java.util.*
public typealias GenericMagixMessage = MagixMessage<JsonElement> public typealias GenericMagixMessage = MagixMessage<JsonElement>
@ -130,10 +133,10 @@ public fun Application.magixModule(magixFlow: MutableSharedFlow<GenericMagixMess
//SSE server. Filter from query //SSE server. Filter from query
get("sse") { get("sse") {
val filter = call.buildFilter() val filter = call.buildFilter()
var idCounter = 0
val sseFlow = magixFlow.filter(filter).map { val sseFlow = magixFlow.filter(filter).map {
val data = magixJson.encodeToString(genericMessageSerializer, it) val data = magixJson.encodeToString(genericMessageSerializer, it)
SseEvent(data, id = idCounter++.toString()) val id = UUID.randomUUID()
SseEvent(data, id = id.toString(), event = "message")
} }
call.respondSse(sseFlow) call.respondSse(sseFlow)
} }

14
settings.gradle.kts
View File

@ -27,13 +27,13 @@ pluginManagement {
rootProject.name = "dataforge-control" rootProject.name = "dataforge-control"
include( include(
// ":dataforge-device-core", ":dataforge-device-core",
// ":dataforge-device-tcp", ":dataforge-device-tcp",
// ":dataforge-device-serial", ":dataforge-device-serial",
// ":dataforge-device-server", ":dataforge-device-server",
// ":dataforge-magix-client", ":dataforge-magix-client",
// ":motors", ":motors",
// ":demo", ":demo",
":magix", ":magix",
":magix:magix-api", ":magix:magix-api",
":magix:magix-server", ":magix:magix-server",