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/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,25 @@
+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()),
+		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"`
 }

config/config.go

@@ -50,11 +50,35 @@ func GetConfigData(cfgPath string) (_ []byte, gErr error) {
 
 	configBytes = result.Of(os.ReadFile(cfgPath)).Expect("failed to read config data: %s", cfgPath)
 	configBytes = result.Of(envsubst.Bytes(configBytes)).Expect("failed to handler config env data: %s", cfgPath)
-	configBytes = []byte(cfgFormat(string(configBytes), &config{workDir: filepath.Dir(cfgPath)}))
+	configBytes = cfgFormat(configBytes, &config{workDir: filepath.Dir(cfgPath)})
 	return configBytes, nil
 }
 
-func LoadFromPath[T any](val *T, cfgPath string) {
+func loadEnvConfigMap(cfgPath string) EnvConfigMap {
+	var res Resources
+	configBytes := result.Of(os.ReadFile(cfgPath)).Expect("failed to read config data: %s", cfgPath)
+	assert.Must(yaml.Unmarshal(configBytes, &res), "failed to unmarshal resource config")
+
+	parentDir := filepath.Dir(cfgPath)
+	var envCfgMap EnvConfigMap
+	for _, envPath := range res.PatchEnvs {
+		envPath = filepath.Join(parentDir, envPath)
+		if pathutil.IsNotExist(envPath) {
+			log.Warn().Str("env_path", envPath).Msg("env config cfgPath not found")
+			continue
+		}
+
+		pathList := listAllPath(envPath).Expect("failed to list envPath: %s", envPath)
+		for _, p := range pathList {
+			envConfigBytes := result.Of(os.ReadFile(p)).Expect("failed to handler env config data, path=%s", p)
+			assert.MustF(yaml.Unmarshal(envConfigBytes, &envCfgMap), "failed to unmarshal env config, path=%s", p)
+		}
+	}
+	initEnv(envCfgMap)
+	return envCfgMap
+}
+
+func LoadFromPath[T any](val *T, cfgPath string) EnvConfigMap {
 	defer recovery.Exit(func(err error) error {
 		log.Err(err).Str("config_path", cfgPath).Msg("failed to load config")
 		return err
@@ -75,6 +99,8 @@ func LoadFromPath[T any](val *T, cfgPath string) {
 			Msg("config type not correct")
 	}
 
+	var envCfgMap = loadEnvConfigMap(cfgPath)
+
 	configBytes := result.Of(GetConfigData(cfgPath)).Expect("failed to handler config data")
 	defer recovery.Exit(func(err error) error {
 		log.Err(err).
@@ -90,7 +116,7 @@ func LoadFromPath[T any](val *T, cfgPath string) {
 			Str("config_data", string(configBytes)).
 			Str("config_path", cfgPath).
 			Msg("failed to unmarshal config")
-		return
+		return nil
 	}
 
 	parentDir := filepath.Dir(cfgPath)
@@ -160,11 +186,13 @@ func LoadFromPath[T any](val *T, cfgPath string) {
 	})...)
 
 	assert.Exit(Merge(val, cfgList...), "failed to merge config")
+	return envCfgMap
 }
 
 type Cfg[T any] struct {
-	T T
-	P *T
+	T      T
+	P      *T
+	EnvCfg *EnvConfigMap
 }
 
 func Load[T any]() Cfg[T] {
@@ -175,6 +203,6 @@ func Load[T any]() Cfg[T] {
 	}
 
 	var cfg T
-	LoadFromPath(&cfg, configPath)
-	return Cfg[T]{T: cfg, P: &cfg}
+	cfgMap := LoadFromPath(&cfg, configPath)
+	return Cfg[T]{T: cfg, P: &cfg, EnvCfg: lo.ToPtr(cfgMap)}
 }

config/configs/assets/assets.yaml

@@ -1,5 +1,5 @@
 assets:
   test_md:
     test_abc:
-      secret: ${{embed("test.md")}}
-  path_dir: ${{get_path_dir()}}
+      secret: {{embed("test.md")}}
+  path_dir: {{get_path_dir()}}

config/envs.go

@@ -0,0 +1,32 @@
+package config
+
+import (
+	"strings"
+
+	"github.com/pubgo/funk/env"
+	"github.com/samber/lo"
+)
+
+type EnvConfigMap map[string]*EnvConf
+
+type EnvConf struct {
+	Name        string `yaml:"name"`
+	Description string `yaml:"description"`
+	Default     string `yaml:"default"`
+	Required    bool   `yaml:"required"`
+	Example     string `yaml:"example"`
+	Versions    string `yaml:"versions"`
+	Tags        string `yaml:"tags"`
+}
+
+func initEnv(envMap EnvConfigMap) {
+	for name, cfg := range envMap {
+		envData := env.Get(name)
+		envData = strings.TrimSpace(lo.Ternary(envData != "", envData, cfg.Default))
+		if cfg.Required && envData == "" {
+			panic("env " + cfg.Name + " is required")
+		}
+
+		env.Set(name, envData).Must()
+	}
+}

config/util.go

@@ -177,7 +177,7 @@ func unmarshalOneOrList[T any](list *[]T, value *yaml.Node) error {
 	if value.Kind == yaml.SequenceNode {
 		return value.Decode(list)
 	}
-	return errors.Format("unmarshalled node: %v", value.Value)
+	return errors.Errorf("unmarshalled node: %v", value.Value)
 }
 
 func listAllPath(dirOrPath string) (ret result.Result[[]string]) {
@@ -220,6 +220,9 @@ func getEnvData(cfg *config) map[string]any {
 		"get_path_dir": func() string {
 			return cfg.workDir
 		},
+		"path_dir": func() string {
+			return cfg.workDir
+		},
 		"embed": func(name string) string {
 			if name == "" {
 				return ""
@@ -239,9 +242,9 @@ func getEnvData(cfg *config) map[string]any {
 	}
 }
 
-func cfgFormat(template string, cfg *config) string {
-	tpl := fasttemplate.New(template, "${{", "}}")
-	return tpl.ExecuteFuncString(func(w io.Writer, tag string) (int, error) {
+func cfgFormat(template []byte, cfg *config) []byte {
+	tpl := fasttemplate.New(string(template), "{{", "}}")
+	return []byte(tpl.ExecuteFuncString(func(w io.Writer, tag string) (int, error) {
 		tag = strings.TrimSpace(tag)
 		evalData, err := eval(tag, cfg)
 		if err != nil {
@@ -257,7 +260,7 @@ func cfgFormat(template string, cfg *config) string {
 		}
 
 		return w.Write(bytes.TrimSpace(data))
-	})
+	}))
 }
 
 func eval(code string, cfg *config) (any, error) {

config/util_test.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"bytes"
 	_ "embed"
 	"os"
 	"sort"
@@ -30,16 +31,16 @@ func TestExpr(t *testing.T) {
 	os.Setenv("testAbc", "hello")
 	env.Init()
 
-	assert.Equal(t, cfgFormat("${{env.TEST_ABC}}", &config{}), "hello")
-	assert.Equal(t, cfgFormat(`${{embed("configs/assets/secret")}}`, &config{}), strings.TrimSpace(`MTIzNDU2CjEyMzQ1NgoxMjM0NTYKMTIzNDU2CjEyMzQ1NgoxMjM0NTYKMTIzNDU2CjEyMzQ1Ng==`))
+	assert.Equal(t, string(cfgFormat([]byte("{{env.TEST_ABC}}"), &config{})), "hello")
+	assert.Equal(t, string(cfgFormat([]byte(`{{embed("configs/assets/secret")}}`), &config{})), strings.TrimSpace(`MTIzNDU2CjEyMzQ1NgoxMjM0NTYKMTIzNDU2CjEyMzQ1NgoxMjM0NTYKMTIzNDU2CjEyMzQ1Ng==`))
 
 	var dd, err = os.ReadFile("configs/assets/assets.yaml")
 	assert.NoError(t, err)
-	var dd1 = strings.TrimSpace(cfgFormat(string(dd), &config{workDir: "configs/assets"}))
+	var dd1 = bytes.TrimSpace(cfgFormat(dd, &config{workDir: "configs/assets"}))
 	var cfg testCfg
-	assert.NoError(t, yaml.Unmarshal([]byte(dd1), &cfg))
+	assert.NoError(t, yaml.Unmarshal(dd1, &cfg))
 
-	assert.Equal(t, dd1, strings.TrimSpace(genYaml))
+	assert.Equal(t, string(dd1), strings.TrimSpace(genYaml))
 }
 
 func TestEnv(t *testing.T) {