Add bunrouter dependency

Reviewed-on: #7

config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"strconv"
 	"strings"
 
 	"git.defalsify.org/vise.git/logging"
@@ -23,6 +24,7 @@ var (
 	userDbConn         string
 	userDbConnMode     storage.DbMode
 	Languages          []string
+	configManager      *Config
 )
 
 type Override struct {
@@ -134,6 +136,17 @@ func GetConns() (storage.Conns, error) {
 
 // LoadConfig initializes the configuration values after environment variables are loaded.
 func LoadConfig() error {
+	configManager = NewConfig(logg)
+
+	// Add configuration keys with validation
+	configManager.AddKey("HOST", "127.0.0.1", false, nil)
+	configManager.AddKey("PORT", "7123", false, func(v string) error {
+		_, err := strconv.Atoi(v)
+		return err
+	})
+	configManager.AddKey("DB_CONN", "", true, nil)
+	// ... add other keys ?  or is enough :/ ...
+
 	err := setConn()
 	if err != nil {
 		return err
@@ -145,5 +158,7 @@ func LoadConfig() error {
 	DefaultLanguage = defaultLanguage
 	Languages = languages
 
+	// Report configuration
+	configManager.Report("INFO")
 	return nil
 }

config/config_test.go

@@ -0,0 +1,63 @@
+// +build configreport
+
+package config
+
+import (
+	"fmt"
+	"os"
+	"testing"
+
+	"git.defalsify.org/vise.git/logging"
+)
+
+// go test -tags configreport ./config/...   ---> run with tag
+func TestConfig(t *testing.T) {
+	logger := logging.NewVanilla().WithDomain("test")
+	cfg := NewConfig(logger)
+
+	t.Run("Default Values", func(t *testing.T) {
+		cfg.AddKey("TEST_KEY", "default", false, nil)
+		value, err := cfg.GetValue("TEST_KEY")
+		t.Logf("Got value: %q, error: %v", value, err)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+		if value != "default" {
+			t.Errorf("expected 'default', got '%s'", value)
+		}
+	})
+
+	t.Run("Environment Override", func(t *testing.T) {
+		os.Setenv("TEST_ENV_KEY", "override")
+		defer os.Unsetenv("TEST_ENV_KEY")
+
+		cfg.AddKey("TEST_ENV_KEY", "default", false, nil)
+		value, err := cfg.GetValue("TEST_ENV_KEY")
+		t.Logf("Got value: %q, error: %v", value, err)
+		if err != nil {
+			t.Errorf("unexpected error: %v", err)
+		}
+		if value != "override" {
+			t.Errorf("expected 'override', got '%s'", value)
+		}
+	})
+
+	t.Run("Validation", func(t *testing.T) {
+		validator := func(v string) error {
+			if v != "valid" {
+				return fmt.Errorf("invalid value")
+			}
+			return nil
+		}
+
+		cfg.AddKey("VALIDATED_KEY", "valid", false, validator)
+		os.Setenv("VALIDATED_KEY", "invalid")
+		defer os.Unsetenv("VALIDATED_KEY")
+
+		value, err := cfg.GetValue("VALIDATED_KEY")
+		t.Logf("Got value: %q, error: %v", value, err)
+		if err == nil {
+			t.Error("expected validation error, got nil")
+		}
+	})
+}

config/reporter.go

@@ -0,0 +1,95 @@
+//go:build configreport
+
+package config
+
+import (
+	"fmt"
+
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/visedriver/env"
+)
+
+// ConfigValue represents a configuration key-value pair
+type ConfigValue struct {
+	Key       string
+	Default   string
+	Validator func(string) error
+	Sensitive bool
+}
+
+// Config handles configuration management and reporting
+type Config struct {
+	values map[string]ConfigValue
+	logger logging.Vanilla
+}
+
+func NewConfig(logger logging.Vanilla) *Config {
+	return &Config{
+		values: make(map[string]ConfigValue),
+		logger: logger,
+	}
+}
+
+// AddKey registers a new configuration key with optional validation
+func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) {
+	c.values[key] = ConfigValue{
+		Key:       key,
+		Default:   defaultValue,
+		Validator: validator,
+		Sensitive: sensitive,
+	}
+}
+
+// GetValue returns the value for a given key, applying environment override if present
+func (c *Config) GetValue(key string) (string, error) {
+	// Find config value by key
+	var cv ConfigValue
+	for _, v := range c.values {
+		if v.Key == key {
+			cv = v
+			break
+		}
+	}
+
+	if cv.Key == "" {
+		return "", fmt.Errorf("configuration key not found: %s", key)
+	}
+
+	// Get value from environment or default
+	value := env.GetEnv(key, cv.Default)
+
+	// Validate if validator exists
+	if cv.Validator != nil && cv.Validator(value) != nil {
+		return "", fmt.Errorf("invalid value for key %s", key)
+	}
+
+	return value, nil
+}
+
+// Report outputs all configuration values at the specified log level
+func (c *Config) Report(level string) {
+	for _, cv := range c.values {
+		value, err := c.GetValue(cv.Key)
+		if err != nil {
+			c.logger.Errorf("Error getting value for %s: %v", cv.Key, err)
+			continue
+		}
+
+		if cv.Sensitive {
+			value = "****"
+		}
+
+		switch level {
+		case "DEBUG":
+			c.logger.Debugf("config set", cv.Key, value)
+		case "INFO":
+			c.logger.Infof("config set", cv.Key, value)
+		case "WARN":
+			c.logger.Warnf("config set", cv.Key, value)
+		case "ERROR":
+			c.logger.Errorf("config set", cv.Key, value)
+		default:
+			c.logger.Infof("config set", cv.Key, value)
+		}
+	}
+}

config/reporter_noop.go

@@ -0,0 +1,21 @@
+//go:build !configreport
+
+package config
+
+import (
+    "git.defalsify.org/vise.git/logging"
+)
+
+type Config struct{}
+
+func NewConfig(logger logging.Vanilla) *Config {
+    return &Config{}
+}
+
+func (c *Config) AddKey(key string, defaultValue string, sensitive bool, validator func(string) error) {}
+
+func (c *Config) GetValue(key string) (string, error) {
+    return "", nil
+}
+
+func (c *Config) Report(level string) {} 

go.mod

@@ -3,7 +3,7 @@ module git.grassecon.net/grassrootseconomics/visedriver
 go 1.23.0
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
+	git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e
 	github.com/jackc/pgx/v5 v5.7.1
 	github.com/joho/godotenv v1.5.1
 )
@@ -19,6 +19,7 @@ require (
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
+	github.com/uptrace/bunrouter v1.0.23 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect

go.sum

@@ -1,5 +1,5 @@
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
-git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e h1:gtB9OdX6x5gQRM3W824dEurXuuf/YPInqgtv2KAp5Zo=
+git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -33,6 +33,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/uptrace/bunrouter v1.0.23 h1:Bi7NKw3uCQkcA/GUCtDNPq5LE5UdR9pe+UyWbjHB/wU=
+github.com/uptrace/bunrouter v1.0.23/go.mod h1:O3jAcl+5qgnF+ejhgkmbceEk0E/mqaK+ADOocdNpY8M=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=

request/base.go

@@ -12,23 +12,32 @@ import (
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
+type EngineFunc func(engine.Config, resource.Resource, *persist.Persister) engine.Engine
+
 type BaseRequestHandler struct {
 	cfgTemplate engine.Config
 	rp          RequestParser
 	rs          resource.Resource
 	hn          entry.EntryHandler
 	provider    storage.StorageProvider
+	engineFunc	EngineFunc
 }
 
-// func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *handlers.Handlers) *BaseRequestHandler {
 func NewBaseRequestHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn entry.EntryHandler) *BaseRequestHandler {
-	return &BaseRequestHandler{
+	h := &BaseRequestHandler{
 		cfgTemplate: cfg,
 		rs:          rs,
 		hn:          hn,
 		rp:          rp,
 		provider:    storage.NewSimpleStorageProvider(stateDb, userdataDb),
 	}
+	h.engineFunc = h.getDefaultEngine
+	return h
+}
+
+func (f *BaseRequestHandler) WithEngineFunc(fn EngineFunc) *BaseRequestHandler {
+	f.engineFunc = fn
+	return f
 }
 
 func (f *BaseRequestHandler) Shutdown(ctx context.Context) {
@@ -39,15 +48,22 @@ func (f *BaseRequestHandler) Shutdown(ctx context.Context) {
 }
 
 func (f *BaseRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
+	return f.engineFunc(cfg, rs, pr)
+}
+
+func (f *BaseRequestHandler) getDefaultEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
 	en := engine.NewEngine(cfg, rs)
 	en = en.WithPersister(pr)
+	en = en.WithFirst(f.hn.Init)
+	if f.cfgTemplate.EngineDebug {
+		en = en.WithDebug(nil)
+	}
 	return en
 }
 
 func (f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error) {
 	var r bool
 	var err error
-	var ok bool
 
 	logg.InfoCtxf(rqs.Ctx, "new request", "data", rqs)
 
@@ -57,27 +73,12 @@ func (f *BaseRequestHandler) Process(rqs RequestSession) (RequestSession, error)
 		return rqs, errors.ErrStorage
 	}
 
-	//f.hn = f.hn.WithPersister(rqs.Storage.Persister)
 	f.hn.SetPersister(rqs.Storage.Persister)
 	defer func() {
 		f.hn.Exit()
 	}()
-	eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
-	en, ok := eni.(*engine.DefaultEngine)
-	if !ok {
-		perr := f.provider.Put(rqs.Ctx, rqs.Config.SessionId, rqs.Storage)
-		rqs.Storage = nil
-		if perr != nil {
-			logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
-		}
-		return rqs, errors.ErrEngineType
-	}
-	en = en.WithFirst(f.hn.Init)
-	if rqs.Config.EngineDebug {
-		en = en.WithDebug(nil)
-	}
-	rqs.Engine = en
 
+	rqs.Engine = f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
 	r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
 	if err != nil {
 		perr := f.provider.Put(rqs.Ctx, rqs.Config.SessionId, rqs.Storage)

request/http/server.go

@@ -7,6 +7,7 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/errors"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"github.com/uptrace/bunrouter"
 )
 
 var (
@@ -16,6 +17,7 @@ var (
 // HTTPRequestHandler implements the session handler for HTTP
 type HTTPRequestHandler struct {
 	request.RequestHandler
+	router *bunrouter.Router
 }
 
 func (f *HTTPRequestHandler) WriteError(w http.ResponseWriter, code int, err error) {
@@ -30,12 +32,25 @@ func (f *HTTPRequestHandler) WriteError(w http.ResponseWriter, code int, err err
 }
 
 func NewHTTPRequestHandler(h request.RequestHandler) *HTTPRequestHandler {
-	return &HTTPRequestHandler{
+	handler := &HTTPRequestHandler{
 		RequestHandler: h,
+		router:         bunrouter.New(),
 	}
+
+	// Route all requests to existing vise logic
+	handler.router.GET("/*path", handler.handleViseRequest)
+	handler.router.POST("/*path", handler.handleViseRequest)
+	handler.router.PUT("/*path", handler.handleViseRequest)
+	handler.router.DELETE("/*path", handler.handleViseRequest)
+
+	return handler
 }
 
 func (hh *HTTPRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	hh.router.ServeHTTP(w, req)
+}
+
+func (hh *HTTPRequestHandler) handleViseRequest(w http.ResponseWriter, req bunrouter.Request) error {
 	var code int
 	var err error
 	var perr error
@@ -47,17 +62,18 @@ func (hh *HTTPRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request
 
 	rp := hh.GetRequestParser()
 	cfg := hh.GetConfig()
-	cfg.SessionId, err = rp.GetSessionId(req.Context(), req)
+	cfg.SessionId, err = rp.GetSessionId(req.Context(), req.Request)
 	if err != nil {
 		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
 		hh.WriteError(w, 400, err)
+		return err
 	}
 	rqs.Config = cfg
-	rqs.Input, err = rp.GetInput(req)
+	rqs.Input, err = rp.GetInput(req.Request)
 	if err != nil {
 		logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
 		hh.WriteError(w, 400, err)
-		return
+		return err
 	}
 
 	rqs, err = hh.Process(rqs)
@@ -74,7 +90,7 @@ func (hh *HTTPRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request
 
 	if code != 200 {
 		hh.WriteError(w, 500, err)
-		return
+		return err
 	}
 
 	w.WriteHeader(200)
@@ -83,10 +99,11 @@ func (hh *HTTPRequestHandler) ServeHTTP(w http.ResponseWriter, req *http.Request
 	rqs, perr = hh.Reset(rqs.Ctx, rqs)
 	if err != nil {
 		hh.WriteError(w, 500, err)
-		return
+		return err
 	}
 	if perr != nil {
 		hh.WriteError(w, 500, perr)
-		return
+		return perr
 	}
+	return nil
 }

request/http/server_test.go

@@ -99,9 +99,7 @@ func TestRequestHandler_ServeHTTP(t *testing.T) {
 				},
 			}
 
-			sessionHandler := &HTTPRequestHandler{
-				RequestHandler: mockRequestHandler,
-			}
+			sessionHandler := NewHTTPRequestHandler(mockRequestHandler)
 
 			req := httptest.NewRequest(http.MethodPost, "/", bytes.NewBuffer(tt.input))
 			req.Header.Set("X-Vise-Session", tt.sessionID)
@@ -119,7 +117,7 @@ func TestRequestHandler_ServeHTTP(t *testing.T) {
 }
 
 func TestRequestHandler_WriteError(t *testing.T) {
-	handler := &HTTPRequestHandler{}
+	handler := NewHTTPRequestHandler(&httpmocks.MockRequestHandler{})
 	mockWriter := &httpmocks.MockWriter{}
 	err := errors.New("test error")