feat: garden button

Author: ItsNotGoodName

internal/core/bus.go

@@ -12,10 +12,15 @@ type EventEnvelopeDeleted struct {
 	IDS []int64
 }
 
+type EventGardenStart struct {
+	Response chan<- bool
+}
+
 type Bus struct {
 	Mutex           sync.Mutex
 	EnvelopeCreated []func(cc *Context, evt EventEnvelopeCreated)
 	EnvelopeDeleted []func(cc *Context, evt EventEnvelopeDeleted)
+	GardenStart     func(cc *Context, evt EventGardenStart)
 }
 
 func NewBus() *Bus {

internal/events/envelope.go

@@ -29,3 +29,20 @@ func PublishEnvelopeDeleted(cc *core.Context, ids ...int64) {
 	}
 	cc.Bus.Mutex.Unlock()
 }
+
+func OnGardenStart(app core.App, fn func(cc *core.Context, evt core.EventGardenStart)) {
+	app.Bus.Mutex.Lock()
+	if app.Bus.GardenStart != nil {
+		panic("GardenStart handler is being redefined")
+	}
+	app.Bus.GardenStart = fn
+	app.Bus.Mutex.Unlock()
+}
+
+func PublishGardenStart(cc *core.Context) <-chan bool {
+	res := make(chan bool)
+	cc.Bus.Mutex.Lock()
+	cc.Bus.GardenStart(cc, core.EventGardenStart{Response: res})
+	cc.Bus.Mutex.Unlock()
+	return res
+}

internal/procs/gardener.go

@@ -2,6 +2,7 @@ package procs
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
@@ -12,11 +13,26 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func GardenerStart(ctx context.Context, app core.App, policy models.RetentionPolicy) {
+func GardenStart(cc *core.Context) error {
+	ctx := cc.Context()
+	select {
+	case <-ctx.Done():
+		return ctx.Err()
+	case res := <-events.PublishGardenStart(cc):
+		if res {
+			return nil
+		}
+
+		return fmt.Errorf("already gardening")
+	}
+}
+
+func GardenerBackground(ctx context.Context, app core.App, policy models.RetentionPolicy) {
 	envDeletedC := make(chan core.EventEnvelopeDeleted, 1)
 	envCreatedC := make(chan core.EventEnvelopeCreated, 1)
+	evtGardenStart := make(chan core.EventGardenStart, 1)
 
-	go gardener(app.Context(ctx), policy, envCreatedC, envDeletedC)
+	go gardener(app.Context(ctx), policy, envCreatedC, envDeletedC, evtGardenStart)
 
 	events.OnEnvelopeCreated(app, func(cc *core.Context, evt core.EventEnvelopeCreated) {
 		select {
@@ -41,9 +57,27 @@ func GardenerStart(ctx context.Context, app core.App, policy models.RetentionPol
 		default:
 		}
 	})
+
+	events.OnGardenStart(app, func(cc *core.Context, evt core.EventGardenStart) {
+		select {
+		case evtGardenStart <- evt:
+		default:
+			select {
+			case <-ctx.Done():
+				return
+			case evt.Response <- false:
+			}
+		}
+	})
 }
 
-func gardener(cc *core.Context, policy models.RetentionPolicy, envCreatedC <-chan core.EventEnvelopeCreated, envDeletedC <-chan core.EventEnvelopeDeleted) {
+func gardener(
+	cc *core.Context,
+	policy models.RetentionPolicy,
+	envCreatedC <-chan core.EventEnvelopeCreated,
+	envDeletedC <-chan core.EventEnvelopeDeleted,
+	evtGardenStart <-chan core.EventGardenStart,
+) {
 	ctx := cc.Context()
 	ticker := time.NewTicker(30 * time.Minute)
 
@@ -79,6 +113,14 @@ func gardener(cc *core.Context, policy models.RetentionPolicy, envCreatedC <-cha
 			gardenerDeleteOrphanAttachments(cc)
 		case <-ticker.C:
 			clean()
+		case evt := <-evtGardenStart:
+			clean()
+
+			select {
+			case <-ctx.Done():
+				return
+			case evt.Response <- true:
+			}
 		}
 	}
 }

internal/procs/mailman.go

@@ -9,7 +9,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func MailmanStart(ctx context.Context, app core.App) {
+func MailmanBackground(ctx context.Context, app core.App) {
 	evtC := make(chan core.EventEnvelopeCreated, 25)
 
 	go mailman(app.Context(ctx), evtC)

main.go

@@ -61,8 +61,8 @@ func run(ctx context.Context, shutdown context.CancelFunc, cli config.CLI) <-cha
 		log.Fatal().Err(err).Msg("Failed to sync app from config")
 	}
 
-	procs.MailmanStart(ctx, app)
-	procs.GardenerStart(ctx, app, cfg.RetentionPolicy)
+	procs.MailmanBackground(ctx, app)
+	procs.GardenerBackground(ctx, app, cfg.RetentionPolicy)
 	procs.VacuumStart(ctx, app)
 
 	var backgrounds []background.Background

web/controllers/controllers.go

@@ -74,3 +74,15 @@ func Vacuum(c *fiber.Ctx, cc *core.Context) error {
 	c.Set("HX-Trigger", "databaseVacuum")
 	return c.SendStatus(http.StatusNoContent)
 }
+
+func Garden(c *fiber.Ctx, cc *core.Context) error {
+	// Execute
+	err := procs.GardenStart(cc)
+	if err != nil {
+		return helpers.Error(c, err)
+	}
+
+	// Response
+	c.Set("HX-Trigger", "garden")
+	return c.SendStatus(http.StatusNoContent)
+}

web/http/routes.go

@@ -43,6 +43,7 @@ func routes(http *fiber.App, app core.App, retentionPolicy models.RetentionPolic
 
 	http.Post("/send", middleware.App(app, controllers.Send))
 	http.Post("/vacuum", middleware.App(app, controllers.Vacuum))
+	http.Post("/garden", middleware.App(app, controllers.Garden))
 	http.Group("/files", controllers.Files(app))
 
 	http.Route("/p", func(http fiber.Router) {

web/views/index.html

@@ -8,7 +8,7 @@ <h2>Recent Envelopes</h2>
     </figure>
   </article>
 
-  <article>
+  <article id="storage">
     <h2>Storage</h2>
     <figure>{{template "p/storage-table" .}}</figure>
     <div class="grid">
@@ -53,6 +53,9 @@ <h2>Retention Policy</h2>
         </tbody>
       </table>
     </figure>
+    <button hx-post="/garden" data-loading-path="/garden" data-loading-disable data-loading-aria-busy>
+      Garden Data
+    </button>
   </article>
 
   <article>

web/views/p/storage-table.html

@@ -1,5 +1,5 @@
-<table hx-trigger="every 5s, databaseVacuum from:body, deleteEnvelopes from:body" hx-get="/p/storage-table"
-  hx-swap="outerHTML">
+<table hx-trigger="every 5s, databaseVacuum from:body, garden from:body, deleteEnvelopes from:body"
+  hx-get="/p/storage-table" hx-swap="outerHTML">
   <tbody>
     <tr>
       <th scope="row"><strong>Envelope Count</strong></th>