feat: hot reloading

Author: dunglas

caddy/app.go

@@ -150,25 +150,13 @@ func (f *FrankenPHPApp) Start() error {
 	)
 
 	for _, w := range f.Workers {
-		workerOpts := make([]frankenphp.WorkerOption, 0, len(w.requestOptions)+4)
-
-		if w.requestOptions == nil {
-			workerOpts = append(workerOpts,
-				frankenphp.WithWorkerEnv(w.Env),
-				frankenphp.WithWorkerWatchMode(w.Watch),
-				frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures),
-				frankenphp.WithWorkerMaxThreads(w.MaxThreads),
-			)
-		} else {
-			workerOpts = append(
-				workerOpts,
-				frankenphp.WithWorkerEnv(w.Env),
-				frankenphp.WithWorkerWatchMode(w.Watch),
-				frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures),
-				frankenphp.WithWorkerMaxThreads(w.MaxThreads),
-				frankenphp.WithWorkerRequestOptions(w.requestOptions...),
-			)
-		}
+		workerOpts := w.appendMercureHubOption([]frankenphp.WorkerOption{
+			frankenphp.WithWorkerEnv(w.Env),
+			frankenphp.WithWorkerWatchMode(w.Watch),
+			frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures),
+			frankenphp.WithWorkerMaxThreads(w.MaxThreads),
+			frankenphp.WithWorkerRequestOptions(w.requestOptions...),
+		})
 
 		opts = append(opts, frankenphp.WithWorkers(w.Name, repl.ReplaceKnown(w.FileName, ""), w.Num, workerOpts...))
 	}

caddy/mercure-skip.go

@@ -1,4 +1,5 @@
 //go:build nomercure
+
 package caddy
 
 import (
@@ -7,3 +8,10 @@ import (
 
 func (f *FrankenPHPModule) assignMercureHubRequestOption(_ caddy.Context) {
 }
+
+type mercureContext struct {
+}
+
+func (wc *workerConfig) appendMercureHubOption(opts []frankenphp.WorkerOption) []frankenphp.WorkerOption {
+	return opts
+}

caddy/mercure.go

@@ -5,16 +5,38 @@ package caddy
 import (
 	"github.com/caddyserver/caddy/v2"
 	"github.com/dunglas/frankenphp"
+	"github.com/dunglas/mercure"
 	mercureCaddy "github.com/dunglas/mercure/caddy"
 )
 
 func init() {
 	mercureCaddy.AllowNoPublish = true
 }
 
-func (f *FrankenPHPModule) assignMercureHubRequestOption(ctx caddy.Context) {
-	if hub := mercureCaddy.FindHub(ctx.Modules()); hub != nil {
-		opt := frankenphp.WithMercureHub(hub)
-		f.mercureHubRequestOption = &opt
+type mercureContext struct {
+	mercureHub *mercure.Hub
+}
+
+func (f *FrankenPHPModule) assignMercureHub(ctx caddy.Context) {
+	hub := mercureCaddy.FindHub(ctx.Modules())
+	if hub == nil {
+		return
+	}
+
+	opt := frankenphp.WithMercureHub(hub)
+	f.mercureHubRequestOption = &opt
+
+	for i, wc := range f.Workers {
+		wc.mercureHub = hub
+
+		f.Workers[i] = wc
 	}
 }
+
+func (wc *workerConfig) appendMercureHubOption(opts []frankenphp.WorkerOption) []frankenphp.WorkerOption {
+	if wc.mercureHub != nil {
+		opts = append(opts, frankenphp.WithWorkerMercureHub(wc.mercureHub))
+	}
+
+	return opts
+}

caddy/module.go

@@ -74,7 +74,7 @@ func (f *FrankenPHPModule) Provision(ctx caddy.Context) error {
 		return fmt.Errorf(`expected ctx.App("frankenphp") to return *FrankenPHPApp, got nil`)
 	}
 
-	f.assignMercureHubRequestOption(ctx)
+	f.assignMercureHub(ctx)
 
 	for i, wc := range f.Workers {
 		// make the file path absolute from the public directory
@@ -89,9 +89,6 @@ func (f *FrankenPHPModule) Provision(ctx caddy.Context) error {
 		}
 
 		wc.requestOptions = []frankenphp.RequestOption{frankenphp.WithRequestLogger(f.logger)}
-		if f.mercureHubRequestOption != nil {
-			wc.requestOptions = append(wc.requestOptions, *f.mercureHubRequestOption)
-		}
 
 		f.Workers[i] = wc
 	}

caddy/workerconfig.go

@@ -22,6 +22,8 @@ import (
 //		}
 //	}
 type workerConfig struct {
+	mercureContext
+
 	// Name for the worker. Default: the filename for FrankenPHPApp workers, always prefixed with "m#" for FrankenPHPModule workers.
 	Name string `json:"name,omitempty"`
 	// FileName sets the path to the worker script.
@@ -39,7 +41,7 @@ type workerConfig struct {
 	// MaxConsecutiveFailures sets the maximum number of consecutive failures before panicking (defaults to 6, set to -1 to never panick)
 	MaxConsecutiveFailures int `json:"max_consecutive_failures,omitempty"`
 
-	requestOptions     []frankenphp.RequestOption
+	requestOptions []frankenphp.RequestOption
 }
 
 func parseWorkerConfig(d *caddyfile.Dispenser) (workerConfig, error) {

internal/watcher/types.go

@@ -0,0 +1,84 @@
+package watcher
+
+import (
+	"encoding/json"
+	"time"
+)
+
+type (
+	EffectType int8
+	PathType   int8
+)
+
+func (e EffectType) MarshalJSON() ([]byte, error) {
+	var s string
+	switch e {
+	case EffectTypeRename:
+		s = "rename"
+	case EffectTypeModify:
+		s = "modify"
+	case EffectTypeCreate:
+		s = "create"
+	case EffectTypeDestroy:
+		s = "destroy"
+	case EffectTypeOwner:
+		s = "owner"
+	case EffectTypeOther:
+		s = "other"
+	}
+
+	return json.Marshal(s)
+}
+
+func (e PathType) MarshalJSON() ([]byte, error) {
+	var s string
+	switch e {
+	case PathTypeDir:
+		s = "dir"
+	case PathTypeFile:
+		s = "file"
+	case PathTypeHardLink:
+		s = "hard_link"
+	case PathTypeSymLink:
+		s = "sym_link"
+	case PathTypeWatcher:
+		s = "watcher"
+	case PathTypeOther:
+		s = "other"
+	}
+
+	return json.Marshal(s)
+}
+
+type Event struct {
+	EffectTime         time.Time
+	PathName           string
+	AssociatedPathName string
+	EffectType         EffectType
+	PathType           PathType
+}
+
+const (
+	EffectTypeRename EffectType = iota
+	EffectTypeModify
+	EffectTypeCreate
+	EffectTypeDestroy
+	EffectTypeOwner
+	EffectTypeOther
+)
+
+const (
+	PathTypeDir PathType = iota
+	PathTypeFile
+	PathTypeHardLink
+	PathTypeSymLink
+	PathTypeWatcher
+	PathTypeOther
+)
+
+type callbackFunc func(events []*Event)
+
+type PatternGroup struct {
+	Patterns []string
+	Callback callbackFunc
+}