n8n-core 2.7.0 → 2.8.0
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.d.ts +5 -2
- package/dist/errors/error-reporter.js +12 -7
- package/dist/errors/error-reporter.js.map +1 -1
- package/dist/execution-engine/active-workflows.d.ts +4 -1
- package/dist/execution-engine/active-workflows.js +37 -20
- package/dist/execution-engine/active-workflows.js.map +1 -1
- package/dist/execution-engine/execution-lifecycle-hooks.d.ts +1 -0
- package/dist/execution-engine/execution-lifecycle-hooks.js +1 -0
- package/dist/execution-engine/execution-lifecycle-hooks.js.map +1 -1
- package/dist/execution-engine/external-secrets-proxy.d.ts +0 -2
- package/dist/execution-engine/external-secrets-proxy.js +0 -3
- package/dist/execution-engine/external-secrets-proxy.js.map +1 -1
- package/dist/execution-engine/requests-response.js +7 -3
- package/dist/execution-engine/requests-response.js.map +1 -1
- package/dist/execution-engine/workflow-execute.js +12 -0
- package/dist/execution-engine/workflow-execute.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/observability/index.d.ts +2 -0
- package/dist/observability/index.js +9 -0
- package/dist/observability/index.js.map +1 -0
- package/dist/observability/tracing/noop-tracing.d.ts +19 -0
- package/dist/observability/tracing/noop-tracing.js +54 -0
- package/dist/observability/tracing/noop-tracing.js.map +1 -0
- package/dist/observability/tracing/sentry-tracing.d.ts +7 -0
- package/dist/observability/tracing/sentry-tracing.js +15 -0
- package/dist/observability/tracing/sentry-tracing.js.map +1 -0
- package/dist/observability/tracing/tracing.d.ts +33 -0
- package/dist/observability/tracing/tracing.js +59 -0
- package/dist/observability/tracing/tracing.js.map +1 -0
- package/package.json +8 -8
|
@@ -2,6 +2,7 @@ import { Logger } from '@n8n/backend-common';
|
|
|
2
2
|
import { type InstanceType } from '@n8n/constants';
|
|
3
3
|
import type { ReportingOptions } from '@n8n/errors';
|
|
4
4
|
import type { ErrorEvent, EventHint } from '@sentry/core';
|
|
5
|
+
import { Tracing } from '../observability';
|
|
5
6
|
type SentryIntegration = 'Redis' | 'Postgres' | 'Http' | 'Express';
|
|
6
7
|
type ErrorReporterInitOptions = {
|
|
7
8
|
serverType: InstanceType | 'task_runner';
|
|
@@ -11,6 +12,7 @@ type ErrorReporterInitOptions = {
|
|
|
11
12
|
serverName: string;
|
|
12
13
|
releaseDate?: Date;
|
|
13
14
|
withEventLoopBlockDetection: boolean;
|
|
15
|
+
eventLoopBlockThreshold?: number;
|
|
14
16
|
tracesSampleRate: number;
|
|
15
17
|
profilesSampleRate: number;
|
|
16
18
|
beforeSendFilter?: (event: ErrorEvent, hint: EventHint) => boolean;
|
|
@@ -18,14 +20,15 @@ type ErrorReporterInitOptions = {
|
|
|
18
20
|
};
|
|
19
21
|
export declare class ErrorReporter {
|
|
20
22
|
private readonly logger;
|
|
23
|
+
private readonly tracing;
|
|
21
24
|
private expirationTimer?;
|
|
22
25
|
private seenErrors;
|
|
23
26
|
private report;
|
|
24
27
|
private beforeSendFilter?;
|
|
25
|
-
constructor(logger: Logger);
|
|
28
|
+
constructor(logger: Logger, tracing: Tracing);
|
|
26
29
|
private defaultReport;
|
|
27
30
|
shutdown(timeoutInMs?: number): Promise<void>;
|
|
28
|
-
init({ beforeSendFilter, dsn, serverType, release, environment, serverName, releaseDate, withEventLoopBlockDetection, profilesSampleRate, tracesSampleRate, eligibleIntegrations, }: ErrorReporterInitOptions): Promise<void>;
|
|
31
|
+
init({ beforeSendFilter, dsn, serverType, release, environment, serverName, releaseDate, withEventLoopBlockDetection, eventLoopBlockThreshold, profilesSampleRate, tracesSampleRate, eligibleIntegrations, }: ErrorReporterInitOptions): Promise<void>;
|
|
29
32
|
beforeSend(event: ErrorEvent, hint: EventHint): Promise<ErrorEvent | null>;
|
|
30
33
|
error(e: unknown, options?: ReportingOptions): void;
|
|
31
34
|
warn(warning: Error | string, options?: ReportingOptions): void;
|
|
@@ -48,12 +48,14 @@ const di_1 = require("@n8n/di");
|
|
|
48
48
|
const axios_1 = require("axios");
|
|
49
49
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
50
50
|
const node_crypto_1 = require("node:crypto");
|
|
51
|
+
const observability_1 = require("../observability");
|
|
51
52
|
const ONE_DAY_IN_MS = 24 * 60 * 60 * 1000;
|
|
52
53
|
const SIX_WEEKS_IN_MS = 6 * 7 * ONE_DAY_IN_MS;
|
|
53
54
|
const RELEASE_EXPIRATION_WARNING = 'Error tracking disabled because this release is older than 6 weeks.';
|
|
54
55
|
let ErrorReporter = class ErrorReporter {
|
|
55
|
-
constructor(logger) {
|
|
56
|
+
constructor(logger, tracing) {
|
|
56
57
|
this.logger = logger;
|
|
58
|
+
this.tracing = tracing;
|
|
57
59
|
this.seenErrors = new Set();
|
|
58
60
|
this.report = this.defaultReport;
|
|
59
61
|
}
|
|
@@ -84,7 +86,7 @@ let ErrorReporter = class ErrorReporter {
|
|
|
84
86
|
const { close } = await Promise.resolve().then(() => __importStar(require('@sentry/node')));
|
|
85
87
|
await close(timeoutInMs);
|
|
86
88
|
}
|
|
87
|
-
async init({ beforeSendFilter, dsn, serverType, release, environment, serverName, releaseDate, withEventLoopBlockDetection, profilesSampleRate, tracesSampleRate, eligibleIntegrations = {}, }) {
|
|
89
|
+
async init({ beforeSendFilter, dsn, serverType, release, environment, serverName, releaseDate, withEventLoopBlockDetection, eventLoopBlockThreshold, profilesSampleRate, tracesSampleRate, eligibleIntegrations = {}, }) {
|
|
88
90
|
if (backend_common_1.inTest)
|
|
89
91
|
return;
|
|
90
92
|
process.on('uncaughtException', (error) => {
|
|
@@ -111,8 +113,8 @@ let ErrorReporter = class ErrorReporter {
|
|
|
111
113
|
if (!dsn)
|
|
112
114
|
return;
|
|
113
115
|
Error.stackTraceLimit = 50;
|
|
114
|
-
const
|
|
115
|
-
const { requestDataIntegration, rewriteFramesIntegration } =
|
|
116
|
+
const sentry = await Promise.resolve().then(() => __importStar(require('@sentry/node')));
|
|
117
|
+
const { init, captureException, setTag, requestDataIntegration, rewriteFramesIntegration } = sentry;
|
|
116
118
|
const enabledIntegrations = new Set([
|
|
117
119
|
'InboundFilters',
|
|
118
120
|
'FunctionToString',
|
|
@@ -126,6 +128,7 @@ let ErrorReporter = class ErrorReporter {
|
|
|
126
128
|
tracingIntegrations
|
|
127
129
|
.filter((integrationName) => !!eligibleIntegrations[integrationName])
|
|
128
130
|
.forEach((integrationName) => enabledIntegrations.add(integrationName));
|
|
131
|
+
this.tracing.setTracingImplementation(new observability_1.SentryTracing(sentry));
|
|
129
132
|
}
|
|
130
133
|
const isProfilingEnabled = profilesSampleRate > 0;
|
|
131
134
|
if (isProfilingEnabled && !isTracingEnabled) {
|
|
@@ -136,7 +139,7 @@ let ErrorReporter = class ErrorReporter {
|
|
|
136
139
|
await this.getEventLoopBlockIntegration({
|
|
137
140
|
server_name: serverName,
|
|
138
141
|
server_type: serverType,
|
|
139
|
-
})
|
|
142
|
+
}, eventLoopBlockThreshold)
|
|
140
143
|
: [];
|
|
141
144
|
const profilingIntegration = isProfilingEnabled ? await this.getProfilingIntegration() : [];
|
|
142
145
|
init({
|
|
@@ -248,11 +251,12 @@ let ErrorReporter = class ErrorReporter {
|
|
|
248
251
|
if (tags)
|
|
249
252
|
event.tags = { ...event.tags, ...tags };
|
|
250
253
|
}
|
|
251
|
-
async getEventLoopBlockIntegration(tags) {
|
|
254
|
+
async getEventLoopBlockIntegration(tags, threshold) {
|
|
252
255
|
try {
|
|
253
256
|
const { eventLoopBlockIntegration } = await Promise.resolve().then(() => __importStar(require('@sentry/node-native')));
|
|
254
257
|
return [
|
|
255
258
|
eventLoopBlockIntegration({
|
|
259
|
+
...(threshold ? { threshold } : {}),
|
|
256
260
|
staticTags: tags,
|
|
257
261
|
}),
|
|
258
262
|
];
|
|
@@ -276,6 +280,7 @@ let ErrorReporter = class ErrorReporter {
|
|
|
276
280
|
exports.ErrorReporter = ErrorReporter;
|
|
277
281
|
exports.ErrorReporter = ErrorReporter = __decorate([
|
|
278
282
|
(0, di_1.Service)(),
|
|
279
|
-
__metadata("design:paramtypes", [backend_common_1.Logger
|
|
283
|
+
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
284
|
+
observability_1.Tracing])
|
|
280
285
|
], ErrorReporter);
|
|
281
286
|
//# sourceMappingURL=error-reporter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAqD;AAErD,gCAAkC;AAIlC,iCAAmC;AACnC,+CAAoF;AACpF,6CAAyC;
|
|
1
|
+
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Logger } from '@n8n/backend-common';
|
|
|
2
2
|
import type { IWorkflowExecuteAdditionalData, Workflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
|
|
3
3
|
import { ErrorReporter } from '../errors/error-reporter';
|
|
4
4
|
import type { IWorkflowData } from '../interfaces';
|
|
5
|
+
import { Tracing } from '../observability';
|
|
5
6
|
import type { IGetExecutePollFunctions, IGetExecuteTriggerFunctions } from './interfaces';
|
|
6
7
|
import { ScheduledTaskManager } from './scheduled-task-manager';
|
|
7
8
|
import { TriggersAndPollers } from './triggers-and-pollers';
|
|
@@ -10,7 +11,8 @@ export declare class ActiveWorkflows {
|
|
|
10
11
|
private readonly scheduledTaskManager;
|
|
11
12
|
private readonly triggersAndPollers;
|
|
12
13
|
private readonly errorReporter;
|
|
13
|
-
|
|
14
|
+
private readonly tracing;
|
|
15
|
+
constructor(logger: Logger, scheduledTaskManager: ScheduledTaskManager, triggersAndPollers: TriggersAndPollers, errorReporter: ErrorReporter, tracing: Tracing);
|
|
14
16
|
private activeWorkflows;
|
|
15
17
|
isActive(workflowId: string): boolean;
|
|
16
18
|
allActiveWorkflows(): string[];
|
|
@@ -20,4 +22,5 @@ export declare class ActiveWorkflows {
|
|
|
20
22
|
remove(workflowId: string): Promise<boolean>;
|
|
21
23
|
removeAllTriggerAndPollerBasedWorkflows(): Promise<void>;
|
|
22
24
|
private closeTrigger;
|
|
25
|
+
private createPollExecuteFn;
|
|
23
26
|
}
|
|
@@ -14,14 +14,16 @@ const backend_common_1 = require("@n8n/backend-common");
|
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
15
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
16
16
|
const error_reporter_1 = require("../errors/error-reporter");
|
|
17
|
+
const observability_1 = require("../observability");
|
|
17
18
|
const scheduled_task_manager_1 = require("./scheduled-task-manager");
|
|
18
19
|
const triggers_and_pollers_1 = require("./triggers-and-pollers");
|
|
19
20
|
let ActiveWorkflows = class ActiveWorkflows {
|
|
20
|
-
constructor(logger, scheduledTaskManager, triggersAndPollers, errorReporter) {
|
|
21
|
+
constructor(logger, scheduledTaskManager, triggersAndPollers, errorReporter, tracing) {
|
|
21
22
|
this.logger = logger;
|
|
22
23
|
this.scheduledTaskManager = scheduledTaskManager;
|
|
23
24
|
this.triggersAndPollers = triggersAndPollers;
|
|
24
25
|
this.errorReporter = errorReporter;
|
|
26
|
+
this.tracing = tracing;
|
|
25
27
|
this.activeWorkflows = {};
|
|
26
28
|
}
|
|
27
29
|
isActive(workflowId) {
|
|
@@ -69,24 +71,7 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
69
71
|
const pollFunctions = getPollFunctions(workflow, node, additionalData, mode, activation);
|
|
70
72
|
const pollTimes = pollFunctions.getNodeParameter('pollTimes');
|
|
71
73
|
const cronExpressions = (pollTimes.item || []).map(n8n_workflow_1.toCronExpression);
|
|
72
|
-
const executeTrigger =
|
|
73
|
-
this.logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
|
|
74
|
-
workflowName: workflow.name,
|
|
75
|
-
workflowId: workflow.id,
|
|
76
|
-
});
|
|
77
|
-
try {
|
|
78
|
-
const pollResponse = await this.triggersAndPollers.runPoll(workflow, node, pollFunctions);
|
|
79
|
-
if (pollResponse !== null) {
|
|
80
|
-
pollFunctions.__emit(pollResponse);
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
catch (error) {
|
|
84
|
-
if (testingTrigger) {
|
|
85
|
-
throw error;
|
|
86
|
-
}
|
|
87
|
-
pollFunctions.__emitError(error);
|
|
88
|
-
}
|
|
89
|
-
};
|
|
74
|
+
const executeTrigger = this.createPollExecuteFn(workflow, node, pollFunctions);
|
|
90
75
|
await executeTrigger(true);
|
|
91
76
|
for (const expression of cronExpressions) {
|
|
92
77
|
if (expression.split(' ').at(0)?.includes('*')) {
|
|
@@ -141,6 +126,37 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
141
126
|
throw new n8n_workflow_1.WorkflowDeactivationError(`Failed to deactivate trigger of workflow ID "${workflowId}": "${error.message}"`, { cause: error, workflowId });
|
|
142
127
|
}
|
|
143
128
|
}
|
|
129
|
+
createPollExecuteFn(workflow, node, pollFunctions) {
|
|
130
|
+
return async (testingTrigger = false) => {
|
|
131
|
+
return await this.tracing.startSpan({
|
|
132
|
+
name: 'Workflow Trigger Poll',
|
|
133
|
+
op: 'trigger.poll',
|
|
134
|
+
attributes: {
|
|
135
|
+
...this.tracing.pickWorkflowAttributes(workflow),
|
|
136
|
+
...this.tracing.pickNodeAttributes(node),
|
|
137
|
+
},
|
|
138
|
+
}, async (span) => {
|
|
139
|
+
this.logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
|
|
140
|
+
workflowName: workflow.name,
|
|
141
|
+
workflowId: workflow.id,
|
|
142
|
+
});
|
|
143
|
+
try {
|
|
144
|
+
const pollResponse = await this.triggersAndPollers.runPoll(workflow, node, pollFunctions);
|
|
145
|
+
if (pollResponse !== null) {
|
|
146
|
+
pollFunctions.__emit(pollResponse);
|
|
147
|
+
}
|
|
148
|
+
span.setStatus({ code: 1 });
|
|
149
|
+
}
|
|
150
|
+
catch (error) {
|
|
151
|
+
span.setStatus({ code: 2 });
|
|
152
|
+
if (testingTrigger) {
|
|
153
|
+
throw error;
|
|
154
|
+
}
|
|
155
|
+
pollFunctions.__emitError(error);
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
};
|
|
159
|
+
}
|
|
144
160
|
};
|
|
145
161
|
exports.ActiveWorkflows = ActiveWorkflows;
|
|
146
162
|
exports.ActiveWorkflows = ActiveWorkflows = __decorate([
|
|
@@ -148,6 +164,7 @@ exports.ActiveWorkflows = ActiveWorkflows = __decorate([
|
|
|
148
164
|
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
149
165
|
scheduled_task_manager_1.ScheduledTaskManager,
|
|
150
166
|
triggers_and_pollers_1.TriggersAndPollers,
|
|
151
|
-
error_reporter_1.ErrorReporter
|
|
167
|
+
error_reporter_1.ErrorReporter,
|
|
168
|
+
observability_1.Tracing])
|
|
152
169
|
], ActiveWorkflows);
|
|
153
170
|
//# sourceMappingURL=active-workflows.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;
|
|
1
|
+
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ export type ExecutionLifecycleHookHandlers = {
|
|
|
3
3
|
nodeExecuteBefore: Array<(this: ExecutionLifecycleHooks, nodeName: string, data: ITaskStartedData) => Promise<void> | void>;
|
|
4
4
|
nodeExecuteAfter: Array<(this: ExecutionLifecycleHooks, nodeName: string, data: ITaskData, executionData: IRunExecutionData) => Promise<void> | void>;
|
|
5
5
|
workflowExecuteBefore: Array<(this: ExecutionLifecycleHooks, workflow: Workflow, data?: IRunExecutionData) => Promise<void> | void>;
|
|
6
|
+
workflowExecuteResume: Array<(this: ExecutionLifecycleHooks, workflow: Workflow, data?: IRunExecutionData) => Promise<void> | void>;
|
|
6
7
|
workflowExecuteAfter: Array<(this: ExecutionLifecycleHooks, data: IRun, newStaticData: IDataObject) => Promise<void> | void>;
|
|
7
8
|
sendResponse: Array<(this: ExecutionLifecycleHooks, response: IExecuteResponsePromiseData) => Promise<void> | void>;
|
|
8
9
|
sendChunk: Array<(this: ExecutionLifecycleHooks, chunk: StructuredChunk) => Promise<void> | void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-lifecycle-hooks.js","sourceRoot":"","sources":["../../src/execution-engine/execution-lifecycle-hooks.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"execution-lifecycle-hooks.js","sourceRoot":"","sources":["../../src/execution-engine/execution-lifecycle-hooks.ts"],"names":[],"mappings":";;;AA0FA,MAAa,uBAAuB;IAYnC,YACU,IAAyB,EACzB,WAAmB,EACnB,YAA2B;QAF3B,SAAI,GAAJ,IAAI,CAAqB;QACzB,gBAAW,GAAX,WAAW,CAAQ;QACnB,iBAAY,GAAZ,YAAY,CAAe;QAd5B,aAAQ,GAAmC;YACnD,gBAAgB,EAAE,EAAE;YACpB,iBAAiB,EAAE,EAAE;YACrB,eAAe,EAAE,EAAE;YACnB,YAAY,EAAE,EAAE;YAChB,oBAAoB,EAAE,EAAE;YACxB,qBAAqB,EAAE,EAAE;YACzB,qBAAqB,EAAE,EAAE;YACzB,SAAS,EAAE,EAAE;SACb,CAAC;IAMC,CAAC;IAEJ,UAAU,CACT,QAAc,EACd,GAAG,QAA6D;QAGhE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,OAAO,CAKX,QAAc,EAAE,UAAkB;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACtC,KAAK,MAAM,YAAY,IAAI,KAAK,EAAE,CAAC;YAClC,MAAM,iBAAiB,GAAG,YAGR,CAAC;YACnB,MAAM,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;CACD;AAzCD,0DAyCC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export interface IExternalSecretsManager {
|
|
2
|
-
updateSecrets(): Promise<void>;
|
|
3
2
|
hasSecret(provider: string, name: string): boolean;
|
|
4
3
|
getSecret(provider: string, name: string): unknown;
|
|
5
4
|
getSecretNames(provider: string): string[];
|
|
@@ -9,7 +8,6 @@ export interface IExternalSecretsManager {
|
|
|
9
8
|
export declare class ExternalSecretsProxy {
|
|
10
9
|
private manager?;
|
|
11
10
|
setManager(manager: IExternalSecretsManager): void;
|
|
12
|
-
update(): Promise<void>;
|
|
13
11
|
getSecret(provider: string, name: string): unknown;
|
|
14
12
|
hasSecret(provider: string, name: string): boolean;
|
|
15
13
|
hasProvider(provider: string): boolean;
|
|
@@ -12,9 +12,6 @@ let ExternalSecretsProxy = class ExternalSecretsProxy {
|
|
|
12
12
|
setManager(manager) {
|
|
13
13
|
this.manager = manager;
|
|
14
14
|
}
|
|
15
|
-
async update() {
|
|
16
|
-
await this.manager?.updateSecrets();
|
|
17
|
-
}
|
|
18
15
|
getSecret(provider, name) {
|
|
19
16
|
return this.manager?.getSecret(provider, name);
|
|
20
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external-secrets-proxy.js","sourceRoot":"","sources":["../../src/execution-engine/external-secrets-proxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;
|
|
1
|
+
{"version":3,"file":"external-secrets-proxy.js","sourceRoot":"","sources":["../../src/execution-engine/external-secrets-proxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gCAAkC;AAW3B,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAGhC,UAAU,CAAC,OAAgC;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,IAAY;QACvC,OAAO,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,QAAgB,EAAE,IAAY;QACvC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,WAAW,CAAC,QAAgB;QAC3B,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,WAAW,CAAC,QAAgB;QAC3B,OAAO,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACrD,CAAC;CACD,CAAA;AA1BY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,YAAO,GAAE;GACG,oBAAoB,CA0BhC"}
|
|
@@ -24,7 +24,7 @@ function buildParentOutputData(json, parentRunIndex, parentOutputIndex, parentSo
|
|
|
24
24
|
],
|
|
25
25
|
];
|
|
26
26
|
}
|
|
27
|
-
function initializeNodeRunData(runData, nodeName, parentNode, parentOutputIndex, parentRunIndex, actionMetadata, runIndex,
|
|
27
|
+
function initializeNodeRunData(runData, nodeName, parentNode, parentOutputIndex, parentRunIndex, actionMetadata, runIndex, displayOutputData) {
|
|
28
28
|
runData[nodeName] ||= [];
|
|
29
29
|
const nodeRunData = runData[nodeName];
|
|
30
30
|
const nodeRunIndex = nodeRunData.length;
|
|
@@ -34,7 +34,7 @@ function initializeNodeRunData(runData, nodeName, parentNode, parentOutputIndex,
|
|
|
34
34
|
previousNodeRun: actionMetadata?.parentNodeName ? parentRunIndex : runIndex,
|
|
35
35
|
};
|
|
36
36
|
nodeRunData.push({
|
|
37
|
-
inputOverride: { ai_tool:
|
|
37
|
+
inputOverride: { ai_tool: displayOutputData },
|
|
38
38
|
source: [sourceData],
|
|
39
39
|
executionIndex: 0,
|
|
40
40
|
executionTime: 0,
|
|
@@ -69,8 +69,12 @@ function prepareRequestedNodesForExecution(workflow, currentNode, request, runIn
|
|
|
69
69
|
...action.input,
|
|
70
70
|
toolCallId: action.id,
|
|
71
71
|
};
|
|
72
|
+
const displayJson = {
|
|
73
|
+
...action.input,
|
|
74
|
+
};
|
|
72
75
|
const parentOutputData = buildParentOutputData(mergedJson, parentRunIndex, defaultParentOutputIndex, defaultParentSourceNode);
|
|
73
|
-
const
|
|
76
|
+
const displayOutputData = buildParentOutputData(displayJson, parentRunIndex, defaultParentOutputIndex, defaultParentSourceNode);
|
|
77
|
+
const nodeRunIndex = initializeNodeRunData(runData, node.name, parentNode, defaultParentOutputIndex, parentRunIndex, actionMetadata, runIndex, displayOutputData);
|
|
74
78
|
nodesToBeExecuted.push({
|
|
75
79
|
inputConnectionData: { type: action.type, node: action.nodeName, index: 0 },
|
|
76
80
|
parentOutputIndex: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests-response.js","sourceRoot":"","sources":["../../src/execution-engine/requests-response.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"requests-response.js","sourceRoot":"","sources":["../../src/execution-engine/requests-response.ts"],"names":[],"mappings":"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"}
|
|
@@ -723,6 +723,9 @@ class WorkflowExecute {
|
|
|
723
723
|
if (!this.additionalData.restartExecutionId) {
|
|
724
724
|
await hooks.runHook('workflowExecuteBefore', [workflow, this.runExecutionData]);
|
|
725
725
|
}
|
|
726
|
+
else {
|
|
727
|
+
await hooks.runHook('workflowExecuteResume', [workflow, this.runExecutionData]);
|
|
728
|
+
}
|
|
726
729
|
}
|
|
727
730
|
catch (error) {
|
|
728
731
|
const e = error;
|
|
@@ -1433,6 +1436,10 @@ class WorkflowExecute {
|
|
|
1433
1436
|
const isSameNumberOfItems = nodeSuccessData.length === 1 &&
|
|
1434
1437
|
executionData.data.main.length === 1 &&
|
|
1435
1438
|
executionData.data.main[0]?.length === nodeSuccessData[0].length;
|
|
1439
|
+
const isSingleOutput = nodeSuccessData.length === 1 &&
|
|
1440
|
+
nodeSuccessData[0]?.length === 1 &&
|
|
1441
|
+
executionData.data.main.length === 1 &&
|
|
1442
|
+
(executionData.data.main[0]?.length ?? 0) > 1;
|
|
1436
1443
|
checkOutputData: for (const outputData of nodeSuccessData) {
|
|
1437
1444
|
if (outputData === null) {
|
|
1438
1445
|
continue;
|
|
@@ -1449,6 +1456,11 @@ class WorkflowExecute {
|
|
|
1449
1456
|
item: index,
|
|
1450
1457
|
};
|
|
1451
1458
|
}
|
|
1459
|
+
else if (isSingleOutput) {
|
|
1460
|
+
item.pairedItem = {
|
|
1461
|
+
item: 0,
|
|
1462
|
+
};
|
|
1463
|
+
}
|
|
1452
1464
|
else {
|
|
1453
1465
|
break checkOutputData;
|
|
1454
1466
|
}
|