rsshub 1.0.0-master.f78ad03 → 1.0.0-master.f792555

package/lib/v2/douyin/live.js

@@ -1,5 +1,5 @@
 const config = require('@/config').value;
-const { getOriginAvatar } = require('./utils');
+const { getOriginAvatar, universalGet } = require('./utils');
 
 module.exports = async (ctx) => {
     const { rid } = ctx.params;
@@ -9,26 +9,7 @@ module.exports = async (ctx) => {
 
     const pageUrl = `https://live.douyin.com/${rid}`;
 
-    const renderData = await ctx.cache.tryGet(
-        `douyin:live:${rid}`,
-        async () => {
-            const browser = await require('@/utils/puppeteer')();
-            const page = await browser.newPage();
-            await page.setRequestInterception(true);
-            page.on('request', (request) => {
-                request.resourceType() === 'document' ? request.continue() : request.abort();
-            });
-            await page.goto(pageUrl, {
-                waitUntil: 'domcontentloaded',
-            });
-            const data = JSON.parse(decodeURIComponent(await page.evaluate(() => document.querySelector('#RENDER_DATA').innerText)));
-            browser.close();
-
-            return data;
-        },
-        config.cache.routeExpire,
-        false
-    );
+    const renderData = await ctx.cache.tryGet(`douyin:live:${rid}`, () => universalGet(pageUrl, 'live', ctx), config.cache.routeExpire, false);
 
     if (renderData[Object.keys(renderData).find((k) => renderData[k].status_code)].status_code !== '0') {
         throw `Status code ${renderData[Object.keys(renderData).find((k) => renderData[k].status_code)].status_code}`;

package/lib/v2/douyin/user.js

@@ -1,9 +1,8 @@
-const cheerio = require('cheerio');
 const { parseDate } = require('@/utils/parse-date');
 const { art } = require('@/utils/render');
 const config = require('@/config').value;
 const { fallback, queryToBoolean } = require('@/utils/readable-social');
-const { templates, resolveUrl, proxyVideo, getOriginAvatar } = require('./utils');
+const { templates, resolveUrl, proxyVideo, getOriginAvatar, universalGet } = require('./utils');
 
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
@@ -20,27 +19,13 @@ module.exports = async (ctx) => {
     const pageData = await ctx.cache.tryGet(
         `douyin:user:${uid}`,
         async () => {
-            const browser = await require('@/utils/puppeteer')();
-            const page = await browser.newPage();
-            await page.setRequestInterception(true);
-            page.on('request', (request) => {
-                request.resourceType() === 'document' ? request.continue() : request.abort();
-            });
-            await page.goto(pageUrl, {
-                waitUntil: 'domcontentloaded',
-            });
-            const html = await page.evaluate(() => document.documentElement.innerHTML);
-            await browser.close();
-
-            const $ = cheerio.load(html);
-            const renderData = JSON.parse(decodeURIComponent($('script#RENDER_DATA').html()));
+            const renderData = await universalGet(pageUrl, 'user', ctx);
             const dataKey = Object.keys(renderData).filter((key) => renderData[key].user && renderData[key].post)[0];
             return renderData[dataKey];
         },
         config.cache.routeExpire,
         false
     );
-
     const userInfo = pageData.user.user;
     const userNickName = userInfo.nickname;
     const userDescription = userInfo.desc;

package/lib/v2/douyin/utils.js

@@ -1,4 +1,8 @@
 const path = require('path');
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const logger = require('@/utils/logger');
+const config = require('@/config').value;
 
 const templates = {
     desc: path.join(__dirname, 'templates/desc.art'),
@@ -42,9 +46,90 @@ const getOriginAvatar = (url) =>
         .replace(/^(.*\.douyinpic\.com\/).*(\/aweme-avatar\/)([^?]*)(\?.*)?$/, '$1origin$2$3')
         .replace(/~\w+_\d+x\d+/g, '');
 
+const extractRenderData = (html) => {
+    if (!html) {
+        throw Error('Empty html. The request may be filtered by WAF.');
+    }
+
+    const $ = cheerio.load(html);
+    const renderData = JSON.parse(decodeURIComponent($('script#RENDER_DATA').html()));
+    if (!renderData) {
+        const title = $('title').text();
+        if (title.includes('验证')) {
+            throw Error(title);
+        } else if ($('#captcha_container').length > 0) {
+            throw Error('Captcha required.');
+        }
+        throw Error('Failed to get render data.');
+    } else if (renderData.isSpider) {
+        throw Error('The request was considered to be from a spider.');
+    } else {
+        return renderData;
+    }
+};
+
+const gotGet = async (url, ua) => {
+    const response = await got(url, {
+        headers: {
+            'User-Agent': ua, // magic!
+        },
+    });
+    return extractRenderData(response.data);
+};
+
+const puppeteerGet = async (pageUrl) => {
+    const browser = await require('@/utils/puppeteer')();
+    const page = await browser.newPage();
+    await page.setRequestInterception(true);
+    page.on('request', (request) => {
+        request.resourceType() === 'document' ? request.continue() : request.abort();
+    });
+    await page.goto(pageUrl, {
+        waitUntil: 'domcontentloaded',
+    });
+    const html = await page.evaluate(() => document.documentElement.innerHTML);
+    await browser.close();
+    return extractRenderData(html);
+};
+
+const universalGet = async (url, route, ctx) => {
+    const cacheKey = `douyin:utils:universalGet:gotFirst:${route}`;
+    const gotFirst = await ctx.cache.tryGet(
+        cacheKey,
+        () => '1',
+        config.cache.contentExpire,
+        false // no refresh now
+    );
+
+    const ua = route === 'live' ? 'Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)' : 'curl/7.86.0';
+
+    let data;
+    if (gotFirst === '1') {
+        try {
+            data = await gotGet(url, ua);
+            ctx.cache.set(cacheKey, '1', config.cache.contentExpire); // refresh if success
+        } catch (e) {
+            logger.warn('Failed to get data with got, trying puppeteer: ' + e.message);
+            data = await puppeteerGet(url);
+            ctx.cache.set(cacheKey, '0', config.cache.contentExpire); // only set if success
+        }
+    } else {
+        try {
+            data = await puppeteerGet(url);
+            ctx.cache.set(cacheKey, '0', config.cache.contentExpire); // refresh if success
+        } catch (e) {
+            logger.warn('Failed to get data with puppeteer, trying got: ' + e.message);
+            data = await gotGet(url, ua);
+            ctx.cache.set(cacheKey, '1', config.cache.contentExpire); // only set if success
+        }
+    }
+    return data;
+};
+
 module.exports = {
     templates,
     resolveUrl,
     proxyVideo,
     getOriginAvatar,
+    universalGet,
 };

package/lib/v2/{acm-ecnu → ecnu}/contest.js

@@ -9,10 +9,7 @@ module.exports = async (ctx) => {
     const rootUrl = 'https://acm.ecnu.edu.cn';
     const currentUrl = `${rootUrl}/contest/`;
 
-    const response = await got({
-        method: 'get',
-        url: currentUrl,
-    });
+    const response = await got(currentUrl);
 
     const $ = cheerio.load(response.data);
     const $trList = $('div > div > table > tbody > tr');

package/lib/v2/ecnu/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/acm/contest/:category?': ['a180285'],
+    '/yjs': ['shengmaosu'],
+};

package/lib/v2/ecnu/radar.js

@@ -0,0 +1,30 @@
+module.exports = {
+    'ecnu.edu.cn': {
+        _name: '华东师范大学',
+        acm: [
+            {
+                title: '所有比赛列表',
+                docs: 'https://docs.rsshub.app/university.html#hua-dong-shi-fan-da-xue',
+                source: ['/contest/', '/'],
+                target: '/ecnu/acm/contest/',
+            },
+            {
+                title: '仅公开比赛列表',
+                docs: 'https://docs.rsshub.app/university.html#hua-dong-shi-fan-da-xue',
+                source: ['/contest/', '/'],
+                target: '/ecnu/acm/contest/public',
+            },
+        ],
+    },
+    'kaoyan.com': {
+        _name: '华东师范大学',
+        yz: [
+            {
+                title: '研究生院',
+                docs: 'https://docs.rsshub.app/university.html#hua-dong-shi-fan-da-xue',
+                source: ['/ecnu/tiaoji', '/'],
+                target: '/ecnu/yjs',
+            },
+        ],
+    },
+};

package/lib/v2/ecnu/router.js

@@ -0,0 +1,4 @@
+module.exports = function (router) {
+    router.get('/acm/contest/:category?', require('./contest'));
+    router.get('/yjs', require('./yjs'));
+};

package/lib/v2/ecnu/yjs.js

@@ -0,0 +1,37 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const link = 'https://yz.kaoyan.com/ecnu/tiaoji/';
+    const response = await got(link);
+    const $ = cheerio.load(response.data);
+    const list = $('.subList li')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('li a').text(),
+                link: item.find('li a').attr('href').replace('http:', 'https:'),
+            };
+        });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data: response } = await got(item.link);
+                const $ = cheerio.load(response);
+                item.description = $('.articleCon').html();
+                item.pubDate = parseDate($('.outer_utime').text());
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '华东师范大学研究生院',
+        link,
+        description: '华东师范大学研究生调剂信息',
+        item: items,
+    };
+};

package/lib/v2/economist/full.js

@@ -7,7 +7,7 @@ const getArticleDetail = async (link, ctx) =>
         const response = await got(link);
         const $ = cheerio.load(response.data);
         $('div.article-audio-player__center-tooltip').remove();
-        const nextData = JSON.parse($('head script[type="application/ld+json"]').text());
+        const nextData = JSON.parse($('head script[type="application/ld+json"]').first().text());
 
         const article = ($('figure[class^=css-]').first().parent().parent().html() || '') + $('p.article__body-text').parent().html();
         const categories = nextData.keywords?.map((k) => k);

package/lib/v2/ehentai/ehapi.js

@@ -17,6 +17,10 @@ if (has_cookie) {
     }
 }
 
+if (config.star) {
+    headers.cookie += `;star=${config.star}`;
+}
+
 function ehgot(url) {
     if (from_ex) {
         return got({ method: 'get', url: `https://exhentai.org/${url}`, headers });
@@ -41,22 +45,53 @@ function ehgot_thumb(cache, thumb_url) {
 
 async function parsePage(cache, data, get_bittorrent = false, embed_thumb = false) {
     const $ = cheerio.load(data);
-    const table = $('table[class^="itg glt"] tbody');
-    if (!table) {
+    // "m" for Minimal
+    // "p" for Minimal+
+    // "l" for Compact
+    // "e" for Extended
+    // "t" for Thumbnail
+    let layout = 't';
+
+    // "itg gld" for Thumbnail
+    let galleries = $('div[class^="itg gld"]');
+    // "itg gltm" for Minimal or Minimal+
+    if (galleries.length <= 0) {
+        galleries = $('table[class^="itg gltm"] tbody');
+        layout = 'm';
+    }
+    // "itg gltc" for Compact
+    if (galleries.length <= 0) {
+        galleries = $('table[class^="itg gltc"] tbody');
+        layout = 'l';
+    }
+    // "itg glte" for Extended
+    if (galleries.length <= 0) {
+        galleries = $('table[class^="itg glte"] tbody');
+        layout = 'e';
+    }
+    if (galleries.length <= 0) {
         return [];
     }
 
-    async function parseTableRow(cache, element) {
+    async function parseElement(cache, element) {
         const el = $(element);
         const title = el.find('div.glink').html();
         const pubDate = el.find('div[id^="posted_"]').html();
-        // match "Minimal", "Minimal+" and "Compact"
-        let el_a = el.find('td[class^="gl3"] a');
-        let el_img = el.find('td[class^=gl2] div.glthumb div img');
-        // if not, match "Extended"
-        if (!(el_a.length && el_img.length)) {
+        let el_a;
+        let el_img;
+        // match layout
+        if ('mpl'.includes(layout)) {
+            // Minimal, Minimal+, Compact
+            el_a = el.find('td[class^="gl3"] a');
+            el_img = el.find('td[class^=gl2] div.glthumb div img');
+        } else if (layout === 'e') {
+            // Extended
             el_a = el.find('td[class^="gl1"] a');
             el_img = el_a.find('img');
+        } else if (layout === 't') {
+            // Thumbnail
+            el_a = el.find('div[class^="gl3t"] a');
+            el_img = el_a.find('img');
         }
         const link = el_a.attr('href');
         let thumbnail = el_img.attr('data-src') ? el_img.attr('data-src') : el_img.attr('src');
@@ -82,13 +117,22 @@ async function parsePage(cache, data, get_bittorrent = false, embed_thumb = fals
                     }
                 }
             }
+            if ('le'.includes(layout)) {
+                // artist tags will only show in Compact or Extended layout
+                // get artist names as author
+                item.author = $(el)
+                    .find('div.gt[title^="artist:"]')
+                    .toArray()
+                    .map((tag) => $(tag).text())
+                    .join(' / ');
+            }
             return item;
         }
     }
 
     const item_Promises = [];
-    table.children('tr').each((index, element) => {
-        item_Promises.push(parseTableRow(cache, element));
+    galleries.children().each((index, element) => {
+        item_Promises.push(parseElement(cache, element));
     });
     const items_with_null = await Promise.all(item_Promises);
 

package/lib/v2/ehentai/maintainer.js

@@ -1,5 +1,5 @@
 module.exports = {
-    '/favorites/:favcat?/:order?/:page?/:routeParams?': ['yindaheng98'],
-    '/search/:params?/:page?/:routeParams?': ['yindaheng98'],
-    '/tag/:tag/:page?/:routeParams?': ['yindaheng98'],
+    '/favorites/:favcat?/:order?/:page?/:routeParams?': ['yindaheng98', 'syrinka'],
+    '/search/:params?/:page?/:routeParams?': ['yindaheng98', 'syrinka'],
+    '/tag/:tag/:page?/:routeParams?': ['yindaheng98', 'syrinka'],
 };

package/lib/v2/fantia/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/search/:type?/:caty?/:peroid?/:order?/:rating?/:keyword?': ['nczitzk'],
+    '/user/:id': ['nczitzk'],
+};

package/lib/v2/fantia/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'fantia.jp': {
+        _name: 'Fantia',
+        '.': [
+            {
+                title: '用户投稿',
+                docs: 'https://docs.rsshub.app/picture.html#fantia',
+                source: ['/fanclubs/:id'],
+                target: '/fantia/user/:id',
+            },
+        ],
+    },
+};

package/lib/v2/fantia/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/search/:type?/:caty?/:period?/:order?/:rating?/:keyword?', require('./search'));
+    router.get('/user/:id', require('./user'));
+};

package/lib/{routes → v2}/fantia/search.js

@@ -1,4 +1,6 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const Config = require('@/config').value.fantia;
 
 module.exports = async (ctx) => {
     const type = ctx.params.type || 'posts';
@@ -6,15 +8,18 @@ module.exports = async (ctx) => {
     const order = ctx.params.order || 'updater';
     const rating = ctx.params.rating || 'all';
     const keyword = ctx.params.keyword || '';
-    const peroid = ctx.params.peroid || '';
+    const period = ctx.params.period || '';
 
     const rootUrl = 'https://fantia.jp';
-    const apiUrl = `${rootUrl}/api/v1/search/${type}?keyword=${keyword}&peroid=${peroid}&brand_type=0&category=${caty === 'all' ? '' : caty}&order=${order}${
+    const apiUrl = `${rootUrl}/api/v1/search/${type}?keyword=${keyword}&peroid=${period}&brand_type=0&category=${caty === 'all' ? '' : caty}&order=${order}${
         rating === 'all' ? '' : rating === 'general' ? '&rating=general' : '&adult=1'
     }&per_page=30`;
     const response = await got({
         method: 'get',
         url: apiUrl,
+        headers: {
+            Cookie: Config.cookies ? Config.cookies : '',
+        },
     });
 
     let items = {};
@@ -32,7 +37,7 @@ module.exports = async (ctx) => {
             items = response.data.posts.map((item) => ({
                 title: item.title,
                 link: `${rootUrl}/posts/${item.id}`,
-                pubDate: new Date(item.posted_at).toUTCString(),
+                pubDate: parseDate(item.posted_at),
                 author: item.fanclub.fanclub_name_with_creator_name,
                 description: `${item.comment ? `<p>${item.comment}</p>` : ''}<img src="${item.thumb ? item.thumb.main : item.thumb_micro}">`,
             }));

package/lib/{routes → v2}/fantia/user.js

@@ -1,4 +1,6 @@
 const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+const Config = require('@/config').value.fantia;
 
 module.exports = async (ctx) => {
     const rootUrl = 'https://fantia.jp';
@@ -6,25 +8,28 @@ module.exports = async (ctx) => {
     const response = await got({
         method: 'get',
         url: userUrl,
+        headers: {
+            Cookie: Config.cookies ? Config.cookies : '',
+        },
     });
-
     const list = response.data.fanclub.recent_posts.map((item) => ({
         title: item.title,
         link: `${rootUrl}/api/v1/posts/${item.id}`,
         description: `<p>${item.comment}</p>`,
-        pubDate: new Date(item.posted_at).toUTCString(),
+        pubDate: parseDate(item.posted_at),
     }));
-
     const items = await Promise.all(
         list.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
                 const contentResponse = await got({
                     method: 'get',
                     url: item.link,
+                    headers: {
+                        Cookie: Config.cookies ? Config.cookies : '',
+                    },
                 });
-
                 item.link = item.link.replace('api/v1/', '');
-                item.description += `<img src="${contentResponse.data.post.thumb.large}">`;
+                item.description += `<img src="${contentResponse.data.post?.thumb?.large ? contentResponse.data.post?.thumb?.large : contentResponse.data.post.thumb_micro}">`;
 
                 return item;
             })

package/lib/v2/fastbull/express-news.js

@@ -0,0 +1,33 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+module.exports = async (ctx) => {
+    const rootUrl = 'https://www.fastbull.cn';
+    const currentUrl = `${rootUrl}/express-news`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const items = $('.news-list')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            return {
+                title: item.find('.title_name').text(),
+                pubDate: parseDate(parseInt(item.attr('data-date'))),
+                link: `${rootUrl}${item.find('.title_name').attr('href')}`,
+            };
+        });
+
+    ctx.state.data = {
+        title: '实时财经快讯 - FastBull',
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/fastbull/maintainer.js

@@ -0,0 +1,5 @@
+module.exports = {
+    '/express-news': ['nczitzk'],
+    '/news': ['nczitzk'],
+    '/': ['nczitzk'],
+};

package/lib/v2/fastbull/news.js

@@ -0,0 +1,57 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const rootUrl = 'https://www.fastbull.cn';
+    const currentUrl = `${rootUrl}/news`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = $('.trending_type')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            return {
+                title: item.find('.title').text(),
+                link: `${rootUrl}${item.attr('href')}`,
+                author: item.find('.resource').text(),
+                description: item.find('.tips').text(),
+                pubDate: parseDate(parseInt(item.find('.new_time').attr('data-date'))),
+            };
+        });
+
+    items = await Promise.all(
+        items.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 = art(path.join(__dirname, 'templates/description.art'), {
+                    tips: item.description,
+                    description: content('.news-detail-content').html(),
+                });
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: '财经头条、财经新闻、最新资讯 - FastBull',
+        link: currentUrl,
+        item: items,
+    };
+};

package/lib/v2/fastbull/radar.js

@@ -0,0 +1,19 @@
+module.exports = {
+    'fastbull.cn': {
+        _name: '法布财经',
+        '.': [
+            {
+                title: '新闻',
+                docs: 'https://docs.rsshub.app/finance.html#fa-bu-cai-jing-xin-wen',
+                source: ['/news', '/'],
+                target: '/fastbull/news',
+            },
+            {
+                title: '快讯',
+                docs: 'https://docs.rsshub.app/finance.html#fa-bu-cai-jing-kuai-xun',
+                source: ['/express-news', '/'],
+                target: '/fastbull/express-news',
+            },
+        ],
+    },
+};

package/lib/v2/fastbull/router.js

@@ -0,0 +1,5 @@
+module.exports = function (router) {
+    router.get('/express-news', require('./express-news'));
+    router.get('/news', require('./news'));
+    router.get('/', require('./news'));
+};

package/lib/v2/fastbull/templates/description.art

@@ -0,0 +1,7 @@
+{{ if tips }}
+<b>摘要</b>：
+<p>{{ tips }}</p>
+{{ /if }}
+{{ if description }}
+{{@ description }}
+{{ /if }}

package/lib/v2/finviz/maintainer.js

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