zen-gitsync 2.15.10 → 2.15.12

package/src/ui/public/logo.svg

@@ -1,75 +1,75 @@
-<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <radialGradient id="bgGrad" cx="38%" cy="32%" r="70%">
-      <stop offset="0%" stop-color="#1e1b4b"/>
-      <stop offset="100%" stop-color="#0d0b1e"/>
-    </radialGradient>
-    <linearGradient id="mainGrad" x1="0%" y1="0%" x2="0%" y2="100%">
-      <stop offset="0%" stop-color="#c4b5fd"/>
-      <stop offset="100%" stop-color="#7c3aed"/>
-    </linearGradient>
-    <linearGradient id="featGrad" x1="0%" y1="0%" x2="100%" y2="100%">
-      <stop offset="0%" stop-color="#7dd3fc"/>
-      <stop offset="100%" stop-color="#0284c7"/>
-    </linearGradient>
-    <filter id="glow" x="-40%" y="-40%" width="180%" height="180%">
-      <feGaussianBlur in="SourceGraphic" stdDeviation="2.5" result="blur"/>
-      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
-    </filter>
-    <filter id="softGlow" x="-20%" y="-20%" width="140%" height="140%">
-      <feGaussianBlur in="SourceGraphic" stdDeviation="1.5" result="blur"/>
-      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
-    </filter>
-  </defs>
-
-  <!-- 背景�?-->
-  <circle cx="100" cy="100" r="96" fill="url(#bgGrad)"/>
-
-  <!-- 同步外弧（上半，代表 sync 循环�?-->
-  <path d="M 100,20 A 80,80 0 1,1 36,153"
-        stroke="rgba(167,139,250,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-  <!-- 同步外弧（下半） -->
-  <path d="M 36,153 A 80,80 0 0,1 164,153"
-        stroke="rgba(56,189,248,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-  <!-- 同步箭头（上�?-->
-  <path d="M 91,17 L 100,20 L 96,29"
-        stroke="rgba(167,139,250,0.55)" stroke-width="2.5" fill="none"
-        stroke-linecap="round" stroke-linejoin="round"/>
-  <!-- 同步箭头（下�?-->
-  <path d="M 163,145 L 164,154 L 155,151"
-        stroke="rgba(56,189,248,0.55)" stroke-width="2.5" fill="none"
-        stroke-linecap="round" stroke-linejoin="round"/>
-
-  <!-- 主分支竖�?-->
-  <line x1="76" y1="44" x2="76" y2="156"
-        stroke="url(#mainGrad)" stroke-width="5.5" stroke-linecap="round"
-        filter="url(#softGlow)"/>
-
-  <!-- 特性分支曲线（分出�?-->
-  <path d="M 76,80 C 98,80 130,96 130,120 L 130,140"
-        stroke="url(#featGrad)" stroke-width="4.5" fill="none"
-        stroke-linecap="round" filter="url(#softGlow)"/>
-  <!-- 特性分支合并回主分�?-->
-  <path d="M 130,140 C 130,156 105,159 76,155"
-        stroke="url(#featGrad)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
-
-  <!-- 主分支节�?-->
-  <circle cx="76" cy="48"  r="11" fill="#13103a" stroke="#c4b5fd" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="76" cy="48"  r="5"  fill="#ddd6fe"/>
-
-  <circle cx="76" cy="84"  r="11" fill="#13103a" stroke="#a78bfa" stroke-width="3"/>
-  <circle cx="76" cy="84"  r="5"  fill="#c4b5fd"/>
-
-  <circle cx="76" cy="120" r="11" fill="#13103a" stroke="#8b5cf6" stroke-width="3"/>
-  <circle cx="76" cy="120" r="5"  fill="#a78bfa"/>
-
-  <circle cx="76" cy="155" r="11" fill="#13103a" stroke="#7c3aed" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="76" cy="155" r="5"  fill="#8b5cf6"/>
-
-  <!-- 特性分支节�?-->
-  <circle cx="130" cy="115" r="11" fill="#13103a" stroke="#38bdf8" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="130" cy="115" r="5"  fill="#7dd3fc"/>
-
-  <circle cx="130" cy="143" r="11" fill="#13103a" stroke="#0ea5e9" stroke-width="3" filter="url(#glow)"/>
-  <circle cx="130" cy="143" r="5"  fill="#38bdf8"/>
+<svg width="200" height="200" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <radialGradient id="bgGrad" cx="38%" cy="32%" r="70%">
+      <stop offset="0%" stop-color="#1e1b4b"/>
+      <stop offset="100%" stop-color="#0d0b1e"/>
+    </radialGradient>
+    <linearGradient id="mainGrad" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#c4b5fd"/>
+      <stop offset="100%" stop-color="#7c3aed"/>
+    </linearGradient>
+    <linearGradient id="featGrad" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0%" stop-color="#7dd3fc"/>
+      <stop offset="100%" stop-color="#0284c7"/>
+    </linearGradient>
+    <filter id="glow" x="-40%" y="-40%" width="180%" height="180%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="2.5" result="blur"/>
+      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
+    </filter>
+    <filter id="softGlow" x="-20%" y="-20%" width="140%" height="140%">
+      <feGaussianBlur in="SourceGraphic" stdDeviation="1.5" result="blur"/>
+      <feMerge><feMergeNode in="blur"/><feMergeNode in="SourceGraphic"/></feMerge>
+    </filter>
+  </defs>
+
+  <!-- 背景�?-->
+  <circle cx="100" cy="100" r="96" fill="url(#bgGrad)"/>
+
+  <!-- 同步外弧（上半，代表 sync 循环�?-->
+  <path d="M 100,20 A 80,80 0 1,1 36,153"
+        stroke="rgba(167,139,250,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+  <!-- 同步外弧（下半） -->
+  <path d="M 36,153 A 80,80 0 0,1 164,153"
+        stroke="rgba(56,189,248,0.18)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+  <!-- 同步箭头（上�?-->
+  <path d="M 91,17 L 100,20 L 96,29"
+        stroke="rgba(167,139,250,0.55)" stroke-width="2.5" fill="none"
+        stroke-linecap="round" stroke-linejoin="round"/>
+  <!-- 同步箭头（下�?-->
+  <path d="M 163,145 L 164,154 L 155,151"
+        stroke="rgba(56,189,248,0.55)" stroke-width="2.5" fill="none"
+        stroke-linecap="round" stroke-linejoin="round"/>
+
+  <!-- 主分支竖�?-->
+  <line x1="76" y1="44" x2="76" y2="156"
+        stroke="url(#mainGrad)" stroke-width="5.5" stroke-linecap="round"
+        filter="url(#softGlow)"/>
+
+  <!-- 特性分支曲线（分出�?-->
+  <path d="M 76,80 C 98,80 130,96 130,120 L 130,140"
+        stroke="url(#featGrad)" stroke-width="4.5" fill="none"
+        stroke-linecap="round" filter="url(#softGlow)"/>
+  <!-- 特性分支合并回主分�?-->
+  <path d="M 130,140 C 130,156 105,159 76,155"
+        stroke="url(#featGrad)" stroke-width="4.5" fill="none" stroke-linecap="round"/>
+
+  <!-- 主分支节�?-->
+  <circle cx="76" cy="48"  r="11" fill="#13103a" stroke="#c4b5fd" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="76" cy="48"  r="5"  fill="#ddd6fe"/>
+
+  <circle cx="76" cy="84"  r="11" fill="#13103a" stroke="#a78bfa" stroke-width="3"/>
+  <circle cx="76" cy="84"  r="5"  fill="#c4b5fd"/>
+
+  <circle cx="76" cy="120" r="11" fill="#13103a" stroke="#8b5cf6" stroke-width="3"/>
+  <circle cx="76" cy="120" r="5"  fill="#a78bfa"/>
+
+  <circle cx="76" cy="155" r="11" fill="#13103a" stroke="#7c3aed" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="76" cy="155" r="5"  fill="#8b5cf6"/>
+
+  <!-- 特性分支节�?-->
+  <circle cx="130" cy="115" r="11" fill="#13103a" stroke="#38bdf8" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="130" cy="115" r="5"  fill="#7dd3fc"/>
+
+  <circle cx="130" cy="143" r="11" fill="#13103a" stroke="#0ea5e9" stroke-width="3" filter="url(#glow)"/>
+  <circle cx="130" cy="143" r="5"  fill="#38bdf8"/>
 </svg>

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

@@ -1,53 +1,53 @@
-// 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 logger from '../utils/logger.js'
-
-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;
-      }
-
-      logger.info(
-        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.
+//
+import logger from '../utils/logger.js'
+
+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;
+      }
+
+      logger.info(
+        chalk.dim(`[${requestTime}]`),
+        chalk.bold(req.method),
+        req.url,
+        statusColor(`[${statusCode}]`),
+        durationColor(`${duration}ms`)
+      );
+    });
+
+    next();
+  };
+}

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

@@ -1,105 +1,105 @@
-// 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 { asyncRoute, HttpError } from '../utils/asyncRoute.js'
-
-import logger from '../utils/logger.js'
-
-export function registerBranchStatusRoutes({
-  app,
-  execGitCommand,
-  getIsGitRepo,
-  getBranchStatusCache,
-  setBranchStatusCache,
-  getRecentPushStatus,
-  setRecentPushStatus
-}) {
-  // 获取当前分支 - 直接读取，不缓存（git symbolic-ref 极快，<5ms）
-  app.get('/api/branch', asyncRoute(async (req, res) => {
-      try {
-        const { stdout } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
-        res.json({ branch: stdout.trim() });
-      } catch (error) {
-        res.status(500).json({ error: error.message });
-      }
-    }));
-
-  // 获取分支与远程的差异状态（领先/落后提交数）
-  app.get('/api/branch-status', asyncRoute(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) {
-          logger.info('检测到最近推送过，直接返回同步状态');
-          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;
-          logger.info(`使用5秒缓存的分支名: ${currentBranch} -> ${upstreamBranch}`);
-        } else {
-          // 直接读取，不再走5分钟长缓存
-          const { stdout: branchOut } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
-          currentBranch = branchOut.trim();
-      
-          const { stdout: upstreamOut } = await execGitCommand(
-            ['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(
-          ['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) {
-        logger.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.
+//
+import { asyncRoute, HttpError } from '../utils/asyncRoute.js'
+
+import logger from '../utils/logger.js'
+
+export function registerBranchStatusRoutes({
+  app,
+  execGitCommand,
+  getIsGitRepo,
+  getBranchStatusCache,
+  setBranchStatusCache,
+  getRecentPushStatus,
+  setRecentPushStatus
+}) {
+  // 获取当前分支 - 直接读取，不缓存（git symbolic-ref 极快，<5ms）
+  app.get('/api/branch', asyncRoute(async (req, res) => {
+      try {
+        const { stdout } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
+        res.json({ branch: stdout.trim() });
+      } catch (error) {
+        res.status(500).json({ error: error.message });
+      }
+    }));
+
+  // 获取分支与远程的差异状态（领先/落后提交数）
+  app.get('/api/branch-status', asyncRoute(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) {
+          logger.info('检测到最近推送过，直接返回同步状态');
+          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;
+          logger.info(`使用5秒缓存的分支名: ${currentBranch} -> ${upstreamBranch}`);
+        } else {
+          // 直接读取，不再走5分钟长缓存
+          const { stdout: branchOut } = await execGitCommand(['symbolic-ref', '--short', 'HEAD']);
+          currentBranch = branchOut.trim();
+      
+          const { stdout: upstreamOut } = await execGitCommand(
+            ['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(
+          ['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) {
+        logger.error('获取分支状态失败:', error);
+        res.status(500).json({ error: error.message });
+      }
+    }));
+}