cmd/pkgserver: move ui internal

This avoids inadvertently exporting a go package. This change also cleans up generate layout.

Signed-off-by: Ophestra <cat@gensokyo.uk>

.gitignore

@@ -7,7 +7,7 @@
 
 # go generate
 /cmd/hakurei/LICENSE
-/cmd/pkgserver/ui/static/*.js
+/cmd/pkgserver/internal/ui/static
 /internal/pkg/testdata/testtool
 /internal/rosa/hakurei_current.tar.gz
 

cmd/pkgserver/internal/ui/ui.go

@@ -0,0 +1,21 @@
+// Package ui holds the static web UI.
+package ui
+
+import "net/http"
+
+func serveWebUI(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+	w.Header().Set("Pragma", "no-cache")
+	w.Header().Set("Expires", "0")
+	w.Header().Set("X-Content-Type-Options", "nosniff")
+	w.Header().Set("X-XSS-Protection", "1")
+	w.Header().Set("X-Frame-Options", "DENY")
+
+	http.ServeFileFS(w, r, content, "static/index.html")
+}
+
+// Register arranges for mux to serve the embedded frontend.
+func Register(mux *http.ServeMux) {
+	mux.Handle("GET /", http.FileServer(http.FS(content)))
+	mux.HandleFunc("GET /{$}", serveWebUI)
+}

cmd/pkgserver/internal/ui/ui_full.go

@@ -0,0 +1,10 @@
+//go:build frontend
+
+package ui
+
+import "embed"
+
+//go:generate tsc
+//go:generate cp index.html style.css static
+//go:embed static
+var content embed.FS

cmd/pkgserver/internal/ui/ui_stub.go

@@ -1,6 +1,6 @@
 //go:build !frontend
 
-package main
+package ui
 
 import "testing/fstest"
 

cmd/pkgserver/main.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"hakurei.app/check"
+	"hakurei.app/cmd/pkgserver/internal/ui"
 	"hakurei.app/command"
 	"hakurei.app/internal/pkg"
 	"hakurei.app/internal/rosa"
@@ -81,7 +82,7 @@ func main() {
 			}
 		}()
 		var mux http.ServeMux
-		uiRoutes(&mux)
+		ui.Register(&mux)
 		index.registerAPI(&mux)
 		server := http.Server{
 			Addr:    flagAddr,

cmd/pkgserver/ui.go

@@ -1,33 +0,0 @@
-package main
-
-import "net/http"
-
-func serveWebUI(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
-	w.Header().Set("Pragma", "no-cache")
-	w.Header().Set("Expires", "0")
-	w.Header().Set("X-Content-Type-Options", "nosniff")
-	w.Header().Set("X-XSS-Protection", "1")
-	w.Header().Set("X-Frame-Options", "DENY")
-
-	http.ServeFileFS(w, r, content, "ui/index.html")
-}
-func serveStaticContent(w http.ResponseWriter, r *http.Request) {
-	switch r.URL.Path {
-	case "/static/style.css":
-		http.ServeFileFS(w, r, content, "ui/static/style.css")
-	case "/favicon.ico":
-		http.ServeFileFS(w, r, content, "ui/static/favicon.ico")
-	case "/static/index.js":
-		http.ServeFileFS(w, r, content, "ui/static/index.js")
-	default:
-		http.NotFound(w, r)
-
-	}
-}
-
-func uiRoutes(mux *http.ServeMux) {
-	mux.HandleFunc("GET /{$}", serveWebUI)
-	mux.HandleFunc("GET /favicon.ico", serveStaticContent)
-	mux.HandleFunc("GET /static/", serveStaticContent)
-}

cmd/pkgserver/ui_full.go

@@ -1,9 +0,0 @@
-//go:build frontend
-
-package main
-
-import "embed"
-
-//go:generate tsc -p ui
-//go:embed ui/*
-var content embed.FS