@gecho-ai/gecho-bridge 1.1.1 → 1.1.2

package/index.js

@@ -148,9 +148,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
       const timeoutId = setTimeout(() => {
         if (pendingRequests.has(requestId)) {
           pendingRequests.delete(requestId);
-          resolve({ error: "抓取超时 (120s)，请检查浏览器是否已停止滚动" });
+          resolve({ error: "抓取超时 (300s)，请检查浏览器是否已停止滚动" });
         }
-      }, 120000);
+      }, 300000);
 
       pendingRequests.set(requestId, { resolve, reject, timeoutId });
 
@@ -243,8 +243,8 @@ async function run() {
     const result = await new Promise((resolve) => {
       const timeoutId = setTimeout(() => {
         pendingRequests.delete(requestId);
-        resolve({ error: "抓取超时 (120s)" });
-      }, 120000);
+        resolve({ error: "抓取超时 (300s)" });
+      }, 300000);
 
       pendingRequests.set(requestId, { resolve, timeoutId });
 

package/mcp-client.js

@@ -19,7 +19,10 @@ const http = require("http");
 const { spawn } = require("child_process");
 const path = require("path");
 
-const HTTP_SERVICE_URL = "http://127.0.0.1:18793/search";
+const SERVICE_BASE_URL = "http://127.0.0.1:18793";
+const HTTP_SERVICE_URL = `${SERVICE_BASE_URL}/search`;
+const PING_URL = `${SERVICE_BASE_URL}/ping`;
+const SHUTDOWN_URL = `${SERVICE_BASE_URL}/shutdown`;
 const SERVICE_PATH = path.join(__dirname, "server.js");
 
 const server = new Server(
@@ -32,7 +35,7 @@ const server = new Server(
  */
 function checkServiceAlive() {
   return new Promise((resolve) => {
-    const req = http.get("http://127.0.0.1:18793/ping", (res) => {
+    const req = http.get(PING_URL, (res) => {
       resolve(res.statusCode === 200);
     });
     req.on("error", () => resolve(false));
@@ -41,31 +44,65 @@ function checkServiceAlive() {
 }
 
 /**
- * 自动拉起 Service 层
+ * 请求旧服务优雅退出
  */
-async function ensureServiceRunning() {
-  const alive = await checkServiceAlive();
-  if (alive) {
-    return;
-  }
+function requestShutdown() {
+  return new Promise((resolve) => {
+    const req = http.request(SHUTDOWN_URL, { method: "POST" }, (res) => {
+      resolve(res.statusCode >= 200 && res.statusCode < 300);
+    });
+    req.on("error", () => resolve(false));
+    req.setTimeout(1000, () => {
+      req.destroy();
+      resolve(false);
+    });
+    req.end();
+  });
+}
 
+function startServiceDetached() {
   const child = spawn("node", [SERVICE_PATH], {
     detached: true,
     stdio: "ignore" // 静默启动，不占用当前终端
   });
-
   child.unref(); // 让子进程独立运行，父进程退出时不影响它
+}
 
-  // 等待服务启动成功
-  let retries = 5;
+async function waitForServiceDown() {
+  let retries = 10;
   while (retries > 0) {
-    await new Promise(r => setTimeout(r, 1000));
+    await new Promise((r) => setTimeout(r, 300));
+    if (!(await checkServiceAlive())) {
+      return true;
+    }
+    retries--;
+  }
+  return false;
+}
+
+async function waitForServiceUp() {
+  let retries = 8;
+  while (retries > 0) {
+    await new Promise((r) => setTimeout(r, 800));
     if (await checkServiceAlive()) {
-      return;
+      return true;
     }
     retries--;
   }
-  throw new Error("Failed to start Service Layer after 5s.");
+  return false;
+}
+
+/**
+ * 启动即接管：每次启动 MCP 时先尝试关闭旧服务，再拉起当前服务
+ */
+async function ensureServiceRunning() {
+  await requestShutdown();
+  await waitForServiceDown();
+  startServiceDetached();
+  const ready = await waitForServiceUp();
+  if (!ready) {
+    throw new Error("Failed to start Service Layer.");
+  }
 }
 
 // 1. 定义工具
@@ -138,7 +175,15 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         return { content: [{ type: "text", text: `❌ 错误: ${serviceResponse.error}` }], isError: true };
       }
 
-      const result = serviceResponse.data || [];
+      const result = serviceResponse.data;
+      if (typeof result === 'object' && result !== null && result.error) {
+        return { content: [{ type: "text", text: `❌ 抓取错误: ${result.error}` }], isError: true };
+      }
+
+      if (!Array.isArray(result)) {
+        return { content: [{ type: "text", text: `❌ 异常: 服务端未返回数组格式的数据` }], isError: true };
+      }
+
       const savePath = serviceResponse.savePath || "";
       const saveLine = savePath
         ? `📂 完整结果已保存到: ${savePath}\n\n`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gecho-ai/gecho-bridge",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "MCP Bridge for TikTok Extension Relay - Connecting LLMs to TikTok via Chrome Extension",
   "main": "mcp-client.js",
   "bin": {

package/server.js

@@ -19,6 +19,7 @@ const HTTP_PORT = 18793;
 let extensionSocket = null;
 const pendingRequests = new Map();
 let requestIdCounter = 1;
+let shuttingDown = false;
 
 function decodeBase64Utf8(value) {
   try {
@@ -64,6 +65,36 @@ function toSafeFileName(name) {
   return reserved.has(upper) ? `${candidate}_` : candidate;
 }
 
+function gracefulShutdown(reason) {
+  if (shuttingDown) return;
+  shuttingDown = true;
+  console.log(`🛑 Service shutting down: ${reason}`);
+
+  for (const [_requestId, pending] of pendingRequests) {
+    clearTimeout(pending.timeoutId);
+    pending.resolve({ error: "Service is shutting down" });
+  }
+  pendingRequests.clear();
+
+  try {
+    if (extensionSocket && extensionSocket.readyState === 1) {
+      extensionSocket.close(1001, "service_shutdown");
+    }
+  } catch (_e) {}
+
+  try {
+    wss.close(() => {
+      server.close(() => process.exit(0));
+    });
+  } catch (_e) {
+    try {
+      server.close(() => process.exit(0));
+    } catch (__e) {
+      process.exit(0);
+    }
+  }
+}
+
 // --- WebSocket Server (与插件通信) ---
 const wss = new WebSocketServer({ port: WS_PORT, host: "127.0.0.1" });
 
@@ -112,7 +143,18 @@ const server = http.createServer(async (req, res) => {
     return res.end(JSON.stringify({ status: "ok" }));
   }
 
+  if (req.method === "POST" && req.url === "/shutdown") {
+    res.end(JSON.stringify({ status: "ok", message: "shutdown accepted" }));
+    setTimeout(() => gracefulShutdown("remote_shutdown"), 20).unref?.();
+    return;
+  }
+
   if (req.method === "POST" && req.url === "/search") {
+    if (shuttingDown) {
+      res.statusCode = 503;
+      return res.end(JSON.stringify({ error: "Service is shutting down" }));
+    }
+
     let body = "";
     req.on("data", chunk => { body += chunk; });
     req.on("end", async () => {
@@ -135,8 +177,8 @@ const server = http.createServer(async (req, res) => {
         const result = await new Promise((resolve) => {
           const timeoutId = setTimeout(() => {
             pendingRequests.delete(requestId);
-            resolve({ error: "Scraping timeout (120s)" });
-          }, 120000);
+            resolve({ error: "Scraping timeout (300s)" });
+          }, 300000);
 
           pendingRequests.set(requestId, { resolve, timeoutId });
 
@@ -180,3 +222,6 @@ server.listen(HTTP_PORT, "127.0.0.1", () => {
   console.log(`   - WebSocket (Extension): ws://127.0.0.1:${WS_PORT}`);
   console.log(`   - HTTP API (Client): http://127.0.0.1:${HTTP_PORT}`);
 });
+
+process.on("SIGTERM", () => gracefulShutdown("sigterm"));
+process.on("SIGINT", () => gracefulShutdown("sigint"));