refactor: migrate env-var reads to config package

cmd/user/main.go

@@ -11,12 +11,18 @@ import (
 
 	"github.com/google/uuid"
 	"golang.org/x/crypto/bcrypt"
+	"mal/internal/config"
 	"mal/internal/database"
 	"mal/internal/db"
 )
 
 func main() {
-	dbConn, err := db.Open(db.GetDBFile())
+	cfg, err := config.Load()
+	if err != nil {
+		log.Fatalf("load config: %v", err)
+	}
+
+	dbConn, err := db.Open(cfg.DatabaseFile)
 	if err != nil {
 		log.Fatalf("failed to open db: %v", err)
 	}

integrations/jikan/client.go

@@ -7,19 +7,21 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	"os"
 	"reflect"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"mal/internal/config"
 	"mal/internal/db"
 	"mal/internal/observability"
 
 	"golang.org/x/sync/singleflight"
 )
 
+var traceEnabled bool
+
 type Client struct {
 	httpClient  *http.Client
 	baseURL     string
@@ -39,7 +41,8 @@ type Client struct {
 
 const jikanSlowLogThreshold = 750 * time.Millisecond
 
-func NewClient(queries *db.Queries, metrics *observability.Metrics) *Client {
+func NewClient(cfg config.Config, queries *db.Queries, metrics *observability.Metrics) *Client {
+	traceEnabled = cfg.JikanTrace
 	return &Client{
 		httpClient: &http.Client{
 			Timeout: 10 * time.Second,
@@ -142,8 +145,7 @@ func waitForRetry(ctx context.Context, delay time.Duration) error {
 }
 
 func jikanTraceEnabled() bool {
-	value := strings.ToLower(strings.TrimSpace(os.Getenv("MAL_JIKAN_TRACE")))
+	return traceEnabled
-	return value == "1" || value == "true" || value == "yes"
 }
 
 func logJikanCache(cacheKey string, source string, startedAt time.Time, err error) {

internal/app/app.go

@@ -5,6 +5,7 @@ import (
 	"mal/integrations/playback/allanime"
 	"mal/internal/anime"
 	"mal/internal/auth"
+	"mal/internal/config"
 	"mal/internal/database"
 	"mal/internal/episodes"
 	"mal/internal/playback"
@@ -19,6 +20,7 @@ import (
 
 func NewApp() *fx.App {
 	return fx.New(
+		config.Module,
 		database.Module,
 		jikan.Module,
 		allanime.Module,

internal/db/sqlite.go

@@ -3,7 +3,6 @@ package db
 import (
 	"database/sql"
 	"fmt"
-	"os"
 
 	// sqlite3 driver.
 	_ "github.com/mattn/go-sqlite3"
@@ -17,11 +16,3 @@ func Open(dbFile string) (*sql.DB, error) {
 	}
 	return db, nil
 }
-
-// GetDBFile returns the database file path, checking DATABASE_FILE env var first
-func GetDBFile() string {
-	if f := os.Getenv("DATABASE_FILE"); f != "" {
-		return f
-	}
-	return "mal.db"
-}

internal/episodes/module.go

@@ -1,11 +1,9 @@
 package episodes
 
 import (
-	"os"
-	"strings"
-
 	"mal/integrations/jikan"
 	"mal/integrations/playback/allanime"
+	"mal/internal/config"
 	"mal/internal/db"
 	"mal/internal/domain"
 	episodeService "mal/internal/episodes/service"
@@ -14,9 +12,8 @@ import (
 	"go.uber.org/fx"
 )
 
-func episodeAvailabilityEnabled() bool {
+func episodeAvailabilityEnabled(cfg config.Config) bool {
-	value := strings.ToLower(strings.TrimSpace(os.Getenv("EPISODE_AVAILABILITY_MODE")))
+	return cfg.EpisodeAvailabilityMode != config.EpisodeAvailabilityModeLegacy && cfg.EpisodeAvailabilityMode != config.EpisodeAvailabilityModeJikan
-	return value != "legacy" && value != "jikan"
 }
 
 var Module = fx.Options(

internal/playback/module.go

@@ -1,10 +1,9 @@
 package playback
 
 import (
-	"os"
-
 	"mal/integrations/jikan"
 	"mal/integrations/playback/allanime"
+	"mal/internal/config"
 	"mal/internal/domain"
 	"mal/internal/playback/handler"
 	"mal/internal/playback/repository"
@@ -14,8 +13,8 @@ import (
 	"go.uber.org/fx"
 )
 
-func provideProxyTokenKey() string {
+func provideProxyTokenKey(cfg config.Config) string {
-	return os.Getenv("PLAYBACK_PROXY_SECRET")
+	return cfg.PlaybackProxySecret
 }
 
 var Module = fx.Options(

internal/server/cors.go

@@ -1,16 +1,19 @@
 package server
 
 import (
+	"mal/internal/config"
 	"net/http"
-	"os"
 	"strings"
 
 	"github.com/gin-gonic/gin"
 )
 
 func CORSMiddleware() gin.HandlerFunc {
-	allowAll := os.Getenv("MAL_CORS_ALLOW_ALL") == "1"
+	return CORSMiddlewareWithConfig(config.Config{})
+}
 
+func CORSMiddlewareWithConfig(cfg config.Config) gin.HandlerFunc {
+	allowAll := cfg.CORSAllowAll
 	return func(c *gin.Context) {
 		origin := c.GetHeader("Origin")
 		if origin != "" && (allowAll || isAllowedOrigin(origin)) {

internal/server/server.go

@@ -3,9 +3,9 @@ package server
 import (
 	"context"
 	"log"
+	"mal/internal/config"
 	"mal/internal/observability"
 	"net/http"
-	"os"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -19,12 +19,14 @@ var Module = fx.Options(
 	fx.Invoke(RunServer),
 )
 
-func ProvideRouter(htmlRender render.HTMLRender, metrics *observability.Metrics) *gin.Engine {
+func ProvideRouter(cfg config.Config, htmlRender render.HTMLRender, metrics *observability.Metrics) *gin.Engine {
-	if os.Getenv("GIN_MODE") == "" {
+	if cfg.GinMode == "" {
 		gin.SetMode(gin.ReleaseMode)
+	} else {
+		gin.SetMode(cfg.GinMode)
 	}
 	r := gin.New()
-	r.Use(CORSMiddleware(), RequestLogger(metrics), gin.Recovery())
+	r.Use(CORSMiddlewareWithConfig(cfg), RequestLogger(metrics), gin.Recovery())
 	r.Static("/static", "./static")
 	r.Static("/dist", "./dist")
 	r.GET("/metrics", gin.WrapH(metrics.Handler()))
@@ -32,11 +34,8 @@ func ProvideRouter(htmlRender render.HTMLRender, metrics *observability.Metrics)
 	return r
 }
 
-func RunServer(lifecycle fx.Lifecycle, r *gin.Engine) {
+func RunServer(cfg config.Config, lifecycle fx.Lifecycle, r *gin.Engine) {
-	port := os.Getenv("PORT")
+	port := cfg.Port
-	if port == "" {
-		port = "3000"
-	}
 
 	srv := newHTTPServer(":"+port, r)