rsshub 1.0.0-master.fd3a269 → 1.0.0-master.fd40700

package/lib/routes/zhihu/pin/utils.js

@@ -17,13 +17,23 @@ module.exports = {
                         break;
 
                     case 'video':
-                        description += `<video
-                    controls="controls"
-                    width="${item.playlist.hd.width}"
-                    height="${item.playlist.hd.height}"
-                    poster="${item.cover_info.thumbnail}"
-                    src="${item.playlist.hd.play_url}"
-                  >`;
+                        try {
+                            description += `<video
+                        controls="controls"
+                        width="${item.playlist.hd.width}"
+                        height="${item.playlist.hd.height}"
+                        poster="${item.cover_info.thumbnail}"
+                        src="${item.playlist.hd.play_url}"
+                      >`;
+                        } catch (e) {
+                            description += `<video
+                            controls="controls"
+                            width="${item.playlist.pop().width}"
+                            height="${item.playlist.pop().height}"
+                            poster="${item.thumbnail}"
+                            src="${item.playlist.pop().play_url}"
+                          >`;
+                        }
                         break;
 
                     case 'link':

package/lib/routes/zhihu/posts.js

@@ -1,6 +1,7 @@
 const got = require('@/utils/got');
 const utils = require('./utils');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const id = ctx.params.id;
@@ -38,7 +39,7 @@ module.exports = async (ctx) => {
                 title: String(item.title),
                 description: item.content,
                 link: item.url,
-                pubDate: new Date(item.updated).toUTCString(),
+                pubDate: parseDate(item.updated * 1000),
             })),
     };
 };

package/lib/routes/zhihu/topic.js

@@ -1,5 +1,6 @@
 const got = require('@/utils/got');
 const utils = require('./utils');
+const { parseDate } = require('@/utils/parse-date');
 
 module.exports = async (ctx) => {
     const { topicId } = ctx.params;
@@ -32,7 +33,7 @@ module.exports = async (ctx) => {
                     title = `${item.question.title}-${item.author.name}的回答：${item.excerpt}`;
                     description = `<strong>${item.question.title}</strong><br>${item.author.name}的回答<br/>${utils.ProcessImage(item.content)}`;
                     link = `https://www.zhihu.com/question/${item.question.id}/answer/${item.id}`;
-                    pubDate = new Date(item.updated_time * 1000).toUTCString();
+                    pubDate = parseDate(item.updated_time * 1000);
                     author = item.author.name;
                     break;
 
@@ -40,7 +41,14 @@ module.exports = async (ctx) => {
                     title = item.title;
                     description = item.title;
                     link = `https://www.zhihu.com/question/${item.id}`;
-                    pubDate = new Date(item.created * 1000).toUTCString();
+                    pubDate = parseDate(item.created * 1000);
+                    break;
+
+                case 'article':
+                    title = item.title;
+                    description = item.content;
+                    link = item.url;
+                    pubDate = parseDate(item.created * 1000);
                     break;
 
                 default:

package/lib/routes/zhihu/zhuanlan.js

@@ -14,6 +14,17 @@ module.exports = async (ctx) => {
         },
     });
 
+    const pinnedRes = await got({
+        method: 'get',
+        url: `https://www.zhihu.com/api/v4/columns/${id}/pinned-items`,
+        headers: {
+            ...utils.header,
+            Referer: `https://zhuanlan.zhihu.com/${id}`,
+        },
+    });
+
+    listRes.data.data = listRes.data.data.concat(pinnedRes.data.data);
+
     // 知乎专栏链接存在两种格式, 一种以 'zhuanlan.' 开头, 另一种新增的以 'c_' 结尾
     let url = `https://zhuanlan.zhihu.com/${id}`;
     if (id.search('c_') === 0) {
@@ -41,7 +52,7 @@ module.exports = async (ctx) => {
 
         if (item.type === 'answer') {
             title = item.question.title;
-            author = item.question.author.name;
+            author = item.question.author ? item.question.author.name : '';
             link = `https://www.zhihu.com/question/${item.question.id}/answer/${item.id}`;
             pubDate = new Date(item.created_time * 1000);
         } else if (item.type === 'article') {

package/lib/utils/puppeteer.js

@@ -5,7 +5,6 @@ const options = {
     args: ['--no-sandbox', '--disable-setuid-sandbox', '--disable-infobars', '--window-position=0,0', '--ignore-certifcate-errors', '--ignore-certifcate-errors-spki-list', `--user-agent=${config.ua}`],
     headless: true,
     ignoreHTTPSErrors: true,
-    userDataDir: './tmp',
 };
 
 module.exports = async () => {

package/lib/v2/12306/index.js

@@ -0,0 +1,108 @@
+const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const path = require('path');
+const config = require('@/config').value;
+
+const rootUrl = 'https://kyfw.12306.cn';
+
+async function getJSESSIONID(linkUrl) {
+    const res = await got({
+        method: 'get',
+        url: linkUrl,
+        headers: {
+            UserAgent: config.ua,
+            Referer: 'https://www.12306.cn/index/index.html',
+        },
+    });
+
+    return res.headers['set-cookie'].join().match(/JSESSIONID=([^;]+);/)[0];
+}
+
+function getStationInfo(stationName, ctx) {
+    return ctx.cache.tryGet(stationName, async () => {
+        const res = await got({
+            method: 'get',
+            url: `${rootUrl}/otn/resources/js/framework/station_name.js`,
+            headers: {
+                UserAgent: config.ua,
+                Referer: 'https://kyfw.12306.cn/otn/leftTicket/init',
+            },
+        });
+
+        return res.data
+            .split('@')
+            .map((item) => {
+                const itemData = item.split('|');
+
+                return itemData.indexOf(stationName) !== -1
+                    ? {
+                          code: itemData[2],
+                          name: itemData[1],
+                      }
+                    : null;
+            })
+            .filter((item) => item)[0];
+    });
+}
+
+module.exports = async (ctx) => {
+    const date = ctx.params.date;
+    const fromStationInfo = await getStationInfo(ctx.params.from, ctx);
+    const toStationInfo = await getStationInfo(ctx.params.to, ctx);
+    const type = ctx.params.type ?? 'ADULT';
+
+    const apiUrl = `${rootUrl}/otn/leftTicket/queryA?leftTicketDTO.train_date=${date}&leftTicketDTO.from_station=${fromStationInfo.code}&leftTicketDTO.to_station=${toStationInfo.code}&purpose_codes=${type}`;
+    const linkUrl = `${rootUrl}/otn/leftTicket/init?linktypeid=dc&fs=${fromStationInfo.code}&ts=${toStationInfo.code}&date=${date}&flag=N,N,Y`;
+
+    const response = await got.get(apiUrl, {
+        headers: {
+            UserAgent: config.ua,
+            Referer: 'https://kyfw.12306.cn/otn/leftTicket/init',
+            Cookie: await getJSESSIONID(linkUrl),
+        },
+    });
+    const data = response.data.data.result;
+    const map = response.data.data.map;
+    if (data.length === 0) {
+        throw '没有找到相关车次，请检查参数是否正确';
+    }
+
+    const items = data.map((item) => {
+        const itemData = item.split('|');
+        const trainInfo = {
+            trainNo: itemData[3],
+            fromStation: map[itemData[6]],
+            toStation: map[itemData[7]],
+            startTime: itemData[8],
+            arriveTime: itemData[9],
+            duration: itemData[10],
+            today: itemData[11],
+            A9: itemData[32],
+            M: itemData[31],
+            O: itemData[30],
+            A6: itemData[29],
+            A4: itemData[28],
+            F: itemData[27],
+            A3: itemData[26],
+            A2: itemData[25],
+            A1: itemData[24],
+            WZ: itemData[23],
+            QT: itemData[22],
+        };
+
+        return {
+            title: `${trainInfo.fromStation} → ${trainInfo.toStation} ${trainInfo.startTime} ${trainInfo.arriveTime}`,
+            description: art(path.join(__dirname, 'templates/train.art'), {
+                trainInfo,
+            }),
+            link: linkUrl,
+            guid: item,
+        };
+    });
+
+    ctx.state.data = {
+        title: `${fromStationInfo.name} → ${toStationInfo.name} ${date}`,
+        link: linkUrl,
+        item: items,
+    };
+};

package/lib/v2/12306/maintainer.js

@@ -0,0 +1,4 @@
+module.exports = {
+    '/:date/:from/:to/:type?': ['Fatpandac'],
+    '/zxdt/:id?': ['LogicJake'],
+};

package/lib/v2/12306/radar.js

@@ -0,0 +1,28 @@
+module.exports = {
+    '12306.cn': {
+        _name: '12306',
+        kyfw: [
+            {
+                title: '售票信息',
+                docs: 'https://docs.rsshub.app/travel.html#_12306-shou-shu-piao-piao-xin-shen-xi',
+                source: ['/', '/otn/leftTicket/init'],
+                target: (params, url) => {
+                    const searchParams = new URL(url).searchParams;
+                    const from = searchParams.get('fs').split(',')[0];
+                    const to = searchParams.get('ts').split(',')[0];
+                    const date = searchParams.get('date');
+
+                    return `/12306/${date}/${from}/${to}`;
+                },
+            },
+        ],
+        www: [
+            {
+                title: '最新动态',
+                docs: 'https://docs.rsshub.app/travel.html#_12306-zui-cuo-xin-dong-tai',
+                source: ['/', '/mormhweb/1/:id/index_fl.html'],
+                target: '/12306/zxdt/:id',
+            },
+        ],
+    },
+};

package/lib/v2/12306/router.js

@@ -0,0 +1,4 @@
+module.exports = function (router) {
+    router.get('/:date/:from/:to/:type?', require('./index'));
+    router.get('/zxdt/:id?', require('./zxdt'));
+};

package/lib/v2/12306/templates/train.art

@@ -0,0 +1,31 @@
+<text>车次：{{ trainInfo.trainNo}}</text>
+<br>
+<text>始发站：{{ trainInfo.fromStation}} → {{ trainInfo.toStation}}</text>
+<br>
+<text>出发时间：{{ trainInfo.startTime}}</text>
+<br>
+<text>到达时间：{{ trainInfo.arriveTime}}</text>
+<br>
+<text>历时：{{ trainInfo.duration}} {{ trainInfo.today === 'N' ? '次日达' : '' }}</text>
+<br>
+<text>商务座/特等座：{{ trainInfo.A9 ? trainInfo.A9 : '无' }}</text>
+<br>
+<text>一等座：{{ trainInfo.M ? trainInfo.M : '无' }}</text>
+<br>
+<text>二等座/二等包座：{{ trainInfo.O ? trainInfo.O : '无' }}</text>
+<br>
+<text>高级软卧：{{ trainInfo.A6 ? trainInfo.A6 : '无' }}</text>
+<br>
+<text>软卧/一等卧：{{ trainInfo.A4 ? trainInfo.A4 : '无' }}</text>
+<br>
+<text>动卧：{{ trainInfo.F ? trainInfo.F : '无' }}</text>
+<br>
+<text>硬卧/二等卧：{{ trainInfo.A3 ? trainInfo.A3 : '无' }}</text>
+<br>
+<text>软座: {{ trainInfo.A2 ? trainInfo.A2 : '无' }}</text>
+<br>
+<text>硬座: {{ trainInfo.A1 ? trainInfo.A1 : '无' }}</text>
+<br>
+<text>无座: {{ trainInfo.WZ ? trainInfo.WZ : '无' }}</text>
+<br>
+<text>其他: {{ trainInfo.QT ? trainInfo.QT : '无' }}</text>

package/lib/v2/18comic/album.js

@@ -0,0 +1,75 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const { rootUrl } = require('./utils');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+
+    const currentUrl = `${rootUrl}/album/${id}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    const category = $('span[data-type="tags"]')
+        .first()
+        .find('a')
+        .toArray()
+        .map((c) => $(c).text());
+    const author = $('span[data-type="author"]')
+        .first()
+        .find('a')
+        .toArray()
+        .map((a) => $(a).text())
+        .join(', ');
+
+    let items = $('.btn-toolbar')
+        .first()
+        .find('a')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            return {
+                title: item.text(),
+                link: `${rootUrl}${item.attr('href')}`,
+                pubDate: parseDate(item.find('.hidden-xs').text()),
+            };
+        });
+
+    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);
+
+                content('.tab-content').remove();
+
+                item.author = author;
+                item.category = category;
+                item.description = `<img src="${content('.thumb-overlay-albums img[data-original]')
+                    .toArray()
+                    .map((image) => content(image).attr('data-original'))
+                    .join('"><img src="')}">`;
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title').text(),
+        link: currentUrl,
+        item: items,
+        description: $('meta[property="og:description"]').attr('content'),
+    };
+};

package/lib/v2/18comic/blogs.js

@@ -0,0 +1,63 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const { rootUrl } = require('./utils');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? '';
+
+    const currentUrl = `${rootUrl}/blogs${category ? `/${category}` : ''}`;
+
+    const response = await got({
+        method: 'get',
+        url: currentUrl,
+    });
+
+    const $ = cheerio.load(response.data);
+
+    let items = $('.title')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+
+            return {
+                title: item.text(),
+                link: `${rootUrl}${item.parent().attr('href')}`,
+            };
+        });
+
+    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.pubDate = parseDate(content('.date').first().text());
+
+                content('.d-flex').remove();
+
+                item.author = content('.blog_name_id').first().text();
+                item.description = content('.blog_content').html();
+                item.category = content('.panel-heading dropdown-toggle')
+                    .toArray()
+                    .map((c) => $(c).text());
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: $('title')
+            .text()
+            .replace(/最新的/, $('.article-nav .active').text()),
+        link: currentUrl,
+        item: items,
+        description: $('meta[property="og:description"]').attr('content'),
+    };
+};

package/lib/v2/18comic/index.js

@@ -0,0 +1,12 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const category = ctx.params.category ?? 'all';
+    const keyword = ctx.params.keyword ?? '';
+    const time = ctx.params.time ?? 'a';
+    const order = ctx.params.order ?? 'mr';
+
+    const currentUrl = `${rootUrl}/albums${category !== 'all' ? `/${category}` : ''}${keyword ? `?screen=${keyword}` : '?'}${time !== 'a' ? `&t=${time}` : ''}${order !== 'mr' ? `&o=${order}` : ''}`;
+
+    ctx.state.data = await ProcessItems(ctx, currentUrl);
+};

package/lib/v2/18comic/maintainer.js

@@ -0,0 +1,6 @@
+module.exports = {
+    '/album/:id': ['nczitzk'],
+    '/blogs/:category?': ['nczitzk'],
+    '/search/:option?/:category?/:time?/:order?/:keyword?': ['nczitzk'],
+    '/:category?/:time?/:order?/:keyword?': ['nczitzk'],
+};

package/lib/v2/18comic/radar.js

@@ -0,0 +1,31 @@
+module.exports = {
+    '18comic.org': {
+        _name: '18comic 禁漫天堂',
+        '.': [
+            {
+                title: '成人 A 漫',
+                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-cheng-ren-a-man',
+                source: ['/'],
+                target: '/18comic/:category?/:time?/:order?/:keyword?',
+            },
+            {
+                title: '搜索',
+                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-sou-suo',
+                source: ['/'],
+                target: '/18comic/search/:option?/:category?:keyword?/:time?/:order?',
+            },
+            {
+                title: '专辑',
+                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-zhuan-ji',
+                source: ['/'],
+                target: '/18comic/album/:id',
+            },
+            {
+                title: '文庫',
+                docs: 'https://docs.rsshub.app/anime.html#18comic-jin-man-tian-tang-wen-ku',
+                source: ['/'],
+                target: '/18comic/blogs/:category?',
+            },
+        ],
+    },
+};

package/lib/v2/18comic/router.js

@@ -0,0 +1,6 @@
+module.exports = function (router) {
+    router.get('/album/:id', require('./album'));
+    router.get('/blogs/:category?', require('./blogs'));
+    router.get('/search/:option?/:category?/:keyword?/:time?/:order?', require('./search'));
+    router.get('/:category?/:time?/:order?/:keyword?', require('./index'));
+};

package/lib/v2/18comic/search.js

@@ -0,0 +1,13 @@
+const { rootUrl, ProcessItems } = require('./utils');
+
+module.exports = async (ctx) => {
+    const option = ctx.params.option ?? 'photos';
+    const category = ctx.params.category ?? 'all';
+    const keyword = ctx.params.keyword ?? '';
+    const time = ctx.params.time ?? 'a';
+    const order = ctx.params.order ?? 'mr';
+
+    const currentUrl = `${rootUrl}/search/${option}${category !== 'all' ? `/${category}` : ''}${keyword ? `?search_query=${keyword}` : '?'}${time !== 'a' ? `&t=${time}` : ''}${order !== 'mr' ? `&o=${order}` : ''}`;
+
+    ctx.state.data = await ProcessItems(ctx, currentUrl);
+};

package/lib/v2/18comic/utils.js

@@ -0,0 +1,71 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const rootUrl = 'https://18comic.org';
+
+module.exports = {
+    rootUrl,
+    ProcessItems: async (ctx, currentUrl) => {
+        currentUrl = currentUrl.replace(/\?$/, '');
+
+        const response = await got({
+            method: 'get',
+            url: currentUrl,
+        });
+
+        const $ = cheerio.load(response.data);
+
+        let items = $('.video-title')
+            .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 20)
+            .toArray()
+            .map((item) => {
+                item = $(item);
+
+                return {
+                    title: item.text().trim(),
+                    link: `${rootUrl}${item.prev().prev().attr('href')}`,
+                };
+            });
+
+        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.pubDate = parseDate(content('div[itemprop="datePublished"]').first().attr('content'));
+                    item.category = content('span[data-type="tags"]')
+                        .first()
+                        .find('a')
+                        .toArray()
+                        .map((c) => $(c).text());
+                    item.author = content('span[data-type="author"]')
+                        .first()
+                        .find('a')
+                        .toArray()
+                        .map((a) => $(a).text())
+                        .join(', ');
+                    item.description = `<p>${content('#intro-block .p-t-5').text()}</p><img src="${content('.img_zoom_img img')
+                        .toArray()
+                        .map((image) => content(image).attr('src'))
+                        .join('"><img src="')}">`;
+
+                    return item;
+                })
+            )
+        );
+
+        return {
+            title: $('title').text(),
+            link: currentUrl,
+            item: items,
+            description: $('meta[property="og:description"]').attr('content'),
+            allowEmpty: true,
+        };
+    },
+};

package/lib/v2/2048/index.js

@@ -51,7 +51,14 @@ module.exports = async (ctx) => {
                 });
 
                 item.author = content('.fl.black').text();
-                item.pubDate = timezone(parseDate(content('.fl.gray').text().replace(/发表于: /, '')), +8);
+                item.pubDate = timezone(
+                    parseDate(
+                        content('.fl.gray')
+                            .text()
+                            .replace(/发表于: /, '')
+                    ),
+                    +8
+                );
 
                 const downloadLink = content('#read_tpc').first().find('a').last();