npm - zen-gitsync - Versions diffs - 2.16.39 → 2.16.41 - Mend

zen-gitsync 2.16.39 → 2.16.41

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

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

@@ -10,18 +10,18 @@
     <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-hyzLLFKf.js"></script>
+    <script type="module" crossorigin src="/assets/index-CwgZxqFI.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-BM3Ffeng.js">
     <link rel="modulepreload" crossorigin href="/assets/monaco-43aputPh.js">
     <link rel="modulepreload" crossorigin href="/assets/element-plus-Cchqf1s7.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-FHXYVNcm.js">
-    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-C5Vpcpi0.js">
+    <link rel="modulepreload" crossorigin href="/assets/_plugin-vue_export-helper-CkojBFWh.js">
     <link rel="modulepreload" crossorigin href="/assets/socket-io-BZIzo1US.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-flow-3jJr-V2W.js">
     <link rel="modulepreload" crossorigin href="/assets/flow-mindmap-D4bc307Q.js">
-    <link rel="modulepreload" crossorigin href="/assets/SvgIcon-ryKBwC8P.js">
-    <link rel="modulepreload" crossorigin href="/assets/CommonDialog-ByvhJIxb.js">
-    <link rel="modulepreload" crossorigin href="/assets/configStore-DdYe2Jg3.js">
+    <link rel="modulepreload" crossorigin href="/assets/SvgIcon-DniMQk5U.js">
+    <link rel="modulepreload" crossorigin href="/assets/CommonDialog-Zoo8fqjA.js">
+    <link rel="modulepreload" crossorigin href="/assets/configStore-BisOZpe4.js">
     <link rel="modulepreload" crossorigin href="/assets/toolsStore-C0VjU2dD.js">
     <link rel="stylesheet" crossorigin href="/assets/monaco-B2lPvkrc.css">
     <link rel="stylesheet" crossorigin href="/assets/element-plus-D3Dn7nX0.css">
@@ -30,7 +30,7 @@
     <link rel="stylesheet" crossorigin href="/assets/flow-mindmap-DnzM9SlK.css">
     <link rel="stylesheet" crossorigin href="/assets/SvgIcon-BQ6bR7l0.css">
     <link rel="stylesheet" crossorigin href="/assets/CommonDialog-Cyh3xu0p.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-DDmVbc4D.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DLi15Rb_.css">
   </head>
   <body>
     <div id="app"></div>

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

@@ -35,7 +35,10 @@ export function registerInstancesRoutes({
     });
   }));
-  // 只允许关闭注册表中仍存活的“其他实例”。前端不能传 signal 或任意命令。
+  // 关闭注册表中仍存活的实例(含当前实例,见下方 selfClose 分支)。前端不能传
+  // signal 或任意命令。当前实例关闭走和 SIGINT 一样的 graceful shutdown 链路
+  // (server/index.js:648 的 SIGTERM handler):drain 子进程 + unregister + exit,
+  // 响应先于 SIGTERM 触发发出,所以客户端能拿到 success。
   app.post('/api/instances/:pid/close', asyncRoute(async (req, res) => {
     const pidText = String(req.params?.pid || '');
     if (!/^\d+$/.test(pidText)) {
@@ -46,9 +49,7 @@ export function registerInstancesRoutes({
     const currentInstanceId = typeof getCurrentInstanceId === 'function'
       ? getCurrentInstanceId()
       : null;
-    if (pid === currentInstanceId) {
-      throw new HttpError(400, '不能从当前页面关闭当前实例');
-    }
+    const isSelfClose = pid === currentInstanceId;
     const instances = await registry.list({ pruneStale: true });
     const target = instances.find((instance) => instance.pid === pid);
@@ -73,7 +74,15 @@ export function registerInstancesRoutes({
       success: true,
       closedPid: pid,
       message: `已关闭实例 ${target.projectName || pid}`,
+      // 标记是否为当前实例。前端靠它决定要不要调 window.close() 关 tab。
+      selfClose: isSelfClose,
     });
+    if (isSelfClose) {
+      // 同步把 SIGTERM 事件 emit 给本进程的 listener(handler 内部 async,且
+      // 最后 setTimeout 100ms 才 exit);setImmediate 把 emit 推到下个 tick,
+      // 确保上面的 res.json 已同步写到 socket buffer,客户端能收到响应。
+      setImmediate(() => process.emit('SIGTERM'));
+    }
   }));
   // 批量关闭注册表中所有非当前实例。逐个走 kill + unregister，失败不影响其他项。

package/src/ui/server/routes/instances.test.js CHANGED Viewed

@@ -47,13 +47,58 @@ test('instances close: 关闭已注册的其他实例并反注册', async () =>
   assert.deepEqual(unregistered, [200])
 })
-test('instances close: 禁止关闭当前实例', async () => {
-  const { routes, killed } = setup({ currentPid: 100, instances: [{ pid: 100, port: 5800 }] })
-  const result = await callClose(routes.get('POST /api/instances/:pid/close'), 100)
+test('instances close: 允许关闭当前实例(selfClose=true),并 emit SIGTERM 触发自身 graceful shutdown', async () => {
+  // 当前实例的关闭走自身 SIGTERM handler(server/index.js:648),由
+  // instances.js 在 res.json 之后 setImmediate(() => process.emit('SIGTERM'))
+  // 触发。本测试用一个临时 listener 验证 emit 真的发生了一次。
+  const target = { pid: 100, port: 5800, projectName: 'self' }
+  let sigtermCount = 0
+  const onSigterm = () => { sigtermCount++ }
+  process.on('SIGTERM', onSigterm)
+  try {
+    const { routes, killed, unregistered } = setup({
+      currentPid: 100,
+      instances: [target],
+    })
+    const result = await callClose(routes.get('POST /api/instances/:pid/close'), 100)
+    // 等 setImmediate 队列跑完,让 emit SIGTERM 触发 listener
+    await new Promise((resolve) => setImmediate(resolve))
+    assert.equal(result.statusCode, 200)
+    assert.equal(result.payload.success, true)
+    assert.equal(result.payload.selfClose, true, 'should mark current instance as self-close')
+    assert.deepEqual(killed, [[100, 'SIGTERM']], 'killProcess 仍要正常调用(SIGTERM handler 真正入口)')
+    assert.deepEqual(unregistered, [100])
+    assert.equal(sigtermCount, 1, 'self-close 后应 emit 一次 SIGTERM 触发自身 shutdown handler')
+  } finally {
+    process.off('SIGTERM', onSigterm)
+  }
+})
-  assert.equal(result.statusCode, 400)
-  assert.match(result.payload.error, /不能.*当前实例/)
-  assert.deepEqual(killed, [])
+test('instances close: 关闭其他实例时 selfClose=false,不 emit SIGTERM', async () => {
+  const target = { pid: 200, port: 5801, projectName: 'other' }
+  let sigtermCount = 0
+  const onSigterm = () => { sigtermCount++ }
+  process.on('SIGTERM', onSigterm)
+  try {
+    const { routes, killed, unregistered } = setup({
+      currentPid: 100,
+      instances: [target],
+    })
+    const result = await callClose(routes.get('POST /api/instances/:pid/close'), 200)
+    await new Promise((resolve) => setImmediate(resolve))
+    assert.equal(result.statusCode, 200)
+    assert.equal(result.payload.success, true)
+    assert.equal(result.payload.selfClose, false, 'other instance must not be marked self-close')
+    assert.deepEqual(killed, [[200, 'SIGTERM']])
+    assert.deepEqual(unregistered, [200])
+    assert.equal(sigtermCount, 0, '关闭其他实例不应触发自身 SIGTERM')
+  } finally {
+    process.off('SIGTERM', onSigterm)
+  }
 })
 test('instances close: 不允许关闭注册表外的 PID', async () => {