Expose library

africastalking/parse.go

@@ -10,8 +10,8 @@ import (
 	"net/url"
 	"strings"
 
-	"git.grassecon.net/urdt/ussd/common"
-	"git.grassecon.net/urdt/ussd/errors"
+	"git.grassecon.net/grassrootseconomics/visedriver/common"
+	"git.grassecon.net/grassrootseconomics/visedriver/errors"
 )
 
 type ATRequestParser struct {

africastalking/server.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/urdt/ussd/request"
-	"git.grassecon.net/urdt/ussd/errors"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"git.grassecon.net/grassrootseconomics/visedriver/errors"
 )
 
 var (

africastalking/server_test.go

@@ -11,9 +11,9 @@ import (
 	"testing"
 
 	"git.defalsify.org/vise.git/engine"
-	"git.grassecon.net/urdt/ussd/request"
-	verrors "git.grassecon.net/urdt/ussd/errors"
-	"git.grassecon.net/urdt/ussd/testutil/mocks/httpmocks"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	verrors "git.grassecon.net/grassrootseconomics/visedriver/errors"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/mocks/httpmocks"
 )
 
 func TestNewATSessionHandler(t *testing.T) {

cmd/main.go

@@ -1,176 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"net/http"
-	"os"
-	"os/signal"
-	"path"
-	"strconv"
-	"syscall"
-
-	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
-	"git.defalsify.org/vise.git/lang"
-	"git.defalsify.org/vise.git/resource"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/initializers"
-	"git.grassecon.net/urdt/ussd/remote"
-	"git.grassecon.net/urdt/ussd/common"
-	"git.grassecon.net/urdt/ussd/handlers"
-	
-	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/internal/africastalking"
-	"git.grassecon.net/grassrootseconomics/visedriver-africastalking/internal/args"
-)
-
-var (
-	logg          = logging.NewVanilla().WithDomain("AfricasTalking").WithContextKey("at-session-id")
-	scriptDir     = path.Join("services", "registration")
-	build         = "dev"
-	menuSeparator = ": "
-)
-
-func init() {
-	initializers.LoadEnvVariables()
-}
-
-func main() {
-	config.LoadConfig()
-
-	var connStr string
-	var resourceDir string
-	var size uint
-	var database string
-	var engineDebug bool
-	var host string
-	var port uint
-	var err error
-	var gettextDir string
-	var langs args.LangVar
-
-
-	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", initializers.GetEnv("HOST", "127.0.0.1"), "http host")
-	flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")
-	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
-	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.Parse()
-
-	if connStr == "" {
-		connStr = config.DbConn
-	}
-	connData, err := common.ToConnData(config.DbConn)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "connstr err: %v", err)
-		os.Exit(1)
-	}
-
-	logg.Infof("start command", "build", build, "conn", connData, "resourcedir", resourceDir, "outputsize", size)
-
-	ctx := context.Background()
-	ctx = context.WithValue(ctx, "Database", database)
-	ln, err := lang.LanguageFromCode(config.DefaultLanguage)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "default language set error: %v", err)
-		os.Exit(1)
-	}
-	ctx = context.WithValue(ctx, "Language", ln)
-
-	pfp := path.Join(scriptDir, "pp.csv")
-
-	cfg := engine.Config{
-		Root:          "root",
-		OutputSize:    uint32(size),
-		FlagCount:     uint32(128),
-		MenuSeparator: menuSeparator,
-	}
-
-	if engineDebug {
-		cfg.EngineDebug = true
-	}
-
-	menuStorageService, err := common.NewStorageService(connData)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	rs, err := menuStorageService.GetResource(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	userdataStore, err := menuStorageService.GetUserdataDb(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	defer userdataStore.Close()
-
-	dbResource, ok := rs.(*resource.DbResource)
-	if !ok {
-		os.Exit(1)
-	}
-
-	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	lhs.SetDataStore(&userdataStore)
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	accountService := remote.AccountService{}
-	hl, err := lhs.GetHandler(&accountService)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	stateStore, err := menuStorageService.GetStateStore(ctx)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-	defer stateStore.Close()
-
-	rp := &at.ATRequestParser{}
-	bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	sh := at.NewATSessionHandler(bsh)
-
-	mux := http.NewServeMux()
-	mux.Handle(initializers.GetEnv("AT_ENDPOINT", "/"), sh)
-
-	s := &http.Server{
-		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
-		Handler: mux,
-	}
-	s.RegisterOnShutdown(sh.Shutdown)
-
-	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() {
-		select {
-		case _ = <-cint:
-		case _ = <-cterm:
-		}
-		s.Shutdown(ctx)
-	}()
-	err = s.ListenAndServe()
-	if err != nil {
-		logg.Infof("Server closed with error", "err", err)
-	}
-}

go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	git.defalsify.org/vise.git v0.2.3-0.20250103172917-3e190a44568d
-	git.grassecon.net/urdt/ussd v0.8.0-beta.11.0.20250109134950-b9712098eff5
+	git.grassecon.net/grassrootseconomics/visedriver lash/purify-max
 )
 
 require (