feat!: final rewrite

Rewritten with chi HTTP router, templ template library, htmx JS library,
daisyUI CSS library.

- Apprise endpoint
- better HTTP error handling
- tracing of actions
- Web UI improvements

- use Suture Go library instead of custom background library
- use core.App interface for all actions
- remove Bun ORM + Jet query builder for Jet query builer
- migrations are now managed with atlas schema migration tool

Author: ItsNotGoodName

.air.toml

@@ -4,19 +4,19 @@ tmp_dir = "tmp"
 
 [build]
   args_bin = []
-  bin = "./tmp/main"
-  cmd = "go build -o ./tmp/main -tags dev ."
-  delay = 1000 # ms
-  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  bin = "./tmp/main -debug"
+  cmd = "make gen-templ && go build -o ./tmp/main -tags dev ./cmd/smtpbridge"
+  delay = 10 # ms
+  exclude_dir = ["assets", "tmp", "vendor", "testdata", "smtpbridge_data"]
   exclude_file = []
-  exclude_regex = ["_test.go"]
+  exclude_regex = ["_test.go", ".*_templ.go"]
   exclude_unchanged = false
   follow_symlink = false
   full_bin = ""
   include_dir = []
-  include_ext = ["go"]
+  include_ext = ["go", "tpl", "tmpl", "html", "templ", "py"]
   include_file = []
-  kill_delay = "1s"
+  kill_delay = "0s"
   log = "build-errors.log"
   poll = false
   poll_interval = 0

.goreleaser.yaml

@@ -11,7 +11,8 @@ before:
     # you may remove this if you don't need go generate
     - go generate ./...
 builds:
-  - env:
+  - main: ./cmd/smtpbridge
+    env:
       - CGO_ENABLED=0
     goos:
       - linux
@@ -50,6 +51,8 @@ dockers:
       - --label=org.opencontainers.image.created={{ .Date }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
       - --label=org.opencontainers.image.licenses={{ .Env.LICENSES }}
+    extra_files:
+      - entrypoint.sh
   - goarch: arm64
     image_templates:
       - ghcr.io/{{ .Env.REPO_OWNER }}/{{ .ProjectName }}:{{ .Version }}-arm64v8
@@ -66,6 +69,8 @@ dockers:
       - --label=org.opencontainers.image.created={{ .Date }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
       - --label=org.opencontainers.image.licenses={{ .Env.LICENSES }}
+    extra_files:
+      - entrypoint.sh
   - goarch: arm
     goarm: 7
     image_templates:
@@ -83,6 +88,8 @@ dockers:
       - --label=org.opencontainers.image.created={{ .Date }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
       - --label=org.opencontainers.image.licenses={{ .Env.LICENSES }}
+    extra_files:
+      - entrypoint.sh
 docker_manifests:
   - name_template: ghcr.io/{{ .Env.REPO_OWNER }}/{{ .ProjectName }}:{{ .Version }}
     image_templates:

Dockerfile

@@ -1,9 +1,12 @@
 FROM alpine
 
-VOLUME /data
+ENV APPRISE_ENABLE=
+ENV APPRISE_VERSION=
 
+VOLUME /data
 WORKDIR /config
 
-ENTRYPOINT ["/usr/bin/smtpbridge", "--data-directory=/data"]
+ENTRYPOINT ["/entrypoint.sh"]
 
+COPY entrypoint.sh /entrypoint.sh
 COPY smtpbridge /usr/bin/smtpbridge

Makefile

@@ -1,28 +1,77 @@
-gen:
-	jet -source=sqlite -dsn="./smtpbridge_data/smtpbridge.db" -path=./internal/dbgen -ignore-tables bun_migrations,bun_migration_locks
+export DB_DIR=./smtpbridge_data
+export DB_FILE=smtpbridge.db
+export DB_PATH="$(DB_DIR)/$(DB_FILE)"
+export DEV_IP=127.0.0.1
+
+-include .env
 
 snapshot:
 	goreleaser release --snapshot --clean
 
+run:
+	go run ./cmd/smtpbridge
+
 preview:
-	cd web && pnpm run build && cd .. && go run .
+	cd web && pnpm run build && cd .. && go run ./cmd/smtpbridge
+
+clean:
+	rm -rf "$(DB_DIR)" && mkdir "$(DB_DIR)"
+
+gen: db-migrate gen-jet gen-templ
+
+dep: dep-air dep-jet dep-goose dep-atlas dep-templ dep-goreleaser
+
+# Development
 
 dev:
 	air
 
 dev-web:
-	cd web && pnpm run dev
+	cd web && pnpm install && pnpm run dev
 
-clean:
-	rm -rf smtpbridge_data
+# Database
+
+db-ui:
+	podman run -it --rm \
+		-p 8090:8080 \
+		-v "$(DB_DIR):/data" \
+		-e "SQLITE_DATABASE=$(DB_FILE)" \
+		docker.io/coleifer/sqlite-web
 
-dep: dep-air dep-jet dep-web
+db-inspect:
+	atlas schema inspect --env local
+
+db-migration:
+	atlas migrate diff $(name) --env local
+
+db-migrate:
+	goose -dir migrations sqlite3 "$(DB_PATH)" up
+
+# Generation
+
+gen-jet:
+	jet -source=sqlite -dsn="$(DB_PATH)" -path=./internal/jet -ignore-tables goose_db_version
+	rm -rf ./internal/jet/model
+
+gen-templ:
+	cd web && templ generate
+
+# Dependencies
 
 dep-air:
 	go install github.com/cosmtrek/air@latest
 
 dep-jet:
 	go install github.com/go-jet/jet/v2/cmd/jet@latest
 
-dep-web:
-	cd web && pnpm install
+dep-goose:
+	go install github.com/pressly/goose/v3/cmd/goose@latest
+
+dep-atlas:
+	go install ariga.io/atlas/cmd/atlas@latest
+
+dep-templ:
+	go install github.com/a-h/templ/cmd/templ@latest
+
+dep-goreleaser:
+	go install github.com/goreleaser/goreleaser@latest