ai-helper-agent 1.14.10 → 1.14.11

package/bin/agent.js

@@ -372,20 +372,32 @@ if (command === 'start') {
 
   const running = await isRunning(config);
   if (running) {
+    let apiShutdownOk = false;
     try {
       const resp = await fetch(`http://${config.host}:${config.port}/api/shutdown`, {
         method: 'POST'
       });
       if (resp.ok) {
-        const data = await resp.json();
-        console.log(`[Agent] ${data.message || t('agentStopped')}`);
+        try {
+          const data = await resp.json();
+          console.log(`[Agent] ${data.message || t('agentStopped')}`);
+        } catch {
+          // 服务端在发送响应后关闭连接，json() 可能读不到完整数据
+          // 但 shutdown 请求已成功送达，服务正在关闭
+          console.log(`[Agent] ${t('agentStopped')}`);
+        }
+        apiShutdownOk = true;
         removePidFile();
         process.exit(0);
       }
-    } catch (err) {
-      console.error(`[Agent] ${t('apiShutdownFailed')}: ${err.message}`);
+    } catch {
+      // isRunning() 刚确认服务在线，fetch 出错说明服务端已关闭连接（shutdown 正在执行）
+      // 视为关闭成功，不打印错误
+      apiShutdownOk = true;
+    }
+    if (!apiShutdownOk) {
+      console.log(`[Agent] ${t('apiShutdownFallback')}`);
     }
-    console.log(`[Agent] ${t('apiShutdownFallback')}`);
   }
 
   const pid = getPidFromFile();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-helper-agent",
-  "version": "1.14.10",
+  "version": "1.14.11",
   "description": "AI Helper Agent - Local file access and system command execution proxy for Chrome extension / AI Helper 代理服务，为 Chrome 扩展提供本地文件读写和系统命令执行",
   "type": "module",
   "main": "./src/server.js",

package/src/server.js

@@ -485,6 +485,39 @@ export function startServer() {
       });
     }
 
+    // Agent 关闭：本机来源（CLI stop）免认证，远程来源仍需认证（防止 0.0.0.0 监听时遭网络攻击）
+    if (req.method === 'POST' && pathname === '/api/shutdown') {
+      const remoteIp = req.socket.remoteAddress || '';
+      const isLocal = remoteIp === '127.0.0.1' || remoteIp === '::1' || remoteIp === '::ffff:127.0.0.1' || remoteIp === 'localhost';
+      if (!isLocal) {
+        // 远程来源：走正常认证流程
+        const authHeader = req.headers.authorization;
+        if (!authHeader || !authHeader.startsWith('Bearer ')) {
+          logSecurity('shutdown_auth_missing', { path: pathname, remote: remoteIp });
+          return jsonResponse(res, 401, { success: false, error: t('error.noToken') });
+        }
+        const extId = verifyToken(authHeader.slice(7));
+        if (!extId) {
+          logSecurity('shutdown_auth_invalid', { path: pathname, remote: remoteIp });
+          return jsonResponse(res, 403, { success: false, error: t('error.invalidToken') });
+        }
+      }
+      if (agentOperationInProgress) {
+        return jsonResponse(res, 409, { success: false, error: t('error.operationInProgress') });
+      }
+      if (Date.now() - lastOperationTime < OPERATION_COOLDOWN_MS) {
+        const wait = Math.ceil((OPERATION_COOLDOWN_MS - (Date.now() - lastOperationTime)) / 1000);
+        return jsonResponse(res, 429, { success: false, error: t('error.tooFrequent', { wait }) });
+      }
+      agentOperationInProgress = true;
+      lastOperationTime = Date.now();
+      logSystem('shutdown', { reason: 'api_request', local: isLocal, remote: remoteIp });
+      jsonResponse(res, 200, { success: true, message: t('message.shuttingDown') });
+      // 延迟 200ms 再关闭，确保响应数据已送达客户端（res.end() 仅写入缓冲区，不保证客户端已接收）
+      setTimeout(() => shutdown(), 200);
+      return;
+    }
+
     // ---------- 需要认证的接口 ----------
     const authHeader = req.headers.authorization;
     if (!authHeader || !authHeader.startsWith('Bearer ')) {
@@ -503,23 +536,6 @@ export function startServer() {
       return jsonResponse(res, 200, { success: true, time: Date.now() });
     }
 
-    // Agent 关闭（需认证）
-    if (req.method === 'POST' && pathname === '/api/shutdown') {
-      if (agentOperationInProgress) {
-        return jsonResponse(res, 409, { success: false, error: t('error.operationInProgress') });
-      }
-      if (Date.now() - lastOperationTime < OPERATION_COOLDOWN_MS) {
-        const wait = Math.ceil((OPERATION_COOLDOWN_MS - (Date.now() - lastOperationTime)) / 1000);
-        return jsonResponse(res, 429, { success: false, error: t('error.tooFrequent', { wait }) });
-      }
-      agentOperationInProgress = true;
-      lastOperationTime = Date.now();
-      logSystem('shutdown', { reason: 'api_request', extId });
-      jsonResponse(res, 200, { success: true, message: t('message.shuttingDown') });
-      shutdown();
-      return;
-    }
-
     // 重启 Agent（需认证）
     if (req.method === 'POST' && pathname === '/api/agent/restart') {
       if (agentOperationInProgress) {