rsshub 1.0.0-master.f71451d → 1.0.0-master.f72af1b

package/lib/routes/bilibili/api-interface.d.ts

@@ -28,6 +28,7 @@ interface Generalspec {
     render_spec: Renderspec;
     size_spec: Containersize;
 }
+/* eslint-disable-next-line @typescript-eslint/no-empty-object-type */
 interface AVATARLAYER {}
 interface Webcssstyle {
     borderRadius: string;
@@ -186,7 +187,15 @@ interface Richtextnode {
     type: string;
     jump_url?: string;
     emoji?: Emoji;
+    pics?: Pic2[];
 }
+interface Pic2 {
+    height: number;
+    size: number;
+    src: string;
+    width: number;
+}
+
 interface Desc {
     rich_text_nodes: Richtextnode[];
     text: string;

package/lib/routes/bilibili/bangumi.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 
 export const route: Route = {
@@ -8,7 +8,8 @@ export const route: Route = {
         mediaid: '番剧媒体 id, 番剧主页 URL 中获取',
     },
     example: '/bilibili/bangumi/media/9192',
-    categories: ['social-media'],
+    categories: ['social-media', 'popular'],
+    view: ViewType.Videos,
     maintainers: ['DIYgod'],
     handler,
 };

package/lib/routes/bilibili/bilibili-recommend.ts

@@ -0,0 +1,42 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import utils from './utils';
+
+export const route: Route = {
+    path: '/precious/:disableEmbed?',
+    categories: ['social-media'],
+    example: '/bilibili/precious',
+    parameters: { disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    name: '入站必刷',
+    maintainers: ['liuyuhe666'],
+    handler,
+};
+
+async function handler(ctx) {
+    const disableEmbed = ctx.req.param('disableEmbed');
+    const response = await got({
+        method: 'get',
+        url: 'https://api.bilibili.com/x/web-interface/popular/precious',
+        headers: {
+            Referer: 'https://www.bilibili.com/v/popular/history',
+        },
+    });
+    const data = response.data.data.list;
+    return {
+        title: '哔哩哔哩入站必刷',
+        link: 'https://www.bilibili.com/v/popular/history',
+        item: data.map((item) => ({
+            title: item.title,
+            description: `${item.desc || item.title}${disableEmbed ? '' : `<br><br>${utils.iframe(item.aid, null, item.bvid)}`}<br><img src="${item.pic}">`,
+            link: item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
+        })),
+    };
+}

package/lib/routes/bilibili/cache.ts

@@ -5,6 +5,7 @@ import { load } from 'cheerio';
 import { config } from '@/config';
 import logger from '@/utils/logger';
 import puppeteer from '@/utils/puppeteer';
+import { JSDOM } from 'jsdom';
 
 let disableConfigCookie = false;
 const getCookie = () => {
@@ -13,7 +14,9 @@ const getCookie = () => {
     }
     const key = 'bili-cookie';
     return cache.tryGet(key, async () => {
-        const browser = await puppeteer();
+        const browser = await puppeteer({
+            stealth: true,
+        });
         const page = await browser.newPage();
         const waitForRequest = new Promise<string>((resolve) => {
             page.on('requestfinished', async (request) => {
@@ -27,7 +30,7 @@ const getCookie = () => {
         await page.goto('https://space.bilibili.com/1/dynamic');
         const cookieString = await waitForRequest;
         logger.debug(`Got bilibili cookie: ${cookieString}`);
-
+        await browser.close();
         return cookieString;
     });
 };
@@ -37,6 +40,26 @@ const clearCookie = () => {
     disableConfigCookie = true;
 };
 
+const getRenderData = (uid) => {
+    const key = 'bili-web-render-data';
+    return cache.tryGet(key, async () => {
+        const cookie = await getCookie();
+        const { data: response } = await got(`https://space.bilibili.com/${uid}`, {
+            headers: {
+                Referer: 'https://www.bilibili.com/',
+                Cookie: cookie,
+            },
+        });
+        const dom = new JSDOM(response);
+        const document = dom.window.document;
+        const scriptElement = document.querySelector('#__RENDER_DATA__');
+        const innerText = scriptElement ? scriptElement.textContent || '{}' : '{}';
+        const renderData = JSON.parse(decodeURIComponent(innerText));
+        const accessId = renderData.access_id;
+        return accessId;
+    });
+};
+
 const getWbiVerifyString = () => {
     const key = 'bili-wbi-verify-string';
     return cache.tryGet(key, async () => {
@@ -260,4 +283,5 @@ export default {
     getCidFromId,
     getAidFromBvid,
     getArticleDataFromCvid,
+    getRenderData,
 };

package/lib/routes/bilibili/dynamic.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import JSONbig from 'json-bigint';
@@ -10,9 +10,22 @@ import { BilibiliWebDynamicResponse, Item2, Modules } from './api-interface';
 
 export const route: Route = {
     path: '/user/dynamic/:uid/:routeParams?',
-    categories: ['social-media'],
+    categories: ['social-media', 'popular'],
+    view: ViewType.SocialMedia,
     example: '/bilibili/user/dynamic/2267573',
-    parameters: { uid: '用户 id, 可在 UP 主主页中找到', routeParams: '额外参数；请参阅以下说明和表格' },
+    parameters: {
+        uid: '用户 id, 可在 UP 主主页中找到',
+        routeParams: `
+| 键           | 含义                              | 接受的值       | 默认值 |
+| ------------ | --------------------------------- | -------------- | ------ |
+| showEmoji    | 显示或隐藏表情图片                | 0/1/true/false | false  |
+| disableEmbed | 关闭内嵌视频                      | 0/1/true/false | false  |
+| useAvid      | 视频链接使用 AV 号 (默认为 BV 号) | 0/1/true/false | false  |
+| directLink   | 使用内容直链                      | 0/1/true/false | false  |
+| hideGoods    | 隐藏带货动态                      | 0/1/true/false | false  |
+
+用例：\`/bilibili/user/dynamic/2267573/showEmoji=1&disableEmbed=1&useAvid=1\``,
+    },
     features: {
         requireConfig: [
             {
@@ -26,7 +39,7 @@ export const route: Route = {
             },
         ],
         requirePuppeteer: false,
-        antiCrawler: true,
+        antiCrawler: false,
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
@@ -40,20 +53,6 @@ export const route: Route = {
     name: 'UP 主动态',
     maintainers: ['DIYgod', 'zytomorrow', 'CaoMeiYouRen', 'JimenezLi'],
     handler,
-    description: `| 键           | 含义                              | 接受的值       | 默认值 |
-  | ------------ | --------------------------------- | -------------- | ------ |
-  | showEmoji    | 显示或隐藏表情图片                | 0/1/true/false | false  |
-  | disableEmbed | 关闭内嵌视频                      | 0/1/true/false | false  |
-  | useAvid      | 视频链接使用 AV 号 (默认为 BV 号) | 0/1/true/false | false  |
-  | directLink   | 使用内容直链                      | 0/1/true/false | false  |
-
-  用例：\`/bilibili/user/dynamic/2267573/showEmoji=1&disableEmbed=1&useAvid=1\`
-
-  :::tip 动态的专栏显示全文
-  动态的专栏显示全文请使用通用参数里的 \`mode=fulltext\`
-
-  举例: bilibili 专栏全文输出 /bilibili/user/dynamic/2267573/?mode=fulltext
-  :::`,
 };
 
 const getTitle = (data: Modules): string => {
@@ -231,17 +230,12 @@ async function handler(ctx) {
     const displayArticle = ctx.req.query('mode') === 'fulltext';
     const useAvid = fallback(undefined, queryToBoolean(routeParams.useAvid), false);
     const directLink = fallback(undefined, queryToBoolean(routeParams.directLink), false);
+    const hideGoods = fallback(undefined, queryToBoolean(routeParams.hideGoods), false);
 
     const cookie = await cacheIn.getCookie();
 
-    const response = await got({
-        method: 'get',
-        url: `https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space`,
-        searchParams: {
-            host_mid: uid,
-            platform: 'web',
-            features: 'itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote',
-        },
+    const params = utils.addDmVerifyInfo(`host_mid=${uid}&platform=web&features=itemOpusStyle,listOnlyfans,opusBigCover,onlyfansVote`, utils.getDmImgList());
+    const response = await got(`https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space?${params}`, {
         headers: {
             Referer: `https://space.bilibili.com/${uid}/`,
             Cookie: cookie,
@@ -261,86 +255,121 @@ async function handler(ctx) {
     cache.set(`bili-userface-from-uid-${uid}`, face);
 
     const rssItems = await Promise.all(
-        items.map(async (item) => {
-            // const parsed = JSONbig.parse(item.card);
+        items
+            .filter((item) => !hideGoods || item.modules.module_dynamic?.additional?.type !== 'ADDITIONAL_TYPE_GOODS')
+            .map(async (item) => {
+                // const parsed = JSONbig.parse(item.card);
 
-            const data = item.modules;
-            const origin = item?.orig?.modules;
+                const data = item.modules;
+                const origin = item?.orig?.modules;
 
-            // link
-            let link = '';
-            if (item.id_str) {
-                link = `https://t.bilibili.com/${item.id_str}`;
-            }
+                // link
+                let link = '';
+                if (item.id_str) {
+                    link = `https://t.bilibili.com/${item.id_str}`;
+                }
 
-            let description = getDes(data) || '';
-            const title = getTitle(data) || description; // 没有 title 的时候使用 desc 填充
+                let description = getDes(data) || '';
+                const title = getTitle(data) || description; // 没有 title 的时候使用 desc 填充
+                const category: string[] = [];
+                // emoji
+                if (data.module_dynamic?.desc?.rich_text_nodes?.length) {
+                    const nodes = data.module_dynamic.desc.rich_text_nodes;
+                    for (const node of nodes) {
+                        // 处理 emoji 的情况
+                        if (showEmoji && node?.emoji) {
+                            const emoji = node.emoji;
+                            description = description.replaceAll(
+                                emoji.text,
+                                `<img alt="${emoji.text}" src="${emoji.icon_url}" style="margin: -1px 1px 0px; display: inline-block; width: 20px; height: 20px; vertical-align: text-bottom;" title="" referrerpolicy="no-referrer">`
+                            );
+                        }
+                        // 处理转发带图评论的情况
+                        if (node?.pics?.length) {
+                            const { pics, text } = node;
+                            description = description.replaceAll(
+                                text,
+                                pics
+                                    .map(
+                                        (pic) =>
+                                            `<img alt="${text}" src="${pic.src}" style="margin: 0px 0px 0px; display: inline-block; width: ${pic.width}px; height: ${pic.height}px; vertical-align: text-bottom;" title="" referrerpolicy="no-referrer">`
+                                    )
+                                    .join('<br>')
+                            );
+                        }
+                        if (node?.type === 'RICH_TEXT_NODE_TYPE_TOPIC') {
+                            // 将话题作为 category
+                            category.push(node.text.match(/#(\S+)#/)?.[1] || '');
+                        }
+                    }
+                }
 
-            // emoji
-            if (data.module_dynamic?.desc?.rich_text_nodes?.length && showEmoji) {
-                const nodes = data.module_dynamic?.desc?.rich_text_nodes;
-                for (const node of nodes) {
-                    if (node?.emoji) {
-                        const emoji = node.emoji;
-                        description = description.replaceAll(
-                            emoji.text,
-                            `<img alt="${emoji.text}" src="${emoji.icon_url}"style="margin: -1px 1px 0px; display: inline-block; width: 20px; height: 20px; vertical-align: text-bottom;" title="" referrerpolicy="no-referrer">`
-                        );
+                if (data.module_dynamic?.major?.opus?.summary?.rich_text_nodes?.length) {
+                    const nodes = data.module_dynamic.major.opus.summary.rich_text_nodes;
+                    for (const node of nodes) {
+                        if (node?.type === 'RICH_TEXT_NODE_TYPE_TOPIC') {
+                            // 将话题作为 category
+                            category.push(node.text.match(/#(\S+)#/)?.[1] || '');
+                        }
                     }
                 }
-            }
+                if (data.module_dynamic?.topic?.name) {
+                    // 将话题作为 category
+                    category.push(data.module_dynamic.topic.name);
+                }
 
-            if (item.type === 'DYNAMIC_TYPE_ARTICLE' && displayArticle) {
-                // 抓取专栏全文
-                const cvid = data.module_dynamic?.major?.opus?.jump_url?.match?.(/cv(\d+)/)?.[0];
-                if (cvid) {
-                    description = (await cacheIn.getArticleDataFromCvid(cvid, uid)).description || '';
+                if (item.type === 'DYNAMIC_TYPE_ARTICLE' && displayArticle) {
+                    // 抓取专栏全文
+                    const cvid = data.module_dynamic?.major?.opus?.jump_url?.match?.(/cv(\d+)/)?.[0];
+                    if (cvid) {
+                        description = (await cacheIn.getArticleDataFromCvid(cvid, uid)).description || '';
+                    }
                 }
-            }
 
-            const urlResult = getUrl(item, useAvid);
-            const urlText = urlResult?.text;
-            if (urlResult && directLink) {
-                link = urlResult.url;
-            }
+                const urlResult = getUrl(item, useAvid);
+                const urlText = urlResult?.text;
+                if (urlResult && directLink) {
+                    link = urlResult.url;
+                }
 
-            const originUrlResult = getUrl(item?.orig, useAvid);
-            const originUrlText = originUrlResult?.text;
-            if (originUrlResult && directLink) {
-                link = originUrlResult.url;
-            }
+                const originUrlResult = getUrl(item?.orig, useAvid);
+                const originUrlText = originUrlResult?.text;
+                if (originUrlResult && directLink) {
+                    link = originUrlResult.url;
+                }
 
-            let originDescription = '';
-            const originName = getOriginName(origin);
-            const originTitle = getOriginTitle(origin);
-            const originDes = getOriginDes(origin);
-            if (originName) {
-                originDescription += `//转发自: @${getOriginName(origin)}: `;
-            }
-            if (originTitle) {
-                originDescription += originTitle;
-            }
-            if (originDes) {
-                originDescription += `<br>${originDes}`;
-            }
+                let originDescription = '';
+                const originName = getOriginName(origin);
+                const originTitle = getOriginTitle(origin);
+                const originDes = getOriginDes(origin);
+                if (originName) {
+                    originDescription += `//转发自: @${getOriginName(origin)}: `;
+                }
+                if (originTitle) {
+                    originDescription += originTitle;
+                }
+                if (originDes) {
+                    originDescription += `<br>${originDes}`;
+                }
 
-            // 换行处理
-            description = description.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
-            originDescription = originDescription.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
+                // 换行处理
+                description = description.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
+                originDescription = originDescription.replaceAll('\r\n', '<br>').replaceAll('\n', '<br>');
 
-            const descriptions = [description, originDescription, urlText, originUrlText, getIframe(data, disableEmbed), getIframe(origin, disableEmbed), getImgs(data), getImgs(origin)]
-                .filter(Boolean)
-                .map((e) => e?.trim())
-                .join('<br>');
+                const descriptions = [description, originDescription, urlText, originUrlText, getIframe(data, disableEmbed), getIframe(origin, disableEmbed), getImgs(data), getImgs(origin)]
+                    .filter(Boolean)
+                    .map((e) => e?.trim())
+                    .join('<br>');
 
-            return {
-                title,
-                description: descriptions,
-                pubDate: data.module_author?.pub_ts ? parseDate(data.module_author.pub_ts, 'X') : undefined,
-                link,
-                author,
-            };
-        })
+                return {
+                    title,
+                    description: descriptions,
+                    pubDate: data.module_author?.pub_ts ? parseDate(data.module_author.pub_ts, 'X') : undefined,
+                    link,
+                    author,
+                    category: category.length ? [...new Set(category)] : undefined,
+                };
+            })
     );
 
     return {

package/lib/routes/bilibili/followings-dynamic.ts

@@ -47,7 +47,6 @@ async function handler(ctx) {
     const displayArticle = fallback(undefined, queryToBoolean(routeParams.displayArticle), false);
 
     const name = await cache.getUsernameFromUID(uid);
-
     const cookie = config.bilibili.cookies[uid];
     if (cookie === undefined) {
         throw new ConfigNotFoundError('缺少对应 uid 的 Bilibili 用户登录后的 Cookie 值');
@@ -64,6 +63,9 @@ async function handler(ctx) {
     if (response.data.code === -6) {
         throw new ConfigNotFoundError('对应 uid 的 Bilibili 用户的 Cookie 已过期');
     }
+    if (response.data.code === 4_100_000) {
+        throw new ConfigNotFoundError('对应 uid 的 Bilibili 用户 请求失败');
+    }
     const data = JSONbig.parse(response.body).data.cards;
 
     const getTitle = (data) => (data ? data.title || data.description || data.content || (data.vest && data.vest.content) || '' : '');
@@ -108,7 +110,9 @@ async function handler(ctx) {
         data.map(async (item) => {
             const parsed = JSONbig.parse(item.card);
             const data = parsed.apiSeasonInfo || (getTitle(parsed.item) ? parsed.item : parsed);
-            const origin = parsed.origin ? JSONbig.parse(parsed.origin) : null;
+            // parsed.origin is already parsed, and it may be json or string.
+            // Don't parse it again, or it will cause an error.
+            const origin = parsed.origin || null;
 
             // img
             let imgHTML = '';

package/lib/routes/bilibili/followings-video.ts

@@ -4,6 +4,7 @@ import cache from './cache';
 import { config } from '@/config';
 import utils from './utils';
 import ConfigNotFoundError from '@/errors/types/config-not-found';
+import logger from '@/utils/logger';
 
 export const route: Route = {
     path: '/followings/video/:uid/:disableEmbed?',
@@ -53,10 +54,15 @@ async function handler(ctx) {
             Cookie: cookie,
         },
     });
-    if (response.data.code === -6) {
-        throw new ConfigNotFoundError('对应 uid 的 Bilibili 用户的 Cookie 已过期');
+    const data = response.data;
+    if (data.code) {
+        logger.error(JSON.stringify(data));
+        if (data.code === -6 || data.code === 4_100_000) {
+            throw new ConfigNotFoundError('对应 uid 的 Bilibili 用户的 Cookie 已过期');
+        }
+        throw new Error(`Got error code ${data.code} while fetching: ${data.message}`);
     }
-    const cards = response.data.data.cards;
+    const cards = data.data.cards;
 
     const out = cards.map((card) => {
         const card_data = JSON.parse(card.card);

package/lib/routes/bilibili/namespace.ts

@@ -1,6 +1,6 @@
 import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
-    name: 'Bilibili',
+    name: '哔哩哔哩 bilibili',
     url: 'www.bilibili.com',
 };

package/lib/routes/bilibili/ranking.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import utils from './utils';
 
@@ -6,17 +6,108 @@ export const route: Route = {
     path: '/ranking/:rid?/:day?/:arc_type?/:disableEmbed?',
     name: '排行榜',
     maintainers: ['DIYgod'],
-    categories: ['social-media'],
+    categories: ['social-media', 'popular'],
+    view: ViewType.Videos,
     example: '/bilibili/ranking/0/3/1',
     parameters: {
-        rid: '排行榜分区 id, 默认 0',
-        day: '时间跨度, 可为 1 3 7 30',
-        arc_type: '投稿时间, 可为 0(全部投稿) 1(近期投稿) , 默认 1',
-        disableEmbed: '默认为开启内嵌视频, 任意值为关闭',
+        rid: {
+            description: '排行榜分区 id',
+            default: '0',
+            options: [
+                {
+                    label: '全站',
+                    value: '0',
+                },
+                {
+                    label: '动画',
+                    value: '1',
+                },
+                {
+                    label: '国创相关',
+                    value: '168',
+                },
+                {
+                    label: '音乐',
+                    value: '3',
+                },
+                {
+                    label: '舞蹈',
+                    value: '129',
+                },
+                {
+                    label: '游戏',
+                    value: '4',
+                },
+                {
+                    label: '科技',
+                    value: '36',
+                },
+                {
+                    label: '数码',
+                    value: '188',
+                },
+                {
+                    label: '生活',
+                    value: '160',
+                },
+                {
+                    label: '鬼畜',
+                    value: '119',
+                },
+                {
+                    label: '时尚',
+                    value: '155',
+                },
+                {
+                    label: '娱乐',
+                    value: '5',
+                },
+                {
+                    label: '影视',
+                    value: '181',
+                },
+            ],
+        },
+        day: {
+            description: '时间跨度',
+            default: '3',
+            options: [
+                {
+                    value: '1',
+                    label: '1日',
+                },
+                {
+                    value: '3',
+                    label: '3日',
+                },
+                {
+                    value: '7',
+                    label: '7日',
+                },
+                {
+                    value: '30',
+                    label: '30日',
+                },
+            ],
+        },
+        arc_type: {
+            description: '投稿时间',
+            default: '1',
+            options: [
+                {
+                    value: '0',
+                    label: '全部投稿',
+                },
+                {
+                    value: '1',
+                    label: '近期投稿',
+                },
+            ],
+        },
+        disableEmbed: {
+            description: '默认为开启内嵌视频, 任意值为关闭',
+        },
     },
-    description: `| 全站 | 动画 | 国创相关 | 音乐 | 舞蹈 | 游戏 | 科技 | 数码 | 生活 | 鬼畜 | 时尚 | 娱乐 | 影视 |
-    | ---- | ---- | -------- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- |
-    | 0    | 1    | 168      | 3    | 129  | 4    | 36   | 188  | 160  | 119  | 155  | 5    | 181  |`,
     handler,
 };
 

package/lib/routes/bilibili/readlist.ts

@@ -1,9 +1,10 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 
 export const route: Route = {
     path: '/readlist/:listid',
-    categories: ['social-media'],
+    categories: ['social-media', 'popular'],
+    view: ViewType.Articles,
     example: '/bilibili/readlist/25611',
     parameters: { listid: '文集 id, 可在专栏文集 URL 中找到' },
     features: {

package/lib/routes/bilibili/utils.ts

@@ -66,6 +66,10 @@ function hexsign(e) {
     return o;
 }
 
+function addRenderData(params, renderData) {
+    return `${params}&w_webid=${encodeURIComponent(renderData)}`;
+}
+
 function addWbiVerifyInfo(params, wbiVerifyString) {
     const searchParams = new URLSearchParams(params);
     searchParams.sort();
@@ -122,4 +126,5 @@ export default {
     getDmImgList,
     addDmVerifyInfo,
     bvidTime,
+    addRenderData,
 };