[O] More stable implmentation

hykilpikonna · hykilpikonna · commit 3457f7e17011 · 2025-03-07T06:27:19.000-05:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,23 +18,20 @@ jobs:
         with:
           bun-version: latest
 
-      - name: Build frontend for deployment
+      - name: Build frontend
         run: |
           cd rooms
           bun install
+          bun run build
+          cp -r dist ../src/main/resources/
+          rm -rf dist
           VITE_WL_BUILD_PROD=true bun run build
 
       - name: Upload pages build
         uses: actions/upload-pages-artifact@v3
         with:
           path: rooms/dist
 
-      - name: Build frontend for embedding
-        run: |
-          cd rooms
-          bun run build
-          cp dist/combined.html ../src/main/resources/
-
       - name: Setup .NET 8.x
         uses: actions/setup-dotnet@v4
         with:
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,4 @@ replay_pid*
 ._*
 build
 logs
-combined.html
+dist
diff --git a/rooms/package.json b/rooms/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build && bun run postbuild.tsx",
+    "build": "vite build",
     "preview": "vite preview",
     "check": "svelte-check --tsconfig ./tsconfig.app.json && tsc -p tsconfig.node.json"
   },
diff --git a/rooms/postbuild.tsx b/rooms/postbuild.tsx
diff --git a/rooms/src/App.svelte b/rooms/src/App.svelte
@@ -10,7 +10,7 @@
     urls = ['https://use.link.aquadx.net', 'https://usw.link.aquadx.net', 'https://asia.link.aquadx.net', 'https://euro.link.aquadx.net']
     names = ["US East", "US West", "Asia", "Europe"]
   } else {
-    urls = ['REPLACE URL HERE qwq']
+    urls = ['']
     names = ['Local Server']
   }
 
diff --git a/src/main/kotlin/FutariLobby.kt b/src/main/kotlin/FutariLobby.kt
@@ -37,8 +37,8 @@ val writer: BufferedWriter = FileOutputStream(File("recruit.log"), true).buffere
 val mutex = Mutex()
 
 fun Application.configureRouting() = routing {
-    val html = resStr("/combined.html")  ?: "<html><body>Running!</body></html>"
     val log = logger()
+    val hostOverride = System.getenv("HOST_OVERRIDE")
 
     suspend fun log(data: String) = mutex.withLock {
         log.info(data)
@@ -50,13 +50,7 @@ fun Application.configureRouting() = routing {
     suspend fun log(data: RecruitRecord, msg: String) =
         log("${LocalDateTime.now().isoDateTime()}: $msg: ${KJson.encodeToString(data)}")
 
-    val hostOverride = System.getenv("HOST_OVERRIDE")
-
-    get("/") {
-        val l = call.request.local
-        val resp = html.replace("REPLACE URL HERE qwq", (hostOverride ?: "${l.scheme}://${l.serverHost}:${l.serverPort}"))
-        call.respondText(resp, ContentType.Text.Html)
-    }
+    staticResources("/", "dist")
 
     post("/recruit/start") {
         val d = call.receive<RecruitRecord>().apply { Time = millis() }

-Original file line number
+Diff line change
 ._*
 build
 logs
 -combined.html
 +dist
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`urls = ['https://use.link.aquadx.net', 'https://usw.link.aquadx.net', 'https://asia.link.aquadx.net', 'https://euro.link.aquadx.net']`
`11`	`11`	`names = ["US East", "US West", "Asia", "Europe"]`
`12`	`12`	`} else {`
`13`		`- urls = ['REPLACE URL HERE qwq']`
	`13`	`+ urls = ['']`
`14`	`14`	`names = ['Local Server']`
`15`	`15`	`}`
`16`	`16`