deal with static files (for prod builds)

Author: sawka

Taskfile.yml

@@ -441,7 +441,7 @@ tasks:
 
     tsunami:demo:todo:
         desc: Run the tsunami todo demo application
-        cmd: go run demo/todo/main-todo.go
+        cmd: go run demo/todo/*.go
         dir: tsunami
         env:
             TSUNAMI_LISTENADDR: "localhost:12026"

public/logos/wave-logo-256.png

@@ -4,10 +4,12 @@
 package app
 
 import (
+	"embed"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log"
+	"mime"
 	"net/http"
 	"strings"
 	"sync"
@@ -19,6 +21,11 @@ import (
 
 const SSEKeepAliveDuration = 5 * time.Second
 
+func init() {
+	// Add explicit mapping for .json files
+	mime.AddExtensionType(".json", "application/json")
+}
+
 type HTTPHandlers struct {
 	Client     *Client
 	renderLock sync.Mutex
@@ -30,10 +37,15 @@ func NewHTTPHandlers(client *Client) *HTTPHandlers {
 	}
 }
 
-func (h *HTTPHandlers) RegisterHandlers(mux *http.ServeMux) {
+func (h *HTTPHandlers) RegisterHandlers(mux *http.ServeMux, embeddedFS *embed.FS) {
 	mux.HandleFunc("/api/render", h.handleRender)
 	mux.HandleFunc("/api/updates", h.handleSSE)
-	mux.HandleFunc("/assets/", h.handleAssetsUrl)
+	mux.HandleFunc("/files/", h.handleAssetsUrl)
+	
+	// Add fallback handler for embedded static files in production mode
+	if embeddedFS != nil {
+		mux.HandleFunc("/", h.handleStaticFiles(embeddedFS))
+	}
 }
 
 func (h *HTTPHandlers) handleRender(w http.ResponseWriter, r *http.Request) {
@@ -222,3 +234,31 @@ 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())
+			if panicErr != nil {
+				http.Error(w, fmt.Sprintf("internal server error: %v", panicErr), http.StatusInternalServerError)
+			}
+		}()
+
+		// Skip if this is an API or files request (already handled by other handlers)
+		if strings.HasPrefix(r.URL.Path, "/api/") || strings.HasPrefix(r.URL.Path, "/files/") {
+			http.NotFound(w, r)
+			return
+		}
+
+		// Handle root "/" => "/index.html"
+		if r.URL.Path == "/" {
+			r.URL.Path = "/index.html"
+		}
+
+		// Serve the file using Go's file server
+		fileServer.ServeHTTP(w, r)
+	}
+}

tsunami/app/serverhandlers.go

@@ -5,6 +5,7 @@ package app
 
 import (
 	"context"
+	"embed"
 	"fmt"
 	"io"
 	"io/fs"
@@ -28,6 +29,8 @@ import (
 const TsunamiListenAddrEnvVar = "TSUNAMI_LISTENADDR"
 const DefaultListenAddr = "localhost:0"
 
+var assetsFS *embed.FS
+
 type SSEvent struct {
 	Event string
 	Data  []byte
@@ -132,7 +135,7 @@ func (c *Client) runMainE() error {
 	if c.SetupFn != nil {
 		c.SetupFn()
 	}
-	err := c.ListenAndServe(context.Background())
+	err := c.ListenAndServe(context.Background(), assetsFS)
 	if err != nil {
 		return err
 	}
@@ -152,13 +155,13 @@ func (c *Client) RunMain() {
 	}
 }
 
-func (c *Client) ListenAndServe(ctx context.Context) error {
+func (c *Client) ListenAndServe(ctx context.Context, embeddedFS *embed.FS) error {
 	// Create HTTP handlers
 	handlers := NewHTTPHandlers(c)
 
 	// Create a new ServeMux and register handlers
 	mux := http.NewServeMux()
-	handlers.RegisterHandlers(mux)
+	handlers.RegisterHandlers(mux, embeddedFS)
 
 	// Determine listen address from environment variable or use default
 	listenAddr := os.Getenv(TsunamiListenAddrEnvVar)
@@ -450,3 +453,7 @@ func (c *Client) RegisterFileHandler(path string, option FileHandlerOption) {
 		}
 	})
 }
+
+func RegisterAssetsFS(fs embed.FS) {
+	assetsFS = &fs
+}

tsunami/app/tsunamiapp.go

@@ -432,7 +432,7 @@ function VDomInnerView({ model }: VDomViewProps) {
     return (
         <>
             {model.backendOpts?.globalstyles ? (
-                <WaveStyle src="/assets/global.css" model={model} onMount={handleStylesMounted} />
+                <WaveStyle src="/files/global.css" model={model} onMount={handleStylesMounted} />
             ) : null}
             {styleMounted ? <VDomRoot model={model} /> : null}
         </>