refactor: restructure pipeline and session examples, update executor implementations, and improve server components

Author: kuhahalong

cmd/runshell/cmd/exec.go

@@ -30,61 +30,28 @@ var execCmd = &cobra.Command{
 		var exec types.Executor
 		var err error
 		if execDockerImage != "" {
-			exec, err = executor.NewDockerExecutor(types.DockerConfig{
+			exec, err = executor.NewDockerExecutorBuilder(types.DockerConfig{
 				Image: execDockerImage,
-			}, nil)
+			}, nil).Build()
 			if err != nil {
 				return fmt.Errorf("failed to create Docker executor: %w", err)
 			}
 		} else {
-			exec = executor.NewLocalExecutor(types.LocalConfig{
+			exec, err = executor.NewLocalExecutorBuilder(types.LocalConfig{
 				AllowUnregisteredCommands: true,
-			}, nil)
+			}, nil).Build()
+			if err != nil {
+				return fmt.Errorf("failed to create local executor: %w", err)
+			}
 		}
 
 		// 创建管道执行器
 		pipeExec := executor.NewPipelineExecutor(exec)
 
-		// 检查是否包含管道符
-		cmdStr := strings.Join(args, " ")
-		if strings.Contains(cmdStr, "|") {
-			// 解析管道命令
-			pipeline, err := pipeExec.ParsePipeline(cmdStr)
-			if err != nil {
-				return fmt.Errorf("failed to parse pipeline: %w", err)
-			}
-
-			// 设置执行选项
-			pipeline.Options = &types.ExecuteOptions{
-				WorkDir: execWorkDir,
-				Env:     parseEnvVars(execEnvVars),
-				Stdin:   os.Stdin,
-				Stdout:  os.Stdout,
-				Stderr:  os.Stderr,
-			}
-			pipeline.Context = cmd.Context()
-
-			// 执行管道命令
-			result, err := pipeExec.ExecutePipeline(pipeline)
-			if err != nil {
-				// 检查是否是 grep 命令没有匹配项的情况
-				if strings.Contains(cmdStr, "grep") && result != nil && result.ExitCode == 1 {
-					return nil
-				}
-				return fmt.Errorf("failed to execute pipeline: %w", err)
-			}
-
-			if result.ExitCode != 0 {
-				return fmt.Errorf("pipeline failed with exit code %d", result.ExitCode)
-			}
-
-			return nil
-		}
-
 		// 非管道命令的处理
 		ctx := &types.ExecuteContext{
 			Context: cmd.Context(),
-			Command: types.Command{Command: args[0]},
+			Command: types.Command{Command: args[0], Args: args[1:]},
 			Options: &types.ExecuteOptions{
 				WorkDir: execWorkDir,
 				Env:     parseEnvVars(execEnvVars),
@@ -95,7 +62,7 @@ var execCmd = &cobra.Command{
 			Executor: exec,
 		}
 
-		result, err := exec.Execute(ctx)
+		result, err := pipeExec.Execute(ctx)
 		if err != nil {
 			return fmt.Errorf("failed to execute command: %w", err)
 		}

cmd/runshell/cmd/exec_test.go

@@ -25,18 +25,14 @@ var serverCmd = &cobra.Command{
 	Short: "Start the HTTP server",
 	Long:  `Start the HTTP server to handle command execution requests.`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		var err error
-		// 创建执行器
-		var exec types.Executor
+		// 创建执行器构建器
+		var execBuilder types.ExecutorBuilder
 		if dockerImage != "" {
-			exec, err = executor.NewDockerExecutor(types.DockerConfig{
+			execBuilder = executor.NewDockerExecutorBuilder(types.DockerConfig{
 				Image: dockerImage,
 			}, nil)
-			if err != nil {
-				return fmt.Errorf("failed to create Docker executor: %w", err)
-			}
 		} else {
-			exec = executor.NewLocalExecutor(types.LocalConfig{
+			execBuilder = executor.NewLocalExecutorBuilder(types.LocalConfig{
 				AllowUnregisteredCommands: true,
 			}, nil)
 		}
@@ -50,12 +46,19 @@ var serverCmd = &cobra.Command{
 				return fmt.Errorf("failed to create auditor: %w", err)
 			}
 
-			// 创建审计执行器
-			exec = executor.NewAuditedExecutor(exec, auditor)
+			// 创建审计执行器构建器
+			origBuilder := execBuilder
+			execBuilder = types.ExecutorBuilderFunc(func() (types.Executor, error) {
+				exec, err := origBuilder.Build()
+				if err != nil {
+					return nil, err
+				}
+				return executor.NewAuditedExecutor(exec, auditor), nil
+			})
 		}
 
 		// 创建服务器
-		srv := server.NewServer(exec, serverAddr)
+		srv := server.NewServer(execBuilder, serverAddr)
 
 		// 启动服务器
 		if err := srv.Start(); err != nil {

cmd/runshell/cmd/server.go

@@ -24,7 +24,6 @@ import (
 	"context"
 	"fmt"
 	"log"
-	"os"
 
 	"github.com/iamlongalong/runshell/pkg/executor"
 	"github.com/iamlongalong/runshell/pkg/types"
@@ -47,26 +46,24 @@ import (
 //
 //	runPipeline(pipeExec, "ls -la | grep go", nil)
 //	runPipeline(pipeExec, "cat file.txt | grep pattern | wc -l", env)
-func runPipeline(pipeExec *executor.PipelineExecutor, cmdStr string, env map[string]string) error {
+func runPipeline(ctx context.Context, pipeExec *executor.PipelineExecutor, cmdStr string, env map[string]string) error {
 	fmt.Printf("\nExecuting: %s\n", cmdStr)
 
-	pipeline, err := pipeExec.ParsePipeline(cmdStr)
-	if err != nil {
-		return fmt.Errorf("failed to parse pipeline: %v", err)
-	}
-
-	pipeline.Context = context.Background()
-	pipeline.Options = &types.ExecuteOptions{
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-		Env:    env,
-	}
-
-	result, err := pipeExec.ExecutePipeline(pipeline)
+	result, err := pipeExec.Execute(&types.ExecuteContext{
+		Context: ctx,
+		Command: types.Command{
+			Command: cmdStr,
+		},
+		Options: &types.ExecuteOptions{
+			Env: env,
+		},
+	})
 	if err != nil {
 		return fmt.Errorf("failed to execute pipeline: %v", err)
 	}
 
+	fmt.Printf("Pipeline Output:\n%s\n", result.Output)
+
 	fmt.Printf("Pipeline exit code: %d\n", result.ExitCode)
 	return nil
 }
@@ -77,47 +74,44 @@ func main() {
 		AllowUnregisteredCommands: true,
 	}, &types.ExecuteOptions{})
 
+	ctx := context.Background()
+
 	// 创建管道执行器
 	pipeExec := executor.NewPipelineExecutor(localExec)
 
 	// 示例 1: 简单的管道命令
-	// 列出当前目录内容并过滤包含 "go" 的行
 	fmt.Println("\n=== Example 1: Simple Pipeline ===")
-	err := runPipeline(pipeExec, "ls -la | grep go", nil)
+	err := runPipeline(ctx, pipeExec, "ls -la | grep go", nil)
 	if err != nil {
 		log.Printf("Example 1 failed: %v\n", err)
 	}
 
 	// 示例 2: 多重管道命令
-	// 统计当前目录中包含 "go" 的文件数量
 	fmt.Println("\n=== Example 2: Multiple Pipes ===")
-	err = runPipeline(pipeExec, "ls -la | grep go | wc -l", nil)
+	err = runPipeline(ctx, pipeExec, "ls -la | grep go | wc -l", nil)
 	if err != nil {
 		log.Printf("Example 2 failed: %v\n", err)
 	}
 
 	// 示例 3: 带环境变量的管道命令
-	// 显示系统路径信息，并添加自定义路径
-	fmt.Println("\n=== Example 3: Pipeline with Environment Variables ===")
-	err = runPipeline(pipeExec, "env | grep PATH", map[string]string{
-		"CUSTOM_PATH": "/custom/path",
+	fmt.Println("\n=== Example 3: Environment Variables ===")
+	err = runPipeline(ctx, pipeExec, "pwd | tr '[:lower:]' '[:upper:]'", map[string]string{
+		"PWD": "/custom/path",
 	})
 	if err != nil {
 		log.Printf("Example 3 failed: %v\n", err)
 	}
 
-	// 示例 4: 复杂的管道命令
-	// 查找并排序 Go 相关进程，显示前三个
-	fmt.Println("\n=== Example 4: Complex Pipeline ===")
-	err = runPipeline(pipeExec, "ps aux | grep go | sort -k2 | head -n 3", nil)
+	// 示例 4: 文本处理
+	fmt.Println("\n=== Example 4: Text Processing ===")
+	err = runPipeline(ctx, pipeExec, "echo hello world | tr '[:lower:]' '[:upper:]'", nil)
 	if err != nil {
 		log.Printf("Example 4 failed: %v\n", err)
 	}
 
-	// 示例 5: 文件处理管道命令
-	// 分析 go.mod 文件中的依赖项
-	fmt.Println("\n=== Example 5: File Processing Pipeline ===")
-	err = runPipeline(pipeExec, "cat ../go.mod | grep require | sort | uniq -c", nil)
+	// 示例 5: 多命令管道
+	fmt.Println("\n=== Example 5: Multiple Commands ===")
+	err = runPipeline(ctx, pipeExec, `echo 'hi\nhello\nworld' | grep o`, nil)
 	if err != nil {
 		log.Printf("Example 5 failed: %v\n", err)
 	}