rsshub 1.0.0-master.f97cdb2 → 1.0.0-master.fa3428f

package/lib/{routes/universities → v2}/zju/cst/index.js

@@ -1,5 +1,6 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
 
 const host = 'http://www.cst.zju.edu.cn/';
 
@@ -33,7 +34,7 @@ async function getPage(id) {
                 item = $(item);
                 return {
                     title: item.find('a').text(),
-                    pubDate: new Date(item.find('.fr').text()).toUTCString(),
+                    pubDate: parseDate(item.find('.fr').text()),
                     link: item.find('a').attr('href'),
                 };
             })
@@ -42,7 +43,7 @@ async function getPage(id) {
 }
 
 module.exports = async (ctx) => {
-    const type = Number.parseInt(ctx.params.type);
+    const type = parseInt(ctx.params.type);
     const link = host + map.get(type).id;
     let items = [];
     if (type === 0) {
@@ -59,30 +60,25 @@ module.exports = async (ctx) => {
     }
 
     const out = await Promise.all(
-        items.map(async (item) => {
+        items.map((item) => {
             const itemUrl = host + item.link;
-            const cache = await ctx.cache.get(itemUrl);
-            if (cache) {
-                return Promise.resolve(JSON.parse(cache));
-            }
-
-            const response = await got({
-                method: 'get',
-                url: itemUrl,
-                headers: {
-                    Referer: link,
-                },
+            return ctx.cache.tryGet(itemUrl, async () => {
+                const response = await got({
+                    method: 'get',
+                    url: itemUrl,
+                    headers: {
+                        Referer: link,
+                    },
+                });
+                const $ = cheerio.load(response.data);
+                const description = $('.vid_wz').html();
+                return {
+                    title: item.title,
+                    link: itemUrl,
+                    description,
+                    pubDate: item.pubDate,
+                };
             });
-            const $ = cheerio.load(response.data);
-            const description = $('.vid_wz').html();
-            const single = {
-                title: item.title,
-                link: itemUrl,
-                description,
-                pubDate: item.pubDate,
-            };
-            ctx.cache.set(itemUrl, JSON.stringify(single));
-            return Promise.resolve(single);
         })
     );
 

package/lib/v2/zju/grs/index.js

@@ -0,0 +1,43 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+const host = 'http://www.grs.zju.edu.cn/';
+
+const map = new Map([
+    [1, { title: '浙大研究生院 -- 全部公告', tag: '1335' }],
+    [2, { title: '浙大研究生院 -- 教学管理', tag: '1336' }],
+    [3, { title: '浙大研究生院 -- 各类资助', tag: '1337' }],
+    [4, { title: '浙大研究生院 -- 学科建设', tag: '1338' }],
+    [5, { title: '浙大研究生院 -- 海外交流', tag: '1339' }],
+]);
+
+module.exports = async (ctx) => {
+    const type = parseInt(ctx.params.type);
+    const tag = map.get(type).tag;
+    const url = `${host}${tag}/list.htm`;
+    const res = await got(url);
+
+    const $ = cheerio.load(res.data);
+    const list = $('#wp_news_w24').find('.list_nav');
+
+    const items =
+        list &&
+        list
+            .map((index, item) => {
+                item = $(item);
+                return {
+                    title: item.find('.list_tit').children('a').attr('title'),
+                    pubDate: parseDate(item.find('.list_time').text()),
+                    link: `http://www.grs.zju.edu.cn/${item.find('a').eq(-1).attr('href')}`,
+                    description: item.find('.list_intro a').text(),
+                };
+            })
+            .get();
+
+    ctx.state.data = {
+        title: map.get(type).title,
+        link: `${host}${tag}/list.htm`,
+        item: items,
+    };
+};

package/lib/v2/zju/list.js

@@ -0,0 +1,66 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const host = 'https://www.zju.edu.cn/';
+module.exports = async (ctx) => {
+    const type = ctx.params.type ?? 'xs';
+    const link = host + type + `/list.htm`;
+    const response = await got({
+        method: 'get',
+        url: link,
+        headers: {
+            Referer: host,
+        },
+    });
+    const $ = cheerio.load(response.data);
+
+    function sortUrl(e) {
+        if (e.search('redirect') !== -1) {
+            return link;
+        } else {
+            return e;
+        }
+    }
+    const list = $('#wp_news_w7 ul.news li')
+        .map(function () {
+            const info = {
+                title: $(this).find('a').attr('title'),
+                link: sortUrl($(this).find('a').attr('href')),
+                date: $(this)
+                    .text()
+                    .match(/\d{4}-\d{2}-\d{2}/)[0],
+            };
+            return info;
+        })
+        .get();
+
+    const out = await Promise.all(
+        list.map((info) => {
+            const title = info.title;
+            const date = info.date;
+            const itemUrl = new URL(info.link, host).href;
+            return ctx.cache.tryGet(itemUrl, async () => {
+                const response = await got({
+                    method: 'get',
+                    url: itemUrl,
+                    headers: {
+                        Referer: link,
+                    },
+                });
+                const $ = cheerio.load(response.data);
+                const description = $('.right_content').html();
+                return {
+                    title,
+                    link: itemUrl,
+                    description,
+                    pubDate: parseDate(date),
+                };
+            });
+        })
+    );
+    ctx.state.data = {
+        title: `浙江大学` + $('ul.submenu .selected').text(),
+        link,
+        item: out,
+    };
+};

package/lib/v2/zju/maintainer.js

@@ -0,0 +1,8 @@
+module.exports = {
+    '/career/:type': ['Caicailiushui'],
+    '/cst/custom/:id': ['zwithz'],
+    '/cst/:type': ['yonvenne', 'zwithz'],
+    '/grs/:type': ['Caicailiushui'],
+    '/list/:type': ['Jeason0228'],
+    '/physics/:type': ['Caicailiushui'],
+};

package/lib/v2/zju/physics/index.js

@@ -0,0 +1,52 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+
+// const host = 'http://physics.zju.edu.cn/redir.php?catalog_id=';
+const host = 'http://physics.zju.edu.cn';
+// const host = 'http://10.14.122.238/redir.php?catalog_id=';
+
+const map = new Map([
+    [1, { title: '浙大物理学院 -- 本院动态', id: '39060' }],
+    [2, { title: '浙大物理学院 -- 科研进展', id: '39070' }],
+    [3, { title: '浙大物理学院 -- 研究生教育最新消息', id: '39079' }],
+
+    // could not find these sections due to http://physics.zju.edu.cn/2022/0325/c39060a2510676/page.htm
+    /*    [4, { title: '浙大物理学院 -- 学生思政最新消息', id: '112' }],
+    [5, { title: '浙大物理学院 -- 研究生思政消息公告', id: '155' }],
+    [6, { title: '浙大物理学院 -- 研究生奖助学金', id: '661' }],
+    [7, { title: '浙大物理学院 -- 研究生思政就业信息', id: '664' }],
+    [8, { title: '浙大物理学院 -- 本科生思政消息公告', id: '667' }],
+    [9, { title: '浙大物理学院 -- 本科生奖助学金', id: '670' }],
+    [10, { title: '浙大物理学院 -- 本科生就业信息', id: '671' }],
+    [11, { title: '浙大物理学院 -- 学术报告', id: '3735' }],*/
+]);
+
+module.exports = async (ctx) => {
+    const type = parseInt(ctx.params.type);
+    const id = map.get(type).id;
+    const res = await got({
+        method: 'get',
+        url: `${host}/${id}/list.htm`,
+    });
+
+    const $ = cheerio.load(res.data);
+    const items = $('#arthd li')
+        .map((index, item) => {
+            item = $(item);
+            return {
+                title: item.find('a').attr('title'),
+                pubDate: parseDate(item.find('.art-date').text()),
+
+                link: `http://physics.zju.edu.cn/${item.find('a').attr('href')}`,
+                // link: `http://10.14.122.238/${item.find('a').attr('href')}`,
+            };
+        })
+        .get();
+
+    ctx.state.data = {
+        title: map.get(type).title,
+        link: `${host}${id}`,
+        item: items,
+    };
+};

package/lib/v2/zju/radar.js

@@ -0,0 +1,139 @@
+module.exports = {
+    'zju.edu.cn': {
+        _name: '浙江大学',
+        physics: [
+            {
+                title: '物理学院',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: ['/*path'],
+                target: (params) => {
+                    let type;
+                    switch (params.path) {
+                        case '39060/list.htm':
+                            type = '1';
+                            break;
+                        case '39070/list.htm':
+                            type = '2';
+                            break;
+                        case '39079/list.htm':
+                            type = '3';
+                            break;
+                        default:
+                            type = '1';
+                            break;
+                    }
+                    return `/zju/physics/${type}`;
+                },
+            },
+        ],
+        www: [
+            {
+                title: '普通栏目',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: ['/*path'],
+                target: (params) => `/zju/list/${params.path.replace('/list.htm', '')}`,
+            },
+        ],
+        'www.career': [
+            {
+                title: '就业服务平台',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: ['/'],
+                target: '/zju/career/1',
+            },
+        ],
+        'www.cst': [
+            {
+                title: '软件学院 - 全部通知',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: ['', '/*tpath'],
+                target: '/zju/cst/0',
+            },
+            {
+                title: '软件学院 - 招生信息',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/32178/list.htm',
+                target: '/zju/cst/1',
+            },
+            {
+                title: '软件学院 - 教务管理',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36216/list.htm',
+                target: '/zju/cst/2',
+            },
+            {
+                title: '软件学院 - 论文管理',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36217/list.htm',
+                target: '/zju/cst/3',
+            },
+            {
+                title: '软件学院 - 思政工作',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36192/list.htm',
+                target: '/zju/cst/4',
+            },
+            {
+                title: '软件学院 - 评奖评优',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36228/list.htm',
+                target: '/zju/cst/5',
+            },
+            {
+                title: '软件学院 - 实习就业',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36193/list.htm',
+                target: '/zju/cst/6',
+            },
+            {
+                title: '软件学院 - 国际实习',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36235/list.htm',
+                target: '/zju/cst/7',
+            },
+            {
+                title: '软件学院 - 国内合作科研',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36194/list.htm',
+                target: '/zju/cst/8',
+            },
+            {
+                title: '软件学院 - 国际合作科研',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: '/36246/list.htm',
+                target: '/zju/cst/9',
+            },
+        ],
+        'www.grs': [
+            {
+                title: '研究生院',
+                docs: 'https://docs.rsshub.app/university.html#zhe-jiang-da-xue',
+                source: ['/*path', '/'],
+                target: (params) => {
+                    let type;
+                    switch (params.path) {
+                        case '1335/list.htm':
+                            type = 1;
+                            break;
+                        case '1336/list.htm':
+                            type = 2;
+                            break;
+                        case '1337/list.htm':
+                            type = 3;
+                            break;
+                        case '1338/list.htm':
+                            type = 4;
+                            break;
+                        case '1339/list.htm':
+                            type = 5;
+                            break;
+                        default:
+                            type = 1;
+                            break;
+                    }
+                    return `/zju/grs/${type}`;
+                },
+            },
+        ],
+    },
+};

package/lib/v2/zju/router.js

@@ -0,0 +1,8 @@
+module.exports = (router) => {
+    router.get('/career/:type', require('./career'));
+    router.get('/cst/custom/:id', require('./cst/custom'));
+    router.get('/cst/:type', require('./cst'));
+    router.get('/grs/:type', require('./grs'));
+    router.get('/list/:type', require('./list'));
+    router.get('/physics/:type', require('./physics'));
+};

package/lib/views/atom.art

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:rsshub="http://rsshub.app/xml/schemas">
     <generator>RSSHub</generator>
     <webMaster>i@diygod.me (DIYgod)</webMaster>
     <language>{{ language || 'zh-cn' }}</language>
@@ -50,6 +50,18 @@
 
         <link href="{{ $e.link }}" />
 
+        {{ if $e.upvotes }}
+        <rsshub:upvotes>{{ $e.upvotes }}</rsshub:upvotes>
+        {{ /if }}
+
+        {{ if $e.downvotes }}
+        <rsshub:downvotes>{{ $e.downvotes }}</rsshub:downvotes>
+        {{ /if }}
+
+        {{ if $e.comments }}
+        <rsshub:comments>{{ $e.comments }}</rsshub:comments>
+        {{ /if }}
+
         {{ if $e.summary }}
         <summary type="html"><![CDATA[{{@ $e.summary }}]]></summary>
         {{ /if }}

package/lib/views/welcome.art

@@ -60,15 +60,18 @@
         }
 
         .debug-item {
+            white-space: nowrap;
             margin: 5px 0;
             font-size: 12px;
             line-height: 24px;
+            max-width: 75%;
         }
 
         .debug-value {
+            white-space: pre-wrap !important;
+            overflow-wrap: anywhere;
             display: inline-block;
             vertical-align: top;
-            white-space: pre;
         }
     </style>
 </head>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsshub",
-  "version": "1.0.0-master.f97cdb2",
+  "version": "1.0.0-master.fa3428f",
   "description": "Make RSS Great Again!",
   "main": "lib/pkg.js",
   "files": [
@@ -42,18 +42,18 @@
   "devDependencies": {
     "@napi-rs/pinyin": "1.7.0",
     "@types/koa": "2.13.4",
-    "@vercel/nft": "0.18.0",
+    "@vercel/nft": "0.18.2",
     "@vuepress/plugin-back-to-top": "1.9.7",
     "@vuepress/plugin-google-analytics": "1.9.7",
     "@vuepress/plugin-pwa": "1.9.7",
     "@vuepress/shared-utils": "1.9.7",
     "ci-info": "3.3.0",
     "cross-env": "7.0.3",
-    "eslint": "8.12.0",
+    "eslint": "8.13.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.0.0",
     "eslint-plugin-yml": "0.14.0",
-    "fs-extra": "10.0.1",
+    "fs-extra": "10.1.0",
     "jest": "27.5.1",
     "mockdate": "3.0.5",
     "nock": "13.2.4",
@@ -77,7 +77,7 @@
   "dependencies": {
     "@koa/router": "10.1.1",
     "@postlight/mercury-parser": "2.2.1",
-    "@sentry/node": "6.19.4",
+    "@sentry/node": "6.19.6",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
@@ -86,7 +86,7 @@
     "city-timezones": "1.2.0",
     "crypto-js": "4.1.1",
     "currency-symbol-map": "5.0.1",
-    "dayjs": "1.11.0",
+    "dayjs": "1.11.1",
     "dotenv": "16.0.0",
     "emailjs-imap-client": "3.1.0",
     "entities": "3.0.1",
@@ -95,10 +95,10 @@
     "git-rev-sync": "3.0.2",
     "googleapis": "100.0.0",
     "got": "11.8.3",
-    "https-proxy-agent": "5.0.0",
+    "https-proxy-agent": "5.0.1",
     "iconv-lite": "0.6.3",
     "instagram-private-api": "1.45.3",
-    "ioredis": "5.0.3",
+    "ioredis": "5.0.4",
     "ip": "*",
     "ip-regex": "4.3.0",
     "is-localhost-ip": "1.4.0",
@@ -109,7 +109,7 @@
     "koa-basic-auth": "4.0.0",
     "koa-favicon": "2.1.0",
     "koa-mount": "4.0.0",
-    "lru-cache": "7.7.3",
+    "lru-cache": "7.8.1",
     "lz-string": "1.4.4",
     "mailparser": "3.4.0",
     "markdown-it": "12.3.2",
@@ -117,13 +117,14 @@
     "parse-torrent": "9.1.5",
     "pidusage": "3.0.0",
     "plist": "3.0.5",
-    "puppeteer": "13.5.2",
+    "puppeteer": "13.6.0",
     "query-string": "7.1.1",
+    "rand-user-agent": "1.0.59",
     "require-all": "3.0.0",
     "rss-parser": "3.12.0",
-    "showdown": "2.0.3",
+    "showdown": "2.1.0",
     "simplecc-wasm": "0.1.4",
-    "socks-proxy-agent": "6.1.1",
+    "socks-proxy-agent": "6.2.0",
     "string-similarity": "4.0.4",
     "tiny-async-pool": "2.0.1",
     "torrent-search-api": "2.1.4",

package/lib/routes/cctv/xwlb.js

@@ -1,48 +0,0 @@
-const got = require('@/utils/got');
-const date = require('@/utils/date');
-const cheerio = require('cheerio');
-const dayjs = require('dayjs');
-require('dayjs/locale/zh-cn');
-
-module.exports = async (ctx) => {
-    const res = await got({ method: 'get', url: 'http://tv.cctv.com/lm/xwlb/' });
-    const $ = cheerio.load(res.data);
-    // 解析最新一期新闻联播的日期
-    const latestDate = dayjs(date($('.md .mh_title > a').text().replace(/\s/g, '')), { locale: 'zh-cn' });
-    const count = [];
-    for (let i = 0; i < 20; i++) {
-        count.push(i);
-    }
-    const resultItems = await Promise.all(
-        count.map(async (i) => {
-            const newsDate = latestDate.subtract(i, 'days').set('hour', 19);
-            const url = `http://tv.cctv.com/lm/xwlb/day/${newsDate.format('YYYYMMDD')}.shtml`;
-            const item = {
-                title: `新闻联播 ${newsDate.format('YYYY/MM/DD')}`,
-                link: url,
-                pubDate: newsDate.toISOString(),
-                description: await ctx.cache.tryGet(url, async () => {
-                    const res = await got.get(url);
-                    const content = cheerio.load(res.data);
-                    const alist = new Array();
-                    content('a').map((i, e) => {
-                        const a = content(e);
-                        const href = a.attr('href');
-                        const title = a.find('.text .title').text();
-                        const dur = a.find('.text .bottom').text();
-                        alist.push(`<a href="${href}">${title} ⏱${dur}</a>`);
-                        return i;
-                    });
-                    return alist.join('<br/>\n');
-                }),
-            };
-            return item;
-        })
-    );
-
-    ctx.state.data = {
-        title: 'CCTV 新闻联播',
-        link: 'http://tv.cctv.com/lm/xwlb/',
-        item: resultItems,
-    };
-};

package/lib/routes/dapenti/utils.js

@@ -1,73 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const iconv = require('iconv-lite');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
-
-module.exports = {
-    parseFeed: async ({ subjectid }) => {
-        const url = `https://www.dapenti.com/blog/blog.asp?name=xilei&subjectid=${subjectid}`;
-        const listRes = await got({
-            method: 'get',
-            url,
-            headers: {
-                Referer: url,
-            },
-            // 喷嚏网编码为GBK，需要转码
-            // 转码需要设定返回数据的格式，其可选项是arraybuffer,blob,document,json,text,stream
-            // 默认为json
-            responseType: 'buffer',
-        });
-        // 转码
-        const data = iconv.decode(listRes.data, 'gb2312');
-        const $ = cheerio.load(data);
-        // 只取最近的三个，取全文rss
-        const list = $('li', 'ul').slice(0, 3).get();
-
-        const result_item = await Promise.all(
-            list.map(async (item) => {
-                const el = $(item);
-                const url = `https://www.dapenti.com/blog/${el.find('a').attr('href')}`;
-                const original_data = await got({
-                    method: 'get',
-                    url,
-                    headers: {
-                        Referer: url,
-                    },
-                    responseType: 'buffer',
-                });
-                const convert_data = iconv.decode(original_data.data, 'gbk');
-                const description = cheerio.load(convert_data, {
-                    decodeEntities: false,
-                })('body > table > tbody > tr > td.oblog_t_2 > div > table > tbody > tr:nth-child(2) > td');
-                const pubInfo = description.find('span span.oblog_text').text().split('发布于');
-                description.find('table, .adsbygoogle').remove();
-
-                // remove header
-                const count = subjectid.toString() === '70' ? 8 : 3;
-                for (let index = 0; index < count; index++) {
-                    description.children().first().remove();
-                }
-
-                // remove footer
-                for (let index = 0; index < 8; index++) {
-                    description.children().last().remove();
-                }
-                const single = {
-                    title: el.text(),
-                    author: pubInfo[0].trim(),
-                    description: description.html(),
-                    pubDate: timezone(parseDate(pubInfo[1].trim()), +8),
-                    link: url,
-                };
-                return single;
-            })
-        );
-
-        return {
-            title: `喷嚏-${subjectid}`,
-            link: url,
-            item: result_item,
-        };
-    },
-};