rsshub 1.0.0-master.fcb92f0 → 1.0.0-master.fcbb3f4

package/lib/v2/iqiyi/maintainer.js

@@ -1,4 +1,4 @@
 module.exports = {
     '/album/:id': ['TonyRL'],
-    '/user/video/:uid': ['talengu'],
+    '/user/video/:uid': ['talengu', 'JimenezLi'],
 };

package/lib/v2/iqiyi/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '剧集',
-                docs: 'https://docs.rsshub.app/multimedia.html#ai-qi-yi',
+                docs: 'https://docs.rsshub.app/routes/multimedia#ai-qi-yi',
                 source: ['/album/:id'],
                 target: '/iqiyi/:category/:id',
             },
@@ -15,7 +15,7 @@ module.exports = {
         '.': [
             {
                 title: '用户视频',
-                docs: 'https://docs.rsshub.app/multimedia.html#ai-qi-yi',
+                docs: 'https://docs.rsshub.app/routes/multimedia#ai-qi-yi',
                 source: ['/u/:uid/*'],
                 target: '/iqiyi/user/video/:uid',
             },

package/lib/v2/iqiyi/video.js

@@ -1,43 +1,52 @@
-const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const config = require('@/config').value;
+const { parseDate } = require('@/utils/parse-date');
+const logger = require('@/utils/logger');
 // /iqiyi/user/video/:uid
 // http://localhost:1200/iqiyi/user/video/2289191062
 module.exports = async (ctx) => {
     const uid = ctx.params.uid;
+    const link = `https://www.iqiyi.com/u/${uid}/videos`;
 
-    const response = await got({
-        method: 'get',
-        url: `http://www.iqiyi.com/u/${uid}/v`,
-        headers: {
-            Host: 'www.iqiyi.com',
-            Referer: `http://www.iqiyi.com/u/${uid}/v`,
-        },
-    });
-
-    const data = response.data;
-    const $ = cheerio.load(data);
-    const description = '';
+    // Use puppeteer because iqiyi page has a delay.
+    const browser = await require('@/utils/puppeteer')();
+    const data = await ctx.cache.tryGet(
+        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();
+            });
+            logger.debug(`Requesting ${link}`);
+            await page.goto(link, {
+                waitUntil: 'domcontentloaded',
+            });
+            await page.waitForSelector('li.pic-txt-li');
+            const html = await page.content();
 
-    const list = $('li[j-delegate="colitem"]');
+            const $ = cheerio.load(html);
+            const list = $('li.pic-txt-li');
 
-    ctx.state.data = {
-        title: $('title').text(),
-        link: `http://www.iqiyi.com/u/${uid}/v`,
-        description,
-        item:
-            list &&
-            list
-                .map((index, item) => {
-                    const title = $(item).find('.site-piclist_pic a').attr('data-title');
+            return {
+                title: $('title').text(),
+                link,
+                item:
+                    list &&
+                    list
+                        .map((index, item) => ({
+                            title: $(item).attr('title'),
+                            // description: `<img src="${$(item).find('.li-pic img').attr('src')}">`,
+                            pubDate: parseDate($(item).find('.li-sub span.sub-date').text(), 'YYYY-MM-DD'),
+                            link: $(item).find('.li-dec a').attr('href'),
+                        }))
+                        .get(),
+            };
+        },
+        config.cache.routeExpire,
+        false
+    );
+    browser.close();
 
-                    return {
-                        title,
-                        description: `<img src="${$(item).find('.site-piclist_pic img').attr('src')}">`,
-                        pubDate: new Date($(item).find('.playTimes_status.tl').text().substring(0, 10).replace(/-/g, '/')).toUTCString(),
-                        link: $(item).find('.site-piclist_pic a').attr('href'),
-                    };
-                })
-                .get(),
-        // .reverse(),
-    };
+    ctx.state.data = data;
 };

package/lib/v2/iqnew/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '最近更新',
-                docs: 'https://docs.rsshub.app/others.html#ai-q-sheng-huo-wang',
+                docs: 'https://docs.rsshub.app/routes/others#ai-q-sheng-huo-wang',
                 source: ['/post/new_100/', '/'],
                 target: '/iqnew/latest',
             },

package/lib/v2/iresearch/radar.js

@@ -4,13 +4,13 @@ module.exports = {
         www: [
             {
                 title: '研究报告',
-                docs: 'https://docs.rsshub.app/other.html#ai-rui-chan-ye-yan-jiu-bao-gao',
+                docs: 'https://docs.rsshub.app/routes/other#ai-rui-chan-ye-yan-jiu-bao-gao',
                 source: ['/report.shtml'],
                 target: '/iresearch/report',
             },
             {
                 title: '周度市场观察',
-                docs: 'https://docs.rsshub.app/other.html#ai-rui-zhou-du-shi-chang-guan-cha',
+                docs: 'https://docs.rsshub.app/routes/other#ai-rui-zhou-du-shi-chang-guan-cha',
                 source: ['/report.shtml'],
                 target: (_, url) => (new URL(url).searchParams.get('type') === '3' ? '/iresearch/weekly' : null),
             },

package/lib/v2/issuehunt/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '项目悬赏',
-                docs: 'https://docs.rsshub.app/programming.html#issue-hunt-xiang-mu-xuan-shang',
+                docs: 'https://docs.rsshub.app/routes/programming#issue-hunt-xiang-mu-xuan-shang',
                 source: '/r/:username/:repo',
                 target: ({ username, repo }) => `/issuehunt/funded/${username}/${repo}`,
             },

package/lib/v2/itch/radar.js

@@ -4,13 +4,13 @@ module.exports = {
         '.': [
             {
                 title: 'Browse',
-                docs: 'https://docs.rsshub.app/game.html#itch-io-browse',
+                docs: 'https://docs.rsshub.app/routes/game#itch-io-browse',
                 source: ['/'],
                 target: (params, url) => `/itch${new URL(url).toString().split('itch.io').pop()}`,
             },
             {
                 title: 'Developer Logs',
-                docs: 'https://docs.rsshub.app/game.html#itch-io-developer-logs',
+                docs: 'https://docs.rsshub.app/routes/game#itch-io-developer-logs',
                 source: ['/'],
                 target: (params, url) => {
                     const matches = new URL(url).toString().match(/\/\/(.*?)\.itch\.io\/(.*?)\/devlog/);
@@ -19,7 +19,7 @@ module.exports = {
             },
             {
                 title: 'Posts',
-                docs: 'https://docs.rsshub.app/game.html#itch-io-posts',
+                docs: 'https://docs.rsshub.app/routes/game#itch-io-posts',
                 source: ['/t/:topic/:id'],
                 target: '/itch/posts/:topic/:id',
             },

package/lib/v2/ithome/index.js

@@ -36,7 +36,7 @@ const config = {
 module.exports = async (ctx) => {
     const cfg = config[ctx.params.caty];
     if (!cfg) {
-        throw Error('Bad category. See <a href="https://docs.rsshub.app/new-media.html#it-zhi-jia">https://docs.rsshub.app/new-media.html#it-zhi-jia</a>');
+        throw Error('Bad category. See <a href="https://docs.rsshub.app/routes/new-media#it-zhi-jia">https://docs.rsshub.app/routes/new-media#it-zhi-jia</a>');
     }
 
     const current_url = get_url(ctx.params.caty);

package/lib/v2/ithome/radar.js

@@ -4,31 +4,31 @@ module.exports = {
         '.': [
             {
                 title: '标签',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-zhuan-ti',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-zhuan-ti',
                 source: ['/tag/:name'],
                 target: '/ithome/tag/:name',
             },
             {
                 title: '专题',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-zhuan-ti',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-zhuan-ti',
                 source: ['/zt/:id'],
                 target: '/ithome/zt/:id',
             },
             {
                 title: '24 小时阅读榜',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-re-bang',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-re-bang',
                 source: ['/*'],
                 target: '/ithome/ranking/24h',
             },
             {
                 title: '7 天最热',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-re-bang',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-re-bang',
                 source: ['/*'],
                 target: '/ithome/ranking/7days',
             },
             {
                 title: '月榜',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-re-bang',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-re-bang',
                 source: ['/*'],
                 target: '/ithome/ranking/monthly',
             },
@@ -36,7 +36,7 @@ module.exports = {
         it: [
             {
                 title: 'IT 资讯',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/it',
             },
@@ -44,7 +44,7 @@ module.exports = {
         soft: [
             {
                 title: '软件之家',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/soft',
             },
@@ -52,7 +52,7 @@ module.exports = {
         win10: [
             {
                 title: 'win10 之家',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/win10',
             },
@@ -60,7 +60,7 @@ module.exports = {
         win11: [
             {
                 title: 'win11 之家',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/win11',
             },
@@ -68,7 +68,7 @@ module.exports = {
         iphone: [
             {
                 title: 'iphone 之家',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/iphone',
             },
@@ -76,7 +76,7 @@ module.exports = {
         ipad: [
             {
                 title: 'ipad 之家',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/ipad',
             },
@@ -84,7 +84,7 @@ module.exports = {
         android: [
             {
                 title: 'android 之家',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/android',
             },
@@ -92,7 +92,7 @@ module.exports = {
         digi: [
             {
                 title: '数码之家',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/digi',
             },
@@ -100,7 +100,7 @@ module.exports = {
         next: [
             {
                 title: '智能时代',
-                docs: 'https://docs.rsshub.app/new-media.html#it-zhi-jia-fen-lei-zi-xun',
+                docs: 'https://docs.rsshub.app/routes/new-media#it-zhi-jia-fen-lei-zi-xun',
                 source: '/',
                 target: '/ithome/next',
             },
@@ -111,7 +111,7 @@ module.exports = {
         www: [
             {
                 title: 'Feeds',
-                docs: 'https://docs.rsshub.app/new-media.html#ithome-tai-wan',
+                docs: 'https://docs.rsshub.app/routes/new-media#ithome-tai-wan',
                 source: ['/:category', '/:category/feeds'],
                 target: '/ithome/tw/feeds/:category',
             },

package/lib/v2/ithome/ranking.js

@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
     const id = type2id[option];
 
     if (!id) {
-        throw Error('Bad type. See <a href="https://docs.rsshub.app/new-media.html#it-zhi-jia">https://docs.rsshub.app/new-media.html#it-zhi-jia</a>');
+        throw Error('Bad type. See <a href="https://docs.rsshub.app/routes/new-media#it-zhi-jia">https://docs.rsshub.app/routes/new-media#it-zhi-jia</a>');
     }
 
     const list = $(`#${id} > li`)

package/lib/v2/ithome/tag.js

@@ -7,7 +7,7 @@ const rootUrl = 'https://www.ithome.com/';
 
 module.exports = async (ctx) => {
     const name = ctx.params.name;
-    const url = `${rootUrl}/tag/${name}`;
+    const url = `${rootUrl}tag/${name}`;
 
     const response = await got(url);
     const $ = cheerio.load(response.data);
@@ -22,7 +22,18 @@ module.exports = async (ctx) => {
     const items = await Promise.all(
         list.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
-                const detailResponse = await got(item.link);
+                let detailResponse;
+
+                // handle 404 errors for some article URLs
+                try {
+                    detailResponse = await got(item.link);
+                } catch {
+                    // empty
+                }
+                if (!detailResponse) {
+                    return;
+                }
+
                 const content = cheerio.load(detailResponse.data);
 
                 const article = content('div.post_content');
@@ -43,6 +54,6 @@ module.exports = async (ctx) => {
     ctx.state.data = {
         title: `IT之家 - ${name}标签`,
         link: url,
-        item: items,
+        item: items.filter((item) => item),
     };
 };

package/lib/v2/iwara/radar.js

@@ -4,19 +4,19 @@ module.exports = {
         ecchi: [
             {
                 title: '用户视频',
-                docs: 'https://docs.rsshub.app/anime.html#iwara',
+                docs: 'https://docs.rsshub.app/routes/anime#iwara',
                 source: '/users/:username',
                 target: '/iwara/users/:username?/video',
             },
             {
                 title: '用户图片',
-                docs: 'https://docs.rsshub.app/anime.html#iwara',
+                docs: 'https://docs.rsshub.app/routes/anime#iwara',
                 source: '/users/:username',
                 target: '/iwara/users/:username?/image',
             },
             {
                 title: '用户订阅列表',
-                docs: 'https://docs.rsshub.app/anime.html#iwara',
+                docs: 'https://docs.rsshub.app/routes/anime#iwara',
                 source: '/',
                 target: '/iwara/subscriptions',
             },

package/lib/v2/ixigua/radar.js

@@ -4,7 +4,7 @@ module.exports = {
         '.': [
             {
                 title: '用户视频投稿',
-                docs: 'https://docs.rsshub.app/multimedia.html#xi-gua-shi-pin',
+                docs: 'https://docs.rsshub.app/routes/multimedia#xi-gua-shi-pin',
                 source: '/home/:uid',
                 target: '/ixigua/user/video/:uid',
             },

package/lib/v2/jandan/radar.js

@@ -3,14 +3,16 @@ module.exports = {
         _name: '煎蛋',
         '.': [
             {
-                title: '首页',
-                docs: 'https://docs.rsshub.app/picture.html#jian-dan-shou-ye',
+                title: '首页/板块/热榜',
+                docs: 'https://docs.rsshub.app/routes/picture#jian-dan',
                 source: ['/:category', '/'],
                 target: '/jandan/:category?',
             },
+        ],
+        i: [
             {
-                title: '板块',
-                docs: 'https://docs.rsshub.app/picture.html#jian-dan-ban-kuai',
+                title: '首页/板块/热榜',
+                docs: 'https://docs.rsshub.app/routes/picture#jian-dan',
                 source: ['/:category', '/'],
                 target: '/jandan/:category?',
             },

package/lib/v2/japanpost/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/track/:reqCode/:locale?': ['tuzi3040'],
+};

package/lib/v2/japanpost/radar.js

@@ -0,0 +1,22 @@
+module.exports = {
+    'japanpost.jp': {
+        _name: '日本郵便',
+        'trackings.post': [
+            {
+                title: '郵便・荷物の追跡',
+                docs: 'https://docs.rsshub.app/routes/other#japanpost-ri-ben-you-bian',
+                source: '/services/srv/search/direct',
+                target: (params, url) => {
+                    const reqCode = new URL(url).searchParams
+                        .get('reqCodeNo1')
+                        .replace(/[^0-9a-zA-Z]/g, '')
+                        .toUpperCase();
+                    const locale = new URL(url).searchParams.get('locale').toLowerCase();
+                    if ((reqCode.search(/^(?:\d{11,12}|[A-Z]{2}\d{9}[A-Z]{2})$/) === 0 && locale === 'ja') || locale === 'en') {
+                        return `/japanpost/track/${reqCode}/${locale}`;
+                    }
+                },
+            },
+        ],
+    },
+};

package/lib/v2/japanpost/router.js

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

package/lib/v2/japanpost/templates/track_item_desc.art

@@ -0,0 +1,14 @@
+{{ packageStatus }}<br>
+{{ if packageTrackRecord }}{{ packageTrackRecord }}<br>{{ /if }}
+{{ if packageOfficeZipCode }}{{ packageOfficeZipCode }} {{ /if }}{{ if packageOffice }}{{ packageOffice }} {{ /if }}{{ packageRegion }}
+{{ if index === 0 }}
+    {{ if officeItemList }}
+        <br>
+        {{ each officeItemList }}
+            <br>{{ $value.officeType }} {{@ $value.officeName }} {{ $value.officeTel }}
+        {{ /each }}
+    {{ /if }}
+    {{ if packageService }}
+        <br>{{ serviceText }}{{ packageService }}
+    {{ /if }}
+{{ /if }}

package/lib/v2/japanpost/track.js

@@ -0,0 +1,114 @@
+const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const cheerio = require('cheerio');
+const path = require('path');
+const utils = require('./utils');
+
+let baseTitle = '日本郵便';
+const baseUrl = 'https://trackings.post.japanpost.jp/services/srv/search/direct?';
+
+module.exports = async (ctx) => {
+    const reqCode = ctx.params.reqCode;
+    const reqReqCode = 'reqCodeNo1=' + reqCode;
+
+    let locale = 'ja';
+    if (ctx.params.locale === 'en') {
+        locale = 'en';
+        baseTitle = 'Japanpost';
+    }
+    const reqLocale = '&locale=' + locale;
+
+    const link = baseUrl + reqReqCode + reqLocale;
+
+    const response = await got({
+        method: 'get',
+        url: link,
+    });
+
+    const $ = cheerio.load(response.data);
+    utils.expandEven($);
+    utils.expandOdd($);
+
+    const list = $('.tableType01').eq(1).find('tr').slice(2);
+    const officeList = $('.tableType03').eq(0).find('tr').slice(1);
+    let officeItemList;
+
+    if (officeList.length) {
+        officeItemList = officeList
+            .map((i, e) => {
+                const eTd = $(e).find('td');
+                return {
+                    officeType: eTd.eq(0).text().trim(),
+                    officeName: eTd.eq(1).html().trim(),
+                    officeTel: eTd.eq(2).html().trim(),
+                };
+            })
+            .get();
+    }
+
+    if (!list.length) {
+        const resErrorText = $('.tableType01').eq(0).find('tr').eq(2).find('td').eq(1).text().trim();
+        throw new Error(resErrorText);
+    }
+
+    const listEven = list.even();
+    const listOdd = list.odd();
+
+    const packageType = $('.tableType01').eq(0).find('tr').eq(1).find('td').eq(1).text().trim();
+    const packageService = $('.tableType01').eq(0).find('tr').eq(1).find('td').eq(2).text().trim();
+    const serviceText = locale === 'ja' ? '付加サービス：' : 'Additional services: ';
+
+    let lastItemTimeStamp;
+    let tz;
+
+    ctx.state.data = {
+        title: `${baseTitle} ${reqCode} ${packageType}`,
+        link,
+        description: `${baseTitle} ${reqCode} ${packageType}`,
+        language: locale,
+        icon: 'https://www.post.japanpost.jp/favicon.ico',
+        logo: 'https://www.post.japanpost.jp/favicon.ico',
+        item: listEven
+            .map((index, item) => {
+                const itemTd = $(item).find('td');
+                const packageStatus = itemTd.eq(1).text().trim();
+                const packageRegion = itemTd.eq(4).text().trim();
+                const packageOffice = itemTd.eq(3).text().trim();
+                const packageOfficeZipCode = listOdd.eq(index).find('td').eq(0).text().trim();
+                const itemTitle = `${packageStatus} ${packageOffice} ${packageRegion}`;
+                const packageTrackRecord = itemTd.eq(2).text().trim();
+                const itemDescription = art(path.join(__dirname, 'templates/track_item_desc.art'), {
+                    packageStatus,
+                    packageTrackRecord,
+                    packageOfficeZipCode,
+                    packageOffice,
+                    packageRegion,
+                    index,
+                    officeItemList,
+                    serviceText,
+                    packageService,
+                });
+
+                const itemPubDateText = itemTd.eq(0).text().trim();
+                const itemGuid = utils.generateGuid(reqCode + itemTitle + itemDescription + itemPubDateText);
+
+                let thisItemTimeStamp;
+                [thisItemTimeStamp, tz] = utils.parseDatetime(itemPubDateText, packageOffice, packageRegion, tz, locale);
+                if (lastItemTimeStamp) {
+                    if (thisItemTimeStamp <= lastItemTimeStamp) {
+                        thisItemTimeStamp = lastItemTimeStamp + 1000;
+                    }
+                }
+                lastItemTimeStamp = thisItemTimeStamp;
+
+                return {
+                    title: itemTitle,
+                    description: itemDescription,
+                    pubDate: new Date(thisItemTimeStamp),
+                    link,
+                    guid: itemGuid.slice(0, 32),
+                };
+            })
+            .get(),
+    };
+};