github-mirror/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-05-12 16:10:30 +02:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

fix(core): Avoid Agent.close() deadlock in instance-ai web-research fetch (no-changelog) (#30105)

Browse Source 
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
José Braulio González Valido 2026-05-11 13:40:49 +01:00 committed by GitHub
parent 3123f2551b
commit 5bf5f03453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/cli/src/modules/instance-ai/web-research/__tests__/fetch-and-extract.test.ts
View File

@ -302,4 +302,35 @@ describe('fetchAndExtract', () => {
).rejects.toThrow(/restricted IP/i); ).rejects.toThrow(/restricted IP/i);
}); });
}); });
it('does not deadlock when the response body streams in chunks after fetch resolves', async () => {
const encoder = new TextEncoder();
const slowBody = new ReadableStream({
async start(controller) {
for (const part of ['<html>', '<body>', 'hello world', '</body>', '</html>']) {
await new Promise((resolve) => setTimeout(resolve, 5));
controller.enqueue(encoder.encode(part));
}
controller.close();
},
});
globalThis.fetch = jest.fn().mockResolvedValue({
ok: true,
status: 200,
statusText: 'OK',
url: 'https://example.com/slow',
headers: new Headers({ 'content-type': 'text/html' }),
body: slowBody,
} as unknown as Response);
const result = await Promise.race([
fetchAndExtract('https://example.com/slow', { ssrf }),
new Promise<never>((_, reject) =>
setTimeout(() => reject(new Error('fetchAndExtract deadlocked')), 2000),
),
]);
expect(result.content).toContain('hello world');
});
}); });

3
packages/cli/src/modules/instance-ai/web-research/fetch-and-extract.ts
View File

@ -72,7 +72,8 @@ export async function fetchAndExtract(
}); });
} finally { } finally {
clearTimeout(timeout); clearTimeout(timeout);
await dispatcher.close(); // Fire-and-forget — awaiting Agent.close() deadlocks against an unread body.
void dispatcher.close().catch(() => {});
} }
// Follow redirects manually so each hop is SSRF-checked // Follow redirects manually so each hop is SSRF-checked