Use static servers for serving embedded web assets

controllers/web.go

@@ -1,59 +1,14 @@
 package controllers
 
 import (
-	"bytes"
-	"io/fs"
 	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
 
-	"github.com/owncast/owncast/router/middleware"
 	"github.com/owncast/owncast/static"
-	log "github.com/sirupsen/logrus"
 )
 
+var staticServer = http.FileServer(http.FS(static.GetWeb()))
+
 // serveWeb will serve web assets.
 func serveWeb(w http.ResponseWriter, r *http.Request) {
-	// If the ETags match then return a StatusNotModified
-	// if responseCode := middleware.ProcessEtags(w, r); responseCode != 0 {
-	// 	w.WriteHeader(responseCode)
-	// 	return
-	// }
-
-	webFiles := static.GetWeb()
-	path := strings.TrimPrefix(r.URL.Path, "/")
-
-	// Determine if the requested path is a directory.
-	// If so, append index.html to the request.
-	if info, err := fs.Stat(webFiles, path); err == nil && info.IsDir() {
-		path = filepath.Join(path, "index.html")
-	} else if _, err := fs.Stat(webFiles, path+"index.html"); err == nil {
-		path = filepath.Join(path, "index.html")
-	} else if path == "" {
-		path = filepath.Join(path, "index.html")
-	}
-
-	f, err := webFiles.Open(path)
-	if os.IsNotExist(err) {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-
-	info, err := f.Stat()
-	if os.IsNotExist(err) {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-
-	// Set a cache control max-age header
-	middleware.SetCachingHeaders(w, r)
-	d, err := fs.ReadFile(webFiles, path)
-	if err != nil {
-		log.Errorln(err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	http.ServeContent(w, r, info.Name(), info.ModTime(), bytes.NewReader(d))
+	staticServer.ServeHTTP(w, r)
 }