From 32c29240d23ad0441b73c95b830eeb3766bcfc86 Mon Sep 17 00:00:00 2001
From: darksnake <altavir@gmail.com>
Date: Tue, 3 Nov 2020 22:25:02 +0300
Subject: [PATCH] Replace even id counter with uuid

---
 .../hep/dataforge/magix/server/magixModule.kt      |  7 +++++--
 settings.gradle.kts                                | 14 +++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/magix/magix-server/src/main/kotlin/hep/dataforge/magix/server/magixModule.kt b/magix/magix-server/src/main/kotlin/hep/dataforge/magix/server/magixModule.kt
index 7549f79..e1ebcce 100644
--- a/magix/magix-server/src/main/kotlin/hep/dataforge/magix/server/magixModule.kt
+++ b/magix/magix-server/src/main/kotlin/hep/dataforge/magix/server/magixModule.kt
@@ -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)
             }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 55fc746..a4dee19 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -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",