refactor: split worker logs from other stdout logs

Author: YangZxi

internal/model/worker_log.go

@@ -12,6 +12,7 @@ type WorkerLog struct {
 	Stdin      string    `json:"stdin" gorm:"column:stdin;type:text"`
 	Stdout     string    `json:"stdout" gorm:"column:stdout;type:text"`
 	Stderr     string    `json:"stderr" gorm:"column:stderr;type:text"`
+	ExecLog    string    `json:"exec_log" gorm:"column:exec_log;type:text"`
 	Result     string    `json:"result" gorm:"column:result;type:text"`
 	Error      string    `json:"error" gorm:"column:error;type:text"`
 	DurationMS int64     `json:"duration_ms" gorm:"column:duration_ms"`

internal/worker/executor/executor.go

@@ -25,6 +25,7 @@ import (
 var workerEntrypointsFS embed.FS
 
 const logAndOutputSeparator = "\n**=====^=====**\n"
+const workerLogSeparatorLine = "==============="
 const (
 	defaultPythonCgroupMemMaxBytes = 64 * 1024 * 1024
 	defaultNodeCgroupMemMaxBytes   = 64 * 1024 * 1024
@@ -45,6 +46,7 @@ type ExecuteResult struct {
 	Body       any
 	Stdout     string
 	Stderr     string
+	ExecLog    string
 	Result     string
 	DurationMS int64
 	TimedOut   bool
@@ -87,6 +89,7 @@ func Run(parent context.Context, workerSpec worker.WorkerSpec, cfg config.Config
 		ServerPort:     cfg.MagicServerPort,
 		Payload:        payload,
 	})
+	result.ExecLog = bridgeStdout
 	result.Stderr = bridgeStderr
 
 	if errors.Is(parent.Err(), context.DeadlineExceeded) {
@@ -97,18 +100,19 @@ func Run(parent context.Context, workerSpec worker.WorkerSpec, cfg config.Config
 	}
 	if runErr != nil {
 		// slog.Error("脚本执行失败", "worker_id", worker.ID, "request_id", input.Event.RequestID, "stderr", bridgeStderr, "err", runErr)
-		result.Stdout = bridgeStdout
+		result.Stdout = extractWorkerStdout(result.ExecLog)
 		result.Err = buildScriptExecuteError(bridgeStderr, runErr)
 		return
 	}
 
 	logOutput, resultOutput, err := splitBridgeOutput(bridgeStdout)
 	if err != nil {
-		result.Stdout = bridgeStdout
+		result.Stdout = extractWorkerStdout(result.ExecLog)
 		result.Err = fmt.Errorf("脚本 stdout 格式错误: %w", err)
 		return
 	}
-	result.Stdout = logOutput
+	_ = logOutput
+	result.Stdout = extractWorkerStdout(result.ExecLog)
 	result.Result = resultOutput
 
 	scriptOut, err := parseScriptOutput([]byte(resultOutput))
@@ -654,6 +658,37 @@ func splitBridgeOutput(stdout string) (logOutput string, resultOutput string, er
 	return logOutput, resultOutput, nil
 }
 
+func extractWorkerStdout(execLog string) string {
+	if strings.TrimSpace(execLog) == "" {
+		return ""
+	}
+
+	logSource := execLog
+	if logOutput, _, err := splitBridgeOutput(execLog); err == nil {
+		logSource = logOutput
+	}
+
+	lines := strings.Split(logSource, "\n")
+	startIdx := -1
+	endIdx := -1
+	for index, line := range lines {
+		if strings.TrimSpace(line) != workerLogSeparatorLine {
+			continue
+		}
+		if startIdx < 0 {
+			startIdx = index
+			continue
+		}
+		endIdx = index
+	}
+
+	if startIdx >= 0 && endIdx > startIdx {
+		return strings.Trim(strings.Join(lines[startIdx+1:endIdx], "\n"), "\n")
+	}
+
+	return strings.TrimSpace(logSource)
+}
+
 // 用于在 Python 虚拟环境目录下定位真实的 site-packages 路径，供构建 PYTHONPATH 使用。
 func detectPythonSitePackages(pythonEnvDir string) string {
 	libDir := filepath.Join(pythonEnvDir, "lib")

internal/worker/executor/invoke.go

@@ -134,6 +134,7 @@ func (s *Service) buildWorkerLog(workerID string, requestID string, input model.
 		Stdin:      stdinText,
 		Stdout:     execResult.Stdout,
 		Stderr:     execResult.Stderr,
+		ExecLog:    execResult.ExecLog,
 		Result:     execResult.Result,
 		Error:      errMsg,
 		DurationMS: execResult.DurationMS,

internal/worker/executor/stdout_extract_test.go

@@ -0,0 +1,52 @@
+package executor
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestExtractWorkerStdoutReturnsWorkerLogBlock(t *testing.T) {
+	raw := strings.Join([]string{
+		"[I] nsjail start",
+		"===============",
+		"worker line 1",
+		"worker line 2",
+		"**=====^=====**",
+		`{"status":200,"body":"ok"}`,
+		"**=====^=====**",
+		"===============",
+		"[I] nsjail end",
+	}, "\n")
+
+	logOutput := extractWorkerStdout(raw)
+	want := "worker line 1\nworker line 2"
+	if logOutput != want {
+		t.Fatalf("worker stdout 提取不正确，got=%q want=%q", logOutput, want)
+	}
+}
+
+func TestExtractWorkerStdoutReturnsEmptyWhenWorkerLogBlockIsEmpty(t *testing.T) {
+	raw := strings.Join([]string{
+		"[I] nsjail start",
+		"===============",
+		"**=====^=====**",
+		`{"status":200,"body":"ok"}`,
+		"**=====^=====**",
+		"===============",
+		"[I] nsjail end",
+	}, "\n")
+
+	logOutput := extractWorkerStdout(raw)
+	if logOutput != "" {
+		t.Fatalf("worker stdout 应为空，got=%q", logOutput)
+	}
+}
+
+func TestExtractWorkerStdoutFallsBackToTrimmedRawWhenLogBlockMissing(t *testing.T) {
+	raw := "[I] nsjail only"
+
+	logOutput := extractWorkerStdout(raw)
+	if logOutput != raw {
+		t.Fatalf("缺少分隔块时应回退原始内容，got=%q want=%q", logOutput, raw)
+	}
+}

pages/src/components/worker-log-list.tsx

@@ -12,13 +12,14 @@ export type WorkerLogItem = {
   stdin: string;
   stdout: string;
   stderr: string;
+  exec_log: string;
   result: string;
   error: string;
   duration_ms: number;
   created_at: string;
 };
 
-type LogTabKey = "result" | "error" | "stdin" | "stdout" | "stderr";
+type LogTabKey = "result" | "error" | "stdin" | "stdout" | "stderr" | "exec_log";
 
 type WorkerLogListProps = {
   loading: boolean;
@@ -32,12 +33,13 @@ type WorkerLogListProps = {
 type LogTabConfig = {
   key: LogTabKey;
   label: string;
+  fixed?: boolean;
   content: string;
   toneClassName: string;
   labelClassName: string;
 };
 
-const logTabOrder: LogTabKey[] = ["result", "error", "stdin", "stdout", "stderr"];
+const logTabOrder: LogTabKey[] = ["result", "error", "stdin", "stdout", "stderr", "exec_log"];
 
 function formatLogTime(raw: string): string {
   const dt = new Date(raw);
@@ -75,6 +77,7 @@ function buildLogTabs(item: WorkerLogItem): LogTabConfig[] {
     result: {
       key: "result",
       label: "result",
+      fixed: true,
       content: formattedResult,
       toneClassName: "bg-accent/20 text-accent-600",
       labelClassName: "text-accent",
@@ -89,13 +92,15 @@ function buildLogTabs(item: WorkerLogItem): LogTabConfig[] {
     stdin: {
       key: "stdin",
       label: "stdin",
+      fixed: true,
       content: formattedStdin,
       toneClassName: "bg-success/20 text-success-700",
       labelClassName: "text-success",
     },
     stdout: {
       key: "stdout",
       label: "stdout",
+      fixed: true,
       content: item.stdout,
       toneClassName: "bg-default/40 text-default-700",
       labelClassName: "text-default-800",
@@ -107,11 +112,19 @@ function buildLogTabs(item: WorkerLogItem): LogTabConfig[] {
       toneClassName: "bg-warning/20 text-warning-700",
       labelClassName: "text-warning",
     },
+    exec_log: {
+      key: "exec_log",
+      label: "exec_log",
+      fixed: true,
+      content: item.exec_log,
+      toneClassName: "bg-default/40 text-default-700",
+      labelClassName: "text-default-800",
+    },
   };
 
   return logTabOrder
     .map((key) => tabMap[key])
-    .filter((tab) => tab.content);
+    .filter((tab) => tab.fixed === true || tab.content);
 }
 
 function getDefaultTabKey(tabs: LogTabConfig[]): LogTabKey | null {