From 1250468f690ee7016a2207d8fed88187a7cd69d1 Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Tue, 10 Dec 2024 15:25:51 -0500 Subject: [PATCH] refactor: refactor hway command to use echo framework for server --- Makefile | 2 +- cmd/hway/cmds.go | 61 ++++++++++++++++++++++++++++++++++++++------- cmd/hway/config.pkl | 1 - cmd/hway/main.go | 54 +++------------------------------------ 4 files changed, 57 insertions(+), 61 deletions(-) delete mode 100644 cmd/hway/config.pkl diff --git a/Makefile b/Makefile index 06af1d8da..930674dad 100644 --- a/Makefile +++ b/Makefile @@ -329,7 +329,7 @@ build-motr: GOOS=js GOARCH=wasm go build -o static/wasm/app.wasm ./cmd/motr/main.go build-hway: gen-templ - go build -o build/hway ./cmd/hway/main.go + go build -o build/hway ./cmd/hway logs-hway: init-env bin/process-compose process logs hway --port $(PC_PORT_NUM) --follow diff --git a/cmd/hway/cmds.go b/cmd/hway/cmds.go index 39c885c7f..2ed377d27 100644 --- a/cmd/hway/cmds.go +++ b/cmd/hway/cmds.go @@ -1,7 +1,19 @@ package main import ( + "fmt" + "log" + "net/http" + "os" + + "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" + "github.com/onsonr/sonr/crypto/ucan" + "github.com/onsonr/sonr/internal/database/sessions" + "github.com/onsonr/sonr/internal/gateway" "github.com/onsonr/sonr/internal/gateway/config" + "github.com/onsonr/sonr/pkg/common/ipfs" + "github.com/onsonr/sonr/pkg/didauth/producer" "github.com/spf13/cobra" ) @@ -22,17 +34,29 @@ func NewRootCmd() *cobra.Command { Use: "hway", Short: "Sonr DID gateway", Run: func(cmd *cobra.Command, args []string) { - cmd.Help() + env, err := loadEnvImplFromArgs(args) + if err != nil { + panic(err) + } + e, err := setupServer(env) + if err != nil { + panic(err) + } + if err := e.Start(fmt.Sprintf(":%d", env.GetServePort())); err != http.ErrServerClosed { + log.Fatal(err) + os.Exit(1) + return + } }, } - cmd.Flags().IntVar(&servePort, "serve-port", 8080, "Port to serve the gateway on") - cmd.Flags().StringVar(&configDir, "config-dir", "", "Directory to store config files") - cmd.Flags().StringVar(&sqliteFile, "sqlite-file", "", "File to store sqlite database") - cmd.Flags().StringVar(&chainId, "chain-id", "", "Chain ID") - cmd.Flags().StringVar(&ipfsGatewayUrl, "ipfs-gateway-url", "", "IPFS gateway URL") - cmd.Flags().StringVar(&sonrApiUrl, "sonr-api-url", "", "Sonr API URL") - cmd.Flags().StringVar(&sonrGrpcUrl, "sonr-grpc-url", "", "Sonr gRPC URL") - cmd.Flags().StringVar(&sonrRpcUrl, "sonr-rpc-url", "", "Sonr RPC URL") + cmd.Flags().IntVar(&servePort, "serve-port", 3000, "Port to serve the gateway on") + cmd.Flags().StringVar(&configDir, "config-dir", "hway", "Directory to store config files") + cmd.Flags().StringVar(&sqliteFile, "sqlite-file", "hway.db", "File to store sqlite database") + cmd.Flags().StringVar(&chainId, "chain-id", "sonr-testnet-1", "Chain ID") + cmd.Flags().StringVar(&ipfsGatewayUrl, "ipfs-gateway-url", "localhost:8080", "IPFS gateway URL") + cmd.Flags().StringVar(&sonrApiUrl, "sonr-api-url", "localhost:1317", "Sonr API URL") + cmd.Flags().StringVar(&sonrGrpcUrl, "sonr-grpc-url", "localhost:9090", "Sonr gRPC URL") + cmd.Flags().StringVar(&sonrRpcUrl, "sonr-rpc-url", "localhost:26657", "Sonr RPC URL") return cmd } @@ -54,3 +78,22 @@ func loadEnvImplFromArgs(args []string) (config.Env, error) { } return env, nil } + +// setupServer sets up the server +func setupServer(env config.Env) (*echo.Echo, error) { + ipc, err := ipfs.NewClient() + if err != nil { + return nil, err + } + db, err := sessions.NewGormDB(env) + if err != nil { + return nil, err + } + e := echo.New() + e.IPExtractor = echo.ExtractIPDirect() + e.Use(middleware.Logger()) + e.Use(middleware.Recover()) + e.Use(producer.Middleware(ipc, ucan.ServicePermissions)) + gateway.RegisterRoutes(e, env, db) + return e, nil +} diff --git a/cmd/hway/config.pkl b/cmd/hway/config.pkl deleted file mode 100644 index ebb8915b5..000000000 --- a/cmd/hway/config.pkl +++ /dev/null @@ -1 +0,0 @@ -amends "https://pkl.sh/sonr.hway/0.0.3/Env.pkl" diff --git a/cmd/hway/main.go b/cmd/hway/main.go index 02f32ad0a..e2b07fc73 100644 --- a/cmd/hway/main.go +++ b/cmd/hway/main.go @@ -3,61 +3,15 @@ package main import ( _ "embed" "fmt" - "log" - "net/http" "os" - - "github.com/labstack/echo/v4" - "github.com/labstack/echo/v4/middleware" - "github.com/onsonr/sonr/crypto/ucan" - "github.com/onsonr/sonr/internal/database/sessions" - "github.com/onsonr/sonr/internal/gateway" - "github.com/onsonr/sonr/internal/gateway/config" - "github.com/onsonr/sonr/pkg/common/ipfs" - "github.com/onsonr/sonr/pkg/didauth/producer" ) -//go:embed config.pkl -var configBz []byte - -func loadConfig() (config.Env, error) { - return config.LoadFromBytes(configBz) -} - -// setupServer sets up the server -func setupServer(env config.Env) (*echo.Echo, error) { - ipc, err := ipfs.NewClient() - if err != nil { - return nil, err - } - db, err := sessions.NewGormDB(env) - if err != nil { - return nil, err - } - e := echo.New() - e.IPExtractor = echo.ExtractIPDirect() - e.Use(middleware.Logger()) - e.Use(middleware.Recover()) - e.Use(producer.Middleware(ipc, ucan.ServicePermissions)) - gateway.RegisterRoutes(e, env, db) - return e, nil -} - // main is the entry point for the application func main() { - env, err := loadConfig() - if err != nil { - panic(err) - } - - e, err := setupServer(env) - if err != nil { - panic(err) - } - - if err := e.Start(fmt.Sprintf(":%d", env.GetServePort())); err != http.ErrServerClosed { - log.Fatal(err) + cmd := NewRootCmd() + if err := cmd.Execute(); err != nil { + fmt.Println(err) os.Exit(1) - return } + os.Exit(0) }