rsshub 1.0.0-master.f9ec483 → 1.0.0-master.fa04a11

package/lib/routes/xiaoheihe/discount.ts

@@ -1,5 +1,6 @@
 import { Route } from '@/types';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
+import { calculate } from './util';
 
 export const route: Route = {
     path: '/discount/:platform',
@@ -23,20 +24,59 @@ export const route: Route = {
 };
 
 const PLATFORM_MAP = {
-    pc: 'PC',
-    switch: 'Switch',
-    psn: 'PSN',
-    xbox: 'Xbox',
+    pc: {
+        key: 'pc',
+        desc: 'PC',
+    },
+    switch: {
+        key: 'switch',
+        desc: 'Switch',
+    },
+    psn: {
+        key: 'ps4',
+        desc: 'PSN',
+    },
+    xbox: {
+        key: 'xbox',
+        desc: 'Xbox',
+    },
 };
 
+function getDiscountDesc(discount) {
+    return `${(100 - discount) / 10}折`;
+}
+
+function getLowestDesc(priceInfo, isSuperLowest = false) {
+    if (!('is_lowest' in priceInfo) || priceInfo.is_lowest === 0) {
+        return '';
+    } else if (isSuperLowest) {
+        return '[超史低]';
+    } else if (priceInfo.is_lowest && priceInfo.is_lowest === 1 && priceInfo.new_lowest && priceInfo.new_lowest === 1) {
+        return '[新史低]';
+    } else if (priceInfo.is_lowest && priceInfo.is_lowest === 1) {
+        return '[史低]';
+    }
+}
+
+function getHeyboxPriceDesc(heyboxPriceInfo) {
+    if (heyboxPriceInfo.coupon_info) {
+        let discountPrice = heyboxPriceInfo.cost_coin / 1000;
+        discountPrice = discountPrice - heyboxPriceInfo.coupon_info.max_reduce;
+        const formatPrice = Number.isInteger(discountPrice) ? discountPrice.toFixed(0) : discountPrice.toFixed(2);
+        return `| 券后价: ${formatPrice} [${heyboxPriceInfo.coupon_info.coupon_desc}]`;
+    } else {
+        return '';
+    }
+}
+
 async function handler(ctx) {
-    const platform = ctx.req.param('platform');
+    const platformInfo = PLATFORM_MAP[ctx.req.param('platform')];
 
-    const response = await got({
-        method: 'get',
-        url: `https://api.xiaoheihe.cn/game/get_game_list_v3?sort_type=discount&filter_head=${platform}&offset=0&limit=30&os_type=web`,
-    });
-    const data = response.data.result.games;
+    const dataUrl = calculate(
+        `https://api.xiaoheihe.cn/game/get_game_list_v3/?filter_head=${platformInfo.key}&offset=0&limit=30&os_type=web&app=heybox&client_type=mobile&version=999.0.3&x_client_type=web&x_os_type=Mac&x_app=heybox&heybox_id=-1&include_filter=-1`
+    );
+    const response = await ofetch(dataUrl);
+    const data = response.result.games;
 
     const items = data.map((item) => {
         const title = `${item.name}${item.name_en ? '/' + item.name_en : ''}`;
@@ -47,44 +87,48 @@ async function handler(ctx) {
             for (const platform of item.platform_infos) {
                 if (platform.price) {
                     if (platform.key) {
-                        description += `平台: ${platform.key}<br/>>`;
+                        description += `平台: ${platform.key.toUpperCase()}<br/>`;
                     }
                     if (platform.price.current) {
-                        description += `当前价格: ${platform.price.current}${platform.price.discount === platform.price.lowest_discount ? '[史低]' : ''}<br/>`;
+                        description += `当前价格: ${platform.price.current} ${getLowestDesc(platform.price)}<br/>`;
                     }
                     if (platform.price.initial) {
                         description += `原价: ${platform.price.initial}<br/>`;
                     }
-                    if (platform.price.discount_desc) {
-                        description += `折扣力度: ${platform.price.discount_desc}<br/>`;
+                    if (platform.price.discount && platform.price.discount > 0) {
+                        description += `折扣力度: ${getDiscountDesc(platform.price.discount)}<br/>`;
                     }
                     if (platform.price.deadline_date) {
                         description += `截止时间: ${platform.price.deadline_date}<br/>`;
                     }
-                    description += '<br/>';
                 }
             }
         } else {
             if (item.price) {
-                description += `平台: ${platform.toUpperCase()}<br/>`;
-                if (item.price.discount) {
-                    description += `折扣力度: ${(100 - item.price.discount) / 10}折<br/>`;
-                }
-                if (item.price.initial && item.price.discount) {
-                    const current = Math.round((item.price.initial * (100 - item.price.discount)) / 100);
-                    description += `当前价格: ${current}${item.price.discount === item.price.lowest_discount ? '[史低]' : ''}&nbsp;&nbsp;`;
+                description += `平台: ${platformInfo.desc}<br/>`;
+                if (item.heybox_price) {
+                    description += `当前价格: ${item.price.current} ${getHeyboxPriceDesc(item.heybox_price)} ${getLowestDesc(item.price, item.heybox_price.super_lowest)}<br/>`;
+                } else if (item.price.current) {
+                    description += `当前价格: ${item.price.current} ${getLowestDesc(item.price)}<br/>`;
                 }
                 if (item.price.initial) {
                     description += `原价: ${item.price.initial}<br/>`;
                 }
-                if (item.score) {
-                    description += `评分: ${item.score}<br/>`;
+                if (item.price.discount && item.price.discount > 0) {
+                    description += `折扣力度: ${getDiscountDesc(item.price.discount)}<br/>`;
+                }
+                if (item.price.deadline_date) {
+                    description += `截止时间: ${item.price.deadline_date}<br/>`;
                 }
-                description += '<br/>';
             }
         }
+        if (item.score) {
+            description += `评分: ${item.score}<br/>`;
+        }
+        description += '<br/>';
+
         let link = `https://api.xiaoheihe.cn/game/share_game_detail?appid=${item.steam_appid}`;
-        if (platform === 'pc') {
+        if (platformInfo.key === 'pc') {
             link = `https://store.steampowered.com/app/${item.steam_appid}`;
         }
         return {
@@ -95,7 +139,7 @@ async function handler(ctx) {
     });
 
     return {
-        title: `小黑盒 ${PLATFORM_MAP[platform]} 游戏折扣`,
+        title: `小黑盒 ${platformInfo.desc} 游戏折扣`,
         link: `https://xiaoheihe.cn`,
         item: items,
     };

package/lib/routes/xiaohongshu/user.ts

@@ -1,19 +1,34 @@
 import { Route, ViewType } from '@/types';
 import cache from '@/utils/cache';
-import { getUser } from './util';
+import querystring from 'querystring';
+import { getUser, renderNotesFulltext, getUserWithCookie } from './util';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
-
+import { config } from '@/config';
+import { fallback, queryToBoolean } from '@/utils/readable-social';
 export const route: Route = {
-    path: '/user/:user_id/:category',
-    name: '用户笔记',
+    path: '/user/:user_id/:category/:routeParams?',
+    name: '用户笔记/收藏',
     categories: ['social-media', 'popular'],
     view: ViewType.Articles,
-    maintainers: ['lotosbin'],
+    maintainers: ['lotosbin', 'howerhe', 'rien7', 'dddaniel1', 'pseudoyu'],
     handler,
+    radar: [
+        {
+            source: ['xiaohongshu.com/user/profile/:user_id'],
+            target: '/user/:user_id/notes',
+        },
+    ],
     example: '/xiaohongshu/user/593032945e87e77791e03696/notes',
     features: {
         antiCrawler: true,
         requirePuppeteer: true,
+        requireConfig: [
+            {
+                name: 'XIAOHONGSHU_COOKIE',
+                optional: true,
+                description: '小红书 cookie 值，可在网络里面看到。',
+            },
+        ],
     },
     parameters: {
         user_id: 'user id, length 24 characters',
@@ -29,6 +44,11 @@ export const route: Route = {
                     label: 'collect',
                 },
             ],
+            default: 'notes',
+        },
+        routeParams: {
+            description: 'displayLivePhoto,`/user/:user_id/notes/displayLivePhoto=0`,不限时LivePhoto显示为图片,`/user/:user_id/notes/displayLivePhoto=1`,取值不为0时LivePhoto显示为视频',
+            default: '0',
         },
     },
 };
@@ -36,8 +56,33 @@ export const route: Route = {
 async function handler(ctx) {
     const userId = ctx.req.param('user_id');
     const category = ctx.req.param('category');
+    const routeParams = querystring.parse(ctx.req.param('routeParams'));
+    const displayLivePhoto = !!fallback(undefined, queryToBoolean(routeParams.displayLivePhoto), false);
     const url = `https://www.xiaohongshu.com/user/profile/${userId}`;
+    const cookie = config.xiaohongshu.cookie;
+
+    if (cookie && category === 'notes') {
+        try {
+            const urlNotePrefix = 'https://www.xiaohongshu.com/explore';
+            const user = await getUserWithCookie(url, cookie);
+            const notes = await renderNotesFulltext(user.notes, urlNotePrefix, displayLivePhoto);
+            return {
+                title: `${user.userPageData.basicInfo.nickname} - 笔记 • 小红书 / RED`,
+                description: user.userPageData.basicInfo.desc,
+                image: user.userPageData.basicInfo.imageb || user.userPageData.basicInfo.images,
+                link: url,
+                item: notes,
+            };
+        } catch {
+            // Fallback to normal logic if cookie method fails
+            return await getUserFeeds(url, category);
+        }
+    } else {
+        return await getUserFeeds(url, category);
+    }
+}
 
+async function getUserFeeds(url: string, category: string) {
     const {
         userPageData: { basicInfo, interactions, tags },
         notes,
@@ -52,7 +97,7 @@ async function handler(ctx) {
         notes.flatMap((n) =>
             n.map(({ id, noteCard }) => ({
                 title: noteCard.displayTitle,
-                link: `${url}/${noteCard.noteId || id}`,
+                link: new URL(noteCard.noteId || id, url).toString(),
                 guid: noteCard.noteId || id || noteCard.displayTitle,
                 description: `<img src ="${noteCard.cover.infoList.pop().url}"><br>${noteCard.displayTitle}`,
                 author: noteCard.user.nickname,

package/lib/routes/xiaohongshu/util.ts

@@ -2,6 +2,30 @@ import { config } from '@/config';
 import logger from '@/utils/logger';
 import { parseDate } from '@/utils/parse-date';
 import puppeteer from '@/utils/puppeteer';
+import { ofetch } from 'ofetch';
+import { load } from 'cheerio';
+import cache from '@/utils/cache';
+
+// Common headers for requests
+const getHeaders = (cookie?: string) => ({
+    Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
+    'Accept-Encoding': 'gzip, deflate, br',
+    'Accept-Language': 'en-US,en;q=0.9',
+    'Cache-Control': 'no-cache',
+    Connection: 'keep-alive',
+    Host: 'www.xiaohongshu.com',
+    Pragma: 'no-cache',
+    'Sec-Ch-Ua': '"Chromium";v="122", "Not(A:Brand";v="24", "Google Chrome";v="122"',
+    'Sec-Ch-Ua-Mobile': '?0',
+    'Sec-Ch-Ua-Platform': '"Windows"',
+    'Sec-Fetch-Dest': 'document',
+    'Sec-Fetch-Mode': 'navigate',
+    'Sec-Fetch-Site': 'none',
+    'Sec-Fetch-User': '?1',
+    'Upgrade-Insecure-Requests': '1',
+    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36',
+    ...(cookie ? { Cookie: cookie } : {}),
+});
 
 const getUser = (url, cache) =>
     cache.tryGet(
@@ -23,7 +47,7 @@ const getUser = (url, cache) =>
                 });
                 await page.waitForSelector('div.reds-tab-item:nth-child(2)');
 
-                const initialState = await page.evaluate(() => window.__INITIAL_STATE__);
+                const initialState = await page.evaluate(() => (window as any).__INITIAL_STATE__);
 
                 if (!(await page.$('.lock-icon'))) {
                     await page.click('div.reds-tab-item:nth-child(2)');
@@ -68,7 +92,7 @@ const getBoard = (url, cache) =>
                 logger.http(`Requesting ${url}`);
                 await page.goto(url);
                 await page.waitForSelector('.pc-container');
-                const initialSsrState = await page.evaluate(() => window.__INITIAL_SSR_STATE__);
+                const initialSsrState = await page.evaluate(() => (window as any).__INITIAL_SSR_STATE__);
                 return initialSsrState.Main;
             } finally {
                 browser.close();
@@ -78,108 +102,6 @@ const getBoard = (url, cache) =>
         false
     );
 
-const setPageFilter = async (page) => {
-    await page.setRequestInterception(true);
-    page.on('request', (req) => {
-        req.resourceType() === 'document' || req.resourceType() === 'script' || req.resourceType() === 'xhr' || req.resourceType() === 'other' ? req.continue() : req.abort();
-    });
-};
-
-const getNotes = (url, cache) =>
-    cache.tryGet(
-        url + '/notes', // To avoid mixing with the cache for `user.js`
-        async () => {
-            let user = '';
-            let notes = [];
-
-            const browser = await puppeteer({ stealth: true });
-            try {
-                const page = await browser.newPage();
-                await setPageFilter(page);
-
-                logger.http(`Requesting ${url}`);
-                await page.goto(url);
-
-                let otherInfo = {};
-                let userPosted = {};
-                try {
-                    [otherInfo, userPosted] = await Promise.all(
-                        ['/api/sns/web/v1/user/otherinfo', '/api/sns/web/v1/user_posted'].map((p) =>
-                            page
-                                .waitForResponse((res) => {
-                                    const req = res.request();
-                                    return req.url().includes(p) && req.method() === 'GET';
-                                })
-                                .then((r) => r.json())
-                        )
-                    );
-                } catch (error) {
-                    throw new Error(`Could not get user information and note list\n${error}`);
-                }
-
-                await page.close();
-
-                // Get full text for each note
-                const notesPromise = userPosted.data.notes.map((n) => {
-                    const noteUrl = url + '/' + n.note_id;
-
-                    return cache.tryGet(noteUrl, async () => {
-                        const notePage = await browser.newPage();
-                        await setPageFilter(notePage);
-
-                        logger.http(`Requesting ${noteUrl}`);
-                        await notePage.goto(noteUrl);
-
-                        let feed = {};
-                        try {
-                            feed = await notePage.evaluate(() => window.__INITIAL_STATE__);
-
-                            // Sometimes the page is not server-side rendered
-                            if (feed?.note?.note === undefined || JSON.stringify(feed?.note?.note) === '{}') {
-                                const res = await notePage.waitForResponse((res) => {
-                                    const req = res.request();
-                                    return req.url().includes('/api/sns/web/v1/feed') && req.method() === 'POST';
-                                });
-
-                                const json = await res.json();
-                                const note_card = json.data.items[0].note_card;
-                                feed.note.note = {
-                                    title: note_card.title,
-                                    noteId: note_card.id,
-                                    desc: note_card.desc,
-                                    tagList: note_card.tag_list,
-                                    imageList: note_card.image_list,
-                                    user: note_card.user,
-                                    time: note_card.time,
-                                    lastUpdateTime: note_card.last_update_time,
-                                };
-                            }
-                        } catch (error) {
-                            throw new Error(`Could not get note ${n.note_id}\n${error}`);
-                        }
-
-                        await notePage.close();
-
-                        if (feed?.note?.note !== undefined && JSON.stringify(feed?.note?.note) !== '{}') {
-                            return feed.note.note;
-                        } else {
-                            throw new Error(`Could not get note ${n.note_id}`);
-                        }
-                    });
-                });
-
-                user = otherInfo.data.basic_info;
-                notes = await Promise.all(notesPromise);
-            } finally {
-                await browser.close();
-            }
-
-            return { user, notes };
-        },
-        config.cache.routeExpire,
-        false
-    );
-
 const formatText = (text) => text.replaceAll(/(\r\n|\r|\n)/g, '<br>').replaceAll('\t', '&emsp;');
 
 // tag_list.id has nothing to do with its url
@@ -196,4 +118,149 @@ const formatNote = (url, note) => ({
     updated: parseDate(note.lastUpdateTime, 'x'),
 });
 
-export { getUser, getBoard, getNotes, formatText, formatNote };
+async function renderNotesFulltext(notes, urlPrex, displayLivePhoto) {
+    const data: Array<{
+        title: string;
+        link: string;
+        description: string;
+        author: string;
+        guid: string;
+        pubDate: Date;
+    }> = [];
+    const promises = notes.flatMap((note) =>
+        note.map(async ({ noteCard, id }) => {
+            const link = `${urlPrex}/${id}`;
+            const { title, description, pubDate } = await getFullNote(link, displayLivePhoto);
+            return {
+                title,
+                link,
+                description,
+                author: noteCard.user.nickName,
+                guid: noteCard.noteId,
+                pubDate,
+            };
+        })
+    );
+    data.push(...(await Promise.all(promises)));
+    return data;
+}
+
+async function getFullNote(link, displayLivePhoto) {
+    const data = (await cache.tryGet(link, async () => {
+        const res = await ofetch(link, {
+            headers: getHeaders(config.xiaohongshu.cookie),
+        });
+        const $ = load(res);
+        const script = extractInitialState($);
+        const state = JSON.parse(script);
+        const note = state.note.noteDetailMap[state.note.firstNoteId].note;
+        const title = note.title;
+        let desc = note.desc;
+        desc = desc.replaceAll(/\[.*?\]/g, '');
+        desc = desc.replaceAll(/#(.*?)#/g, '#$1');
+        desc = desc.replaceAll('\n', '<br>');
+        const pubDate = new Date(note.time);
+
+        let mediaContent = '';
+        if (note.type === 'video') {
+            const originVideoKey = note.video?.consumer?.originVideoKey;
+            const videoUrls: string[] = [];
+
+            if (originVideoKey) {
+                videoUrls.push(`http://sns-video-al.xhscdn.com/${originVideoKey}`);
+            }
+
+            const streamTypes = ['av1', 'h264', 'h265', 'h266'];
+            for (const type of streamTypes) {
+                const streams = note.video?.media?.stream?.[type];
+                if (streams?.length > 0) {
+                    const stream = streams[0];
+                    if (stream.masterUrl) {
+                        videoUrls.push(stream.masterUrl);
+                    }
+                    if (stream.backupUrls?.length) {
+                        videoUrls.push(...stream.backupUrls);
+                    }
+                }
+            }
+
+            const posterUrl = note.imageList?.[0]?.urlDefault;
+
+            if (videoUrls.length > 0) {
+                mediaContent = `<video controls ${posterUrl ? `poster="${posterUrl}"` : ''}>
+                    ${videoUrls.map((url) => `<source src="${url}" type="video/mp4">`).join('\n')}
+                </video><br>`;
+            }
+        } else {
+            mediaContent = note.imageList
+                .map((image) => {
+                    if (image.livePhoto && displayLivePhoto) {
+                        const videoUrls: string[] = [];
+
+                        const streamTypes = ['av1', 'h264', 'h265', 'h266'];
+                        for (const type of streamTypes) {
+                            const streams = image.stream?.[type];
+                            if (streams?.length > 0) {
+                                if (streams[0].masterUrl) {
+                                    videoUrls.push(streams[0].masterUrl);
+                                }
+                                if (streams[0].backupUrls?.length) {
+                                    videoUrls.push(...streams[0].backupUrls);
+                                }
+                            }
+                        }
+
+                        if (videoUrls.length > 0) {
+                            return `<video controls poster="${image.urlDefault}">
+                            ${videoUrls.map((url) => `<source src="${url}" type="video/mp4">`).join('\n')}
+                        </video>`;
+                        }
+                    }
+                    return `<img src="${image.urlDefault}">`;
+                })
+                .join('<br>');
+        }
+
+        const description = `${mediaContent}<br>${title}<br>${desc}`;
+        return {
+            title,
+            description,
+            pubDate,
+        };
+    })) as Promise<{ title: string; description: string; pubDate: Date }>;
+    return data;
+}
+
+async function getUserWithCookie(url: string, cookie: string) {
+    const res = await ofetch(url, {
+        headers: getHeaders(cookie),
+    });
+    const $ = load(res);
+    const paths = $('#userPostedFeeds > section > div > a.cover.ld.mask').map((i, item) => item.attributes[3].value);
+    const script = extractInitialState($);
+    const state = JSON.parse(script);
+    let index = 0;
+    for (const item of state.user.notes.flat()) {
+        const path = paths[index];
+        if (path && path.includes('?')) {
+            item.id = item.id + path?.substring(path.indexOf('?'));
+        }
+        index = index + 1;
+    }
+    return state.user;
+}
+
+// Add helper function to extract initial state
+function extractInitialState($) {
+    let script = $('script')
+        .filter((i, script) => {
+            const text = script.children[0]?.data;
+            return text?.startsWith('window.__INITIAL_STATE__=');
+        })
+        .text();
+    script = script.slice('window.__INITIAL_STATE__='.length);
+    script = script.replaceAll('undefined', 'null');
+    return script;
+}
+
+export { getUser, getBoard, formatText, formatNote, renderNotesFulltext, getFullNote, getUserWithCookie };

package/lib/routes/ximalaya/album.ts

@@ -104,11 +104,11 @@ export const route: Route = {
     handler,
     description: `目前喜马拉雅的 API 只能一集一集的获取各节目上的 ShowNote，会极大的占用系统资源，所以默认为不获取节目的 ShowNote。
 
-  :::warning
+::: warning
   专辑类型即 url 中的分类拼音，使用通用分类 \`album\` 通常是可行的，专辑 id 是跟在**分类拼音**后的那个 id, 不要输成某集的 id 了
 
   **付费内容需要配置好已购买账户的 token 才能收听，详情见部署页面的配置模块**
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/xinpianchang/index.ts

@@ -18,11 +18,11 @@ export const route: Route = {
     name: '发现',
     maintainers: ['nczitzk'],
     handler,
-    description: `:::tip
+    description: `::: tip
   跳转到欲订阅的分类页，将 URL 的 \`/discover\` 到末尾的部分填入 \`params\` 参数。
 
   如 [全部原创视频作品](https://www.xinpianchang.com/discover/article-0-0-all-all-0-0-score) 的 URL 为 \`https://www.xinpianchang.com/discover/article-0-0-all-all-0-0-score\`，其 \`/discover\` 到末尾的部分为 \`article-0-0-all-all-0-0-score\`，所以对应的路由为 [/xinpianchang/discover/article-0-0-all-all-0-0-score](https://rsshub.app/xinpianchang/discover/article-0-0-all-all-0-0-score)。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/xsijishe/forum.ts

@@ -31,9 +31,9 @@ export const route: Route = {
     name: '论坛',
     maintainers: ['akynazh'],
     handler,
-    description: `:::tip 关于子论坛 id 的获取方法
+    description: `::: tip 关于子论坛 id 的获取方法
   \`/xsijishe/forum/51\` 对应于论坛 \`https://xsijishe.com/forum-51-1.html\`，这个论坛的 fid 为 51，也就是 \`forum-{fid}-1\` 中的 fid。
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/xsijishe/rank.ts

@@ -8,9 +8,17 @@ const baseUrl = 'https://xsijishe.com';
 
 export const route: Route = {
     path: '/rank/:type',
-    categories: ['bbs'],
+    categories: ['bbs', 'popular'],
     example: '/xsijishe/rank/weekly',
-    parameters: { type: '排行榜类型: weekly | monthly' },
+    parameters: {
+        type: {
+            description: '排行榜类型',
+            options: [
+                { value: 'weekly', label: '周榜' },
+                { value: 'monthly', label: '月榜' },
+            ],
+        },
+    },
     features: {
         requireConfig: [
             {
@@ -29,23 +37,25 @@ export const route: Route = {
         supportScihub: false,
     },
     name: '排行榜',
-    maintainers: ['akynazh'],
+    maintainers: ['akynazh', 'AiraNadih'],
     handler,
 };
 
 async function handler(ctx) {
     const rankType = ctx.req.param('type');
     let title;
-    let rankId;
+    let index; // 用于选择第几个 li
+
     if (rankType === 'weekly') {
         title = '司机社综合周排行榜';
-        rankId = 'nex_recons_demens';
+        index = 0; // 第一个 li 是周榜
     } else if (rankType === 'monthly') {
         title = '司机社综合月排行榜';
-        rankId = 'nex_recons_demens1';
+        index = 1; // 第二个 li 是月榜
     } else {
         throw new InvalidParameterError('Invalid rank type');
     }
+
     const url = `${baseUrl}/portal.php`;
     const headers = {
         'Accept-Encoding': 'gzip, deflate, br',
@@ -53,11 +63,26 @@ async function handler(ctx) {
         Cookie: config.xsijishe.cookie,
         'User-Agent': config.xsijishe.user_agent,
     };
+
     const resp = await got(url, {
         headers,
     });
+
+    const redirectMatch = resp.data.match(/window\.location\.href\s*=\s*"([^"]+)"/);
+    if (redirectMatch) {
+        const redirectUrl = `${baseUrl}${redirectMatch[1]}`;
+        // 使用提取到的地址重新请求
+        const realResp = await got(redirectUrl, {
+            headers,
+        });
+        resp.data = realResp.data;
+    }
+
     const $ = load(resp.data);
-    let items = $(`#${rankId} dd`)
+    // 根据 index 选择对应的 li，然后获取其中的 dd 元素
+    let items = $('.nex_recon_lists ul li')
+        .eq(index)
+        .find('.nex_recons_demens dl dd')
         .toArray()
         .map((item) => {
             item = $(item);
@@ -68,6 +93,7 @@ async function handler(ctx) {
                 link: `${baseUrl}/${link}`,
             };
         });
+
     items = await Promise.all(
         items.map((item) =>
             cache.tryGet(item.link, async () => {