n8n-core 1.103.2 → 1.104.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/build.tsbuildinfo +1 -1
- package/dist/errors/error-reporter.js +3 -1
- package/dist/errors/error-reporter.js.map +1 -1
- package/dist/execution-engine/active-workflows.js +4 -4
- package/dist/execution-engine/active-workflows.js.map +1 -1
- package/dist/execution-engine/node-execution-context/node-execution-context.d.ts +4 -1
- package/dist/execution-engine/node-execution-context/node-execution-context.js +15 -3
- package/dist/execution-engine/node-execution-context/node-execution-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/scheduling-helper-functions.js +1 -1
- package/dist/execution-engine/node-execution-context/utils/scheduling-helper-functions.js.map +1 -1
- package/dist/execution-engine/scheduled-task-manager.d.ts +13 -4
- package/dist/execution-engine/scheduled-task-manager.js +64 -15
- package/dist/execution-engine/scheduled-task-manager.js.map +1 -1
- package/dist/execution-engine/workflow-execute.js +18 -14
- package/dist/execution-engine/workflow-execute.js.map +1 -1
- package/dist/html-sandbox.d.ts +1 -2
- package/dist/html-sandbox.js +3 -10
- package/dist/html-sandbox.js.map +1 -1
- package/dist/nodes-loader/directory-loader.d.ts +1 -0
- package/dist/nodes-loader/directory-loader.js +3 -1
- package/dist/nodes-loader/directory-loader.js.map +1 -1
- package/dist/nodes-loader/lazy-package-directory-loader.js +1 -1
- package/dist/nodes-loader/lazy-package-directory-loader.js.map +1 -1
- package/dist/utils/is-json-compatible.d.ts +1 -1
- package/dist/utils/is-json-compatible.js +8 -5
- package/dist/utils/is-json-compatible.js.map +1 -1
- package/package.json +9 -9
|
@@ -72,7 +72,9 @@ let ErrorReporter = class ErrorReporter {
|
|
|
72
72
|
meta = e.extra;
|
|
73
73
|
}
|
|
74
74
|
const msg = [e.message + context, stack].join('');
|
|
75
|
-
|
|
75
|
+
if (options?.shouldBeLogged ?? true) {
|
|
76
|
+
this.logger.error(msg, meta);
|
|
77
|
+
}
|
|
76
78
|
e = e.cause;
|
|
77
79
|
} while (e);
|
|
78
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAqD;AAErD,gCAAkC;AAGlC,iCAAmC;AAEnC,+CAAoF;AACpF,6CAAyC;AAgBzC,MAAM,aAAa,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC1C,MAAM,eAAe,GAAG,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC;AAC9C,MAAM,0BAA0B,GAC/B,qEAAqE,CAAC;AAGhE,IAAM,aAAa,GAAnB,MAAM,aAAa;IAUzB,YAA6B,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;QANnC,eAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QAQtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;IAClC,CAAC;IAEO,aAAa,CAAC,KAAqB,EAAE,OAA0B;QACtE,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,KAAK,CAAC;YAEd,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,eAAe,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAEjE,GAAG,CAAC;gBACH,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,IAAI,IAAI,GAAG,SAAS,CAAC;gBACrB,IAAI,CAAC,YAAY,+BAAgB,IAAI,CAAC,YAAY,wBAAS,EAAE,CAAC;oBAC7D,IAAI,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;wBACpC,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC;oBAC1B,CAAC;oBACD,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC;gBAChB,CAAC;gBACD,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
68
68
|
async activatePolling(node, workflow, additionalData, getPollFunctions, mode, activation) {
|
|
69
69
|
const pollFunctions = getPollFunctions(workflow, node, additionalData, mode, activation);
|
|
70
70
|
const pollTimes = pollFunctions.getNodeParameter('pollTimes');
|
|
71
|
-
const
|
|
71
|
+
const cronExpressions = (pollTimes.item || []).map(n8n_workflow_1.toCronExpression);
|
|
72
72
|
const executeTrigger = async (testingTrigger = false) => {
|
|
73
73
|
this.logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
|
|
74
74
|
workflowName: workflow.name,
|
|
@@ -88,12 +88,12 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
88
88
|
}
|
|
89
89
|
};
|
|
90
90
|
await executeTrigger(true);
|
|
91
|
-
for (const
|
|
92
|
-
const cronTimeParts =
|
|
91
|
+
for (const expression of cronExpressions) {
|
|
92
|
+
const cronTimeParts = expression.split(' ');
|
|
93
93
|
if (cronTimeParts.length > 0 && cronTimeParts[0].includes('*')) {
|
|
94
94
|
throw new n8n_workflow_1.ApplicationError('The polling interval is too short. It has to be at least a minute.');
|
|
95
95
|
}
|
|
96
|
-
this.scheduledTaskManager.registerCron(workflow,
|
|
96
|
+
this.scheduledTaskManager.registerCron(workflow, { expression }, executeTrigger);
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
async remove(workflowId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,10 @@ export declare abstract class NodeExecutionContext implements Omit<FunctionsBase
|
|
|
25
25
|
getChildNodes(nodeName: string, options?: {
|
|
26
26
|
includeNodeParameters?: boolean;
|
|
27
27
|
}): NodeTypeAndVersion[];
|
|
28
|
-
getParentNodes(nodeName: string
|
|
28
|
+
getParentNodes(nodeName: string, options?: {
|
|
29
|
+
includeNodeParameters?: boolean;
|
|
30
|
+
}): NodeTypeAndVersion[];
|
|
31
|
+
getChatTrigger(): INode | null;
|
|
29
32
|
get nodeType(): import("n8n-workflow").INodeType;
|
|
30
33
|
get nodeInputs(): INodeInputConfiguration[];
|
|
31
34
|
getNodeInputs(): INodeInputConfiguration[];
|
|
@@ -74,20 +74,32 @@ class NodeExecutionContext {
|
|
|
74
74
|
}
|
|
75
75
|
return output;
|
|
76
76
|
}
|
|
77
|
-
getParentNodes(nodeName) {
|
|
77
|
+
getParentNodes(nodeName, options) {
|
|
78
78
|
const output = [];
|
|
79
79
|
const nodeNames = this.workflow.getParentNodes(nodeName);
|
|
80
80
|
for (const n of nodeNames) {
|
|
81
81
|
const node = this.workflow.nodes[n];
|
|
82
|
-
|
|
82
|
+
const entry = {
|
|
83
83
|
name: node.name,
|
|
84
84
|
type: node.type,
|
|
85
85
|
typeVersion: node.typeVersion,
|
|
86
86
|
disabled: node.disabled ?? false,
|
|
87
|
-
}
|
|
87
|
+
};
|
|
88
|
+
if (options?.includeNodeParameters) {
|
|
89
|
+
entry.parameters = node.parameters;
|
|
90
|
+
}
|
|
91
|
+
output.push(entry);
|
|
88
92
|
}
|
|
89
93
|
return output;
|
|
90
94
|
}
|
|
95
|
+
getChatTrigger() {
|
|
96
|
+
for (const node of Object.values(this.workflow.nodes)) {
|
|
97
|
+
if (this.workflow.nodes[node.name].type === n8n_workflow_1.CHAT_TRIGGER_NODE_TYPE) {
|
|
98
|
+
return this.workflow.nodes[node.name];
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return null;
|
|
102
|
+
}
|
|
91
103
|
get nodeType() {
|
|
92
104
|
const { type, typeVersion } = this.node;
|
|
93
105
|
return this.workflow.nodeTypes.getByNameAndVersion(type, typeVersion);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-execution-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/node-execution-context.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gDAA2C;AAC3C,gCAAoC;AACpC,qDAA6B;AAsB7B,+
|
|
1
|
+
{"version":3,"file":"node-execution-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/node-execution-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const scheduled_task_manager_1 = require("../../scheduled-task-manager");
|
|
|
6
6
|
const getSchedulingFunctions = (workflow) => {
|
|
7
7
|
const scheduledTaskManager = di_1.Container.get(scheduled_task_manager_1.ScheduledTaskManager);
|
|
8
8
|
return {
|
|
9
|
-
registerCron: (
|
|
9
|
+
registerCron: (cron, onTick) => scheduledTaskManager.registerCron(workflow, cron, onTick),
|
|
10
10
|
};
|
|
11
11
|
};
|
|
12
12
|
exports.getSchedulingFunctions = getSchedulingFunctions;
|
package/dist/execution-engine/node-execution-context/utils/scheduling-helper-functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduling-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/scheduling-helper-functions.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;AAGpC,yEAAoE;AAE7D,MAAM,sBAAsB,GAAG,CAAC,QAAkB,EAAuB,EAAE;IACjF,MAAM,oBAAoB,GAAG,cAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC;IACjE,OAAO;QACN,YAAY,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"scheduling-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/scheduling-helper-functions.ts"],"names":[],"mappings":";;;AAAA,gCAAoC;AAGpC,yEAAoE;AAE7D,MAAM,sBAAsB,GAAG,CAAC,QAAkB,EAAuB,EAAE;IACjF,MAAM,oBAAoB,GAAG,cAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC;IACjE,OAAO;QACN,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC;KACzF,CAAC;AACH,CAAC,CAAC;AALW,QAAA,sBAAsB,0BAKjC"}
|
|
@@ -1,11 +1,20 @@
|
|
|
1
|
+
import { Logger } from '@n8n/backend-common';
|
|
2
|
+
import { CronLoggingConfig } from '@n8n/config';
|
|
1
3
|
import { CronJob } from 'cron';
|
|
2
|
-
import type {
|
|
4
|
+
import type { Cron, Workflow } from 'n8n-workflow';
|
|
3
5
|
import { InstanceSettings } from '../instance-settings';
|
|
4
6
|
export declare class ScheduledTaskManager {
|
|
5
7
|
private readonly instanceSettings;
|
|
6
|
-
|
|
7
|
-
readonly
|
|
8
|
-
|
|
8
|
+
private readonly logger;
|
|
9
|
+
private readonly config;
|
|
10
|
+
readonly cronMap: Map<string, {
|
|
11
|
+
job: CronJob;
|
|
12
|
+
displayableCron: string;
|
|
13
|
+
}[]>;
|
|
14
|
+
private readonly logInterval?;
|
|
15
|
+
constructor(instanceSettings: InstanceSettings, logger: Logger, config: CronLoggingConfig);
|
|
16
|
+
private logActiveCrons;
|
|
17
|
+
registerCron(workflow: Workflow, { expression, recurrence }: Cron, onTick: () => void): void;
|
|
9
18
|
deregisterCrons(workflowId: string): void;
|
|
10
19
|
deregisterAllCrons(): void;
|
|
11
20
|
}
|
|
@@ -10,44 +10,93 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ScheduledTaskManager = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
14
|
+
const config_1 = require("@n8n/config");
|
|
15
|
+
const constants_1 = require("@n8n/constants");
|
|
13
16
|
const di_1 = require("@n8n/di");
|
|
14
17
|
const cron_1 = require("cron");
|
|
15
18
|
const instance_settings_1 = require("../instance-settings");
|
|
16
19
|
let ScheduledTaskManager = class ScheduledTaskManager {
|
|
17
|
-
constructor(instanceSettings) {
|
|
20
|
+
constructor(instanceSettings, logger, config) {
|
|
18
21
|
this.instanceSettings = instanceSettings;
|
|
19
|
-
this.
|
|
22
|
+
this.logger = logger;
|
|
23
|
+
this.config = config;
|
|
24
|
+
this.cronMap = new Map();
|
|
25
|
+
this.logger = this.logger.scoped('cron');
|
|
26
|
+
if (this.config.activeInterval === 0)
|
|
27
|
+
return;
|
|
28
|
+
this.logInterval = setInterval(() => this.logActiveCrons(), this.config.activeInterval * constants_1.Time.minutes.toMilliseconds);
|
|
20
29
|
}
|
|
21
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
30
|
+
logActiveCrons() {
|
|
31
|
+
const activeCrons = {};
|
|
32
|
+
for (const [workflowId, cronJobs] of this.cronMap) {
|
|
33
|
+
activeCrons[`workflow-${workflowId}`] = cronJobs.map(({ displayableCron }) => displayableCron);
|
|
34
|
+
}
|
|
35
|
+
if (Object.keys(activeCrons).length === 0)
|
|
36
|
+
return;
|
|
37
|
+
this.logger.debug('Currently active crons', { activeCrons });
|
|
38
|
+
}
|
|
39
|
+
registerCron(workflow, { expression, recurrence }, onTick) {
|
|
40
|
+
const recurrenceStr = recurrence?.activated
|
|
41
|
+
? `every ${recurrence.intervalSize} ${recurrence.typeInterval}`
|
|
42
|
+
: undefined;
|
|
43
|
+
const displayableCron = recurrenceStr ? `${expression} (${recurrenceStr})` : expression;
|
|
44
|
+
const cronJob = new cron_1.CronJob(expression, () => {
|
|
45
|
+
if (this.instanceSettings.isLeader) {
|
|
46
|
+
this.logger.debug('Executing cron for workflow', {
|
|
47
|
+
workflowId: workflow.id,
|
|
48
|
+
cron: displayableCron,
|
|
49
|
+
instanceRole: this.instanceSettings.instanceRole,
|
|
50
|
+
});
|
|
24
51
|
onTick();
|
|
52
|
+
}
|
|
25
53
|
}, undefined, true, workflow.timezone);
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
54
|
+
const workflowCronEntries = this.cronMap.get(workflow.id);
|
|
55
|
+
const cronEntry = { job: cronJob, displayableCron };
|
|
56
|
+
if (workflowCronEntries) {
|
|
57
|
+
workflowCronEntries.push(cronEntry);
|
|
29
58
|
}
|
|
30
59
|
else {
|
|
31
|
-
this.
|
|
60
|
+
this.cronMap.set(workflow.id, [cronEntry]);
|
|
32
61
|
}
|
|
62
|
+
this.logger.debug('Registered cron for workflow', {
|
|
63
|
+
workflowId: workflow.id,
|
|
64
|
+
cron: displayableCron,
|
|
65
|
+
instanceRole: this.instanceSettings.instanceRole,
|
|
66
|
+
});
|
|
33
67
|
}
|
|
34
68
|
deregisterCrons(workflowId) {
|
|
35
|
-
const cronJobs = this.
|
|
69
|
+
const cronJobs = this.cronMap.get(workflowId) ?? [];
|
|
70
|
+
if (cronJobs.length === 0)
|
|
71
|
+
return;
|
|
72
|
+
const crons = [];
|
|
36
73
|
while (cronJobs.length) {
|
|
37
|
-
const
|
|
38
|
-
if (
|
|
39
|
-
|
|
74
|
+
const cronEntry = cronJobs.pop();
|
|
75
|
+
if (cronEntry) {
|
|
76
|
+
crons.push(cronEntry.displayableCron);
|
|
77
|
+
cronEntry.job.stop();
|
|
78
|
+
}
|
|
40
79
|
}
|
|
80
|
+
this.cronMap.delete(workflowId);
|
|
81
|
+
this.logger.info('Deregistered all crons for workflow', {
|
|
82
|
+
workflowId,
|
|
83
|
+
crons,
|
|
84
|
+
instanceRole: this.instanceSettings.instanceRole,
|
|
85
|
+
});
|
|
41
86
|
}
|
|
42
87
|
deregisterAllCrons() {
|
|
43
|
-
for (const workflowId of
|
|
88
|
+
for (const workflowId of this.cronMap.keys()) {
|
|
44
89
|
this.deregisterCrons(workflowId);
|
|
45
90
|
}
|
|
91
|
+
if (this.logInterval)
|
|
92
|
+
clearInterval(this.logInterval);
|
|
46
93
|
}
|
|
47
94
|
};
|
|
48
95
|
exports.ScheduledTaskManager = ScheduledTaskManager;
|
|
49
96
|
exports.ScheduledTaskManager = ScheduledTaskManager = __decorate([
|
|
50
97
|
(0, di_1.Service)(),
|
|
51
|
-
__metadata("design:paramtypes", [instance_settings_1.InstanceSettings
|
|
98
|
+
__metadata("design:paramtypes", [instance_settings_1.InstanceSettings,
|
|
99
|
+
backend_common_1.Logger,
|
|
100
|
+
config_1.CronLoggingConfig])
|
|
52
101
|
], ScheduledTaskManager);
|
|
53
102
|
//# sourceMappingURL=scheduled-task-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled-task-manager.js","sourceRoot":"","sources":["../../src/execution-engine/scheduled-task-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAClC,+BAA+B;AAG/B,2DAAuD;AAGhD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"scheduled-task-manager.js","sourceRoot":"","sources":["../../src/execution-engine/scheduled-task-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,8CAAsC;AACtC,gCAAkC;AAClC,+BAA+B;AAG/B,2DAAuD;AAGhD,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAKhC,YACkB,gBAAkC,EAClC,MAAc,EACd,MAAyB;QAFzB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAmB;QAPlC,YAAO,GAAG,IAAI,GAAG,EAA4D,CAAC;QAStF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEzC,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,CAAC;YAAE,OAAO;QAE7C,IAAI,CAAC,WAAW,GAAG,WAAW,CAC7B,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,EAC3B,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CACxD,CAAC;IACH,CAAC;IAEO,cAAc;QACrB,MAAM,WAAW,GAA6B,EAAE,CAAC;QACjD,KAAK,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACnD,WAAW,CAAC,YAAY,UAAU,EAAE,CAAC,GAAG,QAAQ,CAAC,GAAG,CACnD,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,eAAe,CACxC,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAElD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,YAAY,CAAC,QAAkB,EAAE,EAAE,UAAU,EAAE,UAAU,EAAQ,EAAE,MAAkB;QACpF,MAAM,aAAa,GAAG,UAAU,EAAE,SAAS;YAC1C,CAAC,CAAC,SAAS,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,YAAY,EAAE;YAC/D,CAAC,CAAC,SAAS,CAAC;QAEb,MAAM,eAAe,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,UAAU,KAAK,aAAa,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;QAExF,MAAM,OAAO,GAAG,IAAI,cAAO,CAC1B,UAAU,EACV,GAAG,EAAE;YACJ,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE;oBAChD,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,IAAI,EAAE,eAAe;oBACrB,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY;iBAChD,CAAC,CAAC;gBACH,MAAM,EAAE,CAAC;YACV,CAAC;QACF,CAAC,EACD,SAAS,EACT,IAAI,EACJ,QAAQ,CAAC,QAAQ,CACjB,CAAC;QAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;QAEpD,IAAI,mBAAmB,EAAE,CAAC;YACzB,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE;YACjD,UAAU,EAAE,QAAQ,CAAC,EAAE;YACvB,IAAI,EAAE,eAAe;YACrB,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY;SAChD,CAAC,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,UAAkB;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAEpD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAElC,MAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC;YACjC,IAAI,SAAS,EAAE,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;gBACtC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;QACF,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE;YACvD,UAAU;YACV,KAAK;YACL,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,YAAY;SAChD,CAAC,CAAC;IACJ,CAAC;IAED,kBAAkB;QACjB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAED,IAAI,IAAI,CAAC,WAAW;YAAE,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;CACD,CAAA;AAxGY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,YAAO,GAAE;qCAO2B,oCAAgB;QAC1B,uBAAM;QACN,0BAAiB;GAR/B,oBAAoB,CAwGhC"}
|
|
@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.WorkflowExecute = void 0;
|
|
40
|
+
const config_1 = require("@n8n/config");
|
|
40
41
|
const constants_1 = require("@n8n/constants");
|
|
41
42
|
const di_1 = require("@n8n/di");
|
|
42
43
|
const assert = __importStar(require("assert/strict"));
|
|
@@ -710,20 +711,23 @@ class WorkflowExecute {
|
|
|
710
711
|
? await nodeType.execute(context)
|
|
711
712
|
: await nodeType.execute.call(context);
|
|
712
713
|
}
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
714
|
+
if (di_1.Container.get(config_1.GlobalConfig).sentry.backendDsn) {
|
|
715
|
+
const jsonCompatibleResult = (0, is_json_compatible_1.isJsonCompatible)(data, new Set(['pairedItem']));
|
|
716
|
+
if (!jsonCompatibleResult.isValid) {
|
|
717
|
+
di_1.Container.get(error_reporter_1.ErrorReporter).error('node execution returned incorrect data', {
|
|
718
|
+
shouldBeLogged: false,
|
|
719
|
+
extra: {
|
|
720
|
+
nodeName: node.name,
|
|
721
|
+
nodeType: node.type,
|
|
722
|
+
nodeVersion: node.typeVersion,
|
|
723
|
+
workflowId: workflow.id,
|
|
724
|
+
workflowName: workflow.name ?? 'Unnamed workflow',
|
|
725
|
+
executionId: this.additionalData.executionId ?? 'unsaved-execution',
|
|
726
|
+
errorPath: jsonCompatibleResult.errorPath,
|
|
727
|
+
errorMessage: jsonCompatibleResult.errorMessage,
|
|
728
|
+
},
|
|
729
|
+
});
|
|
730
|
+
}
|
|
727
731
|
}
|
|
728
732
|
const closeFunctionsResults = await Promise.allSettled(closeFunctions.map(async (fn) => await fn()));
|
|
729
733
|
const closingErrors = closeFunctionsResults
|