add static handlers as well...

Author: sawka

tsunami/app/serverhandlers.go

@@ -37,14 +37,19 @@ func NewHTTPHandlers(client *Client) *HTTPHandlers {
 	}
 }
 
-func (h *HTTPHandlers) RegisterHandlers(mux *http.ServeMux, embeddedFS *embed.FS) {
+func (h *HTTPHandlers) RegisterHandlers(mux *http.ServeMux, assetsFS *embed.FS, staticFS *embed.FS) {
 	mux.HandleFunc("/api/render", h.handleRender)
 	mux.HandleFunc("/api/updates", h.handleSSE)
 	mux.HandleFunc("/files/", h.handleAssetsUrl)
-	
+
+	// Add handler for static files at /static/ path
+	if staticFS != nil {
+		mux.HandleFunc("/static/", h.handleStaticPathFiles(staticFS))
+	}
+
 	// Add fallback handler for embedded static files in production mode
-	if embeddedFS != nil {
-		mux.HandleFunc("/", h.handleStaticFiles(embeddedFS))
+	if assetsFS != nil {
+		mux.HandleFunc("/", h.handleStaticFiles(assetsFS))
 	}
 }
 
@@ -238,7 +243,7 @@ func (h *HTTPHandlers) handleSSE(w http.ResponseWriter, r *http.Request) {
 func (h *HTTPHandlers) handleStaticFiles(embeddedFS *embed.FS) http.HandlerFunc {
 	// Create a file server from the embedded FS
 	fileServer := http.FileServer(http.FS(embeddedFS))
-	
+
 	return func(w http.ResponseWriter, r *http.Request) {
 		defer func() {
 			panicErr := util.PanicHandler("handleStaticFiles", recover())
@@ -262,3 +267,26 @@ func (h *HTTPHandlers) handleStaticFiles(embeddedFS *embed.FS) http.HandlerFunc
 		fileServer.ServeHTTP(w, r)
 	}
 }
+
+func (h *HTTPHandlers) handleStaticPathFiles(staticFS *embed.FS) http.HandlerFunc {
+	// Create a file server from the embedded FS
+	fileServer := http.FileServer(http.FS(staticFS))
+
+	return func(w http.ResponseWriter, r *http.Request) {
+		defer func() {
+			panicErr := util.PanicHandler("handleStaticPathFiles", recover())
+			if panicErr != nil {
+				http.Error(w, fmt.Sprintf("internal server error: %v", panicErr), http.StatusInternalServerError)
+			}
+		}()
+
+		// Strip /static/ prefix from the path
+		r.URL.Path = strings.TrimPrefix(r.URL.Path, "/static")
+		if r.URL.Path == "" {
+			r.URL.Path = "/"
+		}
+
+		// Serve the file using Go's file server
+		fileServer.ServeHTTP(w, r)
+	}
+}

tsunami/app/tsunamiapp.go

@@ -30,6 +30,7 @@ const TsunamiListenAddrEnvVar = "TSUNAMI_LISTENADDR"
 const DefaultListenAddr = "localhost:0"
 
 var assetsFS *embed.FS
+var staticFS *embed.FS
 
 type SSEvent struct {
 	Event string
@@ -135,7 +136,7 @@ func (c *Client) runMainE() error {
 	if c.SetupFn != nil {
 		c.SetupFn()
 	}
-	err := c.ListenAndServe(context.Background(), assetsFS)
+	err := c.ListenAndServe(context.Background())
 	if err != nil {
 		return err
 	}
@@ -155,13 +156,13 @@ func (c *Client) RunMain() {
 	}
 }
 
-func (c *Client) ListenAndServe(ctx context.Context, embeddedFS *embed.FS) error {
+func (c *Client) ListenAndServe(ctx context.Context) error {
 	// Create HTTP handlers
 	handlers := NewHTTPHandlers(c)
 
 	// Create a new ServeMux and register handlers
 	mux := http.NewServeMux()
-	handlers.RegisterHandlers(mux, embeddedFS)
+	handlers.RegisterHandlers(mux, assetsFS, staticFS)
 
 	// Determine listen address from environment variable or use default
 	listenAddr := os.Getenv(TsunamiListenAddrEnvVar)
@@ -457,3 +458,7 @@ func (c *Client) RegisterFileHandler(path string, option FileHandlerOption) {
 func RegisterAssetsFS(fs embed.FS) {
 	assetsFS = &fs
 }
+
+func RegisterStaticFS(fs embed.FS) {
+	staticFS = &fs
+}