mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-14 08:34:07 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat(core): Make all http requests made with httpRequestWithAuthentication abortable (#11704)

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2024-11-13 14:18:21 +01:00 committed by GitHub
parent 3202e8c946
commit 0d8aada490
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/core/src/NodeExecuteFunctions.ts
View file

@ -918,6 +918,10 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
axiosRequest.params = n8nRequest.qs; axiosRequest.params = n8nRequest.qs;
if (n8nRequest.abortSignal) {
axiosRequest.signal = n8nRequest.abortSignal;
}
if (n8nRequest.baseURL !== undefined) { if (n8nRequest.baseURL !== undefined) {
axiosRequest.baseURL = n8nRequest.baseURL; axiosRequest.baseURL = n8nRequest.baseURL;
} }
@ -1718,6 +1722,11 @@ export async function httpRequestWithAuthentication(
) { ) {
removeEmptyBody(requestOptions); removeEmptyBody(requestOptions);
// Cancel this request on execution cancellation
if ('getExecutionCancelSignal' in this) {
requestOptions.abortSignal = this.getExecutionCancelSignal();
}
let credentialsDecrypted: ICredentialDataDecryptedObject | undefined; let credentialsDecrypted: ICredentialDataDecryptedObject | undefined;
try { try {
const parentTypes = additionalData.credentialsHelper.getParentTypes(credentialsType); const parentTypes = additionalData.credentialsHelper.getParentTypes(credentialsType);

3
packages/workflow/src/Interfaces.ts
View file

@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
import type { CallbackManager as CallbackManagerLC } from '@langchain/core/callbacks/manager'; import type { CallbackManager as CallbackManagerLC } from '@langchain/core/callbacks/manager';
import type { AxiosProxyConfig } from 'axios'; import type { AxiosProxyConfig, GenericAbortSignal } from 'axios';
import type * as express from 'express'; import type * as express from 'express';
import type FormData from 'form-data'; import type FormData from 'form-data';
import type { PathLike } from 'fs'; import type { PathLike } from 'fs';
@ -529,6 +529,7 @@ export interface IHttpRequestOptions {
}; };
timeout?: number; timeout?: number;
json?: boolean; json?: boolean;
abortSignal?: GenericAbortSignal;
} }
/** /**