Dev #6

Merged
altavir merged 75 commits from dev into master 2021-10-23 11:02:48 +03:00
2 changed files with 12 additions and 9 deletions
Showing only changes of commit 32c29240d2 - Show all commits
magix/magix-server/src/main/kotlin/hep/dataforge/magix/server
settings.gradle.kts

@ -27,6 +27,9 @@ import kotlinx.coroutines.flow.*
import kotlinx.html.*
import kotlinx.serialization.KSerializer
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>
@ -130,10 +133,10 @@ public fun Application.magixModule(magixFlow: MutableSharedFlow<GenericMagixMess
//SSE server. Filter from query
get("sse") {
val filter = call.buildFilter()
var idCounter = 0
val sseFlow = magixFlow.filter(filter).map {
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)
}

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