rsshub 1.0.0-master.fcb92f0 → 1.0.0-master.fcc0fab

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-<img src="https://docs.rsshub.app/logo.png" alt="RSSHub" width="100">
+<img src="https://docs.rsshub.app/img/logo.png" alt="RSSHub" width="100">
 </p>
 <h1 align="center">RSSHub</h1>
 
@@ -33,6 +33,14 @@ RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器，可以
 
 ## Special Thanks
 
+### Special Sponsors
+
+<p>
+<a href="https://xlog.app/" target="_blank"><img height="100px" src="https://i.imgur.com/JuhHTKD.png"></a>
+</p>
+
+[![](https://opencollective.com/static/images/become_sponsor.svg)](https://docs.rsshub.app/en/support/)
+
 ### Contributors
 
 [![](https://opencollective.com/RSSHub/contributors.svg?width=890)](https://github.com/DIYgod/RSSHub/graphs/contributors)
@@ -54,9 +62,9 @@ Logo designer [sheldonrrr](https://dribbble.com/sheldonrrr)
 
 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/quick-start.html)
+Refer to [Join Us](https://docs.rsshub.app/en/joinus/quick-start)
 
-见 [参与我们](https://docs.rsshub.app/joinus/quick-start.html)
+见 [参与我们](https://docs.rsshub.app/joinus/quick-start)
 
 ## Deployment
 
@@ -97,4 +105,4 @@ We accept donations via the following ways:
 **RSSHub** © [DIYgod](https://github.com/DIYgod), Released under the [MIT](./LICENSE) License.<br>
 Authored and maintained by DIYgod with help from contributors ([list](https://github.com/DIYgod/RSSHub/contributors)).
 
-> Blog [@DIYgod](https://diygod.me) · GitHub [@DIYgod](https://github.com/DIYgod) · Twitter [@DIYgod](https://twitter.com/DIYgod) · Telegram Channel [@awesomeDIYgod](https://t.me/awesomeDIYgod)
+> Blog [@DIYgod](https://diygod.cc) · GitHub [@DIYgod](https://github.com/DIYgod) · Twitter [@DIYgod](https://twitter.com/DIYgod) · Telegram Channel [@awesomeDIYgod](https://t.me/awesomeDIYgod)

package/lib/config.js

@@ -73,6 +73,8 @@ const calculateValue = () => {
             auth: envs.PROXY_AUTH,
             url_regex: envs.PROXY_URL_REGEX || '.*',
         },
+        proxyStrategy: envs.PROXY_STRATEGY || 'all', // all / on_retry
+        reverseProxyUrl: envs.REVERSE_PROXY_URL,
         // auth
         authentication: {
             name: envs.HTTP_BASIC_AUTH_NAME || 'usernam3',
@@ -277,8 +279,7 @@ const calculateValue = () => {
             consumer_key: envs.TWITTER_CONSUMER_KEY,
             consumer_secret: envs.TWITTER_CONSUMER_SECRET,
             tokens: twitter_tokens,
-            authorization: envs.TWITTER_WEBAPI_AUTHORIZAION || 'Bearer AAAAAAAAAAAAAAAAAAAAAPYXBAAAAAAACLXUNDekMxqa8h%2F40K4moUkGsoc%3DTYfbDKbT3jJPCEVnMYqilB28NHfOPqkca3qaAxGfsyKCs0wRbw',
-            // reference: https://github.com/dangeredwolf/FixTweet/blob/f3082bbb0d69798687481a605f6760b2eb7558e0/src/constants.ts#L23-L25
+            authorization: envs.TWITTER_WEBAPI_AUTHORIZAION && envs.TWITTER_WEBAPI_AUTHORIZAION.split(','),
         },
         weibo: {
             app_key: envs.WEIBO_APP_KEY,

package/lib/maintainer.js

@@ -5,7 +5,7 @@ const { join } = require('path');
 // Presence Check
 for (const dir of fs.readdirSync(dirname)) {
     const dirPath = join(dirname, dir);
-    if (!fs.existsSync(join(dirPath, 'maintainer.js'))) {
+    if (fs.existsSync(join(dirPath, 'router.js')) && !fs.existsSync(join(dirPath, 'maintainer.js'))) {
         throw Error(`No maintainer.js in "${dirPath}".`);
     }
 }

package/lib/middleware/anti-hotlink.js

@@ -98,8 +98,8 @@ const validateTemplate = (template) => {
 module.exports = async (ctx, next) => {
     await next();
 
-    let image_hotlink_template = undefined;
-    let multimedia_hotlink_template = undefined;
+    let image_hotlink_template;
+    let multimedia_hotlink_template;
     const shouldWrapInIframe = ctx.query.wrap_multimedia_in_iframe === '1';
 
     // Read params if enabled

package/lib/middleware/parameter.js

@@ -3,7 +3,7 @@ const cheerio = require('cheerio');
 const { simplecc } = require('simplecc-wasm');
 const got = require('@/utils/got');
 const config = require('@/config').value;
-const RE2 = require('re2');
+const { RE2JS } = require('re2js');
 
 let mercury_parser;
 
@@ -27,17 +27,6 @@ module.exports = async (ctx, next) => {
     await next();
 
     if (!ctx.state.data && !ctx._matchedRoute) {
-        // Given that the official demo has a cache TTL of 2h, a "wrong path" page will be cached by CloudFlare for
-        // 200h (8.33d).
-        // What makes it worse is that the documentation contains status badges to detect the availability of routes,
-        // but the documentation is updated more timely than the official demo, so the every example path of every
-        // new route will probably have a "wrong path" page cached for at least 200h soon after accepted. That is to
-        // say, the example paths of a new route will probably be unavailable on the public demo in the first 200h
-        // after accepted.
-        // As a conclusion, the next 3 lines has been commented out. (exactly the same behavior as any internal error)
-        // ctx.set({
-        //     'Cache-Control': `public, max-age=${config.cache.routeExpire * 100}`,
-        // });
         throw Error('wrong path');
     }
 
@@ -159,38 +148,37 @@ module.exports = async (ctx, next) => {
             }
 
             // filter
+            const engine = config.feature.filter_regex_engine;
             const makeRegex = (string) => {
+                if (!string) {
+                    return null;
+                }
                 // default: case_senstivie = true
-                const engine = config.feature.filter_regex_engine;
-                if (ctx.query.filter_case_sensitive === 'false') {
-                    switch (engine) {
-                        case 'regexp':
-                            return new RegExp(string, 'i');
-                        case 're2':
-                            return new RE2(string, 'i');
-                        default:
-                            throw Error(`Invalid Engine Value: ${engine}, please check your config.`);
-                    }
-                } else {
-                    switch (engine) {
-                        case 'regexp':
-                            return new RegExp(string);
-                        case 're2':
-                            return new RE2(string);
-                        default:
-                            throw Error(`Invalid Engine Value: ${engine}, please check your config.`);
-                    }
+                const insensitive = ctx.query.filter_case_sensitive === 'false';
+                switch (engine) {
+                    case 'regexp':
+                        return new RegExp(string, insensitive ? 'i' : '');
+                    case 're2':
+                        return RE2JS.compile(string, insensitive ? RE2JS.CASE_INSENSITIVE : 0);
+                    default:
+                        throw Error(`Invalid Engine Value: ${engine}, please check your config.`);
                 }
             };
 
             if (ctx.query.filter) {
+                const regex = makeRegex(ctx.query.filter);
+
                 ctx.state.data.item = ctx.state.data.item.filter((item) => {
                     const title = item.title || '';
                     const description = item.description || title;
                     const author = item.author || '';
-                    const category = item.category ? (Array.isArray(item.category) ? item.category : [item.category]) : [];
+                    const categoryArray = Array.isArray(item.category) ? item.category : [item.category];
+                    const category = item.category ? categoryArray : [];
                     const isFilter =
-                        title.match(makeRegex(ctx.query.filter)) || description.match(makeRegex(ctx.query.filter)) || author.match(makeRegex(ctx.query.filter)) || category.some((c) => c.match(makeRegex(ctx.query.filter)));
+                        engine === 're2'
+                            ? regex.matcher(title).find() || regex.matcher(description).find() || regex.matcher(author).find() || category.some((c) => regex.matcher(c).find())
+                            : title.match(regex) || description.match(regex) || author.match(regex) || category.some((c) => c.match(regex));
+
                     return isFilter;
                 });
             }
@@ -201,12 +189,20 @@ module.exports = async (ctx, next) => {
                     const title = item.title || '';
                     const description = item.description || title;
                     const author = item.author || '';
-                    const category = item.category ? (Array.isArray(item.category) ? item.category : [item.category]) : [];
+                    const categoryArray = Array.isArray(item.category) ? item.category : [item.category];
+                    const category = item.category ? categoryArray : [];
                     let isFilter = true;
-                    ctx.query.filter_title && (isFilter = title.match(makeRegex(ctx.query.filter_title)));
-                    ctx.query.filter_description && (isFilter = isFilter && description.match(makeRegex(ctx.query.filter_description)));
-                    ctx.query.filter_author && (isFilter = isFilter && author.match(makeRegex(ctx.query.filter_author)));
-                    ctx.query.filter_category && (isFilter = isFilter && category.some((c) => c.match(makeRegex(ctx.query.filter_category))));
+
+                    const titleRegex = makeRegex(ctx.query.filter_title);
+                    const descriptionRegex = makeRegex(ctx.query.filter_description);
+                    const authorRegex = makeRegex(ctx.query.filter_author);
+                    const categoryRegex = makeRegex(ctx.query.filter_category);
+
+                    ctx.query.filter_title && (isFilter = engine === 're2' ? titleRegex.matcher(title).find() : title.match(titleRegex));
+                    ctx.query.filter_description && (isFilter = isFilter && (engine === 're2' ? descriptionRegex.matcher(description).find() : description.match(descriptionRegex)));
+                    ctx.query.filter_author && (isFilter = isFilter && (engine === 're2' ? authorRegex.matcher(author).find() : author.match(authorRegex)));
+                    ctx.query.filter_category && (isFilter = isFilter && category.some((c) => (engine === 're2' ? categoryRegex.matcher(c).find() : c.match(categoryRegex))));
+
                     return isFilter;
                 });
             }
@@ -220,12 +216,20 @@ module.exports = async (ctx, next) => {
                     const title = item.title;
                     const description = item.description || title;
                     const author = item.author || '';
-                    const category = item.category ? (Array.isArray(item.category) ? item.category : [item.category]) : [];
+                    const categoryArray = Array.isArray(item.category) ? item.category : [item.category];
+                    const category = item.category ? categoryArray : [];
                     let isFilter = true;
-                    ctx.query.filterout_title && (isFilter = !title.match(makeRegex(ctx.query.filterout_title)));
-                    ctx.query.filterout_description && (isFilter = isFilter && !description.match(makeRegex(ctx.query.filterout_description)));
-                    ctx.query.filterout_author && (isFilter = isFilter && !author.match(makeRegex(ctx.query.filterout_author)));
-                    ctx.query.filterout_category && (isFilter = isFilter && !category.some((c) => c.match(makeRegex(ctx.query.filterout_category))));
+
+                    const titleRegex = makeRegex(ctx.query.filterout_title);
+                    const descriptionRegex = makeRegex(ctx.query.filterout_description);
+                    const authorRegex = makeRegex(ctx.query.filterout_author);
+                    const categoryRegex = makeRegex(ctx.query.filterout_category);
+
+                    ctx.query.filterout_title && (isFilter = engine === 're2' ? !titleRegex.matcher(title).find() : !title.match(titleRegex));
+                    ctx.query.filterout_description && (isFilter = isFilter && (engine === 're2' ? !descriptionRegex.matcher(description).find() : !description.match(descriptionRegex)));
+                    ctx.query.filterout_author && (isFilter = isFilter && (engine === 're2' ? !authorRegex.matcher(author).find() : !author.match(authorRegex)));
+                    ctx.query.filterout_category && (isFilter = isFilter && !category.some((c) => (engine === 're2' ? categoryRegex.matcher(c).find() : c.match(categoryRegex))));
+
                     return isFilter;
                 });
             }
@@ -304,7 +308,7 @@ module.exports = async (ctx, next) => {
                         if (item.description) {
                             text = item.description.replace(/<\/?[^>]+(>|$)/g, '');
                         }
-                        if (text && text.length) {
+                        if (text?.length) {
                             if (text.length > ctx.query.brief) {
                                 item.description = `<p>${text.substring(0, ctx.query.brief)}…</p>`;
                             } else {
@@ -313,7 +317,7 @@ module.exports = async (ctx, next) => {
                         }
                     });
                 } else {
-                    throw Error(`Invalid parameter brief. Please check the doc https://docs.rsshub.app/parameter.html#shu-chu-jian-xun`);
+                    throw Error(`Invalid parameter brief. Please check the doc https://docs.rsshub.app/parameter#shu-chu-jian-xun`);
                 }
             }