@lightcone-ai/daemon 0.15.19 → 0.15.21

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

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 import { randomUUID } from 'crypto';
 import { spawn } from 'child_process';
-import { accessSync, constants as fsConstants } from 'fs';
+import { accessSync, constants as fsConstants, existsSync, readFileSync, rmSync } from 'fs';
 import http from 'http';
 import net from 'net';
+import path from 'path';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { z } from 'zod';
@@ -86,6 +87,12 @@ class CdpSession {
     if (!profileDir) throw new Error('LOGIN_REQUIRED:WECHAT_MP_PROFILE_DIR is not configured');
     const chrome = detectChrome();
     this._port = await getFreePort();
+
+    for (const lockFile of ['SingletonLock', 'SingletonCookie', 'SingletonSocket']) {
+      const lockPath = path.join(profileDir, lockFile);
+      try { if (existsSync(lockPath)) rmSync(lockPath, { force: true }); } catch {}
+    }
+
     this._proc = spawn(chrome, [
       `--remote-debugging-port=${this._port}`,
       '--no-sandbox',
@@ -96,7 +103,7 @@ class CdpSession {
       '--user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
       `--user-data-dir=${profileDir}`,
       '--window-size=1280,900',
-      `${WECHAT_MP_ORIGIN}/cgi-bin/home?t=home/index&lang=zh_CN`,
+      'about:blank',
     ], { stdio: 'ignore' });
 
     for (let i = 0; i < 50; i += 1) {
@@ -112,6 +119,8 @@ class CdpSession {
     await this.cdp('Page.enable');
     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`);
   }
 
   _connectWs(wsUrl) {
@@ -160,6 +169,42 @@ class CdpSession {
     await sleep(1500);
   }
 
+  async injectCookies(profileDir) {
+    const cookiesFile = path.join(profileDir, 'cookies.json');
+    if (!existsSync(cookiesFile)) {
+      console.error(`[wechat-mp-fetch] cookies.json not found at ${cookiesFile}`);
+      return;
+    }
+    try {
+      const rawCookies = JSON.parse(readFileSync(cookiesFile, 'utf8'));
+      const cookies = rawCookies.map(({
+        name,
+        value,
+        domain,
+        path: cookiePath,
+        secure,
+        httpOnly,
+        sameSite,
+        expires,
+        priority,
+      }) => {
+        const cookie = { name, value };
+        if (domain !== undefined) cookie.domain = domain;
+        if (cookiePath !== undefined) cookie.path = cookiePath;
+        if (secure !== undefined) cookie.secure = secure;
+        if (httpOnly !== undefined) cookie.httpOnly = httpOnly;
+        if (sameSite !== undefined) cookie.sameSite = sameSite;
+        if (expires !== undefined && expires !== -1) cookie.expires = expires;
+        if (priority !== undefined) cookie.priority = priority;
+        return cookie;
+      });
+      await this.cdp('Network.setCookies', { cookies });
+      console.error(`[wechat-mp-fetch] Injected ${cookies.length} cookies from cookies.json`);
+    } catch (error) {
+      console.error(`[wechat-mp-fetch] Failed to inject cookies: ${error?.message ?? error}`);
+    }
+  }
+
   async evalValue(expression) {
     const result = await this.cdp('Runtime.evaluate', {
       expression,
@@ -191,7 +236,13 @@ async function ensureLoggedIn() {
     await cdp.navigate(`${WECHAT_MP_ORIGIN}/cgi-bin/home?t=home/index&lang=zh_CN`);
     href = await cdp.currentUrl();
   }
-  const token = new URL(String(href)).searchParams.get('token') ?? '';
+  let token = '';
+  for (let i = 0; i < 12; i += 1) {
+    href = await cdp.currentUrl().catch(() => href);
+    token = new URL(String(href)).searchParams.get('token') ?? '';
+    if (token) break;
+    await sleep(500);
+  }
   if (!token) {
     throw new Error('LOGIN_REQUIRED:WeChat MP backend login is required');
   }

package/package.json

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

package/src/browser-login.js

@@ -104,6 +104,22 @@ export const PLATFORM_CONFIGS = {
         ?? null;
       return val !== null && val !== baseline;
     },
+    async isPageLoggedIn(session) {
+      const result = await session.send('Runtime.evaluate', {
+        expression: `(() => {
+          const href = location.href;
+          const text = document.body?.innerText || '';
+          return {
+            href,
+            hasToken: /[?&]token=\\d+/.test(href),
+            loginTimedOut: text.includes('登录超时') || text.includes('重新登录')
+          };
+        })()`,
+        returnByValue: true,
+      }, 5000);
+      const value = result?.result?.value ?? {};
+      return Boolean(value.hasToken) && !value.loginTimedOut;
+    },
   },
 };
 
@@ -400,7 +416,12 @@ export class BrowserLoginSession {
 
   async isLoggedIn(baseline) {
     const result = await this.send('Network.getAllCookies', {});
-    return this._config.isLoggedIn(result.cookies ?? [], baseline);
+    const cookieLoggedIn = this._config.isLoggedIn(result.cookies ?? [], baseline);
+    if (!cookieLoggedIn) return false;
+    if (typeof this._config.isPageLoggedIn === 'function') {
+      return this._config.isPageLoggedIn(this);
+    }
+    return true;
   }
 
   _startPolling(connection, baselineSession) {