mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-12 13:27:31 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(HTTP Node): fix instance crashing when batching enabled (#3902)

Browse source 
* 🐛 Fix instance crashing when batching enabled

* Add flag parsing for simple mode

* 🐛 Fix issue with simple flag

* ⚡ improvements

* ⚡ Improvements

* 🔥 Remove console.log

Co-authored-by: Omar Ajoue <krynble@gmail.com>
This commit is contained in:
Ricardo Espinoza 2022-09-15 16:32:13 -04:00 committed by GitHub
parent 6c41b29ad2
commit 0ab89ad5d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -479,12 +479,15 @@ async function parseRequestObject(requestObject: IDataObject) {
}); });
} }
if (requestObject.simple === false) {
axiosConfig.validateStatus = () => true;
}
/** /**
* Missing properties: * Missing properties:
* encoding (need testing) * encoding (need testing)
* gzip (ignored - default already works) * gzip (ignored - default already works)
* resolveWithFullResponse (implemented elsewhere) * resolveWithFullResponse (implemented elsewhere)
* simple (???)
*/ */
return axiosConfig; return axiosConfig;
@ -781,6 +784,7 @@ async function httpRequest(
) { ) {
delete axiosRequest.data; delete axiosRequest.data;
} }
const result = await axios(axiosRequest); const result = await axios(axiosRequest);
if (requestOptions.returnFullResponse) { if (requestOptions.returnFullResponse) {
return { return {

42
packages/nodes-base/nodes/HttpRequest/HttpRequest.node.ts
View file

@ -101,7 +101,6 @@ export class HttpRequest implements INodeType {
}, },
}, },
}, },
// ---------------------------------- // ----------------------------------
// v1 creds // v1 creds
// ---------------------------------- // ----------------------------------
@ -804,6 +803,7 @@ export class HttpRequest implements INodeType {
}; };
let returnItems: INodeExecutionData[] = []; let returnItems: INodeExecutionData[] = [];
const requestPromises = []; const requestPromises = [];
for (let itemIndex = 0; itemIndex < items.length; itemIndex++) { for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
const requestMethod = this.getNodeParameter('requestMethod', itemIndex) as string; const requestMethod = this.getNodeParameter('requestMethod', itemIndex) as string;
const parametersAreJson = this.getNodeParameter('jsonParameters', itemIndex) as boolean; const parametersAreJson = this.getNodeParameter('jsonParameters', itemIndex) as boolean;
@ -811,14 +811,11 @@ export class HttpRequest implements INodeType {
const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject; const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
const url = this.getNodeParameter('url', itemIndex) as string; const url = this.getNodeParameter('url', itemIndex) as string;
if ( const isBatchingEnabled = options.batchSize as number >= 0 && options.batchInterval as number > 0;
itemIndex > 0 &&
(options.batchSize as number) >= 0 && if (itemIndex > 0 && isBatchingEnabled) {
(options.batchInterval as number) > 0 // defaults batch size to 1 if it's set to 0
) { const batchSize: number = options.batchSize as number > 0 ? options.batchSize as number : 1;
// defaults batch size to 1 of it's set to 0
const batchSize: number =
(options.batchSize as number) > 0 ? (options.batchSize as number) : 1;
if (itemIndex % batchSize === 0) { if (itemIndex % batchSize === 0) {
await new Promise((resolve) => setTimeout(resolve, options.batchInterval as number)); await new Promise((resolve) => setTimeout(resolve, options.batchInterval as number));
} }
@ -1125,16 +1122,20 @@ export class HttpRequest implements INodeType {
nodeVersion === 1 nodeVersion === 1
) { ) {
if (oAuth1Api) { if (oAuth1Api) {
requestPromises.push(this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions)); const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
requestOAuth1.catch(() => {});
requestPromises.push(requestOAuth1);
} else if (oAuth2Api) { } else if (oAuth2Api) {
requestPromises.push( const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, {
this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, { tokenType: 'Bearer',
tokenType: 'Bearer', });
}), requestOAuth2.catch(() => {});
); requestPromises.push(requestOAuth2);
} else { } else {
// bearerAuth, queryAuth, headerAuth, digestAuth, none // bearerAuth, queryAuth, headerAuth, digestAuth, none
requestPromises.push(this.helpers.request(requestOptions)); const request = this.helpers.request(requestOptions);
request.catch(() => {});
requestPromises.push(request);
} }
} else if (authentication === 'predefinedCredentialType' && nodeCredentialType) { } else if (authentication === 'predefinedCredentialType' && nodeCredentialType) {
const oAuth2Options: { [credentialType: string]: IOAuth2Options } = { const oAuth2Options: { [credentialType: string]: IOAuth2Options } = {
@ -1161,14 +1162,15 @@ export class HttpRequest implements INodeType {
const additionalOAuth2Options = oAuth2Options[nodeCredentialType]; const additionalOAuth2Options = oAuth2Options[nodeCredentialType];
// service-specific cred: OAuth1, OAuth2, plain // service-specific cred: OAuth1, OAuth2, plain
requestPromises.push(
this.helpers.requestWithAuthentication.call( const requestWithAuthentication = this.helpers.requestWithAuthentication.call(
this, this,
nodeCredentialType, nodeCredentialType,
requestOptions, requestOptions,
additionalOAuth2Options && { oauth2: additionalOAuth2Options }, additionalOAuth2Options && { oauth2: additionalOAuth2Options },
), );
); requestWithAuthentication.catch(() => {});
requestPromises.push(requestWithAuthentication);
} }
} }