Merge branch 'master' into alias-fqdn

args/lang.go

@@ -10,7 +10,7 @@ type LangVar struct {
 	v []lang.Language
 }
 
-func(lv *LangVar) Set(s string) error {
+func (lv *LangVar) Set(s string) error {
 	v, err := lang.LanguageFromCode(s)
 	if err != nil {
 		return err
@@ -19,16 +19,14 @@ func(lv *LangVar) Set(s string) error {
 	return err
 }
 
-func(lv *LangVar) String() string {
+func (lv *LangVar) String() string {
 	var s []string
-	for _, v := range(lv.v) {
+	for _, v := range lv.v {
 		s = append(s, v.Code)
 	}
 	return strings.Join(s, ",")
 }
 
-func(lv *LangVar) Langs() []lang.Language {
+func (lv *LangVar) Langs() []lang.Language {
 	return lv.v
 }
-
-

cmd/africastalking/main.go

@@ -12,18 +12,18 @@ import (
 	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/lang"
+	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 
-	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 )
 
 var (
@@ -36,8 +36,7 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
-	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var host string
@@ -45,11 +44,14 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
+	var resourceDir string
 
-
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&connStr, "c", "", "connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource data directory")
+	flag.StringVar(&resourceDir, "resource-dir", "", "resource data directory. If set, overrides --resource to create a non-binary fsdb for the given path.")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
 	flag.UintVar(&port, "p", config.Port(), "http port")
@@ -57,16 +59,18 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
+	if resourceDir != "" {
-		connStr = config.DbConn()
+		*override.ResourceConn = resourceDir
+		override.ResourceConnMode = storage.DBMODE_TEXT
 	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "build", build, "conn", connData, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "build", build, "conn", conns, "outputsize", size)
 
 	ctx := context.Background()
 	ln, err := lang.LanguageFromCode(config.Language())
@@ -89,7 +93,7 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "menustorageservice: %v\n", err)
@@ -101,7 +105,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, "userdatadb: %v\n", err)
 		os.Exit(1)
 	}
-	defer userdataStore.Close()
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -120,7 +123,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService, connData)
+	accountService := services.New(ctx, menuStorageService)
 
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
@@ -133,7 +136,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, "getstatestore: %v\n", err)
 		os.Exit(1)
 	}
-	defer stateStore.Close()
 
 	rp := &at.ATRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
@@ -146,7 +148,10 @@ func main() {
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: mux,
 	}
-	s.RegisterOnShutdown(sh.Shutdown)
+	shutdownFunc := func() {
+		sh.Shutdown(ctx)
+	}
+	s.RegisterOnShutdown(shutdownFunc)
 
 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)

cmd/async/main.go

@@ -14,12 +14,12 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"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/request"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (
@@ -44,9 +44,8 @@ func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
 	var sessionId string
-	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var host string
@@ -54,10 +53,15 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
+	var resourceDir string
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource data directory")
+	flag.StringVar(&resourceDir, "resource-dir", "", "resource data directory. If set, overrides --resource to create a non-binary fsdb for the given path.")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
+
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
@@ -66,16 +70,18 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
+	if resourceDir != "" {
-		connStr = config.DbConn()
+		*override.ResourceConn = resourceDir
+		override.ResourceConnMode = storage.DBMODE_TEXT
 	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
+	logg.Infof("start command", "conn", conns, "outputsize", size, "sessionId", sessionId)
 
 	ctx := context.Background()
 
@@ -99,7 +105,7 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
@@ -116,7 +122,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer userdataStore.Close()
+	//defer userdataStore.Close(ctx)
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -126,7 +132,7 @@ func main() {
 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
-	accountService := services.New(ctx, menuStorageService, connData)
+	accountService := services.New(ctx, menuStorageService)
 
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
@@ -139,7 +145,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer stateStore.Close()
+	//defer stateStore.Close(ctx)
 
 	rp := &asyncRequestParser{
 		sessionId: sessionId,
@@ -161,7 +167,7 @@ func main() {
 		case _ = <-cint:
 		case _ = <-cterm:
 		}
-		sh.Shutdown()
+		sh.Shutdown(ctx)
 	}()
 
 	for true {
@@ -177,7 +183,7 @@ func main() {
 			fmt.Errorf("error in output: %v", err)
 			os.Exit(1)
 		}
-		rqs, err = sh.Reset(rqs)
+		rqs, err = sh.Reset(ctx, rqs)
 		if err != nil {
 			logg.ErrorCtxf(ctx, "error in reset: %v", "err", err)
 			fmt.Errorf("error in reset: %v", err)

cmd/http/main.go

@@ -17,13 +17,13 @@ import (
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	httprequest "git.grassecon.net/grassrootseconomics/visedriver/request/http"
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	httprequest "git.grassecon.net/grassrootseconomics/visedriver/request/http"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 )
 
 var (
@@ -35,8 +35,7 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
-	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var host string
@@ -44,9 +43,14 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
+	var resourceDir string
+
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource data directory")
+	flag.StringVar(&resourceDir, "resource-dir", "", "resource data directory. If set, overrides --resource to create a non-binary fsdb for the given path.")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
-	flag.StringVar(&connStr, "c", "", "connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
@@ -55,16 +59,18 @@ func main() {
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
+	if resourceDir != "" {
-		connStr = config.DbConn()
+		*override.ResourceConn = resourceDir
+		override.ResourceConnMode = storage.DBMODE_TEXT
 	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData, "resourcedir", resourceDir, "outputsize", size)
+	logg.Infof("start command", "conn", conns, "outputsize", size)
 
 	ctx := context.Background()
 
@@ -88,7 +94,7 @@ func main() {
 		cfg.EngineDebug = true
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 
 	rs, err := menuStorageService.GetResource(ctx)
 	if err != nil {
@@ -101,7 +107,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer userdataStore.Close()
 
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@@ -116,7 +121,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService, connData)
+	accountService := services.New(ctx, menuStorageService)
 
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
@@ -129,7 +134,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-	defer stateStore.Close()
 
 	//accountService := services.New(ctx, menuStorageService, connData)
 
@@ -140,7 +144,10 @@ func main() {
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
 		Handler: sh,
 	}
-	s.RegisterOnShutdown(sh.Shutdown)
+	shutdownFunc := func() {
+		sh.Shutdown(ctx)
+	}
+	s.RegisterOnShutdown(shutdownFunc)
 
 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)

cmd/main.go

@@ -5,17 +5,19 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"os/signal"
 	"path"
+	"syscall"
 
 	"git.defalsify.org/vise.git/engine"
+	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/lang"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"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"
 )
 
 var (
@@ -27,34 +29,33 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
 	var size uint
 	var sessionId string
 	var engineDebug bool
-	var resourceDir string
 	var err error
 	var gettextDir string
 	var langs args.LangVar
 
-	flag.StringVar(&resourceDir, "resourcedir", scriptDir, "resource dir")
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource data directory")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
 	flag.Parse()
 
-	if connStr == "" {
+	config.Apply(override)
-		connStr = config.DbConn()
+	conns, err := config.GetConns()
-	}
-	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v\n", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData, "outputsize", size)
+	logg.Infof("start command", "conn", conns, "outputsize", size)
 
 	if len(langs.Langs()) == 0 {
 		langs.Set(config.Language())
@@ -80,7 +81,7 @@ func main() {
 		MenuSeparator: menuSeparator,
 	}
 
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
+	menuStorageService := storage.NewMenuStorageService(conns)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
 		os.Exit(1)
@@ -122,7 +123,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	accountService := services.New(ctx, menuStorageService, connData)
+	accountService := services.New(ctx, menuStorageService)
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err)
@@ -135,6 +136,21 @@ func main() {
 		en = en.WithDebug(nil)
 	}
 
+	cint := make(chan os.Signal)
+	cterm := make(chan os.Signal)
+	signal.Notify(cint, os.Interrupt, syscall.SIGINT)
+	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
+	go func() {
+		var s os.Signal
+		select {
+		case s = <-cterm:
+		case s = <-cint:
+		}
+		logg.InfoCtxf(ctx, "stopping on signal", "sig", s)
+		en.Finish(ctx)
+		os.Exit(0)
+	}()
+
 	err = engine.Loop(ctx, en, os.Stdin, os.Stdout, nil)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "loop exited with error: %v\n", err)

cmd/ssh/main.go

@@ -31,34 +31,30 @@ var (
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
 	var authConnStr string
-	var resourceDir string
 	var size uint
 	var engineDebug bool
 	var stateDebug bool
 	var host string
 	var port uint
-	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&authConnStr, "authdb", "", "auth connection string")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
-	flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.HostSSH(), "socket host")
 	flag.UintVar(&port, "p", config.PortSSH(), "socket port")
 	flag.Parse()
 
-	if connStr == "" {
+	config.Apply(override)
-		connStr = config.DbConn()
+	conns, err := config.GetConns()
-	}
-	if authConnStr == "" {
-		authConnStr = connStr
-	}
-	connData, err := storage.ToConnData(connStr)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
+
 	authConnData, err := storage.ToConnData(authConnStr)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "auth connstr err: %v", err)
@@ -79,7 +75,7 @@ func main() {
 	logg.WarnCtxf(ctx, "!!!!! Do not expose to internet and only use with tunnel!")
 	logg.WarnCtxf(ctx, "!!!!! (See ssh -L <...>)")
 
-	logg.Infof("start command", "conn", connData, "authconn", authConnData, "resourcedir", resourceDir, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
+	logg.Infof("start command", "conn", conns, "authconn", authConnData, "outputsize", size, "keyfile", sshKeyFile, "host", host, "port", port)
 
 	pfp := path.Join(scriptDir, "pp.csv")
 
@@ -102,7 +98,7 @@ func main() {
 	}
 	defer func() {
 		logg.TraceCtxf(ctx, "shutdown auth key store reached")
-		err = authKeyStore.Close()
+		err = authKeyStore.Close(ctx)
 		if err != nil {
 			logg.ErrorCtxf(ctx, "keystore close error", "err", err)
 		}
@@ -114,14 +110,13 @@ func main() {
 	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
 
 	runner := &ssh.SshRunner{
-		Cfg: cfg,
+		Cfg:        cfg,
-		Debug: engineDebug,
+		Debug:      engineDebug,
-		FlagFile: pfp,
+		FlagFile:   pfp,
-		Conn: connData,
+		Conn:       conns,
-		ResourceDir: resourceDir,
+		SrvKeyFile: sshKeyFile,
-		SrvKeyFile:  sshKeyFile,
+		Host:       host,
-		Host:        host,
+		Port:       port,
-		Port:        port,
 	}
 	go func() {
 		select {

cmd/ssh/sshkey/main.go

@@ -34,7 +34,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	defer store.Close()
+	defer store.Close(ctx)
 
 	err = store.AddFromFile(ctx, sshKeyFile, sessionId)
 	if err != nil {

config/args.go

@@ -0,0 +1,28 @@
+package config
+
+import (
+	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+)
+
+func NewOverride() *viseconfig.Override {
+	var a string
+	var b string
+	var c string
+	var d string
+	o := &viseconfig.Override{
+		DbConn:           &a,
+		StateConn:        &b,
+		StateConnMode:    storage.DBMODE_TEXT,
+		ResourceConn:     &c,
+		ResourceConnMode: storage.DBMODE_TEXT,
+		UserConn:         &d,
+		UserConnMode:     storage.DBMODE_BINARY,
+	}
+	return o
+}
+
+func Apply(o *viseconfig.Override) error {
+	viseconfig.ApplyConn(o)
+	return nil
+}

config/config.go

@@ -8,19 +8,29 @@ import (
 	"git.grassecon.net/grassrootseconomics/visedriver/env"
 )
 
-func init() {
+var (
-	env.LoadEnvVariables()
+	GetConns = viseconfig.GetConns
+	EnvPath  string
+)
+
+func loadEnv() {
+	if EnvPath == "" {
+		env.LoadEnvVariables()
+	} else {
+		env.LoadEnvVariablesPath(EnvPath)
+	}
 }
 
 const (
 	defaultSSHHost  string = "127.0.0.1"
 	defaultSSHPort  uint   = 7122
 	defaultHTTPHost string = "127.0.0.1"
-	defaultHTTPPort uint   = 7123
+	defaultHTTPPort uint     = 7123
 	defaultDomain          = "sarafu.local"
 )
 
 func LoadConfig() error {
+	loadEnv()
 	err := viseconfig.LoadConfig()
 	if err != nil {
 		return err
@@ -42,9 +52,6 @@ func SearchDomains() []string {
 	return ParsedDomains
 }
 
-func DbConn() string {
-	return viseconfig.DbConn
-}
 
 func Language() string {
 	return viseconfig.DefaultLanguage

debug/db.go

@@ -1,11 +1,11 @@
 package debug
 
 import (
-	"fmt"
 	"encoding/binary"
+	"fmt"
 
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	visedb "git.defalsify.org/vise.git/db"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 )
 
 var (
@@ -13,10 +13,10 @@ var (
 )
 
 type KeyInfo struct {
-	SessionId string
+	SessionId   string
-	Typ uint8
+	Typ         uint8
-	SubTyp storedb.DataTyp
+	SubTyp      storedb.DataTyp
-	Label string
+	Label       string
 	Description string
 }
 
@@ -32,18 +32,10 @@ func (k KeyInfo) String() string {
 
 func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 	o := KeyInfo{}
-	b := []byte(sessionId)
-
-	if len(k) <= len(b) {
-		return o, fmt.Errorf("storage key missing")
-	}
 
 	o.SessionId = sessionId
-
 	o.Typ = uint8(k[0])
 	k = k[1:]
-	o.SessionId = string(k[:len(b)])
-	k = k[len(b):]
 
 	if o.Typ == visedb.DATATYPE_USERDATA {
 		if len(k) == 0 {
@@ -53,30 +45,19 @@ func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 		o.SubTyp = storedb.DataTyp(v)
 		o.Label = subTypToString(o.SubTyp)
 		k = k[2:]
+		if len(k) != 0 {
+			return o, fmt.Errorf("excess key information: %x", k)
+		}
 	} else {
 		o.Label = typToString(o.Typ)
-	}
+		k = k[2:]
-
-	if len(k) != 0 {
-		return o, fmt.Errorf("excess key information")
 	}
 
 	return o, nil
 }
 
-func FromKey(k []byte) (KeyInfo, error) {
-	o := KeyInfo{}
-
-	if len(k) < 4 {
-		return o, fmt.Errorf("insufficient key length")
-	}
-
-	sessionIdBytes := k[1:len(k)-2]
-	return ToKeyInfo(k, string(sessionIdBytes))
-}
-
 func subTypToString(v storedb.DataTyp) string {
-	return dbTypStr[v + visedb.DATATYPE_USERDATA + 1]
+	return dbTypStr[v+visedb.DATATYPE_USERDATA+1]
 }
 
 func typToString(v uint8) string {

debug/db_debug.go

@@ -1,3 +1,4 @@
+//go:build debugdb
 // +build debugdb
 
 package debug
@@ -11,34 +12,37 @@ import (
 func init() {
 	DebugCap |= 1
 	dbTypStr[db.DATATYPE_STATE] = "internal state"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TRACKING_ID] = "tracking id"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TRACKING_ID] = "tracking id"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_PUBLIC_KEY] = "public key"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_PUBLIC_KEY] = "public key"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACCOUNT_PIN] = "account pin"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACCOUNT_PIN] = "account pin"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_FIRST_NAME] = "first name"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_FIRST_NAME] = "first name"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_FAMILY_NAME] = "family name"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_FAMILY_NAME] = "family name"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_YOB] = "year of birth"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_YOB] = "year of birth"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_LOCATION] = "location"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_LOCATION] = "location"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_GENDER] = "gender"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_GENDER] = "gender"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_OFFERINGS] = "offerings"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_OFFERINGS] = "offerings"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_RECIPIENT] = "recipient"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_RECIPIENT] = "recipient"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_AMOUNT] = "amount"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_AMOUNT] = "amount"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TEMPORARY_VALUE] = "temporary value"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TEMPORARY_VALUE] = "temporary value"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_SYM] = "active sym"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_SYM] = "active sym"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_BAL] = "active bal"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_BAL] = "active bal"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_BLOCKED_NUMBER] = "blocked number"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_BLOCKED_NUMBER] = "blocked number"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_DECIMAL] = "active decimal"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_DECIMAL] = "active decimal"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_ADDRESS] = "active address"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_ADDRESS] = "active address"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_INCORRECT_PIN_ATTEMPTS] = "incorrect pin attempts"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_BALANCES] = "voucher balances"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_SELECTED_LANGUAGE_CODE] = "selected language"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_DECIMALS] = "voucher decimals"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_INITIAL_LANGUAGE_CODE] = "initial language"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_SENDERS] = "tx senders"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_BALANCES] = "voucher balances"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_RECIPIENTS] = "tx recipients"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_DECIMALS] = "voucher decimals"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_VALUES] = "tx values"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_ADDRESSES] = "tx addresses"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_SENDERS] = "tx senders"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_HASHES] = "tx hashes"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_RECIPIENTS] = "tx recipients"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_DATES] = "tx dates"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_VALUES] = "tx values"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_SYMBOLS] = "tx symbols"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_ADDRESSES] = "tx addresses"
-	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_DECIMALS] = "tx decimals"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_HASHES] = "tx hashes"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_DATES] = "tx dates"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_SYMBOLS] = "tx symbols"
+	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_DECIMALS] = "tx decimals"
 }

debug/db_test.go

@@ -3,14 +3,13 @@ package debug
 import (
 	"testing"
 
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	visedb "git.defalsify.org/vise.git/db"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 )
 
 func TestDebugDbSubKeyInfo(t *testing.T) {
 	s := "foo"
 	b := []byte{0x20}
-	b = append(b, []byte(s)...)
 	b = append(b, []byte{0x00, 0x02}...)
 	r, err := ToKeyInfo(b, s)
 	if err != nil {
@@ -25,7 +24,7 @@ func TestDebugDbSubKeyInfo(t *testing.T) {
 	if r.SubTyp != 2 {
 		t.Fatalf("expected 2, got %d", r.SubTyp)
 	}
-	if DebugCap & 1 > 0 {
+	if DebugCap&1 > 0 {
 		if r.Label != "tracking id" {
 			t.Fatalf("expected 'tracking id', got '%s'", r.Label)
 		}
@@ -46,7 +45,7 @@ func TestDebugDbKeyInfo(t *testing.T) {
 	if r.Typ != 16 {
 		t.Fatalf("expected 16, got %d", r.Typ)
 	}
-	if DebugCap & 1 > 0 {
+	if DebugCap&1 > 0 {
 		if r.Label != "internal state" {
 			t.Fatalf("expected 'internal_state', got '%s'", r.Label)
 		}
@@ -56,7 +55,6 @@ func TestDebugDbKeyInfo(t *testing.T) {
 func TestDebugDbKeyInfoRestore(t *testing.T) {
 	s := "bar"
 	b := []byte{visedb.DATATYPE_USERDATA}
-	b = append(b, []byte(s)...)
 	k := storedb.ToBytes(storedb.DATA_ACTIVE_SYM)
 	b = append(b, k...)
 
@@ -70,7 +68,7 @@ func TestDebugDbKeyInfoRestore(t *testing.T) {
 	if r.Typ != 32 {
 		t.Fatalf("expected 32, got %d", r.Typ)
 	}
-	if DebugCap & 1 > 0 {
+	if DebugCap&1 > 0 {
 		if r.Label != "active sym" {
 			t.Fatalf("expected 'active sym', got '%s'", r.Label)
 		}

devtools/admin/main.go

@@ -10,35 +10,43 @@ import (
 	"git.defalsify.org/vise.git/logging"
 
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (
-	logg = logging.NewVanilla().WithContextKey("SessionId")
+	logg      = logging.NewVanilla().WithContextKey("SessionId")
-	scriptDir     = path.Join("services", "registration")
+	scriptDir = path.Join("services", "registration")
 )
 
 func main() {
 	config.LoadConfig()
 
+	override := config.NewOverride()
 	var sessionId string
-	var connStr string
+	var resourceDir string
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", "", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource data directory")
+	flag.StringVar(&resourceDir, "resource-dir", "", "resource data directory. If set, overrides --resource to create a non-binary fsdb for the given path.")
+
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.Parse()
 
-
+	if resourceDir != "" {
-	if connStr == "" {
+		*override.ResourceConn = resourceDir
-		connStr = config.DbConn()
+		override.ResourceConnMode = storage.DBMODE_TEXT
 	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v\n", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
+
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 
@@ -49,16 +57,16 @@ func main() {
 		os.Exit(1)
 	}
 
-	x := cmd.NewCmd(connData, sessionId, flagParser)
+	x := cmd.NewCmd(sessionId, flagParser)
 	err = x.Parse(flag.Args())
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "cmd parse fail: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData, "subcmd", x)
+	logg.Infof("start command", "conn", conns, "subcmd", x)
 
-	menuStorageService := storage.NewMenuStorageService(connData, "")
+	menuStorageService := storage.NewMenuStorageService(conns)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
 		os.Exit(1)

devtools/lang/main.go

@@ -8,13 +8,12 @@ import (
 	"path"
 	"strings"
 
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/lang"
+	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/config"
 )
 
 const (
-	
 	changeHeadSrc = `LOAD reset_account_authorized 0
 LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
@@ -29,8 +28,8 @@ MOVE language_changed
 )
 
 var (
-	logg = logging.NewVanilla()
+	logg   = logging.NewVanilla()
-	mouts string
+	mouts  string
 	incmps string
 )
 
@@ -63,7 +62,7 @@ func main() {
 	}
 	logg.Tracef("using languages", "lang", config.Languages)
 
-	for i, v := range(config.Languages) {
+	for i, v := range config.Languages {
 		ln, err := lang.LanguageFromCode(v)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error parsing language: %s\n", v)
@@ -76,7 +75,7 @@ func main() {
 		incmps += fmt.Sprintf("INCMP %s %v\n", v, n)
 
 		p := path.Join(srcDir, v)
-		w, err := os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
+		w, err := os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "failed open language set template output: %v\n", err)
 			os.Exit(1)
@@ -93,7 +92,7 @@ func main() {
 	src += "INCMP . *\n"
 
 	p := path.Join(srcDir, "select_language.vis")
-	w, err := os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
+	w, err := os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed open select language vis output: %v\n", err)
 		os.Exit(1)
@@ -107,7 +106,7 @@ func main() {
 
 	src = changeHeadSrc + src
 	p = path.Join(srcDir, "change_language.vis")
-	w, err = os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
+	w, err = os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed open select language vis output: %v\n", err)
 		os.Exit(1)

devtools/store/dump/main.go

@@ -7,11 +7,11 @@ import (
 	"os"
 	"path"
 
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (
@@ -19,55 +19,64 @@ var (
 	scriptDir = path.Join("services", "registration")
 )
 
-func formatItem(k []byte, v []byte) (string, error) {
+func formatItem(k []byte, v []byte, sessionId string) (string, error) {
-	o, err := debug.FromKey(k)
+	o, err := debug.ToKeyInfo(k, sessionId)
 	if err != nil {
 		return "", err
 	}
-	s := fmt.Sprintf("%vValue: %v\n\n", o, string(v))
+	s := fmt.Sprintf("%v\t%v\n", o.Label, string(v))
+
 	return s, nil
 }
 
 func main() {
 	config.LoadConfig()
 
-	var connStr string
+	override := config.NewOverride()
 	var sessionId string
 	var database string
 	var engineDebug bool
 	var err error
+	var first bool
+	var resourceDir string
 
 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", ".state", "connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource data directory")
+	flag.StringVar(&resourceDir, "resource-dir", "", "resource data directory. If set, overrides --resource to create a non-binary fsdb for the given path.")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.Parse()
 
-	if connStr != "" {
+	if resourceDir != "" {
-		connStr = config.DbConn()
+		*override.ResourceConn = resourceDir
+		override.ResourceConnMode = storage.DBMODE_TEXT
 	}
-	connData, err := storage.ToConnData(connStr)
+	config.Apply(override)
+	conns, err := config.GetConns()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
+		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
 		os.Exit(1)
 	}
 
-	logg.Infof("start command", "conn", connData)
+	logg.Infof("start command", "conn", conns)
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, "SessionId", sessionId)
 	ctx = context.WithValue(ctx, "Database", database)
 
-	resourceDir := scriptDir
+	menuStorageService := storage.NewMenuStorageService(conns)
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
 
 	store, err := menuStorageService.GetUserdataDb(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get userdata db: %v\n", err.Error())
 		os.Exit(1)
 	}
+	store.SetSession(sessionId)
 	store.SetPrefix(db.DATATYPE_USERDATA)
 
-	d, err := store.Dump(ctx, []byte(sessionId))
+	d, err := store.Dump(ctx, []byte(""))
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "store dump fail: %v\n", err.Error())
 		os.Exit(1)
@@ -78,15 +87,19 @@ func main() {
 		if k == nil {
 			break
 		}
-		r, err := formatItem(k, v)
+		if !first {
+			fmt.Printf("Session ID: %s\n---\n", sessionId)
+			first = true
+		}
+		r, err := formatItem(append([]byte{db.DATATYPE_USERDATA}, k...), v, sessionId)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "format db item error: %v", err)
+			fmt.Fprintf(os.Stderr, "format db item error: %v\n", err)
 			os.Exit(1)
 		}
 		fmt.Printf(r)
 	}
 
-	err = store.Close()
+	err = store.Close(ctx)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)

devtools/store/generate/main.go

@@ -1,86 +0,0 @@
-package main
-
-import (
-	"context"
-	"crypto/sha1"
-	"flag"
-	"fmt"
-	"os"
-	"path"
-
-	testdataloader "github.com/peteole/testdata-loader"
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-)
-
-var (
-	logg      = logging.NewVanilla()
-	baseDir   = testdataloader.GetBasePath()
-	scriptDir = path.Join("services", "registration")
-)
-
-func main() {
-	config.LoadConfig()
-
-	var connStr string
-	var sessionId string
-	var database string
-	var engineDebug bool
-	var err error
-
-	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&connStr, "c", "", "connection string")
-	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
-	flag.Parse()
-
-	if connStr != "" {
-		connStr = config.DbConn()
-	}
-	connData, err := storage.ToConnData(connStr)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
-		os.Exit(1)
-	}
-
-	logg.Infof("start command", "conn", connData)
-
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "SessionId", sessionId)
-	ctx = context.WithValue(ctx, "Database", database)
-
-	resourceDir := scriptDir
-	menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
-	
-	userDb, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	userStore := store.UserDataStore{userDb}
-
-	h := sha1.New()
-	h.Write([]byte(sessionId))
-	address := h.Sum(nil)
-	addressString := fmt.Sprintf("%x", address)
-
-	err = userStore.WriteEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY, []byte(addressString))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	err = userStore.WriteEntry(ctx, addressString, storedb.DATA_PUBLIC_KEY_REVERSE, []byte(sessionId))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	err = userDb.Close()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-}

go.mod

@@ -3,11 +3,11 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4
 
 require (
-	git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739
+	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
-	git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805
-	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
-	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d
+	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta

go.sum

@@ -1,13 +1,13 @@
-git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739 h1:w7pj1oh7jXrfajahVYU7m7AfHst4C6jNVzDVoaqJ7e8=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
-git.defalsify.org/vise.git v0.2.3-0.20250115000535-e2d329b3f739/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05 h1:BenzGx6aDHKDwE23/mWIFD2InYIXyzHroZWV3MF5WUk=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
-git.grassecon.net/grassrootseconomics/common v0.0.0-20250113174703-6afccefd1f05/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f h1:FgccQi8vipX6dUt+GRiRDYHMR3UqC+plz73vw7y3fyU=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805 h1:deGnqf4YCsbxhXgjFEjYjTUCvciLEmI26T9IysRsQXY=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250115072214-bca7c5de969f/go.mod h1:tbA4whUGMUIDgQVdIW0sxWPuuXOvZRSny5zeku5hX4k=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805/go.mod h1:9bc3d//Qqm11hz7GYRdQc1Uan+0GJIOpvRBbv8cHMu8=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63 h1:bX7klKZpX+ZZu1LKbtOXDAhV/KK0YwExehiIi0jusAM=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2 h1:ON77G5K0JNuwPb5JT/hRfF6G6+xstlBQgEIEzWydnhg=
-git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250115003256-c0534ede1b63/go.mod h1:Syw9TZyigPAM7t9FvicOm36iUnidt45f0SxzT2JniQ8=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d h1:q/NO1rEgK3pia32D/tCq5hXfEuJp84COZRwceFvy/MM=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84 h1:VoBmqsjlRdz+IPbtKsAkc1IrMepjR+QlesZT31Jokrk=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250113103030-f0b2056fd87d/go.mod h1:AH15xABcvaJr1TCGlih3oGSuwWC0E5IdbHQwuu+E1KI=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=

handlers/application/menuhandler_test.go

@@ -54,7 +54,7 @@ func InitializeTestStore(t *testing.T) (context.Context, *store.UserDataStore) {
 	store := &store.UserDataStore{Db: db}
 
 	t.Cleanup(func() {
-		db.Close() // Ensure the DB is closed after each test
+		db.Close(ctx) // Ensure the DB is closed after each test
 	})
 
 	return ctx, store

handlers/event/custodial.go

@@ -35,13 +35,6 @@ func (eu *EventsUpdater) HandleCustodialRegistration(ctx context.Context, ev *ap
 	if err != nil {
 		return err
 	}
-//	err = pe.Load(identity.SessionId)
-//	if err != nil {
-//		return err
-//	}
-//	st := pe.GetState()
-//	st.SetFlag(accountCreatedFlag)
-//	return pe.Save(identity.SessionId)
 	logg.DebugCtxf(ctx, "received custodial registration event", "identity", identity)
 	return nil
 }

handlers/event/event.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.defalsify.org/vise.git/persist"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (
@@ -17,9 +17,9 @@ var (
 )
 
 type EventsUpdater struct {
-	api remote.AccountService
+	api        remote.AccountService
 	formatFunc func(string, int, any) string
-	store storage.StorageService 
+	store      storage.StorageService
 }
 
 func NewEventsUpdater(api remote.AccountService, store storage.StorageService) *EventsUpdater {

handlers/event/token.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 
 	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 	"git.grassecon.net/grassrootseconomics/common/identity"
 	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
 )
 
 // execute all
@@ -47,7 +47,6 @@ func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Iden
 	return nil
 }
 
-
 // set default token to given symbol.
 func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, activeSym string) error {
 	pfxDb := toPrefixDb(userStore, identity.SessionId)
@@ -59,7 +58,6 @@ func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identi
 	return store.UpdateVoucherData(ctx, userStore, identity.SessionId, tokenData)
 }
 
-
 // handle token transfer.
 //
 // if from and to are NOT the same, handle code will be executed once for each side of the transfer.
@@ -189,7 +187,7 @@ func (eu *EventsUpdater) updateTokenTransferList(ctx context.Context, identity i
 		return err
 	}
 
-	for i, tx := range(txs) {
+	for i, tx := range txs {
 		r = append(r, eu.formatFunc(apievent.EventTokenTransferTag, i, tx))
 	}
 

internal/cmd/cmd.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 var (
@@ -14,18 +14,17 @@ var (
 )
 
 type Cmd struct {
-	sessionId string
+	sessionId  string
-	conn storage.ConnData
+	conn       storage.ConnData
 	flagParser *application.FlagManager
-	cmd int
+	cmd        int
-	enable bool
+	enable     bool
-	exec func(ctx context.Context, ss storage.StorageService) error
+	exec       func(ctx context.Context, ss storage.StorageService) error
 }
 
-func NewCmd(conn storage.ConnData, sessionId string, flagParser *application.FlagManager) *Cmd {
+func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
 	return &Cmd{
-		conn: conn,
+		sessionId:  sessionId,
-		sessionId: sessionId,
 		flagParser: flagParser,
 	}
 }
@@ -95,5 +94,3 @@ func (c *Cmd) Parse(args []string) error {
 
 	return fmt.Errorf("unknown subcommand: %s", cmd)
 }
-
-

menutraversal_test/menu_traversal_test.go

@@ -9,12 +9,14 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/gofrs/uuid"
+	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
+	"github.com/gofrs/uuid"
 )
 
 var (
+	logg      = logging.NewVanilla().WithDomain("menutraversaltest")
 	testData  = driver.ReadData()
 	sessionID string
 	src       = rand.NewSource(42)
@@ -22,9 +24,6 @@ var (
 )
 
 var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
-var database = flag.String("db", "gdbm", "Specify the database (gdbm or postgres)")
-var connStr = flag.String("conn", ".test_state", "connection string")
-var dbSchema = flag.String("schema", "test", "Specify the database schema (default test)")
 
 func GenerateSessionId() string {
 	uu := uuid.NewGenWithOptions(uuid.WithRandomReader(g))
@@ -80,12 +79,7 @@ func extractSendAmount(response []byte) string {
 }
 
 func TestMain(m *testing.M) {
-	// Parse the flags
-	flag.Parse()
 	sessionID = GenerateSessionId()
-	// set the db
-	testutil.SetDatabase(*database, *connStr, *dbSchema)
-
 	// Cleanup the db after tests
 	defer testutil.CleanDatabase()
 
@@ -100,7 +94,8 @@ func TestAccountCreationSuccessful(t *testing.T) {
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
 		for _, group := range groups {
-			for _, step := range group.Steps {
+			for i, step := range group.Steps {
+				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
@@ -142,7 +137,8 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "account_creation_reject_terms")
 		for _, group := range groups {
-			for _, step := range group.Steps {
+			for i, step := range group.Steps {
+				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
@@ -177,7 +173,8 @@ func TestMainMenuHelp(t *testing.T) {
 	for _, session := range sessions {
 		groups := driver.FilterGroupsByName(session.Groups, "main_menu_help")
 		for _, group := range groups {
-			for _, step := range group.Steps {
+			for i, step := range group.Steps {
+				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
 				cont, err := en.Exec(ctx, []byte(step.Input))
 				if err != nil {
 					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)

services/local.go

@@ -1,16 +1,17 @@
+//go:build !online
 // +build !online
 
 package services
 
 import (
-	"fmt"
 	"context"
+	"fmt"
 
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )
 
 type localEmitter struct {
@@ -37,7 +38,7 @@ func (d *localEmitter) emit(ctx context.Context, msg apievent.Msg) error {
 	return err
 }
 
-func New(ctx context.Context, storageService storage.StorageService, conn storage.ConnData) remote.AccountService {
+func New(ctx context.Context, storageService storage.StorageService) remote.AccountService {
 	svc := devremote.NewDevAccountService(ctx, storageService)
 	svc = svc.WithAutoVoucher(ctx, "FOO", 42)
 	eu := event.NewEventsUpdater(svc, storageService)

services/registration/Makefile

@@ -4,8 +4,8 @@ TXTS = $(wildcard ./*.txt.orig)
 VISE_PATH := ../../go-vise
 
 # Rule to build .bin files from .vis files
-%.vis:
+%.vis: buildasm
-	go run  $(VISE_PATH)/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
+	./vise-asm -f pp.csv $(basename $@).vis > $(basename $@).bin
 	@echo "Built $(basename $@).bin from $(basename $@).vis"
 
 # Rule to copy .orig files to .txt
@@ -19,5 +19,10 @@ all: $(INPUTS) $(TXTS)
 
 clean: 
 	rm -vf *.bin
+	rm -vf ./vise-asm
+
+buildasm:
+	go build -v -o ./vise-asm $(VISE_PATH)/dev/asm/main.go
+
 
 .PHONY: clean