Merge branch 'dev'

.github/workflows/release.yml

@@ -14,6 +14,14 @@ jobs:
         with:
           fetch-depth: 0
 
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: yarn install
+        working-directory: web/client
+      - run: yarn build
+        working-directory: web/client
+
       - name: Set up Go
         uses: actions/setup-go@v4
         with:

web/client/build/readme.txt

@@ -0,0 +1,3 @@
+This dir should be exist, in case go:embed client/build throw error.
+
+//go:embed client/build

web/client/package.json

@@ -23,7 +23,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "BUILD_PATH=build/dist react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

web/web.go

@@ -2,6 +2,7 @@ package web
 
 import (
 	"embed"
+	"fmt"
 	"io/fs"
 	"net/http"
 	"sync"
@@ -16,35 +17,46 @@ var assets embed.FS
 
 type WebAddon struct {
 	proxy.BaseAddon
+
+	server   *http.Server
 	upgrader *websocket.Upgrader
 
 	conns   []*concurrentConn
 	connsMu sync.RWMutex
 }
 
 func NewWebAddon(addr string) *WebAddon {
-	web := new(WebAddon)
-	web.upgrader = &websocket.Upgrader{
-		CheckOrigin: func(r *http.Request) bool {
-			return true
-		},
-	}
-
-	serverMux := new(http.ServeMux)
-	serverMux.HandleFunc("/echo", web.echo)
+	web := &WebAddon{}
 
-	fsys, err := fs.Sub(assets, "client/build")
+	_, err := assets.ReadDir("client/build/dist")
 	if err != nil {
-		panic(err)
-	}
-	serverMux.Handle("/", http.FileServer(http.FS(fsys)))
+		web.server = &http.Server{
+			Addr: addr,
+			Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				w.WriteHeader(http.StatusNotFound)
+				fmt.Fprintf(w, `Please build frontend: "cd web/client; yarn build"`)
+			}),
+		}
+	} else {
+		web.upgrader = &websocket.Upgrader{
+			CheckOrigin: func(r *http.Request) bool {
+				return true
+			},
+		}
+
+		serverMux := new(http.ServeMux)
+		serverMux.HandleFunc("/echo", web.echo)
 
-	server := &http.Server{Addr: addr, Handler: serverMux}
-	web.conns = make([]*concurrentConn, 0)
+		fsys, _ := fs.Sub(assets, "client/build/dist")
+		serverMux.Handle("/", http.FileServer(http.FS(fsys)))
+
+		web.server = &http.Server{Addr: addr, Handler: serverMux}
+		web.conns = make([]*concurrentConn, 0)
+	}
 
 	go func() {
 		log.Infof("web interface start listen at %v\n", addr)
-		err := server.ListenAndServe()
+		err := web.server.ListenAndServe()
 		log.Error(err)
 	}()