perf(web): embed static files and templates

web/embed/embed.go

@@ -0,0 +1,9 @@
+package embed
+
+import "embed"
+
+//go:embed templates
+var TemplatesFS embed.FS
+
+//go:embed static
+var StaticFS embed.FS

web/go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/gin-contrib/sessions v1.0.2
 	github.com/gin-gonic/gin v1.10.0
 	github.com/jackc/pgx/v5 v5.7.2
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -46,5 +47,4 @@ require (
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

web/server/server.go

@@ -1,7 +1,13 @@
 package server
 
 import (
+	"html/template"
+	"io/fs"
+	"log"
+	"net/http"
+
 	"github.com/H1K0/SkazaNull/api"
+	"github.com/H1K0/SkazaNull/embed"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
@@ -14,14 +20,19 @@ func Serve(addr string, encryptionKey []byte) {
 	store.Options(sessions.Options{Path: "/"})
 	r.Use(sessions.Sessions("session", store))
 
+	tmpl := template.Must(template.ParseFS(embed.TemplatesFS, "templates/*.html"))
+	r.SetHTMLTemplate(tmpl)
+
 	api.RegisterRoutes(r)
 
-	r.LoadHTMLGlob("templates/*.html")
-
-	r.Static("/favicon.ico", "./static/service/favicon.ico")
-	r.Static("/skazanull.webmanifest", "./static/service/skazanull.webmanifest")
-	r.Static("/browserconfig.xml", "./static/service/browserconfig.xml")
-	r.Static("/static", "./static")
+	static, err := fs.Sub(embed.StaticFS, "static")
+	if err != nil {
+		log.Fatalf("Failed to get subs of embedded static FS: %s\n", err)
+	}
+	r.StaticFS("/static/", http.FS(static))
+	r.StaticFileFS("/favicon.ico", "static/service/favicon.ico", http.FS(embed.StaticFS))
+	r.StaticFileFS("/skazanull.webmanifest", "static/service/skazanull.webmanifest", http.FS(embed.StaticFS))
+	r.StaticFileFS("/browserconfig.xml", "static/service/browserconfig.xml", http.FS(embed.StaticFS))
 
 	r.GET("/", api.MiddlewareAuth, root)
 	r.GET("/quotes", api.MiddlewareAuth, middlewareAuth, quotes)