zen-gitsync 2.14.1 → 2.14.3

package/src/ui/server/middleware/errorHandler.js

@@ -0,0 +1,84 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Express 全局错误处理中间件。
+//
+// 触发条件（按发生频率排序）：
+//   1) 路由用 asyncRoute 包装后 throw 出来的、未被捕获的异常
+//      —— asyncRoute 自己已经 res.json 返回了，不会到这里
+//   2) 路由没用 asyncRoute（仍写 try/catch），但忘了 res 的场景
+//   3) handler 内部 next(err) 主动透传
+//   4) express.json() / 静态资源 fallback / socket.io 之外的中间件抛错
+//   5) headersSent 之后 next(err) 走 express 默认兜底（关闭连接）
+//
+// 设计要点：
+//   - 必须是 4-arity (err, req, res, next) 才会被 express 识别为错误中间件
+//   - 必须注册在所有 register*Routes 之后、express.static 之后（兜底最后）
+//   - 兼容 HttpError（来自 asyncRoute.js）的 statusCode 字段
+//   - 兼容 express.json() 抛的 SyntaxError（400 Bad Request）
+//   - headersSent 时只能 next(error) 让 express 关连接，不能再 res.write
+//
+// 用法：
+//   app.use(createErrorHandler())
+
+import logger from '../utils/logger.js'
+import { HttpError } from '../utils/asyncRoute.js'
+
+/**
+ * 全局错误处理中间件工厂。
+ * @returns {import('express').ErrorRequestHandler}
+ */
+export function createErrorHandler() {
+  return (err, req, res, next) => {
+    // 已经回包了就只能让 express 关连接，再 res.status 会抛 ERR_HTTP_HEADERS_SENT
+    if (res.headersSent) {
+      return next(err)
+    }
+
+    // 状态码优先级：HttpError.statusCode > err.status（express 惯例）> err.statusCode > 500
+    let statusCode = 500
+    if (err instanceof HttpError && Number.isInteger(err.statusCode)) {
+      statusCode = err.statusCode
+    } else if (err?.status && Number.isInteger(err.status)) {
+      statusCode = err.status
+    } else if (err?.statusCode && Number.isInteger(err.statusCode)) {
+      statusCode = err.statusCode
+    }
+
+    // express.json() 解析失败抛 SyntaxError → 400，不要让用户看到 500
+    if (err instanceof SyntaxError && err.status === 400 && 'body' in err) {
+      statusCode = 400
+    }
+
+    // 4xx 一般是用户输入问题，info 级即可；5xx 是真异常，error 级
+    const logLevel = statusCode >= 500 ? 'error' : 'info'
+    // 与 asyncRoute 一致：err 无 message（throw null/数字/字符串无 .message）时走兜底文案，
+    // 避免 String(null) = 'null' 这种无意义错误信息泄露到响应里
+    const rawMsg = typeof err?.message === 'string' && err.message.length > 0 ? err.message : ''
+    const redactedMsg = rawMsg || 'Internal Server Error'
+    const logLine = `[${req.method} ${req.path}] ${statusCode} ${redactedMsg}`
+    if (logLevel === 'error') {
+      logger.error(logLine)
+      if (err?.stack) logger.error(err.stack)
+    } else {
+      logger.info(logLine)
+    }
+
+    // 错误响应体格式与 asyncRoute 保持一致
+    res.status(statusCode).json({
+      success: false,
+      error: redactedMsg || 'Internal Server Error'
+    })
+  }
+}

package/src/ui/server/middleware/errorHandler.test.js

@@ -0,0 +1,114 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// src/ui/server/middleware/errorHandler.js 单元测试。
+//
+// 核心契约:
+//   - HttpError → 用其 statusCode
+//   - 普通 Error → 500
+//   - SyntaxError (express.json 解析失败) → 400
+//   - res.headersSent → 不再 res.status,转 next(err)
+//   - err.status / err.statusCode 也被识别
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { createErrorHandler } from './errorHandler.js'
+import { HttpError } from '../utils/asyncRoute.js'
+
+function makeMockRes(headersSent = false) {
+  return {
+    statusCode: 200,
+    headersSent,
+    _json: null,
+    status(code) { this.statusCode = code; return this },
+    json(p) { this._json = p; this.headersSent = true; return this }
+  }
+}
+
+function makeMockReq(method = 'GET', path = '/api/foo') {
+  return { method, path }
+}
+
+test('errorHandler: HttpError(404) → 404 + message', () => {
+  const handler = createErrorHandler()
+  const err = new HttpError(404, '资源不存在')
+  const req = makeMockReq()
+  const res = makeMockRes()
+  handler(err, req, res, () => {})
+  assert.equal(res.statusCode, 404)
+  assert.deepEqual(res._json, { success: false, error: '资源不存在' })
+})
+
+test('errorHandler: 普通 Error → 500', () => {
+  const handler = createErrorHandler()
+  const err = new Error('内部炸了')
+  const req = makeMockReq()
+  const res = makeMockRes()
+  handler(err, req, res, () => {})
+  assert.equal(res.statusCode, 500)
+  assert.equal(res._json.success, false)
+  assert.equal(res._json.error, '内部炸了')
+})
+
+test('errorHandler: err.status 优先级仅次于 HttpError', () => {
+  // express 惯例:某些中间件(如 express-jwt)会给 err 设 status 而非 statusCode
+  const handler = createErrorHandler()
+  const err = Object.assign(new Error('未授权'), { status: 401 })
+  const req = makeMockReq()
+  const res = makeMockRes()
+  handler(err, req, res, () => {})
+  assert.equal(res.statusCode, 401)
+  assert.equal(res._json.error, '未授权')
+})
+
+test('errorHandler: SyntaxError 带 status=400 → 400 (express.json 解析失败)', () => {
+  const handler = createErrorHandler()
+  const err = Object.assign(new SyntaxError('Unexpected token'), { status: 400, body: '{bad}' })
+  const req = makeMockReq()
+  const res = makeMockRes()
+  handler(err, req, res, () => {})
+  assert.equal(res.statusCode, 400, 'JSON 解析错误不应是 500')
+})
+
+test('errorHandler: res.headersSent=true → 不覆盖,转 next(err)', () => {
+  const handler = createErrorHandler()
+  const err = new Error('已发响应后抛错')
+  const req = makeMockReq()
+  const res = makeMockRes(true)  // 模拟已发响应
+  let nextCalled = null
+  handler(err, req, res, (e) => { nextCalled = e })
+  assert.equal(res._json, null, '不应再调 res.json')
+  assert.ok(nextCalled, '应调用 next(err) 让 express 关连接')
+  assert.equal(nextCalled, err)
+})
+
+test('errorHandler: err 无 message (throw null) → 500 + 兜底文案', () => {
+  const handler = createErrorHandler()
+  const req = makeMockReq()
+  const res = makeMockRes()
+  handler(null, req, res, () => {})
+  assert.equal(res.statusCode, 500)
+  assert.equal(res._json.error, 'Internal Server Error')
+})
+
+test('errorHandler: 兼容 asyncRoute 的错误响应格式', () => {
+  // errorHandler 与 asyncRoute 共享 {success:false, error} 格式,
+  // 前端不需要区分错误来自哪个路径
+  const handler = createErrorHandler()
+  const err = new HttpError(422, '校验失败')
+  const req = makeMockReq()
+  const res = makeMockRes()
+  handler(err, req, res, () => {})
+  assert.deepEqual(Object.keys(res._json).sort(), ['error', 'success'])
+  assert.equal(res._json.success, false)
+})

package/src/ui/server/routes/exec.js

@@ -117,27 +117,6 @@ export function registerExecRoutes({
   nextProcessId,
   runningProcesses
 }) {
-  // 通用命令执行接口（非流式）— 走 argv 模式,无 shell
-  app.post('/api/exec', asyncRoute(async (req, res) => {
-    try {
-      const { command } = req.body || {};
-      if (!command || typeof command !== 'string' || !command.trim()) {
-        return res.status(400).json({ success: false, error: 'command 不能为空' });
-      }
-
-      try {
-        // execGitCommand 本身已经走 execFile argv 模式(见 utils/index.js)
-        // 这里保持调用形态兼容
-        const { stdout = '', stderr = '' } = await execGitCommand(splitCommandArgs(command), { log: false });
-        return res.json({ success: true, stdout, stderr });
-      } catch (err) {
-        return res.status(400).json({ success: false, error: err?.message || String(err) });
-      }
-    } catch (error) {
-      res.status(500).json({ success: false, error: error.message });
-    }
-  }));
-
   // 流式执行命令接口(支持实时输出)— argv 模式 + cwd 校验
   app.post('/api/exec-stream', asyncRoute(async (req, res) => {
     try {

package/src/ui/server/routes/gitOps.js

@@ -206,6 +206,68 @@ export function registerGitOpsRoutes({
     }
   });
 
+  // 推送并设置上游分支（git push -u origin <branch>）
+  app.post('/api/git/push-with-upstream', async (req, res) => {
+    try {
+      const { branch } = req.body || {};
+      if (!branch || typeof branch !== 'string') {
+        return res.status(400).json({ success: false, error: '缺少 branch 参数' });
+      }
+      const { stdout } = await execGitCommand(['push', '-u', 'origin', branch]);
+      setRecentPushStatus({
+        justPushed: true,
+        pushTime: Date.now(),
+        validDuration: 10000
+      });
+      logger.info(`推送并设置上游成功: origin/${branch}`);
+      res.json({ success: true, message: stdout });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+
+  // 读取单个 git 全局配置
+  // GET /api/git/global-config?key=<name>
+  // key 不存在时返回空串（与 git --get 行为一致；前端 getGlobalConfig 容错为空）
+  app.get('/api/git/global-config', async (req, res) => {
+    try {
+      const key = typeof req.query.key === 'string' ? req.query.key.trim() : '';
+      if (!key) {
+        return res.status(400).json({ success: false, error: '缺少 key 参数' });
+      }
+      try {
+        const { stdout } = await execGitCommand(['config', '--global', '--get', key], { log: false });
+        return res.json({ success: true, value: String(stdout || '').trim() });
+      } catch (err) {
+        // git --get 在 key 不存在时返回非零退出码 → 视为"未设置",返回空串
+        return res.json({ success: true, value: '' });
+      }
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+
+  // 写入单个 git 全局配置
+  // POST /api/git/global-config  body: { key, value }
+  // value 为空字符串时执行 --unset，与 git 语义一致（允许前端"清空某项"）
+  app.post('/api/git/global-config', async (req, res) => {
+    try {
+      const { key, value } = req.body || {};
+      if (!key || typeof key !== 'string') {
+        return res.status(400).json({ success: false, error: '缺少 key 参数' });
+      }
+      const trimmed = typeof value === 'string' ? value.trim() : '';
+      if (!trimmed) {
+        await execGitCommand(['config', '--global', '--unset', key]);
+      } else {
+        await execGitCommand(['config', '--global', key, trimmed]);
+      }
+      res.json({ success: true });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+
   // 带进度的推送更改 (SSE)
   app.post('/api/push-with-progress', async (req, res) => {
     // 设置SSE响应头
@@ -664,8 +726,10 @@ export function registerGitOpsRoutes({
         });
       }
 
-      // 尝试清理 Git 锁文件
-      await checkAndClearGitLock();
+      // 尝试清理 Git 锁文件(破坏性入口:force=true 绕过 mtime 判断,
+      // 仍走 PID liveness 校验——用户主动触发的 reset --hard 不该被
+      // 一个刚崩出来的新孤儿锁挡住)
+      await checkAndClearGitLock({ force: true });
 
       // 执行 git reset --hard origin/branch 命令
       await execGitCommand(['reset', '--hard', `origin/${branch}`]);
@@ -682,8 +746,10 @@ export function registerGitOpsRoutes({
   // 清除本地所有更改，包括未跟踪文件 (git reset --hard && git clean -fd)
   app.post('/api/discard-all-changes', async (req, res) => {
     try {
-      // 尝试清理 Git 锁文件
-      await checkAndClearGitLock();
+      // 尝试清理 Git 锁文件(破坏性入口:force=true 绕过 mtime 判断,
+      // 仍走 PID liveness 校验——用户主动触发的 discard-all 不该被
+      // 一个刚崩出来的新孤儿锁挡住)
+      await checkAndClearGitLock({ force: true });
 
       // 1. 执行 git reset --hard 丢弃已跟踪文件的更改
       await execGitCommand(['reset', '--hard']);

package/src/ui/server/routes/monitor.js

@@ -71,21 +71,26 @@ async function listPorts({ all = false } = {}) {
 }
 
 async function listPortsWindows({ all = false } = {}) {
-  const tcpLines = []
-  const udpLines = []
-  // netstat 一次只能指定一个 proto，分两次调用
-  try {
-    const { stdout } = await execFileP('netstat', ['-ano', '-p', 'TCP'])
-    tcpLines.push(...stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean))
-  } catch (e) {
-    logger.warn(`[monitor] netstat TCP 失败: ${e?.message || e}`)
-  }
-  try {
-    const { stdout } = await execFileP('netstat', ['-ano', '-p', 'UDP'])
-    udpLines.push(...stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean))
-  } catch (e) {
-    logger.warn(`[monitor] netstat UDP 失败: ${e?.message || e}`)
-  }
+  // 三个子进程并行执行（原实现串行 await，netstat TCP + netstat UDP + tasklist
+  // 串行耗时 = 三者之和；并行后 = max(三者)），Windows 上 netstat 对大量
+  // ESTABLISHED 连接很慢，并行能把 8-19s 压到 3-8s。
+  const [tcpRes, udpRes, tasklistRes] = await Promise.all([
+    execFileP('netstat', ['-ano', '-p', 'TCP']).catch((e) => {
+      logger.warn(`[monitor] netstat TCP 失败: ${e?.message || e}`)
+      return { stdout: '' }
+    }),
+    execFileP('netstat', ['-ano', '-p', 'UDP']).catch((e) => {
+      logger.warn(`[monitor] netstat UDP 失败: ${e?.message || e}`)
+      return { stdout: '' }
+    }),
+    execFileP('tasklist', ['/FO', 'CSV', '/NH']).catch((e) => {
+      logger.warn(`[monitor] tasklist 失败: ${e?.message || e}`)
+      return { stdout: '' }
+    })
+  ])
+
+  const tcpLines = tcpRes.stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean)
+  const udpLines = udpRes.stdout.split(/\r?\n/).map((s) => s.trim()).filter(Boolean)
 
   const pids = new Set()
   const ports = []
@@ -133,19 +138,14 @@ async function listPortsWindows({ all = false } = {}) {
   for (const l of tcpLines) parseLine(l, 'TCP')
   for (const l of udpLines) parseLine(l, 'UDP')
 
-  // 批量拿 PID -> 进程名映射，避免对每个 PID 单独 tasklist
+  // tasklist 已在上面并行拿到，这里直接解析 PID -> 进程名映射
   const pidToName = new Map()
   if (pids.size > 0) {
-    try {
-      const { stdout } = await execFileP('tasklist', ['/FO', 'CSV', '/NH'])
-      // 输出形如: "node.exe","1234","Console","1","123,456 K"
-      for (const line of stdout.split(/\r?\n/)) {
-        if (!line.trim()) continue
-        const m = line.match(/^"([^"]+)","(\d+)"/)
-        if (m) pidToName.set(m[2], m[1])
-      }
-    } catch (e) {
-      logger.warn(`[monitor] tasklist 失败: ${e?.message || e}`)
+    // 输出形如: "node.exe","1234","Console","1","123,456 K"
+    for (const line of tasklistRes.stdout.split(/\r?\n/)) {
+      if (!line.trim()) continue
+      const m = line.match(/^"([^"]+)","(\d+)"/)
+      if (m) pidToName.set(m[2], m[1])
     }
   }
 
@@ -278,6 +278,13 @@ async function killProcess(pid, { force = false } = {}) {
 }
 
 // ── 路由注册 ────────────────────────────────────────────────────────────
+// ports 列表缓存：netstat + tasklist 在 Windows 上对大量连接很慢（3-8s），
+// 前端每 10-15s 轮询一次，5s 缓存能把第二次以后的响应压到 <10ms。
+// 仅缓存默认场景（all=false，只看监听端口）；all=true 实时查不缓存。
+let _portsCache = null
+let _portsCacheTime = 0
+const PORTS_CACHE_TTL_MS = 5000
+
 export function registerMonitorRoutes({ app }) {
   // 系统概览：CPU + 内存 + 系统信息
   app.get(
@@ -315,7 +322,16 @@ export function registerMonitorRoutes({ app }) {
     '/api/monitor/ports',
     asyncRoute(async (req, res) => {
       const all = req.query.all === '1' || req.query.all === 'true'
+      // 默认场景命中缓存直接返回（all=true 实时查，不缓存）
+      const now = Date.now()
+      if (!all && _portsCache && (now - _portsCacheTime) < PORTS_CACHE_TTL_MS) {
+        return res.json({ success: true, data: _portsCache, cached: true })
+      }
       const ports = await listPorts({ all })
+      if (!all) {
+        _portsCache = ports
+        _portsCacheTime = now
+      }
       res.json({ success: true, data: ports })
     })
   )