Add server synchronization feature.

2025-05-03 19:31:22 +02:00 · 2025-05-03 19:31:22 +02:00 · fa49d8ed22
commit fa49d8ed22
parent 53c6aede27
15 changed files with 154 additions and 48 deletions
--- a/composeApp/src/commonMain/composeResources/drawable/ic_sync_24dp.xml
+++ b/composeApp/src/commonMain/composeResources/drawable/ic_sync_24dp.xml
@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M160,800L160,720L270,720L254,706Q202,660 181,601Q160,542 160,482Q160,371 226.5,284.5Q293,198 400,170L400,254Q328,280 284,342.5Q240,405 240,482Q240,527 257,569.5Q274,612 310,648L320,658L320,560L400,560L400,800L160,800ZM560,790L560,706Q632,680 676,617.5Q720,555 720,478Q720,433 703,390.5Q686,348 650,312L640,302L640,400L560,400L560,160L800,160L800,240L690,240L706,254Q755,303 777.5,360.5Q800,418 800,478Q800,589 733.5,675.5Q667,762 560,790Z" />
+</vector>
--- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/DataSyncViewModel.kt
+++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/DataSyncViewModel.kt
@ -9,11 +9,13 @@ import com.pixelized.desktop.lwa.repository.item.ItemRepository
 import com.pixelized.desktop.lwa.repository.network.NetworkRepository
 import com.pixelized.desktop.lwa.repository.settings.SettingsRepository
 import com.pixelized.desktop.lwa.repository.tag.TagRepository
+import com.pixelized.shared.lwa.protocol.websocket.GameAdminEvent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
@ -45,24 +47,27 @@ class DataSyncViewModel(
    @OptIn(ExperimentalCoroutinesApi::class)
    suspend fun synchronise() = coroutineScope {

-        networkRepository.data.onEach { println(it) }.launchIn(this)
+        networkRepository.data
+            .onEach { println(it) }
+            .launchIn(this)
+
+        networkRepository.status
+            .filter { status -> status == NetworkRepository.Status.CONNECTED }
+            .flatMapLatest { networkRepository.data }
+            .filterIsInstance(GameAdminEvent.ServerSynchronization::class)
+            .flowOn(context = Dispatchers.IO)
+            .onEach {
+                updateRepository()
+                updateCharacterInstance(
+                    instances = campaignRepository.campaignFlow().value.instances
+                )
+            }
+            .launchIn(this)

        networkRepository.status
            .filter { status -> status == NetworkRepository.Status.CONNECTED }
            .flowOn(context = Dispatchers.IO)
-            .onEach {
-                try {
-                    tagRepository.updateAlterationTags()
-                    alterationRepository.updateAlterationFlow()
-                    tagRepository.updateCharacterTags()
-                    characterRepository.updateCharacterPreviews()
-                    campaignRepository.updateCampaign()
-                    tagRepository.updateItemTags()
-                    itemRepository.updateItemFlow()
-                } catch (exception: Exception) {
-                    println(exception.message) // TODO proper exception handling
-                }
-            }
+            .onEach { updateRepository() }
            .launchIn(this)

        networkRepository.status
@ -70,20 +75,38 @@ class DataSyncViewModel(
            .flowOn(context = Dispatchers.IO)
            .flatMapLatest { campaignRepository.campaignFlow().map { it.instances } }
            .distinctUntilChanged()
-            .onEach { instances ->
-                instances.forEach { characterSheetId ->
-                    try {
-                        characterRepository.updateCharacterSheet(
-                            characterSheetId = characterSheetId,
-                        )
-                        inventoryRepository.updateInventoryFlow(
-                            characterSheetId = characterSheetId,
-                        )
-                    } catch (exception: Exception) {
-                        println(exception.message) // TODO proper exception handling
-                    }
-                }
-            }
+            .onEach { updateCharacterInstance(instances = it) }
            .launchIn(this)
    }
+
+    private suspend fun updateRepository() {
+        try {
+            tagRepository.updateAlterationTags()
+            alterationRepository.updateAlterationFlow()
+            tagRepository.updateCharacterTags()
+            characterRepository.updateCharacterPreviews()
+            campaignRepository.updateCampaign()
+            tagRepository.updateItemTags()
+            itemRepository.updateItemFlow()
+        } catch (exception: Exception) {
+            println(exception.message) // TODO proper exception handling
+        }
+    }
+
+    private suspend fun updateCharacterInstance(
+        instances: Set<String>,
+    ) {
+        instances.forEach { characterSheetId ->
+            try {
+                characterRepository.updateCharacterSheet(
+                    characterSheetId = characterSheetId,
+                )
+                inventoryRepository.updateInventoryFlow(
+                    characterSheetId = characterSheetId,
+                )
+            } catch (exception: Exception) {
+                println(exception.message) // TODO proper exception handling
+            }
+        }
+    }
 }
--- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/text/TextMessageFactory.kt
+++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/text/TextMessageFactory.kt
@ -10,6 +10,7 @@ import com.pixelized.shared.lwa.model.campaign.Campaign
 import com.pixelized.shared.lwa.protocol.websocket.ApiSynchronisation
 import com.pixelized.shared.lwa.protocol.websocket.CampaignEvent
 import com.pixelized.shared.lwa.protocol.websocket.CharacterSheetEvent
+import com.pixelized.shared.lwa.protocol.websocket.GameAdminEvent
 import com.pixelized.shared.lwa.protocol.websocket.GameMasterEvent
 import com.pixelized.shared.lwa.protocol.websocket.RollEvent
 import com.pixelized.shared.lwa.protocol.websocket.SocketMessage
@ -140,6 +141,8 @@ class TextMessageFactory(

            is GameMasterEvent -> null

+            is GameAdminEvent -> null
+
            is ApiSynchronisation -> null
        }
    }
--- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionPage.kt
+++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionPage.kt
@ -19,6 +19,7 @@ import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackHandler
 import kotlinx.coroutines.launch
 import lwacharactersheet.composeapp.generated.resources.Res
 import lwacharactersheet.composeapp.generated.resources.ic_camping_24dp
+import lwacharactersheet.composeapp.generated.resources.ic_sync_24dp
 import lwacharactersheet.composeapp.generated.resources.ic_visibility_24dp
 import lwacharactersheet.composeapp.generated.resources.ic_visibility_off_24dp
 import org.koin.compose.viewmodel.koinViewModel
@ -40,6 +41,11 @@ fun GMActionPage(
    GMActionContent(
        actions = actions,
        scroll = scroll,
+        onServerSync = {
+            scope.launch {
+                viewModel.onServerSync()
+            }
+        },
        onPartyHeal = {
            scope.launch {
                viewModel.onPartyHeal()
@ -68,6 +74,7 @@ fun GMActionContent(
    scroll: ScrollState,
    spacing: Dp = 8.dp,
    actions: State<ActionPageUio?>,
+    onServerSync: () -> Unit,
    onPartyHeal: () -> Unit,
    onPartyVisibility: () -> Unit,
    onNpcVisibility: () -> Unit,
@ -78,6 +85,12 @@ fun GMActionContent(
            .padding(vertical = spacing, horizontal = spacing),
        verticalArrangement = Arrangement.spacedBy(space = spacing),
    ) {
+        GMAction(
+            modifier = Modifier.fillMaxWidth(),
+            icon = Res.drawable.ic_sync_24dp,
+            label = "Syncrhonization du serveur",
+            onAction = onServerSync,
+        )
        GMAction(
            modifier = Modifier.fillMaxWidth(),
            icon = Res.drawable.ic_camping_24dp,
--- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionViewModel.kt
+++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionViewModel.kt
@ -6,6 +6,7 @@ import com.pixelized.desktop.lwa.repository.campaign.CampaignRepository
 import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository
 import com.pixelized.desktop.lwa.repository.network.NetworkRepository
 import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio
+import com.pixelized.shared.lwa.protocol.websocket.GameAdminEvent
 import com.pixelized.shared.lwa.protocol.websocket.GameMasterEvent
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
@ -38,6 +39,19 @@ class GMActionViewModel(
            initialValue = null,
        )

+    suspend fun onServerSync() {
+        try {
+            networkRepository.share(
+                GameAdminEvent.ServerSynchronization(
+                    timestamp = System.currentTimeMillis(),
+                )
+            )
+        } catch (exception: Exception) {
+            val message = ErrorSnackUio.from(exception = exception)
+            _error.emit(message)
+        }
+    }
+
    suspend fun onPartyHeal() {
        campaignRepository.campaignFlow().value.characters.forEach { characterSheetId ->
            val sheet = characterRepository.characterDetail(