Skip to content

Auto-connect to komf when Komelia is served from a komf instance #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
firestaerter3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Auto-connect to komf when Komelia is served from a komf instance #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions ...a-db/wasm/src/wasmJsMain/kotlin/snd/komelia/db/settings/LocalStorageSettingsRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package snd.komelia.db.settings

import io.github.snd_r.komelia.image.UpsamplingMode
import kotlinx.browser.localStorage
import kotlinx.browser.window
import kotlinx.serialization.json.Json
import org.w3c.dom.set
import snd.komelia.db.AppSettings
Expand Down Expand Up @@ -50,9 +51,18 @@ class LocalStorageSettingsRepository {
}

fun getKomfSettings(): KomfSettings {
return localStorage.getItem(komfSettingsKey)
?.let { json.decodeFromString<KomfSettings>(it) }
?: KomfSettings()
val stored = localStorage.getItem(komfSettingsKey)
?.let { runCatching { json.decodeFromString<KomfSettings>(it) }.getOrNull() }
if (stored != null) return stored

// When Komelia is served from a komf instance, auto-connect to that instance
// rather than defaulting to localhost:8085
val origin = window.location.origin
return if (origin.isNotBlank() && !origin.contains("localhost") && !origin.contains("127.0.0.1")) {
KomfSettings(enabled = true, remoteUrl = origin)
} else {
KomfSettings()
}
}

fun saveKomfSettings(settings: KomfSettings) {
Expand Down