rsshub 1.0.0-master.fb6d4f3 → 1.0.0-master.fb7e42c

package/lib/assets/logo.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>RSSHub</title><rect width="24" height="24" fill="#ffd6a6" rx="7.636"/><path fill="#ff8549" d="M.142 6.16Q.002 6.875 0 7.635v8.728A7.636 7.636 0 0 0 7.636 24h8.728a7.7 7.7 0 0 0 1.477-.142 13.26 13.26 0 0 0 1.25-5.64c0-7.35-5.959-13.309-13.31-13.309a13.25 13.25 0 0 0-5.64 1.25"/><circle cx="5.727" cy="18.273" r="4.964" fill="#ff2900"/></svg>

package/lib/config.ts

@@ -187,6 +187,7 @@ export type Config = {
     };
     hefeng: {
         key?: string;
+        apiHost?: string;
     };
     infzm: {
         cookie?: string;
@@ -325,6 +326,10 @@ export type Config = {
     scihub: {
         host?: string;
     };
+    sdo: {
+        ff14risingstones?: string;
+        ua?: string;
+    };
     sis001: {
         baseUrl?: string;
     };
@@ -659,6 +664,7 @@ const calculateValue = () => {
         },
         hefeng: {
             key: envs.HEFENG_KEY,
+            apiHost: envs.HEFENG_API_HOST,
         },
         infzm: {
             cookie: envs.INFZM_COOKIE,
@@ -797,6 +803,10 @@ const calculateValue = () => {
         scihub: {
             host: envs.SCIHUB_HOST || 'https://sci-hub.se/',
         },
+        sdo: {
+            ff14risingstones: envs.SDO_FF14RISINGSTONES,
+            ua: envs.SDO_UA,
+        },
         sis001: {
             baseUrl: envs.SIS001_BASE_URL || 'https://sis001.com',
         },

package/lib/errors/index.test.ts

@@ -55,6 +55,14 @@ describe('invalid-parameter-error', () => {
     }, 20000);
 });
 
+describe('captcha-error', () => {
+    it(`captcha-error`, async () => {
+        const response = await request.get('/test/captcha-error');
+        expect(response.status).toBe(503);
+        expect(response.text).toMatch('CaptchaError: Test captcha error');
+    }, 20000);
+});
+
 describe('route throws an error', () => {
     it('route path error should have path mounted', async () => {
         await request.get('/test/error');
@@ -67,19 +75,21 @@ describe('route throws an error', () => {
             const value = $(item).find('.debug-value').html()?.trim();
             switch (key) {
                 case 'Request Amount:':
-                    expect(value).toBe('11');
+                    expect(value).toBe('12');
                     break;
                 case 'Hot Routes:':
-                    expect(value).toBe('8 /test/:id/:params?<br>');
+                    expect(value).toBe('9 /test/:id/:params?<br>');
                     break;
                 case 'Hot Paths:':
-                    expect(value).toBe('2 /test/error<br>2 /test/slow<br>2 /test/slow4<br>1 /test/httperror<br>1 /test/config-not-found-error<br>1 /test/invalid-parameter-error<br>1 /thisDoesNotExist<br>1 /<br>');
+                    expect(value).toBe(
+                        '2 /test/error<br>2 /test/slow<br>2 /test/slow4<br>1 /test/httperror<br>1 /test/config-not-found-error<br>1 /test/invalid-parameter-error<br>1 /test/captcha-error<br>1 /thisDoesNotExist<br>1 /<br>'
+                    );
                     break;
                 case 'Hot Error Routes:':
-                    expect(value).toBe('5 /test/:id/:params?<br>');
+                    expect(value).toBe('6 /test/:id/:params?<br>');
                     break;
                 case 'Hot Error Paths:':
-                    expect(value).toBe('2 /test/error<br>1 /test/httperror<br>1 /test/slow4<br>1 /test/config-not-found-error<br>1 /test/invalid-parameter-error<br>1 /thisDoesNotExist<br>');
+                    expect(value).toBe('2 /test/error<br>1 /test/httperror<br>1 /test/slow4<br>1 /test/config-not-found-error<br>1 /test/invalid-parameter-error<br>1 /test/captcha-error<br>1 /thisDoesNotExist<br>');
                     break;
                 default:
             }

package/lib/errors/types/captcha.ts

@@ -0,0 +1,5 @@
+class CaptchaError extends Error {
+    name = 'CaptchaError';
+}
+
+export default CaptchaError;

package/lib/middleware/cache.ts

@@ -55,6 +55,10 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
     // Doesn't hit the cache? We need to let others know!
     await cacheModule.globalCache.set(controlKey, '1', config.cache.requestTimeout);
 
+    // let routers control cache
+    ctx.set('cacheKey', key);
+    ctx.set('cacheControlKey', controlKey);
+
     try {
         await next();
     } catch (error) {

package/lib/middleware/parameter.ts

@@ -80,7 +80,7 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
 
         // sort items
         if (ctx.req.query('sorted') !== 'false') {
-            data.item = data.item.sort((a: DataItem, b: DataItem) => +new Date(b.pubDate || 0) - +new Date(a.pubDate || 0));
+            data.item = data.item.toSorted((a: DataItem, b: DataItem) => +new Date(b.pubDate || 0) - +new Date(a.pubDate || 0));
         }
 
         const handleItem = (item: DataItem) => {

package/lib/registry.ts

@@ -155,7 +155,7 @@ const sortRoutes = (
         }
     >
 ) =>
-    Object.entries(routes).sort(([pathA], [pathB]) => {
+    Object.entries(routes).toSorted(([pathA], [pathB]) => {
         const segmentsA = pathA.split('/');
         const segmentsB = pathB.split('/');
         const lenA = segmentsA.length;
@@ -198,7 +198,11 @@ for (const namespace in namespaces) {
                         routeData.handler = route.handler;
                     }
                 }
-                ctx.set('data', await routeData.handler(ctx));
+                const response = await routeData.handler(ctx);
+                if (response instanceof Response) {
+                    return response;
+                }
+                ctx.set('data', response);
             }
         };
         subApp.get(path, wrappedHandler);

package/lib/routes/10000link/info.ts

@@ -209,7 +209,7 @@ export const route: Route = {
             description: 'ID，默认为空，可在对应分类页 URL 中找到',
         },
     },
-    description: `:::tip
+    description: `::: tip
 若订阅 [天下大势](https://info.10000link.com/newslists.aspx?chid=My01)，网址为 \`https://info.10000link.com/newslists.aspx?chid=My01\`，请截取 \`https://info.10000link.com/\` 到末尾 \`.aspx\` 的部分 \`newslists\` 作为 \`category\` 参数填入，而 \`My01\` 作为 \`id\` 参数填入，此时目标路由为 [\`/10000link/info/newslists/My01\`](https://rsshub.app/10000link/info/newslists/My01)。
 :::
 

package/lib/routes/18comic/album.ts

@@ -16,6 +16,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     radar: [
         {

package/lib/routes/18comic/blogs.ts

@@ -18,6 +18,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     radar: [
         {

package/lib/routes/18comic/search.ts

@@ -23,6 +23,7 @@ export const route: Route = {
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
+        nsfw: true,
     },
     radar: [
         {

package/lib/routes/199it/index.ts

@@ -219,7 +219,7 @@ export const route: Route = {
             ],
         },
     },
-    description: `:::tip
+    description: `::: tip
 若订阅 [研究报告](https://www.199it.com/archives/category/report)，网址为 \`https://www.199it.com/archives/category/report\`，请截取 \`https://www.199it.com/archives/category/report\` 到末尾的部分 \`archives/category/report\` 作为 \`category\` 参数填入，此时目标路由为 [\`/199it/archives/category/report\`](https://rsshub.app/199it/archives/category/report)。
 :::
 

package/lib/routes/21caijing/channel.ts

@@ -185,7 +185,7 @@ export const route: Route = {
     parameters: {
         category: '分类，默认为热点，可在对应分类页 URL 中找到',
     },
-    description: `:::tip
+    description: `::: tip
 若订阅 [热点](https://m.21jingji.com/#/)，请将 \`热点\` 作为 \`name\` 参数填入，此时目标路由为 [\`/21caijing/channel/热点\`](https://rsshub.app/21caijing/channel/热点)。
 
 若订阅 [投资通 - 盘前情报](https://m.21jingji.com/#/channel/investment)，请将 \`投资通/盘前情报\` 作为 \`name\` 参数填入，此时目标路由为 [\`/21caijing/channel/投资通/盘前情报\`](https://rsshub.app/21caijing/channel/投资通/盘前情报)。

package/lib/routes/51cto/utils.ts

@@ -16,6 +16,6 @@ export const getToken = () =>
 export const sign = (requestPath: string, payload: Record<string, any> = {}, timestamp: number, token: string) => {
     payload.timestamp = timestamp;
     payload.token = token;
-    const sortedParams = Object.keys(payload).sort();
+    const sortedParams = Object.keys(payload).toSorted();
     return md5(md5(requestPath) + md5(sortedParams + md5(token) + timestamp));
 };