move web package to cmd/gomuks

makes using the library without the web bits easier
tulir · Nov 10, 2024 · 37608d9 · 37608d9
1 parent bc550cb
commit 37608d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/cmd/gomuks/main.go b/cmd/gomuks/main.go
@@ -30,6 +30,7 @@ import (
 
 	"go.mau.fi/gomuks/pkg/gomuks"
 	"go.mau.fi/gomuks/pkg/hicli"
+	"go.mau.fi/gomuks/web"
 )
 
 var (
@@ -77,6 +78,7 @@ func main() {
 	gmx.Commit = Commit
 	gmx.LinkifiedVersion = LinkifiedVersion
 	gmx.BuildTime = ParsedBuildTime
+	gmx.FrontendFS = web.Frontend
 	gmx.Run()
 }
 

diff --git a/pkg/gomuks/gomuks.go b/pkg/gomuks/gomuks.go
@@ -18,6 +18,7 @@ package gomuks
 
 import (
 	"context"
+	"embed"
 	"fmt"
 	"maps"
 	"net/http"
@@ -55,6 +56,8 @@ type Gomuks struct {
 	TempDir   string
 	LogDir    string
 
+	FrontendFS embed.FS
+
 	Config Config
 
 	stopOnce sync.Once

diff --git a/pkg/gomuks/server.go b/pkg/gomuks/server.go
@@ -39,7 +39,6 @@ import (
 	"maunium.net/go/mautrix"
 
 	"go.mau.fi/gomuks/pkg/hicli"
-	"go.mau.fi/gomuks/web"
 )
 
 func (gmx *Gomuks) StartServer() {
@@ -62,7 +61,7 @@ func (gmx *Gomuks) StartServer() {
 		router.Handle("/debug/", http.DefaultServeMux)
 	}
 	router.Handle("/_gomuks/", apiHandler)
-	if frontend, err := fs.Sub(web.Frontend, "dist"); err != nil {
+	if frontend, err := fs.Sub(gmx.FrontendFS, "dist"); err != nil {
 		gmx.Log.Warn().Msg("Frontend not found")
 	} else {
 		router.Handle("/", gmx.FrontendCacheMiddleware(http.FileServerFS(frontend)))