xiaoxue_admin
/
RSSHub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): v2 route path should keep mounted in stats if error throws (#13965)

This commit is contained in:
Tony 2023-12-05 18:11:36 +00:00 committed by GitHub
parent 5921d8aba8
commit 7dee6a82d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/middleware/onerror.js
View File

@ -39,6 +39,10 @@ module.exports = async (ctx, next) => {
});
}
} catch (err) {
// Append v2 route path
ctx.request.path = (ctx.mountPath ?? '') + ctx.request.path;
ctx._matchedRoute = ctx._matchedRoute ? (ctx.mountPath ?? '') + ctx._matchedRoute : ctx.request.path;
let message = err;
if (err.name && (err.name === 'HTTPError' || err.name === 'RequestError')) {
message = `${err.message}: target website might be blocking our access, you can <a href="https://docs.rsshub.app/install/">host your own RSSHub instance</a> for a better usability.`;

32
test/middleware/onerror.js
View File

@ -6,6 +6,7 @@ jest.mock('request-promise-native');
const server = require('../../lib/index');
const config = require('../../lib/config').value;
const request = supertest(server);
const cheerio = require('cheerio');
afterAll(() => {
server.close();
@ -42,3 +43,34 @@ describe('RequestInProgressError', () => {
expect(responses.filter((r) => r.text.includes('This path is currently fetching, please come back later!'))).toHaveLength(1);
});
});
describe('v2 route throws an error', () => {
it('v2 route path error should have path mounted', async () => {
await request.get('/test/error');
await request.get('/thisDoesNotExist');
const response = await request.get('/');
const $ = cheerio.load(response.text);
$('.debug-item').each((index, item) => {
const key = $(item).find('.debug-key').text().trim();
const value = $(item).find('.debug-value').html().trim();
switch (key) {
case 'Request Amount:':
expect(value).toBe('7');
break;
case 'Hot Routes:':
expect(value).toBe('4 /test/:id<br>1 /test/slow<br>1 /thisDoesNotExist<br>');
break;
case 'Hot Paths:':
expect(value).toBe('2 /test/error<br>2 /test/slow<br>1 /test/httperror<br>1 /thisDoesNotExist<br>1 /<br>');
break;
case 'Hot Error Routes:':
expect(value).toBe('3 /test/:id<br>1 /test/slow<br>1 /thisDoesNotExist<br>');
break;
case 'Hot Error Paths:':
expect(value).toBe('2 /test/error<br>1 /test/httperror<br>1 /test/slow<br>1 /thisDoesNotExist<br>');
break;
}
});
});
});