basic support visual config file

icpc · Sep 25, 2023 · a6a9974 · a6a9974
1 parent 3579c81
commit a6a9974
Show file tree

Hide file tree

Showing 9 changed files with 514 additions and 125 deletions.
diff --git a/src/backend/build.gradle.kts b/src/backend/build.gradle.kts
@@ -31,6 +31,7 @@ tasks {
             project.properties["live.dev.widgetPositionsFile"]?.let { "--widget-positions=$it" },
             project.properties["live.dev.contest"]?.let { "--config-directory=$it" },
             project.properties["live.dev.analyticsTemplatesFile"]?.let { "--analytics-template=$it" },
+            project.properties["live.dev.visualConfigFile"]?.let { "--visual-config=$it" },
         )
         this.workingDir = rootDir.resolve("config")
     }
@@ -71,4 +72,4 @@ dependencies {
 
     testImplementation(libs.kotlin.junit)
     testImplementation(libs.ktor.server.tests)
-}
+}
diff --git a/src/backend/src/main/kotlin/org/icpclive/Application.kt b/src/backend/src/main/kotlin/org/icpclive/Application.kt
@@ -16,6 +16,8 @@ import io.ktor.server.routing.*
 import io.ktor.server.util.*
 import io.ktor.server.websocket.*
 import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import org.icpclive.admin.configureAdminApiRouting
@@ -144,6 +146,14 @@ fun Application.module() {
             .addFirstToSolves()
 
 
+        DataBus.visualConfigFlow.completeOrThrow(
+            config.visualConfigFile?.let {
+                fileJsonContentFlow<Map<String, String>>(it, logger).stateIn(this, SharingStarted.Eagerly, emptyMap())
+            } ?: MutableStateFlow(mutableMapOf("one" to "two"))
+        )
+
         launchServices(loader)
     }
 }
+
+private val logger = getLogger(Application::class)
diff --git a/src/backend/src/main/kotlin/org/icpclive/Config.kt b/src/backend/src/main/kotlin/org/icpclive/Config.kt
@@ -57,6 +57,11 @@ object Config : CliktCommand(name = "java -jar live-v3.jar", printHelpOnEmptyArg
         help = "File with localization of analytics messages"
     ).path(canBeFile = true, canBeDir = false, mustExist = true)
 
+    val visualConfigFile by option(
+        "--visual-config",
+        help = "File with localization of analytics messages"
+    ).path(canBeFile = true, canBeDir = false, mustExist = true)
+
     override fun run() {
         defaultWidgetPositions = widgetPositions
         presetsDirectory.toFile().mkdirs()
@@ -72,4 +77,4 @@ object Config : CliktCommand(name = "java -jar live-v3.jar", printHelpOnEmptyArg
 
 }
 
-val config: Config get() = Config
+val config: Config get() = Config
diff --git a/src/backend/src/main/kotlin/org/icpclive/data/DataBus.kt b/src/backend/src/main/kotlin/org/icpclive/data/DataBus.kt
@@ -44,6 +44,7 @@ object DataBus {
     val teamInterestingScoreRequestFlow = CompletableDeferred<Flow<AddTeamScoreRequest>>()
     val teamInterestingFlow = CompletableDeferred<Flow<List<CurrentTeamState>>>()
     val socialEvents = CompletableDeferred<Flow<SocialEvent>>()
+    val visualConfigFlow = CompletableDeferred<StateFlow<Map<String, String>>>()
 
     fun setScoreboardEvents(level: OptimismLevel, flow: Flow<ScoreboardAndContestInfo>) { scoreboardFlow[level.ordinal].completeOrThrow(flow) }
     suspend fun getScoreboardEvents(level: OptimismLevel) = scoreboardFlow[level.ordinal].await()

diff --git a/src/backend/src/main/kotlin/org/icpclive/overlay/Routing.kt b/src/backend/src/main/kotlin/org/icpclive/overlay/Routing.kt
@@ -1,5 +1,7 @@
 package org.icpclive.overlay
 
+import io.ktor.server.application.call
+import io.ktor.server.response.respond
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import kotlinx.coroutines.flow.*
@@ -35,4 +37,5 @@ fun Route.configureOverlayRouting() {
     route("/svgAchievement"){
         configureSvgAtchievementRouting(Config.mediaDirectory)
     }
+    get("/visualConfig.json") { call.respond(DataBus.visualConfigFlow.await().value) }
 }
diff --git a/src/frontend/overlay/package.json b/src/frontend/overlay/package.json
@@ -23,12 +23,13 @@
     "socket.io-client": "^4.5.2",
     "styled-components": "^5.3.3",
     "stylelint": "^14.8.2",
+    "stylelint-config-idiomatic-order": "^9.0.0",
     "stylelint-config-recommended": "^7.0.0",
     "stylelint-config-styled-components": "^0.1.1",
     "stylelint-no-unsupported-browser-features": "^5.0.3",
     "stylelint-processor-styled-components": "^1.10.0",
-    "stylelint-config-idiomatic-order": "^9.0.0",
     "vite": "^4.4.3",
+    "vite-plugin-top-level-await": "^1.3.1",
     "web-vitals": "^1.1.2"
   },
   "scripts": {

diff --git a/src/frontend/overlay/src/config.jsx b/src/frontend/overlay/src/config.jsx
diff --git a/src/frontend/overlay/vite.config.js b/src/frontend/overlay/vite.config.js
@@ -1,9 +1,18 @@
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
+import topLevelAwait from "vite-plugin-top-level-await";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-    plugins: [react()],
+    plugins: [
+        react(),
+        topLevelAwait({
+            // The export name of top-level await promise for each chunk module
+            promiseExportName: "__tla",
+            // The function to generate import names of top-level await promise in each chunk module
+            promiseImportName: i => `__tla_${i}`
+        })
+    ],
     base: process.env.PUBLIC_URL ?? "/",
     build: {
         outDir: process.env.BUILD_PATH ?? "dist",