refactor!: assume HTMX for HTTP requests

Author: ItsNotGoodName

pkg/background/background.go

@@ -36,14 +36,34 @@ func Run(ctx context.Context, backgrounds ...Background) <-chan struct{} {
 type BackgroundFunction func(ctx context.Context)
 
 type Function struct {
-	fn BackgroundFunction
+	fn       BackgroundFunction
+	blocking Blocking
 }
 
-func NewFunction(fn BackgroundFunction) Function {
-	return Function{fn}
+type Blocking int
+
+const (
+	BlockingForever Blocking = iota // BlockingForever blocks forever.
+	BlockingContext                 // BlockingContext blocks until context is done.
+)
+
+// NewFunction create an adhoc function that implements the Background interface.
+func NewFunction(blocking Blocking, fn BackgroundFunction) Function {
+	return Function{
+		fn:       fn,
+		blocking: blocking,
+	}
 }
 
 func (f Function) Background(ctx context.Context, doneC chan<- struct{}) {
-	doneC <- struct{}{}
-	f.fn(ctx)
+	switch f.blocking {
+	case BlockingForever:
+		doneC <- struct{}{}
+		f.fn(ctx)
+	case BlockingContext:
+		f.fn(ctx)
+		doneC <- struct{}{}
+	default:
+		panic("unhandled case")
+	}
 }

web/controllers/auth.go

@@ -20,10 +20,7 @@ func LoginPost(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	// Execute
 	err := procs.AuthHTTPLogin(cc, username, password)
 	if err != nil {
-		if h.IsHTMXRequest(c) {
-			return h.Render(c, "login", loginData(username, err.Error()), "form")
-		}
-		return h.Render(c, "login", loginData(username, err.Error()))
+		return h.Render(c, "login", loginData(username, err.Error()), "form")
 	}
 
 	// Response

web/helpers/http.go

@@ -2,31 +2,21 @@ package helpers
 
 import (
 	"github.com/gofiber/fiber/v2"
+	"github.com/rs/zerolog/log"
 )
 
 const CSRFContextKey = "csrf_key"
 const AnonymousContextKey = "anonymous_key"
 
-func IsHTMXRequest(c *fiber.Ctx) bool {
-	_, isHTMXRequest := c.GetReqHeaders()["Hx-Request"]
-	return isHTMXRequest
-}
-
 func Redirect(c *fiber.Ctx, path string) error {
-	if IsHTMXRequest(c) {
-		c.Set("HX-Redirect", path)
-		return nil
-	} else {
-		return c.Redirect(path)
-	}
+	c.Set("HX-Redirect", path)
+	return nil
 }
 
 func Error(c *fiber.Ctx, err error, codes ...int) error {
-	if IsHTMXRequest(c) {
-		c.Set("HX-Redirect", "/something-went-wrong")
-	}
-
-	return Render(c, "something-went-wrong", fiber.Map{"Error": err})
+	c.Set("HX-Redirect", "/something-went-wrong")
+	log.Err(err).Msg("Request failed")
+	return nil
 }
 
 func NotFound(c *fiber.Ctx) error {

web/http/http.go

@@ -23,25 +23,18 @@ type HTTP struct {
 }
 
 func New(app core.App, shutdown context.CancelFunc, address string, bodyLimit int, sessionsPath string) HTTP {
-	store := session.New(session.Config{
-		Storage: bbolt.New(bbolt.Config{
-			Database: sessionsPath,
-		}),
-	})
-
-	// Fiber
+	// Views
 	views := web.Engine()
 	views.AddFuncMap(h.Map)
+
+	// Fiber
 	http := fiber.New(fiber.Config{
 		DisableStartupMessage: true,
 		Views:                 views,
 		ViewsLayout:           "layouts/index",
 		BodyLimit:             bodyLimit,
 		ErrorHandler: func(c *fiber.Ctx, err error) error {
-			if h.IsHTMXRequest(c) {
-				c.Set("HX-Redirect", "/something-went-wrong")
-			}
-
+			c.Set("HX-Redirect", "/something-went-wrong")
 			return fiber.DefaultErrorHandler(c, err)
 		},
 	})
@@ -52,10 +45,20 @@ func New(app core.App, shutdown context.CancelFunc, address string, bodyLimit in
 	http.Use(csrf.New(csrf.Config{
 		ContextKey: h.CSRFContextKey,
 		Extractor:  csrfExtractor(),
+		ErrorHandler: func(c *fiber.Ctx, err error) error {
+			c.Set("HX-Redirect", "/something-went-wrong")
+			return fiber.DefaultErrorHandler(c, err)
+		},
 	}))
 
+	sessionStore := session.New(session.Config{
+		Storage: bbolt.New(bbolt.Config{
+			Database: sessionsPath,
+		}),
+	})
+
 	route(app,
-		store,
+		sessionStore,
 		http,
 	)
 

web/views/index.html

@@ -65,7 +65,7 @@ <h2>Storage</h2>
         {{csrf $}}
         <button hx-post="/trim" data-loading-path="/trim" data-loading-disable data-loading-aria-busy
           title="Apply retention policy against data.">
-          Trim Data
+          Run Retention Policy
         </button>
       </form>
       <button hx-delete="/envelopes" data-loading-path="/envelopes" data-loading-disable data-loading-aria-busy