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

zen-gitsync 2.6.4 → 2.6.5

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

package/package.json +2 -2
package/src/ui/public/assets/index-D0xeSSyV.js +59 -0
package/src/ui/public/assets/index-DmFxzTUu.css +1 -0
package/src/ui/public/assets/vendor-CiRPTLQ-.js +68 -0
package/src/ui/public/index.html +3 -3
package/src/ui/server/index.js +384 -212
package/src/ui/public/assets/index-42GyTYVk.css +0 -1
package/src/ui/public/assets/index-C-nRMJvh.js +0 -59
package/src/ui/public/assets/vendor-DtkI0iJs.js +0 -68

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-C-nRMJvh.js"></script>
-    <link rel="modulepreload" crossorigin href="/assets/vendor-DtkI0iJs.js">
+    <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-42GyTYVk.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DmFxzTUu.css">
   </head>
   <body>
     <div id="app"></div>

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

@@ -7,23 +7,15 @@ import open from 'open';
 import config from '../../config.js';
 import chalk from 'chalk';
 import fs from 'fs/promises';
+import fsSync from 'fs';
 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);
 const __dirname = path.dirname(__filename);
 const configManager = config; // 确保 configManager 可用
-// 文件系统变动监控器
-let watcher = null;
-// 防抖计时器
-let debounceTimer = null;
-// 防抖延迟时间 (毫秒)
-const DEBOUNCE_DELAY = 1000;
 // 分支状态缓存
 let branchStatusCache = {
   currentBranch: null,
@@ -661,12 +653,6 @@ async function startUIServer(noOpen = false, savePort = false) {
                     console.warn('初始化项目配置失败:', e?.message || e);
                   }
-                  // 关闭旧的文件监控
-                  if (watcher) {
-                    watcher.close().catch(err => console.error('关闭旧监控器失败:', err));
-                    watcher = null;
-                  }
                   // 通知所有旧房间的客户端项目已切换
                   io.to(projectRoomId).emit('project_changed', {
                     oldProjectPath: currentProjectPath,
@@ -694,11 +680,6 @@ async function startUIServer(noOpen = false, savePort = false) {
                   projectRoomId = newProjectRoomId;
                   isGitRepo = false;
-                  if (watcher) {
-                    watcher.close().catch(err => console.error('关闭监控器失败:', err));
-                    watcher = null;
-                  }
                   // 通知所有旧房间的客户端项目已切换
                   io.to(projectRoomId).emit('project_changed', {
                     oldProjectPath: currentProjectPath,
@@ -1446,6 +1427,53 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   })
+  // 置顶模板
+  app.post('/api/config/pin-template', express.json(), async (req, res) => {
+    try {
+      const { template, type } = req.body
+      if (!template || !type) {
+        return res.status(400).json({ success: false, error: '缺少必要参数' })
+      }
+      const config = await configManager.loadConfig()
+      if (type === 'description') {
+        if (config.descriptionTemplates) {
+          // 删除原位置的模板
+          config.descriptionTemplates = config.descriptionTemplates.filter(t => t !== template)
+          // 添加到第一位
+          config.descriptionTemplates.unshift(template)
+          await configManager.saveConfig(config)
+        } else {
+          return res.status(404).json({ success: false, error: '模板列表不存在' })
+        }
+      } else if (type === 'scope') {
+        if (config.scopeTemplates) {
+          config.scopeTemplates = config.scopeTemplates.filter(t => t !== template)
+          config.scopeTemplates.unshift(template)
+          await configManager.saveConfig(config)
+        } else {
+          return res.status(404).json({ success: false, error: '模板列表不存在' })
+        }
+      } else if (type === 'message') {
+        if (config.messageTemplates) {
+          config.messageTemplates = config.messageTemplates.filter(t => t !== template)
+          config.messageTemplates.unshift(template)
+          await configManager.saveConfig(config)
+        } else {
+          return res.status(404).json({ success: false, error: '模板列表不存在' })
+        }
+      } else {
+        return res.status(400).json({ success: false, error: '不支持的模板类型' })
+      }
+      res.json({ success: true })
+    } catch (error) {
+      res.status(500).json({ success: false, error: error.message })
+    }
+  })
   // 保存自定义命令
   app.post('/api/config/save-custom-command', express.json(), async (req, res) => {
     try {
@@ -3369,7 +3397,8 @@ async function startUIServer(noOpen = false, savePort = false) {
               path: dir,
               relativePath: relativePath || '.',
               name: packageData.name || path.basename(dir),
-              scripts: packageData.scripts
+              scripts: packageData.scripts,
+              version: packageData.version || '0.0.0'
             });
             return true;
           }
@@ -3555,6 +3584,340 @@ async function startUIServer(noOpen = false, savePort = false) {
       });
     }
   });
+  // API: 更新npm版本号
+  app.post('/api/update-npm-version', async (req, res) => {
+    try {
+      const { packagePath, versionType } = req.body;
+      if (!packagePath || !versionType) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少必要参数: packagePath, versionType'
+        });
+      }
+      // 确保路径指向package.json文件
+      let packageJsonPath = path.resolve(packagePath);
+      if (fsSync.existsSync(packageJsonPath) && fsSync.statSync(packageJsonPath).isDirectory()) {
+        packageJsonPath = path.join(packageJsonPath, 'package.json');
+      }
+      // 检查文件是否存在
+      if (!fsSync.existsSync(packageJsonPath)) {
+        return res.status(404).json({
+          success: false,
+          error: '找不到package.json文件'
+        });
+      }
+      // 读取package.json
+      const packageJson = JSON.parse(fsSync.readFileSync(packageJsonPath, 'utf8'));
+      if (!packageJson.version) {
+        return res.status(400).json({
+          success: false,
+          error: 'package.json中没有version字段'
+        });
+      }
+      const oldVersion = packageJson.version;
+      const versionParts = oldVersion.split('.').map(Number);
+      // 根据类型增加版本号
+      switch (versionType) {
+        case 'major':
+          versionParts[0]++;
+          versionParts[1] = 0;
+          versionParts[2] = 0;
+          break;
+        case 'minor':
+          versionParts[1]++;
+          versionParts[2] = 0;
+          break;
+        case 'patch':
+          versionParts[2]++;
+          break;
+        default:
+          return res.status(400).json({
+            success: false,
+            error: '无效的版本类型，必须是 major, minor 或 patch'
+          });
+      }
+      const newVersion = versionParts.join('.');
+      packageJson.version = newVersion;
+      // 写回文件
+      fsSync.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf8');
+      console.log(`已更新npm版本号: ${oldVersion} → ${newVersion} (${packagePath})`);
+      res.json({
+        success: true,
+        oldVersion,
+        newVersion
+      });
+    } catch (error) {
+      console.error('更新版本号失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `更新版本号失败: ${error.message}`
+      });
+    }
+  });
+  // API: 添加npm脚本
+  app.post('/api/add-npm-script', async (req, res) => {
+    try {
+      const { packagePath, scriptName, scriptCommand } = req.body;
+      if (!packagePath || !scriptName || !scriptCommand) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少必要参数: packagePath, scriptName, scriptCommand'
+        });
+      }
+      // 确保路径指向package.json文件
+      let packageJsonPath = path.resolve(packagePath);
+      if (fsSync.existsSync(packageJsonPath) && fsSync.statSync(packageJsonPath).isDirectory()) {
+        packageJsonPath = path.join(packageJsonPath, 'package.json');
+      }
+      // 检查文件是否存在
+      if (!fsSync.existsSync(packageJsonPath)) {
+        return res.status(404).json({
+          success: false,
+          error: '找不到package.json文件'
+        });
+      }
+      // 读取package.json
+      const packageJson = JSON.parse(fsSync.readFileSync(packageJsonPath, 'utf8'));
+      // 确保scripts对象存在
+      if (!packageJson.scripts) {
+        packageJson.scripts = {};
+      }
+      // 检查脚本是否已存在
+      if (packageJson.scripts[scriptName]) {
+        return res.status(400).json({
+          success: false,
+          error: `脚本 "${scriptName}" 已存在`
+        });
+      }
+      // 添加脚本
+      packageJson.scripts[scriptName] = scriptCommand;
+      // 写回文件（保持格式化）
+      fsSync.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf8');
+      console.log(`已添加npm脚本: ${scriptName} = ${scriptCommand} (${packagePath})`);
+      res.json({
+        success: true,
+        scriptName,
+        scriptCommand
+      });
+    } catch (error) {
+      console.error('添加npm脚本失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `添加npm脚本失败: ${error.message}`
+      });
+    }
+  });
+  // API: 更新npm脚本
+  app.post('/api/update-npm-script', async (req, res) => {
+    try {
+      const { packagePath, scriptName, scriptCommand, oldScriptName } = req.body;
+      if (!packagePath || !scriptName || !scriptCommand) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少必要参数: packagePath, scriptName, scriptCommand'
+        });
+      }
+      // 确保路径指向package.json文件
+      let packageJsonPath = path.resolve(packagePath);
+      if (fsSync.existsSync(packageJsonPath) && fsSync.statSync(packageJsonPath).isDirectory()) {
+        packageJsonPath = path.join(packageJsonPath, 'package.json');
+      }
+      // 检查文件是否存在
+      if (!fsSync.existsSync(packageJsonPath)) {
+        return res.status(404).json({
+          success: false,
+          error: '找不到package.json文件'
+        });
+      }
+      // 读取package.json
+      const packageJson = JSON.parse(fsSync.readFileSync(packageJsonPath, 'utf8'));
+      // 确保scripts对象存在
+      if (!packageJson.scripts) {
+        packageJson.scripts = {};
+      }
+      // 如果改了脚本名称，删除旧的
+      if (oldScriptName && oldScriptName !== scriptName) {
+        delete packageJson.scripts[oldScriptName];
+      }
+      // 更新脚本
+      packageJson.scripts[scriptName] = scriptCommand;
+      // 写回文件
+      fsSync.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf8');
+      console.log(`已更新npm脚本: ${scriptName} = ${scriptCommand} (${packagePath})`);
+      res.json({
+        success: true,
+        scriptName,
+        scriptCommand
+      });
+    } catch (error) {
+      console.error('更新npm脚本失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `更新npm脚本失败: ${error.message}`
+      });
+    }
+  });
+  // API: 删除npm脚本
+  app.post('/api/delete-npm-script', async (req, res) => {
+    try {
+      const { packagePath, scriptName } = req.body;
+      if (!packagePath || !scriptName) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少必要参数: packagePath, scriptName'
+        });
+      }
+      // 确保路径指向package.json文件
+      let packageJsonPath = path.resolve(packagePath);
+      if (fsSync.existsSync(packageJsonPath) && fsSync.statSync(packageJsonPath).isDirectory()) {
+        packageJsonPath = path.join(packageJsonPath, 'package.json');
+      }
+      // 检查文件是否存在
+      if (!fsSync.existsSync(packageJsonPath)) {
+        return res.status(404).json({
+          success: false,
+          error: '找不到package.json文件'
+        });
+      }
+      // 读取package.json
+      const packageJson = JSON.parse(fsSync.readFileSync(packageJsonPath, 'utf8'));
+      // 检查scripts对象和脚本是否存在
+      if (!packageJson.scripts || !packageJson.scripts[scriptName]) {
+        return res.status(404).json({
+          success: false,
+          error: `脚本 "${scriptName}" 不存在`
+        });
+      }
+      // 删除脚本
+      delete packageJson.scripts[scriptName];
+      // 写回文件
+      fsSync.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf8');
+      console.log(`已删除npm脚本: ${scriptName} (${packagePath})`);
+      res.json({
+        success: true,
+        scriptName
+      });
+    } catch (error) {
+      console.error('删除npm脚本失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `删除npm脚本失败: ${error.message}`
+      });
+    }
+  });
+  // API: 置顶npm脚本
+  app.post('/api/pin-npm-script', async (req, res) => {
+    try {
+      const { packagePath, scriptName } = req.body;
+      if (!packagePath || !scriptName) {
+        return res.status(400).json({
+          success: false,
+          error: '缺少必要参数: packagePath, scriptName'
+        });
+      }
+      // 确保路径指向package.json文件
+      let packageJsonPath = path.resolve(packagePath);
+      if (fsSync.existsSync(packageJsonPath) && fsSync.statSync(packageJsonPath).isDirectory()) {
+        packageJsonPath = path.join(packageJsonPath, 'package.json');
+      }
+      // 检查文件是否存在
+      if (!fsSync.existsSync(packageJsonPath)) {
+        return res.status(404).json({
+          success: false,
+          error: '找不到package.json文件'
+        });
+      }
+      // 读取package.json
+      const packageJson = JSON.parse(fsSync.readFileSync(packageJsonPath, 'utf8'));
+      // 检查scripts对象和脚本是否存在
+      if (!packageJson.scripts || !packageJson.scripts[scriptName]) {
+        return res.status(404).json({
+          success: false,
+          error: `脚本 "${scriptName}" 不存在`
+        });
+      }
+      // 保存要置顶的脚本内容
+      const scriptCommand = packageJson.scripts[scriptName];
+      // 删除该脚本
+      delete packageJson.scripts[scriptName];
+      // 创建新的scripts对象，将置顶脚本放在最前面
+      const newScripts = {
+        [scriptName]: scriptCommand,
+        ...packageJson.scripts
+      };
+      packageJson.scripts = newScripts;
+      // 写回文件
+      fsSync.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n', 'utf8');
+      console.log(`已置顶npm脚本: ${scriptName} (${packagePath})`);
+      res.json({
+        success: true,
+        scriptName
+      });
+    } catch (error) {
+      console.error('置顶npm脚本失败:', error);
+      res.status(500).json({
+        success: false,
+        error: `置顶npm脚本失败: ${error.message}`
+      });
+    }
+  });
   // Socket.io 实时更新
   io.on('connection', (socket) => {
@@ -3571,34 +3934,6 @@ async function startUIServer(noOpen = false, savePort = false) {
     const history = getCommandHistory();
     socket.emit('initial_command_history', { history });
-    // 发送项目信息给客户端
-    socket.emit('project_info', {
-      projectPath: currentProjectPath,
-      projectRoomId: projectRoomId
-    });
-    // 客户端可以请求开始/停止监控
-    socket.on('start_monitoring', () => {
-      if (!watcher) {
-        initFileSystemWatcher().catch(err => console.error('[文件监控] 初始化失败:', err));
-        socket.emit('monitoring_status', { active: true });
-      }
-    });
-    // 处理客户端加入新房间的请求
-    socket.on('join_room', (roomId) => {
-      socket.join(roomId);
-      console.log(`客户端 ${socket.id} 已加入房间: ${roomId}`);
-    });
-    socket.on('stop_monitoring', () => {
-      if (watcher) {
-        watcher.close().catch(err => console.error('关闭监控器失败:', err));
-        watcher = null;
-        socket.emit('monitoring_status', { active: false });
-      }
-    });
     // 请求完整命令历史
     socket.on('request_full_history', () => {
       const fullHistory = getCommandHistory();
@@ -3618,158 +3953,6 @@ async function startUIServer(noOpen = false, savePort = false) {
     });
   });
-  // 读取并解析.gitignore文件
-  async function parseGitignore(projectPath) {
-    const gitignorePath = path.join(projectPath, '.gitignore');
-    const ignorePatterns = [
-      /(^|[\/\\])\../, // 始终忽略.开头的文件（除了.gitignore本身）
-      '**/.git/**', // 始终忽略.git目录
-      // 额外排除常见的编译产物和大文件，减少监控开销
-      '**/*.umd.cjs',      // UMD打包文件
-      '**/*.min.js',       // 压缩JS文件
-      '**/*.bundle.js',    // Webpack打包文件
-      '**/*.dist.js',      // 构建产物
-      '**/*.prod.js',      // 生产环境文件
-      '**/lib/**',         // 通常是编译产物
-      '**/es/**',          // ES模块编译产物
-      '**/esm/**',         // ES模块编译产物
-      '**/*.map',          // Source map文件
-      '**/*.chunk.js',     // 代码分割chunk
-    ];
-    try {
-      const gitignoreContent = await fs.readFile(gitignorePath, 'utf8');
-      const lines = gitignoreContent.split('\n');
-      let validRules = 0;
-      for (let line of lines) {
-        line = line.trim();
-        // 跳过空行和注释
-        if (!line || line.startsWith('#')) continue;
-        // 移除行尾的空格
-        line = line.replace(/\s+$/, '');
-        // 跳过否定规则（chokidar不支持否定规则，这些规则会被忽略）
-        if (line.startsWith('!')) {
-          continue;
-        }
-        // 将gitignore规则转换为glob模式
-        let pattern;
-        // 如果以/开头，表示从根目录开始匹配
-        if (line.startsWith('/')) {
-          pattern = line.substring(1);
-          // 如果是目录，添加/**后缀
-          if (!pattern.includes('*') && !pattern.includes('.')) {
-            ignorePatterns.push(pattern);
-            ignorePatterns.push(pattern + '/**');
-          } else {
-            ignorePatterns.push(pattern);
-          }
-        } else if (line.endsWith('/')) {
-          // 明确的目录规则
-          const dirName = line.slice(0, -1);
-          ignorePatterns.push('**/' + dirName);
-          ignorePatterns.push('**/' + dirName + '/**');
-        } else {
-          // 文件或目录规则
-          // 如果包含*通配符，直接使用
-          if (line.includes('*')) {
-            ignorePatterns.push('**/' + line);
-          } else {
-            // 既匹配文件也匹配目录
-            ignorePatterns.push('**/' + line);
-            ignorePatterns.push('**/' + line + '/**');
-          }
-        }
-        validRules++;
-      }
-      console.log(`[文件监控] 从.gitignore读取了 ${validRules} 条有效的忽略规则`);
-    } catch (error) {
-      // .gitignore不存在或读取失败，使用默认规则
-      console.log('[文件监控] 未找到.gitignore，使用默认忽略规则');
-      ignorePatterns.push(
-        '**/node_modules/**',
-        '**/dist/**',
-        '**/build/**',
-        '**/coverage/**',
-        '**/.nuxt/**',
-        '**/.next/**',
-        '**/out/**',
-        '**/*.log'
-      );
-    }
-    return ignorePatterns;
-  }
-  // 初始化文件系统监控
-  async function initFileSystemWatcher() {
-    // 停止已有的监控器
-    if (watcher) {
-      watcher.close().catch(err => console.error('关闭旧监控器失败:', err));
-    }
-    try {
-      // 获取当前工作目录
-      const currentDir = process.cwd();
-      console.log(`初始化文件系统监控器，路径: ${currentDir}`);
-      // 检查是否是Git仓库
-      if (!isGitRepo) {
-        console.log('当前目录不是Git仓库，不启动监控');
-        return;
-      }
-      const watcherStartTime = Date.now();
-      console.log('[文件监控] 开始初始化监控器...');
-      // 从.gitignore读取忽略规则
-      const ignorePatterns = await parseGitignore(currentDir);
-      // 使用chokidar监控文件变动
-      watcher = chokidar.watch(currentDir, {
-        ignored: ignorePatterns,
-        persistent: true,
-        ignoreInitial: true, // 忽略初始扫描时的文件
-        depth: 10, // 限制扫描深度，避免过深的目录结构
-        awaitWriteFinish: {
-          stabilityThreshold: 300, // 等待文件写入完成的时间
-          pollInterval: 100 // 轮询间隔
-        }
-      });
-      // 合并所有变动事件到一个处理程序
-      const events = ['add', 'change', 'unlink'];
-      events.forEach(event => {
-        watcher.on(event, path => {
-          console.log(`检测到文件变动 [${event}]: ${path}`);
-          debouncedNotifyChanges();
-        });
-      });
-      watcher.on('ready', () => {
-        const initTime = Date.now() - watcherStartTime;
-        console.log(`[文件监控] 监控器初始化完成，耗时 ${initTime}ms`);
-      });
-      watcher.on('error', error => {
-        console.error('[文件监控] 监控错误:', error);
-      });
-      console.log('[文件监控] 监控器已启动（异步初始化中...）');
-    } catch (error) {
-      console.error('启动文件监控失败:', error);
-    }
-  }
   // 获取并广播Git状态 (优化版本 - 只获取porcelain格式)
   async function getAndBroadcastStatus() {
     try {
@@ -3801,17 +3984,6 @@ async function startUIServer(noOpen = false, savePort = false) {
     }
   }
-  // 防抖处理函数
-  function debouncedNotifyChanges() {
-    if (debounceTimer) {
-      clearTimeout(debounceTimer);
-    }
-    debounceTimer = setTimeout(() => {
-      getAndBroadcastStatus();
-    }, DEBOUNCE_DELAY);
-  }
   // 检查当前目录是否是Git仓库
   let isGitRepo = false;
   try {