npm - zen-gitsync - Versions diffs - 2.4.10 → 2.4.12 - Mend

zen-gitsync 2.4.10 → 2.4.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/package.json +1 -1
package/src/config.js +2 -1
package/src/ui/public/assets/index-BFihJBzC.js +46 -0
package/src/ui/public/assets/index-CK7Vijoe.css +1 -0
package/src/ui/public/assets/vendor-DJt7ABTC.js +68 -0
package/src/ui/public/index.html +3 -3
package/src/ui/server/index.js +295 -7
package/src/utils/index.js +40 -1
package/src/ui/public/assets/index-BmMYpCWy.css +0 -1
package/src/ui/public/assets/index-COr7M_hD.js +0 -45
package/src/ui/public/assets/vendor-D-Vg0AbY.js +0 -63

package/src/ui/public/index.html CHANGED Viewed

@@ -5,10 +5,10 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Zen-GitSync - Git同步工具</title>
-    <script type="module" crossorigin src="/assets/index-COr7M_hD.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-D-Vg0AbY.js">
+    <script type="module" crossorigin src="/assets/index-BFihJBzC.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-DJt7ABTC.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor-D9qDBEE1.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-BmMYpCWy.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-CK7Vijoe.css">
   </head>
   <body>
     <div id="app"></div>

package/src/ui/server/index.js CHANGED Viewed

@@ -2,7 +2,7 @@ import express from 'express';
 import { createServer } from 'http';
 import { fileURLToPath } from 'url';
 import path from 'path';
-import { execGitCommand, getCommandHistory, clearCommandHistory, registerSocketIO, execGitAddWithLockFilter } from '../../utils/index.js';
+import { execGitCommand, getCommandHistory, addCommandToHistory, clearCommandHistory, registerSocketIO, execGitAddWithLockFilter } from '../../utils/index.js';
 import open from 'open';
 import config from '../../config.js';
 import chalk from 'chalk';
@@ -10,6 +10,7 @@ import fs from 'fs/promises';
 import os from 'os';
 import { Server } from 'socket.io';
 import chokidar from 'chokidar';
+import { spawn } from 'child_process';
 // import { exec } from 'child_process';
 const __filename = fileURLToPath(import.meta.url);
@@ -54,10 +55,12 @@ let recentPushStatus = {
   validDuration: 10000 // 推送后10秒内认为分支状态是同步的
 };
+const showConsole = true;
 async function startUIServer(noOpen = false, savePort = false) {
   const app = express();
   const httpServer = createServer(app);
   const io = new Server(httpServer);
+  if (showConsole) console.log(`创建服务成功`)
   // 获取当前项目的唯一标识（使用工作目录路径）
   // 需要在切换目录时更新，故使用 let
@@ -77,14 +80,16 @@ async function startUIServer(noOpen = false, savePort = false) {
   try {
     let dirPath = process.cwd();
     try {
+      if(showConsole) console.log(`记录最近打开目录`)
       const { stdout } = await execGitCommand('git rev-parse --show-toplevel');
       const root = stdout?.trim();
       if (root) dirPath = root;
     } catch (_) {
       // 非Git仓库或命令失败，使用 CWD 即可
     }
+    if (showConsole) console.log(`记录最近打开目录: ${dirPath}`)
     await configManager.saveRecentDirectory(dirPath);
-    console.log(chalk.gray(`已记录最近打开目录: ${dirPath}`));
+    if (showConsole) console.log(chalk.gray(`已记录最近打开目录: ${dirPath}`));
   } catch (e) {
     console.warn(chalk.yellow(`记录最近目录失败: ${e?.message || e}`));
   }
@@ -96,6 +101,9 @@ async function startUIServer(noOpen = false, savePort = false) {
     next();
   });
+  // 静态文件服务
+  app.use(express.static(path.join(__dirname, '../public')));
   // 通用命令执行接口（非流式）
   app.post('/api/exec', async (req, res) => {
     try {
@@ -115,9 +123,6 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   });
-  // 静态文件服务
-  app.use(express.static(path.join(__dirname, '../public')));
   // API路由
   // 移除了 /api/status 端点，因为前端只使用 porcelain 格式
@@ -801,6 +806,98 @@ async function startUIServer(noOpen = false, savePort = false) {
       }
   });
+  // 在终端中打开当前目录
+  app.post('/api/open_terminal', async (req, res) => {
+      try {
+          // 获取要打开的目录路径，如果没有提供，则使用当前目录
+          const directoryPath = req.body.path || process.cwd();
+          try {
+              // 检查目录是否存在
+              await fs.access(directoryPath);
+              // 根据不同操作系统打开终端
+              const platform = os.platform();
+              let command;
+              let args;
+              switch (platform) {
+                  case 'win32':
+                      // Windows: 将start命令的参数分开传递，避免引号转义问题
+                      // 参数顺序：start [title] /D [path] [command]
+                      command = 'cmd';
+                      args = ['/c', 'start', '', '/D', directoryPath, 'cmd'];
+                      break;
+                  case 'darwin':
+                      // macOS: 使用 Terminal.app
+                      command = 'open';
+                      args = ['-a', 'Terminal', directoryPath];
+                      break;
+                  case 'linux':
+                      // Linux: 尝试使用常见的终端模拟器
+                      // 优先级: gnome-terminal, konsole, xterm
+                      const terminals = [
+                          { cmd: 'gnome-terminal', args: ['--working-directory', directoryPath] },
+                          { cmd: 'konsole', args: ['--workdir', directoryPath] },
+                          { cmd: 'xterm', args: ['-e', `cd "${directoryPath}" && $SHELL`] }
+                      ];
+                      // 尝试找到可用的终端
+                      let terminalFound = false;
+                      for (const terminal of terminals) {
+                          try {
+                              const { exec } = await import('child_process');
+                              exec(`which ${terminal.cmd}`, (error) => {
+                                  if (!error) {
+                                      command = terminal.cmd;
+                                      args = terminal.args;
+                                      terminalFound = true;
+                                  }
+                              });
+                              if (terminalFound) break;
+                          } catch (e) {
+                              continue;
+                          }
+                      }
+                      if (!terminalFound) {
+                          return res.status(400).json({
+                              success: false,
+                              error: '未找到可用的终端模拟器'
+                          });
+                      }
+                      break;
+                  default:
+                      return res.status(400).json({
+                          success: false,
+                          error: `不支持的操作系统: ${platform}`
+                      });
+              }
+              // 执行命令打开终端
+              spawn(command, args, {
+                  detached: true,
+                  stdio: 'ignore'
+              }).unref();
+              res.json({
+                  success: true,
+                  message: '已在终端中打开目录'
+              });
+          } catch (error) {
+              res.status(400).json({
+                  success: false,
+                  error: `无法打开终端 "${directoryPath}": ${error.message}`
+              });
+          }
+      } catch (error) {
+          res.status(500).json({
+              success: false,
+              error: error.message
+          });
+      }
+  });
   // 打开文件
   app.post('/api/open-file', async (req, res) => {
     try {
@@ -995,9 +1092,12 @@ async function startUIServer(noOpen = false, savePort = false) {
   // 获取配置
   app.get('/api/config/getConfig', async (req, res) => {
     try {
+      console.log('获取配置中。。。')
       const config = await configManager.loadConfig()
+      console.log('获取配置成功')
       res.json(config)
     } catch (error) {
+      console.log('获取配置失败')
       res.status(500).json({ error: error.message })
     }
   })
@@ -1392,6 +1492,192 @@ async function startUIServer(noOpen = false, savePort = false) {
       res.status(500).json({ success: false, error: error.message });
     }
   });
+  // 带进度的推送更改 (SSE)
+  app.post('/api/push-with-progress', async (req, res) => {
+    // 设置SSE响应头
+    res.setHeader('Content-Type', 'text/event-stream');
+    res.setHeader('Cache-Control', 'no-cache');
+    res.setHeader('Connection', 'keep-alive');
+    res.flushHeaders();
+    const sendProgress = (data) => {
+      res.write(`data: ${JSON.stringify(data)}\n\n`);
+    };
+    try {
+      // 获取当前工作目录 - 与execGitCommand保持一致
+      const cwdArg = process.argv.find(arg => arg.startsWith('--path')) || process.argv.find(arg => arg.startsWith('--cwd'));
+      let workDir = process.cwd();
+      if (cwdArg) {
+        const [, value] = cwdArg.split('=');
+        workDir = value || process.cwd();
+      }
+      console.log('开始推送，工作目录:', workDir);
+      // 记录开始时间
+      const startTime = Date.now();
+      // 发送开始消息
+      sendProgress({
+        type: 'progress',
+        message: '开始推送到远程仓库...'
+      });
+      // 使用spawn执行git push --progress
+      const gitPush = spawn('git', ['push', '--progress'], {
+        cwd: workDir,
+        env: {
+          ...process.env,
+          GIT_CONFIG_PARAMETERS: "'core.quotepath=false'" // 关闭路径转义
+        }
+      });
+      let errorOutput = '';
+      let standardOutput = '';
+      // Git的进度信息在stderr中
+      gitPush.stderr.on('data', (data) => {
+        const output = data.toString();
+        errorOutput += output;
+        // 解析进度信息
+        const lines = output.split('\n');
+        for (const line of lines) {
+          if (line.trim()) {
+            // 发送原始行
+            sendProgress({
+              type: 'progress',
+              message: line.trim()
+            });
+            // 识别不同阶段并解析百分比
+            const percentMatch = line.match(/(\d+)%/);
+            if (percentMatch) {
+              const percent = parseInt(percentMatch[1]);
+              let stage = 'unknown';
+              if (line.includes('Enumerating objects')) {
+                stage = 'enumerating';
+              } else if (line.includes('Counting objects')) {
+                stage = 'counting';
+              } else if (line.includes('Compressing objects')) {
+                stage = 'compressing';
+              } else if (line.includes('Writing objects')) {
+                stage = 'writing';
+              } else if (line.includes('Resolving deltas')) {
+                stage = 'resolving';
+              }
+              sendProgress({
+                type: 'stage-progress',
+                stage: stage,
+                percent: percent,
+                message: line.trim()
+              });
+            }
+          }
+        }
+      });
+      gitPush.stdout.on('data', (data) => {
+        standardOutput += data.toString();
+      });
+      gitPush.on('close', (code) => {
+        console.log(`Git push 进程结束，退出码: ${code}`);
+        console.log('标准输出:', standardOutput);
+        console.log('错误输出:', errorOutput);
+        // 计算执行时间
+        const executionTime = Date.now() - startTime;
+        if (code === 0) {
+          // 推送成功
+          recentPushStatus = {
+            justPushed: true,
+            pushTime: Date.now(),
+            validDuration: 10000
+          };
+          // 添加到命令历史
+          addCommandToHistory(
+            'git push --progress',
+            standardOutput,
+            errorOutput,
+            null,
+            executionTime
+          );
+          sendProgress({
+            type: 'complete',
+            success: true,
+            message: standardOutput || errorOutput || 'Push successful'
+          });
+        } else {
+          // 推送失败
+          console.error('推送失败:', errorOutput || standardOutput);
+          // 添加到命令历史（失败情况）
+          addCommandToHistory(
+            'git push --progress',
+            standardOutput,
+            errorOutput,
+            errorOutput || standardOutput || `Push failed with code ${code}`,
+            executionTime
+          );
+          sendProgress({
+            type: 'complete',
+            success: false,
+            error: errorOutput || standardOutput || `Push failed with code ${code}`
+          });
+        }
+        res.end();
+      });
+      gitPush.on('error', (error) => {
+        console.error('Git push 进程错误:', error);
+        // 计算执行时间
+        const executionTime = Date.now() - startTime;
+        // 添加到命令历史（错误情况）
+        addCommandToHistory(
+          'git push --progress',
+          '',
+          '',
+          error.message,
+          executionTime
+        );
+        sendProgress({
+          type: 'complete',
+          success: false,
+          error: error.message
+        });
+        res.end();
+      });
+    } catch (error) {
+      // 添加到命令历史（异常情况）
+      addCommandToHistory(
+        'git push --progress',
+        '',
+        '',
+        error.message,
+        0
+      );
+      sendProgress({
+        type: 'complete',
+        success: false,
+        error: error.message
+      });
+      res.end();
+    }
+  });
   // 添加git pull API端点
   app.post('/api/pull', async (req, res) => {
@@ -2784,7 +3070,7 @@ async function startUIServer(noOpen = false, savePort = false) {
       try {
         // 等待1秒，避免快速尝试多个端口
         if (currentPort > startPort) {
-          await new Promise(resolve => setTimeout(resolve, 1000));
+          await new Promise(resolve => setTimeout(resolve, 800));
           console.log(`尝试端口 ${currentPort}...`);
         }
@@ -2827,7 +3113,9 @@ async function startUIServer(noOpen = false, savePort = false) {
             // 只有在noOpen为false时才打开浏览器
             if (!noOpen) {
-              open(`http://localhost:${currentPort}`);
+              setTimeout(() => {
+                open(`http://localhost:${currentPort}`);
+              }, 0);
             }
             resolve();

package/src/utils/index.js CHANGED Viewed

@@ -331,6 +331,45 @@ function getCommandHistory() {
   return [...commandHistory];
 }
+// Function to manually add command to history (for commands not using execGitCommand)
+function addCommandToHistory(command, stdout = '', stderr = '', error = null, executionTime = 0) {
+  const MAX_OUTPUT_LENGTH = 5000;
+  // Truncate outputs if too long
+  const isStdoutTruncated = stdout.length > MAX_OUTPUT_LENGTH;
+  const isStderrTruncated = stderr.length > MAX_OUTPUT_LENGTH;
+  const truncatedStdout = isStdoutTruncated ? stdout.substring(0, MAX_OUTPUT_LENGTH) + '...[truncated]' : stdout;
+  const truncatedStderr = isStderrTruncated ? stderr.substring(0, MAX_OUTPUT_LENGTH) + '...[truncated]' : stderr;
+  const historyItem = {
+    command,
+    stdout: truncatedStdout || '',
+    stderr: truncatedStderr || '',
+    error: error ? (typeof error === 'string' ? error : error.message) : null,
+    executionTime,
+    timestamp: new Date().toISOString(),
+    success: !error,
+    isStdoutTruncated,
+    isStderrTruncated
+  };
+  // Add to history (limited size)
+  commandHistory.unshift(historyItem);
+  if (commandHistory.length > MAX_HISTORY_SIZE) {
+    commandHistory.pop();
+  }
+  // Broadcast via WebSocket if available
+  if (ioInstance) {
+    ioInstance.emit('command_history_update', {
+      newCommand: historyItem,
+      fullHistory: commandHistory.slice(0, 10)
+    });
+  }
+  return historyItem;
+}
 const getCwd = () => {
   const cwdArg = process.argv.find(arg => arg.startsWith('--path')) || process.argv.find(arg => arg.startsWith('--cwd'));
   if (cwdArg) {
@@ -914,7 +953,7 @@ async function addResetScriptToPackageJson() {
 export {
   coloredLog, errorLog, execSyncGitCommand,
-  execGitCommand, getCommandHistory, // Add this export
+  execGitCommand, getCommandHistory, addCommandToHistory, // Add command history exports
   clearCommandHistory,
   registerSocketIO, // 导出注册Socket.io的函数
   getCwd, judgePlatform, showHelp, judgeLog, printGitLog,