Improvements to self hosting

pawl0wski · pawl0wski · commit 00deff4deee5 · 2025-06-09T23:33:29.000+02:00
diff --git a/composeApp/src/androidMain/kotlin/com/github/familyvault/backend/client/PrivMxClient.android.kt b/composeApp/src/androidMain/kotlin/com/github/familyvault/backend/client/PrivMxClient.android.kt
@@ -83,7 +83,7 @@ class PrivMxClient : IPrivMxClient, AutoCloseable {
 
     override fun disconnect() {
         connection?.unregisterAll()
-        container.disconnectAll()
+        connection?.close()
     }
 
     override fun createThread(
diff --git a/composeApp/src/commonMain/composeResources/values-en/strings.xml b/composeApp/src/commonMain/composeResources/values-en/strings.xml
@@ -230,5 +230,5 @@
     <string name="connection_checking">Checking connection</string>
     <string name="connection_ok">Valid FamilyVault server</string>
     <string name="connection_failed">Connection test failed</string>
-
+    <string name="self_hosting_infobox_content">Click here to learn more about your own FamilyVault server.</string>
 </resources>
diff --git a/composeApp/src/commonMain/composeResources/values-pl/strings.xml b/composeApp/src/commonMain/composeResources/values-pl/strings.xml
@@ -230,4 +230,5 @@
     <string name="connection_checking">Sprawdzam połączenie</string>
     <string name="connection_ok">Poprawny serwer FamilyVault</string>
     <string name="connection_failed">Nieudany test połączenia</string>
+    <string name="self_hosting_infobox_content">Kliknij tutaj, aby dowiedzieć się więcej o własnym serwerze FamilyVault.</string>
 </resources>
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/DI.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/DI.kt
@@ -79,7 +79,7 @@ val sharedModules = module {
             get(),
         )
     }.bind<IFamilyGroupService>()
-    single { JoinStatusService() }.bind<IJoinStatusService>()
+    single { JoinStatusService(get()) }.bind<IJoinStatusService>()
     single {
         ChatService(
             get(),
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/models/FamilyGroupSession.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/models/FamilyGroupSession.kt
@@ -2,6 +2,7 @@ package com.github.familyvault.models
 
 data class FamilyGroupSession(
     var bridgeUrl: String,
+    var backendUrl: String?,
     val familyGroupName: String,
     var solutionId: String,
     var contextId: String,
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/services/FamilyGroupService.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/services/FamilyGroupService.kt
@@ -1,6 +1,5 @@
 package com.github.familyvault.services
 
-import com.github.familyvault.AppConfig
 import com.github.familyvault.backend.client.IFamilyVaultBackendClient
 import com.github.familyvault.backend.client.IPrivMxClient
 import com.github.familyvault.backend.exceptions.FamilyVaultBackendNoConnectionException
@@ -61,6 +60,7 @@ class FamilyGroupService(
 
         familyGroupSessionService.assignSession(
             familyVaultBackendClient.getBridgeUrl().bridgeUrl,
+            selfHostedAddressState.get(),
             familyGroupName,
             solutionId,
             contextId,
@@ -96,6 +96,7 @@ class FamilyGroupService(
 
         familyGroupSessionService.assignSession(
             familyVaultBackendClient.getBridgeUrl().bridgeUrl,
+            selfHostedAddressState.get(),
             familyGroupInformation.familyGroupName,
             solutionId,
             contextId,
@@ -118,8 +119,15 @@ class FamilyGroupService(
         val credential = familyGroupCredentialsRepository.getDefaultCredential()
             ?: return ConnectionStatus.NoCredentials
 
+        if (credential.backendUrl != null) {
+            familyVaultBackendClient.setCustomBackendUrl(credential.backendUrl)
+        } else {
+            familyVaultBackendClient.removeCustomBackendUrl()
+        }
+
         val familyGroupInformation: GetFamilyGroupNameResponse
 
+
         try {
             familyGroupInformation =
                 familyVaultBackendClient.getFamilyGroupName(GetFamilyGroupNameRequest(credential.contextId))
@@ -129,6 +137,7 @@ class FamilyGroupService(
 
         familyGroupSessionService.assignSession(
             familyVaultBackendClient.getBridgeUrl().bridgeUrl,
+            credential.backendUrl,
             familyGroupInformation.familyGroupName,
             credential.solutionId,
             credential.contextId,
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/services/FamilyGroupSessionService.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/services/FamilyGroupSessionService.kt
@@ -22,6 +22,7 @@ class FamilyGroupSessionService(
     override suspend fun assignSession(familyGroupCredential: FamilyGroupCredential) {
         assignSession(
             familyVaultBackendClient.getBridgeUrl().bridgeUrl,
+            familyGroupCredential.backendUrl,
             familyGroupCredential.familyGroupName,
             familyGroupCredential.solutionId,
             familyGroupCredential.contextId,
@@ -34,13 +35,14 @@ class FamilyGroupSessionService(
 
     override fun assignSession(
         bridgeUrl: String,
+        backendUrl: String?,
         familyGroupName: String,
         solutionId: String,
         contextId: String,
         keyPair: PublicEncryptedPrivateKeyPair
     ) {
         session = FamilyGroupSession(
-            bridgeUrl, familyGroupName, solutionId, contextId, PublicPrivateKeyPair(
+            bridgeUrl, backendUrl, familyGroupName, solutionId, contextId, PublicPrivateKeyPair(
                 keyPair.publicKey,
                 privMxClient.decryptPrivateKeyPassword(keyPair.encryptedPrivateKey)
             )
@@ -50,8 +52,13 @@ class FamilyGroupSessionService(
     override suspend fun connect(): ConnectionStatus {
         requireNotNull(session)
         try {
+            if (session?.backendUrl != null) {
+                familyVaultBackendClient.setCustomBackendUrl(requireNotNull(session?.backendUrl))
+            } else {
+                familyVaultBackendClient.removeCustomBackendUrl()
+            }
             privMxClient.establishConnection(
-                getBridgeUrl(), getSolutionId(), getPrivateKey()
+                familyVaultBackendClient.getBridgeUrl().bridgeUrl, getSolutionId(), getPrivateKey()
             )
             currentUser = familyVaultBackendClient.getMemberFromFamilyGroup(
                 GetMemberFromFamilyGroupRequest(
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/services/IFamilyGroupSessionService.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/services/IFamilyGroupSessionService.kt
@@ -11,6 +11,7 @@ interface IFamilyGroupSessionService {
     )
     fun assignSession(
         bridgeUrl: String,
+        backendUrl: String?,
         familyGroupName: String,
         solutionId: String,
         contextId: String,
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/services/JoinStatusService.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/services/JoinStatusService.kt
@@ -9,8 +9,8 @@ import com.github.familyvault.models.JoinStatusInfo
 import com.github.familyvault.models.enums.JoinStatusState
 import kotlinx.coroutines.delay
 
-class JoinStatusService : IJoinStatusService {
-    private val familyVaultBackendProxy = FamilyVaultBackendClient()
+class JoinStatusService(private val familyVaultBackendProxy: FamilyVaultBackendClient) :
+    IJoinStatusService {
 
     override suspend fun generateJoinStatus(): JoinStatus {
         return familyVaultBackendProxy.generateJoinStatus().joinStatus
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/main/ChangeFamilyGroupScreen.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/main/ChangeFamilyGroupScreen.kt
@@ -96,7 +96,7 @@ class ChangeFamilyGroupScreen : Screen {
                         Column {
                             familyGroups.map {
                                 val isCurrentFamilyGroup =
-                                it.contextId == currentContextId && it.memberPublicKey == currentMemberPublicKey
+                                    it.contextId == currentContextId && it.memberPublicKey == currentMemberPublicKey
 
                                 FamilyGroupEntry(
                                     it,
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/main/chat/SelectChatContent.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/main/chat/SelectChatContent.kt
@@ -59,14 +59,20 @@ fun SelectChatContent() {
             chatThreadListenerService.startListeningForNewChatThread {
                 currentChatThreadsState.addNewChatThread(it)
                 chatMessagesListenerService.startListeningForNewMessage(it.id) { newMessage ->
-                    currentChatThreadsState.editExistingChatThreadLastMessage(newMessage, it)
+                    currentChatThreadsState.editExistingChatThreadLastMessage(
+                        newMessage,
+                        it
+                    )
                 }
             }
 
             chatThreadListenerService.startListeningForUpdatedChatThread {
                 currentChatThreadsState.editExistingChatThread(it)
                 chatMessagesListenerService.startListeningForNewMessage(it.id) { newMessage ->
-                    currentChatThreadsState.editExistingChatThreadLastMessage(newMessage, it)
+                    currentChatThreadsState.editExistingChatThreadLastMessage(
+                        newMessage,
+                        it
+                    )
                 }
             }
 
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/start/FamilyGroupSelfHostingScreen.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/start/FamilyGroupSelfHostingScreen.kt
@@ -18,22 +18,27 @@ import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
+import com.github.familyvault.DocumentationLinks
 import com.github.familyvault.backend.client.FamilyVaultBackendClient
 import com.github.familyvault.backend.client.IFamilyVaultBackendClient
 import com.github.familyvault.forms.SelfHostingAddressForm
 import com.github.familyvault.models.OptionType
+import com.github.familyvault.models.enums.InfoBoxType
 import com.github.familyvault.states.ISelfHostedAddressState
 import com.github.familyvault.ui.components.ConnectionStatus
 import com.github.familyvault.ui.components.ConnectionStatusIndicator
 import com.github.familyvault.ui.components.HeaderWithIcon
+import com.github.familyvault.ui.components.InfoBox
 import com.github.familyvault.ui.components.formsContent.SelfHostingAddressFormContent
 import com.github.familyvault.ui.components.overrides.Button
 import com.github.familyvault.ui.components.screen.StartScreenScaffold
 import com.github.familyvault.ui.theme.AdditionalTheme
 import familyvault.composeapp.generated.resources.Res
 import familyvault.composeapp.generated.resources.check_connection
 import familyvault.composeapp.generated.resources.custom_server
+import familyvault.composeapp.generated.resources.documentation
 import familyvault.composeapp.generated.resources.next_button_content
+import familyvault.composeapp.generated.resources.self_hosting_infobox_content
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
@@ -55,10 +60,17 @@ class FamilyGroupSelfHostingScreen : Screen {
                 icon = Icons.Outlined.Home,
                 type = OptionType.Second
             )
+            InfoBox(
+                title = stringResource(Res.string.documentation),
+                content = stringResource(Res.string.self_hosting_infobox_content),
+                type = InfoBoxType.DOCUMENTATION,
+                link = DocumentationLinks.SELF_HOSTING
+            )
             Column(
                 modifier = Modifier.fillMaxHeight(),
                 verticalArrangement = Arrangement.Bottom
             ) {
+                Spacer(modifier = Modifier.height(AdditionalTheme.spacings.small))
                 SelfHostingAddressFormContent(form) {
                     connectionStatus = null
                 }
@@ -78,8 +90,9 @@ class FamilyGroupSelfHostingScreen : Screen {
                             try {
                                 testFamilyVaultBackendClient.getSolutionId()
                                 connectionStatus = ConnectionStatus.OK
-                            } catch (_: Exception) {
+                            } catch (e: Exception) {
                                 connectionStatus = ConnectionStatus.FAILED
+                                println(e)
                             }
                         }
                     }
diff --git a/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/start/joinFamilyGroup/FamilyGroupJoinAssignPrivateKeyPasswordScreen.kt b/composeApp/src/commonMain/kotlin/com/github/familyvault/ui/screens/start/joinFamilyGroup/FamilyGroupJoinAssignPrivateKeyPasswordScreen.kt
@@ -13,6 +13,7 @@ import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
+import com.github.familyvault.backend.client.IFamilyVaultBackendClient
 import com.github.familyvault.backend.client.IPrivMxClient
 import com.github.familyvault.forms.PrivateKeyPasswordForm
 import com.github.familyvault.models.MemberIdentifier
@@ -21,6 +22,7 @@ import com.github.familyvault.models.enums.FormSubmitState
 import com.github.familyvault.services.IJoinStatusService
 import com.github.familyvault.states.ICurrentDraftFamilyMemberState
 import com.github.familyvault.states.IJoinFamilyGroupPayloadState
+import com.github.familyvault.states.ISelfHostedAddressState
 import com.github.familyvault.ui.components.BottomNextButton
 import com.github.familyvault.ui.components.dialogs.CircularProgressIndicatorDialog
 import com.github.familyvault.ui.components.dialogs.ErrorDialog

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class PrivMxClient : IPrivMxClient, AutoCloseable {`
`83`	`83`
`84`	`84`	`override fun disconnect() {`
`85`	`85`	`connection?.unregisterAll()`
`86`		`- container.disconnectAll()`
	`86`	`+ connection?.close()`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`override fun createThread(`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ val sharedModules = module {`
`79`	`79`	`get(),`
`80`	`80`	`)`
`81`	`81`	`}.bind<IFamilyGroupService>()`
`82`		`- single { JoinStatusService() }.bind<IJoinStatusService>()`
	`82`	`+ single { JoinStatusService(get()) }.bind<IJoinStatusService>()`
`83`	`83`	`single {`
`84`	`84`	`ChatService(`
`85`	`85`	`get(),`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ interface IFamilyGroupSessionService {`
`11`	`11`	`)`
`12`	`12`	`fun assignSession(`
`13`	`13`	`bridgeUrl: String,`
	`14`	`+ backendUrl: String?,`
`14`	`15`	`familyGroupName: String,`
`15`	`16`	`solutionId: String,`
`16`	`17`	`contextId: String,`