Feat/error

cliutils/utils.go

@@ -0,0 +1,14 @@
+package cliutils
+
+import (
+	"os"
+	"strings"
+)
+
+func IsHelp() bool {
+	help := strings.TrimSpace(os.Args[len(os.Args)-1])
+	if strings.HasSuffix(help, "--help") || strings.HasSuffix(help, "-h") {
+		return true
+	}
+	return false
+}

cmds/configcmd/cmd.go

@@ -4,14 +4,15 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/pubgo/dix"
-	"github.com/pubgo/funk/assert"
-	"github.com/pubgo/funk/config"
 	"github.com/urfave/cli/v3"
 	"gopkg.in/yaml.v3"
+
+	"github.com/pubgo/funk/assert"
+	"github.com/pubgo/funk/config"
+	"github.com/pubgo/funk/recovery"
 )
 
-func New[Cfg any](di *dix.Dix) *cli.Command {
+func New[Cfg any]() *cli.Command {
 	return &cli.Command{
 		Name:  "config",
 		Usage: "config management",
@@ -20,8 +21,9 @@ func New[Cfg any](di *dix.Dix) *cli.Command {
 				Name:        "show",
 				Description: "show config data",
 				Action: func(ctx context.Context, command *cli.Command) error {
-					fmt.Println("config path:", config.GetConfigPath())
-					fmt.Println("config raw data:", string(assert.Must1(yaml.Marshal(config.Load[Cfg]().T))))
+					defer recovery.Exit()
+					fmt.Println("config path:\n", config.GetConfigPath())
+					fmt.Println("config raw data:\n", string(assert.Must1(yaml.Marshal(config.Load[Cfg]().T))))
 					return nil
 				},
 			},

cmds/envcmd/cmd.go

@@ -0,0 +1,37 @@
+package envcmd
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/urfave/cli/v3"
+
+	"github.com/pubgo/funk/config"
+	"github.com/pubgo/funk/env"
+	"github.com/pubgo/funk/pretty"
+	"github.com/pubgo/funk/recovery"
+)
+
+func New() *cli.Command {
+	return &cli.Command{
+		Name:  "envs",
+		Usage: "show all envs",
+		Action: func(ctx context.Context, command *cli.Command) error {
+			defer recovery.Exit()
+
+			env.Init()
+
+			fmt.Println("config path:", config.GetConfigPath())
+			envs := config.LoadEnvConfigMap(config.GetConfigPath())
+			for name, cfg := range envs {
+				envData := env.Get(name)
+				if envData != "" {
+					cfg.Default = envData
+				}
+			}
+
+			pretty.Println(envs)
+			return nil
+		},
+	}
+}

cmds/protoc-gen-go-cloudevent/internal/gen.go

@@ -122,7 +122,7 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 			info := subjects[subName]
 			var keyName = fmt.Sprintf("%sCloudEventKey", info.mth.GoName)
 			genFile.Commentf("%s /%s/%s", keyName, info.srv.Desc.FullName(), info.mth.GoName)
-			genFile.Commentf(strings.TrimSpace(info.mth.Comments.Leading.String()))
+			genFile.Comment(strings.TrimSpace(info.mth.Comments.Leading.String()))
 			genFile.Const().
 				Id(keyName).
 				Op("=").

cmds/protoc-gen-go-enum/internal/gen.go

@@ -11,7 +11,7 @@ import (
 func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile {
 	filename := file.GeneratedFilenamePrefix + ".pb.enum.go"
 	genFile := jen.NewFile(string(file.GoPackageName))
-	genFile.HeaderComment("Code generated by protoc-gen-go-sql. DO NOT EDIT.")
+	genFile.HeaderComment("Code generated by protoc-gen-go-enum. DO NOT EDIT.")
 	genFile.HeaderComment("versions:")
 	genFile.HeaderComment(fmt.Sprintf("- protoc-gen-go-enum %s", version))
 	genFile.HeaderComment(fmt.Sprintf("- protoc                 %s", protocVersion(gen)))

cmds/testmain/main.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"sort"
+
+	"github.com/moby/term"
+	"github.com/pubgo/funk/assert"
+	"github.com/pubgo/funk/cliutils"
+	"github.com/pubgo/funk/cmds/versioncmd"
+	"github.com/pubgo/funk/ctxutil"
+	"github.com/pubgo/funk/version"
+	"github.com/urfave/cli/v3"
+)
+
+func main() {
+	app := &cli.Command{
+		Name:                   "testmain",
+		Suggest:                true,
+		UseShortOptionHandling: true,
+		ShellComplete:          cli.DefaultAppComplete,
+		Version:                version.Version(),
+		Commands: []*cli.Command{
+			versioncmd.New(),
+		},
+		Before: func(ctx context.Context, command *cli.Command) (context.Context, error) {
+			if !term.IsTerminal(os.Stdin.Fd()) {
+				return ctx, fmt.Errorf("stdin is not a terminal")
+			}
+
+			if cliutils.IsHelp() {
+				return ctx, cli.ShowAppHelp(command)
+			}
+			return ctx, nil
+		},
+	}
+
+	sort.Sort(cli.FlagsByName(app.Flags))
+	assert.Exit(app.Run(ctxutil.Signal(), os.Args))
+}

cmds/versioncmd/cmd.go

@@ -0,0 +1,36 @@
+package versioncmd
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/urfave/cli/v3"
+
+	"github.com/pubgo/funk/pretty"
+	"github.com/pubgo/funk/recovery"
+	"github.com/pubgo/funk/running"
+	"github.com/pubgo/funk/version"
+)
+
+func New() *cli.Command {
+	return &cli.Command{
+		Name:  "version",
+		Usage: fmt.Sprintf("%s version info", version.Project()),
+		Commands: []*cli.Command{
+			{
+				Name:  "validate",
+				Usage: "show version info",
+				Action: func(ctx context.Context, command *cli.Command) error {
+					defer recovery.Exit()
+					running.CheckVersion()
+					return nil
+				},
+			},
+		},
+		Action: func(ctx context.Context, command *cli.Command) error {
+			defer recovery.Exit()
+			pretty.Println(running.GetSysInfo())
+			return nil
+		},
+	}
+}

component/cloudevent/client.go

@@ -11,6 +11,7 @@ import (
 	"github.com/nats-io/nats.go/jetstream"
 	ants "github.com/panjf2000/ants/v2"
 	"github.com/pubgo/funk/assert"
+	"github.com/pubgo/funk/component/lifecycle"
 	"github.com/pubgo/funk/component/natsclient"
 	"github.com/pubgo/funk/errors"
 	"github.com/pubgo/funk/errors/errcheck"
@@ -22,7 +23,6 @@ import (
 	"github.com/pubgo/funk/try"
 	"github.com/pubgo/funk/typex"
 	"github.com/pubgo/funk/version"
-	"github.com/pubgo/lava/core/lifecycle"
 	"github.com/rs/zerolog"
 	"github.com/samber/lo"
 	"google.golang.org/protobuf/proto"
@@ -454,7 +454,7 @@ func (c *Client) doConsume() (r error) {
 				c.doConsumeHandler(streamName, consumerName, jobSubjects, concurrent),
 				c.doErrHandler(streamName, consumerName),
 			))
-			c.p.Lc.BeforeStop(func() { con.Stop() })
+			c.p.Lc.BeforeStop(lifecycle.WrapNoCtxErr(con.Stop))
 		}
 	}
 	return

component/gormclient/migratecmd/cmd.go

@@ -46,10 +46,10 @@ func New(di *dix.Dix) *cli.Command {
 				Destination: &id,
 			},
 		},
-		Before: func(ctx context.Context, command *cli.Command) error {
+		Before: func(ctx context.Context, command *cli.Command) (context.Context, error) {
 			p := dix.Inject(di, new(params))
 			options.TableName = p.Db.TablePrefix + migrates.DefaultConfig.TableName
-			return nil
+			return ctx, nil
 		},
 		Commands: []*cli.Command{
 			{

component/lifecycle/lifecycle.go

@@ -0,0 +1,37 @@
+package lifecycle
+
+import "context"
+
+func WrapNoError(fn func(context.Context)) ExecFunc {
+	return func(ctx context.Context) error { fn(ctx); return nil }
+}
+
+func WrapNoCtx(fn func() error) ExecFunc {
+	return func(ctx context.Context) error { return fn() }
+}
+
+func WrapNoCtxErr(fn func()) ExecFunc {
+	return func(ctx context.Context) error { fn(); return nil }
+}
+
+type ExecFunc = func(context.Context) error
+
+type Executor struct {
+	Exec ExecFunc
+}
+
+type Handler func(lc Lifecycle)
+
+type Lifecycle interface {
+	AfterStop(f ExecFunc)
+	BeforeStop(f ExecFunc)
+	AfterStart(f ExecFunc)
+	BeforeStart(f ExecFunc)
+}
+
+type Getter interface {
+	GetAfterStops() []Executor
+	GetBeforeStops() []Executor
+	GetAfterStarts() []Executor
+	GetBeforeStarts() []Executor
+}

component/natsclient/client.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/nats-io/nats.go"
 	"github.com/pubgo/funk/assert"
+	"github.com/pubgo/funk/component/lifecycle"
 	"github.com/pubgo/funk/log"
 	"github.com/pubgo/funk/running"
-	"github.com/pubgo/lava/core/lifecycle"
 )
 
 type Param struct {
@@ -50,7 +50,7 @@ func New(p Param) *Client {
 
 	log.Info().Bool("is_connected", nc.IsConnected()).Msg("nats connection ...")
 
-	p.Lc.BeforeStop(func() { nc.Close() })
+	p.Lc.BeforeStop(lifecycle.WrapNoCtxErr(nc.Close))
 
 	return &Client{Param: p, logger: logger, Conn: nc}
 }

config/aaa.go

@@ -11,4 +11,7 @@ type Resources struct {
 
 	// PatchResources resource config not required to exist
 	PatchResources []string `yaml:"patch_resources"`
+
+	// PatchEnvs config file or path, not required to exist
+	PatchEnvs []string `yaml:"patch_envs"`
 }