Merge branch 'master' of https://github.com/Suwayomi/Suwayomi-Server into private/master

server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt

@@ -27,7 +27,10 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.future.future
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
 import org.eclipse.jetty.server.ServerConnector
 import suwayomi.tachidesk.global.GlobalAPI
 import suwayomi.tachidesk.graphql.GraphQL
@@ -51,6 +54,7 @@ import java.util.concurrent.CompletableFuture
 import kotlin.concurrent.thread
 import kotlin.text.get
 import kotlin.time.Duration.Companion.days
+import kotlin.time.Duration.Companion.seconds
 
 object JavalinSetup {
     private val logger = KotlinLogging.logger {}
@@ -132,7 +136,12 @@ object JavalinSetup {
 
                 config.events.serverStarted {
                     if (serverConfig.initialOpenInBrowserEnabled.value) {
-                        Browser.openInBrowser()
+                        scope.launch {
+                            withTimeoutOrNull(10.seconds) {
+                                WebInterfaceManager.isSetupComplete.first { it }
+                            }
+                            Browser.openInBrowser()
+                        }
                     }
                 }
             }

server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt

@@ -27,6 +27,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.sample
@@ -90,7 +91,7 @@ object WebInterfaceManager {
     private val preferences = Injekt.get<Application>().getSharedPreferences("server_util", Context.MODE_PRIVATE)
     private var currentUpdateTaskId: String = ""
 
-    private var isSetupComplete = false
+    val isSetupComplete = MutableStateFlow(false)
 
     private val json: Json by injectLazy()
     private val network: NetworkHelper by injectLazy()
@@ -196,7 +197,7 @@ object WebInterfaceManager {
         @OptIn(DelicateCoroutinesApi::class)
         GlobalScope.launchIO {
             setupWebUI()
-            isSetupComplete = true
+            isSetupComplete.value = true
         }
     }
 
@@ -260,7 +261,7 @@ object WebInterfaceManager {
         val lastAutomatedUpdate = preferences.getLong(LAST_WEBUI_UPDATE_CHECK_KEY, System.currentTimeMillis())
 
         val task = {
-            if (isSetupComplete) {
+            if (isSetupComplete.value) {
                 val log =
                     KotlinLogging.logger(
                         "${logger.name}::scheduleWebUIUpdateCheck(" +