@gecho-ai/gecho-bridge 1.1.1 → 1.1.3

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. 定义工具
@@ -73,8 +110,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
   return {
     tools: [
       {
-        name: "tiktok_search_top_200",
-        description: "在 TikTok 上搜索关键词，自动滚动加载至少 200 条结果，并全部返回。",
+        name: "tiktok_search",
+        description: "在 TikTok 上搜索关键词，自动滚动加载结果并返回。",
         inputSchema: {
           type: "object",
           properties: {
@@ -83,6 +120,18 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
           },
           required: ["query"]
         }
+      },
+      {
+        name: "tiktok_insight",
+        description: "在 TikTok 搜索的基础上进行商机洞察和趋势分析。",
+        inputSchema: {
+          type: "object",
+          properties: {
+            query: { type: "string", description: "搜索关键词 (例如: '户外野餐垫')" },
+            save_dir: { type: "string", description: "可选的保存目录绝对路径 (例如: '/Users/xxx/data')" }
+          },
+          required: ["query"]
+        }
       }
     ]
   };
@@ -90,9 +139,11 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
 
 // 2. 转发工具请求到 Service 层
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
-  if (request.params.name === "tiktok_search_top_200") {
-    const { query, save_dir } = request.params.arguments;
+  const toolName = request.params.name;
+  const args = request.params.arguments;
 
+  // 只要是 tiktok_ 开头的工具，都走通用转发逻辑
+  if (toolName.startsWith("tiktok_") || toolName.startsWith("x_") || toolName.startsWith("ins_")) {
     try {
       const requestService = () => new Promise((resolve, reject) => {
         const req = http.request(HTTP_SERVICE_URL, {
@@ -117,7 +168,12 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         });
 
         req.on("error", () => reject(new Error("Service Layer communication error")));
-        req.write(JSON.stringify({ query, save_dir }));
+        
+        // 【核心改动】：直接将工具名作为 action，所有参数作为 payload 透传
+        req.write(JSON.stringify({ 
+          action: toolName, 
+          ...args 
+        }));
         req.end();
       });
 
@@ -138,26 +194,35 @@ 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`
-        : `📂 未返回保存路径，请检查服务端日志。\n\n`;
+        ? `📂 数据已存: ${savePath}\n\n`
+        : "";
+      
       const top20 = result.slice(0, 20);
       return {
         content: [
           { 
             type: "text", 
-            text: `✅ 抓取完成！共获取 ${result.length} 条数据。\n` +
+            text: `✅ [${toolName}] 执行成功，共 ${result.length} 条数据。\n` +
                   saveLine +
-                  `以下是点赞最高的前 20 条结果：\n` +
+                  `以下是部分结果展示：\n` +
                   JSON.stringify(top20, null, 2) 
           }
         ]
       };
     } catch (e) {
       return { 
-        content: [{ type: "text", text: `❌ 转发失败: ${e.message}.` }], 
+        content: [{ type: "text", text: `❌ 链路故障: ${e.message}.` }], 
         isError: true 
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gecho-ai/gecho-bridge",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "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,16 +143,28 @@ const server = http.createServer(async (req, res) => {
     return res.end(JSON.stringify({ status: "ok" }));
   }
 
-  if (req.method === "POST" && req.url === "/search") {
+  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" || req.url === "/action")) {
+    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 () => {
       try {
         const payload = JSON.parse(body);
-        const query = normalizeQuery(payload.query, payload.query_b64);
-        if (!query) {
+        const action = payload.action;
+        
+        if (!action) {
           res.statusCode = 400;
-          return res.end(JSON.stringify({ error: "Missing query" }));
+          return res.end(JSON.stringify({ error: "Missing action" }));
         }
 
         if (!extensionSocket || extensionSocket.readyState !== 1) {
@@ -129,20 +172,31 @@ const server = http.createServer(async (req, res) => {
           return res.end(JSON.stringify({ error: "Extension not connected" }));
         }
 
-        console.log(`🔍 Processing search request for: [${query}]`);
+        console.log(`🚀 Dispatching action: [${action}]`);
         const requestId = `svc-${Date.now()}-${requestIdCounter++}`;
         
         const result = await new Promise((resolve) => {
           const timeoutId = setTimeout(() => {
             pendingRequests.delete(requestId);
-            resolve({ error: "Scraping timeout (120s)" });
-          }, 120000);
+            resolve({ error: `Scraping timeout (300s) for action: ${action}` });
+          }, 300000);
 
           pendingRequests.set(requestId, { resolve, timeoutId });
 
+          // 通用透传逻辑：将 payload 中的所有参数（除去 action）作为 params 传给插件
+          const { action: _a, ...params } = payload;
+          
+          // 🐷 兼容层：如果插件版本较旧，识别不了 tiktok_search，则映射回 search
+          let finalAction = action;
+          if (action === "tiktok_search") finalAction = "search";
+          if (action === "tiktok_insight") finalAction = "search";
+          
           extensionSocket.send(JSON.stringify({
             method: "execute_action",
-            params: { action: "search", params: { query } },
+            params: { 
+              action: finalAction, 
+              params: params 
+            },
             requestId: requestId
           }));
         });
@@ -151,11 +205,10 @@ const server = http.createServer(async (req, res) => {
         let savePath = "";
         let saveWarning = "";
         if (Array.isArray(result) && result.length > 0) {
-          // 优先级: 1. 请求中传来的 save_dir 2. 环境变量 GECHO_DATA_DIR 3. 默认 data 目录
-          const dataDir = payload.save_dir || process.env.GECHO_DATA_DIR || path.join(__dirname, "..", "data");
+          const dataDir = payload.save_dir || process.env.GECHO_DATA_DIR || path.join(__dirname, "data");
           if (!fs.existsSync(dataDir)) fs.mkdirSync(dataDir, { recursive: true });
-          const safeName = toSafeFileName(query);
-          const fixedPath = path.join(dataDir, `${safeName}_search_results.json`);
+          const safeName = toSafeFileName(params.query || action);
+          const fixedPath = path.join(dataDir, `${safeName}_results.json`);
           try {
             fs.writeFileSync(fixedPath, JSON.stringify(result, null, 2), "utf8");
             savePath = fixedPath;
@@ -180,3 +233,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"));