rsshub 1.0.0-master.fed0404 → 1.0.0-master.ff97759

package/README.md

@@ -5,17 +5,18 @@
 
 > 🍰 Everything is RSSible
 
-[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?style=flat-square)](https://t.me/rsshub)
-[![build status](https://img.shields.io/travis/DIYgod/RSSHub/master.svg?style=flat-square)](https://travis-ci.org/DIYgod/RSSHub)
-[![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square)](https://codecov.io/github/DIYgod/RSSHub?branch=master)
+[![telegram](https://img.shields.io/badge/chat-telegram-brightgreen.svg?logo=telegram&style=flat-square)](https://t.me/rsshub)
+[![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub)
+[![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub)
+[![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster)
 
 ## Introduction
 
-RSSHub is an open source, easy to use, and extensible RSS feed aggregator, it's capable of generating RSS feeds from pretty much everything.
+RSSHub is an open source, easy to use, and extensible RSS feed generator. It's capable of generating RSS feeds from pretty much everything.
 
 RSSHub delivers millions of contents aggregated from all kinds of sources, our vibrant open source community is ensuring the deliver of RSSHub's new routes, new features and bug fixes.
 
-RSSHub can be used with browser extension [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar)
+RSSHub can be used with browser extension [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar) and mobile auxiliary app [RSSBud](https://github.com/Cay-Zhang/RSSBud) (iOS) and [RSSAid](https://github.com/LeetaoGoooo/RSSAid) (Android)
 
 [English docs](https://docs.rsshub.app/en) | [Telegram Group](https://t.me/rsshub) | [Telegram Channel](https://t.me/awesomeRSSHub)
 
@@ -23,7 +24,7 @@ RSSHub can be used with browser extension [RSSHub Radar](https://github.com/DIYg
 
 RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以给任何奇奇怪怪的内容生成 RSS 订阅源。RSSHub 借助于开源社区的力量快速发展中，目前已适配数百家网站的上千项内容
 
-可以配合浏览器扩展 [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar) 食用
+可以配合浏览器扩展 [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar) 和 移动端辅助 App [RSSBud](https://github.com/Cay-Zhang/RSSBud) (iOS) 与 [RSSAid](https://github.com/LeetaoGoooo/RSSAid) (Android) 食用
 
 [中文文档](https://docs.rsshub.app) | [Telegram 群](https://t.me/rsshub) | [Telegram 频道](https://t.me/awesomeRSSHub)
 
@@ -32,12 +33,12 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以
 ### Special Sponsors
 
 <div>
-<a href="https://rixcloud.app/rsshub" target="_blank"><img height="60px" src="https://i.imgur.com/TrgP3S1.png"></a>
+<a href="https://rss3.io/" target="_blank"><img height="60px" src="https://i.imgur.com/v7TF0jp.jpg"></a>
 </div>
 
 ### Sponsors
 
-[Sayori Studio](https://t.me/SayoriStudio) . [Sion Kazama](https://blog.sion.moe) . [琚致远](https://www.shaoyaoju.org/) . [Rolly RSS 阅读器](https://www.coolapk.com/apk/239500) . [mokeyjay](https://www.mokeyjay.com/) . [tkaray](https://rayray.moe/) . [萌开源联盟](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/)
 
@@ -51,13 +52,19 @@ Logo designer [sheldonrrr](https://dribbble.com/sheldonrrr)
 
 <a href="https://www.cloudflare.com" target="_blank"><img height="50px" src="https://i.imgur.com/7Ph27Fq.png"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://www.netlify.com" target="_blank"><img height="40px" src="https://i.imgur.com/cU01915.png"></a>
 
+## Related Projects
+
+-   [RSSHub Radar](https://github.com/DIYgod/RSSHub-Radar) | 一个可以帮助你快速发现和订阅当前网站 RSS 和 RSSHub 的浏览器扩展
+-   [RSSBud](https://github.com/Cay-Zhang/RSSBud) ([TestFlight 公测](https://testflight.apple.com/join/rjCVzzHP)) | iOS 平台的 RSSHub Radar，专为移动生态优化
+-   [RSSAid](https://github.com/LeetaoGoooo/RSSAid)  | 基于 Flutter 构建的 Android 平台的 RSSHub Radar
+
 ## Join Us
 
 We welcome all pull requests. Suggestions and feedback are also welcomed [here](https://github.com/DIYgod/RSSHub/issues).
 
-Refer to [Join Us](https://docs.rsshub.app/en/joinus/)
+Refer to [Join Us](https://docs.rsshub.app/en/joinus/quick-start.html)
 
-见 [参与我们](https://docs.rsshub.app/joinus/)
+见 [参与我们](https://docs.rsshub.app/joinus/quick-start.html)
 
 ## Deployment
 
@@ -79,6 +86,7 @@ You can support RSSHub via donations.
 
 Recurring donors will be rewarded via express issue response, or even have your name displayed on our GitHub page and website.
 
+-   Become a Sponser on [GitHub](https://github.com/sponsors/DIYgod)
 -   Become a Sponser on [Patreon](https://www.patreon.com/DIYgod)
 -   Become a Sponser on [爱发电](https://afdian.net/@diygod)
 -   Contact us directly: i@diygod.me
@@ -87,8 +95,8 @@ Recurring donors will be rewarded via express issue response, or even have your
 
 We accept donations via the following ways:
 
--   [WeChat Pay](https://i.loli.net/2019/03/23/5c950ebbc373e.png)
--   [Alipay](https://i.loli.net/2019/03/23/5c950ebbc980e.png)
+-   [WeChat Pay](https://diygod.me/images/wx.jpg)
+-   [Alipay](https://diygod.me/images/zfb.jpg)
 -   [Paypal](https://www.paypal.me/DIYgod)
 
 ## Author

package/lib/api_router.js

@@ -1,15 +1,13 @@
 const Router = require('@koa/router');
 const router = new Router();
-const routes = require('./router');
+const maintainer = require('./maintainer');
 
 router.get('/routes/:name?', (ctx) => {
-    const allRoutes = Array.from(routes.stack);
-    allRoutes.shift();
     const result = {};
     let counter = 0;
 
-    allRoutes.forEach((i) => {
-        const path = i.path;
+    Object.keys(maintainer).forEach((i) => {
+        const path = i;
         const top = path.split('/')[1];
 
         if (!ctx.params.name || top === ctx.params.name) {

package/lib/app.js

@@ -16,8 +16,10 @@ const favicon = require('koa-favicon');
 const debug = require('./middleware/debug');
 const accessControl = require('./middleware/access-control');
 const antiHotlink = require('./middleware/anti-hotlink');
+const loadOnDemand = require('./middleware/load-on-demand');
 
 const router = require('./router');
+const core_router = require('./core_router');
 const protected_router = require('./protected_router');
 const mount = require('koa-mount');
 
@@ -48,7 +50,6 @@ app.context.debug = {
     etag: 0,
     paths: [],
     routes: [],
-    ips: [],
     errorPaths: [],
     errorRoutes: [],
 };
@@ -71,16 +72,21 @@ app.use(antiHotlink);
 // 3 filter content
 app.use(parameter);
 
+// No Cache routes
+app.use(mount('/', core_router.routes())).use(core_router.allowedMethods());
+// API router
+app.use(mount('/api', api_router.routes())).use(api_router.allowedMethods());
+
 // 2 cache
 app.use(cache(app));
 
+// 1 load on demand
+app.use(loadOnDemand(app));
+
 // router
 app.use(mount('/', router.routes())).use(router.allowedMethods());
 
 // routes the require authentication
 app.use(mount('/protected', protected_router.routes())).use(protected_router.allowedMethods());
 
-// API router
-app.use(mount('/api', api_router.routes())).use(api_router.allowedMethods());
-
 module.exports = app;

package/lib/config.js

@@ -1,4 +1,5 @@
 require('dotenv').config();
+const randUserAgent = require('@/utils/rand-user-agent');
 let envs = process.env;
 let value;
 
@@ -25,69 +26,38 @@ const calculateValue = () => {
     }
 
     value = {
+        // app config
+        disallowRobot: envs.DISALLOW_ROBOT !== '0' && envs.DISALLOW_ROBOT !== 'false',
+        enableCluster: envs.ENABLE_CLUSTER,
         isPackage: envs.IS_PACKAGE,
-        noLogfiles: envs.NO_LOGFILES,
+        nodeName: envs.NODE_NAME,
+        puppeteerWSEndpoint: envs.PUPPETEER_WS_ENDPOINT,
+        // network
         connect: {
             port: envs.PORT || 1200, // 监听端口
             socket: envs.SOCKET || null, // 监听 Unix Socket, null 为禁用
         },
+        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 || randUserAgent({ browser: 'chrome', os: 'mac os', device: 'desktop' }),
+        // cors request
+        allowOrigin: envs.ALLOW_ORIGIN,
+        // cache
         cache: {
             type: typeof envs.CACHE_TYPE === 'undefined' ? 'memory' : envs.CACHE_TYPE, // 缓存类型，支持 'memory' 和 'redis'，设为空可以禁止缓存
+            requestTimeout: parseInt(envs.CACHE_REQUEST_TIMEOUT) || 60,
             routeExpire: parseInt(envs.CACHE_EXPIRE) || 5 * 60, // 路由缓存时间，单位为秒
             contentExpire: parseInt(envs.CACHE_CONTENT_EXPIRE) || 1 * 60 * 60, // 不变内容缓存时间，单位为秒
         },
-        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',
-        listenInaddrAny: envs.LISTEN_INADDR_ANY || 1, // 是否允许公网连接，取值 0 1
-        requestRetry: parseInt(envs.REQUEST_RETRY) || 2, // 请求失败重试次数
-        // 是否显示 Debug 信息，取值 boolean 'false' 'key' ，取值为 'false' false 时永远不显示，取值为 'key' 时带上 ?debug=key 显示
-        debugInfo: envs.DEBUG_INFO || true,
-        disallowRobot: envs.DISALLOW_ROBOT !== '0' && envs.DISALLOW_ROBOT !== 'false',
-        titleLengthLimit: parseInt(envs.TITLE_LENGTH_LIMIT) || 150,
+        memory: {
+            max: parseInt(envs.MEMORY_MAX) || Math.pow(2, 8), // The maximum number of items that remain in the cache. This must be a positive finite intger.
+            // https://github.com/isaacs/node-lru-cache#options
+        },
         redis: {
             url: envs.REDIS_URL || 'redis://localhost:6379/',
-            options: {
-                // 支持这些参数 https://github.com/NodeRedis/node_redis#options-object-properties
-                password: envs.REDIS_PASSWORD || null,
-            },
-        },
-        nodeName: envs.NODE_NAME,
-        suffix: envs.SUFFIX,
-        pixiv: {
-            username: envs.PIXIV_USERNAME,
-            password: envs.PIXIV_PASSWORD,
-        },
-        fanbox: {
-            session: envs.FANBOX_SESSION_ID,
-        },
-        disqus: {
-            api_key: envs.DISQUS_API_KEY,
-        },
-        twitter: {
-            consumer_key: envs.TWITTER_CONSUMER_KEY,
-            consumer_secret: envs.TWITTER_CONSUMER_SECRET,
-            tokens: twitter_tokens,
-        },
-        youtube: {
-            key: envs.YOUTUBE_KEY,
-        },
-        telegram: {
-            token: envs.TELEGRAM_TOKEN,
-        },
-        github: {
-            access_token: envs.GITHUB_ACCESS_TOKEN,
-        },
-        authentication: {
-            name: envs.HTTP_BASIC_AUTH_NAME || 'usernam3',
-            pass: envs.HTTP_BASIC_AUTH_PASS || 'passw0rd',
         },
-        bilibili: {
-            cookies: bilibili_cookies,
-        },
-        yuque: {
-            token: envs.YUQUE_TOKEN,
-        },
-        puppeteerWSEndpoint: envs.PUPPETEER_WS_ENDPOINT,
-        loggerLevel: envs.LOGGER_LEVEL || 'info',
+        // proxy
         proxyUri: envs.PROXY_URI,
         proxy: {
             protocol: envs.PROXY_PROTOCOL,
@@ -96,22 +66,75 @@ const calculateValue = () => {
             auth: envs.PROXY_AUTH,
             url_regex: envs.PROXY_URL_REGEX || '.*',
         },
+        // auth
+        authentication: {
+            name: envs.HTTP_BASIC_AUTH_NAME || 'usernam3',
+            pass: envs.HTTP_BASIC_AUTH_PASS || 'passw0rd',
+        },
+        // access control
         blacklist: envs.BLACKLIST && envs.BLACKLIST.split(','),
         whitelist: envs.WHITELIST && envs.WHITELIST.split(','),
         allowLocalhost: envs.ALLOW_LOCALHOST,
         accessKey: envs.ACCESS_KEY,
-        enableCluster: envs.ENABLE_CLUSTER,
-        email: {
-            config: email_config,
+        // logging
+        // 是否显示 Debug 信息，取值 'true' 'false' 'some_string' ，取值为 'true' 时永久显示，取值为 'false' 时永远隐藏，取值为 'some_string' 时请求带上 '?debug=some_string' 显示
+        debugInfo: envs.DEBUG_INFO || 'true',
+        loggerLevel: envs.LOGGER_LEVEL || 'info',
+        noLogfiles: envs.NO_LOGFILES,
+        sentry: {
+            dsn: envs.SENTRY,
+            routeTimeout: parseInt(envs.SENTRY_ROUTE_TIMEOUT) || 30000,
+        },
+        // feed config
+        hotlink: {
+            template: envs.HOTLINK_TEMPLATE,
+        },
+        suffix: envs.SUFFIX,
+        titleLengthLimit: parseInt(envs.TITLE_LENGTH_LIMIT) || 150,
+
+        // Route-specific Configurations
+        bilibili: {
+            cookies: bilibili_cookies,
+        },
+        bitbucket: {
+            username: envs.BITBUCKET_USERNAME,
+            password: envs.BITBUCKET_PASSWORD,
+        },
+        btbyr: {
+            host: envs.BTBYR_HOST,
+            cookies: envs.BTBYR_COOKIE,
+        },
+        bupt: {
+            portal_cookie: envs.BUPT_PORTAL_COOKIE,
         },
-        sentry: envs.SENTRY,
         chuiniu: {
             member: envs.CHUINIU_MEMBER,
         },
-        weibo: {
-            app_key: envs.WEIBO_APP_KEY,
-            app_secret: envs.WEIBO_APP_SECRET,
-            redirect_url: envs.WEIBO_REDIRECT_URL,
+        dida365: {
+            username: envs.DIDA365_USERNAME,
+            password: envs.DIDA365_PASSWORD,
+        },
+        discuz: {
+            cookies: discuz_cookies,
+        },
+        disqus: {
+            api_key: envs.DISQUS_API_KEY,
+        },
+        douban: {
+            cookie: envs.DOUBAN_COOKIE,
+        },
+        ehentai: {
+            ipb_member_id: envs.EH_IPB_MEMBER_ID,
+            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,
+        },
+        fanbox: {
+            session: envs.FANBOX_SESSION_ID,
         },
         fanfou: {
             consumer_key: envs.FANFOU_CONSUMER_KEY,
@@ -119,49 +142,116 @@ const calculateValue = () => {
             username: envs.FANFOU_USERNAME,
             password: envs.FANFOU_PASSWORD,
         },
-        lastfm: {
-            api_key: envs.LASTFM_API_KEY,
-        },
-        pkubbs: {
-            cookie: envs.PKUBBS_COOKIE,
+        game4399: {
+            cookie: envs.GAME_4399,
         },
-        nhentai: {
-            username: envs.NHENTAI_USERNAME,
-            password: envs.NHENTAI_PASSWORD,
+        github: {
+            access_token: envs.GITHUB_ACCESS_TOKEN,
         },
-        discuz: {
-            cookies: discuz_cookies,
+        google: {
+            fontsApiKey: envs.GOOGLE_FONTS_API_KEY,
         },
-        scihub: {
-            host: envs.SCIHUB_HOST || 'https://sci-hub.tw/',
+        hefeng: {
+            // weather
+            key: envs.HEFENG_KEY,
         },
-        hotlink: {
-            template: envs.HOTLINK_TEMPLATE,
+        infzm: {
+            cookie: envs.INFZM_COOKIE,
         },
         initium: {
             username: envs.INITIUM_USERNAME,
             password: envs.INITIUM_PASSWORD,
             bearertoken: envs.INITIUM_BEARER_TOKEN,
+            iap_receipt: envs.INITIUM_IAP_RECEIPT,
         },
-        btbyr: {
-            host: envs.BTBYR_HOST,
-            cookies: envs.BTBYR_COOKIE,
+        instagram: {
+            username: envs.IG_USERNAME,
+            password: envs.IG_PASSWORD,
+            proxy: envs.IG_PROXY,
+        },
+        lastfm: {
+            api_key: envs.LASTFM_API_KEY,
         },
         mastodon: {
             apiHost: envs.MASTODON_API_HOST,
             accessToken: envs.MASTODON_API_ACCESS_TOKEN,
             acctDomain: envs.MASTODON_API_ACCT_DOMAIN,
         },
-        xiaoyuzhou: {
-            device_id: envs.XIAOYUZHOU_ID,
-            refresh_token: envs.XIAOYUZHOU_TOKEN,
+        miniflux: {
+            instance: envs.MINIFLUX_INSTANCE || 'https://reader.miniflux.app',
+            token: envs.MINIFLUX_TOKEN || '',
+        },
+        ncm: {
+            cookies: envs.NCM_COOKIES || '',
+        },
+        newrank: {
+            cookie: envs.NEWRANK_COOKIE,
         },
         nga: {
             uid: envs.NGA_PASSPORT_UID,
             cid: envs.NGA_PASSPORT_CID,
         },
-        newrank: {
-            cookie: envs.NEWRANK_COOKIE,
+        nhentai: {
+            username: envs.NHENTAI_USERNAME,
+            password: envs.NHENTAI_PASSWORD,
+        },
+        pixiv: {
+            refreshToken: envs.PIXIV_REFRESHTOKEN,
+            bypassCdn: envs.PIXIV_BYPASS_CDN !== '0' && envs.PIXIV_BYPASS_CDN !== 'false',
+            bypassCdnHostname: envs.PIXIV_BYPASS_HOSTNAME || 'public-api.secure.pixiv.net',
+            bypassCdnDoh: envs.PIXIV_BYPASS_DOH || 'https://1.1.1.1/dns-query',
+            imgProxy: envs.PIXIV_IMG_PROXY || 'https://i.pixiv.cat',
+        },
+        pkubbs: {
+            cookie: envs.PKUBBS_COOKIE,
+        },
+        scboy: {
+            token: envs.SCBOY_BBS_TOKEN,
+        },
+        scihub: {
+            host: envs.SCIHUB_HOST || 'https://sci-hub.se/',
+        },
+        spotify: {
+            clientId: envs.SPOTIFY_CLIENT_ID,
+            clientSecret: envs.SPOTIFY_CLIENT_SECRET,
+            refreshToken: envs.SPOTIFY_REFRESHTOKEN,
+        },
+        telegram: {
+            token: envs.TELEGRAM_TOKEN,
+        },
+        twitter: {
+            consumer_key: envs.TWITTER_CONSUMER_KEY,
+            consumer_secret: envs.TWITTER_CONSUMER_SECRET,
+            tokens: twitter_tokens,
+            authorization: envs.TWITTER_WEBAPI_AUTHORIZAION || 'Bearer AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA',
+            // 此处硬编码参考自https://github.com/mikf/gallery-dl/blob/master/gallery_dl/extractor/twitter.py#L550
+        },
+        weibo: {
+            app_key: envs.WEIBO_APP_KEY,
+            app_secret: envs.WEIBO_APP_SECRET,
+            redirect_url: envs.WEIBO_REDIRECT_URL,
+        },
+        wenku8: {
+            cookie: envs.WENKU8_COOKIE,
+        },
+        wordpress: {
+            cdnUrl: envs.WORDPRESS_CDN,
+        },
+        xiaoyuzhou: {
+            device_id: envs.XIAOYUZHOU_ID,
+            refresh_token: envs.XIAOYUZHOU_TOKEN,
+        },
+        ximalaya: {
+            token: envs.XIMALAYA_TOKEN,
+        },
+        youtube: {
+            key: envs.YOUTUBE_KEY,
+        },
+        yuque: {
+            token: envs.YUQUE_TOKEN,
+        },
+        zhihu: {
+            cookies: envs.ZHIHU_COOKIES,
         },
     };
 };

package/lib/core_router.js

@@ -0,0 +1,17 @@
+const Router = require('@koa/router');
+const config = require('@/config').value;
+const router = new Router();
+
+// Load Core Route
+router.get('/', require('./routes/index'));
+
+router.get('/robots.txt', (ctx) => {
+    if (config.disallowRobot) {
+        ctx.set('Content-Type', 'text/plain');
+        ctx.body = 'User-agent: *\nDisallow: /';
+    } else {
+        ctx.throw(404, 'Not Found');
+    }
+});
+
+module.exports = router;

package/lib/errors/RequestInProgress.js

@@ -0,0 +1,3 @@
+class RequestInProgressError extends Error {}
+
+module.exports = RequestInProgressError;

package/lib/errors/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+    RequestInProgressError: require('./RequestInProgress'),
+};

package/lib/index.js

@@ -29,6 +29,7 @@ if (config.enableCluster && cluster.isMaster && process.env.NODE_ENV !== 'test'
     }
 
     logger.info('🎉 RSSHub start! Cheers!');
+    logger.info('💖 Can you help keep this open source project alive? Please sponsor 👉 https://docs.rsshub.app/en/support');
 
     module.exports = server;
 }

package/lib/maintainer.js

@@ -0,0 +1,27 @@
+const dirname = __dirname + '/v2';
+
+// 遍历整个 routes 文件夹，收集模块 maintainer.js
+const maintainerPath = require('require-all')({
+    dirname,
+    filter: /maintainer\.js$/,
+});
+
+const maintainers = {};
+
+// 将收集到的自定义模块进行合并
+for (const dir in maintainerPath) {
+    const routes = maintainerPath[dir]['maintainer.js']; // Do not merge other file
+    for (const key in routes) {
+        maintainers['/' + dir + key] = routes[key];
+    }
+}
+
+// 兼容旧版路由
+const router = require('./router');
+router.stack.forEach((e) => {
+    if (!maintainers[e.path]) {
+        maintainers[e.path] = [];
+    }
+});
+
+module.exports = maintainers;

package/lib/middleware/access-control.js

@@ -5,12 +5,13 @@ const isLocalhost = require('is-localhost-ip');
 const reject = (ctx) => {
     ctx.response.status = 403;
 
-    throw Error('Access denied.');
+    throw Error('Authentication failed. Access denied.');
 };
 
 module.exports = async (ctx, next) => {
     const ip = ctx.ips[0] || ctx.ip;
     const requestPath = ctx.request.path;
+    const requestUA = ctx.request.header['user-agent'];
     const accessKey = ctx.query.key;
     const accessCode = ctx.query.code;
 
@@ -28,24 +29,24 @@ module.exports = async (ctx, next) => {
         await next();
     } else {
         if (!isControlled || allowLocalhost) {
-            return await grant();
+            return grant();
         }
 
         if (config.accessKey) {
             if (config.accessKey === accessKey || accessCode === md5(requestPath + config.accessKey)) {
-                return await grant();
+                return grant();
             }
         }
 
         if (config.whitelist) {
-            if (config.whitelist.includes(ip) || config.whitelist.includes(requestPath)) {
-                return await grant();
+            if (config.whitelist.find((white) => ip.includes(white) || requestPath.includes(white) || requestUA.includes(white))) {
+                return grant();
             }
         }
 
         if (config.blacklist) {
-            if (!(config.blacklist.includes(ip) || config.blacklist.includes(requestPath))) {
-                return await grant();
+            if (!config.blacklist.find((black) => ip.includes(black) || requestPath.includes(black) || requestUA.includes(black))) {
+                return grant();
             }
         }