feat: improved building

server/cmd/trevstack/main.go

@@ -3,7 +3,6 @@ package main
 
 import (
 	"context"
-	"embed"
 	"errors"
 	"fmt"
 	"log"
@@ -18,6 +17,7 @@ import (
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 
+	embed "github.com/spotdemo4/trevstack/server"
 	"github.com/spotdemo4/trevstack/server/internal/database"
 	"github.com/spotdemo4/trevstack/server/internal/handlers/client"
 	"github.com/spotdemo4/trevstack/server/internal/handlers/file"
@@ -26,9 +26,6 @@ import (
 	"github.com/spotdemo4/trevstack/server/internal/interceptors"
 )
 
-var clientFS *embed.FS
-var dbFS *embed.FS
-
 func main() {
 	logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{}))
 	slog.SetDefault(logger)
@@ -40,7 +37,7 @@ func main() {
 	}
 
 	// Migrate database
-	err = database.Migrate(env.DatabaseURL, dbFS)
+	err = database.Migrate(env.DatabaseURL, embed.DBFS)
 	if err != nil {
 		log.Fatal(err.Error())
 	}
@@ -59,7 +56,7 @@ func main() {
 
 	// Serve web interface
 	mux := http.NewServeMux()
-	mux.Handle("/", client.NewClientHandler(env.Key, clientFS))
+	mux.Handle("/", client.NewClientHandler(env.Key, embed.ClientFS))
 	mux.Handle("/file/", file.NewFileHandler(sqlc, env.Key))
 	mux.Handle("/grpc/", http.StripPrefix("/grpc", api))
 

server/embed.go

@@ -0,0 +1,13 @@
+//go:build !dev
+
+package embed
+
+import (
+	"embed"
+)
+
+//go:embed all:client
+var ClientFS embed.FS
+
+//go:embed db/migrations/*.sql
+var DBFS embed.FS

server/embed_dev.go

@@ -0,0 +1,10 @@
+//go:build dev
+
+package embed
+
+import (
+	"embed"
+)
+
+var ClientFS embed.FS
+var DBFS embed.FS

server/internal/database/migrate.go

@@ -2,6 +2,7 @@ package database
 
 import (
 	"embed"
+	"io"
 	"log"
 	"net/url"
 
@@ -9,8 +10,9 @@ import (
 	_ "github.com/spotdemo4/dbmate-sqlite-modernc/pkg/driver/sqlite" // Modernc sqlite
 )
 
-func Migrate(dsn string, dbFS *embed.FS) error {
-	if dbFS == nil {
+func Migrate(dsn string, dbFS embed.FS) error {
+	_, err := dbFS.ReadDir(".")
+	if err == io.EOF {
 		return nil
 	}
 
@@ -22,6 +24,7 @@ func Migrate(dsn string, dbFS *embed.FS) error {
 	db := dbmate.New(dburl)
 	db.Driver()
 	db.FS = dbFS
+	db.AutoDumpSchema = false
 
 	log.Println("Migrations:")
 	migrations, err := db.FindMigrations()

server/internal/handlers/client/client.go

@@ -2,14 +2,16 @@ package client
 
 import (
 	"embed"
+	"io"
 	"io/fs"
 	"net/http"
 
 	"github.com/spotdemo4/trevstack/server/internal/interceptors"
 )
 
-func NewClientHandler(key string, clientFS *embed.FS) http.Handler {
-	if clientFS == nil {
+func NewClientHandler(key string, clientFS embed.FS) http.Handler {
+	_, err := clientFS.ReadDir(".")
+	if err == io.EOF {
 		return http.NotFoundHandler()
 	}
 

server/prod.go

@@ -1,20 +0,0 @@
-//go:build !dev
-
-package main
-
-import (
-	"embed"
-	"log"
-)
-
-//go:embed all:client
-var cFS embed.FS
-
-//go:embed db/migrations/*.sql
-var dFS embed.FS
-
-func init() {
-	log.Println("initializing for production")
-	clientFS = &cFS
-	dbFS = &dFS
-}