fix dev server/live reload
Alan Pearce alan@alanpearce.eu
Wed, 19 Jun 2024 13:50:37 +0200
7 files changed, 64 insertions(+), 17 deletions(-)
M internal/builder/builder.go → internal/builder/builder.go
@@ -267,5 +267,6 @@ return nil, errors.WithMessage(err, "could not remove destination directory") } } + loadCSS() return build(ioConfig.Destination, *config) }
M internal/builder/page.templ → internal/builder/page.templ
@@ -52,6 +52,14 @@ <a href="https://git.alanpearce.eu/website/">Site source code</a> is <a href="https://opensource.org/licenses/MIT">MIT</a> </footer> @counter(page.Path, page.Title) + if site.InjectLiveReload { + <script defer> + new EventSource("/_/reload").onmessage = event => { + console.log("got message", event) + window.location.reload() + }; + </script> + } </body> </html> }
M internal/builder/template.go → internal/builder/template.go
@@ -30,7 +30,7 @@ "xhtml": "http://www.w3.org/1999/xhtml", } ) -func init() { +func loadCSS() { bytes, err := os.ReadFile("templates/style.css") if err != nil { panic(err)
M internal/server/dev.go → internal/server/dev.go
@@ -5,7 +5,9 @@ "fmt" "io/fs" "log/slog" "os" + "path" "path/filepath" + "slices" "time" "website/internal/log" @@ -17,6 +19,29 @@ type FileWatcher struct { *fsnotify.Watcher } +var ( + ignores = []string{ + "*.templ", + "*.go", + } + checkSettleInterval = 200 * time.Millisecond +) + +func matches(name string) func(string) bool { + return func(pattern string) bool { + matched, err := path.Match(pattern, name) + if err != nil { + log.Warn("error checking watcher ignores", "error", err) + } + + return matched + } +} + +func ignored(pathname string) bool { + return slices.ContainsFunc(ignores, matches(path.Base(pathname))) +} + func NewFileWatcher() (*FileWatcher, error) { watcher, err := fsnotify.NewWatcher() if err != nil { @@ -46,23 +71,31 @@ return errors.WithMessage(err, "error walking directory tree") } func (watcher FileWatcher) Start(callback func(string)) { + var timer *time.Timer for { select { case event := <-watcher.Events: - if event.Has(fsnotify.Create) || event.Has(fsnotify.Rename) { - f, err := os.Stat(event.Name) - if err != nil { - slog.Error(fmt.Sprintf("error handling %s event: %v", event.Op.String(), err)) - } else if f.IsDir() { - err = watcher.Add(event.Name) + if !ignored(event.Name) { + log.Info("watcher event", "name", event.Name, "op", event.Op.String()) + if event.Has(fsnotify.Create) || event.Has(fsnotify.Rename) { + f, err := os.Stat(event.Name) if err != nil { - slog.Error(fmt.Sprintf("error adding new folder to watcher: %v", err)) + slog.Error(fmt.Sprintf("error handling %s event: %v", event.Op.String(), err)) + } else if f.IsDir() { + err = watcher.Add(event.Name) + if err != nil { + slog.Error(fmt.Sprintf("error adding new folder to watcher: %v", err)) + } + } + } + if event.Has(fsnotify.Rename) || event.Has(fsnotify.Write) { + if timer == nil { + timer = time.AfterFunc(checkSettleInterval, func() { + callback(event.Name) + }) } + timer.Reset(checkSettleInterval) } - } - if event.Has(fsnotify.Rename) || event.Has(fsnotify.Write) { - callback(event.Name) - time.Sleep(500 * time.Millisecond) } case err := <-watcher.Errors: slog.Error(fmt.Sprintf("error in watcher: %v", err))
M internal/server/server.go → internal/server/server.go
@@ -100,7 +100,7 @@ fw, err := NewFileWatcher() if err != nil { return nil, errors.WithMessage(err, "could not create file watcher") } - for _, dir := range []string{"content", "static", "templates"} { + for _, dir := range []string{"content", "static", "templates", "internal/builder"} { err := fw.AddRecursive(dir) if err != nil { return nil, errors.WithMessagef( @@ -110,8 +110,11 @@ dir, ) } } + err = fw.Add(".") + if err != nil { + return nil, errors.WithMessage(err, "could not add directory to file watcher") + } go fw.Start(func(filename string) { - log.Debug("file updated", "filename", filename) r, err := builder.BuildSite(builderConfig) if err != nil { log.Error("could not build site", "error", err)
M modd.conf → modd.conf
@@ -1,3 +1,5 @@-config.toml { - daemon: templ generate --watch --proxy "http://localhost:3000" --cmd "go run ./cmd/server --dev" --open-browser=false +**/*.go !**/*_templ.go { + daemon +sigint: systemfd -s http::3000 -- \ + templ generate --watch \ + --cmd="go run ./cmd/server --dev" }