feat(desktop, network): Chat-Funktion hinzugefügt und P2P-Sync verbessert

Signed-off-by: Stefan Mogeritsch <stefan.mo.co@gmail.com>

frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/frontend/shell/desktop/DesktopApp.kt

@@ -26,10 +26,11 @@ import org.koin.compose.viewmodel.koinViewModel
  */
 @Composable
 fun DesktopApp() {
-  val deviceInitViewModel: at.mocode.frontend.features.device.initialization.presentation.DeviceInitializationViewModel = koinViewModel()
+  val deviceInitViewModel: at.mocode.frontend.features.device.initialization.presentation.DeviceInitializationViewModel =
+    koinViewModel()
   val deviceSettings by deviceInitViewModel.uiState.collectAsState()
 
-  val isDark = when(deviceSettings.settings.appTheme) {
+  val isDark = when (deviceSettings.settings.appTheme) {
     at.mocode.frontend.features.device.initialization.domain.model.AppThemeSetting.SYSTEM -> isSystemInDarkTheme()
     at.mocode.frontend.features.device.initialization.domain.model.AppThemeSetting.LIGHT -> false
     at.mocode.frontend.features.device.initialization.domain.model.AppThemeSetting.DARK -> true

frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/frontend/shell/desktop/PreviewMain.kt

@@ -27,7 +27,7 @@ private fun PreviewContent() {
     Surface {
 
       // --- REITER ---
-       //ReiterScreen(viewModel = ReiterViewModel())
+      //ReiterScreen(viewModel = ReiterViewModel())
 
       // --- PFERDE ---
       // PferdeScreen(viewModel = PferdeViewModel())
@@ -35,8 +35,6 @@ private fun PreviewContent() {
       // --- VEREIN ---
 
 
-
-
       // ── Hier den gewünschten Screen eintragen ──────────────────────
       // VeranstalterAuswahlScreen(onVeranstalterSelected = {}, onNeuerVeranstalter = {})
       // VeranstalterNeuScreen(onBack = {}, onSave = {})

frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/frontend/shell/desktop/di/DesktopModule.kt

@@ -8,6 +8,8 @@ import at.mocode.frontend.core.navigation.DeepLinkHandler
 import at.mocode.frontend.core.navigation.NavigationPort
 import at.mocode.frontend.shell.desktop.navigation.DesktopNavigationPort
 import at.mocode.frontend.shell.desktop.repository.DesktopMasterdataRepository
+import at.mocode.frontend.shell.desktop.screens.chat.presentation.ChatViewModel
+import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
 
 /**
@@ -35,4 +37,5 @@ val desktopModule = module {
   single<CurrentUserProvider> { DesktopCurrentUserProvider(get()) }
   single { DeepLinkHandler(get(), get()) }
   single<MasterdataRepository> { DesktopMasterdataRepository(get()) }
+  viewModel { ChatViewModel(get()) }
 }

frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/frontend/shell/desktop/main.kt

@@ -1,17 +1,12 @@
 package at.mocode.frontend.shell.desktop
 
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Window
-import androidx.compose.ui.window.WindowState
 import androidx.compose.ui.window.application
 import at.mocode.frontend.core.auth.di.authModule
-import at.mocode.frontend.core.localdb.AppDatabase
 import at.mocode.frontend.core.localdb.DatabaseProvider
 import at.mocode.frontend.core.localdb.localDbModule
-import at.mocode.frontend.core.network.chat.KtorWebSocketServerService
-import at.mocode.frontend.core.network.discovery.NetworkDiscoveryService
 import at.mocode.frontend.core.network.networkModule
-import at.mocode.frontend.core.sync.di.syncModule
+import at.mocode.frontend.core.network.sync.SyncManager
 import at.mocode.frontend.features.billing.di.billingModule
 import at.mocode.frontend.features.device.initialization.di.deviceInitializationModule
 import at.mocode.frontend.features.funktionaer.di.funktionaerModule
@@ -24,76 +19,51 @@ import at.mocode.frontend.features.turnier.di.turnierFeatureModule
 import at.mocode.frontend.features.veranstalter.di.veranstalterModule
 import at.mocode.frontend.features.verein.di.vereinFeatureModule
 import at.mocode.frontend.features.zns.import.di.znsImportModule
-import at.mocode.frontend.shell.desktop.data.repository.StoreVeranstaltungRepository
 import at.mocode.frontend.shell.desktop.di.desktopModule
 import at.mocode.veranstaltung.feature.di.veranstaltungModule
-import at.mocode.veranstaltung.feature.domain.repository.VeranstaltungRepository
 import kotlinx.coroutines.runBlocking
-import org.koin.core.context.GlobalContext
-import org.koin.core.context.loadKoinModules
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
 
-fun main() = application {
-  try {
-    startKoin {
+fun main() {
+  application {
+    // Koin Starten
+    val koinApp = startKoin {
+      printLogger()
       modules(
         networkModule,
-        syncModule,
         authModule,
         localDbModule,
-        pingFeatureModule,
-        nennungFeatureModule,
-        znsImportModule,
-        profileModule,
-        billingModule,
-        pferdeModule,
-        reiterModule,
-        funktionaerModule,
-        vereinFeatureModule,
-        veranstalterModule,
-        turnierFeatureModule,
-        veranstaltungModule,
-        module {
-          single<VeranstaltungRepository> { StoreVeranstaltungRepository() }
-        },
-        deviceInitializationModule,
         desktopModule,
+        deviceInitializationModule,
+        billingModule,
+        funktionaerModule,
+        nennungFeatureModule,
+        pferdeModule,
+        pingFeatureModule,
+        profileModule,
+        reiterModule,
+        turnierFeatureModule,
+        veranstalterModule,
+        veranstaltungModule,
+        vereinFeatureModule,
+        znsImportModule
       )
     }
 
-    // Datenbank EAGER initialisieren (JVM-safe via runBlocking)
-    val koin = GlobalContext.get()
-    val dbProvider = koin.get<DatabaseProvider>()
+    val koin = koinApp.koin
+
+    // Datenbank initialisieren und als Singleton registrieren
+    val dbProvider: DatabaseProvider = koin.get()
     val database = runBlocking { dbProvider.createDatabase() }
+    koin.loadModules(listOf(module { single { database } }))
 
-    loadKoinModules(module {
-      single<AppDatabase> { database }
-    })
+    // SyncManager initialisieren und starten (Default Port 8080)
+    val syncManager: SyncManager = koin.get()
+    syncManager.start(8080)
 
-    println("[DesktopApp] KOIN & DB initialisiert")
-
-    // Start POC Netzwerk-Dienste
-    try {
-      val wsServer = koin.get<KtorWebSocketServerService>()
-      wsServer.start()
-      val discovery = koin.get<NetworkDiscoveryService>()
-      discovery.startDiscovery()
-      discovery.registerService(wsServer.getPort())
-    } catch(e: Exception) {
-       println("[DesktopApp] Netzwerk-Dienste Fehler: %s".format(e.message))
+    Window(onCloseRequest = ::exitApplication, title = "Meldestelle Desktop") {
+      DesktopApp()
     }
-
-    at.mocode.frontend.shell.desktop.data.Store.seed()
-  } catch (e: Exception) {
-    println("[DesktopApp] Startup-Fehler: %s".format(e.message))
-  }
-
-  Window(
-    onCloseRequest = ::exitApplication,
-    title = "Meldestelle",
-    state = WindowState(width = 1600.dp, height = 900.dp),
-  ) {
-    DesktopApp()
   }
 }

frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/frontend/shell/desktop/screens/chat/ChatScreen.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Send
@@ -16,30 +17,24 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import at.mocode.frontend.core.designsystem.theme.AppColors
 import at.mocode.frontend.core.designsystem.theme.Dimens
-import java.time.LocalTime
-import java.time.format.DateTimeFormatter
-
-data class ChatMessage(
-  val id: String,
-  val sender: String,
-  val text: String,
-  val time: String,
-  val isFromMe: Boolean
-)
+import at.mocode.frontend.shell.desktop.screens.chat.presentation.ChatMessageState
+import at.mocode.frontend.shell.desktop.screens.chat.presentation.ChatViewModel
+import org.koin.compose.viewmodel.koinViewModel
 
 @Composable
 fun ChatScreen(
-  onBack: () -> Unit
+  onBack: () -> Unit,
+  viewModel: ChatViewModel = koinViewModel()
 ) {
   var messageText by remember { mutableStateOf("") }
-  val messages = remember { mutableStateListOf<ChatMessage>() }
-  val timeFormatter = DateTimeFormatter.ofPattern("HH:mm")
+  val messages by viewModel.messages.collectAsState()
+  val peerCount by viewModel.peerCount.collectAsState()
+  val scrollState = rememberLazyListState()
 
-  // Mock initial messages
-  LaunchedEffect(Unit) {
-    if (messages.isEmpty()) {
-      messages.add(ChatMessage("1", "Richter-Turm 1", "Startliste für Bewerb 5 ist fertig?", "10:45", false))
-      messages.add(ChatMessage("2", "Meldestelle", "Ja, wird gerade gedruckt.", "10:46", true))
+  // Auto-scroll to bottom on new messages
+  LaunchedEffect(messages.size) {
+    if (messages.isNotEmpty()) {
+      scrollState.animateScrollToItem(messages.size - 1)
     }
   }
 
@@ -61,9 +56,9 @@ fun ChatScreen(
             fontWeight = FontWeight.Bold
           )
           Text(
-            "LAN-Kanal: aktiv (3 Teilnehmer)",
+            "LAN-Kanal: aktiv ($peerCount Teilnehmer verbunden)",
             style = MaterialTheme.typography.labelMedium,
-            color = AppColors.Success
+            color = if (peerCount > 0) AppColors.Success else MaterialTheme.colorScheme.error
           )
         }
       }
@@ -71,11 +66,12 @@ fun ChatScreen(
 
     // Chat Messages
     LazyColumn(
+      state = scrollState,
       modifier = Modifier.weight(1f).fillMaxWidth().padding(horizontal = Dimens.SpacingM),
       contentPadding = PaddingValues(vertical = Dimens.SpacingM),
       verticalArrangement = Arrangement.spacedBy(Dimens.SpacingS)
     ) {
-      items(messages) { msg ->
+      items(messages, key = { it.id }) { msg ->
         ChatBubble(msg)
       }
     }
@@ -102,18 +98,11 @@ fun ChatScreen(
         IconButton(
           onClick = {
             if (messageText.isNotBlank()) {
-              messages.add(
-                ChatMessage(
-                  id = messages.size.toString(),
-                  sender = "Meldestelle",
-                  text = messageText,
-                  time = LocalTime.now().format(timeFormatter),
-                  isFromMe = true
-                )
-              )
+              viewModel.sendMessage(messageText)
               messageText = ""
             }
           },
+          enabled = messageText.isNotBlank(),
           colors = IconButtonDefaults.iconButtonColors(
             containerColor = MaterialTheme.colorScheme.primary,
             contentColor = MaterialTheme.colorScheme.onPrimary
@@ -128,7 +117,7 @@ fun ChatScreen(
 }
 
 @Composable
-private fun ChatBubble(msg: ChatMessage) {
+private fun ChatBubble(msg: ChatMessageState) {
   Column(
     modifier = Modifier.fillMaxWidth(),
     horizontalAlignment = if (msg.isFromMe) Alignment.End else Alignment.Start

frontend/shells/meldestelle-desktop/src/jvmMain/kotlin/at/mocode/frontend/shell/desktop/screens/chat/presentation/ChatViewModel.kt

@@ -0,0 +1,88 @@
+package at.mocode.frontend.shell.desktop.screens.chat.presentation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import at.mocode.frontend.core.network.sync.ChatMessageEvent
+import at.mocode.frontend.core.network.sync.SyncManager
+import at.mocode.frontend.features.device.initialization.data.local.DeviceInitializationSettingsManager
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.util.*
+import kotlin.time.Clock
+
+data class ChatMessageState(
+  val id: String,
+  val sender: String,
+  val text: String,
+  val time: String,
+  val isFromMe: Boolean
+)
+
+class ChatViewModel(
+  private val syncManager: SyncManager
+) : ViewModel() {
+  private val timeFormatter = DateTimeFormatter.ofPattern("HH:mm")
+  private val settings = DeviceInitializationSettingsManager.loadSettings()
+  private val myName = settings?.deviceName ?: "Meldestelle"
+
+  private val _messages = MutableStateFlow<List<ChatMessageState>>(emptyList())
+  val messages: StateFlow<List<ChatMessageState>> = _messages.asStateFlow()
+
+  private val _peerCount = MutableStateFlow(0)
+  val peerCount: StateFlow<Int> = _peerCount.asStateFlow()
+
+  init {
+    viewModelScope.launch {
+      syncManager.getIncomingEvents().collect { event ->
+        if (event is ChatMessageEvent) {
+          _messages.update {
+            it + ChatMessageState(
+              id = event.eventId,
+              sender = event.senderName,
+              text = event.message,
+              time = LocalTime.now().format(timeFormatter),
+              isFromMe = event.originNodeId == myName
+            )
+          }
+        }
+      }
+    }
+
+    viewModelScope.launch {
+      syncManager.getConnectedPeers().collect { peers ->
+        _peerCount.value = peers.size
+      }
+    }
+  }
+
+  fun sendMessage(text: String) {
+    if (text.isBlank()) return
+
+    val event = ChatMessageEvent(
+      eventId = UUID.randomUUID().toString(),
+      sequenceNumber = 0,
+      originNodeId = myName,
+      createdAt = Clock.System.now().toEpochMilliseconds(),
+      senderName = myName,
+      message = text
+    )
+
+    // Sofort lokal anzeigen
+    _messages.update {
+      it + ChatMessageState(
+        id = event.eventId,
+        sender = myName,
+        text = text,
+        time = LocalTime.now().format(timeFormatter),
+        isFromMe = true
+      )
+    }
+
+    syncManager.broadcastEvent(event)
+  }
+}