refactor: Use to domcontentloaded for determining page load completion.

* Tidy codes.

Author: iFurySt

src/auth/authManager.ts

@@ -1,16 +1,12 @@
-import { Browser, BrowserContext, Page, chromium, Cookie } from 'playwright';
-import { CookieManager } from './cookieManager';
+import {Browser, BrowserContext, chromium, Cookie, Page} from 'playwright';
+import {CookieManager} from './cookieManager';
 import * as dotenv from 'dotenv';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-import { exec } from 'child_process';
-import { promisify } from 'util';
 
 dotenv.config();
 
-const execAsync = promisify(exec);
-
 export class AuthManager {
   private browser: Browser | null;
   private context: BrowserContext | null;
@@ -27,15 +23,15 @@ export class AuthManager {
       const homeDir = os.homedir();
       const mcpDir = path.join(homeDir, '.mcp');
       const rednoteDir = path.join(mcpDir, 'rednote');
-      
+
       // Create directories if they don't exist
       if (!fs.existsSync(mcpDir)) {
         fs.mkdirSync(mcpDir);
       }
       if (!fs.existsSync(rednoteDir)) {
         fs.mkdirSync(rednoteDir);
       }
-      
+
       cookiePath = path.join(rednoteDir, 'cookies.json');
     }
 
@@ -51,36 +47,12 @@ export class AuthManager {
     return this.browser;
   }
 
-  async getPage(): Promise<Page> {
-    if (!this.page) {
-      const browser = await this.getBrowser();
-      this.page = await browser.newPage();
-
-      // Load existing cookies if available
-      const cookies = await this.getCookies();
-      if (cookies.length > 0) {
-        await this.page.context().addCookies(cookies);
-      }
-    }
-    return this.page;
-  }
-
   async getCookies(): Promise<Cookie[]> {
     return await this.cookieManager.loadCookies();
   }
 
-  private async handleSecurityVerification() {
-    if (!this.page) return;
-
-    const securityUrl = '/web-login/captcha';
-    if (this.page.url().includes(securityUrl)) {
-      await this.page.waitForTimeout(2000);
-      await this.page.reload({ waitUntil: 'networkidle' });
-    }
-  }
-
   async login(): Promise<void> {
-    this.browser = await chromium.launch({ headless: false });
+    this.browser = await chromium.launch({headless: false});
     if (!this.browser) {
       throw new Error('Failed to launch browser');
     }
@@ -101,8 +73,8 @@ export class AuthManager {
 
         // Navigate to explore page
         await this.page.goto('https://www.xiaohongshu.com/explore', {
-          waitUntil: 'networkidle',
-          timeout: 30000
+          waitUntil: 'domcontentloaded',
+          timeout: 10000
         });
 
         // Check if already logged in
@@ -112,7 +84,7 @@ export class AuthManager {
             const sidebarUser = document.querySelector('.user.side-bar-component .channel');
             return sidebarUser?.textContent?.trim() === '我';
           });
-          
+
           if (isLoggedIn) {
             // Already logged in, save cookies and return
             const newCookies = await this.context.cookies();
@@ -131,32 +103,6 @@ export class AuthManager {
           timeout: 10000
         });
 
-        // save image code
-        // if (qrCodeImage) {
-        //   const qrCodeSrc = await qrCodeImage.getAttribute('src');
-        //   if (qrCodeSrc) {
-        //     // Save QR code image
-        //     const qrCodeBuffer = Buffer.from(qrCodeSrc.split(',')[1], 'base64');
-        //     const tempDir = process.env.TEMP || process.env.TMP || '/tmp';
-        //     const qrCodePath = path.join(tempDir, 'xhs-login-qrcode.png');
-        //
-        //     await fs.promises.writeFile(qrCodePath, qrCodeBuffer);
-        //
-        //     // Open QR code image with system default viewer
-        //     try {
-        //       if (process.platform === 'darwin') {
-        //         await execAsync(`open ${qrCodePath}`);
-        //       } else if (process.platform === 'win32') {
-        //         await execAsync(`start ${qrCodePath}`);
-        //       } else if (process.platform === 'linux') {
-        //         await execAsync(`xdg-open ${qrCodePath}`);
-        //       }
-        //     } catch (error) {
-        //       // Silently handle error
-        //     }
-        //   }
-        // }
-
         // Wait for user to complete login
         await this.page.waitForSelector('.user.side-bar-component .channel', {
           timeout: 60000
@@ -191,20 +137,6 @@ export class AuthManager {
     }
   }
 
-  async checkLoginStatus(): Promise<boolean> {
-    const page = await this.getPage();
-    await page.goto('https://www.xiaohongshu.com');
-
-    // Check if login button exists
-    const loginButton = await page.$('button[data-testid="login-button"], button:has-text("登录"), .login-button');
-    return !loginButton;
-  }
-
-  async isAuthenticated(): Promise<boolean> {
-    const cookies = await this.cookieManager.loadCookies();
-    return cookies.length > 0;
-  }
-
   async cleanup(): Promise<void> {
     if (this.page) await this.page.close();
     if (this.context) await this.context.close();

src/auth/cookieManager.ts

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { Cookie } from 'playwright';
+import {Cookie} from 'playwright';
 
 export class CookieManager {
   private readonly cookiePath: string;
@@ -12,7 +12,7 @@ export class CookieManager {
   async saveCookies(cookies: Cookie[]): Promise<void> {
     const dir = path.dirname(this.cookiePath);
     if (!fs.existsSync(dir)) {
-      fs.mkdirSync(dir, { recursive: true });
+      fs.mkdirSync(dir, {recursive: true});
     }
     await fs.promises.writeFile(this.cookiePath, JSON.stringify(cookies, null, 2));
   }

src/cli.ts

@@ -1,17 +1,21 @@
 #!/usr/bin/env node
 
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { z } from "zod";
-import { AuthManager } from './auth/authManager';
-import { RedNoteTools } from './tools/rednoteTools';
+import {McpServer} from "@modelcontextprotocol/sdk/server/mcp.js";
+import {StdioServerTransport} from "@modelcontextprotocol/sdk/server/stdio.js";
+import {z} from "zod";
+import {AuthManager} from './auth/authManager';
+import {RedNoteTools} from './tools/rednoteTools';
 
 const tools = new RedNoteTools();
 
+const name = "rednote";
+const description = "A friendly tool to help you access and interact with Xiaohongshu (RedNote) content through Model Context Protocol.";
+const version = "0.1.6";
+
 // Create server instance
 const server = new McpServer({
-  name: "rednote",
-  version: "0.1.0",
+  name,
+  version,
   protocolVersion: "2024-11-05",
   capabilities: {
     tools: true,
@@ -26,7 +30,7 @@ const server = new McpServer({
 server.tool("search_notes", "根据关键词搜索笔记", {
   keywords: z.string().describe("搜索关键词"),
   limit: z.number().optional().describe("返回结果数量限制"),
-}, async ({ keywords, limit = 10 }: { keywords: string; limit?: number }) => {
+}, async ({keywords, limit = 10}: { keywords: string; limit?: number }) => {
   const notes = await tools.searchNotes(keywords, limit);
   return {
     content: notes.map(note => ({
@@ -38,7 +42,7 @@ server.tool("search_notes", "根据关键词搜索笔记", {
 
 server.tool("get_note_content", "获取笔记内容", {
   url: z.string().describe("笔记 URL"),
-}, async ({ url }: { url: string }) => {
+}, async ({url}: { url: string }) => {
   const note = await tools.getNoteContent(url);
   return {
     content: [{
@@ -50,7 +54,7 @@ server.tool("get_note_content", "获取笔记内容", {
 
 server.tool("get_note_comments", "获取笔记评论", {
   url: z.string().describe("笔记 URL"),
-}, async ({ url }: { url: string }) => {
+}, async ({url}: { url: string }) => {
   const comments = await tools.getNoteComments(url);
   return {
     content: comments.map(comment => ({
@@ -97,14 +101,13 @@ if (process.argv.includes('--stdio')) {
     process.exit(1);
   });
 } else {
-  // 设置命令行程序
-  const { Command } = require('commander');
+  const {Command} = require('commander');
   const program = new Command();
 
   program
-    .name('rednote-mcp')
-    .description('RedNote MCP implementation for Model Context Protocol')
-    .version('0.1.0');
+    .name(name)
+    .description(description)
+    .version(version);
 
   program
     .command('init')

src/index.ts

@@ -1 +1 @@
-import './cli'; 
+import './cli';

src/tools/rednoteTools.ts

@@ -1,5 +1,5 @@
-import { AuthManager } from '../auth/authManager';
-import { Browser, Page } from 'playwright';
+import {AuthManager} from '../auth/authManager';
+import {Browser, Page} from 'playwright';
 
 interface Note {
   title: string;
@@ -27,17 +27,6 @@ export class RedNoteTools {
     this.authManager = new AuthManager();
   }
 
-  /**
-   * Wait for a random duration between min and max seconds
-   * @param min Minimum seconds to wait
-   * @param max Maximum seconds to wait
-   */
-  private async randomDelay(min: number, max: number): Promise<void> {
-    if (!this.page) throw new Error('Page not initialized');
-    const ms = Math.floor(Math.random() * (max - min) * 1000) + min * 1000;
-    await this.page.waitForTimeout(ms);
-  }
-
   async initialize(): Promise<void> {
     if (!this.browser) {
       this.browser = await this.authManager.getBrowser();
@@ -99,7 +88,7 @@ export class RedNoteTools {
           await this.page.waitForSelector('#noteContainer', {
             timeout: 30000
           });
-          
+
           await this.randomDelay(0.5, 1.5);
 
           // Extract note content
@@ -193,14 +182,14 @@ export class RedNoteTools {
       await this.page.waitForSelector('main article');
 
       // Extract note content
-      const note = await this.page.evaluate(() => {
+      return await this.page.evaluate(() => {
         // Get main article content
         const article = document.querySelector('main article');
         if (!article) throw new Error('Article not found');
 
         // Get title from h1 or first text block
         const title = article.querySelector('h1')?.textContent?.trim() ||
-                     article.querySelector('.title')?.textContent?.trim() || '';
+          article.querySelector('.title')?.textContent?.trim() || '';
 
         // Get content from article text
         const contentBlocks = Array.from(article.querySelectorAll('p, .content'));
@@ -227,8 +216,6 @@ export class RedNoteTools {
           comments
         };
       });
-
-      return note;
     } finally {
       await this.cleanup();
     }
@@ -245,7 +232,7 @@ export class RedNoteTools {
       await this.page.waitForSelector('[role="dialog"] [role="list"]');
 
       // Extract comments
-      const comments = await this.page.evaluate(() => {
+      return await this.page.evaluate(() => {
         const items = document.querySelectorAll('[role="dialog"] [role="list"] [role="listitem"]');
         const results: Comment[] = [];
 
@@ -255,15 +242,24 @@ export class RedNoteTools {
           const likes = parseInt(item.querySelector('[data-testid="likes-count"]')?.textContent || '0');
           const time = item.querySelector('time')?.textContent?.trim() || '';
 
-          results.push({ author, content, likes, time });
+          results.push({author, content, likes, time});
         });
 
         return results;
       });
-
-      return comments;
     } finally {
       await this.cleanup();
     }
   }
+
+  /**
+   * Wait for a random duration between min and max seconds
+   * @param min Minimum seconds to wait
+   * @param max Maximum seconds to wait
+   */
+  private async randomDelay(min: number, max: number): Promise<void> {
+    if (!this.page) throw new Error('Page not initialized');
+    const ms = Math.floor(Math.random() * (max - min) * 1000) + min * 1000;
+    await this.page.waitForTimeout(ms);
+  }
 }