fix: 清理任务状态并捕获 nexttrace 启动异常

  - app.py:38 调整超时守护线程，只触发 stop_nexttrace_for_sid，并让清理逻辑集中在后续步骤，避免重复删除带
  来的竞态。
  - app.py:47 新增 cleanup_client_state 并在 emit_complete 调用，统一移除 clients 与 client_last_active，
  保证无论自然结束还是被强制停止都能彻底清理。
  - app.py:140 引入 emit_error_row，在参数非法或进程启动失败时向前端发送可解析的错误行，同时立即
  emit_complete，防止任务悬挂。
  - app.py:158 将 subprocess.Popen 包装在 try/except 中，捕获 OSError 后记录日志并清理，避免 nexttrace 缺
  失时的僵尸任务。

Author: tsosunchia

Dockerfile

@@ -3,12 +3,23 @@ FROM golang:1.25-alpine3.21 AS builder
 # 安装所需的软件包
 RUN apk update && apk add --no-cache git
 
-# 克隆NEXTTRACE源代码并编译
+# 克隆NEXTTRACE源代码并编译（内联计算版本信息并注入到 -ldflags）
 WORKDIR /build
-RUN git clone https://github.com/nxtrace/Ntrace-core.git . && \
-    go clean -modcache && \
-    go mod download && \
-    go build -trimpath -ldflags '-w -s -checklinkname=0' -o nexttrace .
+RUN set -eux; \
+    git clone https://github.com/nxtrace/Ntrace-core.git . ; \
+    go clean -modcache; \
+    go mod download; \
+    BUILD_VERSION="$(git describe --tags --always 2>/dev/null || true)"; \
+    [ -n "$BUILD_VERSION" ] || BUILD_VERSION=dev; \
+    BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"; \
+    COMMIT_SHA1="$(git rev-parse --short HEAD 2>/dev/null || true)"; \
+    [ -n "$COMMIT_SHA1" ] || COMMIT_SHA1=unknown; \
+    LD_PKG="$(go list -m)/config"; \
+    LD_BASE="-X ${LD_PKG}.Version=${BUILD_VERSION} \
+             -X ${LD_PKG}.BuildDate=${BUILD_DATE} \
+             -X ${LD_PKG}.CommitID=${COMMIT_SHA1} \
+             -w -s -checklinkname=0"; \
+    go build -trimpath -ldflags "${LD_BASE}" -o nexttrace .
 
 FROM ubuntu:22.04
 

app.py

@@ -41,10 +41,17 @@ def check_timeouts():
             if time.time() - last_active > time_limit:
                 logging.debug(f"Client {sid} timed out")
                 stop_nexttrace_for_sid(sid)
-                del client_last_active[sid]
         time.sleep(1)
 
 
+def cleanup_client_state(sid):
+    task_removed = clients.pop(sid, None)
+    if task_removed:
+        logging.info(f"Client {sid} removed from clients dictionary")
+    if client_last_active.pop(sid, None) is not None:
+        logging.debug(f"Client {sid} removed from last active tracker")
+
+
 def stop_nexttrace_for_sid(sid):
     task = clients.get(sid)
     if not task:
@@ -64,10 +71,6 @@ def stop_nexttrace_for_sid(sid):
             task.process.kill()
             logging.info(f"Process killed forcefully for client {sid}")
     task.emit_complete()
-    if sid in clients:
-        del clients[sid]
-        logging.info(f"Client {sid} removed from clients dictionary after process termination")
-    client_last_active.pop(sid, None)
 
 
 Thread(target=check_timeouts, daemon=True).start()
@@ -132,6 +135,11 @@ def emit_complete(self):
             if not self._complete_emitted:
                 self._complete_emitted = True
                 self.socketio.emit('nexttrace_complete', room=self.sid)
+                cleanup_client_state(self.sid)
+
+    def emit_error_row(self, message):
+        error_payload = json.dumps(['-1', '', '', '0', 'ERROR', '', message], ensure_ascii=False)
+        self.socketio.emit('nexttrace_output', error_payload, room=self.sid)
 
     def run(self):
         fixParam = '--map --raw -q 1 --send-time 1'  # -d disable-geoip
@@ -143,14 +151,20 @@ def run(self):
 
         pattern = re.compile(r'[&;<>\"\'()|\[\]{}$#!%*+=]')
         if pattern.search(self.params):
-            self.socketio.emit('nexttrace_output', 'Invalid params', room=self.sid)
+            self.emit_error_row('参数不合法，任务未启动')
             self.emit_complete()
-            raise ValueError('Invalid params')
+            return
         logging.debug(f"cmd: {[self.nexttrace_path] + self.params.split() + fixParam.split()}")
-        self.process = subprocess.Popen(
-            [self.nexttrace_path] + self.params.split() + fixParam.split(),
-            stdout=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True, env=process_env, bufsize=1
-        )
+        try:
+            self.process = subprocess.Popen(
+                [self.nexttrace_path] + self.params.split() + fixParam.split(),
+                stdout=subprocess.PIPE, stdin=subprocess.PIPE, universal_newlines=True, env=process_env, bufsize=1
+            )
+        except OSError as exc:
+            logging.error(f"Failed to start nexttrace for client {self.sid}: {exc}")
+            self.emit_error_row('启动 nexttrace 失败，请检查服务器配置')
+            self.emit_complete()
+            return
         output_monitor = OutputMonitor(self.process, self.socketio, self.sid, options)
         output_monitor_flag = True