rsshub 1.0.0-master.fdbb6fa → 1.0.0-master.fdc59d2

package/lib/v2/bilibili/userChannel.js

@@ -1,70 +1,66 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
 const cache = require('./cache');
 const utils = require('./utils');
 
+const notFoundData = {
+    title: '此 bilibili 频道不存在',
+};
+
 module.exports = async (ctx) => {
-    const uid = Number.parseInt(ctx.params.uid);
-    const cid = Number.parseInt(ctx.params.cid);
+    const uid = parseInt(ctx.params.uid);
+    const sid = parseInt(ctx.params.sid);
     const disableEmbed = ctx.params.disableEmbed;
 
-    // 获取频道的 ctype
-    const channelsLink = `https://api.bilibili.com/x/space/channel/list?mid=${uid}`;
-    const channelsResponse = await ctx.cache.tryGet(channelsLink, async () => {
-        const response = await got.get(channelsLink, {
+    const link = `https://space.bilibili.com/${uid}/channel/seriesdetail?sid=${sid}`;
+
+    // 获取频道信息
+    const channelInfoLink = `https://api.bilibili.com/x/series/series?series_id=${sid}`;
+    const channelInfo = await ctx.cache.tryGet(channelInfoLink, async () => {
+        const response = await got(channelInfoLink, {
             headers: {
-                Referer: `https://space.bilibili.com/${uid}/`,
+                Referer: link,
             },
         });
-        return response.data;
+        // 频道不存在时返回 null
+        return response.data.data;
     });
-    const channelInfo = channelsResponse.data.list.find((channel) => channel.cid === cid);
+
     if (!channelInfo) {
-        throw new Error('无法获取该频道信息，请报告这个问题');
+        ctx.state.data = notFoundData;
+        return;
     }
-    const ctype = channelInfo.is_live_playback ? 1 : 0;
+    const [userName, face] = await cache.getUsernameAndFaceFromUID(ctx, uid);
+    const host = `https://api.bilibili.com/x/series/archives?mid=${uid}&series_id=${sid}&only_normal=true&sort=desc&pn=1&ps=10`;
 
-    const link = `https://space.bilibili.com/${uid}/detail?cid=${cid}&ctype=${ctype}`;
-    const userName = await cache.getUsernameFromUID(ctx, uid);
-    const host = `https://api.bilibili.com/x/space/channel/video?mid=${uid}&cid=${cid}&pn=1&ps=10&order=0&ctype=${ctype}`;
-
-    const response = await got({
-        method: 'get',
-        url: host,
+    const response = await got(host, {
         headers: {
             Referer: link,
         },
     });
 
-    let data = response.data;
-    if (!data.data) {
-        ctx.state.data = {
-            title: '此 bilibili 频道不存在',
-        };
+    const data = response.data.data;
+    if (!data.archives) {
+        ctx.state.data = notFoundData;
         return;
-    } else {
-        data = data.data.list;
     }
 
-    const channelName = data.name;
-
     ctx.state.data = {
-        title: `${userName} 的 bilibili 频道 ${channelName}`,
+        title: `${userName} 的 bilibili 频道 ${channelInfo.meta.name}`,
         link,
-        description: data.name,
-
+        description: `${userName} 的 bilibili 频道`,
+        logo: face,
+        icon: face,
         item: data.archives.map((item) => {
             const descList = [];
-            if (item.desc) {
-                descList.push(item.desc);
-            }
             if (!disableEmbed) {
-                descList.push(`${item.desc ? '<br>' : ''}${utils.iframe(item.aid)}`);
+                descList.push(utils.iframe(item.aid));
             }
             descList.push(`<img src="${item.pic}">`);
             return {
                 title: item.title,
                 description: descList.join('<br>'),
-                pubDate: new Date(item.pubdate * 1000),
+                pubDate: parseDate(item.pubdate, 'X'),
                 link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
                 author: userName,
             };

package/lib/v2/bilibili/userCollection.js

@@ -0,0 +1,52 @@
+const got = require('@/utils/got');
+const cache = require('./cache');
+const utils = require('./utils');
+const { parseDate } = require('@/utils/parse-date');
+
+const notFoundData = {
+    title: '此 bilibili 频道不存在',
+};
+
+module.exports = async (ctx) => {
+    const uid = parseInt(ctx.params.uid);
+    const sid = parseInt(ctx.params.sid);
+    const disableEmbed = ctx.params.disableEmbed;
+
+    const link = `https://space.bilibili.com/${uid}/channel/collectiondetail?sid=${sid}`;
+    const [userName, face] = await cache.getUsernameAndFaceFromUID(ctx, uid);
+    const host = `https://api.bilibili.com/x/polymer/space/seasons_archives_list?mid=${uid}&season_id=${sid}&sort_reverse=false&page_num=1&page_size=10`;
+
+    const response = await got(host, {
+        headers: {
+            Referer: link,
+        },
+    });
+
+    const data = response.data.data;
+    if (!data.archives) {
+        ctx.state.data = notFoundData;
+        return;
+    }
+
+    ctx.state.data = {
+        title: `${userName} 的 bilibili 合集 ${data.meta.name}`,
+        link,
+        description: `${userName} 的 bilibili 合集`,
+        logo: face,
+        icon: face,
+        item: data.archives.map((item) => {
+            const descList = [];
+            if (!disableEmbed) {
+                descList.push(utils.iframe(item.aid));
+            }
+            descList.push(`<img src="${item.pic}">`);
+            return {
+                title: item.title,
+                description: descList.join('<br>'),
+                pubDate: parseDate(item.pubdate, 'X'),
+                link: item.pubdate > utils.bvidTime && item.bvid ? `https://www.bilibili.com/video/${item.bvid}` : `https://www.bilibili.com/video/av${item.aid}`,
+                author: userName,
+            };
+        }),
+    };
+};

package/lib/v2/bilibili/video-all.js

@@ -6,27 +6,45 @@ const { parseDate } = require('@/utils/parse-date');
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     const disableEmbed = ctx.params.disableEmbed;
+    const cookie = await cache.getCookie(ctx);
     const [name, face] = await cache.getUsernameAndFaceFromUID(ctx, uid);
 
-    const response = await got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&jsonp=jsonp`, {
+    await got(`https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`, {
         headers: {
             Referer: `https://space.bilibili.com/${uid}/`,
+            Cookie: cookie,
+        },
+    });
+    const response = await got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&jsonp=jsonp`, {
+        headers: {
+            Referer: `https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`,
+            Cookie: cookie,
         },
     });
 
     const vlist = [...response.data.data.list.vlist];
     const pageTotal = Math.ceil(response.data.data.page.count / response.data.data.page.ps);
+
+    const getPage = async (pageId) => {
+        await got(`https://space.bilibili.com/${uid}/video?tid=0&page=${pageId}&keyword=&order=pubdate`, {
+            headers: {
+                Referer: `https://space.bilibili.com/${uid}/`,
+                Cookie: cookie,
+            },
+        });
+        return await got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=${pageId}&keyword=&order=pubdate&jsonp=jsonp`, {
+            headers: {
+                Referer: `https://space.bilibili.com/${uid}/video?tid=0&page=${pageId}&keyword=&order=pubdate`,
+                Cookie: cookie,
+            },
+        });
+    };
+
     const promises = [];
 
     if (pageTotal > 1) {
         for (let i = 2; i <= pageTotal; i++) {
-            promises.push(
-                got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=${i}&keyword=&order=pubdate&jsonp=jsonp`, {
-                    headers: {
-                        Referer: `https://space.bilibili.com/${uid}/`,
-                    },
-                })
-            );
+            promises.push(getPage(i));
         }
         const rets = await Promise.all(promises);
         rets.forEach((ret) => {

package/lib/v2/bilibili/video.js

@@ -5,13 +5,19 @@ const utils = require('./utils');
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
     const disableEmbed = ctx.params.disableEmbed;
+    const cookie = await cache.getCookie(ctx);
     const [name, face] = await cache.getUsernameAndFaceFromUID(ctx, uid);
 
-    const response = await got({
-        method: 'get',
-        url: `https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=10&tid=0&pn=1&order=pubdate&jsonp=jsonp`,
+    await got(`https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`, {
         headers: {
             Referer: `https://space.bilibili.com/${uid}/`,
+            Cookie: cookie,
+        },
+    });
+    const response = await got(`https://api.bilibili.com/x/space/arc/search?mid=${uid}&ps=30&tid=0&pn=1&keyword=&order=pubdate&jsonp=jsonp`, {
+        headers: {
+            Referer: `https://space.bilibili.com/${uid}/video?tid=0&page=1&keyword=&order=pubdate`,
+            Cookie: cookie,
         },
     });
     const data = response.data;

package/lib/v2/bilibili/vsearch.js

@@ -1,6 +1,9 @@
+const config = require('@/config').value;
 const got = require('@/utils/got');
 const { parseDate } = require('@/utils/parse-date');
 const utils = require('./utils');
+const { CookieJar } = require('tough-cookie');
+const cookieJar = new CookieJar();
 
 module.exports = async (ctx) => {
     const kw = ctx.params.kw;
@@ -9,18 +12,35 @@ module.exports = async (ctx) => {
     const kw_url = encodeURIComponent(kw);
     const tids = ctx.params.tid ?? 0;
 
-    const response = await got({
-        method: 'get',
-        url: `https://api.bilibili.com/x/web-interface/search/type?jsonp=jsonp&search_type=video&highlight=1&keyword=${kw_url}&order=${order}&duration=0&single_column=0&tids=${tids}`,
-        headers: {
-            Referer: `https://search.bilibili.com/all?keyword=${kw_url}`,
+    const data = await ctx.cache.tryGet(
+        `bilibili:vsearch:${tids}:${kw}:${order}`,
+        async () => {
+            await got('https://www.bilibili.com', {
+                cookieJar,
+            });
+
+            const response = await got('https://api.bilibili.com/x/web-interface/search/type', {
+                headers: {
+                    Referer: `https://search.bilibili.com/all?keyword=${kw_url}`,
+                },
+                cookieJar,
+                searchParams: {
+                    search_type: 'video',
+                    highlight: 1,
+                    keyword: kw,
+                    order,
+                    tids,
+                },
+            });
+            return response.data.data.result;
         },
-    });
-    const data = response.data.data.result;
+        config.cache.routeExpire,
+        false
+    );
 
     ctx.state.data = {
         title: `${kw} - bilibili`,
-        link: `https://search.bilibili.com/all?keyword=${kw_url}&order=${order}`,
+        link: `https://search.bilibili.com/all?keyword=${kw}&order=${order}`,
         description: `Result from ${kw} bilibili search, ordered by ${order}.`,
         item: data.map((item) => {
             const l = item.duration
@@ -42,7 +62,7 @@ module.exports = async (ctx) => {
                     `<img src="${img}"><br/>` +
                     `Match By: ${item.hit_columns.join(',')}` +
                     (!disableEmbed ? `<br><br>${utils.iframe(item.aid)}` : ''),
-                pubDate: parseDate(item.pubdate * 1000),
+                pubDate: parseDate(item.pubdate, 'X'),
                 guid: item.arcurl,
                 link: item.arcurl,
             };

package/lib/v2/bluestacks/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/release/5': ['TonyRL'],
+};

package/lib/v2/bluestacks/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'bluestacks.com': {
+        _name: 'BlueStacks',
+        '.': [
+            {
+                title: 'BlueStacks 5 版本日誌',
+                docs: 'https://docs.rsshub.app/program-update.html#bluestacks',
+                source: ['/hc/en-us/articles/360056960211-Release-Notes-BlueStacks-5', '/'],
+                target: '/bluestacks/release/5',
+            },
+        ],
+    },
+};

package/lib/v2/bluestacks/release.js

@@ -0,0 +1,63 @@
+const cherrio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const pageUrl = 'https://support.bluestacks.com/hc/en-us/articles/360056960211-Release-Notes-BlueStacks-5';
+
+module.exports = async (ctx) => {
+    const browser = await require('@/utils/puppeteer')();
+    const page = await browser.newPage();
+    await page.setRequestInterception(true);
+    page.on('request', (request) => {
+        request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
+    });
+    await page.goto(pageUrl, {
+        waitUntil: 'domcontentloaded',
+    });
+    const res = await page.evaluate(() => document.documentElement.innerHTML);
+    await page.close();
+
+    const $ = cherrio.load(res);
+
+    const items = $('div h3 a')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.text(),
+                link: item.attr('href'),
+            };
+        });
+
+    await Promise.all(
+        items.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const page = await browser.newPage();
+                await page.setRequestInterception(true);
+                page.on('request', (request) => {
+                    request.resourceType() === 'document' || request.resourceType() === 'script' ? request.continue() : request.abort();
+                });
+                await page.goto(item.link, {
+                    waitUntil: 'domcontentloaded',
+                });
+                const res = await page.evaluate(() => document.documentElement.innerHTML);
+                const $ = cherrio.load(res);
+                await page.close();
+
+                item.description = $('div.article__body').html();
+                item.pubDate = parseDate($('div.meta time').attr('datetime'));
+
+                return item;
+            })
+        )
+    );
+
+    await browser.close();
+
+    ctx.state.data = {
+        title: $('.article__title').text().trim(),
+        description: $('meta[name=description]').text().trim(),
+        link: pageUrl,
+        image: $('link[rel="shortcut icon"]').attr('href'),
+        item: items,
+    };
+};

package/lib/v2/bluestacks/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/release/5', require('./release'));
+};

package/lib/v2/bnu/dwxgb.js

@@ -0,0 +1,57 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const { category, type } = ctx.params;
+
+    const rootUrl = 'https://dwxgb.bnu.edu.cn';
+    let currentUrl = `${rootUrl}/${category}/${type}/index.html`;
+
+    let response;
+    try {
+        response = await got({
+            method: 'get',
+            url: currentUrl,
+        });
+    } catch (e) {
+        currentUrl = `${rootUrl}/${category}/${type}/index.htm`;
+        response = await got({
+            method: 'get',
+            url: currentUrl,
+        });
+    }
+
+    const $ = cheerio.load(response.data);
+
+    const list = $('ul.container.list > li')
+        .map((_, item) => ({
+            title: $(item).find('a').text().trim(),
+            pubDate: parseDate($(item).find('span').text()),
+            link: `${rootUrl}/${category}/${type}/${$(item).find('a').attr('href')}`,
+        }))
+        .get();
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const detailResponse = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const content = cheerio.load(detailResponse.data);
+
+                item.description = content('div.article.typo').html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${$('div.breadcrumb1 > a:nth-child(3)').text()} - ${$('div.breadcrumb1 > a:nth-child(4)').text()}`,
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/bnu/radar.js

@@ -4,10 +4,16 @@ module.exports = {
         '.': [
             {
                 title: '经济与工商管理学院',
-                docs: 'https://docs.rsshub.app/universities.html#bei-jing-shi-fan-da-xue-jing-ji-yu-gong-shang-guan-li-xue-yuan',
+                docs: 'https://docs.rsshub.app/university.html#bei-jing-shi-fan-da-xue',
                 source: ['/'],
                 target: '/bs/:category?',
             },
+            {
+                title: '经济与工商管理学院',
+                docs: 'https://docs.rsshub.app/university.html#bei-jing-shi-fan-da-xue',
+                source: ['/'],
+                target: '/bnu/dwxgb/:category/:type',
+            },
         ],
     },
 };

package/lib/v2/bnu/router.js

@@ -1,3 +1,4 @@
 module.exports = function (router) {
     router.get('/bs/:category?', require('./bs'));
+    router.get('/dwxgb/:category/:type', require('./dwxgb'));
 };

package/lib/v2/china/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/news/military': ['jiaaoMario'],
+    '/news/:category?': ['jiaaoMario'],
+};

package/lib/v2/china/news/highlights/news.js

@@ -0,0 +1,40 @@
+const cheerio = require('cheerio');
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+const CATEGORY_MAP = {
+    domestic: 'domestic',
+    international: 'international',
+    social: 'social',
+    news100: 'news100',
+};
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://news.china.com';
+    const category = CATEGORY_MAP[ctx.params.category] ?? CATEGORY_MAP.domestic;
+    const websiteUrl = `${baseUrl}/${category}`;
+    const response = await got(websiteUrl);
+    const data = response.data;
+    const $ = cheerio.load(data);
+    const categoryTitle = $('.wp_title').text();
+    const news = $('.item_list li');
+    ctx.state.data = {
+        title: `中华网-${categoryTitle}新闻`,
+        link: websiteUrl,
+        item:
+            news &&
+            news
+                .map((_, item) => {
+                    item = $(item);
+                    return {
+                        title: item.find('.item_title a').text(),
+                        author: item.find('.item_source').text(),
+                        category: `${categoryTitle}新闻`,
+                        pubDate: parseDate(item.find('.item_time').text()),
+                        description: item.find('.item_title a').text(),
+                        link: item.find('li a').attr('href'),
+                    };
+                })
+                .get(),
+    };
+};

package/lib/v2/china/news/military/news.js

@@ -0,0 +1,31 @@
+const cheerio = require('cheerio');
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const websiteUrl = 'https://military.china.com/news/';
+    const response = await got(websiteUrl);
+    const data = response.data;
+    const $ = cheerio.load(data);
+    const commonList = $('.listItem');
+
+    ctx.state.data = {
+        title: '中华网-军事新闻',
+        link: 'https://military.china.com/news/',
+        item:
+            commonList &&
+            commonList
+                .map((_, item) => {
+                    item = $(item);
+                    return {
+                        title: item.find('.tit a').text(),
+                        author: '中华网军事',
+                        category: '中华网军事',
+                        pubDate: parseDate(item.find('.time').text()),
+                        description: item.find('.tag').text(),
+                        link: item.find('.tit a').attr('href'),
+                    };
+                })
+                .get(),
+    };
+};

package/lib/v2/china/radar.js

@@ -0,0 +1,21 @@
+module.exports = {
+    'china.com': {
+        _name: '中华网',
+        military: [
+            {
+                title: '军事新闻',
+                docs: 'https://docs.rsshub.app/new-media.html#zhong-hua-wang',
+                source: '/news',
+                target: '/china/news/military',
+            },
+        ],
+        news: [
+            {
+                title: '时事新闻',
+                docs: 'https://docs.rsshub.app/new-media.html#zhong-hua-wang',
+                source: '/:category',
+                target: '/china/news/:category?',
+            },
+        ],
+    },
+};

package/lib/v2/china/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/news/military', require('./news/military/news.js'));
+    router.get('/news/:category?', require('./news/highlights/news.js'));
+};

package/lib/v2/cnbc/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/rss/:id?': ['TonyRL'],
+};

package/lib/v2/cnbc/radar.js

@@ -0,0 +1,21 @@
+module.exports = {
+    'cnbc.com': {
+        _name: 'CNBC',
+        search: [
+            {
+                title: '全文 RSS',
+                docs: 'https://docs.rsshub.app/traditional-media.html#cnbc',
+                source: ['/rs/search/combinedcms/view.xml'],
+                target: (_, url) => `/cnbc/rss/${new URL(url).searchParams.get('id')}`,
+            },
+        ],
+        www: [
+            {
+                title: '全文 RSS',
+                docs: 'https://docs.rsshub.app/traditional-media.html#cnbc',
+                source: ['/id/:id/device/rss/rss.html'],
+                target: '/cnbc/rss/:id',
+            },
+        ],
+    },
+};

package/lib/v2/cnbc/router.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/rss/:id?', require('./rss'));
+};

package/lib/v2/cnbc/rss.js

@@ -0,0 +1,54 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const parser = require('@/utils/rss-parser');
+
+module.exports = async (ctx) => {
+    const { id = '100003114' } = ctx.params;
+    const feed = await parser.parseURL(`https://search.cnbc.com/rs/search/combinedcms/view.xml?partnerId=wrss01&id=${id}`);
+
+    const items = await Promise.all(
+        feed.items
+            .filter((i) => !i.link.startsWith('https://www.cnbc.com/select/'))
+            .map((item) =>
+                ctx.cache.tryGet(item.link, async () => {
+                    const { data: response } = await got(item.link);
+                    const $ = cheerio.load(response);
+
+                    delete item.content;
+                    delete item.contentSnippet;
+                    delete item.isoDate;
+
+                    item.description = '';
+                    if ($('.RenderKeyPoints-keyPoints').length) {
+                        $('.RenderKeyPoints-keyPoints').html();
+                    }
+                    if ($('.FeaturedContent-articleBody').length) {
+                        item.description += $('.FeaturedContent-articleBody').html();
+                    }
+                    if ($('.ArticleBody-articleBody').length) {
+                        item.description += $('.ArticleBody-articleBody').html();
+                    }
+                    if ($('.LiveBlogBody-articleBody').length) {
+                        item.description += $('.LiveBlogBody-articleBody').html();
+                    }
+                    if ($('.ClipPlayer-clipPlayer').length) {
+                        item.description += $('.ClipPlayer-clipPlayer').html();
+                    }
+
+                    const meta = JSON.parse($('[type=application/ld+json]').last().text());
+                    item.author = meta.author ? (meta.author.name ? meta.author.name : meta.author.map((a) => a.name).join(', ')) : null;
+                    item.category = meta.keywords;
+
+                    return item;
+                })
+            )
+    );
+
+    ctx.state.data = {
+        title: feed.title,
+        link: feed.link,
+        description: feed.description,
+        item: items,
+        language: feed.language,
+    };
+};