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

package/README.md

@@ -38,7 +38,7 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以
 
 ### Sponsors
 
-[Sayori Studio](https://t.me/SayoriStudio) . [Sion Kazama](https://blog.sion.moe) . [琚致远](https://wineso.me/) . [Rolly RSS 阅读器](https://www.coolapk.com/apk/239500) . [mokeyjay](https://www.mokeyjay.com/) . [萌开源联盟](https://www.moeunion.com) . [hooke007](https://github.com/hooke007/MPV_lazy) . [feeds.pub](https://feeds.pub)
+[Sayori Studio](https://t.me/SayoriStudio) . [Sion Kazama](https://blog.sion.moe) . [琚致远](https://wineso.me/) . [Rolly RSS 阅读器](https://www.coolapk.com/apk/239500) . [mokeyjay](https://www.mokeyjay.com/) . [萌开源联盟](https://www.moeunion.com) . [hooke007](https://github.com/hooke007/MPV_lazy) . [feeds.pub](https://feeds.pub) . [KINGX@安全引擎](http://cve.today/)
 
 [![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/en/support/)
 

package/lib/config.js

@@ -1,4 +1,5 @@
 require('dotenv').config();
+const randUserAgent = require('@/utils/rand-user-agent');
 let envs = process.env;
 let value;
 
@@ -39,7 +40,7 @@ const calculateValue = () => {
         listenInaddrAny: envs.LISTEN_INADDR_ANY || 1, // 是否允许公网连接，取值 0 1
         requestRetry: parseInt(envs.REQUEST_RETRY) || 2, // 请求失败重试次数
         requestTimeout: parseInt(envs.REQUEST_TIMEOUT) || 30000, // Milliseconds to wait for the server to end the response before aborting the request
-        ua: envs.UA || 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36',
+        ua: envs.UA || randUserAgent({ browser: 'chrome', os: 'mac os', device: 'desktop' }),
         // cors request
         allowOrigin: envs.ALLOW_ORIGIN,
         // cache
@@ -127,6 +128,7 @@ const calculateValue = () => {
             ipb_pass_hash: envs.EH_IPB_PASS_HASH,
             sk: envs.EH_SK,
             igneous: envs.EH_IGNEOUS,
+            img_proxy: envs.EH_IMG_PROXY,
         },
         email: {
             config: email_config,

package/lib/radar-rules.js

@@ -1238,71 +1238,6 @@ module.exports = {
             },
         ],
     },
-    'zju.edu.cn': {
-        _name: '浙江大学',
-        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',
-            },
-        ],
-    },
     'kuaidi100.com': {
         _name: '快递100',
         '.': [
@@ -2226,33 +2161,6 @@ module.exports = {
             },
         ],
     },
-    'eagle.cool': {
-        _name: 'Eagle',
-        cn: [
-            {
-                title: '更新日志',
-                docs: 'https://docs.rsshub.app/program-update.html#eagle',
-                source: '/changelog',
-                target: '/eagle/changelog/cn',
-            },
-        ],
-        tw: [
-            {
-                title: '更新日誌',
-                docs: 'https://docs.rsshub.app/program-update.html#eagle',
-                source: '/changelog',
-                target: '/eagle/changelog/tw',
-            },
-        ],
-        en: [
-            {
-                title: 'Release Notes',
-                docs: 'https://docs.rsshub.app/program-update.html#eagle',
-                source: '/changelog',
-                target: '/eagle/changelog/en',
-            },
-        ],
-    },
     'furaffinity.net': {
         _name: 'Fur Affinity',
         www: [

package/lib/router.js

@@ -42,10 +42,10 @@ router.get('/bangumi/group/:id', lazyloadRouteHandler('./routes/bangumi/group/to
 router.get('/bangumi/subject/:id', lazyloadRouteHandler('./routes/bangumi/subject'));
 router.get('/bangumi/user/blog/:id', lazyloadRouteHandler('./routes/bangumi/user/blog'));
 
-// 報導者
-router.get('/twreporter/newest', lazyloadRouteHandler('./routes/twreporter/newest'));
-router.get('/twreporter/photography', lazyloadRouteHandler('./routes/twreporter/photography'));
-router.get('/twreporter/category/:cid', lazyloadRouteHandler('./routes/twreporter/category'));
+// 報導者 migrated to v2
+// router.get('/twreporter/newest', lazyloadRouteHandler('./routes/twreporter/newest'));
+// router.get('/twreporter/photography', lazyloadRouteHandler('./routes/twreporter/photography'));
+// router.get('/twreporter/category/:cid', lazyloadRouteHandler('./routes/twreporter/category'));
 
 // 微博
 router.get('/weibo/user/:uid/:routeParams?', lazyloadRouteHandler('./routes/weibo/user'));
@@ -133,8 +133,8 @@ router.get('/plainlaw/archives', lazyloadRouteHandler('./routes/plainlaw/archive
 // router.get('/jandan/:sub_model', lazyloadRouteHandler('./routes/jandan/pic'));
 
 // 喷嚏
-router.get('/dapenti/tugua', lazyloadRouteHandler('./routes/dapenti/tugua'));
-router.get('/dapenti/subject/:id', lazyloadRouteHandler('./routes/dapenti/subject'));
+// router.get('/dapenti/tugua', lazyloadRouteHandler('./routes/dapenti/tugua'));
+// router.get('/dapenti/subject/:id', lazyloadRouteHandler('./routes/dapenti/subject'));
 
 // Dockone
 router.get('/dockone/weekly', lazyloadRouteHandler('./routes/dockone/weekly'));
@@ -278,14 +278,13 @@ router.get('/tingshuitz/wuhan', lazyloadRouteHandler('./routes/tingshuitz/wuhan'
 router.get('/mihoyo/bh3/:type', lazyloadRouteHandler('./routes/mihoyo/bh3'));
 router.get('/mihoyo/bh2/:type', lazyloadRouteHandler('./routes/mihoyo/bh2'));
 
-// 新闻联播
-router.get('/cctv/xwlb', lazyloadRouteHandler('./routes/cctv/xwlb'));
-
+// 新闻联播 migrated to v2
+// router.get('/cctv/xwlb', lazyloadRouteHandler('./routes/cctv/xwlb'));
 // 央视新闻
-router.get('/cctv/lm/:id?', lazyloadRouteHandler('./routes/cctv/lm'));
-router.get('/cctv/:category', lazyloadRouteHandler('./routes/cctv/category'));
-router.get('/cctv/photo/jx', lazyloadRouteHandler('./routes/cctv/jx'));
-router.get('/cctv-special/:id?', lazyloadRouteHandler('./routes/cctv/special'));
+// router.get('/cctv/lm/:id?', lazyloadRouteHandler('./routes/cctv/lm'));
+// router.get('/cctv/:category', lazyloadRouteHandler('./routes/cctv/category'));
+// router.get('/cctv/photo/jx', lazyloadRouteHandler('./routes/cctv/jx'));
+// router.get('/cctv-special/:id?', lazyloadRouteHandler('./routes/cctv/special'));
 
 // 财新博客
 router.get('/caixin/blog/:column', lazyloadRouteHandler('./routes/caixin/blog'));
@@ -357,13 +356,13 @@ router.get('/namoc/media', lazyloadRouteHandler('./routes/namoc/media'));
 router.get('/namoc/exhibition', lazyloadRouteHandler('./routes/namoc/exhibition'));
 router.get('/namoc/specials', lazyloadRouteHandler('./routes/namoc/specials'));
 
-// 懂球帝
-router.get('/dongqiudi/daily', lazyloadRouteHandler('./routes/dongqiudi/daily'));
-router.get('/dongqiudi/result/:team', lazyloadRouteHandler('./routes/dongqiudi/result'));
-router.get('/dongqiudi/team_news/:team', lazyloadRouteHandler('./routes/dongqiudi/team_news'));
-router.get('/dongqiudi/player_news/:id', lazyloadRouteHandler('./routes/dongqiudi/player_news'));
-router.get('/dongqiudi/special/:id', lazyloadRouteHandler('./routes/dongqiudi/special'));
-router.get('/dongqiudi/top_news/:id?', lazyloadRouteHandler('./routes/dongqiudi/top_news'));
+// 懂球帝 migrated to v2
+// router.get('/dongqiudi/daily', lazyloadRouteHandler('./routes/dongqiudi/daily'));
+// router.get('/dongqiudi/result/:team', lazyloadRouteHandler('./routes/dongqiudi/result'));
+// router.get('/dongqiudi/team_news/:team', lazyloadRouteHandler('./routes/dongqiudi/team_news'));
+// router.get('/dongqiudi/player_news/:id', lazyloadRouteHandler('./routes/dongqiudi/player_news'));
+// router.get('/dongqiudi/special/:id', lazyloadRouteHandler('./routes/dongqiudi/special'));
+// router.get('/dongqiudi/top_news/:id?', lazyloadRouteHandler('./routes/dongqiudi/top_news'));
 
 // 维基百科 Wikipedia
 router.get('/wikipedia/mainland', lazyloadRouteHandler('./routes/wikipedia/mainland'));
@@ -377,15 +376,15 @@ router.get('/egsea/flash', lazyloadRouteHandler('./routes/egsea/flash'));
 // 选股宝
 router.get('/xuangubao/subject/:subject_id', lazyloadRouteHandler('./routes/xuangubao/subject'));
 
-// 雪球
-router.get('/xueqiu/user/:id/:type?', lazyloadRouteHandler('./routes/xueqiu/user'));
-router.get('/xueqiu/favorite/:id', lazyloadRouteHandler('./routes/xueqiu/favorite'));
-router.get('/xueqiu/user_stock/:id', lazyloadRouteHandler('./routes/xueqiu/user_stock'));
-router.get('/xueqiu/fund/:id', lazyloadRouteHandler('./routes/xueqiu/fund'));
-router.get('/xueqiu/stock_info/:id/:type?', lazyloadRouteHandler('./routes/xueqiu/stock_info'));
-router.get('/xueqiu/snb/:id', lazyloadRouteHandler('./routes/xueqiu/snb'));
-router.get('/xueqiu/hots', lazyloadRouteHandler('./routes/xueqiu/hots'));
-router.get('/xueqiu/stock_comments/:id/:titleLength?', lazyloadRouteHandler('./routes/xueqiu/stock_comments'));
+// 雪球 migrated to v2
+// router.get('/xueqiu/user/:id/:type?', lazyloadRouteHandler('./routes/xueqiu/user'));
+// router.get('/xueqiu/favorite/:id', lazyloadRouteHandler('./routes/xueqiu/favorite'));
+// router.get('/xueqiu/user_stock/:id', lazyloadRouteHandler('./routes/xueqiu/user_stock'));
+// router.get('/xueqiu/fund/:id', lazyloadRouteHandler('./routes/xueqiu/fund'));
+// router.get('/xueqiu/stock_info/:id/:type?', lazyloadRouteHandler('./routes/xueqiu/stock_info'));
+// router.get('/xueqiu/snb/:id', lazyloadRouteHandler('./routes/xueqiu/snb'));
+// router.get('/xueqiu/hots', lazyloadRouteHandler('./routes/xueqiu/hots'));
+// router.get('/xueqiu/stock_comments/:id/:titleLength?', lazyloadRouteHandler('./routes/xueqiu/stock_comments'));
 
 // Greasy Fork
 router.get('/greasyfork/:language/:domain?', lazyloadRouteHandler('./routes/greasyfork/scripts'));
@@ -422,20 +421,18 @@ router.get('/tucaoqq/post/:project/:key', lazyloadRouteHandler('./routes/tencent
 // Bugly SDK
 router.get('/bugly/changelog/:platform', lazyloadRouteHandler('./routes/tencent/bugly/changelog'));
 
-// wechat
-router.get('/wechat/wemp/:id', lazyloadRouteHandler('./routes/tencent/wechat/wemp'));
-router.get('/wechat/csm/:id', lazyloadRouteHandler('./routes/tencent/wechat/csm'));
-router.get('/wechat/ce/:id', lazyloadRouteHandler('./routes/tencent/wechat/ce'));
-router.get('/wechat/announce', lazyloadRouteHandler('./routes/tencent/wechat/announce'));
+// wechat migrated to v2
+// router.get('/wechat/wemp/:id', lazyloadRouteHandler('./routes/tencent/wechat/wemp'));
+// router.get('/wechat/ce/:id', lazyloadRouteHandler('./routes/tencent/wechat/ce'));
+// router.get('/wechat/announce', lazyloadRouteHandler('./routes/tencent/wechat/announce'));
 router.get('/wechat/miniprogram/plugins', lazyloadRouteHandler('./routes/tencent/wechat/miniprogram/plugins'));
-router.get('/wechat/tgchannel/:id/:mpName?/:searchQueryType?', lazyloadRouteHandler('./routes/tencent/wechat/tgchannel'));
-router.get('/wechat/uread/:userid', lazyloadRouteHandler('./routes/tencent/wechat/uread'));
-router.get('/wechat/ershicimi/:id', lazyloadRouteHandler('./routes/tencent/wechat/ershcimi'));
-router.get('/wechat/wjdn/:id', lazyloadRouteHandler('./routes/tencent/wechat/wjdn'));
-router.get('/wechat/wxnmh/:id', lazyloadRouteHandler('./routes/tencent/wechat/wxnmh'));
-router.get('/wechat/mp/homepage/:biz/:hid/:cid?', lazyloadRouteHandler('./routes/tencent/wechat/mp'));
-router.get('/wechat/mp/msgalbum/:biz/:aid', lazyloadRouteHandler('./routes/tencent/wechat/msgalbum'));
-router.get('/wechat/feeds/:id', lazyloadRouteHandler('./routes/tencent/wechat/feeds'));
+// router.get('/wechat/tgchannel/:id/:mpName?/:searchQueryType?', lazyloadRouteHandler('./routes/tencent/wechat/tgchannel'));
+// router.get('/wechat/uread/:userid', lazyloadRouteHandler('./routes/tencent/wechat/uread'));
+// router.get('/wechat/ershicimi/:id', lazyloadRouteHandler('./routes/tencent/wechat/ershcimi'));
+// router.get('/wechat/wxnmh/:id', lazyloadRouteHandler('./routes/tencent/wechat/wxnmh'));
+// router.get('/wechat/mp/homepage/:biz/:hid/:cid?', lazyloadRouteHandler('./routes/tencent/wechat/mp'));
+// router.get('/wechat/mp/msgalbum/:biz/:aid', lazyloadRouteHandler('./routes/tencent/wechat/msgalbum'));
+// router.get('/wechat/feeds/:id', lazyloadRouteHandler('./routes/tencent/wechat/feeds'));
 
 // All the Flight Deals
 router.get('/atfd/:locations/:nearby?', lazyloadRouteHandler('./routes/atfd/index'));
@@ -510,7 +507,7 @@ router.get('/dpu/jiaowu/news/:type?', lazyloadRouteHandler('./routes/universitie
 router.get('/dpu/wlfw/news/:type?', lazyloadRouteHandler('./routes/universities/dpu/wlfw/news'));
 
 // 大连理工大学
-router.get('/dut/:subsite/:type', lazyloadRouteHandler('./routes/universities/dut/index'));
+// router.get('/dut/:subsite/:type', lazyloadRouteHandler('./routes/universities/dut/index'));
 
 // 东南大学
 router.get('/seu/radio/academic', lazyloadRouteHandler('./routes/universities/seu/radio/academic'));
@@ -716,12 +713,12 @@ router.get('/jgsu/jwc', lazyloadRouteHandler('./routes/universities/jgsu/jwc'));
 // 中南大学
 router.get('/csu/job/:type?', lazyloadRouteHandler('./routes/universities/csu/job'));
 
-// 山东大学
-router.get('/sdu/sc/:type?', lazyloadRouteHandler('./routes/universities/sdu/sc'));
-router.get('/sdu/cs/:type?', lazyloadRouteHandler('./routes/universities/sdu/cs'));
-router.get('/sdu/cmse/:type?', lazyloadRouteHandler('./routes/universities/sdu/cmse'));
-router.get('/sdu/mech/:type?', lazyloadRouteHandler('./routes/universities/sdu/mech'));
-router.get('/sdu/epe/:type?', lazyloadRouteHandler('./routes/universities/sdu/epe'));
+// 山东大学 migrated to v2
+// router.get('/sdu/sc/:type?', lazyloadRouteHandler('./routes/universities/sdu/sc'));
+// router.get('/sdu/cs/:type?', lazyloadRouteHandler('./routes/universities/sdu/cs'));
+// router.get('/sdu/cmse/:type?', lazyloadRouteHandler('./routes/universities/sdu/cmse'));
+// router.get('/sdu/mech/:type?', lazyloadRouteHandler('./routes/universities/sdu/mech'));
+// router.get('/sdu/epe/:type?', lazyloadRouteHandler('./routes/universities/sdu/epe'));
 
 // 中国海洋大学
 router.get('/ouc/it/:type?', lazyloadRouteHandler('./routes/universities/ouc/it'));
@@ -813,8 +810,8 @@ router.get('/xmu/aero/:type', lazyloadRouteHandler('./routes/universities/xmu/ae
 router.get('/ifanr/:channel?', lazyloadRouteHandler('./routes/ifanr/index'));
 
 // 果壳网
-router.get('/guokr/scientific', lazyloadRouteHandler('./routes/guokr/scientific'));
-router.get('/guokr/:channel', lazyloadRouteHandler('./routes/guokr/calendar'));
+// router.get('/guokr/scientific', lazyloadRouteHandler('./routes/guokr/scientific'));
+// router.get('/guokr/:channel', lazyloadRouteHandler('./routes/guokr/calendar'));
 
 // 联合早报 已经迁移至v2模板
 // router.get('/zaobao/realtime/:section?', require('./routes/zaobao/realtime'));
@@ -1456,8 +1453,8 @@ router.get('/gamersky/news', lazyloadRouteHandler('./routes/gamersky/news'));
 router.get('/gamersky/ent/:category', lazyloadRouteHandler('./routes/gamersky/ent'));
 
 // 游研社
-router.get('/yystv/category/:category', lazyloadRouteHandler('./routes/yystv/category'));
-router.get('/yystv/docs', lazyloadRouteHandler('./routes/yystv/docs'));
+// router.get('/yystv/category/:category', lazyloadRouteHandler('./routes/yystv/category'));
+// router.get('/yystv/docs', lazyloadRouteHandler('./routes/yystv/docs'));
 
 // konami
 router.get('/konami/pesmobile/:lang?/:os?', lazyloadRouteHandler('./routes/konami/pesmobile'));
@@ -1470,13 +1467,13 @@ router.get('/psnine/game', lazyloadRouteHandler('./routes/psnine/game'));
 router.get('/psnine/news/:order?', lazyloadRouteHandler('./routes/psnine/news'));
 router.get('/psnine/node/:id?/:order?', lazyloadRouteHandler('./routes/psnine/node'));
 
-// 浙江大学
-router.get('/zju/list/:type', lazyloadRouteHandler('./routes/universities/zju/list'));
-router.get('/zju/physics/:type', lazyloadRouteHandler('./routes/universities/zju/physics'));
-router.get('/zju/grs/:type', lazyloadRouteHandler('./routes/universities/zju/grs'));
-router.get('/zju/career/:type', lazyloadRouteHandler('./routes/universities/zju/career'));
-router.get('/zju/cst/:type', lazyloadRouteHandler('./routes/universities/zju/cst'));
-router.get('/zju/cst/custom/:id', lazyloadRouteHandler('./routes/universities/zju/cst/custom'));
+// 浙江大学 migrated to v2
+// router.get('/zju/list/:type', lazyloadRouteHandler('./routes/universities/zju/list'));
+// router.get('/zju/physics/:type', lazyloadRouteHandler('./routes/universities/zju/physics'));
+// router.get('/zju/grs/:type', lazyloadRouteHandler('./routes/universities/zju/grs'));
+// router.get('/zju/career/:type', lazyloadRouteHandler('./routes/universities/zju/career'));
+// router.get('/zju/cst/:type', lazyloadRouteHandler('./routes/universities/zju/cst'));
+// router.get('/zju/cst/custom/:id', lazyloadRouteHandler('./routes/universities/zju/cst/custom'));
 
 // 浙江大学城市学院
 router.get('/zucc/news/latest', lazyloadRouteHandler('./routes/universities/zucc/news'));
@@ -2114,10 +2111,10 @@ router.get('/pgyer/:app?', lazyloadRouteHandler('./routes/pgyer/app'));
 // 微博个人时间线
 router.get('/weibo/timeline/:uid/:feature?/:routeParams?', lazyloadRouteHandler('./routes/weibo/timeline'));
 
-// TAPTAP
-router.get('/taptap/topic/:id/:label?', lazyloadRouteHandler('./routes/taptap/topic'));
-router.get('/taptap/changelog/:id', lazyloadRouteHandler('./routes/taptap/changelog'));
-router.get('/taptap/review/:id/:order?', lazyloadRouteHandler('./routes/taptap/review'));
+// TAPTAP migrated to v2
+// router.get('/taptap/topic/:id/:label?', lazyloadRouteHandler('./routes/taptap/topic'));
+// router.get('/taptap/changelog/:id', lazyloadRouteHandler('./routes/taptap/changelog'));
+// router.get('/taptap/review/:id/:order?/:lang?', lazyloadRouteHandler('./routes/taptap/review'));
 
 // lofter migrated to v2
 // router.get('/lofter/tag/:name?/:type?', lazyloadRouteHandler('./routes/lofter/tag'));
@@ -3460,7 +3457,7 @@ router.get('/blizzard/news/:language?/:category?', lazyloadRouteHandler('./route
 router.get('/deepmind/blog/:category?', lazyloadRouteHandler('./routes/deepmind/blog'));
 
 // 东西智库
-router.get('/dx2025/:type?/:category?', lazyloadRouteHandler('./routes/dx2025/index'));
+// router.get('/dx2025/:type?/:category?', lazyloadRouteHandler('./routes/dx2025/index'));
 
 // DeepL
 router.get('/deepl/blog/:lang?', lazyloadRouteHandler('./routes/deepl/blog'));
@@ -3655,7 +3652,7 @@ router.get('/yicas/blog', lazyloadRouteHandler('./routes/yicas/blog'));
 router.get('/93/:category?', lazyloadRouteHandler('./routes/93/index'));
 
 // 科学网
-router.get('/sciencenet/blog/:type?/:time?/:sort?', lazyloadRouteHandler('./routes/sciencenet/blog'));
+// router.get('/sciencenet/blog/:type?/:time?/:sort?', lazyloadRouteHandler('./routes/sciencenet/blog'));
 
 // DailyArt
 router.get('/dailyart/:language?', lazyloadRouteHandler('./routes/dailyart/index'));
@@ -3878,7 +3875,7 @@ router.get('/ccg/:category?', lazyloadRouteHandler('./routes/ccg/index'));
 // router.get('/gf-cn/news/:category?', lazyloadRouteHandler('./routes/gf-cn/news'));
 
 // Eagle
-router.get('/eagle/changelog/:language?', lazyloadRouteHandler('./routes/eagle/changelog'));
+// router.get('/eagle/changelog/:language?', lazyloadRouteHandler('./routes/eagle/changelog'));
 
 // ezone.hk
 // router.get('/ezone/:category?', lazyloadRouteHandler('./routes/ezone/index'));
@@ -3940,10 +3937,10 @@ router.get('/tongli/news/:type', lazyloadRouteHandler('./routes/tongli/news'));
 // OR
 router.get('/or/:id?', lazyloadRouteHandler('./routes/or'));
 
-// e-hentai
-router.get('/ehentai/favorites/:favcat?/:order?/:page?/:bittorrent?', lazyloadRouteHandler('./routes/ehentai/favorites'));
-router.get('/ehentai/search/:params?/:page?/:bittorrent?', lazyloadRouteHandler('./routes/ehentai/search'));
-router.get('/ehentai/tag/:tag/:page?/:bittorrent?', lazyloadRouteHandler('./routes/ehentai/tag'));
+// e-hentai migrated to v2
+// router.get('/ehentai/favorites/:favcat?/:order?/:page?/:routeParams?', lazyloadRouteHandler('./routes/ehentai/favorites'));
+// router.get('/ehentai/search/:params?/:page?/:routeParams?', lazyloadRouteHandler('./routes/ehentai/search'));
+// router.get('/ehentai/tag/:tag/:page?/:routeParams?', lazyloadRouteHandler('./routes/ehentai/tag'));
 
 // 字型故事
 router.get('/fontstory', lazyloadRouteHandler('./routes/fontstory/tw'));

package/lib/routes/tencent/wechat/miniprogram/framework.js

@@ -1,5 +1,7 @@
 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 link = `https://developers.weixin.qq.com/miniprogram/dev/framework/release/`;
@@ -16,14 +18,14 @@ module.exports = async (ctx) => {
     ctx.state.data = {
         title: name,
         link,
-        item: $('#docContent .content h3')
+        item: $('#docContent .content h2')
             .map((_, item) => {
                 item = $(item);
                 const title = item.text().replace(/[\s|#]/g, '');
                 return {
                     title,
                     description: item.next().html(),
-                    pubDate: new Date(new RegExp(/\d{4}-\d{2}-\d{2}/).exec(title) + ' GMT+8').toUTCString(),
+                    pubDate: timezone(parseDate(new RegExp(/\d{4}-\d{2}-\d{2}/).exec(title)), +8),
                     link: link + item.find('a.header-anchor').attr('href'),
                 };
             })

package/lib/utils/common-config.js

@@ -3,6 +3,10 @@ const got = require('@/utils/got');
 const iconv = require('iconv-lite');
 // eslint-disable-next-line no-unused-vars
 const date = require('@/utils/date');
+// eslint-disable-next-line no-unused-vars
+const { parseDate } = require('@/utils/parse-date');
+// eslint-disable-next-line no-unused-vars
+const timezone = require('@/utils/timezone');
 
 function transElemText($, prop) {
     const regex = new RegExp(/\$\((.*)\)/g);

package/lib/utils/parse-date.js

@@ -1,6 +1,7 @@
 const dayjs = require('dayjs');
 dayjs.extend(require('dayjs/plugin/customParseFormat'));
 dayjs.extend(require('dayjs/plugin/duration'));
+dayjs.extend(require('dayjs/plugin/isSameOrBefore'));
 dayjs.extend(require('dayjs/plugin/weekday'));
 
 const words = [
@@ -17,31 +18,31 @@ const words = [
         regExp: /^(?:前天|(?:the)?d(?:ay)?b(?:eforeyesterda)?y)(.*)/,
     },
     {
-        startAt: dayjs().isBefore(dayjs().weekday(1)) ? dayjs().weekday(1).subtract(1, 'week') : dayjs().weekday(1),
+        startAt: dayjs().isSameOrBefore(dayjs().weekday(1)) ? dayjs().weekday(1).subtract(1, 'week') : dayjs().weekday(1),
         regExp: /^(?:周|星期)一(.*)/,
     },
     {
-        startAt: dayjs().isBefore(dayjs().weekday(2)) ? dayjs().weekday(2).subtract(1, 'week') : dayjs().weekday(2),
+        startAt: dayjs().isSameOrBefore(dayjs().weekday(2)) ? dayjs().weekday(2).subtract(1, 'week') : dayjs().weekday(2),
         regExp: /^(?:周|星期)二(.*)/,
     },
     {
-        startAt: dayjs().isBefore(dayjs().weekday(3)) ? dayjs().weekday(3).subtract(1, 'week') : dayjs().weekday(3),
+        startAt: dayjs().isSameOrBefore(dayjs().weekday(3)) ? dayjs().weekday(3).subtract(1, 'week') : dayjs().weekday(3),
         regExp: /^(?:周|星期)三(.*)/,
     },
     {
-        startAt: dayjs().isBefore(dayjs().weekday(4)) ? dayjs().weekday(4).subtract(1, 'week') : dayjs().weekday(4),
+        startAt: dayjs().isSameOrBefore(dayjs().weekday(4)) ? dayjs().weekday(4).subtract(1, 'week') : dayjs().weekday(4),
         regExp: /^(?:周|星期)四(.*)/,
     },
     {
-        startAt: dayjs().isBefore(dayjs().weekday(5)) ? dayjs().weekday(5).subtract(1, 'week') : dayjs().weekday(5),
+        startAt: dayjs().isSameOrBefore(dayjs().weekday(5)) ? dayjs().weekday(5).subtract(1, 'week') : dayjs().weekday(5),
         regExp: /^(?:周|星期)五(.*)/,
     },
     {
-        startAt: dayjs().isBefore(dayjs().weekday(6)) ? dayjs().weekday(6).subtract(1, 'week') : dayjs().weekday(6),
+        startAt: dayjs().isSameOrBefore(dayjs().weekday(6)) ? dayjs().weekday(6).subtract(1, 'week') : dayjs().weekday(6),
         regExp: /^(?:周|星期)六(.*)/,
     },
     {
-        startAt: dayjs().isBefore(dayjs().weekday(7)) ? dayjs().weekday(7).subtract(1, 'week') : dayjs().weekday(7),
+        startAt: dayjs().isSameOrBefore(dayjs().weekday(7)) ? dayjs().weekday(7).subtract(1, 'week') : dayjs().weekday(7),
         regExp: /^(?:周|星期)(?:日|天)(.*)/,
     },
     {

package/lib/utils/rand-user-agent.js

@@ -0,0 +1,29 @@
+const randUserAgent = require('rand-user-agent');
+
+/**
+ * A handy function to help generate a legit useragent.
+ *
+ * @param {Object} randUserAgent
+ * @param {string} randUserAgent.browser Name of a browser, case-insensitive. `chrome`, `edge`, `firefox`, `mobile safari`(ios only) or `safari`.
+ * @param {string} randUserAgent.os Name of an OS, case-insensitive. `android`, `ios`, `mac os`, `linux` or `windows`.
+ * @param {string} randUserAgent.device Name of a device, case-insensitive. `desktop`, `mobile` or `tablet`.
+ * @returns A random useragent for the given specifications.
+ */
+module.exports = ({ browser = 'chrome', os = 'mac os', device = 'desktop' }) => {
+    device = device.toLowerCase();
+    browser = browser.toLowerCase();
+    os = os.toLowerCase();
+    let UA = randUserAgent(device, browser, os);
+
+    if (browser === 'chrome') {
+        while (UA.includes('Chrome-Lighthouse') || UA.includes('Gener8') || UA.includes('HeadlessChrome') || UA.includes('SMTBot')) {
+            UA = randUserAgent(device, browser, os);
+        }
+    }
+    if (browser === 'safari') {
+        while (UA.includes('Applebot')) {
+            UA = randUserAgent(device, browser, os);
+        }
+    }
+    return UA;
+};

package/lib/utils/request-wrapper.js

@@ -14,7 +14,7 @@ if (config.proxyUri && typeof config.proxyUri === 'string') {
         HttpsProxyAgent = HttpsProxyAgent || require('https-proxy-agent');
         proxy = new HttpsProxyAgent(config.proxyUri);
     } else if (config.proxyUri.startsWith('socks')) {
-        SocksProxyAgent = SocksProxyAgent || require('socks-proxy-agent');
+        SocksProxyAgent = SocksProxyAgent || require('socks-proxy-agent').SocksProxyAgent;
         proxy = new SocksProxyAgent(config.proxyUri);
     } else {
         throw 'Unknown proxy-uri format';
@@ -30,7 +30,7 @@ if (config.proxyUri && typeof config.proxyUri === 'string') {
 
     switch (config.proxy.protocol) {
         case 'socks':
-            SocksProxyAgent = SocksProxyAgent || require('socks-proxy-agent');
+            SocksProxyAgent = SocksProxyAgent || require('socks-proxy-agent').SocksProxyAgent;
             agent.http = new SocksProxyAgent(proxyUrl);
             agent.https = new SocksProxyAgent(proxyUrl);
             break;
@@ -102,9 +102,6 @@ const requestWrapper = (url, options) => {
         options.headers['user-agent'] = config.ua;
     }
 
-    // server
-    options.headers.server = 'RSSHub';
-
     try {
         const urlHandler = new URL(url);
         // referer