rsshub 1.0.0-master.f78ad03 → 1.0.0-master.f796ff1

package/lib/v2/ithome/radar.js

@@ -106,4 +106,15 @@ module.exports = {
             },
         ],
     },
+    'ithome.com.tw': {
+        _name: 'iThome',
+        www: [
+            {
+                title: 'Feeds',
+                docs: 'https://docs.rsshub.app/new-media.html#ithome-tai-wan',
+                source: ['/:category', '/:category/feeds'],
+                target: '/ithome/tw/feeds/:category',
+            },
+        ],
+    },
 };

package/lib/v2/ithome/router.js

@@ -1,6 +1,7 @@
 module.exports = function (router) {
     router.get('/ranking/:type', require('./ranking'));
     router.get('/tag/:name', require('./tag'));
+    router.get('/tw/feeds/:category', require('./tw/feeds'));
     router.get('/zt/:id', require('./zt'));
     router.get('/:caty', require('./index'));
 };

package/lib/v2/ithome/tw/feeds.js

@@ -0,0 +1,38 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://www.ithome.com.tw';
+    const currentUrl = `${baseUrl}/${ctx.params.category}/feeds`;
+    const response = await got(currentUrl);
+    const $ = cheerio.load(response.data);
+    const name = $('a.active-trail').text();
+    const items = await Promise.all(
+        $('.title a')
+            .get()
+            .map((item) => {
+                const link = baseUrl + $(item).attr('href');
+                return ctx.cache.tryGet(link, async () => {
+                    const response = await got(link);
+                    const $ = cheerio.load(response.data);
+                    return {
+                        title: $('.page-header').text(),
+                        author: $('.author a').text(),
+                        description: $('article').eq(0).html(),
+                        pubDate: timezone(parseDate($('.created').text(), 'YYYY-MM-DD'), +8),
+                        category: name,
+                        link,
+                    };
+                });
+            })
+    );
+
+    ctx.state.data = {
+        title: `${name} | iThome`,
+        link: currentUrl,
+        description: 'iThome Online 是臺灣第一個網路原生報，提供IT產業即時新聞、企業IT產品報導與測試、技術專題、IT應用報導、IT書訊，以及面向豐富的名家專欄。',
+        item: items,
+    };
+};

package/lib/v2/iwara/subscriptions.js

@@ -30,7 +30,7 @@ module.exports = async (ctx) => {
             const type = $(item).find('div.field').hasClass('field-type-video') ? 'Video' : 'Image';
             return {
                 title: $(item).find('h3.title').text(),
-                author: username,
+                author: $(item).find('a.username').text(),
                 link: rootUrl + $(item).find('h3.title > a').attr('href'),
                 category: type,
                 description: art(path.join(__dirname, 'templates/subscriptions.art'), {

package/lib/v2/jandan/index.js

@@ -1,64 +1,30 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
-const path = require('path');
+const parser = require('@/utils/rss-parser');
 
 module.exports = async (ctx) => {
     const rootUrl = 'http://i.jandan.net';
-
-    const response = await got({
-        method: 'get',
-        url: rootUrl,
-    });
-
-    const $ = cheerio.load(response.data);
-
-    let items = $('.post')
-        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 15)
-        .toArray()
-        .map((item) => {
-            item = $(item);
-
-            const a = item.find('.thetitle a');
-
-            return {
-                title: a.text(),
-                link: a.attr('href'),
-                description: art(path.join(__dirname, 'templates/description.art'), {
-                    summary: item.find('.indexs').text(),
-                    image: item
-                        .find('img')
-                        .attr('data-original')
-                        .replace(/!square/, ''),
-                }),
-            };
-        });
-
-    items = await Promise.all(
-        items.map((item) =>
+    const feed = await parser.parseURL(`${rootUrl}/feed/`);
+    const items = await Promise.all(
+        feed.items.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
-                const detailResponse = await got({
-                    method: 'get',
-                    url: item.link,
-                });
-
-                const content = cheerio.load(detailResponse.data);
-
-                content('.wechat-hide').prev().nextAll().remove();
-
-                item.description += content('.entry').html();
-                item.author = content('.postinfo strong').text();
-                item.pubDate = timezone(parseDate(detailResponse.data.match(/"pubDate": "(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})"/)[1]), +8);
-
-                return item;
+                const response = await got(item.link);
+                const $ = cheerio.load(response.data);
+                $('.wechat-hide').prev().nextAll().remove();
+                const single = {
+                    title: item.title,
+                    description: $('.entry').html(),
+                    pubDate: item.pubDate,
+                    link: item.link,
+                    author: item['dc:creator'],
+                    category: item.categories,
+                };
+                return single;
             })
         )
     );
-
     ctx.state.data = {
-        title: $('title').text(),
+        title: '煎蛋',
         link: rootUrl,
         item: items,
     };

package/lib/v2/jandan/maintainer.js

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

package/lib/v2/jandan/section.js

@@ -44,6 +44,5 @@ module.exports = async (ctx) => {
         title: `${$('title').text()} - 煎蛋`,
         link: currentUrl,
         item: items,
-        description: response.data.match(/"description": "([\s\S]*)",/)[1],
     };
 };

package/lib/v2/javbus/index.js

@@ -4,6 +4,11 @@ const { parseDate } = require('@/utils/parse-date');
 const { art } = require('@/utils/render');
 const path = require('path');
 
+const toSize = (raw) => {
+    const matches = raw.match(/(\d+(\.\d+)?)(\w+)/);
+    return matches[3] === 'GB' ? matches[1] * 1024 : matches[1];
+};
+
 module.exports = async (ctx) => {
     const isWestern = /^\/western/.test(ctx.path);
 
@@ -19,7 +24,7 @@ module.exports = async (ctx) => {
     const $ = cheerio.load(response.data);
 
     let items = $('.movie-box')
-        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 30)
+        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 50)
         .toArray()
         .map((item) => {
             item = $(item);
@@ -98,11 +103,12 @@ module.exports = async (ctx) => {
                                 link: td.first().attr('href'),
                                 size: td.eq(1).text().trim(),
                                 date: td.last().text().trim(),
+                                score: content(tr).find('a').length ** 8 * toSize(td.eq(1).text().trim()),
                             };
                         });
 
                     if (magnets) {
-                        item.enclosure_url = magnets[0].link;
+                        item.enclosure_url = magnets.sort((a, b) => b.score - a.score)[0].link;
                         item.enclosure_type = 'application/x-bittorrent';
                     }
                 } catch (e) {

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

@@ -9,9 +9,20 @@
 {{/if}}
 <br>
 <h4>磁力連結投稿</h4>
+<table>
+<tr>
+<th>磁力名稱</th>
+<th>檔案大小</th>
+<th>分享日期</th>
+</tr>
 {{each magnets magnet}}
-<li><a href="{{ magnet.link }}">{{ magnet.title }} [{{ magnet.size }}] ({{ magnet.date }})</a></li>
+<tr>
+<td><a href="{{ magnet.link }}">{{ magnet.title }}</a></td>
+<td>{{ magnet.size }}</td>
+<td>{{ magnet.date }}</td>
+</tr>
 {{/each}}
+</table>
 <h4>樣品圖像</h4>
 {{each thumbs}}
 <img src="{{ $value }}">

package/lib/v2/jiemian/list.js

@@ -38,14 +38,14 @@ module.exports = async (ctx) => {
 
                 const content = cheerio.load(detailResponse.data);
 
-                const pubDate = content('.date').attr('data-article-publish-time');
+                const pubDate = content('.article-info span[data-article-publish-time]').attr('data-article-publish-time');
                 const timeMatches = content('.article-info')
                     .text()
                     .match(/\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}/);
 
                 item.description = content('.article-content').html();
                 item.author = content('.article-info .author').first().text().replace(/·/, '').trim();
-                item.pubDate = timeMatches ? timezone(parseDate(timeMatches[1]), +8) : parseDate(pubDate * 1000);
+                item.pubDate = timeMatches ? timezone(parseDate(timeMatches[0]), +8) : parseDate(pubDate, 'X');
 
                 return item;
             })

package/lib/v2/jike/user.js

@@ -140,6 +140,7 @@ module.exports = async (ctx) => {
 
     ctx.state.data = {
         title: `${data.user.screenName}的即刻动态`,
+        description: data.user.bio,
         link: `https://m.okjike.com/users/${id}`,
         image: data.user.avatarImage.picUrl,
         item: items,

package/lib/v2/jornada/index.js

@@ -0,0 +1,59 @@
+const got = require('@/utils/got');
+const { parseDate } = require('@/utils/parse-date');
+
+const rootUrl = 'https://www.jornada.com.mx';
+
+const categories = {
+    capital: 'Capital',
+    cartones: 'Cartones',
+    ciencia: 'Ciencia-Y-Tecnologia',
+    cultura: 'Cultura',
+    deportes: 'Deportes',
+    economia: 'Economia',
+    estados: 'Estados',
+    mundo: 'Mundo',
+    opinion: 'Opinion',
+    politica: 'Politica',
+    sociedad: 'Sociedad',
+};
+
+const getDateForToday = () => {
+    const date = new Date(Date.now());
+    const today = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + date.getDate()).slice(-2);
+    return today;
+};
+
+module.exports = async (ctx) => {
+    const date = ctx.params.date === 'today' || ctx.params.date === undefined ? getDateForToday() : ctx.params.date;
+    const category = ctx.params.category;
+    const url = `${rootUrl}/jsonstorage/articles_${date}_.json`;
+
+    const response = await got(url);
+    const data = response.data;
+
+    let items = {};
+
+    if (!category) {
+        items = data.map((item) => ({
+            title: item.title,
+            description: item.content,
+            pubDate: parseDate(item.date),
+            link: `${rootUrl}/${item.url}`,
+        }));
+    } else {
+        const newsFilteredByCategory = data.filter((item) => item.category === categories[category]);
+
+        items = newsFilteredByCategory.map((item) => ({
+            title: item.title,
+            description: item.content,
+            pubDate: parseDate(item.date),
+            link: `${rootUrl}/${item.url}`,
+        }));
+    }
+
+    ctx.state.data = {
+        title: 'La Jornada',
+        link: rootUrl,
+        item: items,
+    };
+};

package/lib/v2/jornada/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/:date?/:category?': ['Thealf154'],
+};

package/lib/v2/jornada/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'jornada.com.mx': {
+        _name: 'La Jornada',
+        '.': [
+            {
+                title: 'News',
+                docs: 'https://docs.rsshub.app/traditional-media.html#jornada',
+                source: ['/category/:category', '/'],
+                target: (params) => (params.category ? `/jornada/today/${params.category.replacce('.html', '')}` : `/jornada/today`),
+            },
+        ],
+    },
+};

package/lib/v2/jornada/router.js

@@ -0,0 +1,3 @@
+module.exports = function (router) {
+    router.get('/:date?/:category?', require('./index'));
+};

package/lib/v2/jseea/maintainer.js

@@ -0,0 +1,3 @@
+module.exports = {
+    '/news/:type?': ['schen1024'],
+};

package/lib/v2/jseea/news.js

@@ -0,0 +1,64 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+// 参考 bit/jwc 北京理工大学的的页面写成
+
+const baseUrl = 'https://www.jseea.cn';
+const siteTitle = ' - 江苏省教育考试院';
+
+// 专门定义一个function用于加载文章内容
+async function load(link) {
+    // 异步请求文章
+    const { data: response } = await got(link);
+    // 加载文章内容
+    const $ = cheerio.load(response);
+    // 提取文章内容
+    $('strong').remove();
+    const description = $('#content').html();
+    // 返回解析的结果
+    return description;
+}
+
+module.exports = async (ctx) => {
+    // 默认 正常规定 然后获取列表页面
+    const type = ctx.params.type ?? 'zkyw';
+    const listPageUrl = `${baseUrl}/webfile/news/${type}/`;
+    const { data: response } = await got(listPageUrl);
+    const $ = cheerio.load(response);
+
+    // console.log(type+":"+listPageUrl);
+    // 获取当前页面的 list
+    const list = $('div.content-list-div ul li a')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item
+                    .contents()
+                    .filter((_, e) => e.nodeType === 3)
+                    .text()
+                    .trim(),
+                link: `https:${item.attr('href')}`,
+                pubDate: timezone(parseDate(item.find('span').text(), 'YYYY-MM-DD'), 8),
+            };
+        });
+
+    const result = await Promise.all(
+        // 遍历每一篇文章
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                item.description = await load(item.link);
+                // 合并解析后的结果集作为该篇文章最终的输出结果
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('head title').text() + siteTitle,
+        link: listPageUrl,
+        item: result,
+    };
+};

package/lib/v2/jseea/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'jseea.cn': {
+        _name: '江苏省教育考试院',
+        '.': [
+            {
+                title: '新闻中心',
+                docs: 'https://docs.rsshub.app/government.html#jiang-su-sheng-ren-min-zheng-fu',
+                source: ['/webfile/news/:type'],
+                target: '/jseea/news/:type',
+            },
+        ],
+    },
+};

package/lib/v2/jseea/router.js

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

package/lib/v2/kemono/index.js

@@ -55,8 +55,8 @@ module.exports = async (ctx) => {
         title = $('title').text();
 
         items = await Promise.all(
-            $('.post-card')
-                .find('.fancy-link')
+            $('.card-list__items')
+                .find('a')
                 .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 25)
                 .toArray()
                 .map((item) => {

package/lib/v2/kuaidi100/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/company': ['NeverBehave'],
+    '/track/:number/:id/:phone?': ['NeverBehave'],
+};

package/lib/v2/kuaidi100/radar.js

@@ -0,0 +1,25 @@
+module.exports = {
+    'kuaidi100.com': {
+        _name: '快递 100',
+        '.': [
+            {
+                title: '快递订单追踪',
+                docs: 'https://docs.rsshub.app/other.html#kuai-di-100',
+                source: '/',
+                target: (params, url, document) => {
+                    const postid = document && document.querySelector('#postid').value;
+                    const com = document && document.querySelector('#selectComBtn').childNodes[1].attributes[1].value;
+                    if (com && com !== 'default' && postid) {
+                        return `/kuaidi100/track/${com}/${postid}`;
+                    }
+                },
+            },
+            {
+                title: '支持的快递公司列表',
+                docs: 'https://docs.rsshub.app/other.html#kuai-di-100',
+                source: '/',
+                target: '/kuaidi100/company',
+            },
+        ],
+    },
+};

package/lib/v2/kuaidi100/router.js

@@ -0,0 +1,4 @@
+module.exports = (router) => {
+    router.get('/company', require('./supported_company'));
+    router.get('/track/:number/:id/:phone?', require('./index'));
+};

package/lib/{routes → v2}/kuaidi100/supported_company.js

@@ -10,7 +10,6 @@ module.exports = async (ctx) => {
             title: item.name,
             description: item.number,
             category: item.comTypeName,
-            pubDate: new Date().toUTCString(),
             link: item.siteUrl,
         })),
     };

package/lib/{routes → v2}/kuaidi100/utils.js

@@ -1,6 +1,10 @@
 const got = require('@/utils/got');
 const wwwid_key = 'kuaidi100-wwwid';
 const csrf_key = 'kuaidi100-csrf';
+const globacsrftoken_key = 'kuaidi100-globacsrftoken';
+const dasddocTitl_key = 'kuaidi100-dasddocTitl';
+const dasddocReferrer_key = 'kuaidi100-dasddocReferrer';
+const dasddocHref_key = 'kuaidi100-dasddocHref';
 const query_count = 'kuaidi100-cookie-count';
 const max_query_count = 30;
 
@@ -9,7 +13,11 @@ async function getCookie(ctx) {
     shouldUpdateCookie(ctx);
     let wwwid = await ctx.cache.get(wwwid_key);
     let csrf = await ctx.cache.get(csrf_key);
-    if (!wwwid || !csrf) {
+    let globacsrftoken = await ctx.cache.get(globacsrftoken_key);
+    let dasddocTitl = await ctx.cache.get(dasddocTitl_key);
+    let dasddocReferrer = await ctx.cache.get(dasddocReferrer_key);
+    let dasddocHref = await ctx.cache.get(dasddocHref_key);
+    if (!wwwid || !csrf || !dasddocTitl || !dasddocReferrer || !dasddocHref) {
         const indexResponse = await got({
             method: 'get',
             url: 'https://www.kuaidi100.com/?from=appstore',
@@ -25,12 +33,24 @@ async function getCookie(ctx) {
                     wwwid = e.split(';')[0];
                 } else if (e.indexOf('csrftoken') === 0) {
                     csrf = e.split(';')[0];
+                } else if (e.indexOf('globacsrftoken') === 0) {
+                    globacsrftoken = e.split(';')[0];
+                } else if (e.indexOf('dasddocTitle') >= 0) {
+                    dasddocTitl = e.split(';')[0];
+                } else if (e.indexOf('dasddocReferrer') >= 0) {
+                    dasddocReferrer = e.split(';')[0];
+                } else if (e.indexOf('dasddocHref') >= 0) {
+                    dasddocHref = e.split(';')[0];
                 }
             }
         }
 
         ctx.cache.set(wwwid_key, wwwid, 600);
         ctx.cache.set(csrf_key, csrf, 600);
+        ctx.cache.set(globacsrftoken_key, globacsrftoken, 600);
+        ctx.cache.set(dasddocTitl_key, dasddocTitl, 600);
+        ctx.cache.set(dasddocReferrer_key, dasddocReferrer, 600);
+        ctx.cache.set(dasddocHref_key, dasddocHref, 600);
         // We have acquired new cookie. It may due to cache timeout.
         // Force update counter and don't wait it finished.
         shouldUpdateCookie(ctx, true);
@@ -39,6 +59,10 @@ async function getCookie(ctx) {
     return {
         wwwid,
         csrf,
+        globacsrftoken,
+        dasddocTitl,
+        dasddocReferrer,
+        dasddocHref,
     };
 }
 
@@ -61,11 +85,10 @@ async function getCookie(ctx) {
         "version": 776
     }
 */
-async function getCompanyList(ctx) {
+function getCompanyList(ctx) {
     // Using date as cache key and it will automatically expired by 1d
     const key = `kuaidi100-company-name-${new Date().toISOString().split('T')[0]}`;
-    let list = await ctx.cache.get(key);
-    if (!list) {
+    return ctx.cache.tryGet(key, async () => {
         const cookie = await getCookie(ctx);
         const wwwid = cookie.wwwid;
         const companyResponse = await got({
@@ -76,7 +99,7 @@ async function getCompanyList(ctx) {
                 Cookie: wwwid,
             },
         });
-        list = companyResponse.body;
+        let list = companyResponse.body;
 
         // Parsing the js file
         try {
@@ -87,11 +110,8 @@ async function getCompanyList(ctx) {
             throw new Error('无法正确获取快递公司列表：请稍后重试');
         }
 
-        ctx.cache.set(key, list);
-    } else {
-        list = JSON.parse(list);
-    }
-    return list;
+        return list;
+    });
 }
 
 function shouldUpdateCookie(ctx, forcedUpdate = false) {
@@ -186,6 +206,17 @@ module.exports = {
     getQuery: async (ctx, number, id, phone) => {
         const query_key = `kuaidi100-query-${number}-${id}`;
         let query = await ctx.cache.get(query_key);
+        // 组装日期与单号 日期为提前两个月
+        const timestamp = Number.parseInt(new Date().getTime() / 1000);
+        const lastTowMonth = new Date().getTime() - 60 * 60 * 24 * 60 * 1000;
+        const dateString = new Date(lastTowMonth).toLocaleDateString('ZH').split('/').join('');
+        const queryMeta = encodeURIComponent(
+            JSON.stringify({
+                date: dateString,
+                nums: [id],
+            })
+        );
+
         if (!query) {
             const cookie = await getCookie(ctx);
             const queryResponse = await got({
@@ -193,7 +224,11 @@ module.exports = {
                 url: `https://www.kuaidi100.com/query?type=${number}&postid=${id}&temp=${Math.random()}&phone=${phone ? phone : ''}`,
                 headers: {
                     Referer: 'https://www.kuaidi100.com/',
-                    Cookie: `${cookie.csrf}; ${cookie.wwwid}`,
+                    'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8,ja;q=0.7',
+                    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36',
+                    Cookie: `${cookie.globacsrftoken}; ${cookie.csrf}; ${cookie.wwwid}; ${cookie.dasddocHref}; ${cookie.dasddocReferrer}; ${
+                        cookie.dasddocTitl
+                    }; addcom=${number}; addnu=${id}; snt_query_meta=${queryMeta}; sortStatus=0; Hm_lpvt_22ea01af58ba2be0fec7c11b25e88e6c=${timestamp}; Hm_lvt_22ea01af58ba2be0fec7c11b25e88e6c=${timestamp - 1642}`,
                 },
             });