feat: orphan delete on event and refactor

Author: ItsNotGoodName

cmd/smtpbridge/main.go

@@ -15,7 +15,6 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/internal/database"
 	"github.com/ItsNotGoodName/smtpbridge/internal/file"
 	"github.com/ItsNotGoodName/smtpbridge/internal/mailman"
-	"github.com/ItsNotGoodName/smtpbridge/internal/models"
 	"github.com/ItsNotGoodName/smtpbridge/internal/repo"
 	"github.com/ItsNotGoodName/smtpbridge/migrations"
 	"github.com/ItsNotGoodName/smtpbridge/pkg/secret"
@@ -38,7 +37,11 @@ func main() {
 	flags := config.WithFlagSet(flag.NewFlagSet(os.Args[0], flag.ExitOnError))
 
 	app := lieut.NewSingleCommandApp(
-		lieut.AppInfo{Name: "smtpbridge", Version: build.Current.Version, Summary: "Bridge email to other messaging services."},
+		lieut.AppInfo{
+			Name:    "smtpbridge",
+			Version: build.Current.Version,
+			Summary: "Bridge email to other messaging services.",
+		},
 		run(flags),
 		flags,
 		os.Stdout,
@@ -94,16 +97,9 @@ func run(flags *flag.FlagSet) lieut.Executor {
 		}
 
 		// App
-		webFileStore := app.NewWebFileStore("apple-touch-icon.png", fmt.Sprintf("http://127.0.0.1:%d", cfg.HTTPPort))
-		app := app.New(db, fileStore, bus, cfg.Config, cfg.EndpointFactory, webFileStore)
-
-		// TODO: move this somewhere else
-		{
-			release := bus.OnEnvelopeCreated(func(ctx context.Context, evt models.EventEnvelopeCreated) error {
-				return app.MailmanEnqueue(ctx, evt.ID)
-			})
-			defer release()
-		}
+		webTestFileStore := app.NewWebTestFileStore("apple-touch-icon.png", fmt.Sprintf("http://127.0.0.1:%d", cfg.HTTPPort))
+		app, release := app.New(db, fileStore, bus, cfg.Config, cfg.EndpointFactory, webTestFileStore)
+		defer release()
 
 		// Supervisor
 		super := suture.New("root", suture.Spec{

config/config.go

@@ -25,8 +25,8 @@ import (
 )
 
 const (
-	TimeFormat12H = "12h"
-	TimeFormat24H = "24h"
+	timeFormat12H = "12h"
+	timeFormat24H = "24h"
 )
 
 type Config struct {
@@ -106,7 +106,7 @@ var RawDefault = struct {
 	HTTPPort           uint16 `koanf:"http.port"`
 	// IMAPPort         uint16 `koanf:"imap.port"`
 }{
-	TimeFormat:         TimeFormat12H,
+	TimeFormat:         timeFormat12H,
 	SMTPMaxPayloadSize: "25 MB",
 	DataDirectory:      "smtpbridge_data",
 	PythonExecutable:   "python3",
@@ -115,15 +115,17 @@ var RawDefault = struct {
 	// IMAPPort:         10143,
 }
 
+// flagFlatKeys are remaps of CLI flag keys to work with koanf's parsing.
 var flagFlatKeys map[string]string = map[string]string{
 	"time-format":       "time_format",
 	"data-directory":    "data_directory",
 	"python-executable": "python_executable",
 }
 
+// WithFlagSet includes CLI flags with the config reading.
 func WithFlagSet(flags *flag.FlagSet) *flag.FlagSet {
 	flags.String("config", "", flagUsageString("", "Path to config file."))
-	flags.String("time-format", "", flagUsageString(TimeFormat12H, fmt.Sprintf("Format for time display (%s/%s).", TimeFormat12H, TimeFormat24H)))
+	flags.String("time-format", "", flagUsageString(timeFormat12H, fmt.Sprintf("Format for time display (%s/%s).", timeFormat12H, timeFormat24H)))
 	flags.String("data-directory", "", flagUsageString(RawDefault.DataDirectory, "Path to data directory."))
 	flags.String("python-executable", "", flagUsageString(RawDefault.PythonExecutable, "Python executable."))
 	flags.Bool("debug", false, flagUsageBool(false, "Run in debug mode."))
@@ -290,9 +292,9 @@ func (p Parser) Parse(raw Raw) (Config, error) {
 
 	var timeHourFormat string
 	switch raw.TimeFormat {
-	case TimeFormat12H:
+	case timeFormat12H:
 		timeHourFormat = helpers.TimeHourFormat12
-	case TimeFormat24H:
+	case timeFormat24H:
 		timeHourFormat = helpers.TimeHourFormat24
 	default:
 		return Config{}, fmt.Errorf("invalid time format: %s", raw.TimeFormat)

internal/app/app.go

@@ -30,12 +30,12 @@ type FileStore interface {
 }
 
 type App struct {
-	db              database.Querier
-	fileStore       FileStore
-	bus             core.Bus
-	config          *models.Config
-	endpointFactory endpoint.Factory
-	webFileStore    WebFileStore
+	db               database.Querier
+	fileStore        FileStore
+	bus              core.Bus
+	config           *models.Config
+	endpointFactory  endpoint.Factory
+	webTestFileStore WebTestFileStore
 }
 
 func (a App) RuleEndpointsGet(ctx context.Context, id int64) (models.RuleEndpoints, error) {
@@ -103,16 +103,29 @@ func New(
 	bus core.Bus,
 	config *models.Config,
 	endpointFactory endpoint.Factory,
-	webFileStore WebFileStore,
-) App {
-	return App{
-		db:              db,
-		fileStore:       fileStore,
-		bus:             bus,
-		config:          config,
-		endpointFactory: endpointFactory,
-		webFileStore:    webFileStore,
+	webTestFileStore WebTestFileStore,
+) (App, func()) {
+	a := App{
+		db:               db,
+		fileStore:        fileStore,
+		bus:              bus,
+		config:           config,
+		endpointFactory:  endpointFactory,
+		webTestFileStore: webTestFileStore,
 	}
+
+	return a, a.init()
+}
+
+func (a App) init() func() {
+	return closers(
+		a.bus.OnEnvelopeCreated(func(ctx context.Context, evt models.EventEnvelopeCreated) error {
+			return a.MailmanEnqueue(ctx, evt.ID)
+		}),
+		a.bus.OnEnvelopeDeleted(func(ctx context.Context, evt models.EventEnvelopeDeleted) error {
+			return a.AttachmentOrphanDelete(ctx, a.Tracer(trace.SourceApp))
+		}),
+	)
 }
 
 var ErrorLogin = fmt.Errorf("login invalid")
@@ -187,6 +200,8 @@ func (a App) EnvelopeDelete(ctx context.Context, id int64) error {
 		return err
 	}
 
+	a.bus.EnvelopeDeleted(ctx)
+
 	return nil
 }
 
@@ -301,7 +316,7 @@ func (a App) EndpointTest(ctx context.Context, id int64) error {
 		return err
 	}
 
-	file, err := a.webFileStore.File()
+	file, err := a.webTestFileStore.File()
 	if err != nil {
 		return err
 	}
@@ -318,7 +333,7 @@ func (a App) EndpointTest(ctx context.Context, id int64) error {
 		Text:    "Test Body",
 	}), datt.Attachment)
 
-	return end.Send(ctx, a.webFileStore, env)
+	return end.Send(ctx, a.webTestFileStore, env)
 }
 
 func (a App) Tracer(source string) trace.Tracer {

internal/app/utils.go

@@ -0,0 +1,9 @@
+package app
+
+func closers(closers ...func()) func() {
+	return func() {
+		for _, v := range closers {
+			v()
+		}
+	}
+}

internal/app/web.go

@@ -10,27 +10,28 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/web"
 )
 
-type WebFileStore struct {
+// WebTestFileStore is used for testing endpoints.
+type WebTestFileStore struct {
 	name string
 	url  string
 }
 
-func NewWebFileStore(name, url string) WebFileStore {
-	return WebFileStore{
+func NewWebTestFileStore(name, url string) WebTestFileStore {
+	return WebTestFileStore{
 		name: name,
 		url:  url,
 	}
 }
 
-func (w WebFileStore) File() (fs.File, error) {
+func (w WebTestFileStore) File() (fs.File, error) {
 	return web.FS.Open(w.name)
 }
 
-func (w WebFileStore) Reader(ctx context.Context, att models.Attachment) (io.ReadCloser, error) {
+func (w WebTestFileStore) Reader(ctx context.Context, att models.Attachment) (io.ReadCloser, error) {
 	return w.File()
 }
 
-func (w WebFileStore) Path(ctx context.Context, att models.Attachment) (string, error) {
+func (w WebTestFileStore) Path(ctx context.Context, att models.Attachment) (string, error) {
 	if w.url == "" {
 		return "", fmt.Errorf("app: url is empty")
 	}

internal/trace/trace.go

@@ -76,6 +76,7 @@ const (
 	SourceSMTP    = "smtp"
 	SourceMailman = "mailman"
 	SourceCron    = "cron"
+	SourceApp     = "app"
 )
 
 const (