Compare commits

..

5 Commits

Author SHA1 Message Date
Carlosokumu
e2d1f65bb3 implement connect 2025-04-08 12:43:35 +03:00
Carlosokumu
bdde401439 use gdbm db implementation 2025-04-08 12:28:24 +03:00
Carlosokumu
a5c1ac2415 upgrade go-vise dep 2025-04-08 11:28:44 +03:00
Carlosokumu
504e4baf56 add function to create a log db 2025-04-08 11:27:55 +03:00
Carlosokumu
d8a852575d implement dummy base 2025-04-08 10:33:49 +03:00
6 changed files with 32 additions and 30 deletions

3
go.mod
View File

@@ -3,7 +3,7 @@ module git.grassecon.net/grassrootseconomics/visedriver
go 1.23.0
require (
git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e
git.defalsify.org/vise.git v0.3.2-0.20250407143413-e55cf9bcb7d2
github.com/jackc/pgx/v5 v5.7.1
github.com/joho/godotenv v1.5.1
)
@@ -19,7 +19,6 @@ 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

4
go.sum
View File

@@ -1,5 +1,7 @@
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=
git.defalsify.org/vise.git v0.3.2-0.20250407143413-e55cf9bcb7d2 h1:kbiDZtvphEKsTAnebrB6QxRbB7zdoTHSmzzumXrJ4hw=
git.defalsify.org/vise.git v0.3.2-0.20250407143413-e55cf9bcb7d2/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,8 +35,6 @@ 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=

View File

@@ -7,7 +7,6 @@ import (
"git.defalsify.org/vise.git/logging"
"git.grassecon.net/grassrootseconomics/visedriver/errors"
"git.grassecon.net/grassrootseconomics/visedriver/request"
"github.com/uptrace/bunrouter"
)
var (
@@ -17,7 +16,6 @@ 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) {
@@ -32,25 +30,12 @@ func (f *HTTPRequestHandler) WriteError(w http.ResponseWriter, code int, err err
}
func NewHTTPRequestHandler(h request.RequestHandler) *HTTPRequestHandler {
handler := &HTTPRequestHandler{
return &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
@@ -62,18 +47,17 @@ func (hh *HTTPRequestHandler) handleViseRequest(w http.ResponseWriter, req bunro
rp := hh.GetRequestParser()
cfg := hh.GetConfig()
cfg.SessionId, err = rp.GetSessionId(req.Context(), req.Request)
cfg.SessionId, err = rp.GetSessionId(req.Context(), req)
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.Request)
rqs.Input, err = rp.GetInput(req)
if err != nil {
logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
hh.WriteError(w, 400, err)
return err
return
}
rqs, err = hh.Process(rqs)
@@ -90,7 +74,7 @@ func (hh *HTTPRequestHandler) handleViseRequest(w http.ResponseWriter, req bunro
if code != 200 {
hh.WriteError(w, 500, err)
return err
return
}
w.WriteHeader(200)
@@ -99,11 +83,10 @@ func (hh *HTTPRequestHandler) handleViseRequest(w http.ResponseWriter, req bunro
rqs, perr = hh.Reset(rqs.Ctx, rqs)
if err != nil {
hh.WriteError(w, 500, err)
return err
return
}
if perr != nil {
hh.WriteError(w, 500, perr)
return perr
return
}
return nil
}

View File

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

View File

@@ -90,6 +90,10 @@ func (tdb *ThreadGdbmDb) Prefix() uint8 {
return v
}
func (tdb *ThreadGdbmDb) Base() *db.DbBase {
return tdb.Base()
}
func (tdb *ThreadGdbmDb) SetLock(typ uint8, locked bool) error {
tdb.reserve()
err := tdb.db.SetLock(typ, locked)

View File

@@ -203,6 +203,20 @@ func (ms *MenuStorageService) GetUserdataDb(ctx context.Context) (db.Db, error)
return userStore, nil
}
func (ms *MenuStorageService) GetLogDb(ctx context.Context, mainDb db.Db, connStr string, section string) (db.Db, error) {
err := ms.ensureDbDir(connStr)
if err != nil {
return nil, err
}
connStr = path.Join(connStr, section)
tgdbm := gdbmstorage.NewThreadGdbmDb()
err = tgdbm.Connect(ctx, connStr)
if err != nil {
return nil, err
}
return tgdbm, nil
}
func (ms *MenuStorageService) GetResource(ctx context.Context) (resource.Resource, error) {
store, err := ms.getOrCreateDb(ctx, "resource.gdbm", STORETYPE_RESOURCE)
if err != nil {