From 5e50fede9a1615aa444dfc06cdee79258fd2e852 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Sat, 2 May 2026 03:15:07 +0900
Subject: [PATCH] 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                                    |   2 +-
 cmd/pkgserver/{ => internal}/ui/index.html    |   0
 cmd/pkgserver/{ => internal}/ui/index.ts      |   0
 .../{ui/static => internal/ui}/style.css      |   0
 cmd/pkgserver/{ => internal}/ui/tsconfig.json |   0
 cmd/pkgserver/internal/ui/ui.go               |  21 +++++++++++
 cmd/pkgserver/internal/ui/ui_full.go          |  10 ++++++
 cmd/pkgserver/{ => internal/ui}/ui_stub.go    |   2 +-
 cmd/pkgserver/main.go                         |   3 +-
 cmd/pkgserver/ui.go                           |  33 ------------------
 cmd/pkgserver/ui/static/favicon.ico           | Bin 16958 -> 0 bytes
 cmd/pkgserver/ui_full.go                      |   9 -----
 12 files changed, 35 insertions(+), 45 deletions(-)
 rename cmd/pkgserver/{ => internal}/ui/index.html (100%)
 rename cmd/pkgserver/{ => internal}/ui/index.ts (100%)
 rename cmd/pkgserver/{ui/static => internal/ui}/style.css (100%)
 rename cmd/pkgserver/{ => internal}/ui/tsconfig.json (100%)
 create mode 100644 cmd/pkgserver/internal/ui/ui.go
 create mode 100644 cmd/pkgserver/internal/ui/ui_full.go
 rename cmd/pkgserver/{ => internal/ui}/ui_stub.go (84%)
 delete mode 100644 cmd/pkgserver/ui.go
 delete mode 100644 cmd/pkgserver/ui/static/favicon.ico
 delete mode 100644 cmd/pkgserver/ui_full.go

diff --git a/.gitignore b/.gitignore
index 8325f1cb..488373ff 100644
--- a/.gitignore
+++ b/.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
 
diff --git a/cmd/pkgserver/ui/index.html b/cmd/pkgserver/internal/ui/index.html
similarity index 100%
rename from cmd/pkgserver/ui/index.html
rename to cmd/pkgserver/internal/ui/index.html
diff --git a/cmd/pkgserver/ui/index.ts b/cmd/pkgserver/internal/ui/index.ts
similarity index 100%
rename from cmd/pkgserver/ui/index.ts
rename to cmd/pkgserver/internal/ui/index.ts
diff --git a/cmd/pkgserver/ui/static/style.css b/cmd/pkgserver/internal/ui/style.css
similarity index 100%
rename from cmd/pkgserver/ui/static/style.css
rename to cmd/pkgserver/internal/ui/style.css
diff --git a/cmd/pkgserver/ui/tsconfig.json b/cmd/pkgserver/internal/ui/tsconfig.json
similarity index 100%
rename from cmd/pkgserver/ui/tsconfig.json
rename to cmd/pkgserver/internal/ui/tsconfig.json
diff --git a/cmd/pkgserver/internal/ui/ui.go b/cmd/pkgserver/internal/ui/ui.go
new file mode 100644
index 00000000..fbee1b7f
--- /dev/null
+++ b/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)
+}
diff --git a/cmd/pkgserver/internal/ui/ui_full.go b/cmd/pkgserver/internal/ui/ui_full.go
new file mode 100644
index 00000000..232f5e65
--- /dev/null
+++ b/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
diff --git a/cmd/pkgserver/ui_stub.go b/cmd/pkgserver/internal/ui/ui_stub.go
similarity index 84%
rename from cmd/pkgserver/ui_stub.go
rename to cmd/pkgserver/internal/ui/ui_stub.go
index bdd691da..fea38491 100644
--- a/cmd/pkgserver/ui_stub.go
+++ b/cmd/pkgserver/internal/ui/ui_stub.go
@@ -1,6 +1,6 @@
 //go:build !frontend
 
-package main
+package ui
 
 import "testing/fstest"
 
diff --git a/cmd/pkgserver/main.go b/cmd/pkgserver/main.go
index 82165a03..6889dfe1 100644
--- a/cmd/pkgserver/main.go
+++ b/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,
diff --git a/cmd/pkgserver/ui.go b/cmd/pkgserver/ui.go
deleted file mode 100644
index 54ab2696..00000000
--- a/cmd/pkgserver/ui.go
+++ /dev/null
@@ -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)
-}
diff --git a/cmd/pkgserver/ui/static/favicon.ico b/cmd/pkgserver/ui/static/favicon.ico
deleted file mode 100644
index 2fefdfd7efe2321bbb1cb85a6e7c308522ba088f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16958
zcmZQzU}RuqaBu+83Je-f3=Con3=A3!3=9qo3=9nn5OIc4Fla(RQc{vZT3VV*N=k}R
zN=k}ZLPCOR&^V3`4v~_QS}!Ff^&bg;kdl%DC0RPyKJZpZNlEQN@;fXX{0H7;^l^cd
zlvEj-|6fZ=O0v+$_JOxWN=nKG&Ht+g-c|H-fs~XKADaJX(9ib4VUv`U)HkFsm@qh8
zML$<aNlAS~^8a-D**x$zLF;{3xeub}54@}B=K?7yDFvjs2l@XP{cIn2o1~<qtkC>_
ze&Ah2dlyJaNrBqDaZ*xJlhOQtoA$QT*9IvmDQ;*xcdnF_RFIUEl&+MN)CDwugVH_-
z|C5rE@&}a*^mQd|Y=frny*T^|@-Hs@SV~Ijpp=wUwUm^UIc;1=dsC&Pq{7MYJ9?P>
zkdl(Bl9G~groD@)YlD=Ol(3YPl(LkRR2mh+0hBicsOv)dnI<JA)lY>mI3gt_RUjoL
z#YsPxQ^zJLDXBmz_#c)xqNSvyWU1pa+M6OJC8a1OC3TyM{s)D_S7`gmUP?+z666ce
zcoK*nOc)eTQc_Y+sO)!;|B>-CDJiK-Qc_Z%rKF^qq@<)~Nl8hW4u)`$l9Jj<W4|MZ
z12P+wK60g`q?86K9I%XUAiIxV?8Tt==0Jpjl$6x!0g8L{u&txF|Dj_$ptcLTTLyw3
zF#!G#9wc!O3hxI}Qc^nf3<D`CsfmNg|DZ7FrnCQd4Kn{9mXea9TM$S|NrBp`pl}~d
zxSw7DASER=dyvIHC?4oGzaS+g<v0la4@#42bW8)224NV0`q9$#2m{bu9*#LqP+A;F
z{1(<{qIEbx$Nx?Y!gR1zN=izI*8T^XFC`_#10ByBs5l4p3qf=3pfT9%Qc_YIrKF@%
z>De~|^+BYhqz(;0Iw+Nrl41wN0|?8=$bi<GfR+Y<xOBzPbnuW)Vem;xN-Bk}9wfpt
zDJiKAI{1I76g?Yz#Q9qvIv-F(BmbX<j{T?*;T*atk(QPQ<+l<kDXFtkQc_o?q@>nL
zNlBfeFbtkbNl7h`l9DO}&5t1GZ@PJmNQ<PTq%@KIdJ{SxM(Vf#XzX-1bPRpIl$6wd
zDJdxs9Y&-x227chl#~mS{~t+7N#!8%NvRJ(<9TzWq@;d9`_^Biq@<pM+A&g6QtqI%
zFC!x}VE)8qv6Pfl9g=@RbAk7e_@wy%wUm_9Pbn!WP&h<LNlCqjngf~(;DzQdMqKU~
zC~;X?Sy2A(l9H18D<vfb8jB>w&xF*1#??V<2tZ+4I#7PZXRnx;7=x6QRK1jx6sX<@
zm0N`TM2fs8be!RZl#~?R`gQpHi!LW6C1nRqr=<7`m)e(TW@SoANi{&lK>1?O&521#
zNlk~k50{@v5$}PT1&VKwKF}DW1GG*B^=Evc^P`fWwkCR93<MuqM}yo-4ZKB4N(z*R
zV0B6f$WKyIQYKPTQh%hRr2M3$q(Eg2sH{u_$qh7?l9FPhV!sEJ#zAXmKw}t3LGzvB
z;^Lt41vJlc64c~HYG2PCXurek2lcb1q@+M&@RX(j(A*}-3{d>4gUpwblB$K~2~Q{=
zR3C!W<be2t1!Gz31#%-P802SAoqrM9<`I#Sl9~ebdo9SHQc_Y;Qc_Z&v{5cCO_w1q
zkhMf%DJiKXP`8reXJoaYcHa$X{yz$>PtQQtmVxS4P}%^EYuOOxAUZ38#ucaygzP6`
z*`R$PpfymS@mtW`K4@Lo4rp5tW(Fusl<Dj(qOF6j;R3bSVD2S_28~~V%5`^S3!&qy
z&QelRp!ITtdf$Ykq$H>v3@WQYX_Q#MgYq&czCmk6LFpURj<klZD`SF|1CgM<4|2E+
zW;ST;mXwqfDD4sx25XW10$oc73IkC8_p+3f6lhM*8(GazU`t6!f!3uE<9|?_2E4Xu
zDENyQH-g5TrKF^$5?L4A1+AkX#@wNzMoLO5iG;Oqp#ILF8^fhEtfi!++K7mM(AW;B
z+|#DizQLv++E2NICk#OKBxucWz+h{~Q7bH=eHGC7#X>15DNsA^yp)vGIVmZrby8AN
zl~PhtAUPjU-+@|oj+!$X0=PopKLY%*hp>Oh<Dg;kP#UHlM*o0{qtg!{;(r+U!RG#8
zV1&{P^&rL%1_p=%2B-oC26mA6KL!Q{5dDV%A^@U6I)8w?^8f#T82tgt2h;Wc|6`@?
zq2e%F9;%-oO0)m}4>F&D`Tu{Ay&(EO$lUY)|Nn1b0CWEzfVcxB4hkWVdZ_!Dp)}Y-
zAaRg~Ks3mMAoD;phz}D7dGHSd0~3^HbN>&vmjy(F%<l&o$iTn=vIoQm>HE*XU;#1*
l#0N?LKfv4wrXPSp<^TWx2heDk_ye%>{{R00l?Q8r5dcr}!IuC4

diff --git a/cmd/pkgserver/ui_full.go b/cmd/pkgserver/ui_full.go
deleted file mode 100644
index f7f730c6..00000000
--- a/cmd/pkgserver/ui_full.go
+++ /dev/null
@@ -1,9 +0,0 @@
-//go:build frontend
-
-package main
-
-import "embed"
-
-//go:generate tsc -p ui
-//go:embed ui/*
-var content embed.FS