From 9fa1a9aa99de93682966dbeeac8a28b5ff0f77a9 Mon Sep 17 00:00:00 2001 From: Michael Kret <88898367+michael-radency@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:59:30 +0300 Subject: [PATCH] fix: Disable errors obfuscation (no-changelog) (#10617) --- .../agents/ConversationalAgent/execute.ts | 2 +- .../agents/OpenAiFunctionsAgent/execute.ts | 2 +- .../agents/PlanAndExecuteAgent/execute.ts | 2 +- .../agents/Agent/agents/ReActAgent/execute.ts | 2 +- .../agents/Agent/agents/SqlAgent/execute.ts | 2 +- .../agents/Agent/agents/ToolsAgent/execute.ts | 2 +- .../OpenAiAssistant/OpenAiAssistant.node.ts | 2 +- .../nodes/chains/ChainLLM/ChainLlm.node.ts | 2 +- .../ChainRetrievalQA/ChainRetrievalQa.node.ts | 2 +- .../V2/ChainSummarizationV2.node.ts | 2 +- .../InformationExtractor.node.ts | 2 +- .../SentimentAnalysis.node.ts | 2 +- .../TextClassifier/TextClassifier.node.ts | 2 +- .../nodes-langchain/nodes/code/Code.node.ts | 2 +- .../nodes/vendors/OpenAi/actions/router.ts | 2 +- packages/core/src/NodeExecuteFunctions.ts | 9 +--- packages/core/src/WorkflowExecute.ts | 2 - .../src/components/Error/NodeErrorView.vue | 4 -- .../src/plugins/i18n/locales/en.json | 1 - .../nodes/ActionNetwork/ActionNetwork.node.ts | 2 +- .../ActiveCampaign/ActiveCampaign.node.ts | 2 +- .../nodes/Affinity/Affinity.node.ts | 2 +- .../nodes/AiTransform/AiTransform.node.ts | 2 +- .../nodes/Airtable/v1/AirtableV1.node.ts | 10 ++-- .../v2/actions/base/getSchema.operation.ts | 2 +- .../v2/actions/record/create.operation.ts | 2 +- .../actions/record/deleteRecord.operation.ts | 2 +- .../v2/actions/record/get.operation.ts | 2 +- .../v2/actions/record/search.operation.ts | 2 +- .../v2/actions/record/update.operation.ts | 2 +- .../v2/actions/record/upsert.operation.ts | 2 +- packages/nodes-base/nodes/Amqp/Amqp.node.ts | 2 +- .../nodes/ApiTemplateIo/ApiTemplateIo.node.ts | 6 +-- packages/nodes-base/nodes/Asana/Asana.node.ts | 2 +- .../nodes/Autopilot/Autopilot.node.ts | 2 +- .../nodes-base/nodes/Aws/AwsLambda.node.ts | 2 +- packages/nodes-base/nodes/Aws/AwsSns.node.ts | 2 +- .../AwsCertificateManager.node.ts | 2 +- .../Aws/Comprehend/AwsComprehend.node.ts | 2 +- .../nodes/Aws/DynamoDB/AwsDynamoDB.node.ts | 2 +- .../nodes-base/nodes/Aws/ELB/AwsElb.node.ts | 2 +- .../Aws/Rekognition/AwsRekognition.node.ts | 2 +- .../nodes/Aws/S3/V1/AwsS3V1.node.ts | 2 +- .../nodes/Aws/S3/V2/AwsS3V2.node.ts | 2 +- .../nodes-base/nodes/Aws/SES/AwsSes.node.ts | 2 +- .../nodes-base/nodes/Aws/SQS/AwsSqs.node.ts | 2 +- .../nodes/Aws/Textract/AwsTextract.node.ts | 2 +- .../Aws/Transcribe/AwsTranscribe.node.ts | 2 +- .../nodes/BambooHr/v1/actions/router.ts | 2 +- .../nodes-base/nodes/Baserow/Baserow.node.ts | 2 +- .../nodes/Beeminder/Beeminder.node.ts | 2 +- packages/nodes-base/nodes/Bitly/Bitly.node.ts | 2 +- packages/nodes-base/nodes/Box/Box.node.ts | 2 +- .../nodes/Brandfetch/Brandfetch.node.ts | 2 +- .../nodes/Chargebee/Chargebee.node.ts | 2 +- .../nodes/CircleCi/CircleCi.node.ts | 2 +- .../nodes/Cisco/Webex/CiscoWebex.node.ts | 4 +- .../nodes/Clearbit/Clearbit.node.ts | 2 +- .../nodes-base/nodes/ClickUp/ClickUp.node.ts | 2 +- .../nodes/Clockify/Clockify.node.ts | 2 +- .../nodes/Cloudflare/Cloudflare.node.ts | 2 +- .../nodes-base/nodes/Cockpit/Cockpit.node.ts | 2 +- packages/nodes-base/nodes/Coda/Coda.node.ts | 34 +++++++------- packages/nodes-base/nodes/Code/Code.node.ts | 4 +- .../nodes/CoinGecko/CoinGecko.node.ts | 2 +- .../nodes/Compression/Compression.node.ts | 2 +- .../nodes/Contentful/Contentful.node.ts | 2 +- .../nodes/ConvertKit/ConvertKit.node.ts | 2 +- .../nodes-base/nodes/Copper/Copper.node.ts | 2 +- .../nodes-base/nodes/Cortex/Cortex.node.ts | 2 +- .../nodes-base/nodes/Crypto/Crypto.node.ts | 2 +- .../nodes/CustomerIo/CustomerIo.node.ts | 2 +- .../nodes/DateTime/V1/DateTimeV1.node.ts | 2 +- .../nodes/DateTime/V2/DateTimeV2.node.ts | 2 +- .../nodes/DebugHelper/DebugHelper.node.ts | 2 +- packages/nodes-base/nodes/DeepL/DeepL.node.ts | 2 +- packages/nodes-base/nodes/Demio/Demio.node.ts | 2 +- packages/nodes-base/nodes/Dhl/Dhl.node.ts | 2 +- .../v2/actions/channel/create.operation.ts | 2 +- .../channel/deleteChannel.operation.ts | 2 +- .../v2/actions/channel/get.operation.ts | 2 +- .../v2/actions/channel/getAll.operation.ts | 2 +- .../v2/actions/channel/update.operation.ts | 2 +- .../v2/actions/member/getAll.operation.ts | 2 +- .../v2/actions/member/roleAdd.operation.ts | 2 +- .../v2/actions/member/roleRemove.operation.ts | 2 +- .../message/deleteMessage.operation.ts | 2 +- .../v2/actions/message/get.operation.ts | 2 +- .../v2/actions/message/getAll.operation.ts | 2 +- .../v2/actions/message/react.operation.ts | 2 +- .../v2/actions/message/send.operation.ts | 2 +- .../actions/webhook/sendLegacy.operation.ts | 2 +- .../nodes/Discourse/Discourse.node.ts | 2 +- .../nodes-base/nodes/Disqus/Disqus.node.ts | 2 +- packages/nodes-base/nodes/Drift/Drift.node.ts | 2 +- .../nodes-base/nodes/Dropbox/Dropbox.node.ts | 2 +- .../nodes/EditImage/EditImage.node.ts | 2 +- packages/nodes-base/nodes/Egoi/Egoi.node.ts | 2 +- .../ElasticSecurity/ElasticSecurity.node.ts | 2 +- .../nodes/EmailSend/v1/EmailSendV1.node.ts | 2 +- .../nodes/EmailSend/v2/send.operation.ts | 2 +- .../nodes-base/nodes/Emelia/Emelia.node.ts | 2 +- .../ExecuteCommand/ExecuteCommand.node.ts | 2 +- .../ExecuteWorkflow/ExecuteWorkflow.node.ts | 4 +- .../nodes/Facebook/FacebookGraphApi.node.ts | 2 +- .../nodes/FileMaker/FileMaker.node.ts | 2 +- .../actions/spreadsheet.operation.ts | 2 +- .../actions/toBinary.operation.ts | 2 +- .../ConvertToFile/actions/toJson.operation.ts | 4 +- .../ConvertToFile/actions/toText.operation.ts | 2 +- .../actions/moveTo.operation.ts | 2 +- .../ExtractFromFile/actions/pdf.operation.ts | 2 +- .../ReadWriteFile/actions/read.operation.ts | 2 +- .../ReadWriteFile/actions/write.operation.ts | 2 +- .../nodes/Filter/V2/FilterV2.node.ts | 2 +- .../nodes/Freshdesk/Freshdesk.node.ts | 2 +- .../nodes/Freshservice/Freshservice.node.ts | 2 +- .../nodes/FreshworksCrm/FreshworksCrm.node.ts | 2 +- packages/nodes-base/nodes/Ftp/Ftp.node.ts | 4 +- .../nodes/Function/Function.node.ts | 2 +- .../nodes/FunctionItem/FunctionItem.node.ts | 4 +- .../nodes/GetResponse/GetResponse.node.ts | 2 +- packages/nodes-base/nodes/Ghost/Ghost.node.ts | 2 +- packages/nodes-base/nodes/Git/Git.node.ts | 2 +- .../nodes-base/nodes/Github/Github.node.ts | 2 +- .../nodes-base/nodes/Gitlab/Gitlab.node.ts | 4 +- .../nodes/GoToWebinar/GoToWebinar.node.ts | 2 +- .../Analytics/v1/GoogleAnalyticsV1.node.ts | 2 +- .../Google/Analytics/v2/actions/router.ts | 2 +- .../BigQuery/v1/GoogleBigQueryV1.node.ts | 4 +- .../database/executeQuery.operation.ts | 4 +- .../v2/actions/database/insert.operation.ts | 2 +- .../nodes/Google/Books/GoogleBooks.node.ts | 2 +- .../Google/Calendar/GoogleCalendar.node.ts | 2 +- .../nodes/Google/Chat/GoogleChat.node.ts | 2 +- .../Google/Contacts/GoogleContacts.node.ts | 2 +- .../nodes/Google/Docs/GoogleDocs.node.ts | 2 +- .../Google/Drive/v1/GoogleDriveV1.node.ts | 2 +- .../nodes/Google/Drive/v2/actions/router.ts | 2 +- .../GoogleFirebaseCloudFirestore.node.ts | 4 +- .../GoogleFirebaseRealtimeDatabase.node.ts | 2 +- .../Google/GSuiteAdmin/GSuiteAdmin.node.ts | 2 +- .../nodes/Google/Gmail/v1/GmailV1.node.ts | 2 +- .../nodes/Google/Gmail/v2/GmailV2.node.ts | 2 +- .../Perspective/GooglePerspective.node.ts | 2 +- .../Google/Sheet/v1/GoogleSheetsV1.node.ts | 18 +++---- .../nodes/Google/Sheet/v2/actions/router.ts | 2 +- .../nodes/Google/Slides/GoogleSlides.node.ts | 2 +- .../nodes/Google/Task/GoogleTasks.node.ts | 2 +- .../nodes/Google/YouTube/YouTube.node.ts | 2 +- .../nodes-base/nodes/Gotify/Gotify.node.ts | 2 +- .../nodes-base/nodes/Grafana/Grafana.node.ts | 2 +- .../nodes-base/nodes/GraphQL/GraphQL.node.ts | 2 +- packages/nodes-base/nodes/Grist/Grist.node.ts | 2 +- .../nodes/HackerNews/HackerNews.node.ts | 2 +- .../nodes-base/nodes/HaloPSA/HaloPSA.node.ts | 2 +- .../nodes-base/nodes/Harvest/Harvest.node.ts | 2 +- .../nodes/HelpScout/HelpScout.node.ts | 2 +- .../nodes/HomeAssistant/HomeAssistant.node.ts | 2 +- packages/nodes-base/nodes/Html/Html.node.ts | 2 +- .../nodes/HtmlExtract/HtmlExtract.node.ts | 2 +- .../nodes/Hubspot/V1/HubspotV1.node.ts | 4 +- .../nodes/Hubspot/V2/HubspotV2.node.ts | 4 +- .../nodes-base/nodes/Hunter/Hunter.node.ts | 2 +- .../nodes/ICalendar/createEvent.operation.ts | 2 +- packages/nodes-base/nodes/If/V2/IfV2.node.ts | 2 +- .../nodes/Intercom/Intercom.node.ts | 2 +- .../nodes/InvoiceNinja/InvoiceNinja.node.ts | 2 +- .../nodes-base/nodes/Jenkins/Jenkins.node.ts | 2 +- packages/nodes-base/nodes/Jwt/Jwt.node.ts | 2 +- packages/nodes-base/nodes/Kafka/Kafka.node.ts | 2 +- packages/nodes-base/nodes/Ldap/Ldap.node.ts | 4 +- .../nodes-base/nodes/Lemlist/Lemlist.node.ts | 2 +- packages/nodes-base/nodes/Line/Line.node.ts | 2 +- .../nodes-base/nodes/Linear/Linear.node.ts | 2 +- .../nodes/LinkedIn/LinkedIn.node.ts | 2 +- .../nodes/LoneScale/LoneScale.node.ts | 2 +- .../nodes-base/nodes/Magento/Magento2.node.ts | 2 +- .../nodes/Mailcheck/Mailcheck.node.ts | 2 +- .../nodes/Mailchimp/Mailchimp.node.ts | 2 +- .../nodes/MailerLite/MailerLite.node.ts | 2 +- .../nodes-base/nodes/Mailgun/Mailgun.node.ts | 2 +- .../nodes-base/nodes/Mailjet/Mailjet.node.ts | 2 +- .../nodes/Mandrill/Mandrill.node.ts | 2 +- .../nodes/Markdown/Markdown.node.ts | 2 +- .../nodes/Marketstack/Marketstack.node.ts | 2 +- .../nodes-base/nodes/Matrix/Matrix.node.ts | 2 +- .../nodes/Mattermost/v1/actions/router.ts | 2 +- .../nodes-base/nodes/Mautic/Mautic.node.ts | 2 +- .../nodes-base/nodes/Medium/Medium.node.ts | 2 +- .../nodes/MessageBird/MessageBird.node.ts | 2 +- .../Dynamics/MicrosoftDynamicsCrm.node.ts | 2 +- .../Excel/v1/MicrosoftExcelV1.node.ts | 12 ++--- .../v2/actions/table/addTable.operation.ts | 2 +- .../v2/actions/table/append.operation.ts | 2 +- .../actions/table/convertToRange.operation.ts | 2 +- .../v2/actions/table/deleteTable.operation.ts | 2 +- .../v2/actions/table/getColumns.operation.ts | 2 +- .../v2/actions/table/getRows.operation.ts | 2 +- .../v2/actions/table/lookup.operation.ts | 2 +- .../workbook/addWorksheet.operation.ts | 2 +- .../workbook/deleteWorkbook.operation.ts | 2 +- .../v2/actions/workbook/getAll.operation.ts | 2 +- .../v2/actions/worksheet/clear.operation.ts | 2 +- .../worksheet/deleteWorksheet.operation.ts | 2 +- .../v2/actions/worksheet/getAll.operation.ts | 2 +- .../actions/worksheet/readRows.operation.ts | 2 +- .../v2/actions/worksheet/update.operation.ts | 2 +- .../v2/actions/worksheet/upsert.operation.ts | 2 +- .../MicrosoftGraphSecurity.node.ts | 2 +- .../OneDrive/MicrosoftOneDrive.node.ts | 2 +- .../Outlook/v1/MicrosoftOutlookV1.node.ts | 42 ++++++++--------- .../Microsoft/Outlook/v2/actions/router.ts | 2 +- .../nodes/Microsoft/Sql/MicrosoftSql.node.ts | 4 +- .../Teams/v1/MicrosoftTeamsV1.node.ts | 2 +- .../Microsoft/Teams/v2/actions/router.ts | 2 +- .../Microsoft/ToDo/MicrosoftToDo.node.ts | 2 +- .../nodes-base/nodes/Mindee/Mindee.node.ts | 2 +- packages/nodes-base/nodes/Misp/Misp.node.ts | 2 +- .../nodes-base/nodes/Mocean/Mocean.node.ts | 2 +- .../nodes/MondayCom/MondayCom.node.ts | 2 +- .../nodes-base/nodes/MongoDb/MongoDb.node.ts | 14 +++--- .../nodes/MonicaCrm/MonicaCrm.node.ts | 2 +- .../nodes-base/nodes/MySql/v1/MySqlV1.node.ts | 6 +-- .../nodes/MySql/v2/helpers/utils.ts | 6 +-- packages/nodes-base/nodes/Nasa/Nasa.node.ts | 2 +- .../nodes-base/nodes/Netlify/Netlify.node.ts | 2 +- .../nodes/Netscaler/ADC/NetscalerAdc.node.ts | 2 +- .../nodes/NextCloud/NextCloud.node.ts | 4 +- .../nodes-base/nodes/NocoDB/NocoDB.node.ts | 10 ++-- .../nodes/Notion/v2/NotionV2.node.ts | 28 +++++------ packages/nodes-base/nodes/Odoo/Odoo.node.ts | 2 +- .../nodes/OneSimpleApi/OneSimpleApi.node.ts | 2 +- packages/nodes-base/nodes/Onfleet/Onfleet.ts | 20 ++++---- .../nodes/OpenThesaurus/OpenThesaurus.node.ts | 2 +- .../OpenWeatherMap/OpenWeatherMap.node.ts | 2 +- .../nodes-base/nodes/Paddle/Paddle.node.ts | 2 +- .../nodes/PagerDuty/PagerDuty.node.ts | 2 +- .../nodes-base/nodes/PayPal/PayPal.node.ts | 2 +- .../nodes/Phantombuster/Phantombuster.node.ts | 2 +- .../nodes/Pipedrive/Pipedrive.node.ts | 2 +- .../nodes-base/nodes/PostHog/PostHog.node.ts | 8 ++-- .../nodes/ProfitWell/ProfitWell.node.ts | 2 +- .../nodes/Pushbullet/Pushbullet.node.ts | 2 +- .../nodes/Pushover/Pushover.node.ts | 2 +- .../nodes/QuickBooks/QuickBooks.node.ts | 2 +- .../nodes/Raindrop/Raindrop.node.ts | 2 +- .../ReadBinaryFile/ReadBinaryFile.node.ts | 2 +- .../nodes-base/nodes/ReadPdf/ReadPDF.node.ts | 2 +- .../nodes-base/nodes/Reddit/Reddit.node.ts | 2 +- .../RespondToWebhook/RespondToWebhook.node.ts | 2 +- .../nodes/Rocketchat/Rocketchat.node.ts | 2 +- .../nodes/RssFeedRead/RssFeedRead.node.ts | 2 +- packages/nodes-base/nodes/S3/S3.node.ts | 2 +- .../nodes/Salesforce/Salesforce.node.ts | 2 +- .../nodes/SeaTable/SeaTable.node.ts | 10 ++-- .../nodes-base/nodes/Segment/Segment.node.ts | 2 +- .../nodes/SendGrid/SendGrid.node.ts | 20 ++++---- .../nodes/SentryIo/SentryIo.node.ts | 2 +- .../nodes/ServiceNow/ServiceNow.node.ts | 2 +- .../nodes-base/nodes/Set/v2/manual.mode.ts | 2 +- packages/nodes-base/nodes/Set/v2/raw.mode.ts | 2 +- .../nodes-base/nodes/Shopify/Shopify.node.ts | 2 +- .../nodes-base/nodes/Signl4/Signl4.node.ts | 2 +- .../nodes-base/nodes/Slack/V1/SlackV1.node.ts | 2 +- .../nodes-base/nodes/Slack/V2/SlackV2.node.ts | 2 +- packages/nodes-base/nodes/Sms77/Sms77.node.ts | 2 +- .../nodes-base/nodes/Spontit/Spontit.node.ts | 2 +- .../nodes-base/nodes/Spotify/Spotify.node.ts | 2 +- .../v1/SpreadsheetFileV1.node.ts | 4 +- .../SpreadsheetFile/v2/fromFile.operation.ts | 2 +- .../SpreadsheetFile/v2/toFile.operation.ts | 2 +- packages/nodes-base/nodes/Ssh/Ssh.node.ts | 2 +- .../nodes-base/nodes/Stackby/Stackby.node.ts | 8 ++-- .../nodes/Storyblok/Storyblok.node.ts | 2 +- .../nodes-base/nodes/Strapi/Strapi.node.ts | 2 +- .../nodes-base/nodes/Strava/Strava.node.ts | 2 +- .../nodes-base/nodes/Stripe/Stripe.node.ts | 2 +- .../nodes/Supabase/Supabase.node.ts | 10 ++-- .../nodes/Switch/V1/SwitchV1.node.ts | 2 +- .../nodes/Switch/V2/SwitchV2.node.ts | 2 +- .../nodes/Switch/V3/SwitchV3.node.ts | 2 +- .../nodes/SyncroMSP/v1/actions/router.ts | 2 +- packages/nodes-base/nodes/Taiga/Taiga.node.ts | 2 +- .../nodes/Tapfiliate/Tapfiliate.node.ts | 2 +- .../nodes/Telegram/Telegram.node.ts | 2 +- .../nodes-base/nodes/TheHive/TheHive.node.ts | 2 +- .../nodes/TheHiveProject/actions/router.ts | 2 +- .../nodes/Todoist/v1/TodoistV1.node.ts | 2 +- .../nodes/Todoist/v2/TodoistV2.node.ts | 2 +- .../nodes/TravisCi/TravisCi.node.ts | 2 +- .../nodes-base/nodes/Trello/Trello.node.ts | 2 +- .../nodes-base/nodes/Twilio/Twilio.node.ts | 2 +- packages/nodes-base/nodes/Twist/Twist.node.ts | 2 +- .../nodes/Twitter/V1/TwitterV1.node.ts | 2 +- .../nodes/Twitter/V2/TwitterV2.node.ts | 2 +- packages/nodes-base/nodes/UProc/UProc.node.ts | 2 +- .../nodes-base/nodes/Uplead/Uplead.node.ts | 2 +- .../nodes/UptimeRobot/UptimeRobot.node.ts | 2 +- .../nodes/UrlScanIo/UrlScanIo.node.ts | 2 +- .../VenafiTlsProtectDatacenter.node.ts | 2 +- .../VenafiTlsProtectCloud.node.ts | 2 +- packages/nodes-base/nodes/Vero/Vero.node.ts | 2 +- .../nodes-base/nodes/Vonage/Vonage.node.ts | 2 +- packages/nodes-base/nodes/Wekan/Wekan.node.ts | 2 +- packages/nodes-base/nodes/Wise/Wise.node.ts | 2 +- .../nodes/Wordpress/Wordpress.node.ts | 2 +- .../WriteBinaryFile/WriteBinaryFile.node.ts | 2 +- packages/nodes-base/nodes/Xero/Xero.node.ts | 2 +- packages/nodes-base/nodes/Xml/Xml.node.ts | 2 +- .../nodes-base/nodes/Yourls/Yourls.node.ts | 2 +- .../nodes-base/nodes/Zammad/Zammad.node.ts | 2 +- .../nodes-base/nodes/Zendesk/Zendesk.node.ts | 2 +- .../nodes-base/nodes/Zoho/ZohoCrm.node.ts | 2 +- packages/nodes-base/nodes/Zoom/Zoom.node.ts | 2 +- packages/nodes-base/nodes/Zulip/Zulip.node.ts | 2 +- packages/workflow/src/Constants.ts | 2 - packages/workflow/src/Interfaces.ts | 2 +- .../src/errors/node-operation.error.ts | 12 ----- .../workflow/test/errors/node.error.test.ts | 47 ------------------- 320 files changed, 445 insertions(+), 518 deletions(-) diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts index 899fe57a7..887017cca 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts @@ -114,7 +114,7 @@ export async function conversationalAgentExecute( } catch (error) { throwIfToolSchema(this, error); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } }); continue; } diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts index 072039259..12e1dbda4 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts @@ -116,7 +116,7 @@ export async function openAiFunctionsAgentExecute( returnData.push({ json: response }); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } }); continue; } diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts index 4c77a6a0a..a4ae1a0f1 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts @@ -93,7 +93,7 @@ export async function planAndExecuteAgentExecute( returnData.push({ json: response }); } catch (error) { throwIfToolSchema(this, error); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } }); continue; } diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts index 1fdaafc29..11a5acb04 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts @@ -114,7 +114,7 @@ export async function reActAgentAgentExecute( returnData.push({ json: response }); } catch (error) { throwIfToolSchema(this, error); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } }); continue; } diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts index bd8868ad3..4b3149112 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts @@ -142,7 +142,7 @@ export async function sqlAgentAgentExecute( returnData.push({ json: response }); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i } }); continue; } diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts index fc760cb92..295b0a5d1 100644 --- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts +++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts @@ -225,7 +225,7 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise executeData, - continueOnFail: (error?: Error) => { - const shouldContinue = continueOnFail(node); - if (error && shouldContinue && !(error instanceof ApplicationError)) { - error.message = OBFUSCATED_ERROR_MESSAGE; - } - return shouldContinue; + continueOnFail: () => { + return continueOnFail(node); }, evaluateExpression: (expression: string, itemIndex: number) => { return workflow.expression.resolveSimpleParameterValue( diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts index 3e563e04b..a7c282e43 100644 --- a/packages/core/src/WorkflowExecute.ts +++ b/packages/core/src/WorkflowExecute.ts @@ -1333,8 +1333,6 @@ export class WorkflowExecute { } else { // Report any unhandled and non-wrapped errors to Sentry toReport = error; - // Set obfuscate to true so that the error would be obfuscated in th UI - error.obfuscate = true; } if (toReport) { ErrorReporterProxy.error(toReport, { diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue index 7ca1b7d2d..d1bcb87be 100644 --- a/packages/editor-ui/src/components/Error/NodeErrorView.vue +++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue @@ -226,10 +226,6 @@ function addItemIndexSuffix(message: string): string { } function getErrorMessage(): string { - if ('obfuscate' in props.error && props.error.obfuscate === true) { - return i18n.baseText('nodeErrorView.showMessage.obfuscate'); - } - let message = ''; const isSubNodeError = diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index 89d317d64..3fd9714b8 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -1135,7 +1135,6 @@ "nodeErrorView.itemIndex": "Item Index", "nodeErrorView.runIndex": "Run Index", "nodeErrorView.showMessage.title": "Copied to clipboard", - "nodeErrorView.showMessage.obfuscate": "Internal error", "nodeErrorView.stack": "Stack", "nodeErrorView.theErrorCauseIsTooLargeToBeDisplayed": "The error cause is too large to be displayed", "nodeErrorView.time": "Time", diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts index 20a9cbce0..068cf0b90 100644 --- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts +++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts @@ -487,7 +487,7 @@ export class ActionNetwork implements INodeType { ? returnData.push(...(response as IDataObject[])) : returnData.push(response as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts index 33ebbd926..ca7ea31c3 100644 --- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts +++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts @@ -1189,7 +1189,7 @@ export class ActiveCampaign implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts index d526f4f5b..d70d90870 100644 --- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts +++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts @@ -420,7 +420,7 @@ export class Affinity implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts index 9d21d8288..573c34ad6 100644 --- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts +++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts @@ -133,7 +133,7 @@ export class AiTransform implements INodeType { try { items = (await sandbox.runCodeAllItems()) as INodeExecutionData[]; } catch (error) { - if (!this.continueOnFail(error)) { + if (!this.continueOnFail()) { set(error, 'node', node); throw error; } diff --git a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts index b143394e9..84ddd66e0 100644 --- a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts +++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts @@ -653,7 +653,7 @@ export class AirtableV1 implements INodeType { rows.length = 0; } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } @@ -696,7 +696,7 @@ export class AirtableV1 implements INodeType { rows.length = 0; } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } @@ -757,7 +757,7 @@ export class AirtableV1 implements INodeType { }), ]; } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); } else { throw error; @@ -792,7 +792,7 @@ export class AirtableV1 implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } @@ -880,7 +880,7 @@ export class AirtableV1 implements INodeType { rows.length = 0; } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts index fae52ba66..aa791f7b6 100644 --- a/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts +++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts @@ -48,7 +48,7 @@ export async function execute( returnData.push(...executionData); } catch (error) { error = processAirtableError(error as NodeApiError, undefined, i); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts index 3686e33bf..758c3b7a2 100644 --- a/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts +++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts @@ -87,7 +87,7 @@ export async function execute( returnData.push(...executionData); } catch (error) { error = processAirtableError(error as NodeApiError, undefined, i); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { message: error.message, error } }); continue; } diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts index 100590fc5..cbbf12ba3 100644 --- a/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts +++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts @@ -55,7 +55,7 @@ export async function execute( returnData.push(...executionData); } catch (error) { error = processAirtableError(error as NodeApiError, id, i); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts index 4dcfaeda4..73a993307 100644 --- a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts +++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts @@ -91,7 +91,7 @@ export async function execute( returnData.push(...executionData); } catch (error) { error = processAirtableError(error as NodeApiError, id, i); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts index beb11dc92..4d3fc8e9d 100644 --- a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts +++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts @@ -227,7 +227,7 @@ export async function execute( returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { message: error.message, error }, pairedItem: { item: i } }); continue; } else { diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts index cc9d785cf..d2c4172dd 100644 --- a/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts +++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts @@ -138,7 +138,7 @@ export async function execute( returnData.push(...executionData); } catch (error) { error = processAirtableError(error as NodeApiError, recordId, i); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { message: error.message, error } }); continue; } diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts index 27f9314cb..e6266480c 100644 --- a/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts +++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts @@ -148,7 +148,7 @@ export async function execute( returnData.push(...executionData); } catch (error) { error = processAirtableError(error as NodeApiError, undefined, i); - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { message: error.message, error } }); continue; } diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts index 47f1833a3..ce711d969 100644 --- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts +++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts @@ -261,7 +261,7 @@ export class Amqp implements INodeType { return [responseData]; } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { return [[{ json: { error: error.message }, pairedItems: { item: 0 } }]]; } else { throw error; diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts index 0ffbc8d7c..28f1a52c6 100644 --- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts +++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts @@ -385,7 +385,7 @@ export class ApiTemplateIo implements INodeType { returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } @@ -471,7 +471,7 @@ export class ApiTemplateIo implements INodeType { } returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } @@ -561,7 +561,7 @@ export class ApiTemplateIo implements INodeType { } returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts index dc980a96e..550c38627 100644 --- a/packages/nodes-base/nodes/Asana/Asana.node.ts +++ b/packages/nodes-base/nodes/Asana/Asana.node.ts @@ -2467,7 +2467,7 @@ export class Asana implements INodeType { ), ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts index 876dfdbc3..069e2dd03 100644 --- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts +++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts @@ -306,7 +306,7 @@ export class Autopilot implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const exectionErrorWithMetaData = this.helpers.constructExecutionMetaData( [{ json: { error: error.message } }], { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts index ddd95c4a2..1dc35d651 100644 --- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts +++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts @@ -204,7 +204,7 @@ export class AwsLambda implements INodeType { returnData.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: (error as JsonObject).message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.ts b/packages/nodes-base/nodes/Aws/AwsSns.node.ts index fe898d427..858f93774 100644 --- a/packages/nodes-base/nodes/Aws/AwsSns.node.ts +++ b/packages/nodes-base/nodes/Aws/AwsSns.node.ts @@ -318,7 +318,7 @@ export class AwsSns implements INodeType { } as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts index 5cdb0cfa7..25abdb766 100644 --- a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts +++ b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts @@ -223,7 +223,7 @@ export class AwsCertificateManager implements INodeType { returnData.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts index 3d995fd01..8a416bcd5 100644 --- a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts +++ b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts @@ -277,7 +277,7 @@ export class AwsComprehend implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts index efc713000..cecc3aca4 100644 --- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts +++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts @@ -399,7 +399,7 @@ export class AwsDynamoDB implements INodeType { returnData.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts index 470b5b354..fbc781fb6 100644 --- a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts +++ b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts @@ -451,7 +451,7 @@ export class AwsElb implements INodeType { ), ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: (error as JsonObject).toString() }); continue; } diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts index 0f9be63d1..a1e24ea4b 100644 --- a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts +++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts @@ -455,7 +455,7 @@ export class AwsRekognition implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts index 82de951fe..8456f4a8c 100644 --- a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts +++ b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts @@ -893,7 +893,7 @@ export class AwsS3V1 implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts index 789237465..fe97fa076 100644 --- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts +++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts @@ -1057,7 +1057,7 @@ export class AwsS3V2 implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts index 5cf0bd4dc..4589f8a21 100644 --- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts +++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts @@ -1285,7 +1285,7 @@ export class AwsSes implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts index 5b4654a08..474a928bb 100644 --- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts +++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts @@ -378,7 +378,7 @@ export class AwsSqs implements INodeType { const result = responseData.SendMessageResponse.SendMessageResult; returnData.push(result as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.description }); continue; } diff --git a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts index a5173d0d1..6d032b3d8 100644 --- a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts +++ b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts @@ -144,7 +144,7 @@ export class AwsTextract implements INodeType { returnData.push(responseData as unknown as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts index d44f1ca0c..013279db5 100644 --- a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts +++ b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts @@ -540,7 +540,7 @@ export class AwsTranscribe implements INodeType { returnData.push(responseData as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts index 4d3f434a2..9e8cb85a9 100644 --- a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts +++ b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts @@ -39,7 +39,7 @@ export async function router(this: IExecuteFunctions): Promise { x.json.error = error.reason || 'LDAP connection error occurred'; @@ -418,7 +418,7 @@ export class Ldap implements INodeType { ); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnItems.push({ json: items[itemIndex].json, error, pairedItem: itemIndex }); } else { await client.unbind(); diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts index 63c21d7c8..9e55d8375 100644 --- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts +++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts @@ -289,7 +289,7 @@ export class Lemlist implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts index 7cdc4b03d..349e59872 100644 --- a/packages/nodes-base/nodes/Line/Line.node.ts +++ b/packages/nodes-base/nodes/Line/Line.node.ts @@ -129,7 +129,7 @@ export class Line implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts index 0657cf7d0..7ea6f2aca 100644 --- a/packages/nodes-base/nodes/Linear/Linear.node.ts +++ b/packages/nodes-base/nodes/Linear/Linear.node.ts @@ -299,7 +299,7 @@ export class Linear implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts index b3be6c4ea..9732176da 100644 --- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts +++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts @@ -282,7 +282,7 @@ export class LinkedIn implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts b/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts index 521a5f987..46efa2af3 100644 --- a/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts +++ b/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts @@ -466,7 +466,7 @@ export class LoneScale implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.ts b/packages/nodes-base/nodes/Magento/Magento2.node.ts index 835fb8144..0d7196eb7 100644 --- a/packages/nodes-base/nodes/Magento/Magento2.node.ts +++ b/packages/nodes-base/nodes/Magento/Magento2.node.ts @@ -800,7 +800,7 @@ export class Magento2 implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts index 5a9a30aca..2c5562dbc 100644 --- a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts +++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts @@ -98,7 +98,7 @@ export class Mailcheck implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts index 8b452a1ee..c2e63b6f9 100644 --- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts +++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts @@ -2190,7 +2190,7 @@ export class Mailchimp implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts index 266aebcd2..6fe7c621b 100644 --- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts +++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts @@ -182,7 +182,7 @@ export class MailerLite implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts index a36b235d4..324118a46 100644 --- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts +++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts @@ -194,7 +194,7 @@ export class Mailgun implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: itemIndex } }, diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts index a1d282dea..0b02a4590 100644 --- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts +++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts @@ -310,7 +310,7 @@ export class Mailjet implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts index 7371d7acf..b673d3eba 100644 --- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts +++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts @@ -891,7 +891,7 @@ export class Mandrill implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.ts b/packages/nodes-base/nodes/Markdown/Markdown.node.ts index dc38ee256..bcd270797 100644 --- a/packages/nodes-base/nodes/Markdown/Markdown.node.ts +++ b/packages/nodes-base/nodes/Markdown/Markdown.node.ts @@ -608,7 +608,7 @@ export class Markdown implements INodeType { returnData.push(newItem); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: (error as JsonObject).message }); continue; } diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts index 2d7aba98e..62617ee6f 100644 --- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts +++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts @@ -161,7 +161,7 @@ export class Marketstack implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts index eb24fb3c3..141a6c518 100644 --- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts +++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts @@ -151,7 +151,7 @@ export class Matrix implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts index 17ce9945f..bd1af59af 100644 --- a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts +++ b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts @@ -42,7 +42,7 @@ export async function router(this: IExecuteFunctions): Promise result[0]) as unknown as IDataObject[], ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnItems = this.helpers.returnJsonArray({ error: error.message }); } else { await connection.end(); diff --git a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts index daff2a131..1e15ce71b 100644 --- a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts +++ b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts @@ -264,7 +264,7 @@ export function configureQueryRunner( } catch (err) { const error = parseMySqlError.call(this, err, 0, formatedQueries); - if (!this.continueOnFail(err)) throw error; + if (!this.continueOnFail()) throw error; returnData.push({ json: { message: error.message, error: { ...error } } }); } } else { @@ -302,7 +302,7 @@ export function configureQueryRunner( } catch (err) { const error = parseMySqlError.call(this, err, index, [formatedQuery]); - if (!this.continueOnFail(err)) { + if (!this.continueOnFail()) { connection.release(); throw error; } @@ -352,7 +352,7 @@ export function configureQueryRunner( connection.release(); } - if (!this.continueOnFail(err)) throw error; + if (!this.continueOnFail()) throw error; returnData.push(prepareErrorItem(queries[index], error as Error, index)); // Return here because we already rolled back the transaction diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts index b192c2145..b291680c5 100644 --- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts +++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts @@ -1110,7 +1110,7 @@ export class Nasa implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { if (resource === 'earthImagery' && operation === 'get') { items[i].json = { error: error.message }; } else if (resource === 'astronomyPictureOfTheDay' && operation === 'get' && download) { diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.ts b/packages/nodes-base/nodes/Netlify/Netlify.node.ts index 11cd3c1fe..c2f6f9332 100644 --- a/packages/nodes-base/nodes/Netlify/Netlify.node.ts +++ b/packages/nodes-base/nodes/Netlify/Netlify.node.ts @@ -195,7 +195,7 @@ export class Netlify implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts b/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts index 5dd09f980..2f7fff154 100644 --- a/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts +++ b/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts @@ -240,7 +240,7 @@ export class NetscalerAdc implements INodeType { }), ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: (error as JsonObject).toString() }); continue; } diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts index e889bf572..9a710c2a9 100644 --- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts +++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts @@ -1099,7 +1099,7 @@ export class NextCloud implements INodeType { qs, ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { if (resource === 'file' && operation === 'download') { items[i].json = { error: error.message }; } else { @@ -1288,7 +1288,7 @@ export class NextCloud implements INodeType { returnData.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { if (resource === 'file' && operation === 'download') { items[i].json = { error: error.message }; } else { diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts index 00b46ebd0..390c3e279 100644 --- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts +++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts @@ -405,7 +405,7 @@ export class NocoDB implements INodeType { returnData.push(...body); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.toString() }); } throw new NodeApiError(this.getNode(), error as JsonObject); @@ -468,7 +468,7 @@ export class NocoDB implements INodeType { returnData.push(...responseData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.toString() }); } throw new NodeApiError(this.getNode(), error as JsonObject); @@ -541,7 +541,7 @@ export class NocoDB implements INodeType { return [data]; } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.toString() } }); } else { throw error; @@ -617,7 +617,7 @@ export class NocoDB implements INodeType { newItems.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.toString() }), { itemData: { item: i } }, @@ -759,7 +759,7 @@ export class NocoDB implements INodeType { returnData.push(...body); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.toString() }); } throw new NodeApiError(this.getNode(), error as JsonObject); diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts index c69bb8ee7..6c5205f9d 100644 --- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts +++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts @@ -86,7 +86,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -161,7 +161,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -193,7 +193,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -236,7 +236,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -299,7 +299,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -386,7 +386,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -416,7 +416,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -511,7 +511,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -563,7 +563,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -589,7 +589,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -618,7 +618,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -652,7 +652,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -704,7 +704,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, @@ -766,7 +766,7 @@ export class NotionV2 implements INodeType { ); returnData = returnData.concat(executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: { item: i }, diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts index 0df41f47b..58472d934 100644 --- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts +++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts @@ -751,7 +751,7 @@ export class Odoo implements INodeType { returnData.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts index be8e294ce..e04dbaaed 100644 --- a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts +++ b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts @@ -865,7 +865,7 @@ export class OneSimpleApi implements INodeType { returnData.push(responseData as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.ts index 1c49d8908..b5c17186c 100644 --- a/packages/nodes-base/nodes/Onfleet/Onfleet.ts +++ b/packages/nodes-base/nodes/Onfleet/Onfleet.ts @@ -879,7 +879,7 @@ export class Onfleet { } } catch (error) { //@ts-ignore - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -923,7 +923,7 @@ export class Onfleet { responseData.push(await onfleetApiRequest.call(this, 'GET', path)); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -965,7 +965,7 @@ export class Onfleet { responseData.push(await onfleetApiRequest.call(this, 'GET', path)); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -1022,7 +1022,7 @@ export class Onfleet { responseData.push(await onfleetApiRequest.call(this, 'GET', path)); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -1085,7 +1085,7 @@ export class Onfleet { responseData.push({ success: true }); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -1140,7 +1140,7 @@ export class Onfleet { responseData.push(await onfleetApiRequest.call(this, 'PUT', path, hubData)); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -1259,7 +1259,7 @@ export class Onfleet { responseData.push(await onfleetApiRequest.call(this, 'POST', path, workerSchedule)); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -1308,7 +1308,7 @@ export class Onfleet { responseData.push({ success: true }); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -1366,7 +1366,7 @@ export class Onfleet { responseData.push(await onfleetApiRequest.call(this, 'PUT', path, { tasks, ...options })); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } @@ -1462,7 +1462,7 @@ export class Onfleet { responseData.push(await onfleetApiRequest.call(this, 'POST', path, teamAutoDispatch)); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { responseData.push({ error: (error as IDataObject).toString() }); continue; } diff --git a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts index b85e29629..0e2481f62 100644 --- a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts +++ b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts @@ -173,7 +173,7 @@ export class OpenThesaurus implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts index 9cb874c68..c5766b5df 100644 --- a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts +++ b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts @@ -278,7 +278,7 @@ export class OpenWeatherMap implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts index d472b428e..cb9ce4b76 100644 --- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts +++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts @@ -520,7 +520,7 @@ export class Paddle implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts index d55a9db02..4a1cfbbe6 100644 --- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts +++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts @@ -460,7 +460,7 @@ export class PagerDuty implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts index bbd46890b..c046226a3 100644 --- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts +++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts @@ -242,7 +242,7 @@ export class PayPal implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts index 0bb38ba27..33a323830 100644 --- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts +++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts @@ -253,7 +253,7 @@ export class Phantombuster implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts index 15cb8358b..7fb02e9fa 100644 --- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts +++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts @@ -4962,7 +4962,7 @@ export class Pipedrive implements INodeType { returnData.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { if (resource === 'file' && operation === 'download') { items[i].json = { error: error.message }; } else { diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts index 7b9a1b737..603bddcc0 100644 --- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts +++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts @@ -122,7 +122,7 @@ export class PostHog implements INodeType { returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } @@ -174,7 +174,7 @@ export class PostHog implements INodeType { returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); } else { throw error; @@ -218,7 +218,7 @@ export class PostHog implements INodeType { returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } @@ -274,7 +274,7 @@ export class PostHog implements INodeType { returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts index 727d32ac5..8298e6834 100644 --- a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts +++ b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts @@ -139,7 +139,7 @@ export class ProfitWell implements INodeType { returnData.push(responseData as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts index c1a9209da..6af7b5f23 100644 --- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts +++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts @@ -493,7 +493,7 @@ export class Pushbullet implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts index b1262175d..2ac87ecb8 100644 --- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts +++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts @@ -359,7 +359,7 @@ export class Pushover implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts index 8e81df8aa..17e1e01e9 100644 --- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts +++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts @@ -1119,7 +1119,7 @@ export class QuickBooks implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const download = this.getNodeParameter('download', 0, false); if ( ['invoice', 'estimate', 'payment'].includes(resource) && diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts index 2a4661b35..9a14e7785 100644 --- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts +++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts @@ -417,7 +417,7 @@ export class Raindrop implements INodeType { ? returnData.push(...(responseData as IDataObject[])) : returnData.push(responseData as IDataObject); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts index a41dadbe7..dedc00d37 100644 --- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts +++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts @@ -75,7 +75,7 @@ export class ReadBinaryFile implements INodeType { newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(stream, filePath); returnData.push(newItem); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: (error as Error).message, diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts index 7eed004d5..c7a1485cb 100644 --- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts +++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts @@ -85,7 +85,7 @@ export class ReadPDF implements INodeType { json, }); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message, diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts index 38d35b132..d04e6406a 100644 --- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts +++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts @@ -428,7 +428,7 @@ export class Reddit implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts index ea378f97e..68bd19e3f 100644 --- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts +++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts @@ -433,7 +433,7 @@ export class RespondToWebhook implements INodeType { this.sendResponse(response); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const itemData = generatePairedItemData(items.length); const returnData = this.helpers.constructExecutionMetaData( [{ json: { error: error.message } }], diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts index de8ddb492..274aae41a 100644 --- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts +++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts @@ -484,7 +484,7 @@ export class Rocketchat implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts index 4b63a43d7..de9f602b8 100644 --- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts +++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts @@ -137,7 +137,7 @@ export class RssFeedRead implements INodeType { returnData.push(...executionData); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message }, pairedItem: fallbackPairedItems || [{ item: i }], diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts index 777788d52..bfb581447 100644 --- a/packages/nodes-base/nodes/S3/S3.node.ts +++ b/packages/nodes-base/nodes/S3/S3.node.ts @@ -890,7 +890,7 @@ export class S3 implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { if (resource === 'file' && operation === 'download') { items[i].json = { error: error.message }; } else { diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts index 73fc54fce..df0fd2951 100644 --- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts +++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts @@ -3084,7 +3084,7 @@ export class Salesforce implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts index 9010e0d3c..0b62dae69 100644 --- a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts +++ b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts @@ -234,7 +234,7 @@ export class SeaTable implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -266,7 +266,7 @@ export class SeaTable implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -329,7 +329,7 @@ export class SeaTable implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -364,7 +364,7 @@ export class SeaTable implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -431,7 +431,7 @@ export class SeaTable implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts index d54612d11..bfef2985a 100644 --- a/packages/nodes-base/nodes/Segment/Segment.node.ts +++ b/packages/nodes-base/nodes/Segment/Segment.node.ts @@ -617,7 +617,7 @@ export class Segment implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts index eedd6f7e6..c80352120 100644 --- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts +++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts @@ -173,7 +173,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -214,7 +214,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -306,7 +306,7 @@ export class SendGrid implements INodeType { ); returnData.push(responseData as INodeExecutionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message } }); } else { throw error; @@ -335,7 +335,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -372,7 +372,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -403,7 +403,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -433,7 +433,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -464,7 +464,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -494,7 +494,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -642,7 +642,7 @@ export class SendGrid implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts index bd76abd86..ad83f771b 100644 --- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts +++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts @@ -733,7 +733,7 @@ export class SentryIo implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts index 0e866e135..50d78a31f 100644 --- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts +++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts @@ -1138,7 +1138,7 @@ export class ServiceNow implements INodeType { }); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Set/v2/manual.mode.ts b/packages/nodes-base/nodes/Set/v2/manual.mode.ts index 724a30333..282730bbf 100644 --- a/packages/nodes-base/nodes/Set/v2/manual.mode.ts +++ b/packages/nodes-base/nodes/Set/v2/manual.mode.ts @@ -249,7 +249,7 @@ export async function execute( ); return composeReturnItem.call(this, i, item, newData, options, node.typeVersion); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { return { json: { error: (error as Error).message, pairedItem: { item: i } } }; } throw new NodeOperationError(this.getNode(), error as Error, { diff --git a/packages/nodes-base/nodes/Set/v2/raw.mode.ts b/packages/nodes-base/nodes/Set/v2/raw.mode.ts index 86aa11c75..b24a5e2dd 100644 --- a/packages/nodes-base/nodes/Set/v2/raw.mode.ts +++ b/packages/nodes-base/nodes/Set/v2/raw.mode.ts @@ -56,7 +56,7 @@ export async function execute( return composeReturnItem.call(this, i, item, newData, options, node.typeVersion); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { return { json: { error: (error as Error).message }, pairedItem: { item: i } }; } throw new NodeOperationError(node, error as Error, { diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts index 0c3f49078..f2c70184e 100644 --- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts +++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts @@ -466,7 +466,7 @@ export class Shopify implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts index b86170ea6..6aa599b12 100644 --- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts +++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts @@ -342,7 +342,7 @@ export class Signl4 implements INodeType { returnData.push(responseData as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts index 70cd85246..585bde58e 100644 --- a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts +++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts @@ -1372,7 +1372,7 @@ export class SlackV1 implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: (error as JsonObject).message } }); continue; } diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts index 19a5efc28..14d62c697 100644 --- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts +++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts @@ -1359,7 +1359,7 @@ export class SlackV2 implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: (error as JsonObject).message } }); continue; } diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts index 1fd9a9a12..a59f1ea21 100644 --- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts +++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts @@ -298,7 +298,7 @@ export class Sms77 implements INodeType { returnData.push(responseData as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts index c91fb3ece..9e20cd87c 100644 --- a/packages/nodes-base/nodes/Spontit/Spontit.node.ts +++ b/packages/nodes-base/nodes/Spontit/Spontit.node.ts @@ -103,7 +103,7 @@ export class Spontit implements INodeType { returnData.push(responseData as IDataObject); } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ error: error.message }); continue; } diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts index 5a7db76a6..b951831c3 100644 --- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts +++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts @@ -1314,7 +1314,7 @@ export class Spotify implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts index b954aa169..99c7cc80b 100644 --- a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts +++ b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts @@ -155,7 +155,7 @@ export class SpreadsheetFileV1 implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { newItems.push({ json: { error: error.message, @@ -242,7 +242,7 @@ export class SpreadsheetFileV1 implements INodeType { newItems.push(newItem); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { newItems.push({ json: { error: error.message, diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts index de0e41ba6..719faeb47 100644 --- a/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts +++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts @@ -209,7 +209,7 @@ export async function execute( error.message = `The file selected in 'Input Binary Field' is not in ${fileFormat} format`; errorDescription = `Try to change the operation or select a ${fileFormat} file in 'Input Binary Field'`; } - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message, diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts index 85948b991..61f8f8509 100644 --- a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts +++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts @@ -29,7 +29,7 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData returnData.push(newItem); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData.push({ json: { error: error.message, diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts index ad17713ff..c344fcf7a 100644 --- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts +++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts @@ -466,7 +466,7 @@ export class Ssh implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { if (resource === 'file' && operation === 'download') { items[i] = { json: { diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts index c269849a7..72c9ef4a1 100644 --- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts +++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts @@ -192,7 +192,7 @@ export class Stackby implements INodeType { responseData.map((data: any) => data.field) as INodeExecutionData[], ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -228,7 +228,7 @@ export class Stackby implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -282,7 +282,7 @@ export class Stackby implements INodeType { responseData.map((data: any) => data.field) as INodeExecutionData[], ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const itemData = generatePairedItemData(items.length); const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), @@ -332,7 +332,7 @@ export class Stackby implements INodeType { responseData.map((data: any) => data.field) as INodeExecutionData[], ); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts index 02045aa29..c921e6a26 100644 --- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts +++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts @@ -349,7 +349,7 @@ export class Storyblok implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts index 8c991e739..c3ff781b6 100644 --- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts +++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts @@ -389,7 +389,7 @@ export class Strapi implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts index 32f989051..48f01c78f 100644 --- a/packages/nodes-base/nodes/Strava/Strava.node.ts +++ b/packages/nodes-base/nodes/Strava/Strava.node.ts @@ -187,7 +187,7 @@ export class Strava implements INodeType { returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts index 79d829d61..2c8b3042a 100644 --- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts +++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts @@ -464,7 +464,7 @@ export class Stripe implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionErrorData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts index 6323747b7..d6151b2dc 100644 --- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts +++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts @@ -171,7 +171,7 @@ export class Supabase implements INodeType { returnData.push(...executionData); }); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.description }), { itemData: mapPairedItemsFrom(records) }, @@ -220,7 +220,7 @@ export class Supabase implements INodeType { try { rows = await supabaseApiRequest.call(this, 'DELETE', endpoint, {}, qs); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.description }), { itemData: { item: i } }, @@ -260,7 +260,7 @@ export class Supabase implements INodeType { try { rows = await supabaseApiRequest.call(this, 'GET', endpoint, {}, qs); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.message }), { itemData: { item: i } }, @@ -326,7 +326,7 @@ export class Supabase implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.description }), { itemData: { item: i } }, @@ -402,7 +402,7 @@ export class Supabase implements INodeType { ); returnData.push(...executionData); } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { const executionData = this.helpers.constructExecutionMetaData( this.helpers.returnJsonArray({ error: error.description }), { itemData: { item: i } }, diff --git a/packages/nodes-base/nodes/Switch/V1/SwitchV1.node.ts b/packages/nodes-base/nodes/Switch/V1/SwitchV1.node.ts index 4782da7c8..b3c2ca30b 100644 --- a/packages/nodes-base/nodes/Switch/V1/SwitchV1.node.ts +++ b/packages/nodes-base/nodes/Switch/V1/SwitchV1.node.ts @@ -678,7 +678,7 @@ export class SwitchV1 implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData[0].push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts b/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts index c940658c6..19f56fd5d 100644 --- a/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts +++ b/packages/nodes-base/nodes/Switch/V2/SwitchV2.node.ts @@ -699,7 +699,7 @@ export class SwitchV2 implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData[0].push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts index 5c9c212b4..6892bc2d2 100644 --- a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts +++ b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts @@ -396,7 +396,7 @@ export class SwitchV3 implements INodeType { } } } catch (error) { - if (this.continueOnFail(error)) { + if (this.continueOnFail()) { returnData[0].push({ json: { error: error.message } }); continue; } diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts index c57f20f53..3b5a5b321 100644 --- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts +++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts @@ -42,7 +42,7 @@ export async function router(this: IExecuteFunctions): Promise = Functions export type ContextType = 'flow' | 'node'; type BaseExecutionFunctions = FunctionsBaseWithRequiredKeys<'getMode'> & { - continueOnFail(error?: Error): boolean; + continueOnFail(): boolean; evaluateExpression(expression: string, itemIndex: number): NodeParameterValueType; getContext(type: ContextType): IContextObject; getExecuteData(): IExecuteData; diff --git a/packages/workflow/src/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts index 199071468..c55cd003c 100644 --- a/packages/workflow/src/errors/node-operation.error.ts +++ b/packages/workflow/src/errors/node-operation.error.ts @@ -9,8 +9,6 @@ import { ApplicationError } from './application.error'; export class NodeOperationError extends NodeError { type: string | undefined; - obfuscate: boolean = false; - constructor( node: INode, error: Error | string | JsonObject, @@ -20,13 +18,8 @@ export class NodeOperationError extends NodeError { return error; } - let obfuscateErrorMessage = false; - if (typeof error === 'string') { error = new ApplicationError(error); - } else if (!(error instanceof ApplicationError)) { - // this error was no processed by n8n, obfuscate error message - obfuscateErrorMessage = true; } super(node, error); @@ -35,11 +28,6 @@ export class NodeOperationError extends NodeError { error.messages.forEach((message) => this.addToMessages(message)); } - if (obfuscateErrorMessage && !options.description) { - const originalMessage = typeof error === 'string' ? error : (error.message as string); - this.addToMessages(originalMessage); - this.obfuscate = true; - } if (options.message) this.message = options.message; if (options.level) this.level = options.level; if (options.functionality) this.functionality = options.functionality; diff --git a/packages/workflow/test/errors/node.error.test.ts b/packages/workflow/test/errors/node.error.test.ts index 4ec8c1d61..7d0783a65 100644 --- a/packages/workflow/test/errors/node.error.test.ts +++ b/packages/workflow/test/errors/node.error.test.ts @@ -2,7 +2,6 @@ import { mock } from 'jest-mock-extended'; import type { INode } from '@/Interfaces'; import { NodeApiError } from '@/errors/node-api.error'; import { NodeOperationError } from '@/errors/node-operation.error'; -import { ApplicationError } from '@/errors/application.error'; describe('NodeError', () => { const node = mock(); @@ -16,50 +15,4 @@ describe('NodeError', () => { expect(wrapped1).toEqual(apiError); expect(wrapped2).toEqual(opsError); }); - - it('should obfuscate errors not processed by n8n', () => { - const error = new Error('Original error message'); - const nodeOpError = new NodeOperationError(node, error); - - expect(nodeOpError.obfuscate).toBe(true); - expect(nodeOpError.message).toBe('Original error message'); - expect(nodeOpError.messages).toContain('Original error message'); - }); - - it('should not obfuscate errors processed by n8n', () => { - const appError = new ApplicationError('Processed error message'); - const nodeOpError = new NodeOperationError(node, appError); - - expect(nodeOpError.obfuscate).toBe(false); - expect(nodeOpError.message).toBe('Processed error message'); - expect(nodeOpError.messages).not.toContain('Processed error message'); - }); - - it('should not obfuscate string errors', () => { - const errorMessage = 'String error message'; - const nodeOpError = new NodeOperationError(node, errorMessage); - - expect(nodeOpError.obfuscate).toBe(false); - expect(nodeOpError.message).toBe(errorMessage); - expect(nodeOpError.messages).toHaveLength(0); - }); - - it('should not obfuscate error if description provided', () => { - const error = new Error('Initial error message'); - const options = { description: 'Error description' }; - const nodeOpError = new NodeOperationError(node, error, options); - - expect(nodeOpError.obfuscate).toBe(false); - expect(nodeOpError.message).toBe('Initial error message'); - }); - - it('should respect provided options for message and description', () => { - const error = new Error('Initial error message'); - const options = { message: 'Overridden message', description: 'Error description' }; - const nodeOpError = new NodeOperationError(node, error, options); - - expect(nodeOpError.obfuscate).toBe(false); - expect(nodeOpError.message).toBe('Overridden message'); - expect(nodeOpError.description).toBe('Error description'); - }); });