@gecho-ai/gecho-bridge 1.0.1 → 1.1.2

package/README.md

@@ -42,12 +42,52 @@ Add a new MCP server:
 - **Type**: command
 - **Command**: `npx -y @gecho-ai/gecho-bridge@latest`
 
+### Save Path Configuration
+Search results are persisted to a JSON file. You can control the save directory in two ways:
+
+1. Pass `save_dir` in the MCP tool call arguments.
+2. Set environment variable `GECHO_DATA_DIR` for the MCP process.
+
+Priority order used by the service:
+
+1. `save_dir` from request arguments
+2. `GECHO_DATA_DIR` environment variable
+3. Default `data` directory (`path.join(__dirname, "..", "data")`)
+
+File naming:
+
+- Result file pattern: `<query>_search_results.json`
+- Query text is sanitized to a safe file name before writing.
+
+Example (Claude Desktop with `GECHO_DATA_DIR`):
+
+```json
+{
+  "mcpServers": {
+    "gecho-bridge": {
+      "command": "npx",
+      "args": ["-y", "@gecho-ai/gecho-bridge@latest"],
+      "env": {
+        "GECHO_DATA_DIR": "/Users/yourname/gecho-data"
+      }
+    }
+  }
+}
+```
+
+Example (Cursor command with env):
+
+```bash
+GECHO_DATA_DIR=/Users/yourname/gecho-data npx -y @gecho-ai/gecho-bridge@latest
+```
+
 ## Usage
 
 Once configured, you can ask your AI:
 
 - "Search TikTok for 'cooking recipes'"
 - "Find trending TikTok videos about AI agents"
+- "Search TikTok for 'computer' and save to `/Users/yourname/data` (`save_dir`)"
 
 ## Development
 

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,11 +19,14 @@ 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(
-  { name: "tiktok-bridge-client", version: "1.1.0" },
+  { name: "tiktok-bridge-client", version: "1.1.1" },
   { capabilities: { tools: {} } }
 );
 
@@ -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,35 +44,65 @@ function checkServiceAlive() {
 }
 
 /**
- * 自动拉起 Service 层
+ * 请求旧服务优雅退出
  */
-async function ensureServiceRunning() {
-  const alive = await checkServiceAlive();
-  if (alive) {
-    console.error("🐷 Service Layer is already running.");
-    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();
+  });
+}
 
-  console.error("🐷 Service Layer not found. Starting it automatically...");
-  
+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()) {
-      console.error("✅ Service Layer started successfully.");
-      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. 定义工具
@@ -82,7 +115,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
         inputSchema: {
           type: "object",
           properties: {
-            query: { type: "string", description: "搜索关键词 (例如: '猫薄荷')" }
+            query: { type: "string", description: "搜索关键词 (例如: '猫薄荷')" },
+            save_dir: { type: "string", description: "可选的保存目录绝对路径 (例如: '/Users/xxx/data')" }
           },
           required: ["query"]
         }
@@ -94,7 +128,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
 // 2. 转发工具请求到 Service 层
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
   if (request.params.name === "tiktok_search_top_200") {
-    const { query } = request.params.arguments;
+    const { query, save_dir } = request.params.arguments;
 
     try {
       const requestService = () => new Promise((resolve, reject) => {
@@ -114,40 +148,53 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             if (res.statusCode >= 400) {
               reject(new Error(parsed.error || `HTTP ${res.statusCode}`));
             } else {
-              resolve(parsed.data);
+              resolve(parsed); // 返回整个响应对象
             }
           });
         });
 
         req.on("error", () => reject(new Error("Service Layer communication error")));
-        req.write(JSON.stringify({ query }));
+        req.write(JSON.stringify({ query, save_dir }));
         req.end();
       });
 
-      let result;
+      let serviceResponse;
       try {
-        result = await requestService();
+        serviceResponse = await requestService();
       } catch (firstError) {
         if (String(firstError.message || "").includes("communication error")) {
           await ensureServiceRunning();
           await new Promise(r => setTimeout(r, 800));
-          result = await requestService();
+          serviceResponse = await requestService();
         } else {
           throw firstError;
         }
       }
 
-      if (result.error) {
-        return { content: [{ type: "text", text: `❌ 错误: ${result.error}` }], isError: true };
+      if (serviceResponse.error) {
+        return { content: [{ type: "text", text: `❌ 错误: ${serviceResponse.error}` }], isError: true };
+      }
+
+      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 top20 = Array.isArray(result) ? result.slice(0, 20) : [];
+      const savePath = serviceResponse.savePath || "";
+      const saveLine = savePath
+        ? `📂 完整结果已保存到: ${savePath}\n\n`
+        : `📂 未返回保存路径，请检查服务端日志。\n\n`;
+      const top20 = result.slice(0, 20);
       return {
         content: [
           { 
             type: "text", 
-            text: `✅ 抓取完成！共获取 ${Array.isArray(result) ? result.length : 0} 条数据。\n` +
-                  `📂 完整结果已保存在本地 data 目录。\n\n` +
+            text: `✅ 抓取完成！共获取 ${result.length} 条数据。\n` +
+                  saveLine +
                   `以下是点赞最高的前 20 条结果：\n` +
                   JSON.stringify(top20, null, 2) 
           }
@@ -169,11 +216,9 @@ async function main() {
     await ensureServiceRunning();
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    console.error("🐷 TikTok Bridge MCP Client is running (STDIO)");
   } catch (e) {
-    console.error(`❌ Client initialization failed: ${e.message}`);
     process.exit(1);
   }
 }
 
-main().catch(e => console.error(e));
+main().catch(e => {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gecho-ai/gecho-bridge",
-  "version": "1.0.1",
+  "version": "1.1.2",
   "description": "MCP Bridge for TikTok Extension Relay - Connecting LLMs to TikTok via Chrome Extension",
   "main": "mcp-client.js",
   "bin": {
@@ -30,6 +30,6 @@
     "ws": "^8.19.0"
   },
   "publishConfig": {
-  "access": "public"
+    "access": "public"
   }
 }

package/server.js

@@ -19,6 +19,81 @@ const HTTP_PORT = 18793;
 let extensionSocket = null;
 const pendingRequests = new Map();
 let requestIdCounter = 1;
+let shuttingDown = false;
+
+function decodeBase64Utf8(value) {
+  try {
+    return Buffer.from(String(value || ""), "base64").toString("utf8");
+  } catch (_e) {
+    return "";
+  }
+}
+
+function normalizeQuery(rawQuery, queryB64) {
+  const queryText = String(rawQuery || "").trim();
+  const decodedFromB64 = decodeBase64Utf8(queryB64).trim();
+  if (decodedFromB64) {
+    if (!queryText || /^[?？]+$/.test(queryText)) {
+      return decodedFromB64;
+    }
+  }
+  if (!queryText) {
+    return "";
+  }
+  try {
+    if (/%[0-9A-Fa-f]{2}/.test(queryText)) {
+      return decodeURIComponent(queryText);
+    }
+  } catch (_e) {}
+  return queryText;
+}
+
+function toSafeFileName(name) {
+  const value = String(name || "").trim();
+  const replaced = value
+    .replace(/[<>:"/\\|?*\u0000-\u001F]/g, "_")
+    .replace(/[. ]+$/g, "")
+    .slice(0, 80);
+  const fallback = `query_${Date.now()}`;
+  const candidate = replaced || fallback;
+  const upper = candidate.toUpperCase();
+  const reserved = new Set([
+    "CON","PRN","AUX","NUL",
+    "COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9",
+    "LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"
+  ]);
+  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" });
@@ -61,19 +136,31 @@ wss.on("error", (err) => {
 
 // --- HTTP Server (供 Client 层调用) ---
 const server = http.createServer(async (req, res) => {
-  res.setHeader("Content-Type", "application/json");
+  res.setHeader("Content-Type", "application/json; charset=utf-8");
 
   // 健康检查接口
   if (req.method === "GET" && req.url === "/ping") {
     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 () => {
       try {
-        const { query } = JSON.parse(body);
+        const payload = JSON.parse(body);
+        const query = normalizeQuery(payload.query, payload.query_b64);
         if (!query) {
           res.statusCode = 400;
           return res.end(JSON.stringify({ error: "Missing query" }));
@@ -90,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 });
 
@@ -103,14 +190,22 @@ const server = http.createServer(async (req, res) => {
         });
 
         // 持久化存储
+        let savePath = "";
+        let saveWarning = "";
         if (Array.isArray(result) && result.length > 0) {
-          const dataDir = path.join(__dirname, "..", "data");
+          // 优先级: 1. 请求中传来的 save_dir 2. 环境变量 GECHO_DATA_DIR 3. 默认 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 fixedPath = path.join(dataDir, `${query}_search_results.json`);
-          fs.writeFileSync(fixedPath, JSON.stringify(result, null, 2), "utf8");
+          const safeName = toSafeFileName(query);
+          const fixedPath = path.join(dataDir, `${safeName}_search_results.json`);
+          try {
+            fs.writeFileSync(fixedPath, JSON.stringify(result, null, 2), "utf8");
+            savePath = fixedPath;
+          } catch (e) {
+            saveWarning = e.message;
+          }
         }
-
-        res.end(JSON.stringify({ success: true, data: result }));
+        res.end(JSON.stringify({ success: true, data: result, savePath, saveWarning }));
       } catch (e) {
         res.statusCode = 500;
         res.end(JSON.stringify({ error: e.message }));
@@ -127,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"));