rsshub 1.0.0-master.fea5824 → 1.0.0-master.febd623

package/lib/v2/zuel/radar.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'zuel.edu.cn': {
+        _name: '中南财经政法大学',
+        wap: [
+            {
+                title: '通知公告',
+                docs: 'https://docs.rsshub.app/univeristy.html#zhong-nan-cai-jing-zheng-fa-da-xue-tong-zhi-gong-gao',
+                source: ['/', '/notice/list.htm'],
+                target: '/zuel/notice',
+            },
+        ],
+    },
+};

package/lib/v2/zuel/router.js

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

package/lib/v2router.js

@@ -0,0 +1,17 @@
+const dirname = __dirname + '/v2';
+
+// 遍历整个 routes 文件夹，收集模块路由 router.js
+const RouterPath = require('require-all')({
+    dirname,
+    filter: /router\.js$/,
+});
+
+const routes = {};
+
+// 将收集到的自定义模块路由进行合并
+for (const dir in RouterPath) {
+    const project = RouterPath[dir]['router.js']; // Do not merge other file
+    routes[dir] = project;
+}
+
+module.exports = routes;

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>
@@ -37,8 +37,10 @@
         <id>{{ $e.guid || $e.id || $e.link }}</id>
         <title><![CDATA[{{@ $e.title }}]]></title>
 
-        <published>{{ $e.pubDate || $e.updated }}</published>
-        <updated>{{ $e.updated }}</updated>
+        {{ if ($e.pubDate && $e.updated) }}
+        <published>{{ $e.pubDate }}</published>
+        {{ /if }}
+        <updated>{{ $e.updated || $e.pubDate }}</updated>
 
         {{ if $e.author }}
         <author>
@@ -48,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/error.art

@@ -39,6 +39,16 @@
 
         <pre class="message">Route requested: {{@ requestPath }}</pre>
         <pre class="message">Error message: {{@ message }}</pre>
+        <pre class="message">
+Helpful Information to provide when opening issue:
+Path: {{@ errorPath }}
+Node version: {{@ nodeVersion}}
+Git Hash: {{@ gitHash}}
+        </pre>
+        <pre class="message">
+如果您认为 RSSHub 导致了该错误，请在Github按照模版，复制本页面信息进行<a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+bug&template=bug_report_zh.yml" target="_blank">汇报</a>
+If you believe this is an error caused by RSSHub, please <a href="https://github.com/DIYgod/RSSHub/issues/new?assignees=&labels=RSS+bug&template=bug_report_en.yml" target="_blank">report on github</a>
+        </pre>
 
         <div style="margin: 50px 0">
             <p>在线文档与支持，请访问<a href="https://docs.rsshub.app/" target="_blank">docs.rsshub.app</a>。</p>

package/lib/views/rss.art

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss  xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"
-{{ if itunes_author }}
+{{ if itunes_author || itunes_category || (item && item.some((i) => (i.itunes_item_image || i.itunes_duration))) }}
   xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd"
-{{ else if item && item.some((i) => i.media) }}
+{{ /if }}
+{{ if item && item.some((i) => i.media) }}
   xmlns:media="http://search.yahoo.com/mrss/"
 {{ /if }}
 >
@@ -13,7 +14,7 @@
         <description><![CDATA[{{@ description || title }} - Made with love by RSSHub(https://github.com/DIYgod/RSSHub)]]></description>
         <generator>RSSHub</generator>
         <webMaster>i@diygod.me (DIYgod)</webMaster>
-        {{ if itunes_author }}<itunes:author>{{ itunes_author}}</itunes:author>{{ /if }}
+        {{ if itunes_author }}<itunes:author>{{ itunes_author }}</itunes:author>{{ /if }}
         {{ if itunes_category }}<itunes:category text="{{ itunes_category }}"/>{{ /if }}
         {{ if itunes_author }}<itunes:explicit>{{ itunes_explicit || 'clean' }}</itunes:explicit>{{ /if }}
         <language>{{ language || 'zh-cn' }}</language>
@@ -35,7 +36,7 @@
             <link>{{ $value.link }}</link>
             {{ if $value.itunes_item_image }}<itunes:image href="{{ $value.itunes_item_image }}"/>{{ /if }}
             {{ if $value.enclosure_url }}<enclosure url="{{ $value.enclosure_url }}" {{ if $value.enclosure_length }}length="{{ $value.enclosure_length }}"{{ /if }} {{ if $value.enclosure_type }}type="{{ $value.enclosure_type }}"{{ /if }} />{{ /if }}
-            {{ if itunes_author && $value.itunes_duration }}<itunes:duration>{{ $value.itunes_duration }}</itunes:duration> {{ /if }}
+            {{ if $value.itunes_duration }}<itunes:duration>{{ $value.itunes_duration }}</itunes:duration> {{ /if }}
             {{ if $value.author }}<author><![CDATA[{{ $value.author }}]]></author>{{ /if }}
             {{ if typeof $value.category === 'string' }}
             <category>{{ $value.category }}</category>

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.fea5824",
+  "version": "1.0.0-master.febd623",
   "description": "Make RSS Great Again!",
   "main": "lib/pkg.js",
   "files": [
@@ -12,12 +12,17 @@
     "profiling": "NODE_ENV=production node --prof lib/index.js",
     "docs:dev": "vuepress dev docs",
     "docs:build": "vuepress build docs",
+    "build:all": "npm run build:radar && npm run build:maintainer",
+    "build:radar": "node scripts/workflow/build-radar.js",
+    "build:maintainer": "node scripts/workflow/build-maintainer.js",
     "lint": "eslint .",
-    "format": "eslint \"**/*.js\" --fix && node docs/.format/format.js && prettier \"**/*.{js,json}\" --write",
-    "format:staged": "eslint \"**/*.js\" --fix && node docs/.format/format.js --staged && pretty-quick --staged --verbose --pattern \"**/*.{js,json}\"",
-    "format:check": "eslint \"**/*.js\" && prettier-check \"**/*.{js,json}\"",
-    "test": "npm run format:check && cross-env NODE_ENV=test jest --coverage --runInBand --forceExit",
-    "jest": "cross-env NODE_ENV=test jest --runInBand --forceExit"
+    "format": "eslint \"**/*.{js,yml}\" --fix && node docs/.format/format.js && prettier \"**/*.{js,json}\" --write",
+    "format:staged": "eslint \"**/*.{js,yml}\" --fix && node docs/.format/format.js --staged && pretty-quick --staged --verbose --pattern \"**/*.{js,json}\"",
+    "format:check": "eslint \"**/*.{js,yml}\" && prettier-check \"**/*.{js,json}\"",
+    "jest": "cross-env NODE_ENV=test jest --runInBand --forceExit --detectOpenHandles",
+    "jest:coverage": "cross-env NODE_ENV=test jest --coverage --runInBand --forceExit --detectOpenHandles",
+    "jest:watch": "cross-env NODE_ENV=test jest --watch",
+    "test": "npm run format:check && npm run jest:coverage"
   },
   "repository": {
     "type": "git",
@@ -36,92 +41,101 @@
   },
   "homepage": "https://github.com/DIYgod/RSSHub#readme",
   "devDependencies": {
-    "@napi-rs/pinyin": "^1.6.1",
-    "@types/cheerio": "0.22.24",
-    "@types/got": "9.6.11",
-    "@types/koa": "2.13.1",
-    "@vercel/nft": "0.9.6",
-    "@vuepress/plugin-back-to-top": "1.8.2",
-    "@vuepress/plugin-google-analytics": "1.8.2",
-    "@vuepress/plugin-pwa": "1.8.2",
+    "@napi-rs/pinyin": "1.7.0",
+    "@types/koa": "2.13.4",
+    "@vercel/nft": "0.19.1",
+    "@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",
     "cross-env": "7.0.3",
-    "globby": "11.0.2",
-    "eslint": "7.29.0",
-    "eslint-config-prettier": "8.3.0",
-    "eslint-plugin-prettier": "3.4.0",
-    "jest": "26.6.3",
+    "eslint": "8.16.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-yml": "1.0.0",
+    "fs-extra": "10.1.0",
+    "jest": "28.1.0",
     "mockdate": "3.0.5",
-    "nock": "13.0.11",
-    "nodemon": "2.0.7",
-    "prettier": "2.2.1",
+    "nock": "13.2.6",
+    "nodemon": "2.0.16",
+    "prettier": "2.6.2",
     "prettier-check": "2.0.0",
-    "pretty-quick": "3.1.1",
-    "remark": "12.0.1",
-    "remark-frontmatter": "2.0.0",
+    "pretty-quick": "3.1.3",
+    "remark": "13.0.0",
+    "remark-frontmatter": "3.0.0",
+    "remark-gfm": "1.0.0",
     "remark-pangu": "2.2.0",
-    "remark-preset-prettier": "0.4.1",
-    "staged-git-files": "1.2.0",
-    "string-width": "4.2.2",
-    "supertest": "6.1.3",
-    "vuepress": "1.8.2",
+    "remark-parse": "9.0.0",
+    "remark-preset-prettier": "0.5.1",
+    "remark-stringify": "9.0.1",
+    "staged-git-files": "1.3.0",
+    "string-width": "4.2.3",
+    "supertest": "6.2.3",
+    "tosource": "2.0.0-alpha.3",
+    "unified": "9.2.2",
+    "vuepress": "1.9.7",
     "yorkie": "2.0.0"
   },
   "dependencies": {
-    "@koa/router": "10.0.0",
-    "@postlight/mercury-parser": "2.2.0",
-    "@sentry/node": "6.7.2",
+    "@koa/router": "10.1.1",
+    "@postlight/mercury-parser": "2.2.1",
+    "@sentry/node": "7.0.0",
     "aes-js": "3.1.2",
     "art-template": "4.13.2",
     "bbcodejs": "0.0.4",
-    "cheerio": "1.0.0-rc.3",
-    "chrono-node": "2.2.6",
-    "city-timezones": "^1.2.0",
-    "crypto-js": "4.0.0",
-    "currency-symbol-map": "4.0.4",
-    "dayjs": "1.10.3",
-    "dotenv": "8.5.1",
+    "cheerio": "1.0.0-rc.11",
+    "chrono-node": "2.3.8",
+    "city-timezones": "1.2.0",
+    "crypto-js": "4.1.1",
+    "currency-symbol-map": "5.1.0",
+    "dayjs": "1.11.2",
+    "dotenv": "16.0.1",
     "emailjs-imap-client": "3.1.0",
-    "entities": "2.1.0",
+    "entities": "3.0.1",
     "etag": "1.8.1",
     "fanfou-sdk": "4.2.0",
-    "git-rev-sync": "3.0.1",
-    "googleapis": "73.0.0",
-    "got": "11.8.2",
-    "https-proxy-agent": "5.0.0",
-    "iconv-lite": "0.6.2",
-    "instagram-private-api": "1.44.1",
-    "ioredis": "4.27.2",
-    "ip-regex": "4.2.0",
+    "git-rev-sync": "3.0.2",
+    "googleapis": "100.0.0",
+    "got": "11.8.5",
+    "https-proxy-agent": "5.0.1",
+    "iconv-lite": "0.6.3",
+    "instagram-private-api": "1.45.3",
+    "ioredis": "5.0.6",
+    "ip-regex": "4.3.0",
     "is-localhost-ip": "1.4.0",
-    "jsdom": "16.5.3",
+    "jsdom": "19.0.0",
     "json-bigint": "1.0.0",
-    "json5": "2.2.0",
-    "koa": "2.13.1",
+    "json5": "2.2.1",
+    "koa": "2.13.4",
     "koa-basic-auth": "4.0.0",
     "koa-favicon": "2.1.0",
     "koa-mount": "4.0.0",
-    "lru-cache": "6.0.0",
+    "lru-cache": "7.10.1",
     "lz-string": "1.4.4",
-    "mailparser": "3.2.0",
-    "markdown-it": "12.0.6",
+    "mailparser": "3.5.0",
+    "markdown-it": "13.0.1",
     "module-alias": "2.2.2",
-    "parse-torrent": "9.1.3",
-    "pidusage": "2.0.21",
-    "plist": "3.0.2",
-    "puppeteer": "9.1.1",
-    "query-string": "7.0.1",
+    "parse-torrent": "9.1.5",
+    "pidusage": "3.0.0",
+    "plist": "3.0.5",
+    "puppeteer": "13.7.0",
+    "puppeteer-extra": "3.2.3",
+    "puppeteer-extra-plugin-stealth": "2.9.0",
+    "query-string": "7.1.1",
+    "rand-user-agent": "1.0.65",
     "require-all": "3.0.0",
-    "rss-parser": "3.10.0",
-    "showdown": "1.9.1",
-    "simplecc-wasm": "0.1.2",
-    "socks-proxy-agent": "6.0.0",
-    "string-similarity": "^4.0.3",
-    "tiny-async-pool": "1.2.0",
-    "torrent-search-api": "^2.1.3",
+    "rss-parser": "3.12.0",
+    "showdown": "2.1.0",
+    "simplecc-wasm": "0.1.4",
+    "socks-proxy-agent": "7.0.0",
+    "string-similarity": "4.0.4",
+    "tiny-async-pool": "2.1.0",
+    "torrent-search-api": "2.1.4",
     "tough-cookie": "4.0.0",
     "tunnel": "0.0.6",
-    "twit": "2.2.11",
-    "winston": "3.3.3"
+    "twitter-api-v2": "1.12.2",
+    "winston": "3.7.2",
+    "xml2js": "0.4.23"
   },
   "jest": {
     "testMatch": [
@@ -137,12 +151,21 @@
     ],
     "collectCoverageFrom": [
       "lib/**/*.js",
-      "!lib/routes/**/*.js"
+      "!lib/routes/**/*.js",
+      "!lib/v2/**/*.js",
+      "!lib/radar-rules.js",
+      "!lib/router.js"
     ],
     "bail": true,
     "testEnvironment": "node",
     "moduleNameMapper": {
       "@/(.*)": "<rootDir>/lib/$1"
     }
+  },
+  "nodemonConfig": {
+    "ext": "art,js,mjs,json"
+  },
+  "engines": {
+    "node": ">=14"
   }
 }

package/lib/middleware/cache.js

@@ -1,180 +0,0 @@
-const Redis = require('ioredis');
-const Lru = require('lru-cache');
-const md5 = require('@/utils/md5');
-const config = require('@/config').value;
-const logger = require('@/utils/logger');
-
-module.exports = function (app) {
-    let available = false;
-    const globalCache = {
-        get: null,
-        set: null,
-    };
-
-    if (config.cache.type === 'redis') {
-        const redisClient = new Redis(config.redis.url);
-
-        redisClient.on('error', (error) => {
-            available = false;
-            logger.error('Redis error: ', error);
-        });
-        redisClient.on('end', () => {
-            available = false;
-        });
-        redisClient.on('connect', () => {
-            available = true;
-            logger.info('Redis connected.');
-        });
-
-        app.context.cache = {
-            get: async (key, refresh = true) => {
-                if (key && available) {
-                    let value = await redisClient.get(key);
-                    if (value && refresh) {
-                        redisClient.expire(key, config.cache.contentExpire);
-                        value = value + '';
-                    }
-                    return value;
-                }
-            },
-            set: function (key, value, maxAge = config.cache.contentExpire) {
-                if (!available) {
-                    return;
-                }
-                if (!value || value === 'undefined') {
-                    value = '';
-                }
-                if (typeof value === 'object') {
-                    value = JSON.stringify(value);
-                }
-                if (key) {
-                    redisClient.set(key, value, 'NX', 'EX', maxAge);
-                }
-            },
-            client: redisClient,
-            globalCache: globalCache,
-        };
-        globalCache.get = async (key) => {
-            if (key && available) {
-                const value = await redisClient.get(key);
-                return value;
-            }
-        };
-        globalCache.set = app.context.cache.set;
-    } else if (config.cache.type === 'memory') {
-        const pageCache = new Lru({
-            maxAge: config.cache.routeExpire * 1000,
-            max: Infinity,
-        });
-
-        const routeCache = new Lru({
-            maxAge: config.cache.routeExpire * 1000,
-            max: Infinity,
-            updateAgeOnGet: true,
-        });
-
-        app.context.cache = {
-            get: (key, refresh = true) => {
-                if (key && available) {
-                    let value = (refresh ? routeCache : pageCache).get(key);
-                    if (value) {
-                        value = value + '';
-                    }
-                    return value;
-                }
-            },
-            set: (key, value, maxAge = config.cache.contentExpire, refresh = true) => {
-                if (!value || value === 'undefined') {
-                    value = '';
-                }
-                if (typeof value === 'object') {
-                    value = JSON.stringify(value);
-                }
-                if (key && available) {
-                    return (refresh ? routeCache : pageCache).set(key, value, maxAge * 1000);
-                }
-            },
-            client: [pageCache, routeCache],
-            globalCache: globalCache,
-        };
-        globalCache.get = (key) => {
-            if (key && available) {
-                return pageCache.get(key);
-            }
-        };
-        globalCache.set = (key, value, maxAge) => {
-            if (!value || value === 'undefined') {
-                value = '';
-            }
-            if (typeof value === 'object') {
-                value = JSON.stringify(value);
-            }
-            if (key) {
-                return pageCache.set(key, value, maxAge * 1000);
-            }
-        };
-        available = true;
-    } else {
-        app.context.cache = {
-            get: () => null,
-            set: () => null,
-        };
-    }
-
-    app.context.cache.tryGet = async function (key, getValueFunc, maxAge = config.cache.contentExpire) {
-        let v = await this.get(key);
-        if (!v) {
-            v = await getValueFunc();
-            this.set(key, v, maxAge);
-        } else {
-            let parsed;
-            try {
-                parsed = JSON.parse(v);
-            } catch (e) {
-                parsed = null;
-            }
-            if (parsed) {
-                v = parsed;
-            }
-        }
-
-        return v;
-    };
-
-    return async function cache(ctx, next) {
-        const key = 'koa-redis-cache:' + md5(ctx.request.path);
-
-        if (!available) {
-            return await next();
-        }
-
-        try {
-            const value = await globalCache.get(key);
-
-            if (value) {
-                ctx.response.status = 200;
-                if (config.cache.type === 'redis') {
-                    ctx.response.set({
-                        'X-Koa-Redis-Cache': 'true',
-                    });
-                } else if (config.cache.type === 'memory') {
-                    ctx.response.set({
-                        'X-Koa-Memory-Cache': 'true',
-                    });
-                }
-                ctx.state.data = JSON.parse(value);
-                return;
-            }
-        } catch (e) {
-            //
-        }
-
-        await next();
-
-        if (ctx.response.get('Cache-Control') !== 'no-cache' && ctx.state && ctx.state.data) {
-            ctx.state.data.lastBuildDate = new Date().toUTCString();
-            const body = JSON.stringify(ctx.state.data);
-            await globalCache.set(key, body, config.cache.routeExpire);
-        }
-    };
-};

package/lib/routes/12306/zxdt.js

@@ -1,67 +0,0 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const url = require('url');
-
-module.exports = async (ctx) => {
-    const id = ctx.params.id || -1;
-
-    let link;
-    if (id === -1) {
-        link = 'https://www.12306.cn/mormhweb/zxdt/index_zxdt.html';
-    } else {
-        link = `https://www.12306.cn/mormhweb/1/${id}/index_fl.html`;
-    }
-
-    const response = await got.get(link);
-    const data = response.data;
-    const $ = cheerio.load(data);
-    const name = $('div.nav_center > a:nth-child(4)').text();
-
-    const list = $('#newList > ul > li')
-        .map(function () {
-            const info = {
-                title: $(this).find('a').text(),
-                link: $(this).find('a').attr('href'),
-                date: $(this).find('span').text().slice(1, -1),
-            };
-            return info;
-        })
-        .get();
-
-    const out = await Promise.all(
-        list.map(async (info) => {
-            const title = info.title;
-            const date = info.date;
-            const itemUrl = url.resolve(link, info.link);
-
-            const cache = await ctx.cache.get(itemUrl);
-            if (cache) {
-                return Promise.resolve(JSON.parse(cache));
-            }
-
-            const response = await got.get(itemUrl);
-            const $ = cheerio.load(response.data);
-            let description = $('.article-box').html();
-            if (description) {
-                description = description.replace(/src="/g, `src="${url.resolve(itemUrl, '.')}`).trim();
-            } else {
-                description = $('.content_text').html() || '文章已被删除';
-            }
-
-            const single = {
-                title: title,
-                link: itemUrl,
-                description: description,
-                pubDate: new Date(date).toUTCString(),
-            };
-            ctx.cache.set(itemUrl, JSON.stringify(single));
-            return Promise.resolve(single);
-        })
-    );
-
-    ctx.state.data = {
-        title: `${name}最新动态`,
-        link: link,
-        item: out,
-    };
-};