@lightcone-ai/daemon 0.15.21 → 0.15.23

package/mcp-servers/wechat-mp-fetch/index.js

@@ -36,6 +36,20 @@ const cache = new Map();
 let lastRequestAt = 0;
 let session = null;
 
+function readSavedSession(profileDir) {
+  const sessionFile = path.join(profileDir, 'session.json');
+  if (!existsSync(sessionFile)) {
+    throw new Error('LOGIN_REQUIRED:WeChat MP backend session token is missing; please scan login again');
+  }
+  const saved = parseJsonMaybe(readFileSync(sessionFile, 'utf8'));
+  const token = String(saved?.token ?? '').trim();
+  const homeUrl = String(saved?.homeUrl ?? '').trim();
+  if (!token || !homeUrl.startsWith(`${WECHAT_MP_ORIGIN}/cgi-bin/`)) {
+    throw new Error('LOGIN_REQUIRED:WeChat MP backend session token is invalid; please scan login again');
+  }
+  return { token, homeUrl, savedAt: saved?.savedAt ?? null };
+}
+
 function detectChrome() {
   if (process.env.CHROME_BIN) return process.env.CHROME_BIN;
   const candidates = [
@@ -85,6 +99,7 @@ class CdpSession {
 
   async launch(profileDir) {
     if (!profileDir) throw new Error('LOGIN_REQUIRED:WECHAT_MP_PROFILE_DIR is not configured');
+    const savedSession = readSavedSession(profileDir);
     const chrome = detectChrome();
     this._port = await getFreePort();
 
@@ -120,7 +135,7 @@ class CdpSession {
     await this.cdp('Network.enable');
     await this.cdp('Runtime.enable');
     await this.injectCookies(profileDir);
-    await this.navigate(`${WECHAT_MP_ORIGIN}/cgi-bin/home?t=home/index&lang=zh_CN`);
+    await this.navigate(savedSession.homeUrl);
   }
 
   _connectWs(wsUrl) {
@@ -220,6 +235,19 @@ class CdpSession {
   async currentUrl() {
     return this.evalValue('location.href');
   }
+
+  async close() {
+    try { await this.cdp('Browser.close', {}, 3000); } catch {}
+    await sleep(300);
+    if (this._ws) {
+      try { this._ws.close(); } catch {}
+      this._ws = null;
+    }
+    if (this._proc) {
+      try { this._proc.kill('SIGKILL'); } catch {}
+      this._proc = null;
+    }
+  }
 }
 
 async function getSession() {
@@ -229,23 +257,40 @@ async function getSession() {
   return session;
 }
 
+async function closeSession() {
+  const active = session;
+  session = null;
+  if (active) await active.close();
+}
+
 async function ensureLoggedIn() {
   const cdp = await getSession();
+  const savedSession = readSavedSession(WECHAT_MP_PROFILE_DIR);
   let href = await cdp.currentUrl().catch(() => '');
   if (!String(href).startsWith(WECHAT_MP_ORIGIN)) {
-    await cdp.navigate(`${WECHAT_MP_ORIGIN}/cgi-bin/home?t=home/index&lang=zh_CN`);
+    await cdp.navigate(savedSession.homeUrl);
     href = await cdp.currentUrl();
   }
-  let token = '';
+  let token = savedSession.token;
   for (let i = 0; i < 12; i += 1) {
     href = await cdp.currentUrl().catch(() => href);
-    token = new URL(String(href)).searchParams.get('token') ?? '';
+    token = new URL(String(href)).searchParams.get('token') ?? token;
     if (token) break;
     await sleep(500);
   }
+  const pageState = await cdp.evalValue(`(() => {
+    const text = document.body?.innerText || '';
+    return {
+      href: location.href,
+      loginRequired: text.includes('登录超时') || text.includes('请重新登录') || text.includes('重新登录')
+    };
+  })()`).catch(() => null);
   if (!token) {
     throw new Error('LOGIN_REQUIRED:WeChat MP backend login is required');
   }
+  if (pageState?.loginRequired) {
+    throw new Error('LOGIN_REQUIRED:WeChat MP backend session expired; please scan login again');
+  }
   return { cdp, token };
 }
 
@@ -461,6 +506,8 @@ server.tool(
       return toolResult({ ok: true, logged_in: true, token_present: Boolean(token), source_type: 'wechat_mp' });
     } catch (error) {
       return toolError(error);
+    } finally {
+      await closeSession();
     }
   }
 );
@@ -478,6 +525,8 @@ server.tool(
       return toolResult(await searchAccounts(checked));
     } catch (error) {
       return toolError(error);
+    } finally {
+      await closeSession();
     }
   }
 );
@@ -496,6 +545,8 @@ server.tool(
       return toolResult(await listRecentArticles(checked));
     } catch (error) {
       return toolError(error);
+    } finally {
+      await closeSession();
     }
   }
 );
@@ -519,3 +570,7 @@ server.tool(
 const transport = new StdioServerTransport();
 await server.connect(transport);
 console.error('[wechat-mp-fetch] MCP Server started');
+
+process.once('SIGINT', () => { closeSession().finally(() => process.exit(130)); });
+process.once('SIGTERM', () => { closeSession().finally(() => process.exit(143)); });
+process.once('beforeExit', () => { if (session) void closeSession(); });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightcone-ai/daemon",
-  "version": "0.15.21",
+  "version": "0.15.23",
   "type": "module",
   "main": "src/index.js",
   "bin": {

package/src/browser-login.js

@@ -106,19 +106,56 @@ export const PLATFORM_CONFIGS = {
     },
     async isPageLoggedIn(session) {
       const result = await session.send('Runtime.evaluate', {
-        expression: `(() => {
+        expression: `(async () => {
           const href = location.href;
           const text = document.body?.innerText || '';
+          const token = new URL(href).searchParams.get('token') || '';
+          if (!/[?&]token=\\d+/.test(href) || text.includes('登录超时') || text.includes('重新登录')) {
+            return {
+              href,
+              hasToken: Boolean(token),
+              loginTimedOut: text.includes('登录超时') || text.includes('重新登录'),
+              apiOk: false
+            };
+          }
+
+          const url = new URL('/cgi-bin/searchbiz', location.origin);
+          url.searchParams.set('action', 'search_biz');
+          url.searchParams.set('begin', '0');
+          url.searchParams.set('count', '1');
+          url.searchParams.set('query', '腾讯');
+          url.searchParams.set('token', token);
+          url.searchParams.set('lang', 'zh_CN');
+          url.searchParams.set('f', 'json');
+          url.searchParams.set('ajax', '1');
+
+          let apiOk = false;
+          try {
+            const response = await fetch(url.toString(), {
+              credentials: 'include',
+              headers: {
+                'Accept': 'application/json, text/javascript, */*; q=0.01',
+                'X-Requested-With': 'XMLHttpRequest'
+              }
+            });
+            const payload = await response.json();
+            apiOk = response.ok && Number(payload?.base_resp?.ret ?? 0) === 0 && Array.isArray(payload?.list);
+          } catch {
+            apiOk = false;
+          }
+
           return {
             href,
-            hasToken: /[?&]token=\\d+/.test(href),
-            loginTimedOut: text.includes('登录超时') || text.includes('重新登录')
+            hasToken: Boolean(token),
+            loginTimedOut: false,
+            apiOk
           };
         })()`,
         returnByValue: true,
+        awaitPromise: true,
       }, 5000);
       const value = result?.result?.value ?? {};
-      return Boolean(value.hasToken) && !value.loginTimedOut;
+      return Boolean(value.hasToken) && !value.loginTimedOut && Boolean(value.apiOk);
     },
   },
 };
@@ -453,8 +490,25 @@ export class BrowserLoginSession {
             );
             writeFileSync(path.join(this._profileDir, 'cookies.json'), JSON.stringify(cookies));
             console.log(`[BrowserLogin][${this._platform}] Saved ${cookies.length} cookies to cookies.json`);
+            if (this._platform === 'wechat_mp') {
+              const hrefResult = await this.send('Runtime.evaluate', {
+                expression: 'location.href',
+                returnByValue: true,
+              }, 5000);
+              const homeUrl = String(hrefResult?.result?.value ?? '');
+              const token = new URL(homeUrl).searchParams.get('token') ?? '';
+              if (!token) throw new Error('WeChat MP token missing from logged-in URL');
+              writeFileSync(path.join(this._profileDir, 'session.json'), JSON.stringify({
+                platform: this._platform,
+                token,
+                homeUrl,
+                savedAt: new Date().toISOString(),
+              }));
+              console.log(`[BrowserLogin][${this._platform}] Saved backend session token to session.json`);
+            }
           } catch (err) {
-            console.error(`[BrowserLogin][${this._platform}] Failed to save cookies: ${err.message}`);
+            console.error(`[BrowserLogin][${this._platform}] Failed to save browser session: ${err.message}`);
+            if (this._platform === 'wechat_mp') throw err;
           }
           // Kill any stale chrome-pool session so the next publish job starts fresh with new cookies
           try {