From 861d04dbfde635e13b23a6bc724ab58f95072db1 Mon Sep 17 00:00:00 2001 From: lash Date: Tue, 4 Feb 2025 13:25:10 +0000 Subject: [PATCH 01/12] WIP Implement custom engine --- cmd/africastalking/main.go | 1 + cmd/async/main.go | 2 ++ cmd/http/main.go | 1 + cmd/main.go | 15 ++------------- go.mod | 4 ++-- go.sum | 12 ++++-------- handlers/local.go | 15 +++++++++++---- ssh/ssh.go | 16 ++-------------- testutil/engine.go | 6 +++--- 9 files changed, 28 insertions(+), 44 deletions(-) diff --git a/cmd/africastalking/main.go b/cmd/africastalking/main.go index 2975d03..a1a5b27 100644 --- a/cmd/africastalking/main.go +++ b/cmd/africastalking/main.go @@ -133,6 +133,7 @@ func main() { rp := &at.ATRequestParser{} bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl) + bsh = bsh.WithEngineFunc(lhs.GetEngine) sh := at.NewATRequestHandler(bsh) mux := http.NewServeMux() diff --git a/cmd/async/main.go b/cmd/async/main.go index a55a19b..e40caa4 100644 --- a/cmd/async/main.go +++ b/cmd/async/main.go @@ -145,6 +145,8 @@ func main() { sessionId: sessionId, } sh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl) + sh = sh.WithEngineFunc(lhs.GetEngine) + cfg.SessionId = sessionId rqs := request.RequestSession{ Ctx: ctx, diff --git a/cmd/http/main.go b/cmd/http/main.go index e691254..a2732eb 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -133,6 +133,7 @@ func main() { rp := &httprequest.DefaultRequestParser{} bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl) + bsh = bsh.WithEngineFunc(lhs.GetEngine) sh := httprequest.NewHTTPRequestHandler(bsh) s := &http.Server{ Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))), diff --git a/cmd/main.go b/cmd/main.go index 360f8af..408d2b3 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -16,7 +16,6 @@ import ( "git.grassecon.net/grassrootseconomics/sarafu-vise/args" "git.grassecon.net/grassrootseconomics/sarafu-vise/config" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers" - "git.grassecon.net/grassrootseconomics/sarafu-vise/services" "git.grassecon.net/grassrootseconomics/visedriver/storage" ) @@ -79,6 +78,7 @@ func main() { OutputSize: uint32(size), FlagCount: uint32(128), MenuSeparator: menuSeparator, + EngineDebug: engineDebug, } menuStorageService := storage.NewMenuStorageService(conns) @@ -123,18 +123,7 @@ func main() { os.Exit(1) } - accountService := services.New(ctx, menuStorageService) - hl, err := lhs.GetHandler(accountService) - if err != nil { - fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err) - os.Exit(1) - } - - en := lhs.GetEngine() - en = en.WithFirst(hl.Init) - if engineDebug { - en = en.WithDebug(nil) - } + en := lhs.GetEngine(cfg, rs, pe) cint := make(chan os.Signal) cterm := make(chan os.Signal) diff --git a/go.mod b/go.mod index 9be5609..54e6967 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise go 1.23.4 require ( - git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 + git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1 - git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250124100946-03d19283f6fa + git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 github.com/alecthomas/assert/v2 v2.2.2 github.com/gofrs/uuid v4.4.0+incompatible diff --git a/go.sum b/go.sum index b2e2876..3e16a53 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,11 @@ -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= git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ= git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60= git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1 h1:BJHfokTHzrw9QjQ+4s2HmSER0iBPuE7byW5oQC2zLIQ= git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8= -git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250124100946-03d19283f6fa h1:yQLKwby3eD/zNjNw/INU5lGiLuWPEHdsgASwMA4UptE= -git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250124100946-03d19283f6fa/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk= -git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84 h1:VoBmqsjlRdz+IPbtKsAkc1IrMepjR+QlesZT31Jokrk= -git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ= -git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121153115-bfb16bd5a57a h1:jyS1Q8ktEGnH8R5ne/1GN7SyuDPtEGTrGtC8Px3fVJc= -git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121153115-bfb16bd5a57a/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ= +git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244 h1:BXotWSKg04U97sf/xeWJuUTSVgKk2aEK+5BtBrnafXQ= +git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244/go.mod h1:6B6ByxXOiRY0NR7K02Bf3fEu7z+2c/6q8PFVNjC5G8w= git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E= git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ= github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= diff --git a/handlers/local.go b/handlers/local.go index 77e3980..5cbaa9d 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -24,6 +24,7 @@ type LocalHandlerService struct { UserdataStore *db.Db Cfg engine.Config Rs resource.Resource + first resource.EntryFunc } func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) { @@ -118,13 +119,19 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) ls.DbRs.AddLocalFunc("update_all_profile_items", appHandlers.UpdateAllProfileItems) ls.DbRs.AddLocalFunc("set_back", appHandlers.SetBack) ls.DbRs.AddLocalFunc("show_blocked_account", appHandlers.ShowBlockedAccount) + ls.first = appHandlers.Init return appHandlers, nil } -// TODO: enable setting of sessionId on engine init time -func (ls *LocalHandlerService) GetEngine() *engine.DefaultEngine { - en := engine.NewEngine(ls.Cfg, ls.Rs) - en = en.WithPersister(ls.Pe) +func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine { + en := engine.NewEngine(cfg, rs) + if ls.first != nil { + en = en.WithFirst(ls.first) + } + en = en.WithPersister(pr) + if cfg.EngineDebug { + en = en.WithDebug(nil) + } return en } diff --git a/ssh/ssh.go b/ssh/ssh.go index 81d7835..9e6b76f 100644 --- a/ssh/ssh.go +++ b/ssh/ssh.go @@ -17,7 +17,7 @@ import ( "git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/state" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers" - "git.grassecon.net/grassrootseconomics/sarafu-vise/services" +// "git.grassecon.net/grassrootseconomics/sarafu-vise/services" "git.grassecon.net/grassrootseconomics/visedriver/storage" ) @@ -177,20 +177,8 @@ func (s *SshRunner) GetEngine(sessionId string) (engine.Engine, func(), error) { return nil, nil, err } - // TODO: clear up why pointer here and by-value other cmds - accountService := services.New(ctx, menuStorageService) - - hl, err := lhs.GetHandler(accountService) - if err != nil { - return nil, nil, err - } - - en := lhs.GetEngine() - en = en.WithFirst(hl.Init) - if s.Debug { - en = en.WithDebug(nil) - } // TODO: this is getting very hacky! + en := lhs.GetEngine(lhs.Cfg, rs, pe) closer := func() { err := menuStorageService.Close(ctx) if err != nil { diff --git a/testutil/engine.go b/testutil/engine.go index a179b5d..167ad5a 100644 --- a/testutil/engine.go +++ b/testutil/engine.go @@ -137,14 +137,14 @@ func TestEngine(sessionId string) (engine.Engine, func(), chan bool) { panic("Unknown account service type") } - hl, err := lhs.GetHandler(testtag.AccountService) + // TODO: triggers withfirst assignment + _, err = lhs.GetHandler(testtag.AccountService) if err != nil { fmt.Fprintf(os.Stderr, err.Error()) os.Exit(1) } - en := lhs.GetEngine() - en = en.WithFirst(hl.Init) + en := lhs.GetEngine(lhs.Cfg, rs, pe) cleanFn := func() { err := en.Finish(ctx) if err != nil { -- 2.45.2 From 422b6510973f8e47db8f1c9f26b85b04592c354a Mon Sep 17 00:00:00 2001 From: lash Date: Tue, 4 Feb 2025 13:33:44 +0000 Subject: [PATCH 02/12] Add missing file --- engine/engine.go | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 engine/engine.go diff --git a/engine/engine.go b/engine/engine.go new file mode 100644 index 0000000..a3b8e29 --- /dev/null +++ b/engine/engine.go @@ -0,0 +1,25 @@ +package engine + +import ( + "context" + + "git.defalsify.org/vise.git/engine" + "git.defalsify.org/vise.git/resource" +) + +type SarafuEngine struct { + engine.Engine +} + +func NewSarafuEngine(cfg engine.Config, rs resource.Resource) *SarafuEngine { + return &SarafuEngine{ + Engine: engine.NewEngine(cfg, rs), + } +} + +func (se *SarafuEngine) Exec(ctx context.Context, input []byte) (bool, error) { + if len(input) == 0 { + panic("insert something here") + } + return se.Engine.Exec(ctx, input) +} -- 2.45.2 From 23cadc6178cee0ae7f2fa0212bfd5bc093ea97d5 Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 5 Feb 2025 10:21:21 +0000 Subject: [PATCH 03/12] Reinstate loading handlerfuncs in cmd, ssh clients --- cmd/main.go | 7 +++++++ ssh/ssh.go | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/cmd/main.go b/cmd/main.go index 408d2b3..48edda6 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -16,6 +16,7 @@ import ( "git.grassecon.net/grassrootseconomics/sarafu-vise/args" "git.grassecon.net/grassrootseconomics/sarafu-vise/config" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers" + "git.grassecon.net/grassrootseconomics/sarafu-vise/services" "git.grassecon.net/grassrootseconomics/visedriver/storage" ) @@ -123,6 +124,12 @@ func main() { os.Exit(1) } + accountService := services.New(ctx, menuStorageService) + _, err = lhs.GetHandler(accountService) + if err != nil { + fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err) + os.Exit(1) + } en := lhs.GetEngine(cfg, rs, pe) cint := make(chan os.Signal) diff --git a/ssh/ssh.go b/ssh/ssh.go index 9e6b76f..9a0440a 100644 --- a/ssh/ssh.go +++ b/ssh/ssh.go @@ -178,6 +178,12 @@ func (s *SshRunner) GetEngine(sessionId string) (engine.Engine, func(), error) { } // TODO: this is getting very hacky! + accountService := services.New(ctx, menuStorageService) + _, err = lhs.GetHandler(accountService) + if err != nil { + fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err) + os.Exit(1) + } en := lhs.GetEngine(lhs.Cfg, rs, pe) closer := func() { err := menuStorageService.Close(ctx) -- 2.45.2 From fdde1bb979d437291e9fde6a92d44caa97f10408 Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 5 Feb 2025 10:28:20 +0000 Subject: [PATCH 04/12] Add missing services import in ssh --- go.mod | 2 +- go.sum | 4 ++-- ssh/ssh.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 54e6967..12278ee 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise go 1.23.4 require ( - git.defalsify.org/vise.git v0.2.3-0.20250204132233-2bffe532f21e + git.defalsify.org/vise.git v0.2.3-0.20250205092758-ea6bfa050eeb git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244 diff --git a/go.sum b/go.sum index 3e16a53..18b9d5c 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -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.2.3-0.20250205092758-ea6bfa050eeb h1:WcNLKynPAXT/djmWJcdgiEsNO4HVSLYiaqclPpMCIK8= +git.defalsify.org/vise.git v0.2.3-0.20250205092758-ea6bfa050eeb/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck= git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ= git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60= git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1 h1:BJHfokTHzrw9QjQ+4s2HmSER0iBPuE7byW5oQC2zLIQ= diff --git a/ssh/ssh.go b/ssh/ssh.go index 9a0440a..bab538a 100644 --- a/ssh/ssh.go +++ b/ssh/ssh.go @@ -17,7 +17,7 @@ import ( "git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/state" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers" -// "git.grassecon.net/grassrootseconomics/sarafu-vise/services" + "git.grassecon.net/grassrootseconomics/sarafu-vise/services" "git.grassecon.net/grassrootseconomics/visedriver/storage" ) -- 2.45.2 From df58f690323da15c0f724df97bda11c67d6015a7 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 5 Feb 2025 19:02:23 +0300 Subject: [PATCH 05/12] Remove input length check on menuhandler Init --- handlers/application/menuhandler.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 53ada39..4518ba7 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -125,12 +125,7 @@ func (h *MenuHandlers) Init(ctx context.Context, sym string, input []byte) (reso h.st = h.pe.GetState() h.ca = h.pe.GetMemory() - - if len(input) == 0 { - // move to the top node - h.st.Code = []byte{} - } - +`` sessionId, ok := ctx.Value("SessionId").(string) if ok { ctx = context.WithValue(ctx, "SessionId", sessionId) -- 2.45.2 From 3d9eeddab88c14465b96fca7dc1614b478b1af9c Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 5 Feb 2025 19:07:35 +0300 Subject: [PATCH 06/12] Remove the Move to top node on empty input test case --- handlers/application/menuhandler.go | 1 - handlers/application/menuhandler_test.go | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/handlers/application/menuhandler.go b/handlers/application/menuhandler.go index 4518ba7..17acfe9 100644 --- a/handlers/application/menuhandler.go +++ b/handlers/application/menuhandler.go @@ -125,7 +125,6 @@ func (h *MenuHandlers) Init(ctx context.Context, sym string, input []byte) (reso h.st = h.pe.GetState() h.ca = h.pe.GetMemory() -`` sessionId, ok := ctx.Value("SessionId").(string) if ok { ctx = context.WithValue(ctx, "SessionId", sessionId) diff --git a/handlers/application/menuhandler_test.go b/handlers/application/menuhandler_test.go index 3bf66a4..2e426aa 100644 --- a/handlers/application/menuhandler_test.go +++ b/handlers/application/menuhandler_test.go @@ -175,20 +175,6 @@ func TestInit(t *testing.T) { input: []byte("1"), expectedResult: resource.Result{}, }, - { - name: "Move to top node on empty input", - setup: func() (*MenuHandlers, context.Context) { - pe := persist.NewPersister(testStore).WithSession(sessionId).WithContent(st, ca) - h := &MenuHandlers{ - flagManager: fm, - pe: pe, - } - st.Code = []byte("some pending bytecode") - return h, context.WithValue(ctx, "SessionId", sessionId) - }, - input: []byte(""), - expectedResult: resource.Result{}, - }, } for _, tt := range tests { -- 2.45.2 From 68597ea7cc0ee6020a74d7ef88f64f0cfcfee892 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 5 Feb 2025 19:08:36 +0300 Subject: [PATCH 07/12] Return the Sarafu Engine in GetEngine --- handlers/local.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/handlers/local.go b/handlers/local.go index 5cbaa9d..c001fab 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -10,6 +10,7 @@ import ( "git.defalsify.org/vise.git/resource" "git.grassecon.net/grassrootseconomics/sarafu-api/remote" + sarafu_engine "git.grassecon.net/grassrootseconomics/sarafu-vise/engine" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application" ) @@ -24,7 +25,7 @@ type LocalHandlerService struct { UserdataStore *db.Db Cfg engine.Config Rs resource.Resource - first resource.EntryFunc + first resource.EntryFunc } func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) { @@ -125,7 +126,8 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) } func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine { - en := engine.NewEngine(cfg, rs) + se := sarafu_engine.NewSarafuEngine(cfg, rs) + en := se.Engine.(*engine.DefaultEngine) if ls.first != nil { en = en.WithFirst(ls.first) } @@ -133,5 +135,6 @@ func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource if cfg.EngineDebug { en = en.WithDebug(nil) } - return en + + return se } -- 2.45.2 From f88e2534864957514e76aee361047efa5d0e900b Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Wed, 5 Feb 2025 19:16:25 +0300 Subject: [PATCH 08/12] Call the engine Reset --- engine/engine.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/engine.go b/engine/engine.go index a3b8e29..d8aef60 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -2,6 +2,7 @@ package engine import ( "context" + "fmt" "git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/resource" @@ -19,7 +20,12 @@ func NewSarafuEngine(cfg engine.Config, rs resource.Resource) *SarafuEngine { func (se *SarafuEngine) Exec(ctx context.Context, input []byte) (bool, error) { if len(input) == 0 { - panic("insert something here") + e, ok := se.Engine.(*engine.DefaultEngine) + if !ok { + return false, fmt.Errorf("") + } + + e.Reset(ctx, true) } return se.Engine.Exec(ctx, input) } -- 2.45.2 From 12acd508b1eace15b7fc9f898ae2c22adada9341 Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 5 Feb 2025 16:26:17 +0000 Subject: [PATCH 09/12] Allow empty input in async cmd --- cmd/async/main.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cmd/async/main.go b/cmd/async/main.go index a55a19b..56b69da 100644 --- a/cmd/async/main.go +++ b/cmd/async/main.go @@ -1,12 +1,15 @@ package main import ( + "bufio" "context" "flag" "fmt" + "io" "os" "os/signal" "path" + "strings" "syscall" "git.defalsify.org/vise.git/engine" @@ -184,11 +187,19 @@ func main() { os.Exit(1) } fmt.Println("") - _, err = fmt.Scanln(&rqs.Input) + in := bufio.NewReader(os.Stdin) + //_, err = fmt.Scanln(&rqs.Input) + s, err := in.ReadString('\n') if err != nil { + if err == io.EOF { + break + } logg.ErrorCtxf(ctx, "error in input", "err", err) fmt.Errorf("error in input: %v", err) os.Exit(1) } + rqs.Input = []byte{} + s = strings.TrimSpace(s) + rqs.Input = []byte(s) } } -- 2.45.2 From 1d7027905df7d7c453cb51c35e72dbf970812aee Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 5 Feb 2025 17:44:29 +0000 Subject: [PATCH 10/12] Use simplified reset on empty input solution --- cmd/africastalking/main.go | 1 + cmd/async/main.go | 4 ++-- cmd/http/main.go | 1 + cmd/main.go | 1 + engine/engine.go | 22 +++++++++++++--------- go.mod | 2 +- go.sum | 4 ++-- handlers/local.go | 17 ++++++++++++----- 8 files changed, 33 insertions(+), 19 deletions(-) diff --git a/cmd/africastalking/main.go b/cmd/africastalking/main.go index a1a5b27..3f7e372 100644 --- a/cmd/africastalking/main.go +++ b/cmd/africastalking/main.go @@ -81,6 +81,7 @@ func main() { OutputSize: uint32(size), FlagCount: uint32(128), MenuSeparator: menuSeparator, + ResetOnEmptyInput: true, } if engineDebug { diff --git a/cmd/async/main.go b/cmd/async/main.go index 91a2542..9a064a6 100644 --- a/cmd/async/main.go +++ b/cmd/async/main.go @@ -96,6 +96,7 @@ func main() { OutputSize: uint32(size), FlagCount: uint32(128), MenuSeparator: menuSeparator, + ResetOnEmptyInput: true, } if engineDebug { @@ -130,7 +131,6 @@ func main() { lhs.SetDataStore(&userdataStore) accountService := services.New(ctx, menuStorageService) - hl, err := lhs.GetHandler(accountService) if err != nil { fmt.Fprintf(os.Stderr, err.Error()) @@ -190,10 +190,10 @@ func main() { } fmt.Println("") in := bufio.NewReader(os.Stdin) - //_, err = fmt.Scanln(&rqs.Input) s, err := in.ReadString('\n') if err != nil { if err == io.EOF { + logg.DebugCtxf(ctx, "have EOF, bailing") break } logg.ErrorCtxf(ctx, "error in input", "err", err) diff --git a/cmd/http/main.go b/cmd/http/main.go index a2732eb..13ef408 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -82,6 +82,7 @@ func main() { OutputSize: uint32(size), FlagCount: uint32(128), MenuSeparator: menuSeparator, + ResetOnEmptyInput: true, } if engineDebug { diff --git a/cmd/main.go b/cmd/main.go index 48edda6..564649a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -80,6 +80,7 @@ func main() { FlagCount: uint32(128), MenuSeparator: menuSeparator, EngineDebug: engineDebug, + ResetOnEmptyInput: true, } menuStorageService := storage.NewMenuStorageService(conns) diff --git a/engine/engine.go b/engine/engine.go index d8aef60..08b9aa1 100644 --- a/engine/engine.go +++ b/engine/engine.go @@ -2,10 +2,14 @@ package engine import ( "context" - "fmt" "git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/resource" + "git.defalsify.org/vise.git/logging" +) + +var ( + logg = logging.NewVanilla().WithDomain("sarafu-vise.engine") ) type SarafuEngine struct { @@ -19,13 +23,13 @@ func NewSarafuEngine(cfg engine.Config, rs resource.Resource) *SarafuEngine { } func (se *SarafuEngine) Exec(ctx context.Context, input []byte) (bool, error) { - if len(input) == 0 { - e, ok := se.Engine.(*engine.DefaultEngine) - if !ok { - return false, fmt.Errorf("") - } - - e.Reset(ctx, true) - } + logg.TraceCtxf(ctx, "sarafu engine exec", "input", input) +// if len(input) == 0 { +// e := se.Engine.(*engine.DefaultEngine) +// v, err := e.Reset(ctx, true) +// if err != nil { +// return v, err +// } +// } return se.Engine.Exec(ctx, input) } diff --git a/go.mod b/go.mod index 12278ee..04cfbd6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise go 1.23.4 require ( - git.defalsify.org/vise.git v0.2.3-0.20250205092758-ea6bfa050eeb + git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.1.0.20250204132347-1eb0b1555244 diff --git a/go.sum b/go.sum index 18b9d5c..dae909d 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.defalsify.org/vise.git v0.2.3-0.20250205092758-ea6bfa050eeb h1:WcNLKynPAXT/djmWJcdgiEsNO4HVSLYiaqclPpMCIK8= -git.defalsify.org/vise.git v0.2.3-0.20250205092758-ea6bfa050eeb/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck= +git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac h1:f/E0ZTclVfMEnD/3Alrzzbg+dOm138zGydV42jT0JPw= +git.defalsify.org/vise.git v0.2.3-0.20250205173834-d1f6647211ac/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck= git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ= git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60= git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250123142805-2181388f5bf1 h1:BJHfokTHzrw9QjQ+4s2HmSER0iBPuE7byW5oQC2zLIQ= diff --git a/handlers/local.go b/handlers/local.go index c001fab..7ae996c 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -8,12 +8,17 @@ import ( "git.defalsify.org/vise.git/engine" "git.defalsify.org/vise.git/persist" "git.defalsify.org/vise.git/resource" + "git.defalsify.org/vise.git/logging" "git.grassecon.net/grassrootseconomics/sarafu-api/remote" - sarafu_engine "git.grassecon.net/grassrootseconomics/sarafu-vise/engine" +// sarafu_engine "git.grassecon.net/grassrootseconomics/sarafu-vise/engine" "git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application" ) +var ( + logg = logging.NewVanilla().WithDomain("sarafu-vise.engine") +) + type HandlerService interface { GetHandler() (*application.MenuHandlers, error) } @@ -126,8 +131,10 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) } func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine { - se := sarafu_engine.NewSarafuEngine(cfg, rs) - en := se.Engine.(*engine.DefaultEngine) + //logg.Tracef("creating new engine") + //se := sarafu_engine.NewSarafuEngine(cfg, rs) + //en := se.Engine.(*engine.DefaultEngine) + en := engine.NewEngine(cfg, rs) if ls.first != nil { en = en.WithFirst(ls.first) } @@ -135,6 +142,6 @@ func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource if cfg.EngineDebug { en = en.WithDebug(nil) } - - return se + //return se + return en } -- 2.45.2 From af4b075df3f87fb047d71595cc3c648a91bcb683 Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 5 Feb 2025 17:45:31 +0000 Subject: [PATCH 11/12] Add reset on empty to ssh --- cmd/ssh/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/ssh/main.go b/cmd/ssh/main.go index d3afbb0..96dd150 100644 --- a/cmd/ssh/main.go +++ b/cmd/ssh/main.go @@ -84,6 +84,7 @@ func main() { Root: "root", OutputSize: uint32(size), FlagCount: uint32(128), + ResetOnEmptyInput: true, } if stateDebug { cfg.StateDebug = true -- 2.45.2 From c13768d7825e786143ec2199391ae2717d79efee Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 5 Feb 2025 17:56:08 +0000 Subject: [PATCH 12/12] Remove custom engine --- engine/engine.go | 35 ----------------------------------- handlers/local.go | 4 ---- 2 files changed, 39 deletions(-) delete mode 100644 engine/engine.go diff --git a/engine/engine.go b/engine/engine.go deleted file mode 100644 index 08b9aa1..0000000 --- a/engine/engine.go +++ /dev/null @@ -1,35 +0,0 @@ -package engine - -import ( - "context" - - "git.defalsify.org/vise.git/engine" - "git.defalsify.org/vise.git/resource" - "git.defalsify.org/vise.git/logging" -) - -var ( - logg = logging.NewVanilla().WithDomain("sarafu-vise.engine") -) - -type SarafuEngine struct { - engine.Engine -} - -func NewSarafuEngine(cfg engine.Config, rs resource.Resource) *SarafuEngine { - return &SarafuEngine{ - Engine: engine.NewEngine(cfg, rs), - } -} - -func (se *SarafuEngine) Exec(ctx context.Context, input []byte) (bool, error) { - logg.TraceCtxf(ctx, "sarafu engine exec", "input", input) -// if len(input) == 0 { -// e := se.Engine.(*engine.DefaultEngine) -// v, err := e.Reset(ctx, true) -// if err != nil { -// return v, err -// } -// } - return se.Engine.Exec(ctx, input) -} diff --git a/handlers/local.go b/handlers/local.go index 7ae996c..96d2d8c 100644 --- a/handlers/local.go +++ b/handlers/local.go @@ -131,9 +131,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) } func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine { - //logg.Tracef("creating new engine") - //se := sarafu_engine.NewSarafuEngine(cfg, rs) - //en := se.Engine.(*engine.DefaultEngine) en := engine.NewEngine(cfg, rs) if ls.first != nil { en = en.WithFirst(ls.first) @@ -142,6 +139,5 @@ func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource if cfg.EngineDebug { en = en.WithDebug(nil) } - //return se return en } -- 2.45.2