npm - zen-gitsync - Versions diffs - 2.6.5 → 2.6.7 - Mend

zen-gitsync 2.6.5 → 2.6.7

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

package/README.md +148 -148
package/package.json +2 -1
package/src/ui/public/assets/index-B2e9R1rl.js +76 -0
package/src/ui/public/assets/index-M7x7bOZu.css +1 -0
package/src/ui/public/assets/vendor-CHpDISRi.js +75 -0
package/src/ui/public/assets/vendor-HJmoQ7iQ.css +1 -0
package/src/ui/public/index.html +4 -4
package/src/ui/server/index.js +299 -0
package/src/ui/public/assets/index-D0xeSSyV.js +0 -59
package/src/ui/public/assets/index-DmFxzTUu.css +0 -1
package/src/ui/public/assets/vendor-CiRPTLQ-.js +0 -68
package/src/ui/public/assets/vendor-D9qDBEE1.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 - Git同步工具</title>
-    <script type="module" crossorigin src="/assets/index-D0xeSSyV.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-CiRPTLQ-.js">
-    <link rel="stylesheet" crossorigin href="/assets/vendor-D9qDBEE1.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-DmFxzTUu.css">
+    <script type="module" crossorigin src="/assets/index-B2e9R1rl.js"></script>
+    <link rel="modulepreload" crossorigin href="/assets/vendor-CHpDISRi.js">
+    <link rel="stylesheet" crossorigin href="/assets/vendor-HJmoQ7iQ.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-M7x7bOZu.css">
   </head>
   <body>
     <div id="app"></div>

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

@@ -11,6 +11,7 @@ import fsSync from 'fs';
 import os from 'os';
 import { Server } from 'socket.io';
 import { spawn } from 'child_process';
+import iconv from 'iconv-lite';
 // import { exec } from 'child_process';
 const __filename = fileURLToPath(import.meta.url);
@@ -148,6 +149,134 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   });
+  // 流式执行命令接口（支持实时输出）
+  app.post('/api/exec-stream', async (req, res) => {
+    try {
+      const { command, directory } = req.body || {};
+      if (!command || typeof command !== 'string' || !command.trim()) {
+        return res.status(400).json({ success: false, error: 'command 不能为空' });
+      }
+      // 确定执行目录
+      const execDirectory = directory && directory.trim()
+        ? (path.isAbsolute(directory) ? directory : path.join(currentProjectPath, directory))
+        : currentProjectPath;
+      console.log(`流式执行命令: ${command}`);
+      console.log(`执行目录: ${execDirectory}`);
+      // 设置响应头为流式传输
+      res.setHeader('Content-Type', 'text/event-stream');
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Connection', 'keep-alive');
+      res.setHeader('X-Accel-Buffering', 'no'); // 禁用nginx缓冲
+      // 使用 spawn 执行命令，支持实时输出
+      console.log(`[流式输出] 准备执行命令: ${command}`);
+      console.log(`[流式输出] 当前平台: ${process.platform}`);
+      console.log(`[流式输出] 工作目录: ${execDirectory}`);
+      // 使用 shell: true 来支持 Windows 内置命令（如 dir、cd 等）
+      const childProcess = spawn(command.trim(), [], {
+        cwd: execDirectory,
+        shell: true, // 通过 shell 执行，支持 Windows 内置命令
+        env: {
+          ...process.env,
+          GIT_CONFIG_PARAMETERS: "'core.quotepath=false'"
+        }
+      });
+      console.log(`[流式输出] childProcess.stdout 是否存在:`, !!childProcess.stdout);
+      console.log(`[流式输出] childProcess.stderr 是否存在:`, !!childProcess.stderr);
+      let outputReceived = false;
+      // 发送数据到客户端的辅助函数
+      const sendData = (type, data) => {
+        const message = `data: ${JSON.stringify({ type, data })}\n\n`;
+        console.log(`[流式输出] 发送数据 - 类型: ${type}, 长度: ${data?.length || 0}`);
+        res.write(message);
+      };
+      // 在 Windows 上，CMD 默认使用 GBK 编码
+      // 不设置 encoding，直接处理 Buffer，然后用 iconv-lite 转换
+      const isWindows = process.platform === 'win32';
+      console.log(`[流式输出] 平台: ${process.platform}, 使用编码转换: ${isWindows}`);
+      // 监听标准输出
+      childProcess.stdout?.on('data', (data) => {
+        // data 是 Buffer 对象
+        let output;
+        if (isWindows) {
+          // Windows 系统，从 GBK 转换为 UTF-8
+          output = iconv.decode(data, 'gbk');
+          console.log(`[流式输出] 收到stdout(GBK转UTF8):`, output.substring(0, 100));
+        } else {
+          // Unix 系统，直接使用 UTF-8
+          output = data.toString('utf8');
+          console.log(`[流式输出] 收到stdout(UTF8):`, output.substring(0, 100));
+        }
+        outputReceived = true;
+        sendData('stdout', output);
+      });
+      // 监听标准错误输出
+      childProcess.stderr?.on('data', (data) => {
+        // data 是 Buffer 对象
+        let output;
+        if (isWindows) {
+          // Windows 系统，从 GBK 转换为 UTF-8
+          output = iconv.decode(data, 'gbk');
+          console.log(`[流式输出] 收到stderr(GBK转UTF8):`, output.substring(0, 100));
+        } else {
+          // Unix 系统，直接使用 UTF-8
+          output = data.toString('utf8');
+          console.log(`[流式输出] 收到stderr(UTF8):`, output.substring(0, 100));
+        }
+        outputReceived = true;
+        // 不再自动标记为错误，只显示 stderr 输出
+        // Git 的警告信息会输出到 stderr 但退出码仍为 0
+        sendData('stderr', output);
+      });
+      // 监听进程退出（exit 在流关闭前触发）
+      childProcess.on('exit', (code, signal) => {
+        console.log(`[流式输出] 进程 exit 事件 - 代码: ${code}, 信号: ${signal}`);
+      });
+      // 监听进程关闭（close 在流关闭后触发）
+      childProcess.on('close', (code, signal) => {
+        console.log(`[流式输出] 进程 close 事件 - 代码: ${code}, 信号: ${signal}, 有输出: ${outputReceived}`);
+        // 只根据退出码判断成功与否，退出码为 0 表示成功
+        sendData('exit', { code, success: code === 0 });
+        res.end();
+      });
+      // 监听错误
+      childProcess.on('error', (error) => {
+        console.error(`[流式输出] 进程错误:`, error);
+        sendData('error', error.message);
+        res.end();
+      });
+      // 添加spawn事件监听
+      childProcess.on('spawn', () => {
+        console.log(`[流式输出] 进程已启动 - PID: ${childProcess.pid}`);
+      });
+      // 注意：不监听req.on('close')，参考git push的实现
+      // 进程会自然结束，close事件会触发res.end()
+      // 如果监听req.on('close')可能会导致进程被提前kill
+    } catch (error) {
+      console.error('流式执行命令失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `流式执行命令失败: ${error.message}`
+      });
+    }
+  });
   // 在新终端中执行自定义命令
   app.post('/api/exec-in-terminal', async (req, res) => {
     try {
@@ -1569,6 +1698,176 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   })
+  // 保存指令编排
+  app.post('/api/config/save-orchestration', express.json(), async (req, res) => {
+    try {
+      const { orchestration } = req.body
+      if (!orchestration || !orchestration.name || !Array.isArray(orchestration.steps)) {
+        return res.status(400).json({ success: false, error: '缺少必要参数' })
+      }
+      const config = await configManager.loadConfig()
+      // 确保编排数组存在
+      if (!Array.isArray(config.orchestrations)) {
+        config.orchestrations = []
+      }
+      // 生成唯一ID
+      const id = `orch_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
+      const newOrchestration = {
+        id,
+        name: orchestration.name,
+        description: orchestration.description || '',
+        steps: orchestration.steps
+      }
+      config.orchestrations.push(newOrchestration)
+      await configManager.saveConfig(config)
+      res.json({ success: true, orchestration: newOrchestration })
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message })
+    }
+  })
+  // 删除指令编排
+  app.post('/api/config/delete-orchestration', express.json(), async (req, res) => {
+    try {
+      const { id } = req.body
+      if (!id) {
+        return res.status(400).json({ success: false, error: '缺少编排ID参数' })
+      }
+      const config = await configManager.loadConfig()
+      if (Array.isArray(config.orchestrations)) {
+        const index = config.orchestrations.findIndex(orch => orch.id === id)
+        if (index !== -1) {
+          config.orchestrations.splice(index, 1)
+          await configManager.saveConfig(config)
+        }
+      }
+      res.json({ success: true })
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message })
+    }
+  })
+  // 更新指令编排
+  app.post('/api/config/update-orchestration', express.json(), async (req, res) => {
+    try {
+      const { id, orchestration } = req.body
+      if (!id || !orchestration || !orchestration.name || !Array.isArray(orchestration.steps)) {
+        return res.status(400).json({ success: false, error: '缺少必要参数' })
+      }
+      const config = await configManager.loadConfig()
+      if (Array.isArray(config.orchestrations)) {
+        const index = config.orchestrations.findIndex(orch => orch.id === id)
+        if (index !== -1) {
+          config.orchestrations[index] = {
+            id,
+            name: orchestration.name,
+            description: orchestration.description || '',
+            steps: orchestration.steps
+          }
+          await configManager.saveConfig(config)
+        } else {
+          return res.status(404).json({ success: false, error: '未找到指定编排' })
+        }
+      } else {
+        return res.status(404).json({ success: false, error: '编排列表不存在' })
+      }
+      res.json({ success: true })
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message })
+    }
+  })
+  // 版本号递增
+  app.post('/api/version-bump', express.json(), async (req, res) => {
+    try {
+      const { bumpType, packageJsonPath } = req.body
+      // 确定 package.json 的路径
+      let pkgPath
+      if (packageJsonPath && packageJsonPath.trim()) {
+        pkgPath = path.isAbsolute(packageJsonPath)
+          ? packageJsonPath
+          : path.join(currentProjectPath, packageJsonPath)
+      } else {
+        pkgPath = path.join(currentProjectPath, 'package.json')
+      }
+      // 检查文件是否存在（使用 Node.js 原生方法）
+      try {
+        await fs.access(pkgPath)
+      } catch (err) {
+        return res.status(404).json({
+          success: false,
+          error: `未找到 package.json 文件: ${pkgPath}`
+        })
+      }
+      // 读取 package.json
+      const pkgContent = await fs.readFile(pkgPath, 'utf8')
+      const pkg = JSON.parse(pkgContent)
+      if (!pkg.version) {
+        return res.status(400).json({
+          success: false,
+          error: 'package.json 中未找到 version 字段'
+        })
+      }
+      const oldVersion = pkg.version
+      // 解析版本号
+      const versionParts = oldVersion.split('.').map(Number)
+      if (versionParts.length !== 3 || versionParts.some(isNaN)) {
+        return res.status(400).json({
+          success: false,
+          error: `无效的版本号格式: ${oldVersion}，应为 x.y.z 格式`
+        })
+      }
+      // 根据类型递增版本号
+      let [major, minor, patch] = versionParts
+      if (bumpType === 'major') {
+        major += 1
+        minor = 0
+        patch = 0
+      } else if (bumpType === 'minor') {
+        minor += 1
+        patch = 0
+      } else { // patch
+        patch += 1
+      }
+      const newVersion = `${major}.${minor}.${patch}`
+      pkg.version = newVersion
+      // 写回 package.json（保持格式化）
+      await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf8')
+      res.json({
+        success: true,
+        oldVersion,
+        newVersion,
+        filePath: pkgPath
+      })
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message })
+    }
+  })
   // 提交更改
   app.post('/api/commit', express.json(), async (req, res) => {
     try {