mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-21 02:56:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(HTTP Request Tool Node): Fix HTML response optimization issue (#11439)

Browse source
This commit is contained in:
Eugene 2024-10-30 10:32:08 +01:00 committed by GitHub
parent d7ba206b30
commit cf37e94dd8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 71 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
View file

@ -10,19 +10,19 @@ describe('ToolHttpRequest', () => {
const helpers = mock<IExecuteFunctions['helpers']>();
const executeFunctions = mock<IExecuteFunctions>({ helpers });
describe('Binary response', () => {
beforeEach(() => {
jest.resetAllMocks();
executeFunctions.getNode.mockReturnValue(
mock<INode>({
type: 'n8n-nodes-base.httpRequest',
name: 'HTTP Request',
typeVersion: 1.1,
}),
);
executeFunctions.addInputData.mockReturnValue({ index: 0 });
});
beforeEach(() => {
jest.resetAllMocks();
executeFunctions.getNode.mockReturnValue(
mock<INode>({
type: 'n8n-nodes-base.httpRequest',
name: 'HTTP Request',
typeVersion: 1.1,
}),
);
executeFunctions.addInputData.mockReturnValue({ index: 0 });
});
describe('Binary response', () => {
it('should return the error when receiving a binary response', async () => {
helpers.httpRequest.mockResolvedValue({
body: Buffer.from(''),
@ -237,4 +237,62 @@ describe('ToolHttpRequest', () => {
);
});
});
describe('Optimize response', () => {
it('should extract body from the response HTML', async () => {
helpers.httpRequest.mockResolvedValue({
body: `<!DOCTYPE html>
<html>
<head>
</head>
<body>
<h1>Test</h1>
<div>
<p>
Test content
</p>
</div>
</body>
</html>`,
headers: {
'content-type': 'text/html',
},
});
executeFunctions.getNodeParameter.mockImplementation(
(paramName: string, _: any, fallback: any) => {
switch (paramName) {
case 'method':
return 'GET';
case 'url':
return '{url}';
case 'options':
return {};
case 'placeholderDefinitions.values':
return [];
case 'optimizeResponse':
return true;
case 'responseType':
return 'html';
case 'cssSelector':
return 'body';
default:
return fallback;
}
},
);
const { response } = await httpTool.supplyData.call(executeFunctions, 0);
const res = await (response as N8nTool).invoke({
url: 'https://httpbin.org/html',
});
expect(helpers.httpRequest).toHaveBeenCalled();
expect(res).toEqual(
JSON.stringify(['<h1>Test</h1> <div> <p> Test content </p> </div>'], null, 2),
);
});
});
});

2
packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
View file

@ -1,5 +1,5 @@
import { Readability } from '@mozilla/readability';
import cheerio from 'cheerio';
import * as cheerio from 'cheerio';
import { convert } from 'html-to-text';
import { JSDOM } from 'jsdom';
import get from 'lodash/get';