From fb1613c252e5f2ea31052a2c7e1c2d4de60771b0 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Fri, 22 Aug 2025 13:19:05 +0800 Subject: [PATCH] refactor(xiaohongshu): enhance puppeteer integration in getUser function - Updated the getUser function to utilize getPuppeteerPage for improved page handling. - Simplified request interception logic by moving it into the new function. - Ensured proper resource management by replacing browser.close() with destory(). --- lib/routes/xiaohongshu/util.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/routes/xiaohongshu/util.ts b/lib/routes/xiaohongshu/util.ts index 12054f7f0..8587b3115 100644 --- a/lib/routes/xiaohongshu/util.ts +++ b/lib/routes/xiaohongshu/util.ts @@ -1,7 +1,7 @@ import { config } from '@/config'; import logger from '@/utils/logger'; import { parseDate } from '@/utils/parse-date'; -import puppeteer from '@/utils/puppeteer'; +import puppeteer, { getPuppeteerPage } from '@/utils/puppeteer'; import ofetch from '@/utils/ofetch'; import { load } from 'cheerio'; import cache from '@/utils/cache'; @@ -31,14 +31,16 @@ const getUser = (url, cache) => cache.tryGet( url, async () => { - const browser = await puppeteer(); + const { page, destory } = await getPuppeteerPage(url, { + onBeforeLoad: async (page) => { + await page.setRequestInterception(true); + page.on('request', (request) => { + request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'xhr' || request.resourceType() === 'other' ? request.continue() : request.abort(); + }); + }, + }); try { - const page = await browser.newPage(); - await page.setRequestInterception(true); let collect = ''; - page.on('request', (request) => { - request.resourceType() === 'document' || request.resourceType() === 'script' || request.resourceType() === 'xhr' || request.resourceType() === 'other' ? request.continue() : request.abort(); - }); logger.http(`Requesting ${url}`); await page.goto(url, { waitUntil: 'domcontentloaded', @@ -69,7 +71,7 @@ const getUser = (url, cache) => return { userPageData, notes, collect }; } finally { - await browser.close(); + await destory(); } }, config.cache.routeExpire,