npm - zen-gitsync - Versions diffs - 2.11.30 → 2.11.32 - Mend

zen-gitsync 2.11.30 → 2.11.32

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/src/ui/public/index.html CHANGED Viewed

@@ -10,11 +10,11 @@
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,400&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet" />
-    <script type="module" crossorigin src="/assets/index-LS9fheYp.js"></script>
+    <script type="module" crossorigin src="/assets/index-BNd_56JT.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-BM3Ffeng.js">
-    <link rel="modulepreload" crossorigin href="/assets/vendor-BGRFri1B.js">
-    <link rel="stylesheet" crossorigin href="/assets/vendor-CKD7ZwC_.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-BEBp0Z-C.css">
+    <link rel="modulepreload" crossorigin href="/assets/vendor-DTKP57oj.js">
+    <link rel="stylesheet" crossorigin href="/assets/vendor-7wb-m8Qu.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DAGcNJIG.css">
   </head>
   <body>
     <div id="app"></div>

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

@@ -27,6 +27,8 @@ import { registerFileOpenRoutes } from './routes/fileOpen.js';
 import { registerGitOpsRoutes } from './routes/gitOps.js';
 import { registerCodeRoutes } from './routes/code.js';
 import { registerCodeAnalysisRoutes } from './routes/codeAnalysis.js';
+import { registerInstancesRoutes } from './routes/instances.js';
+import { createInstanceRegistry } from './utils/instanceRegistry.js';
 import { createSavePortToFile } from './utils/createSavePortToFile.js';
 import { startServerOnAvailablePort } from './utils/startServerOnAvailablePort.js';
 import { createFilePickerMiddleware } from 'local-file-picker';
@@ -74,7 +76,16 @@ async function startUIServer(noOpen = false, savePort = false) {
   // 注册Socket.io实例，用于命令历史通知
   registerSocketIO(io);
+  // 构建实例注册表（用于跨进程共享"当前运行中的 GUI"信息）
+  // 注册表文件位于用户主目录，所有 g ui 进程共享写入
+  const instanceRegistry = createInstanceRegistry({
+    fs,
+    path,
+    os,
+    registryPath: path.join(os.homedir(), '.zen-gitsync-instances.json')
+  });
   // 添加全局中间件来解析JSON请求体
   app.use(express.json());
@@ -203,6 +214,13 @@ async function startUIServer(noOpen = false, savePort = false) {
   registerCodeAnalysisRoutes({ app, configManager });
+  // 实例注册表 API：列出当前所有运行中的 GUI
+  registerInstancesRoutes({
+    app,
+    registry: instanceRegistry,
+    getCurrentInstanceId: () => process.pid
+  });
   registerGitOpsRoutes({
     app,
     execGitCommand,
@@ -276,15 +294,26 @@ async function startUIServer(noOpen = false, savePort = false) {
   // 启动服务器
   const PORT = 3000;
   // 创建一个函数来保存端口号到文件和环境变量
   // 使用闭包保存端口状态，防止多次写入相同端口
   const savePortToFile = createSavePortToFile({ savePort, fs, path });
   // 使用变量标记回调是否已执行，防止多次触发
   const callbackExecutedRef = { value: false };
-  // 尝试在可用端口上启动服务器
-  await startServerOnAvailablePort({
+  // 用 'listening' 事件做注册触发：startServerOnAvailablePort 的 await
+  // 在端口重试场景下不一定按时返回，但 'listening' 事件只在服务器真正绑定端口时触发
+  let registerDone = false;
+  httpServer.once('listening', () => {
+    if (registerDone) return;
+    registerDone = true;
+    registerCurrentInstance().catch((e) => {
+      console.warn(chalk.yellow(`[instanceRegistry] 启动注册流程失败: ${e?.message || e}`));
+    });
+  });
+  // 尝试在可用端口上启动服务器（不等待；listen 事件会驱动后续逻辑）
+  startServerOnAvailablePort({
     httpServer,
     startPort: PORT,
     chalk,
@@ -294,8 +323,64 @@ async function startUIServer(noOpen = false, savePort = false) {
     savePortToFile,
     maxTries: 100,
     callbackExecutedRef
+  }).catch((e) => {
+    console.error('启动服务器失败:', e);
   });
+  // 把所有注册/心跳/watch 逻辑封装到独立函数，由 listening 事件触发
+  async function registerCurrentInstance() {
+    const addr = httpServer.address();
+    const currentPort = addr && addr.port;
+    if (!currentPort) {
+      console.warn(chalk.yellow('[instanceRegistry] 无法获取当前端口，跳过注册'));
+      return;
+    }
+    try {
+      const projectName = await instanceRegistry._resolveProjectName(currentProjectPath);
+      await instanceRegistry.register({
+        pid: process.pid,
+        port: currentPort,
+        projectPath: currentProjectPath,
+        projectName,
+        hostname: os.hostname()
+      });
+      console.log(chalk.green(`[instanceRegistry] 已注册 pid=${process.pid} port=${currentPort} name=${projectName}`));
+    } catch (e) {
+      console.warn(chalk.yellow(`[instanceRegistry] 注册失败: ${e?.message || e}`));
+      return;
+    }
+    // 5 秒心跳
+    const heartbeatTimer = setInterval(() => {
+      instanceRegistry.heartbeat(process.pid, { projectPath: currentProjectPath })
+        .catch((e) => console.warn(chalk.yellow(`[instanceRegistry] 心跳失败: ${e?.message || e}`)));
+    }, 5000);
+    // 监听注册表文件变化：任何进程写入都会触发，向本进程的所有客户端广播
+    // fs.watch 在 Windows 上偶有不可靠，Socket.IO 推送 + 前端轮询（15s）兜底
+    const stopWatcher = instanceRegistry.watch(async (fresh) => {
+      try {
+        io.emit('instances_changed', { instances: fresh });
+      } catch (e) {
+        console.warn(chalk.yellow(`[instanceRegistry] 广播失败: ${e?.message || e}`));
+      }
+    }, fsSync.watch);
+    // 优雅退出：SIGINT/SIGTERM 触发异步 unregister + 清心跳
+    const shutdown = async (signal) => {
+      try { clearInterval(heartbeatTimer); } catch (_) {}
+      try { await instanceRegistry.unregister(process.pid); } catch (_) {}
+      console.log(chalk.gray(`[instanceRegistry] 收到 ${signal}，已清理本实例`));
+    };
+    process.on('SIGINT', () => { shutdown('SIGINT'); });
+    process.on('SIGTERM', () => { shutdown('SIGTERM'); });
+    // 'exit' 是同步钩子，无法 await：仅关闭 watcher；kill -9 走心跳超时
+    process.on('exit', () => {
+      try { stopWatcher && stopWatcher(); } catch (_) {}
+    });
+  }
  }
  export default startUIServer;

package/src/ui/server/routes/instances.js ADDED Viewed

@@ -0,0 +1,24 @@
+// 实例注册表 API 路由
+// 当前只暴露只读列表；停止/启停他人实例属于 out-of-scope（v1 只做跳转导航）
+export function registerInstancesRoutes({ app, registry, getCurrentInstanceId }) {
+  // 获取所有活跃实例（自动 prune 失效条目）
+  app.get('/api/instances', async (req, res) => {
+    try {
+      const instances = await registry.list({ pruneStale: true });
+      const currentInstanceId = typeof getCurrentInstanceId === 'function'
+        ? getCurrentInstanceId()
+        : null;
+      res.json({
+        success: true,
+        instances,
+        currentInstanceId
+      });
+    } catch (error) {
+      res.status(500).json({
+        success: false,
+        error: error?.message || String(error)
+      });
+    }
+  });
+}

package/src/ui/server/utils/instanceRegistry.js ADDED Viewed

@@ -0,0 +1,256 @@
+// 实例注册表工具
+// 维护 ~/.zen-gitsync-instances.json，记录所有正在运行的 GUI 实例
+// 多进程并发写采用 atomic temp+rename + 进程内串行化 Promise 链
+// stale 判定：PID 不存在 或 lastHeartbeat 超过阈值
+const STALE_MS = 30_000;          // 心跳超时阈值（毫秒）
+const WATCH_DEBOUNCE_MS = 100;    // fs.watch 防抖时间
+const REGISTRY_VERSION = 1;
+function isProcessAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    // 信号 0 仅做存活检查，不真正发送信号
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    if (err && (err.code === 'ESRCH' || err.code === 'ENOENT')) {
+      return false;
+    }
+    // EPERM 等情况：进程存在但权限不足，按 alive 处理
+    return true;
+  }
+}
+// 解析项目名：优先 package.json.name，兜底为目录 basename
+async function resolveProjectName(projectPath, fsMod, pathMod) {
+  if (!projectPath) return '';
+  try {
+    const pkgPath = pathMod.join(projectPath, 'package.json');
+    const raw = await fsMod.readFile(pkgPath, 'utf-8');
+    const pkg = JSON.parse(raw);
+    if (pkg && typeof pkg.name === 'string' && pkg.name.trim()) {
+      return pkg.name.trim();
+    }
+  } catch (_) {
+    // 读失败或解析失败，兜底
+  }
+  return pathMod.basename(projectPath);
+}
+export function createInstanceRegistry({ fs: fsMod, path: pathMod, os: osMod, registryPath }) {
+  if (!fsMod || !pathMod || !osMod || !registryPath) {
+    throw new Error('createInstanceRegistry: 必须提供 fs/path/os/registryPath');
+  }
+  // 进程内写串行化：所有 mutate 操作都 await 这条链
+  let writeChain = Promise.resolve();
+  function enqueueWrite(task) {
+    const next = writeChain.then(task, task);
+    // 不让单个失败阻塞后续操作
+    writeChain = next.catch(() => {});
+    return next;
+  }
+  async function readAll() {
+    try {
+      const raw = await fsMod.readFile(registryPath, 'utf-8');
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === 'object' && parsed.instances && typeof parsed.instances === 'object') {
+        return parsed;
+      }
+      return { version: REGISTRY_VERSION, instances: {} };
+    } catch (err) {
+      if (err && err.code === 'ENOENT') {
+        return { version: REGISTRY_VERSION, instances: {} };
+      }
+      console.warn(`[instanceRegistry] 读取注册表失败，按空表处理: ${err?.message || err}`);
+      return { version: REGISTRY_VERSION, instances: {} };
+    }
+  }
+  async function writeAll(obj) {
+    const payload = {
+      version: REGISTRY_VERSION,
+      ...obj,
+      instances: obj.instances || {}
+    };
+    const tmpPath = `${registryPath}.tmp`;
+    await fsMod.writeFile(tmpPath, JSON.stringify(payload, null, 2), 'utf-8');
+    await fsMod.rename(tmpPath, registryPath);
+  }
+  // 同步裁剪：传入当前内存中的 instances 字典，返回裁剪后的新字典
+  function pruneInPlace(instances) {
+    const now = Date.now();
+    const result = {};
+    for (const [pidStr, entry] of Object.entries(instances)) {
+      if (!entry || typeof entry !== 'object') continue;
+      const pid = Number(entry.pid ?? Number(pidStr));
+      if (!isProcessAlive(pid)) continue;
+      if (typeof entry.lastHeartbeat === 'number' && now - entry.lastHeartbeat > STALE_MS) continue;
+      result[pidStr] = entry;
+    }
+    return result;
+  }
+  // 公开 API
+  async function register({ pid, port, projectPath, projectName, hostname } = {}) {
+    if (!Number.isInteger(pid) || pid <= 0) throw new Error('register: pid 必填');
+    if (!Number.isInteger(port) || port <= 0) throw new Error('register: port 必填');
+    if (!projectPath) throw new Error('register: projectPath 必填');
+    const resolvedName = projectName && String(projectName).trim()
+      ? String(projectName).trim()
+      : await resolveProjectName(projectPath, fsMod, pathMod);
+    const entry = {
+      pid,
+      port,
+      projectName: resolvedName,
+      projectPath,
+      startedAt: Date.now(),
+      lastHeartbeat: Date.now(),
+      hostname: hostname || osMod.hostname()
+    };
+    await enqueueWrite(async () => {
+      const obj = await readAll();
+      obj.instances[String(pid)] = entry;
+      await writeAll(obj);
+    });
+    return entry;
+  }
+  async function unregister(pid) {
+    if (!Number.isInteger(pid) || pid <= 0) return;
+    await enqueueWrite(async () => {
+      const obj = await readAll();
+      if (obj.instances && obj.instances[String(pid)]) {
+        delete obj.instances[String(pid)];
+        await writeAll(obj);
+      }
+    });
+  }
+  async function heartbeat(pid, updates = {}) {
+    if (!Number.isInteger(pid) || pid <= 0) return;
+    await enqueueWrite(async () => {
+      const obj = await readAll();
+      const key = String(pid);
+      const existing = obj.instances[key];
+      if (!existing) {
+        // 如果心跳时条目不存在（被裁剪或被外部清理），跳过；
+        // 由调用方负责周期性 re-register
+        return;
+      }
+      obj.instances[key] = {
+        ...existing,
+        ...(updates.projectPath ? { projectPath: updates.projectPath } : {}),
+        ...(updates.projectName ? { projectName: updates.projectName } : {}),
+        lastHeartbeat: Date.now()
+      };
+      await writeAll(obj);
+    });
+  }
+  async function list({ pruneStale = true } = {}) {
+    const obj = await readAll();
+    let instances = obj.instances || {};
+    if (pruneStale) {
+      instances = pruneInPlace(instances);
+      // 如果发生了裁剪，持久化回去
+      const hasChange = Object.keys(instances).length !== Object.keys(obj.instances || {}).length;
+      if (hasChange) {
+        await enqueueWrite(async () => {
+          const fresh = await readAll();
+          fresh.instances = pruneInPlace(fresh.instances || {});
+          await writeAll(fresh);
+        });
+      }
+    }
+    const arr = Object.values(instances);
+    arr.sort((a, b) => (a.port || 0) - (b.port || 0));
+    return arr;
+  }
+  // 监听注册表文件变化；callback 会在 debounce 后被调用，参数是最新 list
+  // fsWatch 参数：node 'fs' 模块的 watch 函数（同步 + EventEmitter 形式）
+  function watch(callback, fsWatch) {
+    if (typeof callback !== 'function') {
+      throw new Error('watch: callback 必填');
+    }
+    if (typeof fsWatch !== 'function') {
+      console.warn('[instanceRegistry] 未提供 fs.watch，跨进程推送将不可用');
+      return function noop() {};
+    }
+    let debounceTimer = null;
+    let watcher = null;
+    let pruneTimer = null;
+    let closed = false;
+    const fire = async () => {
+      if (closed) return;
+      try {
+        const fresh = await list({ pruneStale: true });
+        callback(fresh);
+      } catch (e) {
+        console.warn(`[instanceRegistry] watch 回调失败: ${e?.message || e}`);
+      }
+    };
+    // 周期性 prune：即便没有其他进程写入注册表，也定期清理本地失效条目
+    // （例如所有 server 都强 kill 后，文件里残留的僵尸条目会被自动清理）
+    pruneTimer = setInterval(() => {
+      if (closed) return;
+      list({ pruneStale: true }).catch(() => {});
+    }, STALE_MS / 3);
+    try {
+      watcher = fsWatch(registryPath, { persistent: false }, () => {
+        if (closed) return;
+        if (debounceTimer) clearTimeout(debounceTimer);
+        debounceTimer = setTimeout(fire, WATCH_DEBOUNCE_MS);
+      });
+      if (watcher && typeof watcher.on === 'function') {
+        watcher.on('error', (err) => {
+          console.warn(`[instanceRegistry] fs.watch 出错: ${err?.message || err}`);
+        });
+      }
+    } catch (err) {
+      console.warn(`[instanceRegistry] 无法启动 fs.watch (${err?.message || err})，跨进程推送将不可用，请依赖轮询`);
+    }
+    return function closeWatcher() {
+      closed = true;
+      if (debounceTimer) {
+        clearTimeout(debounceTimer);
+        debounceTimer = null;
+      }
+      if (pruneTimer) {
+        clearInterval(pruneTimer);
+        pruneTimer = null;
+      }
+      if (watcher) {
+        try { watcher.close(); } catch (_) {}
+        watcher = null;
+      }
+    };
+  }
+  function close() {
+    // 工厂内部无 timer，仅为 API 对称
+  }
+  return {
+    register,
+    unregister,
+    heartbeat,
+    list,
+    watch,
+    close,
+    _resolveProjectName: (p) => resolveProjectName(p, fsMod, pathMod),
+    _STALE_MS: STALE_MS
+  };
+}