feat(xcli): 提供 XCli 基座

xcli/define.go

@@ -18,6 +18,21 @@ type ICommand interface {
 	Flags() *flag.FlagSet
 }
 
+func BuildCobraCommand(icmd ICommand) *cobra.Command {
+	c := &cobra.Command{
+		Use:   icmd.Use(),
+		Short: icmd.Short(),
+		Long:  icmd.Long(),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return icmd.Run(cmd.Context(), args)
+		},
+	}
+	ConvFlag2Pflag(icmd.Flags(), c.Flags())
+	return c
+}
+
+// ============================================== flag value ==============================================
+
 type pflagValueAdapter struct {
 	value flag.Value
 }
@@ -38,27 +53,6 @@ func (x *pflagValueAdapter) Type() string {
 	return "string"
 }
 
-func InitRootCommand(root ICommand, cmds ...ICommand) *cobra.Command {
-	rootCmd := BuildCobraCommand(root)
-	for _, sudCmd := range cmds {
-		rootCmd.AddCommand(BuildCobraCommand(sudCmd))
-	}
-	return rootCmd
-}
-
-func BuildCobraCommand(icmd ICommand) *cobra.Command {
-	c := &cobra.Command{
-		Use:   icmd.Use(),
-		Short: icmd.Short(),
-		Long:  icmd.Long(),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return icmd.Run(cmd.Context(), args)
-		},
-	}
-	ConvFlag2Pflag(icmd.Flags(), c.Flags())
-	return c
-}
-
 func ConvFlag2Pflag(src *flag.FlagSet, dst *pflag.FlagSet) {
 	src.VisitAll(func(f *flag.Flag) {
 		dst.Var(newPflagValueAdapter(f.Value), f.Name, f.Usage)

xcli/xcli.go

@@ -0,0 +1,98 @@
+package xcli
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/ccheers/xpkg/sync/errgroup"
+	"github.com/spf13/cobra"
+)
+
+type XCli struct {
+	rootCmd *cobra.Command
+}
+
+type XCliOptions struct {
+	short   string
+	long    string
+	cmdList ICommandList
+}
+
+func defaultXCliOptions() *XCliOptions {
+	return &XCliOptions{}
+}
+
+type XCliOption interface {
+	apply(opt *XCliOptions)
+}
+
+type XCliOptionFunc func(opt *XCliOptions)
+
+func (f XCliOptionFunc) apply(opt *XCliOptions) {
+	f(opt)
+}
+
+func WithShort(short string) XCliOption {
+	return XCliOptionFunc(func(opt *XCliOptions) {
+		opt.short = short
+	})
+}
+
+func WithLong(long string) XCliOption {
+	return XCliOptionFunc(func(opt *XCliOptions) {
+		opt.long = long
+	})
+}
+
+func WithCommandList(cmdList ICommandList) XCliOption {
+	return XCliOptionFunc(func(opt *XCliOptions) {
+		opt.cmdList = cmdList
+	})
+}
+
+func NewXCli(name string, opts ...XCliOption) *XCli {
+	options := defaultXCliOptions()
+	for _, o := range opts {
+		o.apply(options)
+	}
+
+	rootCmd := &cobra.Command{
+		Use:   name,
+		Short: options.short,
+		Long:  options.long,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cmd.Help()
+		},
+	}
+
+	for _, cmd := range options.cmdList {
+		rootCmd.AddCommand(BuildCobraCommand(cmd))
+	}
+
+	return &XCli{
+		rootCmd: rootCmd,
+	}
+}
+
+func (x *XCli) Run(ctx context.Context) error {
+	ctx, cancel := context.WithCancel(ctx)
+
+	eg := errgroup.WithCancel(ctx)
+	eg.Go(func(ctx context.Context) error {
+		return x.rootCmd.ExecuteContext(ctx)
+	})
+	eg.Go(func(ctx context.Context) error {
+		c := make(chan os.Signal, 2)
+		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+		go func() {
+			<-c
+			cancel()
+			<-c
+			os.Exit(1) // second signal. Exit directly.
+		}()
+		return nil
+	})
+	return eg.Wait()
+}