n8n 1.72.1 → 1.73.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/active-workflow-manager.d.ts +6 -4
- package/dist/active-workflow-manager.js +38 -13
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/collaboration/collaboration.service.d.ts +3 -1
- package/dist/collaboration/collaboration.service.js +6 -3
- package/dist/collaboration/collaboration.service.js.map +1 -1
- package/dist/commands/base-command.d.ts +2 -1
- package/dist/commands/base-command.js +3 -3
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/execute-batch.js +1 -1
- package/dist/commands/execute-batch.js.map +1 -1
- package/dist/commands/start.js +3 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/config/index.d.ts +0 -1
- package/dist/config/schema.d.ts +0 -6
- package/dist/config/schema.js +0 -6
- package/dist/config/schema.js.map +1 -1
- package/dist/databases/entities/workflow-entity.d.ts +1 -1
- package/dist/databases/entities/workflow-entity.js.map +1 -1
- package/dist/databases/repositories/execution.repository.d.ts +3 -2
- package/dist/databases/repositories/execution.repository.js +4 -2
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/repositories/settings.repository.d.ts +3 -1
- package/dist/databases/repositories/settings.repository.js +6 -4
- package/dist/databases/repositories/settings.repository.js.map +1 -1
- package/dist/databases/repositories/shared-workflow.repository.d.ts +1 -1
- package/dist/databases/subscribers/user-subscriber.d.ts +1 -0
- package/dist/databases/subscribers/user-subscriber.js +6 -2
- package/dist/databases/subscribers/user-subscriber.js.map +1 -1
- package/dist/db.js +2 -1
- package/dist/db.js.map +1 -1
- package/dist/environments/source-control/source-control-import.service.ee.d.ts +3 -2
- package/dist/environments/source-control/source-control-import.service.ee.js +4 -2
- package/dist/environments/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/evaluation/test-runner/test-runner.service.ee.d.ts +4 -1
- package/dist/evaluation/test-runner/test-runner.service.ee.js +36 -11
- package/dist/evaluation/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation/test-runner/utils.ee.d.ts +2 -1
- package/dist/evaluation/test-runner/utils.ee.js +8 -6
- package/dist/evaluation/test-runner/utils.ee.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.d.ts +3 -1
- package/dist/events/relays/telemetry.event-relay.js +5 -1
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle-hooks/save-execution-progress.js +2 -2
- package/dist/execution-lifecycle-hooks/save-execution-progress.js.map +1 -1
- package/dist/expression-evaluator.js +3 -1
- package/dist/expression-evaluator.js.map +1 -1
- package/dist/license.d.ts +1 -3
- package/dist/license.js +11 -10
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.d.ts +7 -3
- package/dist/load-nodes-and-credentials.js +76 -3
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/manual-execution.service.d.ts +9 -0
- package/dist/manual-execution.service.js +112 -0
- package/dist/manual-execution.service.js.map +1 -0
- package/dist/node-types.js +1 -1
- package/dist/node-types.js.map +1 -1
- package/dist/public-api/types.d.ts +4 -1
- package/dist/public-api/types.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +10 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +14 -0
- package/dist/push/abstract.push.d.ts +3 -1
- package/dist/push/abstract.push.js +6 -3
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/push/index.d.ts +3 -3
- package/dist/push/index.js +5 -5
- package/dist/push/index.js.map +1 -1
- package/dist/push/websocket.push.js +1 -1
- package/dist/push/websocket.push.js.map +1 -1
- package/dist/response-helper.js +2 -1
- package/dist/response-helper.js.map +1 -1
- package/dist/runners/runner-ws-server.js +1 -1
- package/dist/runners/runner-ws-server.js.map +1 -1
- package/dist/runners/task-managers/task-manager.js +8 -1
- package/dist/runners/task-managers/task-manager.js.map +1 -1
- package/dist/runners/task-runner-module.d.ts +3 -1
- package/dist/runners/task-runner-module.js +5 -2
- package/dist/runners/task-runner-module.js.map +1 -1
- package/dist/scaling/job-processor.d.ts +3 -2
- package/dist/scaling/job-processor.js +4 -2
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/pubsub/publisher.service.d.ts +1 -1
- package/dist/scaling/pubsub/publisher.service.js +9 -1
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -2
- package/dist/scaling/pubsub/subscriber.service.js +10 -6
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/scaling/scaling.service.d.ts +3 -2
- package/dist/scaling/scaling.service.js +9 -6
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/server.d.ts +1 -3
- package/dist/server.js +2 -5
- package/dist/server.js.map +1 -1
- package/dist/services/credentials-tester.service.d.ts +3 -1
- package/dist/services/credentials-tester.service.js +6 -4
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/dynamic-node-parameters.service.js +6 -2
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +0 -1
- package/dist/services/frontend.service.js +1 -12
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/orchestration.service.d.ts +0 -5
- package/dist/services/orchestration.service.js +2 -18
- package/dist/services/orchestration.service.js.map +1 -1
- package/dist/services/pruning/pruning.service.js +1 -1
- package/dist/services/pruning/pruning.service.js.map +1 -1
- package/dist/shutdown/shutdown.service.d.ts +3 -2
- package/dist/shutdown/shutdown.service.js +6 -3
- package/dist/shutdown/shutdown.service.js.map +1 -1
- package/dist/user-management/email/node-mailer.d.ts +3 -1
- package/dist/user-management/email/node-mailer.js +6 -4
- package/dist/user-management/email/node-mailer.js.map +1 -1
- package/dist/wait-tracker.js +2 -3
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/live-webhooks.js +3 -1
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/test-webhook-registrations.service.d.ts +3 -3
- package/dist/webhooks/test-webhook-registrations.service.js +5 -5
- package/dist/webhooks/test-webhook-registrations.service.js.map +1 -1
- package/dist/webhooks/test-webhooks.d.ts +5 -3
- package/dist/webhooks/test-webhooks.js +11 -9
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.d.ts +3 -1
- package/dist/webhooks/waiting-webhooks.js +8 -3
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +5 -4
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook.service.d.ts +13 -4
- package/dist/webhooks/webhook.service.js +100 -3
- package/dist/webhooks/webhook.service.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +5 -5
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-helpers.d.ts +1 -2
- package/dist/workflow-helpers.js +0 -9
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.d.ts +6 -6
- package/dist/workflow-runner.js +11 -52
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +3 -1
- package/dist/workflows/workflow-execution.service.js +5 -2
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow-static-data.service.d.ts +4 -2
- package/dist/workflows/workflow-static-data.service.js +5 -3
- package/dist/workflows/workflow-static-data.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +4 -4
- package/package.json +11 -11
- package/templates/form-trigger.handlebars +5 -1
- package/dist/error-reporting.d.ts +0 -1
- package/dist/error-reporting.js +0 -137
- package/dist/error-reporting.js.map +0 -1
|
@@ -43,7 +43,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
43
43
|
};
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.TestWebhooks = void 0;
|
|
46
|
-
const
|
|
46
|
+
const n8n_core_1 = require("n8n-core");
|
|
47
47
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
48
48
|
const typedi_1 = require("typedi");
|
|
49
49
|
const constants_1 = require("../constants");
|
|
@@ -53,18 +53,19 @@ const workflow_missing_id_error_1 = require("../errors/workflow-missing-id.error
|
|
|
53
53
|
const node_types_1 = require("../node-types");
|
|
54
54
|
const push_1 = require("../push");
|
|
55
55
|
const publisher_service_1 = require("../scaling/pubsub/publisher.service");
|
|
56
|
-
const orchestration_service_1 = require("../services/orchestration.service");
|
|
57
56
|
const utils_1 = require("../utils");
|
|
58
57
|
const test_webhook_registrations_service_1 = require("../webhooks/test-webhook-registrations.service");
|
|
59
58
|
const WebhookHelpers = __importStar(require("../webhooks/webhook-helpers"));
|
|
60
59
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
60
|
+
const webhook_service_1 = require("./webhook.service");
|
|
61
61
|
let TestWebhooks = class TestWebhooks {
|
|
62
|
-
constructor(push, nodeTypes, registrations,
|
|
62
|
+
constructor(push, nodeTypes, registrations, instanceSettings, publisher, webhookService) {
|
|
63
63
|
this.push = push;
|
|
64
64
|
this.nodeTypes = nodeTypes;
|
|
65
65
|
this.registrations = registrations;
|
|
66
|
-
this.
|
|
66
|
+
this.instanceSettings = instanceSettings;
|
|
67
67
|
this.publisher = publisher;
|
|
68
|
+
this.webhookService = webhookService;
|
|
68
69
|
this.timeouts = {};
|
|
69
70
|
}
|
|
70
71
|
async executeWebhook(request, response) {
|
|
@@ -121,7 +122,7 @@ let TestWebhooks = class TestWebhooks {
|
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
124
|
catch { }
|
|
124
|
-
if (this.
|
|
125
|
+
if (this.instanceSettings.isMultiMain &&
|
|
125
126
|
pushRef &&
|
|
126
127
|
!this.push.getBackend().hasPushRef(pushRef)) {
|
|
127
128
|
void this.publisher.publishCommand({
|
|
@@ -204,7 +205,7 @@ let TestWebhooks = class TestWebhooks {
|
|
|
204
205
|
};
|
|
205
206
|
try {
|
|
206
207
|
await this.registrations.register(registration);
|
|
207
|
-
await
|
|
208
|
+
await this.webhookService.createWebhookIfNotExists(workflow, webhook, 'manual', 'manual');
|
|
208
209
|
cacheableWebhook.staticData = workflow.staticData;
|
|
209
210
|
await this.registrations.register(registration);
|
|
210
211
|
this.timeouts[key] = timeout;
|
|
@@ -283,7 +284,7 @@ let TestWebhooks = class TestWebhooks {
|
|
|
283
284
|
}
|
|
284
285
|
if (staticData)
|
|
285
286
|
workflow.staticData = staticData;
|
|
286
|
-
await
|
|
287
|
+
await this.webhookService.deleteWebhook(workflow, webhook, 'internal', 'update');
|
|
287
288
|
}
|
|
288
289
|
await this.registrations.deregisterAll();
|
|
289
290
|
}
|
|
@@ -306,7 +307,8 @@ exports.TestWebhooks = TestWebhooks = __decorate([
|
|
|
306
307
|
__metadata("design:paramtypes", [push_1.Push,
|
|
307
308
|
node_types_1.NodeTypes,
|
|
308
309
|
test_webhook_registrations_service_1.TestWebhookRegistrationsService,
|
|
309
|
-
|
|
310
|
-
publisher_service_1.Publisher
|
|
310
|
+
n8n_core_1.InstanceSettings,
|
|
311
|
+
publisher_service_1.Publisher,
|
|
312
|
+
webhook_service_1.WebhookService])
|
|
311
313
|
], TestWebhooks);
|
|
312
314
|
//# sourceMappingURL=test-webhooks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/test-webhooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA
|
|
1
|
+
{"version":3,"file":"test-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/test-webhooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,15 @@ import { ExecutionRepository } from '../databases/repositories/execution.reposit
|
|
|
3
3
|
import type { IExecutionResponse } from '../interfaces';
|
|
4
4
|
import { Logger } from '../logging/logger.service';
|
|
5
5
|
import { NodeTypes } from '../node-types';
|
|
6
|
+
import { WebhookService } from './webhook.service';
|
|
6
7
|
import type { IWebhookResponseCallbackData, IWebhookManager, WaitingWebhookRequest } from './webhook.types';
|
|
7
8
|
export declare class WaitingWebhooks implements IWebhookManager {
|
|
8
9
|
protected readonly logger: Logger;
|
|
9
10
|
protected readonly nodeTypes: NodeTypes;
|
|
10
11
|
private readonly executionRepository;
|
|
12
|
+
private readonly webhookService;
|
|
11
13
|
protected includeForms: boolean;
|
|
12
|
-
constructor(logger: Logger, nodeTypes: NodeTypes, executionRepository: ExecutionRepository);
|
|
14
|
+
constructor(logger: Logger, nodeTypes: NodeTypes, executionRepository: ExecutionRepository, webhookService: WebhookService);
|
|
13
15
|
protected logReceivedWebhook(method: string, executionId: string): void;
|
|
14
16
|
protected disableNode(execution: IExecutionResponse, _method?: string): void;
|
|
15
17
|
private isSendAndWaitRequest;
|
|
@@ -52,11 +52,13 @@ const logger_service_1 = require("../logging/logger.service");
|
|
|
52
52
|
const node_types_1 = require("../node-types");
|
|
53
53
|
const WebhookHelpers = __importStar(require("../webhooks/webhook-helpers"));
|
|
54
54
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
55
|
+
const webhook_service_1 = require("./webhook.service");
|
|
55
56
|
let WaitingWebhooks = class WaitingWebhooks {
|
|
56
|
-
constructor(logger, nodeTypes, executionRepository) {
|
|
57
|
+
constructor(logger, nodeTypes, executionRepository, webhookService) {
|
|
57
58
|
this.logger = logger;
|
|
58
59
|
this.nodeTypes = nodeTypes;
|
|
59
60
|
this.executionRepository = executionRepository;
|
|
61
|
+
this.webhookService = webhookService;
|
|
60
62
|
this.includeForms = false;
|
|
61
63
|
}
|
|
62
64
|
logReceivedWebhook(method, executionId) {
|
|
@@ -135,7 +137,9 @@ let WaitingWebhooks = class WaitingWebhooks {
|
|
|
135
137
|
throw new not_found_error_1.NotFoundError('Could not find node to process webhook.');
|
|
136
138
|
}
|
|
137
139
|
const additionalData = await WorkflowExecuteAdditionalData.getBase();
|
|
138
|
-
const webhookData =
|
|
140
|
+
const webhookData = this.webhookService
|
|
141
|
+
.getNodeWebhooks(workflow, workflowStartNode, additionalData)
|
|
142
|
+
.find((webhook) => webhook.httpMethod === req.method &&
|
|
139
143
|
webhook.path === (suffix ?? '') &&
|
|
140
144
|
webhook.webhookDescription.restartWebhook === true &&
|
|
141
145
|
(webhook.webhookDescription.isForm || false) === this.includeForms);
|
|
@@ -172,6 +176,7 @@ exports.WaitingWebhooks = WaitingWebhooks = __decorate([
|
|
|
172
176
|
(0, typedi_1.Service)(),
|
|
173
177
|
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
174
178
|
node_types_1.NodeTypes,
|
|
175
|
-
execution_repository_1.ExecutionRepository
|
|
179
|
+
execution_repository_1.ExecutionRepository,
|
|
180
|
+
webhook_service_1.WebhookService])
|
|
176
181
|
], WaitingWebhooks);
|
|
177
182
|
//# sourceMappingURL=waiting-webhooks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waiting-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/waiting-webhooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+
|
|
1
|
+
{"version":3,"file":"waiting-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/waiting-webhooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,7 @@ const webhook_form_data_1 = require("../webhooks/webhook-form-data");
|
|
|
57
57
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
58
58
|
const WorkflowHelpers = __importStar(require("../workflow-helpers"));
|
|
59
59
|
const workflow_runner_1 = require("../workflow-runner");
|
|
60
|
+
const webhook_service_1 = require("./webhook.service");
|
|
60
61
|
function getWorkflowWebhooks(workflow, additionalData, destinationNode, ignoreRestartWebhooks = false) {
|
|
61
62
|
const returnData = [];
|
|
62
63
|
let parentNodes;
|
|
@@ -68,7 +69,7 @@ function getWorkflowWebhooks(workflow, additionalData, destinationNode, ignoreRe
|
|
|
68
69
|
if (parentNodes !== undefined && !parentNodes.includes(node.name)) {
|
|
69
70
|
continue;
|
|
70
71
|
}
|
|
71
|
-
returnData.push.apply(returnData,
|
|
72
|
+
returnData.push.apply(returnData, typedi_1.Container.get(webhook_service_1.WebhookService).getNodeWebhooks(workflow, node, additionalData, ignoreRestartWebhooks));
|
|
72
73
|
}
|
|
73
74
|
return returnData;
|
|
74
75
|
}
|
|
@@ -152,7 +153,7 @@ async function executeWebhook(workflow, webhookData, workflowData, workflowStart
|
|
|
152
153
|
}
|
|
153
154
|
}
|
|
154
155
|
try {
|
|
155
|
-
webhookResultData = await
|
|
156
|
+
webhookResultData = await typedi_1.Container.get(webhook_service_1.WebhookService).runWebhook(workflow, webhookData, workflowStartNode, additionalData, executionMode, runExecutionData ?? null);
|
|
156
157
|
typedi_1.Container.get(workflow_statistics_service_1.WorkflowStatisticsService).emit('nodeFetchedData', {
|
|
157
158
|
workflowId: workflow.id,
|
|
158
159
|
node: workflowStartNode,
|
|
@@ -166,7 +167,7 @@ async function executeWebhook(workflow, webhookData, workflowData, workflowStart
|
|
|
166
167
|
if (err instanceof n8n_workflow_1.NodeOperationError && err.type === 'manual-form-test') {
|
|
167
168
|
errorMessage = err.message;
|
|
168
169
|
}
|
|
169
|
-
|
|
170
|
+
typedi_1.Container.get(n8n_core_1.ErrorReporter).error(err, {
|
|
170
171
|
extra: {
|
|
171
172
|
nodeName: workflowStartNode.name,
|
|
172
173
|
nodeType: workflowStartNode.type,
|
|
@@ -352,7 +353,7 @@ async function executeWebhook(workflow, webhookData, workflowData, workflowStart
|
|
|
352
353
|
didSendResponse = true;
|
|
353
354
|
})
|
|
354
355
|
.catch(async (error) => {
|
|
355
|
-
|
|
356
|
+
typedi_1.Container.get(n8n_core_1.ErrorReporter).error(error);
|
|
356
357
|
typedi_1.Container.get(logger_service_1.Logger).error(`Error with Webhook-Response for execution "${executionId}": "${error.message}"`, { executionId, workflowId: workflow.id });
|
|
357
358
|
});
|
|
358
359
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-helpers.js","sourceRoot":"","sources":["../../src/webhooks/webhook-helpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"webhook-helpers.js","sourceRoot":"","sources":["../../src/webhooks/webhook-helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgEA,kDAoCC;AASD,wCA+qBC;AApxBD,wCAA2C;AAE3C,qDAA6B;AAC7B,uCAA4D;AAoB5D,+CAOsB;AACtB,8CAA2C;AAC3C,mCAAmC;AAEnC,2DAAuD;AAEvD,0FAAqF;AACrF,8EAAyE;AACzE,sFAAyF;AAEzF,6DAAkD;AAClD,+CAA0C;AAC1C,oEAAgE;AAChE,wFAAmF;AACnF,iDAA6C;AAC7C,oEAAyE;AACzE,kGAAoF;AACpF,oEAAsD;AACtD,uDAAmD;AAEnD,uDAAmD;AAMnD,SAAgB,mBAAmB,CAClC,QAAkB,EAClB,cAA8C,EAC9C,eAAwB,EACxB,qBAAqB,GAAG,KAAK;IAI7B,MAAM,UAAU,GAAmB,EAAE,CAAC;IAEtC,IAAI,WAAiC,CAAC;IACtC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QACnC,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAEvD,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,IAAI,WAAW,KAAK,SAAS,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAInE,SAAS;QACV,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,KAAK,CACpB,UAAU,EACV,kBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,eAAe,CAC5C,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,qBAAqB,CACrB,CACD,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,MAAM,EAAE,mBAAmB,EAAE,GAAG,kBAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,SAAS,CAAC;AACtE,MAAM,aAAa,GAAG,IAAA,6CAAyB,EAAC,mBAAmB,CAAC,CAAC;AAM9D,KAAK,UAAU,cAAc,CACnC,QAAkB,EAClB,WAAyB,EACzB,YAAyB,EACzB,iBAAwB,EACxB,aAAkC,EAClC,OAA2B,EAC3B,gBAA+C,EAC/C,WAA+B,EAC/B,GAAmB,EACnB,GAAqB,EACrB,gBAAmF,EACnF,eAAwB;IAGxB,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CACtD,iBAAiB,CAAC,IAAI,EACtB,iBAAiB,CAAC,WAAW,CAC7B,CAAC;IACF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,YAAY,GAAG,iCAAiC,iBAAiB,CAAC,IAAI,gBAAgB,CAAC;QAC7F,gBAAgB,CAAC,IAAI,+BAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,2CAAmB,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED,MAAM,cAAc,GAAqC;QACxD,YAAY,EAAE,WAAW;KACzB,CAAC;IAEF,IAAI,OAAO,GAAwB,SAAS,CAAC;IAC7C,IAAI,CAAC;QACJ,OAAO,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,oCAAgB,CAAC,CAAC,wBAAwB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC3F,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,+BAAa,CAAC,sBAAsB,CAAC,CAAC;IACjD,CAAC;IAGD,MAAM,cAAc,GAAG,MAAM,6BAA6B,CAAC,OAAO,EAAE,CAAC;IAErE,IAAI,WAAW,EAAE,CAAC;QACjB,cAAc,CAAC,WAAW,GAAG,WAAW,CAAC;IAC1C,CAAC;IAGD,IAAI,YAAY,CAAC;IAIjB,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACjD,MAAM,cAAc,GAAG,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACtE,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,IAAI,KAAK,6BAAc,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACpD,WAAW,GAAG,IAAI,CAAC;gBACnB,MAAM;YACP,CAAC;QACF,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YACjB,YAAY,GAAG,UAAU,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CACzD,iBAAiB,EACjB,WAAW,CAAC,kBAAkB,CAAC,YAAY,EAC3C,aAAa,EACb,cAAc,EACd,SAAS,EACT,YAAY,CACW,CAAC;IAC1B,CAAC;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAC/D,iBAAiB,EACjB,WAAW,CAAC,kBAAkB,CAAC,YAAsB,EACrD,aAAa,EACb,cAAc,EACd,SAAS,EACT,GAAG,CACO,CAAC;IAEZ,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAChE,iBAAiB,EACjB,WAAW,CAAC,kBAAkB,CAAC,YAAY,EAC3C,aAAa,EACb,cAAc,EACd,SAAS,EACT,gBAAgB,CAChB,CAAC;IAEF,IAAI,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAIpF,MAAM,YAAY,GAAG,sBAAsB,YAAY,iBAAiB,CAAC;QACzE,gBAAgB,CAAC,IAAI,+BAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,2CAAmB,CAAC,YAAY,CAAC,CAAC;IAC7C,CAAC;IAGD,cAAc,CAAC,WAAW,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,YAAY,GAAG,GAAG,CAAC;IAElC,IAAI,UAAU,CAAC;IAEf,MAAM,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC;IAClD,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;QAEvB,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CACvD,iBAAiB,EACjB,0CAA0C,EAC1C,aAAa,EACb,cAAc,EACd,SAAS,EACT,KAAK,CACL,CAAC;IACH,CAAC;IAED,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,qBAAqB,GAAG,EAAE,CAAC;IAC/B,IAAI,CAAC;QAGJ,IAAI,iBAAuC,CAAC;QAI5C,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC;YAC5B,IAAI,WAAW,KAAK,qBAAqB,EAAE,CAAC;gBAC3C,GAAG,CAAC,IAAI,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACP,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;oBACrB,IACC,WAAW,EAAE,UAAU,CAAC,kBAAkB,CAAC;wBAC3C,WAAW,EAAE,UAAU,CAAC,YAAY,CAAC;wBACrC,WAAW,EAAE,UAAU,CAAC,mCAAmC,CAAC;wBAC5D,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC;wBAC7B,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC5B,CAAC;wBACF,MAAM,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;oBACtB,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,MAAM,IAAA,uBAAS,EAAC,GAAG,CAAC,CAAC;gBACtB,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,CAAC;YACJ,iBAAiB,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,UAAU,CACjE,QAAQ,EACR,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,gBAAgB,IAAI,IAAI,CACxB,CAAC;YACF,kBAAS,CAAC,GAAG,CAAC,uDAAyB,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAChE,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,IAAI,EAAE,iBAAiB;aACvB,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YAEd,MAAM,WAAW,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC9E,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,SAAS,CAAC;YACb,IAAI,YAAY,GAAG,YAAY,WAAW,wCAAwC,CAAC;YAGnF,IAAI,GAAG,YAAY,iCAAkB,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;gBAC1E,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC;YAC5B,CAAC;YAED,kBAAS,CAAC,GAAG,CAAC,wBAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACvC,KAAK,EAAE;oBACN,QAAQ,EAAE,iBAAiB,CAAC,IAAI;oBAChC,QAAQ,EAAE,iBAAiB,CAAC,IAAI;oBAChC,WAAW,EAAE,iBAAiB,CAAC,WAAW;oBAC1C,UAAU,EAAE,QAAQ,CAAC,EAAE;iBACvB;aACD,CAAC,CAAC;YAEH,gBAAgB,CAAC,IAAI,+BAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;YACzD,eAAe,GAAG,IAAI,CAAC;YAGvB,qBAAqB,GAAG;gBACvB,UAAU,EAAE;oBACX,OAAO,EAAE,EAAE;oBACX,gBAAgB,EAAE,iBAAiB,CAAC,IAAI;oBACxC,KAAK,EAAE;wBACN,GAAG,GAAG;wBACN,OAAO,EAAE,GAAG,CAAC,OAAO;wBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;qBAChB;iBACD;aACD,CAAC;YAEF,iBAAiB,GAAG;gBACnB,iBAAiB,EAAE,IAAI;gBAGvB,YAAY,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;aAC9B,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAqC;YACxD,YAAY,EAAE,WAAW;SACzB,CAAC;QAEF,IAAI,WAAW,CAAC,kBAAkB,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;YAClE,MAAM,eAAe,GAAG,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CACnE,iBAAiB,EACjB,WAAW,CAAC,kBAAkB,CAAC,eAAe,EAC9C,aAAa,EACb,cAAc,EACd,SAAS,EACT,SAAS,CAQT,CAAC;YAEF,IAAI,eAAe,KAAK,SAAS,IAAI,eAAe,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC5E,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;oBAC5C,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBACtC,CAAC;YACF,CAAC;QACF,CAAC;QAED,IAAI,iBAAiB,CAAC,iBAAiB,KAAK,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAEtE,gBAAgB,CAAC,IAAI,EAAE;gBACtB,iBAAiB,EAAE,IAAI;aACvB,CAAC,CAAC;YACH,eAAe,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,IAAI,iBAAiB,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAElD,IAAI,iBAAiB,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;gBAErD,IAAI,CAAC,eAAe,EAAE,CAAC;oBACtB,gBAAgB,CAAC,IAAI,EAAE;wBACtB,IAAI,EAAE,iBAAiB,CAAC,eAAe;wBACvC,YAAY;qBACZ,CAAC,CAAC;oBACH,eAAe,GAAG,IAAI,CAAC;gBACxB,CAAC;YACF,CAAC;iBAAM,CAAC;gBAGP,IAAI,CAAC,eAAe,EAAE,CAAC;oBACtB,gBAAgB,CAAC,IAAI,EAAE;wBACtB,IAAI,EAAE;4BACL,OAAO,EAAE,uBAAuB;yBAChC;wBACD,YAAY;qBACZ,CAAC,CAAC;oBACH,eAAe,GAAG,IAAI,CAAC;gBACxB,CAAC;YACF,CAAC;YACD,OAAO;QACR,CAAC;QAID,IAAI,YAAY,KAAK,YAAY,IAAI,CAAC,eAAe,EAAE,CAAC;YAEvD,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;gBAE/B,gBAAgB,CAAC,IAAI,EAAE;oBACtB,YAAY;iBACZ,CAAC,CAAC;YACJ,CAAC;iBAAM,IAAI,YAAY,EAAE,CAAC;gBAEzB,gBAAgB,CAAC,IAAI,EAAE;oBACtB,IAAI,EAAE,YAA2B;oBACjC,YAAY;iBACZ,CAAC,CAAC;YACJ,CAAC;iBAAM,IAAI,iBAAiB,CAAC,eAAe,KAAK,SAAS,EAAE,CAAC;gBAE5D,gBAAgB,CAAC,IAAI,EAAE;oBACtB,IAAI,EAAE,iBAAiB,CAAC,eAAe;oBACvC,YAAY;iBACZ,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,gBAAgB,CAAC,IAAI,EAAE;oBACtB,IAAI,EAAE;wBACL,OAAO,EAAE,sBAAsB;qBAC/B;oBACD,YAAY;iBACZ,CAAC,CAAC;YACJ,CAAC;YAED,eAAe,GAAG,IAAI,CAAC;QACxB,CAAC;QAGD,MAAM,kBAAkB,GAAmB,EAAE,CAAC;QAC9C,kBAAkB,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE;gBACL,IAAI,EAAE,iBAAiB,CAAC,YAAY;aACpC;YACD,MAAM,EAAE,IAAI;SACZ,CAAC,CAAC;QAEH,gBAAgB;YACf,gBAAgB;gBACf;oBACA,SAAS,EAAE,EAAE;oBACb,UAAU,EAAE;wBACX,OAAO,EAAE,EAAE;qBACX;oBACD,aAAa,EAAE;wBACd,WAAW,EAAE,EAAE;wBACf,kBAAkB;wBAClB,gBAAgB,EAAE,EAAE;qBACpB;iBACqB,CAAC;QAEzB,IAAI,eAAe,IAAI,gBAAgB,CAAC,SAAS,EAAE,CAAC;YACnD,gBAAgB,CAAC,SAAS,CAAC,eAAe,GAAG,eAAe,CAAC;QAC9D,CAAC;QAED,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAG/B,gBAAgB,CAAC,aAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;gBAC9D,iBAAiB,CAAC,YAAY,CAAC;QACjC,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAErD,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,OAA6B,CAAC;QAClC,MAAM,UAAU,GAAG,aAAa,KAAK,QAAQ,CAAC;QAC9C,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;YAC/B,gBAAgB,CAAC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;QAC/C,CAAC;QAED,MAAM,OAAO,GAAkC;YAC9C,aAAa;YACb,aAAa,EAAE,gBAAgB;YAC/B,OAAO;YACP,YAAY;YACZ,OAAO;YACP,SAAS,EAAE,OAAO,EAAE,EAAE;SACtB,CAAC;QAGF,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC;QAC5C,CAAC;QAED,IAAI,eAAmE,CAAC;QACxE,IAAI,YAAY,KAAK,cAAc,EAAE,CAAC;YACrC,eAAe,GAAG,IAAA,oCAAqB,GAAwB,CAAC;YAChE,eAAe,CAAC,OAAO;iBACrB,IAAI,CAAC,KAAK,EAAE,QAA8B,EAAE,EAAE;gBAC9C,IAAI,eAAe,EAAE,CAAC;oBACrB,OAAO;gBACR,CAAC;gBAED,MAAM,UAAU,GAAI,QAAQ,CAAC,IAAoB,EAAE,UAAyB,CAAC;gBAC7E,IAAI,UAAU,EAAE,EAAE,EAAE,CAAC;oBACpB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC7B,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,4BAAiB,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBACjF,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;oBACjC,MAAM,IAAA,mBAAQ,EAAC,MAAM,CAAC,CAAC;oBACvB,gBAAgB,CAAC,IAAI,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrD,CAAC;qBAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC3C,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC7B,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACvB,gBAAgB,CAAC,IAAI,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrD,CAAC;qBAAM,CAAC;oBAGP,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;oBACjC,IAAI,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC;oBACvC,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAmB,CAAC;oBAGxC,IACC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,aAAa;wBAC3C,OAAO,CAAC,QAAQ;wBAChB,MAAM,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EACnC,CAAC;wBACF,YAAY,GAAG,GAAG,CAAC;wBACnB,IAAI,GAAG;4BACN,WAAW,EAAE,OAAO,CAAC,QAAQ;yBAC7B,CAAC;wBACF,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;oBAC9B,CAAC;oBAED,gBAAgB,CAAC,IAAI,EAAE;wBACtB,IAAI;wBACJ,OAAO;wBACP,YAAY;qBACZ,CAAC,CAAC;gBACJ,CAAC;gBAED,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;gBAClC,eAAe,GAAG,IAAI,CAAC;YACxB,CAAC,CAAC;iBACD,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACtB,kBAAS,CAAC,GAAG,CAAC,wBAAa,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC1C,kBAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC,KAAK,CAC1B,8CAA8C,WAAW,OAAO,KAAK,CAAC,OAAO,GAAG,EAChF,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,CACxC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAGD,WAAW,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,GAAG,CACpD,OAAO,EACP,IAAI,EACJ,CAAC,eAAe,EAChB,WAAW,EACX,eAAe,CACf,CAAC;QAEF,IAAI,YAAY,KAAK,UAAU,IAAI,CAAC,eAAe,EAAE,CAAC;YACrD,GAAG,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,kBAAkB,IAAI,WAAW,EAAE,CAAC,CAAC;YACpE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAClC,eAAe,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,kBAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC,KAAK,CAC1B,kCAAkC,QAAQ,CAAC,IAAI,oCAAoC,WAAW,EAAE,EAChG,EAAE,WAAW,EAAE,CACf,CAAC;QAEF,MAAM,gBAAgB,GAAG,kBAAS,CAAC,GAAG,CAAC,oCAAgB,CAAC,CAAC;QAGzD,MAAM,cAAc,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QAE3E,MAAM,EAAE,eAAe,EAAE,GAAG,gBAAgB,CAAC;QAC7C,IAAI,eAAe,EAAE,CAAC;YAErB,KAAK,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC7B,MAAM,WAAW,GAAG,kBAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC;gBAC/C,KAAK,WAAW,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;YAC9D,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,eAAe,EAAE,CAAC;YACtB,cAAc;iBAEZ,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBACpB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACxB,IAAI,CAAC,eAAe,EAAE,CAAC;wBACtB,gBAAgB,CAAC,IAAI,EAAE;4BACtB,IAAI,EAAE;gCACL,OAAO,EAAE,yDAAyD;6BAClE;4BACD,YAAY;yBACZ,CAAC,CAAC;wBACH,eAAe,GAAG,IAAI,CAAC;oBACxB,CAAC;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAED,IAAI,UAAU,EAAE,CAAC;oBAChB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;gBACxC,CAAC;gBAED,MAAM,UAAU,GAAG,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;gBACrE,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;oBACnE,IAAI,CAAC,eAAe,EAAE,CAAC;wBACtB,gBAAgB,CAAC,IAAI,EAAE;4BACtB,IAAI,EAAE;gCACL,OAAO,EAAE,mBAAmB;6BAC5B;4BACD,YAAY,EAAE,GAAG;yBACjB,CAAC,CAAC;oBACJ,CAAC;oBACD,eAAe,GAAG,IAAI,CAAC;oBACvB,OAAO,IAAI,CAAC;gBACb,CAAC;gBAGD,IAAI,YAAY,KAAK,cAAc,IAAI,eAAe,EAAE,CAAC;oBACxD,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;oBACpD,OAAO,SAAS,CAAC;gBAClB,CAAC;gBAED,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC9B,IAAI,CAAC,eAAe,EAAE,CAAC;wBACtB,gBAAgB,CAAC,IAAI,EAAE;4BACtB,IAAI,EAAE;gCACL,OAAO,EACN,0EAA0E;6BAC3E;4BACD,YAAY;yBACZ,CAAC,CAAC;oBACJ,CAAC;oBACD,eAAe,GAAG,IAAI,CAAC;oBACvB,OAAO,IAAI,CAAC;gBACb,CAAC;gBAED,MAAM,cAAc,GAAqC;oBACxD,YAAY,EAAE,WAAW;iBACzB,CAAC;gBAEF,IAAI,CAAC,eAAe,EAAE,CAAC;oBACtB,IAAI,IAA6C,CAAC;oBAElD,IAAI,YAAY,KAAK,gBAAgB,EAAE,CAAC;wBAGvC,IAAI,UAAU,CAAC,IAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;4BAChD,gBAAgB,CAAC,IAAI,+BAAgB,CAAC,6BAA6B,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC1E,eAAe,GAAG,IAAI,CAAC;4BACvB,OAAO,SAAS,CAAC;wBAClB,CAAC;wBAED,IAAI,GAAG,UAAU,CAAC,IAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;wBAEzC,MAAM,oBAAoB,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CACvE,iBAAiB,EACjB,WAAW,CAAC,kBAAkB,CAAC,oBAAoB,EACnD,aAAa,EACb,cAAc,EACd,SAAS,EACT,SAAS,CACT,CAAC;wBAEF,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;4BACxC,IAAI,GAAG,IAAA,aAAG,EAAC,IAAI,EAAE,oBAA8B,CAAgB,CAAC;wBACjE,CAAC;wBAED,MAAM,mBAAmB,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CACtE,iBAAiB,EACjB,WAAW,CAAC,kBAAkB,CAAC,mBAAmB,EAClD,aAAa,EACb,cAAc,EACd,SAAS,EACT,SAAS,CACT,CAAC;wBAEF,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;4BAEvC,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,mBAA6B,CAAC,CAAC;4BAG7D,IACC,IAAI,KAAK,IAAI;gCACb,IAAI,KAAK,SAAS;gCAClB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EACnD,CAAC;gCACF,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;4BACf,CAAC;iCAAM,CAAC;gCACP,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;4BAC/B,CAAC;4BAED,gBAAgB,CAAC,IAAI,EAAE;gCACtB,iBAAiB,EAAE,IAAI;6BACvB,CAAC,CAAC;4BACH,eAAe,GAAG,IAAI,CAAC;wBACxB,CAAC;oBACF,CAAC;yBAAM,IAAI,YAAY,KAAK,kBAAkB,EAAE,CAAC;wBAEhD,IAAI,GAAG,UAAU,CAAC,IAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,CAAC;wBAEpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;4BACxB,gBAAgB,CAAC,IAAI,+BAAgB,CAAC,6BAA6B,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC1E,eAAe,GAAG,IAAI,CAAC;4BACvB,OAAO,SAAS,CAAC;wBAClB,CAAC;wBAED,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;4BAC/B,gBAAgB,CAAC,IAAI,+BAAgB,CAAC,oCAAoC,CAAC,EAAE,EAAE,CAAC,CAAC;4BACjF,eAAe,GAAG,IAAI,CAAC;4BACvB,OAAO,SAAS,CAAC;wBAClB,CAAC;wBAED,MAAM,0BAA0B,GAAG,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAC7E,iBAAiB,EACjB,WAAW,CAAC,kBAAkB,CAAC,0BAA0B,EACzD,aAAa,EACb,cAAc,EACd,SAAS,EACT,MAAM,CACN,CAAC;wBAEF,IAAI,0BAA0B,KAAK,SAAS,IAAI,CAAC,eAAe,EAAE,CAAC;4BAClE,gBAAgB,CACf,IAAI,+BAAgB,CAAC,wCAAwC,CAAC,EAC9D,EAAE,CACF,CAAC;4BACF,eAAe,GAAG,IAAI,CAAC;wBACxB,CAAC;wBAED,MAAM,UAAU,GAAI,IAAI,CAAC,MAAyB,CACjD,0BAAoC,CACpC,CAAC;wBACF,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,eAAe,EAAE,CAAC;4BAClD,gBAAgB,CACf,IAAI,+BAAgB,CACnB,wBAAwB,0BAA0B,2CAA2C,CAC7F,EACD,EAAE,CACF,CAAC;4BACF,eAAe,GAAG,IAAI,CAAC;wBACxB,CAAC;wBAED,IAAI,CAAC,eAAe,EAAE,CAAC;4BAEtB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;4BACnD,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;gCACnB,MAAM,MAAM,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,4BAAiB,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gCACjF,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;gCACjC,MAAM,IAAA,mBAAQ,EAAC,MAAM,CAAC,CAAC;4BACxB,CAAC;iCAAM,CAAC;gCACP,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,8BAAe,CAAC,CAAC,CAAC;4BAC1D,CAAC;4BAED,gBAAgB,CAAC,IAAI,EAAE;gCACtB,iBAAiB,EAAE,IAAI;6BACvB,CAAC,CAAC;4BACH,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;wBACnC,CAAC;oBACF,CAAC;yBAAM,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;wBAEtC,IAAI,GAAG,SAAS,CAAC;oBAClB,CAAC;yBAAM,CAAC;wBAEP,IAAI,GAAG,EAAE,CAAC;wBACV,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,IAAK,CAAC,IAAI,CAAC,CAAC,CAAE,EAAE,CAAC;4BAC/C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACvB,CAAC;oBACF,CAAC;oBAED,IAAI,CAAC,eAAe,EAAE,CAAC;wBACtB,gBAAgB,CAAC,IAAI,EAAE;4BACtB,IAAI;4BACJ,YAAY;yBACZ,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;gBACD,eAAe,GAAG,IAAI,CAAC;gBAEvB,OAAO,IAAI,CAAC;YACb,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACZ,IAAI,CAAC,eAAe,EAAE,CAAC;oBACtB,gBAAgB,CACf,IAAI,+BAAgB,CAAC,4CAA4C,EAAE;wBAClE,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,CAAC;qBACR,CAAC,EACF,EAAE,CACF,CAAC;gBACH,CAAC;gBAED,MAAM,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAClE,IAAI,CAAC,YAAY,sCAAuB;oBAAE,mBAAmB,CAAC,KAAK,GAAG,SAAS,CAAC;gBAChF,MAAM,mBAAmB,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,WAAW,CAAC;IACpB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,MAAM,KAAK,GACV,CAAC,YAAY,+CAAyB;YACrC,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,IAAI,+BAAgB,CAAC,4CAA4C,EAAE;gBACnE,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,CAAC;aACR,CAAC,CAAC;QACN,IAAI,eAAe;YAAE,MAAM,KAAK,CAAC;QACjC,gBAAgB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5B,OAAO;IACR,CAAC;AACF,CAAC"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
import type { IHttpRequestMethods } from 'n8n-workflow';
|
|
1
|
+
import type { IHttpRequestMethods, INode, IRunExecutionData, IWebhookData, IWebhookResponseData, IWorkflowExecuteAdditionalData, Workflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
2
|
import type { WebhookEntity } from '../databases/entities/webhook-entity';
|
|
3
3
|
import { WebhookRepository } from '../databases/repositories/webhook.repository';
|
|
4
|
+
import { Logger } from '../logging/logger.service';
|
|
5
|
+
import { NodeTypes } from '../node-types';
|
|
4
6
|
import { CacheService } from '../services/cache/cache.service';
|
|
5
7
|
type Method = NonNullable<IHttpRequestMethods>;
|
|
6
8
|
export declare class WebhookService {
|
|
7
|
-
private
|
|
8
|
-
private
|
|
9
|
-
|
|
9
|
+
private readonly logger;
|
|
10
|
+
private readonly webhookRepository;
|
|
11
|
+
private readonly cacheService;
|
|
12
|
+
private readonly nodeTypes;
|
|
13
|
+
constructor(logger: Logger, webhookRepository: WebhookRepository, cacheService: CacheService, nodeTypes: NodeTypes);
|
|
10
14
|
populateCache(): Promise<void>;
|
|
11
15
|
private findCached;
|
|
12
16
|
private findStaticWebhook;
|
|
@@ -17,5 +21,10 @@ export declare class WebhookService {
|
|
|
17
21
|
deleteWorkflowWebhooks(workflowId: string): Promise<WebhookEntity[]>;
|
|
18
22
|
private deleteWebhooks;
|
|
19
23
|
getWebhookMethods(path: string): Promise<IHttpRequestMethods[]>;
|
|
24
|
+
getNodeWebhooks(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, ignoreRestartWebhooks?: boolean): IWebhookData[];
|
|
25
|
+
createWebhookIfNotExists(workflow: Workflow, webhookData: IWebhookData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): Promise<void>;
|
|
26
|
+
deleteWebhook(workflow: Workflow, webhookData: IWebhookData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): Promise<void>;
|
|
27
|
+
private runWebhookMethod;
|
|
28
|
+
runWebhook(workflow: Workflow, webhookData: IWebhookData, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, runExecutionData: IRunExecutionData | null): Promise<IWebhookResponseData>;
|
|
20
29
|
}
|
|
21
30
|
export {};
|
|
@@ -10,13 +10,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.WebhookService = void 0;
|
|
13
|
+
const n8n_core_1 = require("n8n-core");
|
|
14
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
13
15
|
const typedi_1 = require("typedi");
|
|
14
16
|
const webhook_repository_1 = require("../databases/repositories/webhook.repository");
|
|
17
|
+
const logger_service_1 = require("../logging/logger.service");
|
|
18
|
+
const node_types_1 = require("../node-types");
|
|
15
19
|
const cache_service_1 = require("../services/cache/cache.service");
|
|
16
20
|
let WebhookService = class WebhookService {
|
|
17
|
-
constructor(webhookRepository, cacheService) {
|
|
21
|
+
constructor(logger, webhookRepository, cacheService, nodeTypes) {
|
|
22
|
+
this.logger = logger;
|
|
18
23
|
this.webhookRepository = webhookRepository;
|
|
19
24
|
this.cacheService = cacheService;
|
|
25
|
+
this.nodeTypes = nodeTypes;
|
|
20
26
|
}
|
|
21
27
|
async populateCache() {
|
|
22
28
|
const allWebhooks = await this.webhookRepository.find();
|
|
@@ -86,11 +92,102 @@ let WebhookService = class WebhookService {
|
|
|
86
92
|
.find({ select: ['method'], where: { webhookPath: path } })
|
|
87
93
|
.then((rows) => rows.map((r) => r.method));
|
|
88
94
|
}
|
|
95
|
+
getNodeWebhooks(workflow, node, additionalData, ignoreRestartWebhooks = false) {
|
|
96
|
+
if (node.disabled === true) {
|
|
97
|
+
return [];
|
|
98
|
+
}
|
|
99
|
+
const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
|
|
100
|
+
if (nodeType.description.webhooks === undefined) {
|
|
101
|
+
return [];
|
|
102
|
+
}
|
|
103
|
+
const workflowId = workflow.id || '__UNSAVED__';
|
|
104
|
+
const mode = 'internal';
|
|
105
|
+
const returnData = [];
|
|
106
|
+
for (const webhookDescription of nodeType.description.webhooks) {
|
|
107
|
+
if (ignoreRestartWebhooks && webhookDescription.restartWebhook === true) {
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
let nodeWebhookPath = workflow.expression.getSimpleParameterValue(node, webhookDescription.path, mode, {});
|
|
111
|
+
if (nodeWebhookPath === undefined) {
|
|
112
|
+
this.logger.error(`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`);
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
nodeWebhookPath = nodeWebhookPath.toString();
|
|
116
|
+
if (nodeWebhookPath.startsWith('/')) {
|
|
117
|
+
nodeWebhookPath = nodeWebhookPath.slice(1);
|
|
118
|
+
}
|
|
119
|
+
if (nodeWebhookPath.endsWith('/')) {
|
|
120
|
+
nodeWebhookPath = nodeWebhookPath.slice(0, -1);
|
|
121
|
+
}
|
|
122
|
+
const isFullPath = workflow.expression.getSimpleParameterValue(node, webhookDescription.isFullPath, 'internal', {}, undefined, false);
|
|
123
|
+
const restartWebhook = workflow.expression.getSimpleParameterValue(node, webhookDescription.restartWebhook, 'internal', {}, undefined, false);
|
|
124
|
+
const path = n8n_workflow_1.NodeHelpers.getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath, restartWebhook);
|
|
125
|
+
const webhookMethods = workflow.expression.getSimpleParameterValue(node, webhookDescription.httpMethod, mode, {}, undefined, 'GET');
|
|
126
|
+
if (webhookMethods === undefined) {
|
|
127
|
+
this.logger.error(`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`);
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
130
|
+
let webhookId;
|
|
131
|
+
if ((path.startsWith(':') || path.includes('/:')) && node.webhookId) {
|
|
132
|
+
webhookId = node.webhookId;
|
|
133
|
+
}
|
|
134
|
+
String(webhookMethods)
|
|
135
|
+
.split(',')
|
|
136
|
+
.forEach((httpMethod) => {
|
|
137
|
+
if (!httpMethod)
|
|
138
|
+
return;
|
|
139
|
+
returnData.push({
|
|
140
|
+
httpMethod: httpMethod.trim(),
|
|
141
|
+
node: node.name,
|
|
142
|
+
path,
|
|
143
|
+
webhookDescription,
|
|
144
|
+
workflowId,
|
|
145
|
+
workflowExecuteAdditionalData: additionalData,
|
|
146
|
+
webhookId,
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
return returnData;
|
|
151
|
+
}
|
|
152
|
+
async createWebhookIfNotExists(workflow, webhookData, mode, activation) {
|
|
153
|
+
const webhookExists = await this.runWebhookMethod('checkExists', workflow, webhookData, mode, activation);
|
|
154
|
+
if (!webhookExists) {
|
|
155
|
+
await this.runWebhookMethod('create', workflow, webhookData, mode, activation);
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
async deleteWebhook(workflow, webhookData, mode, activation) {
|
|
159
|
+
await this.runWebhookMethod('delete', workflow, webhookData, mode, activation);
|
|
160
|
+
}
|
|
161
|
+
async runWebhookMethod(method, workflow, webhookData, mode, activation) {
|
|
162
|
+
const node = workflow.getNode(webhookData.node);
|
|
163
|
+
if (!node)
|
|
164
|
+
return;
|
|
165
|
+
const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
|
|
166
|
+
const webhookFn = nodeType.webhookMethods?.[webhookData.webhookDescription.name]?.[method];
|
|
167
|
+
if (webhookFn === undefined)
|
|
168
|
+
return;
|
|
169
|
+
const context = new n8n_core_1.HookContext(workflow, node, webhookData.workflowExecuteAdditionalData, mode, activation, webhookData);
|
|
170
|
+
return (await webhookFn.call(context));
|
|
171
|
+
}
|
|
172
|
+
async runWebhook(workflow, webhookData, node, additionalData, mode, runExecutionData) {
|
|
173
|
+
const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
|
|
174
|
+
if (nodeType.webhook === undefined) {
|
|
175
|
+
throw new n8n_workflow_1.ApplicationError('Node does not have any webhooks defined', {
|
|
176
|
+
extra: { nodeName: node.name },
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
const context = new n8n_core_1.WebhookContext(workflow, node, additionalData, mode, webhookData, [], runExecutionData ?? null);
|
|
180
|
+
return nodeType instanceof n8n_workflow_1.Node
|
|
181
|
+
? await nodeType.webhook(context)
|
|
182
|
+
: (await nodeType.webhook.call(context));
|
|
183
|
+
}
|
|
89
184
|
};
|
|
90
185
|
exports.WebhookService = WebhookService;
|
|
91
186
|
exports.WebhookService = WebhookService = __decorate([
|
|
92
187
|
(0, typedi_1.Service)(),
|
|
93
|
-
__metadata("design:paramtypes", [
|
|
94
|
-
|
|
188
|
+
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
189
|
+
webhook_repository_1.WebhookRepository,
|
|
190
|
+
cache_service_1.CacheService,
|
|
191
|
+
node_types_1.NodeTypes])
|
|
95
192
|
], WebhookService);
|
|
96
193
|
//# sourceMappingURL=webhook.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.service.js","sourceRoot":"","sources":["../../src/webhooks/webhook.service.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"webhook.service.js","sourceRoot":"","sources":["../../src/webhooks/webhook.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -163,7 +163,7 @@ function executeErrorWorkflow(workflowData, fullRunData, mode, executionId, retr
|
|
|
163
163
|
void typedi_1.Container.get(workflow_execution_service_1.WorkflowExecutionService).executeErrorWorkflow(errorWorkflow, workflowErrorData, project);
|
|
164
164
|
})
|
|
165
165
|
.catch((error) => {
|
|
166
|
-
|
|
166
|
+
typedi_1.Container.get(n8n_core_1.ErrorReporter).error(error);
|
|
167
167
|
logger.error(`Could not execute ErrorWorkflow for execution ID ${this.executionId} because of error querying the workflow owner`, {
|
|
168
168
|
executionId,
|
|
169
169
|
errorWorkflowId: errorWorkflow,
|
|
@@ -312,7 +312,7 @@ function hookFunctionsSave() {
|
|
|
312
312
|
await typedi_1.Container.get(workflow_static_data_service_1.WorkflowStaticDataService).saveStaticDataById(this.workflowData.id, newStaticData);
|
|
313
313
|
}
|
|
314
314
|
catch (e) {
|
|
315
|
-
|
|
315
|
+
typedi_1.Container.get(n8n_core_1.ErrorReporter).error(e);
|
|
316
316
|
logger.error(`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`, { executionId: this.executionId, workflowId: this.workflowData.id });
|
|
317
317
|
}
|
|
318
318
|
}
|
|
@@ -352,7 +352,7 @@ function hookFunctionsSave() {
|
|
|
352
352
|
}
|
|
353
353
|
}
|
|
354
354
|
catch (error) {
|
|
355
|
-
|
|
355
|
+
typedi_1.Container.get(n8n_core_1.ErrorReporter).error(error);
|
|
356
356
|
logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, {
|
|
357
357
|
executionId: this.executionId,
|
|
358
358
|
workflowId: this.workflowData.id,
|
|
@@ -412,7 +412,7 @@ function hookFunctionsSaveWorker() {
|
|
|
412
412
|
await typedi_1.Container.get(workflow_static_data_service_1.WorkflowStaticDataService).saveStaticDataById(this.workflowData.id, newStaticData);
|
|
413
413
|
}
|
|
414
414
|
catch (e) {
|
|
415
|
-
|
|
415
|
+
typedi_1.Container.get(n8n_core_1.ErrorReporter).error(e);
|
|
416
416
|
logger.error(`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`, { pushRef: this.pushRef, workflowId: this.workflowData.id });
|
|
417
417
|
}
|
|
418
418
|
}
|
|
@@ -462,7 +462,7 @@ function hookFunctionsSaveWorker() {
|
|
|
462
462
|
]);
|
|
463
463
|
}
|
|
464
464
|
catch (error) {
|
|
465
|
-
|
|
465
|
+
typedi_1.Container.get(n8n_core_1.ErrorReporter).error(error);
|
|
466
466
|
typedi_1.Container.get(logger_service_1.Logger).error('There was a problem running hook "workflow.postExecute"', error);
|
|
467
467
|
}
|
|
468
468
|
}
|