zen-gitsync 2.11.39 → 2.12.3

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

@@ -1,37 +1,51 @@
-export function createRequestLogger({ chalk }) {
-  return (req, res, next) => {
-    const startTime = Date.now();
-    const requestTime = new Date().toLocaleString('zh-CN', { hour12: false });
-
-    res.on('finish', () => {
-      const duration = Date.now() - startTime;
-      const statusCode = res.statusCode;
-
-      let statusColor = chalk.green;
-      if (statusCode >= 400 && statusCode < 500) {
-        statusColor = chalk.yellow;
-      } else if (statusCode >= 500) {
-        statusColor = chalk.red;
-      }
-
-      let durationColor = chalk.gray;
-      if (duration > 1000) {
-        durationColor = chalk.red;
-      } else if (duration > 500) {
-        durationColor = chalk.yellow;
-      } else if (duration > 200) {
-        durationColor = chalk.cyan;
-      }
-
-      console.log(
-        chalk.dim(`[${requestTime}]`),
-        chalk.bold(req.method),
-        req.url,
-        statusColor(`[${statusCode}]`),
-        durationColor(`${duration}ms`)
-      );
-    });
-
-    next();
-  };
-}
+// 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.
+//
+export function createRequestLogger({ chalk }) {
+  return (req, res, next) => {
+    const startTime = Date.now();
+    const requestTime = new Date().toLocaleString('zh-CN', { hour12: false });
+
+    res.on('finish', () => {
+      const duration = Date.now() - startTime;
+      const statusCode = res.statusCode;
+
+      let statusColor = chalk.green;
+      if (statusCode >= 400 && statusCode < 500) {
+        statusColor = chalk.yellow;
+      } else if (statusCode >= 500) {
+        statusColor = chalk.red;
+      }
+
+      let durationColor = chalk.gray;
+      if (duration > 1000) {
+        durationColor = chalk.red;
+      } else if (duration > 500) {
+        durationColor = chalk.yellow;
+      } else if (duration > 200) {
+        durationColor = chalk.cyan;
+      }
+
+      console.log(
+        chalk.dim(`[${requestTime}]`),
+        chalk.bold(req.method),
+        req.url,
+        statusColor(`[${statusCode}]`),
+        durationColor(`${duration}ms`)
+      );
+    });
+
+    next();
+  };
+}

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

@@ -1,87 +1,101 @@
-export function registerBranchStatusRoutes({
-  app,
-  execGitCommand,
-  getIsGitRepo,
-  getBranchStatusCache,
-  setBranchStatusCache,
-  getRecentPushStatus,
-  setRecentPushStatus
-}) {
-  // 获取当前分支 - 直接读取，不缓存（git symbolic-ref 极快，<5ms）
-  app.get('/api/branch', async (req, res) => {
-    try {
-      const { stdout } = await execGitCommand('git symbolic-ref --short HEAD');
-      res.json({ branch: stdout.trim() });
-    } catch (error) {
-      res.status(500).json({ error: error.message });
-    }
-  });
-
-  // 获取分支与远程的差异状态（领先/落后提交数）
-  app.get('/api/branch-status', async (req, res) => {
-    try {
-      if (!getIsGitRepo()) {
-        return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
-      }
-
-      const now = Date.now();
-      const forceRefresh = req.query.force === 'true';
-
-      const recentPushStatus = getRecentPushStatus();
-      const branchStatusCache = getBranchStatusCache();
-
-      // push 后10秒内直接返回同步状态
-      if (recentPushStatus.justPushed &&
-          (now - recentPushStatus.pushTime) < recentPushStatus.validDuration) {
-        console.log('检测到最近推送过，直接返回同步状态');
-        return res.json({
-          hasUpstream: true,
-          upstreamBranch: branchStatusCache.upstreamBranch || 'origin/main',
-          ahead: 0,
-          behind: 0
-        });
-      }
-
-      // 5秒缓存分支名，防止短时间内重复执行 git symbolic-ref / git rev-parse
-      const branchInfoCacheValid = !forceRefresh &&
-                                   branchStatusCache.currentBranch &&
-                                   branchStatusCache.upstreamBranch &&
-                                   (now - branchStatusCache.lastUpdate) < branchStatusCache.cacheTimeout;
-
-      let currentBranch, upstreamBranch;
-
-      if (branchInfoCacheValid) {
-        currentBranch = branchStatusCache.currentBranch;
-        upstreamBranch = branchStatusCache.upstreamBranch;
-        console.log(`使用5秒缓存的分支名: ${currentBranch} -> ${upstreamBranch}`);
-      } else {
-        // 直接读取，不再走5分钟长缓存
-        const { stdout: branchOut } = await execGitCommand('git symbolic-ref --short HEAD');
-        currentBranch = branchOut.trim();
-
-        const { stdout: upstreamOut } = await execGitCommand(
-          'git rev-parse --abbrev-ref --symbolic-full-name @{u}',
-          { ignoreError: true }
-        );
-        upstreamBranch = upstreamOut.trim() || null;
-
-        if (!upstreamBranch) {
-          setBranchStatusCache({ currentBranch: null, upstreamBranch: null, lastUpdate: 0, cacheTimeout: 5000 });
-          return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
-        }
-
-        setBranchStatusCache({ currentBranch, upstreamBranch, lastUpdate: now, cacheTimeout: 5000 });
-      }
-
-      const { stdout: aheadBehindOutput } = await execGitCommand(
-        `git rev-list --left-right --count ${currentBranch}...${upstreamBranch}`
-      );
-      const [ahead, behind] = aheadBehindOutput.trim().split('\t').map(Number);
-
-      res.json({ hasUpstream: true, upstreamBranch, ahead, behind });
-    } catch (error) {
-      console.error('获取分支状态失败:', error);
-      res.status(500).json({ error: error.message });
-    }
-  });
-}
+// 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.
+//
+export function registerBranchStatusRoutes({
+  app,
+  execGitCommand,
+  getIsGitRepo,
+  getBranchStatusCache,
+  setBranchStatusCache,
+  getRecentPushStatus,
+  setRecentPushStatus
+}) {
+  // 获取当前分支 - 直接读取，不缓存（git symbolic-ref 极快，<5ms）
+  app.get('/api/branch', async (req, res) => {
+    try {
+      const { stdout } = await execGitCommand('git symbolic-ref --short HEAD');
+      res.json({ branch: stdout.trim() });
+    } catch (error) {
+      res.status(500).json({ error: error.message });
+    }
+  });
+
+  // 获取分支与远程的差异状态（领先/落后提交数）
+  app.get('/api/branch-status', async (req, res) => {
+    try {
+      if (!getIsGitRepo()) {
+        return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
+      }
+
+      const now = Date.now();
+      const forceRefresh = req.query.force === 'true';
+
+      const recentPushStatus = getRecentPushStatus();
+      const branchStatusCache = getBranchStatusCache();
+
+      // push 后10秒内直接返回同步状态
+      if (recentPushStatus.justPushed &&
+          (now - recentPushStatus.pushTime) < recentPushStatus.validDuration) {
+        console.log('检测到最近推送过，直接返回同步状态');
+        return res.json({
+          hasUpstream: true,
+          upstreamBranch: branchStatusCache.upstreamBranch || 'origin/main',
+          ahead: 0,
+          behind: 0
+        });
+      }
+
+      // 5秒缓存分支名，防止短时间内重复执行 git symbolic-ref / git rev-parse
+      const branchInfoCacheValid = !forceRefresh &&
+                                   branchStatusCache.currentBranch &&
+                                   branchStatusCache.upstreamBranch &&
+                                   (now - branchStatusCache.lastUpdate) < branchStatusCache.cacheTimeout;
+
+      let currentBranch, upstreamBranch;
+
+      if (branchInfoCacheValid) {
+        currentBranch = branchStatusCache.currentBranch;
+        upstreamBranch = branchStatusCache.upstreamBranch;
+        console.log(`使用5秒缓存的分支名: ${currentBranch} -> ${upstreamBranch}`);
+      } else {
+        // 直接读取，不再走5分钟长缓存
+        const { stdout: branchOut } = await execGitCommand('git symbolic-ref --short HEAD');
+        currentBranch = branchOut.trim();
+
+        const { stdout: upstreamOut } = await execGitCommand(
+          'git rev-parse --abbrev-ref --symbolic-full-name @{u}',
+          { ignoreError: true }
+        );
+        upstreamBranch = upstreamOut.trim() || null;
+
+        if (!upstreamBranch) {
+          setBranchStatusCache({ currentBranch: null, upstreamBranch: null, lastUpdate: 0, cacheTimeout: 5000 });
+          return res.json({ hasUpstream: false, ahead: 0, behind: 0 });
+        }
+
+        setBranchStatusCache({ currentBranch, upstreamBranch, lastUpdate: now, cacheTimeout: 5000 });
+      }
+
+      const { stdout: aheadBehindOutput } = await execGitCommand(
+        `git rev-list --left-right --count ${currentBranch}...${upstreamBranch}`
+      );
+      const [ahead, behind] = aheadBehindOutput.trim().split('\t').map(Number);
+
+      res.json({ hasUpstream: true, upstreamBranch, ahead, behind });
+    } catch (error) {
+      console.error('获取分支状态失败:', error);
+      res.status(500).json({ error: error.message });
+    }
+  });
+}

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

@@ -1,96 +1,110 @@
-import * as vm from 'node:vm';
-
-function isPlainObject(value) {
-  return Object.prototype.toString.call(value) === '[object Object]';
-}
-
-function normalizeOutputs(outputs) {
-  if (!isPlainObject(outputs)) return {};
-
-  const result = {};
-  const entries = Object.entries(outputs);
-
-  for (const [key, val] of entries) {
-    const safeKey = String(key || '').trim();
-    if (!safeKey) continue;
-    if (safeKey.length > 64) continue;
-
-    if (val === undefined || val === null) {
-      result[safeKey] = '';
-      continue;
-    }
-
-    if (typeof val === 'string') {
-      result[safeKey] = val;
-      continue;
-    }
-
-    if (typeof val === 'number' || typeof val === 'boolean') {
-      result[safeKey] = String(val);
-      continue;
-    }
-
-    try {
-      result[safeKey] = JSON.stringify(val);
-    } catch {
-      result[safeKey] = String(val);
-    }
-  }
-
-  return result;
-}
-
-export function registerCodeRoutes({ app }) {
-  app.post('/api/execute-code-node', async (req, res) => {
-    try {
-      const { script, input, param } = req.body || {};
-
-      if (!script || typeof script !== 'string' || !script.trim()) {
-        return res.status(400).json({ success: false, error: 'script 不能为空' });
-      }
-
-      const inputText = typeof input === 'string' ? input : (input === undefined || input === null ? '' : String(input));
-
-      const paramObj = (param && typeof param === 'object') ? param : undefined;
-
-      const wrapped = `"use strict";\n${script}\n`;
-
-      const sandbox = {
-        input: inputText,
-        param: paramObj,
-        main: undefined
-      };
-
-      const context = vm.createContext(sandbox, {
-        name: 'code-node-sandbox'
-      });
-
-      const vmScript = new vm.Script(wrapped, { filename: 'code-node.js' });
-
-      let result;
-      try {
-        result = vmScript.runInContext(context, { timeout: 800 });
-      } catch (e) {
-        return res.status(400).json({ success: false, error: e?.message || String(e) });
-      }
-
-      const mainFn = context.main || sandbox.main;
-      if (typeof mainFn !== 'function') {
-        return res.status(400).json({ success: false, error: '未找到 main(param) 函数' });
-      }
-
-      let finalResult = result;
-      try {
-        finalResult = mainFn(paramObj || {});
-      } catch (e) {
-        return res.status(400).json({ success: false, error: e?.message || String(e) });
-      }
-
-      const outputs = normalizeOutputs(finalResult);
-
-      return res.json({ success: true, outputs });
-    } catch (error) {
-      return res.status(500).json({ success: false, error: error?.message || String(error) });
-    }
-  });
-}
+// 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.
+//
+import * as vm from 'node:vm';
+
+function isPlainObject(value) {
+  return Object.prototype.toString.call(value) === '[object Object]';
+}
+
+function normalizeOutputs(outputs) {
+  if (!isPlainObject(outputs)) return {};
+
+  const result = {};
+  const entries = Object.entries(outputs);
+
+  for (const [key, val] of entries) {
+    const safeKey = String(key || '').trim();
+    if (!safeKey) continue;
+    if (safeKey.length > 64) continue;
+
+    if (val === undefined || val === null) {
+      result[safeKey] = '';
+      continue;
+    }
+
+    if (typeof val === 'string') {
+      result[safeKey] = val;
+      continue;
+    }
+
+    if (typeof val === 'number' || typeof val === 'boolean') {
+      result[safeKey] = String(val);
+      continue;
+    }
+
+    try {
+      result[safeKey] = JSON.stringify(val);
+    } catch {
+      result[safeKey] = String(val);
+    }
+  }
+
+  return result;
+}
+
+export function registerCodeRoutes({ app }) {
+  app.post('/api/execute-code-node', async (req, res) => {
+    try {
+      const { script, input, param } = req.body || {};
+
+      if (!script || typeof script !== 'string' || !script.trim()) {
+        return res.status(400).json({ success: false, error: 'script 不能为空' });
+      }
+
+      const inputText = typeof input === 'string' ? input : (input === undefined || input === null ? '' : String(input));
+
+      const paramObj = (param && typeof param === 'object') ? param : undefined;
+
+      const wrapped = `"use strict";\n${script}\n`;
+
+      const sandbox = {
+        input: inputText,
+        param: paramObj,
+        main: undefined
+      };
+
+      const context = vm.createContext(sandbox, {
+        name: 'code-node-sandbox'
+      });
+
+      const vmScript = new vm.Script(wrapped, { filename: 'code-node.js' });
+
+      let result;
+      try {
+        result = vmScript.runInContext(context, { timeout: 800 });
+      } catch (e) {
+        return res.status(400).json({ success: false, error: e?.message || String(e) });
+      }
+
+      const mainFn = context.main || sandbox.main;
+      if (typeof mainFn !== 'function') {
+        return res.status(400).json({ success: false, error: '未找到 main(param) 函数' });
+      }
+
+      let finalResult = result;
+      try {
+        finalResult = mainFn(paramObj || {});
+      } catch (e) {
+        return res.status(400).json({ success: false, error: e?.message || String(e) });
+      }
+
+      const outputs = normalizeOutputs(finalResult);
+
+      return res.json({ success: true, outputs });
+    } catch (error) {
+      return res.status(500).json({ success: false, error: error?.message || String(error) });
+    }
+  });
+}