Merge 3e2df4e651 into c866230711

Makefile

@@ -62,19 +62,7 @@ build_dev_test: build_test2json build_gotestsum
 	tar czfv device-tests.tar.gz -C $(BIN_DIR)/tests .
 
 frontend:
-	cd ui && npm ci && npm run build:device && \
-	find ../static/assets \
-		-type f \
-		\( -name '*.js' \
-		-o -name '*.css' \
-		-o -name '*.png' \
-		-o -name '*.jpg' \
-		-o -name '*.jpeg' \
-		-o -name '*.gif' \
-		-o -name '*.webp' \
-		-o -name '*.woff2' \
-		\) \
-		-exec sh -c 'gzip -9 -kfv {}' \;
+	cd ui && npm ci && npm run build:device
 
 dev_release: frontend build_dev
 	@echo "Uploading release..."

go.mod

@@ -81,7 +81,6 @@ require (
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.3.0 // indirect
-	github.com/vearutop/statigz v1.5.0 // indirect
 	github.com/vishvananda/netns v0.0.5 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 	golang.org/x/arch v0.18.0 // indirect

go.sum

@@ -171,8 +171,6 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
 github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
-github.com/vearutop/statigz v1.5.0 h1:FuWwZiT82yBw4xbWdWIawiP2XFTyEPhIo8upRxiKLqk=
-github.com/vearutop/statigz v1.5.0/go.mod h1:oHmjFf3izfCO804Di1ZjB666P3fAlVzJEx2k6jNt/Gk=
 github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=
 github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=
 github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=

ui/src/components/USBStateStatus.tsx

@@ -22,39 +22,6 @@ const USBStateMap: Record<USBStates, string> = {
   "not attached": "Disconnected",
   suspended: "Low power mode",
 };
-const StatusCardProps: StatusProps = {
-  configured: {
-    icon: ({ className }) => (
-      <img className={cx(className)} src={KeyboardAndMouseConnectedIcon} alt="" />
-    ),
-    iconClassName: "h-5 w-5 shrink-0",
-    statusIndicatorClassName: "bg-green-500 border-green-600",
-  },
-  attached: {
-    icon: ({ className }) => <LoadingSpinner className={cx(className)} />,
-    iconClassName: "h-5 w-5 text-blue-500",
-    statusIndicatorClassName: "bg-slate-300 border-slate-400",
-  },
-  addressed: {
-    icon: ({ className }) => <LoadingSpinner className={cx(className)} />,
-    iconClassName: "h-5 w-5 text-blue-500",
-    statusIndicatorClassName: "bg-slate-300 border-slate-400",
-  },
-  "not attached": {
-    icon: ({ className }) => (
-      <img className={cx(className)} src={KeyboardAndMouseConnectedIcon} alt="" />
-    ),
-    iconClassName: "h-5 w-5 opacity-50 grayscale filter",
-    statusIndicatorClassName: "bg-slate-300 border-slate-400",
-  },
-  suspended: {
-    icon: ({ className }) => (
-      <img className={cx(className)} src={KeyboardAndMouseConnectedIcon} alt="" />
-    ),
-    iconClassName: "h-5 w-5 opacity-50 grayscale filter",
-    statusIndicatorClassName: "bg-green-500 border-green-600",
-  },
-};
 
 export default function USBStateStatus({
   state,
@@ -63,7 +30,39 @@ export default function USBStateStatus({
   state: USBStates;
   peerConnectionState?: RTCPeerConnectionState | null;
 }) {
-
+  const StatusCardProps: StatusProps = {
+    configured: {
+      icon: ({ className }) => (
+        <img className={cx(className)} src={KeyboardAndMouseConnectedIcon} alt="" />
+      ),
+      iconClassName: "h-5 w-5 shrink-0",
+      statusIndicatorClassName: "bg-green-500 border-green-600",
+    },
+    attached: {
+      icon: ({ className }) => <LoadingSpinner className={cx(className)} />,
+      iconClassName: "h-5 w-5 text-blue-500",
+      statusIndicatorClassName: "bg-slate-300 border-slate-400",
+    },
+    addressed: {
+      icon: ({ className }) => <LoadingSpinner className={cx(className)} />,
+      iconClassName: "h-5 w-5 text-blue-500",
+      statusIndicatorClassName: "bg-slate-300 border-slate-400",
+    },
+    "not attached": {
+      icon: ({ className }) => (
+        <img className={cx(className)} src={KeyboardAndMouseConnectedIcon} alt="" />
+      ),
+      iconClassName: "h-5 w-5 opacity-50 grayscale filter",
+      statusIndicatorClassName: "bg-slate-300 border-slate-400",
+    },
+    suspended: {
+      icon: ({ className }) => (
+        <img className={cx(className)} src={KeyboardAndMouseConnectedIcon} alt="" />
+      ),
+      iconClassName: "h-5 w-5 opacity-50 grayscale filter",
+      statusIndicatorClassName: "bg-green-500 border-green-600",
+    },
+  };
   const props = StatusCardProps[state];
   if (!props) {
     console.warn("Unsupported USB state: ", state);

ui/vite.config.ts

@@ -31,35 +31,20 @@ export default defineConfig(({ mode, command }) => {
     esbuild: {
       pure: ["console.debug"],
     },
-    build: {
-      outDir: isCloud ? "dist" : "../static",
-      rollupOptions: {
-        output: {
-          manualChunks: (id) => {
-            if (id.includes("node_modules")) {
-              return "vendor";
-            }
-            return null;
-          },
-          assetFileNames: "assets/immutable/[name]-[hash][extname]",
-          chunkFileNames: "assets/immutable/[name]-[hash].js",
-          entryFileNames: "assets/immutable/[name]-[hash].js",
-        },
-      },
-    },
+    build: { outDir: isCloud ? "dist" : "../static" },
     server: {
       host: "0.0.0.0",
       https: useSSL,
       proxy: JETKVM_PROXY_URL
         ? {
-          "/me": JETKVM_PROXY_URL,
-          "/device": JETKVM_PROXY_URL,
-          "/webrtc": JETKVM_PROXY_URL,
-          "/auth": JETKVM_PROXY_URL,
-          "/storage": JETKVM_PROXY_URL,
-          "/cloud": JETKVM_PROXY_URL,
-          "/developer": JETKVM_PROXY_URL,
-        }
+            "/me": JETKVM_PROXY_URL,
+            "/device": JETKVM_PROXY_URL,
+            "/webrtc": JETKVM_PROXY_URL,
+            "/auth": JETKVM_PROXY_URL,
+            "/storage": JETKVM_PROXY_URL,
+            "/cloud": JETKVM_PROXY_URL,
+            "/developer": JETKVM_PROXY_URL,
+          }
         : undefined,
     },
     base: onDevice && command === "build" ? "/static" : "/",

web.go

@@ -11,7 +11,6 @@ import (
 	"net/http"
 	"net/http/pprof"
 	"path/filepath"
-	"slices"
 	"strings"
 	"time"
 
@@ -25,7 +24,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/rs/zerolog"
-	"github.com/vearutop/statigz"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -68,11 +66,6 @@ type SetupRequest struct {
 	Password      string `json:"password,omitempty"`
 }
 
-var cachableFileExtensions = []string{
-	".jpg", ".jpeg", ".png", ".gif", ".webp", ".woff2",
-	".ico",
-}
-
 func setupRouter() *gin.Engine {
 	gin.SetMode(gin.ReleaseMode)
 	gin.DisableConsoleColor()
@@ -82,36 +75,23 @@ func setupRouter() *gin.Engine {
 			return *ginLogger
 		}),
 	))
-
 	staticFS, _ := fs.Sub(staticFiles, "static")
-	staticFileServer := http.StripPrefix("/static", statigz.FileServer(
-		staticFS.(fs.ReadDirFS),
-	))
 
 	// Add a custom middleware to set cache headers for images
 	// This is crucial for optimizing the initial welcome screen load time
 	// By enabling caching, we ensure that pre-loaded images are stored in the browser cache
 	// This allows for a smoother enter animation and improved user experience on the welcome screen
 	r.Use(func(c *gin.Context) {
-		if strings.HasPrefix(c.Request.URL.Path, "/static/assets/immutable/") {
-			c.Header("Cache-Control", "public, max-age=31536000, immutable") // Cache for 1 year
-			c.Next()
-			return
-		}
-
 		if strings.HasPrefix(c.Request.URL.Path, "/static/") {
 			ext := filepath.Ext(c.Request.URL.Path)
-			if slices.Contains(cachableFileExtensions, ext) {
+			if ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".gif" || ext == ".webp" {
 				c.Header("Cache-Control", "public, max-age=300") // Cache for 5 minutes
 			}
 		}
-
 		c.Next()
 	})
 
-	r.Any("/static/*w", func(c *gin.Context) {
-		staticFileServer.ServeHTTP(c.Writer, c.Request)
-	})
+	r.StaticFS("/static", http.FS(staticFS))
 	r.POST("/auth/login-local", handleLogin)
 
 	// We use this to determine if the device is setup