prevent NodeApiError rewraping in request functions

packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts

@@ -63,6 +63,7 @@ export async function activeCampaignApiRequest(
 			return responseData[dataKey] as IDataObject;
 		}
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts

@@ -54,6 +54,7 @@ export async function acuitySchedulingApiRequest(
 			);
 		}
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Affinity/GenericFunctions.ts

@@ -46,6 +46,7 @@ export async function affinityApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts

@@ -50,6 +50,7 @@ export async function agileCrmApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
@@ -168,6 +169,7 @@ export async function agileCrmApiRequestUpdate(
 		return lastSuccesfulUpdateReturn;
 	} catch (error) {
 		if (successfulUpdates.length === 0) {
+			if (error instanceof NodeApiError) throw error;
 			throw new NodeApiError(this.getNode(), error as JsonObject);
 		} else {
 			throw new NodeApiError(this.getNode(), error as JsonObject, {

packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts

@@ -47,6 +47,7 @@ export async function apiTemplateIoApiRequest(
 		}
 		return response;
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Automizy/GenericFunctions.ts

@@ -43,6 +43,7 @@ export async function automizyApiRequest(
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Autopilot/GenericFunctions.ts

@@ -46,6 +46,7 @@ export async function autopilotApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts

@@ -39,6 +39,7 @@ export async function awsApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts

@@ -43,6 +43,7 @@ export async function awsApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts

@@ -253,6 +253,7 @@ export class AwsSqs implements INodeType {
 					// loads first 1000 queues from SQS
 					data = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `?${params.join('&')}`);
 				} catch (error) {
+					if (error instanceof NodeApiError) throw error;
 					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
@@ -372,6 +373,7 @@ export class AwsSqs implements INodeType {
 						`${queuePath}?${params.join('&')}`,
 					);
 				} catch (error) {
+					if (error instanceof NodeApiError) throw error;
 					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 

packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts

@@ -70,6 +70,7 @@ export async function awsApiRequest(
 			}
 		}
 
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject); // no XML parsing needed
 	}
 }

packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts

@@ -68,6 +68,7 @@ export async function awsApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject); // no XML parsing needed
 	}
 }

packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts

@@ -45,6 +45,7 @@ export async function bannerbearApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Baserow/GenericFunctions.ts

@@ -45,6 +45,7 @@ export async function baserowApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
@@ -104,6 +105,7 @@ export async function getJwtToken(
 		const { token } = (await this.helpers.request(options)) as { token: string };
 		return token;
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts

@@ -39,6 +39,7 @@ export async function bitbucketApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Bitly/GenericFunctions.ts

@@ -45,6 +45,7 @@ export async function bitlyApiRequest(
 			});
 		}
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts

@@ -65,6 +65,7 @@ export async function bitwardenApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
@@ -99,6 +100,7 @@ export async function getAccessToken(
 		const { access_token } = await this.helpers.request(options);
 		return access_token;
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Box/GenericFunctions.ts

@@ -44,6 +44,7 @@ export async function boxApiRequest(
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'boxOAuth2Api', options, oAuth2Options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts

@@ -53,6 +53,7 @@ export async function brandfetchApiRequest(
 
 		return response;
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Bubble/GenericFunctions.ts

@@ -55,6 +55,7 @@ export async function bubbleApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Chargebee/Chargebee.node.ts

@@ -598,6 +598,7 @@ export class Chargebee implements INodeType {
 				try {
 					responseData = await this.helpers.request(options);
 				} catch (error) {
+					if (error instanceof NodeApiError) throw error;
 					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 

packages/nodes-base/nodes/CircleCi/GenericFunctions.ts

@@ -38,6 +38,7 @@ export async function circleciApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts

@@ -48,6 +48,7 @@ export async function webexApiRequest(
 			tokenType: 'Bearer',
 		});
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts

@@ -37,6 +37,7 @@ export async function citrixADCApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'citrixAdcApi', options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Clearbit/GenericFunctions.ts

@@ -36,6 +36,7 @@ export async function clearbitApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/ClickUp/GenericFunctions.ts

@@ -51,6 +51,7 @@ export async function clickupApiRequest(
 			);
 		}
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts

@@ -35,6 +35,7 @@ export async function cloudflareApiRequest(
 		}
 		return await this.helpers.requestWithAuthentication.call(this, 'cloudflareApi', options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Cockpit/GenericFunctions.ts

@@ -41,6 +41,7 @@ export async function cockpitApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Coda/GenericFunctions.ts

@@ -39,6 +39,7 @@ export async function codaApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts

@@ -40,6 +40,7 @@ export async function coinGeckoApiRequest(
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Contentful/GenericFunctions.ts

@@ -39,6 +39,7 @@ export async function contentfulApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts

@@ -52,6 +52,7 @@ export async function convertKitApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Copper/GenericFunctions.ts

@@ -64,6 +64,7 @@ export async function copperApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/DeepL/GenericFunctions.ts

@@ -44,6 +44,7 @@ export async function deepLApiRequest(
 
 		return await this.helpers.requestWithAuthentication.call(this, 'deepLApi', options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Demio/GenericFunctions.ts

@@ -37,6 +37,7 @@ export async function demioApiRequest(
 
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Dhl/GenericFunctions.ts

@@ -41,6 +41,7 @@ export async function dhlApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Discourse/GenericFunctions.ts

@@ -33,6 +33,7 @@ export async function discourseApiRequest(
 		}
 		return await this.helpers.requestWithAuthentication.call(this, 'discourseApi', options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Disqus/GenericFunctions.ts

@@ -46,6 +46,7 @@ export async function disqusApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Drift/GenericFunctions.ts

@@ -50,6 +50,7 @@ export async function driftApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'driftOAuth2Api', options);
 		}
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Dropbox/GenericFunctions.ts

@@ -45,6 +45,7 @@ export async function dropboxApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'dropboxOAuth2Api', options);
 		}
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Egoi/GenericFunctions.ts

@@ -49,6 +49,7 @@ export async function egoiApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts

@@ -58,6 +58,7 @@ export async function elasticSecurityApiRequest(
 			error.error.error = `${error.error.error}: ${error.error.message}`;
 		}
 
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts

@@ -40,6 +40,7 @@ export async function elasticsearchApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'elasticsearchApi', options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
@@ -103,6 +104,7 @@ export async function elasticsearchApiRequestAllItems(
 
 		return returnData;
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }

packages/nodes-base/nodes/EmailSend/v2/send.operation.ts

@@ -336,6 +336,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				continue;
 			}
 			delete error.cert;
+			if (error instanceof NodeApiError) throw error;
 			throw new NodeApiError(this.getNode(), error as JsonObject);
 		}
 	}

packages/nodes-base/nodes/Emelia/GenericFunctions.ts

@@ -39,6 +39,7 @@ export async function emeliaApiRequest(
 	try {
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
+		if (error instanceof NodeApiError) throw error;
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }