npm - zen-gitsync - Versions diffs - 2.9.5 → 2.9.6 - Mend

zen-gitsync 2.9.5 → 2.9.6

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 (8) hide show

package/package.json +1 -1
package/src/ui/public/assets/index-BBxepbAQ.js +79 -0
package/src/ui/public/assets/index-NF8pDlXw.css +1 -0
package/src/ui/public/assets/{vendor-Ba8bfrbK.js → vendor-PvZNfVU0.js} +1 -1
package/src/ui/public/index.html +3 -3
package/src/ui/server/index.js +217 -25
package/src/ui/public/assets/index-BxBxY90Z.js +0 -79
package/src/ui/public/assets/index-CQconlCN.css +0 -1

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

@@ -6,10 +6,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</title>
-    <script type="module" crossorigin src="/assets/index-BxBxY90Z.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-Ba8bfrbK.js">
+    <script type="module" crossorigin src="/assets/index-BBxepbAQ.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-PvZNfVU0.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor-BUGaay5Z.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-CQconlCN.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-NF8pDlXw.css">
   </head>
   <body>
     <div id="app"></div>

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

@@ -20,6 +20,9 @@ const configManager = config; // 确保 configManager 可用
 const runningProcesses = new Map(); // key: processId, value: { childProcess, command, startTime }
 let processIdCounter = 0;
+ const terminalSessions = new Map(); // key: terminalSessionId, value: { id, command, workingDirectory, pid, createdAt, lastStartedAt }
+ let terminalSessionIdCounter = 0;
 // 分支状态缓存
 let branchStatusCache = {
   currentBranch: null,
@@ -365,6 +368,68 @@ async function startUIServer(noOpen = false, savePort = false) {
       });
     }
   });
+  async function startTerminalProcess({ command, workingDirectory }) {
+    const targetDir = workingDirectory || currentProjectPath;
+    if (process.platform === 'win32') {
+      const cmdToRun = command.trim();
+      const safeWorkingDir = String(targetDir).replace(/"/g, '""');
+      const safeCmd = String(cmdToRun).replace(/"/g, '""');
+      const psScript = `$p = Start-Process -FilePath "cmd.exe" -ArgumentList "/K", "${safeCmd}" -WorkingDirectory "${safeWorkingDir}" -PassThru; Write-Output $p.Id`;
+      return await new Promise((resolve, reject) => {
+        const child = spawn('powershell.exe', ['-NoProfile', '-Command', psScript], {
+          windowsHide: true
+        });
+        let out = '';
+        let err = '';
+        child.stdout?.on('data', (d) => {
+          out += d.toString('utf8');
+        });
+        child.stderr?.on('data', (d) => {
+          err += d.toString('utf8');
+        });
+        child.on('error', (e) => reject(e));
+        child.on('close', (code) => {
+          if (code !== 0) {
+            return reject(new Error(err || `Start-Process 失败，退出码: ${code}`));
+          }
+          const pid = parseInt(String(out).trim(), 10);
+          if (!Number.isFinite(pid)) {
+            return reject(new Error(`无法获取终端 PID: ${out || err || 'unknown'}`));
+          }
+          resolve({ pid });
+        });
+      });
+    }
+    if (process.platform === 'darwin') {
+      const script = `tell application "Terminal" to do script "cd ${targetDir} && ${command.trim()}"`;
+      exec(`osascript -e '${script}'`, (error) => {
+        if (error) {
+          console.error('打开终端失败:', error);
+        }
+      });
+      return { pid: null };
+    }
+    const terminalCommand = `gnome-terminal -- bash -c "cd ${targetDir} && ${command.trim()}; exec bash" || xterm -e "cd ${targetDir} && ${command.trim()}; bash"`;
+    exec(terminalCommand, (error) => {
+      if (error) {
+        console.error('打开终端失败:', error);
+      }
+    });
+    return { pid: null };
+  }
   // 在新终端中执行自定义命令
   app.post('/api/exec-in-terminal', async (req, res) => {
@@ -378,35 +443,30 @@ async function startUIServer(noOpen = false, savePort = false) {
       const targetDir = workingDirectory || currentProjectPath;
       console.log(`在终端中执行命令: ${command}`);
       console.log(`工作目录: ${targetDir}`);
-      // 根据操作系统选择合适的终端命令
-      let terminalCommand;
-      if (process.platform === 'win32') {
-        // Windows: 使用 start 命令打开新的 cmd 窗口
-        // /K 参数表示执行命令后保持窗口打开
-        terminalCommand = `start cmd /K "cd /d ${targetDir} && ${command}"`;
-      } else if (process.platform === 'darwin') {
-        // macOS: 使用 osascript 打开 Terminal.app
-        const script = `tell application "Terminal" to do script "cd ${targetDir} && ${command}"`;
-        terminalCommand = `osascript -e '${script}'`;
-      } else {
-        // Linux: 尝试常见的终端模拟器
-        terminalCommand = `gnome-terminal -- bash -c "cd ${targetDir} && ${command}; exec bash" || xterm -e "cd ${targetDir} && ${command}; bash"`;
-      }
-      // 执行命令打开新终端（使用已导入的 exec）
-      exec(terminalCommand, (error, stdout, stderr) => {
-        if (error) {
-          console.error('打开终端失败:', error);
-        }
+      const terminalSessionId = ++terminalSessionIdCounter;
+      const now = Date.now();
+      terminalSessions.set(terminalSessionId, {
+        id: terminalSessionId,
+        command: command.trim(),
+        workingDirectory: targetDir,
+        pid: null,
+        createdAt: now,
+        lastStartedAt: now
       });
+      const { pid } = await startTerminalProcess({ command, workingDirectory: targetDir });
+      const session = terminalSessions.get(terminalSessionId);
+      if (session) {
+        session.pid = pid;
+        session.lastStartedAt = Date.now();
+        terminalSessions.set(terminalSessionId, session);
+      }
       res.json({
         success: true,
         message: `已在新终端中执行命令`,
-        command: command,
-        path: currentProjectPath
+        session: terminalSessions.get(terminalSessionId)
       });
     } catch (error) {
       console.error('在终端中执行命令失败:', error);
@@ -417,6 +477,138 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   });
+  app.get('/api/terminal-sessions', async (req, res) => {
+    try {
+      const sessions = Array.from(terminalSessions.values()).sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+      res.json({ success: true, sessions });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+  function killTerminalPid(pid) {
+    if (!pid) return;
+    if (process.platform === 'win32') {
+      exec(`taskkill /pid ${pid} /T /F`, (error) => {
+        if (error) {
+          // 进程可能已退出，Windows 常见提示：ERROR: The process "xxxx" not found.
+          // 这里降级为警告，不影响后续流程
+          console.warn(`[终端会话] taskkill 失败(可忽略): ${error?.message || error}`);
+        }
+      });
+      return;
+    }
+    try {
+      process.kill(pid, 'SIGTERM');
+    } catch (e) {
+      // ignore
+    }
+  }
+  async function isPidAlive(pid) {
+    if (!pid) return false;
+    if (process.platform === 'win32') {
+      const script = `Get-Process -Id ${pid} -ErrorAction SilentlyContinue | Out-Null; if ($?) { exit 0 } else { exit 1 }`;
+      return await new Promise((resolve) => {
+        const child = spawn('powershell.exe', ['-NoProfile', '-Command', script], { windowsHide: true });
+        child.on('error', () => resolve(false));
+        child.on('close', (code) => resolve(code === 0));
+      });
+    }
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  app.post('/api/terminal-sessions/:id/restart', async (req, res) => {
+    try {
+      const id = parseInt(req.params.id, 10);
+      if (!Number.isFinite(id)) {
+        return res.status(400).json({ success: false, error: 'id 非法' });
+      }
+      const session = terminalSessions.get(id);
+      if (!session) {
+        return res.status(404).json({ success: false, error: `终端会话 #${id} 不存在` });
+      }
+      // 先尝试结束旧窗口（如果仍在运行）
+      const oldPid = session.pid;
+      if (oldPid) {
+        killTerminalPid(oldPid);
+      }
+      const { pid } = await startTerminalProcess({ command: session.command, workingDirectory: session.workingDirectory });
+      session.pid = pid;
+      session.lastStartedAt = Date.now();
+      terminalSessions.set(id, session);
+      res.json({ success: true, session });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+  app.get('/api/terminal-sessions/status', async (req, res) => {
+    try {
+      const cleanup = String(req.query.cleanup || 'false') === 'true';
+      const sessions = Array.from(terminalSessions.values());
+      const results = await Promise.all(sessions.map(async (s) => {
+        const alive = s?.pid ? await isPidAlive(s.pid) : false;
+        return { ...s, alive };
+      }));
+      if (cleanup) {
+        for (const s of results) {
+          if (s.pid && !s.alive) {
+            terminalSessions.delete(s.id);
+          }
+        }
+      }
+      const output = cleanup
+        ? Array.from(terminalSessions.values()).map((s) => {
+            const found = results.find(r => r.id === s.id);
+            return { ...s, alive: found?.alive ?? false };
+          }).sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0))
+        : results.sort((a, b) => (b.createdAt || 0) - (a.createdAt || 0));
+      res.json({ success: true, sessions: output });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
+  app.delete('/api/terminal-sessions/:id', async (req, res) => {
+    try {
+      const id = parseInt(req.params.id, 10);
+      if (!Number.isFinite(id)) {
+        return res.status(400).json({ success: false, error: 'id 非法' });
+      }
+      const session = terminalSessions.get(id);
+      if (!session) {
+        return res.status(404).json({ success: false, error: `终端会话 #${id} 不存在` });
+      }
+      if (session.pid) {
+        killTerminalPid(session.pid);
+      }
+      terminalSessions.delete(id);
+      res.json({ success: true, removedId: id });
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message });
+    }
+  });
   // 停止正在运行的进程
   app.post('/api/kill-process', async (req, res) => {
     try {