n8n-core 2.35.2 → 2.36.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/execution-engine/execution-context.service.d.ts +2 -2
- package/dist/execution-engine/execution-context.service.js +2 -2
- package/dist/execution-engine/execution-context.service.js.map +1 -1
- package/dist/execution-engine/index.d.ts +2 -0
- package/dist/execution-engine/index.js +4 -1
- package/dist/execution-engine/index.js.map +1 -1
- package/dist/execution-engine/node-execution-context/poll-context.d.ts +6 -2
- package/dist/execution-engine/node-execution-context/poll-context.js +9 -1
- package/dist/execution-engine/node-execution-context/poll-context.js.map +1 -1
- package/dist/execution-engine/node-execution-context/webhook-context.d.ts +3 -1
- package/dist/execution-engine/node-execution-context/webhook-context.js +3 -2
- package/dist/execution-engine/node-execution-context/webhook-context.js.map +1 -1
- package/dist/execution-engine/poll-cursor-hooks.d.ts +3 -0
- package/dist/execution-engine/poll-cursor-hooks.js +11 -0
- package/dist/execution-engine/poll-cursor-hooks.js.map +1 -0
- package/dist/execution-engine/poll-trigger-executor.d.ts +3 -1
- package/dist/execution-engine/poll-trigger-executor.js +33 -14
- package/dist/execution-engine/poll-trigger-executor.js.map +1 -1
- package/dist/execution-engine/requests-response.js +3 -0
- package/dist/execution-engine/requests-response.js.map +1 -1
- package/dist/execution-engine/triggers-and-pollers.d.ts +19 -0
- package/dist/execution-engine/triggers-and-pollers.js +62 -1
- package/dist/execution-engine/triggers-and-pollers.js.map +1 -1
- package/package.json +15 -15
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
|
-
import { ICredentialContext, IExecuteData, IExecutionContext, INodeExecutionData, PlaintextExecutionContext, Workflow } from 'n8n-workflow';
|
|
2
|
+
import { ICredentialContext, IExecuteData, IExecutionContext, INodeExecutionData, OAuthResourceGrant, PlaintextExecutionContext, Workflow } from 'n8n-workflow';
|
|
3
3
|
import { Cipher } from '../encryption';
|
|
4
4
|
import { ExecutionContextHookRegistry } from './execution-context-hook-registry.service';
|
|
5
5
|
export declare class ExecutionContextService {
|
|
@@ -10,7 +10,7 @@ export declare class ExecutionContextService {
|
|
|
10
10
|
decryptCredentialContext(encrypted: string): Promise<ICredentialContext>;
|
|
11
11
|
decryptExecutionContext(context: IExecutionContext): Promise<PlaintextExecutionContext>;
|
|
12
12
|
buildManualExecutionCredentials(n8nAuthCookie: string): Promise<string>;
|
|
13
|
-
buildTriggerIdentityCredentials(token: string, resource: string): Promise<string>;
|
|
13
|
+
buildTriggerIdentityCredentials(token: string, resource: string, grant?: OAuthResourceGrant): Promise<string>;
|
|
14
14
|
encryptExecutionContext(context: PlaintextExecutionContext): Promise<IExecutionContext>;
|
|
15
15
|
mergeExecutionContexts(baseContext: PlaintextExecutionContext, contextToMerge: Partial<PlaintextExecutionContext>): PlaintextExecutionContext;
|
|
16
16
|
augmentSubExecutionContext(workflow: Workflow, startItem: IExecuteData, contextToAugment: IExecutionContext): Promise<IExecutionContext>;
|
|
@@ -46,11 +46,11 @@ let ExecutionContextService = class ExecutionContextService {
|
|
|
46
46
|
};
|
|
47
47
|
return await this.cipher.encryptV2(payload);
|
|
48
48
|
}
|
|
49
|
-
async buildTriggerIdentityCredentials(token, resource) {
|
|
49
|
+
async buildTriggerIdentityCredentials(token, resource, grant) {
|
|
50
50
|
const payload = {
|
|
51
51
|
version: 1,
|
|
52
52
|
identity: token,
|
|
53
|
-
metadata: { source: 'n8n-oauth', resource },
|
|
53
|
+
metadata: { source: 'n8n-oauth', resource, ...(grant ? { grant } : {}) },
|
|
54
54
|
};
|
|
55
55
|
return await this.cipher.encryptV2(payload);
|
|
56
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-context.service.js","sourceRoot":"","sources":["../../src/execution-engine/execution-context.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAClC,+
|
|
1
|
+
{"version":3,"file":"execution-context.service.js","sourceRoot":"","sources":["../../src/execution-engine/execution-context.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,11 +45,13 @@ export * from './node-execution-context';
|
|
|
45
45
|
export * from './node-execution-context/utils/execution-metadata';
|
|
46
46
|
export { NoOpPollJobManager } from './noop-poll-job-manager';
|
|
47
47
|
export * from './partial-execution-utils';
|
|
48
|
+
export { commitStagedCursor, runPollInStagingScope } from './poll-cursor-hooks';
|
|
48
49
|
export { PollJobManager } from './poll-job-manager';
|
|
49
50
|
export { PollTriggerExecutor } from './poll-trigger-executor';
|
|
50
51
|
export { isEngineRequest } from './requests-response';
|
|
51
52
|
export * from './routing-node';
|
|
52
53
|
export * from './scheduled-task-manager';
|
|
53
54
|
export { TriggersAndPollers } from './triggers-and-pollers';
|
|
55
|
+
export type { PollErrorKind, PollTickEventMap } from './triggers-and-pollers';
|
|
54
56
|
export * from './workflow-execute';
|
|
55
57
|
export { buildEvalMockCredentials } from './eval-mock-helpers';
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.buildEvalMockCredentials = exports.TriggersAndPollers = exports.isEngineRequest = exports.PollTriggerExecutor = exports.PollJobManager = exports.NoOpPollJobManager = exports.ExternalSecretsProxy = exports.ExecutionLifecycleHooks = exports.ExecutionContextService = exports.establishExecutionContext = exports.buildPdfWithText = exports.evalCanvasPng = exports.synthesizeBinaryFixture = void 0;
|
|
17
|
+
exports.buildEvalMockCredentials = exports.TriggersAndPollers = exports.isEngineRequest = exports.PollTriggerExecutor = exports.PollJobManager = exports.runPollInStagingScope = exports.commitStagedCursor = exports.NoOpPollJobManager = exports.ExternalSecretsProxy = exports.ExecutionLifecycleHooks = exports.ExecutionContextService = exports.establishExecutionContext = exports.buildPdfWithText = exports.evalCanvasPng = exports.synthesizeBinaryFixture = void 0;
|
|
18
18
|
__exportStar(require("./active-workflow-triggers"), exports);
|
|
19
19
|
var eval_mock_fixtures_1 = require("./eval-mock-fixtures");
|
|
20
20
|
Object.defineProperty(exports, "synthesizeBinaryFixture", { enumerable: true, get: function () { return eval_mock_fixtures_1.synthesizeBinaryFixture; } });
|
|
@@ -34,6 +34,9 @@ __exportStar(require("./node-execution-context/utils/execution-metadata"), expor
|
|
|
34
34
|
var noop_poll_job_manager_1 = require("./noop-poll-job-manager");
|
|
35
35
|
Object.defineProperty(exports, "NoOpPollJobManager", { enumerable: true, get: function () { return noop_poll_job_manager_1.NoOpPollJobManager; } });
|
|
36
36
|
__exportStar(require("./partial-execution-utils"), exports);
|
|
37
|
+
var poll_cursor_hooks_1 = require("./poll-cursor-hooks");
|
|
38
|
+
Object.defineProperty(exports, "commitStagedCursor", { enumerable: true, get: function () { return poll_cursor_hooks_1.commitStagedCursor; } });
|
|
39
|
+
Object.defineProperty(exports, "runPollInStagingScope", { enumerable: true, get: function () { return poll_cursor_hooks_1.runPollInStagingScope; } });
|
|
37
40
|
var poll_job_manager_1 = require("./poll-job-manager");
|
|
38
41
|
Object.defineProperty(exports, "PollJobManager", { enumerable: true, get: function () { return poll_job_manager_1.PollJobManager; } });
|
|
39
42
|
var poll_trigger_executor_1 = require("./poll-trigger-executor");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/execution-engine/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAqFA,6DAA2C;AAC3C,2DAM8B;AAL7B,6HAAA,uBAAuB,OAAA;AACvB,mHAAA,aAAa,OAAA;AACb,sHAAA,gBAAgB,OAAA;AAIjB,yDAAgE;AAAvD,8HAAA,yBAAyB,OAAA;AAClC,4EAA0D;AAC1D,yEAAsE;AAA7D,oIAAA,uBAAuB,OAAA;AAChC,yEAAsE;AAA7D,oIAAA,uBAAuB,OAAA;AAChC,mEAA8F;AAArF,8HAAA,oBAAoB,OAAA;AAE7B,2DAAyC;AACzC,oFAAkE;AAClE,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA;AAC3B,4DAA0C;AAC1C,uDAAoD;AAA3C,kHAAA,cAAc,OAAA;AACvB,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,yDAAsD;AAA7C,oHAAA,eAAe,OAAA;AACxB,iDAA+B;AAC/B,2DAAyC;AACzC,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/execution-engine/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAqFA,6DAA2C;AAC3C,2DAM8B;AAL7B,6HAAA,uBAAuB,OAAA;AACvB,mHAAA,aAAa,OAAA;AACb,sHAAA,gBAAgB,OAAA;AAIjB,yDAAgE;AAAvD,8HAAA,yBAAyB,OAAA;AAClC,4EAA0D;AAC1D,yEAAsE;AAA7D,oIAAA,uBAAuB,OAAA;AAChC,yEAAsE;AAA7D,oIAAA,uBAAuB,OAAA;AAChC,mEAA8F;AAArF,8HAAA,oBAAoB,OAAA;AAE7B,2DAAyC;AACzC,oFAAkE;AAClE,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA;AAC3B,4DAA0C;AAC1C,yDAAgF;AAAvE,uHAAA,kBAAkB,OAAA;AAAE,0HAAA,qBAAqB,OAAA;AAClD,uDAAoD;AAA3C,kHAAA,cAAc,OAAA;AACvB,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAC5B,yDAAsD;AAA7C,oHAAA,eAAe,OAAA;AACxB,iDAA+B;AAC/B,2DAAyC;AACzC,+DAA4D;AAAnD,0HAAA,kBAAkB,OAAA;AAE3B,qDAAmC;AAInC,yDAA+D;AAAtD,6HAAA,wBAAwB,OAAA"}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import type { ICredentialDataDecryptedObject, INode, IPollFunctions, IWorkflowExecuteAdditionalData, Workflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
|
|
1
|
+
import type { ICredentialDataDecryptedObject, IDataObject, INode, IPollFunctions, IWorkflowExecuteAdditionalData, Workflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
|
|
2
2
|
import { NodeExecutionContext } from './node-execution-context';
|
|
3
3
|
export declare class PollContext extends NodeExecutionContext implements IPollFunctions {
|
|
4
4
|
private readonly activation;
|
|
5
5
|
readonly __emit: IPollFunctions['__emit'];
|
|
6
6
|
readonly __emitError: IPollFunctions['__emitError'];
|
|
7
|
+
readonly __commitCursor: NonNullable<IPollFunctions['__commitCursor']>;
|
|
8
|
+
readonly __runPoll: NonNullable<IPollFunctions['__runPoll']>;
|
|
9
|
+
private readonly resolveNodeStaticData;
|
|
7
10
|
readonly helpers: IPollFunctions['helpers'];
|
|
8
|
-
constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode, __emit?: IPollFunctions['__emit'], __emitError?: IPollFunctions['__emitError']);
|
|
11
|
+
constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode, __emit?: IPollFunctions['__emit'], __emitError?: IPollFunctions['__emitError'], __commitCursor?: NonNullable<IPollFunctions['__commitCursor']>, __runPoll?: NonNullable<IPollFunctions['__runPoll']>, resolveNodeStaticData?: () => IDataObject);
|
|
12
|
+
getWorkflowStaticData(type: string): IDataObject;
|
|
9
13
|
getActivationMode(): WorkflowActivateMode;
|
|
10
14
|
getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string): Promise<T>;
|
|
11
15
|
}
|
|
@@ -15,11 +15,14 @@ const throwOnEmitError = () => {
|
|
|
15
15
|
throw new n8n_workflow_1.UnexpectedError('Overwrite PollContext.__emitError function');
|
|
16
16
|
};
|
|
17
17
|
class PollContext extends node_execution_context_1.NodeExecutionContext {
|
|
18
|
-
constructor(workflow, node, additionalData, mode, activation, __emit = throwOnEmit, __emitError = throwOnEmitError) {
|
|
18
|
+
constructor(workflow, node, additionalData, mode, activation, __emit = throwOnEmit, __emitError = throwOnEmitError, __commitCursor = async () => { }, __runPoll = async (poll) => await poll(), resolveNodeStaticData = () => this.workflow.getStaticData('node', this.node)) {
|
|
19
19
|
super(workflow, node, additionalData, mode);
|
|
20
20
|
this.activation = activation;
|
|
21
21
|
this.__emit = __emit;
|
|
22
22
|
this.__emitError = __emitError;
|
|
23
|
+
this.__commitCursor = __commitCursor;
|
|
24
|
+
this.__runPoll = __runPoll;
|
|
25
|
+
this.resolveNodeStaticData = resolveNodeStaticData;
|
|
23
26
|
this.helpers = {
|
|
24
27
|
createDeferredPromise: deferred_promise_1.createDeferredPromise,
|
|
25
28
|
returnJsonArray: return_json_array_1.returnJsonArray,
|
|
@@ -28,6 +31,11 @@ class PollContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
28
31
|
...(0, scheduling_helper_functions_1.getSchedulingFunctions)(workflow.id, workflow.timezone, node.id),
|
|
29
32
|
};
|
|
30
33
|
}
|
|
34
|
+
getWorkflowStaticData(type) {
|
|
35
|
+
if (type === 'node')
|
|
36
|
+
return this.resolveNodeStaticData();
|
|
37
|
+
return super.getWorkflowStaticData(type);
|
|
38
|
+
}
|
|
31
39
|
getActivationMode() {
|
|
32
40
|
return this.activation;
|
|
33
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/poll-context.ts"],"names":[],"mappings":";;;AAAA,0EAA4E;
|
|
1
|
+
{"version":3,"file":"poll-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/poll-context.ts"],"names":[],"mappings":";;;AAAA,0EAA4E;AAW5E,+CAA+C;AAE/C,qEAAgE;AAChE,6EAA2E;AAC3E,+EAA6E;AAC7E,iEAA4D;AAC5D,qFAA6E;AAE7E,MAAM,WAAW,GAAG,GAAG,EAAE;IACxB,MAAM,IAAI,8BAAe,CAAC,uCAAuC,CAAC,CAAC;AACpE,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC7B,MAAM,IAAI,8BAAe,CAAC,4CAA4C,CAAC,CAAC;AACzE,CAAC,CAAC;AAEF,iBAAyB,SAAQ,6CAAoB;IAGpD,YACC,QAAkB,EAClB,IAAW,EACX,cAA8C,EAC9C,IAAyB,EACR,UAAgC,EACxC,MAAM,GAA6B,WAAW,EAC9C,WAAW,GAAkC,gBAAgB,EAG7D,cAAc,GAAkD,KAAK,IAAI,EAAE,GAAE,CAAC,EAC9E,SAAS,GAA6C,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE,EAG1E,qBAAqB,GAAsB,GAAG,EAAE,CAChE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC;QAE/C,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;0BAZ3B,UAAU;sBAClB,MAAM;2BACN,WAAW;8BAGX,cAAc;yBACd,SAAS;qCAGD,qBAAqB;QAKtC,IAAI,CAAC,OAAO,GAAG;YACd,qBAAqB,EAArB,wCAAqB;YACrB,eAAe,EAAf,mCAAe;YACf,GAAG,IAAA,oDAAyB,EAAC,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC;YAC5D,GAAG,IAAA,kDAAwB,EAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC;YACxD,GAAG,IAAA,oDAAsB,EAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;SAClE,CAAC;IACH,CAAC;IAED,qBAAqB,CAAC,IAAY;QACjC,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,iBAAiB;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,cAAc,CAAoD,IAAY;QACnF,OAAO,MAAM,IAAI,CAAC,eAAe,CAAI,IAAI,CAAC,CAAC;IAC5C,CAAC;CACD"}
|
|
@@ -28,5 +28,7 @@ export declare class WebhookContext extends NodeExecutionContext implements IWeb
|
|
|
28
28
|
validateN8nOAuth2Token(token: string, resourceUrl: string): Promise<N8nOAuth2ValidationResult>;
|
|
29
29
|
establishTriggerIdentity(token: string, resource: string): Promise<void>;
|
|
30
30
|
checkTriggerCredentialStatus(): Promise<CredentialCheckResult | undefined>;
|
|
31
|
-
getInputConnectionData(connectionType: AINodeConnectionType, itemIndex: number
|
|
31
|
+
getInputConnectionData(connectionType: AINodeConnectionType, itemIndex: number, options?: number | {
|
|
32
|
+
inputData?: IDataObject;
|
|
33
|
+
}): Promise<unknown>;
|
|
32
34
|
}
|
|
@@ -129,9 +129,10 @@ class WebhookContext extends node_execution_context_1.NodeExecutionContext {
|
|
|
129
129
|
}
|
|
130
130
|
return await this.additionalData.checkTriggerCredentialStatus();
|
|
131
131
|
}
|
|
132
|
-
async getInputConnectionData(connectionType, itemIndex) {
|
|
132
|
+
async getInputConnectionData(connectionType, itemIndex, options) {
|
|
133
|
+
const inputData = typeof options === 'object' && options !== null ? options.inputData : undefined;
|
|
133
134
|
const connectionInputData = [
|
|
134
|
-
{ json: this.additionalData.httpRequest?.body || {} },
|
|
135
|
+
{ json: inputData ?? (this.additionalData.httpRequest?.body || {}) },
|
|
135
136
|
];
|
|
136
137
|
const runExecutionData = this.runExecutionData ?? (0, n8n_workflow_1.createEmptyRunExecutionData)();
|
|
137
138
|
const executeData = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/webhook-context.ts"],"names":[],"mappings":";;;AAAA,0EAA4E;AAuB5E,+CAA4E;AAE5E,qEAAgE;AAChE,6EAA2F;AAC3F,iFAA2E;AAC3E,+EAA6E;AAC7E,iEAA4D;AAC5D,+EAAqE;
|
|
1
|
+
{"version":3,"file":"webhook-context.js","sourceRoot":"","sources":["../../../src/execution-engine/node-execution-context/webhook-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.commitStagedCursor = exports.runPollInStagingScope = void 0;
|
|
4
|
+
const runPollInStagingScope = async (pollFunctions, poll) => (pollFunctions.__runPoll ? await pollFunctions.__runPoll(poll) : await poll());
|
|
5
|
+
exports.runPollInStagingScope = runPollInStagingScope;
|
|
6
|
+
const commitStagedCursor = async (pollFunctions) => {
|
|
7
|
+
if (pollFunctions.__commitCursor)
|
|
8
|
+
await pollFunctions.__commitCursor();
|
|
9
|
+
};
|
|
10
|
+
exports.commitStagedCursor = commitStagedCursor;
|
|
11
|
+
//# sourceMappingURL=poll-cursor-hooks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"poll-cursor-hooks.js","sourceRoot":"","sources":["../../src/execution-engine/poll-cursor-hooks.ts"],"names":[],"mappings":";;;AAOO,MAAM,qBAAqB,GAAG,KAAK,EACzC,aAA6B,EAC7B,IAAsB,EACT,EAAE,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;AAHnF,QAAA,qBAAqB,GAArB,qBAAqB,CAG8D;AAGzF,MAAM,kBAAkB,GAAG,KAAK,EAAE,aAA6B,EAAiB,EAAE;IACxF,IAAI,aAAa,CAAC,cAAc;QAAE,MAAM,aAAa,CAAC,cAAc,EAAE,CAAC;AACxE,CAAC,CAAC;AAFW,QAAA,kBAAkB,GAAlB,kBAAkB,CAE7B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
2
|
import type { INode, IPollFunctions, Workflow } from 'n8n-workflow';
|
|
3
|
+
import { ErrorReporter } from '../errors/error-reporter';
|
|
3
4
|
import { Tracing } from '../observability';
|
|
4
5
|
import { TriggersAndPollers } from './triggers-and-pollers';
|
|
5
6
|
export type PollTriggerExecuteFn = (testingTrigger?: boolean) => Promise<void>;
|
|
@@ -7,6 +8,7 @@ export declare class PollTriggerExecutor {
|
|
|
7
8
|
private readonly logger;
|
|
8
9
|
private readonly triggersAndPollers;
|
|
9
10
|
private readonly tracing;
|
|
10
|
-
|
|
11
|
+
private readonly errorReporter;
|
|
12
|
+
constructor(logger: Logger, triggersAndPollers: TriggersAndPollers, tracing: Tracing, errorReporter: ErrorReporter);
|
|
11
13
|
create(workflow: Workflow, node: INode, pollFunctions: IPollFunctions, isCurrent: () => boolean): PollTriggerExecuteFn;
|
|
12
14
|
}
|
|
@@ -12,13 +12,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.PollTriggerExecutor = void 0;
|
|
13
13
|
const backend_common_1 = require("@n8n/backend-common");
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
|
+
const error_reporter_1 = require("../errors/error-reporter");
|
|
15
16
|
const observability_1 = require("../observability");
|
|
17
|
+
const poll_cursor_hooks_1 = require("./poll-cursor-hooks");
|
|
16
18
|
const triggers_and_pollers_1 = require("./triggers-and-pollers");
|
|
17
19
|
let PollTriggerExecutor = class PollTriggerExecutor {
|
|
18
|
-
constructor(logger, triggersAndPollers, tracing) {
|
|
20
|
+
constructor(logger, triggersAndPollers, tracing, errorReporter) {
|
|
19
21
|
this.logger = logger;
|
|
20
22
|
this.triggersAndPollers = triggersAndPollers;
|
|
21
23
|
this.tracing = tracing;
|
|
24
|
+
this.errorReporter = errorReporter;
|
|
22
25
|
this.logger = logger.scoped('poll-trigger');
|
|
23
26
|
}
|
|
24
27
|
create(workflow, node, pollFunctions, isCurrent) {
|
|
@@ -46,19 +49,35 @@ let PollTriggerExecutor = class PollTriggerExecutor {
|
|
|
46
49
|
span.setStatus({ code: 1 });
|
|
47
50
|
return;
|
|
48
51
|
}
|
|
52
|
+
let isolateAcquired = false;
|
|
49
53
|
try {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
54
|
+
await (0, poll_cursor_hooks_1.runPollInStagingScope)(pollFunctions, async () => {
|
|
55
|
+
if (ownsIsolate) {
|
|
56
|
+
await workflow.expression.acquireIsolate();
|
|
57
|
+
isolateAcquired = true;
|
|
58
|
+
}
|
|
59
|
+
const pollResponse = await this.triggersAndPollers.runPollFunction(workflow, node, pollFunctions);
|
|
60
|
+
if (!testingTrigger && !isCurrent()) {
|
|
61
|
+
this.logger.debug(`Discarding in-flight poll result for superseded workflow "${workflow.name}"`, { workflowId: workflow.id });
|
|
62
|
+
span.setStatus({ code: 1 });
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
if (pollResponse !== null) {
|
|
66
|
+
pollFunctions.__emit(pollResponse);
|
|
67
|
+
}
|
|
68
|
+
else if (!testingTrigger) {
|
|
69
|
+
try {
|
|
70
|
+
await (0, poll_cursor_hooks_1.commitStagedCursor)(pollFunctions);
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
this.errorReporter.error(error, {
|
|
74
|
+
extra: { workflowId: workflow.id, nodeId: node.id },
|
|
75
|
+
});
|
|
76
|
+
this.logger.error(`Failed to commit the poll cursor for workflow "${workflow.name}"; the next poll repeats the same window`, { workflowId: workflow.id, nodeId: node.id, error });
|
|
77
|
+
}
|
|
78
|
+
}
|
|
55
79
|
span.setStatus({ code: 1 });
|
|
56
|
-
|
|
57
|
-
}
|
|
58
|
-
if (pollResponse !== null) {
|
|
59
|
-
pollFunctions.__emit(pollResponse);
|
|
60
|
-
}
|
|
61
|
-
span.setStatus({ code: 1 });
|
|
80
|
+
});
|
|
62
81
|
}
|
|
63
82
|
catch (error) {
|
|
64
83
|
if (testingTrigger) {
|
|
@@ -74,7 +93,7 @@ let PollTriggerExecutor = class PollTriggerExecutor {
|
|
|
74
93
|
pollFunctions.__emitError(error);
|
|
75
94
|
}
|
|
76
95
|
finally {
|
|
77
|
-
if (
|
|
96
|
+
if (isolateAcquired)
|
|
78
97
|
await workflow.expression.releaseIsolate();
|
|
79
98
|
}
|
|
80
99
|
});
|
|
@@ -84,6 +103,6 @@ let PollTriggerExecutor = class PollTriggerExecutor {
|
|
|
84
103
|
exports.PollTriggerExecutor = PollTriggerExecutor;
|
|
85
104
|
exports.PollTriggerExecutor = PollTriggerExecutor = __decorate([
|
|
86
105
|
(0, di_1.Service)(),
|
|
87
|
-
__metadata("design:paramtypes", [backend_common_1.Logger, triggers_and_pollers_1.TriggersAndPollers, observability_1.Tracing])
|
|
106
|
+
__metadata("design:paramtypes", [backend_common_1.Logger, triggers_and_pollers_1.TriggersAndPollers, observability_1.Tracing, error_reporter_1.ErrorReporter])
|
|
88
107
|
], PollTriggerExecutor);
|
|
89
108
|
//# sourceMappingURL=poll-trigger-executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-trigger-executor.js","sourceRoot":"","sources":["../../src/execution-engine/poll-trigger-executor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAGlC,mDAAsD;AAEtD,iEAA4D;AAWrD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YACkB,MAAc,EACd,kBAAsC,EACtC,OAAgB;
|
|
1
|
+
{"version":3,"file":"poll-trigger-executor.js","sourceRoot":"","sources":["../../src/execution-engine/poll-trigger-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -136,6 +136,9 @@ function handleRequest({ workflow, currentNode, request, runIndex, executionData
|
|
|
136
136
|
if (!result) {
|
|
137
137
|
return { nodesToBeExecuted: [] };
|
|
138
138
|
}
|
|
139
|
+
if (workflow.settings.executionOrder === 'v1') {
|
|
140
|
+
nodesToBeExecuted.reverse();
|
|
141
|
+
}
|
|
139
142
|
nodesToBeExecuted.unshift({
|
|
140
143
|
inputConnectionData: result.connectionData,
|
|
141
144
|
parentOutputIndex: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests-response.js","sourceRoot":"","sources":["../../src/execution-engine/requests-response.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"requests-response.js","sourceRoot":"","sources":["../../src/execution-engine/requests-response.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,25 @@
|
|
|
1
|
+
import { TypedEmitter } from '@n8n/backend-common';
|
|
1
2
|
import type { Workflow, INode, INodeExecutionData, IPollFunctions, IWorkflowExecuteAdditionalData, WorkflowExecuteMode, WorkflowActivateMode, ITriggerResponse } from 'n8n-workflow';
|
|
2
3
|
import type { IGetExecuteTriggerFunctions } from './interfaces';
|
|
4
|
+
export type PollErrorKind = 'auth' | 'rate_limited' | 'thrown';
|
|
5
|
+
type PollTickBase = {
|
|
6
|
+
nodeType: string;
|
|
7
|
+
durationMs: number;
|
|
8
|
+
overlapped: boolean;
|
|
9
|
+
};
|
|
10
|
+
export type PollTickEventMap = {
|
|
11
|
+
'poll-tick-completed': (PollTickBase & {
|
|
12
|
+
status: 'success';
|
|
13
|
+
}) | (PollTickBase & {
|
|
14
|
+
status: 'error';
|
|
15
|
+
errorKind: PollErrorKind;
|
|
16
|
+
});
|
|
17
|
+
};
|
|
3
18
|
export declare class TriggersAndPollers {
|
|
19
|
+
readonly events: TypedEmitter<PollTickEventMap>;
|
|
20
|
+
private readonly inFlightPolls;
|
|
21
|
+
private emitTick;
|
|
4
22
|
runTriggerFunction(workflow: Workflow, node: INode, getTriggerFunctions: IGetExecuteTriggerFunctions, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): Promise<ITriggerResponse | undefined>;
|
|
5
23
|
runPollFunction(workflow: Workflow, node: INode, pollFunctions: IPollFunctions): Promise<INodeExecutionData[][] | null>;
|
|
6
24
|
}
|
|
25
|
+
export {};
|
|
@@ -10,10 +10,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TriggersAndPollers = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
13
14
|
const di_1 = require("@n8n/di");
|
|
14
15
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
15
16
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
17
|
+
const classifyPollError = (error) => {
|
|
18
|
+
const apiError = error instanceof n8n_workflow_1.NodeApiError
|
|
19
|
+
? error
|
|
20
|
+
: error instanceof Error && error.cause instanceof n8n_workflow_1.NodeApiError
|
|
21
|
+
? error.cause
|
|
22
|
+
: undefined;
|
|
23
|
+
if (apiError) {
|
|
24
|
+
if (apiError.httpCode === '429') {
|
|
25
|
+
return 'rate_limited';
|
|
26
|
+
}
|
|
27
|
+
if (apiError.httpCode === '401' || apiError.httpCode === '403') {
|
|
28
|
+
return 'auth';
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return 'thrown';
|
|
32
|
+
};
|
|
16
33
|
let TriggersAndPollers = class TriggersAndPollers {
|
|
34
|
+
constructor() {
|
|
35
|
+
this.events = new backend_common_1.TypedEmitter();
|
|
36
|
+
this.inFlightPolls = new Map();
|
|
37
|
+
}
|
|
38
|
+
emitTick(tick) {
|
|
39
|
+
try {
|
|
40
|
+
this.events.emit('poll-tick-completed', tick);
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
}
|
|
44
|
+
}
|
|
17
45
|
async runTriggerFunction(workflow, node, getTriggerFunctions, additionalData, mode, activation) {
|
|
18
46
|
const triggerFunctions = getTriggerFunctions(workflow, node, additionalData, mode, activation);
|
|
19
47
|
const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
|
|
@@ -59,7 +87,40 @@ let TriggersAndPollers = class TriggersAndPollers {
|
|
|
59
87
|
tags: { nodeType: node.type },
|
|
60
88
|
});
|
|
61
89
|
}
|
|
62
|
-
|
|
90
|
+
const pollKey = `${workflow.id}:${node.id}`;
|
|
91
|
+
const inFlight = this.inFlightPolls.get(pollKey) ?? 0;
|
|
92
|
+
const overlapped = inFlight > 0;
|
|
93
|
+
this.inFlightPolls.set(pollKey, inFlight + 1);
|
|
94
|
+
const startedAt = performance.now();
|
|
95
|
+
try {
|
|
96
|
+
const result = await nodeType.poll.call(pollFunctions);
|
|
97
|
+
this.emitTick({
|
|
98
|
+
nodeType: node.type,
|
|
99
|
+
status: 'success',
|
|
100
|
+
durationMs: performance.now() - startedAt,
|
|
101
|
+
overlapped,
|
|
102
|
+
});
|
|
103
|
+
return result;
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
this.emitTick({
|
|
107
|
+
nodeType: node.type,
|
|
108
|
+
status: 'error',
|
|
109
|
+
errorKind: classifyPollError(error),
|
|
110
|
+
durationMs: performance.now() - startedAt,
|
|
111
|
+
overlapped,
|
|
112
|
+
});
|
|
113
|
+
throw error;
|
|
114
|
+
}
|
|
115
|
+
finally {
|
|
116
|
+
const remaining = (this.inFlightPolls.get(pollKey) ?? 1) - 1;
|
|
117
|
+
if (remaining > 0) {
|
|
118
|
+
this.inFlightPolls.set(pollKey, remaining);
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
this.inFlightPolls.delete(pollKey);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
63
124
|
}
|
|
64
125
|
};
|
|
65
126
|
exports.TriggersAndPollers = TriggersAndPollers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"triggers-and-pollers.js","sourceRoot":"","sources":["../../src/execution-engine/triggers-and-pollers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,+
|
|
1
|
+
{"version":3,"file":"triggers-and-pollers.js","sourceRoot":"","sources":["../../src/execution-engine/triggers-and-pollers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.36.0",
|
|
4
4
|
"description": "Core functionality of n8n",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -35,10 +35,10 @@
|
|
|
35
35
|
"vitest": "^4.1.9",
|
|
36
36
|
"vitest-mock-extended": "^3.1.0",
|
|
37
37
|
"zod": "3.25.76",
|
|
38
|
+
"@n8n/typescript-config": "1.10.0",
|
|
38
39
|
"@n8n/playwright-janitor": "0.1.0",
|
|
39
|
-
"@n8n/
|
|
40
|
-
"@n8n/
|
|
41
|
-
"@n8n/vitest-config": "1.20.0"
|
|
40
|
+
"@n8n/vitest-config": "1.21.0",
|
|
41
|
+
"@n8n/typeorm": "0.8.0"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
44
|
"zod": "3.25.76"
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"luxon": "3.7.2",
|
|
62
62
|
"mime-types": "3.0.2",
|
|
63
63
|
"ms": "2.1.3",
|
|
64
|
-
"nanoid": "3.3.
|
|
64
|
+
"nanoid": "3.3.18",
|
|
65
65
|
"oauth-1.0a": "2.2.6",
|
|
66
66
|
"p-cancelable": "2.1.1",
|
|
67
67
|
"picocolors": "1.0.1",
|
|
@@ -71,18 +71,18 @@
|
|
|
71
71
|
"winston": "3.14.2",
|
|
72
72
|
"xml2js": "0.6.2",
|
|
73
73
|
"qs": "6.15.2",
|
|
74
|
-
"@n8n/backend-
|
|
75
|
-
"@n8n/
|
|
76
|
-
"@n8n/
|
|
77
|
-
"@n8n/
|
|
78
|
-
"@n8n/
|
|
79
|
-
"@n8n/constants": "0.
|
|
80
|
-
"@n8n/decorators": "1.
|
|
74
|
+
"@n8n/backend-network": "1.10.0",
|
|
75
|
+
"@n8n/backend-common": "1.36.0",
|
|
76
|
+
"@n8n/blob-storage": "1.4.0",
|
|
77
|
+
"@n8n/client-oauth2": "1.18.0",
|
|
78
|
+
"@n8n/config": "2.34.0",
|
|
79
|
+
"@n8n/constants": "0.35.0",
|
|
80
|
+
"@n8n/decorators": "1.36.0",
|
|
81
81
|
"@n8n/di": "0.16.0",
|
|
82
|
+
"@n8n/workflow-sdk": "0.29.0",
|
|
82
83
|
"@n8n/errors": "0.13.0",
|
|
83
|
-
"
|
|
84
|
-
"@n8n/
|
|
85
|
-
"n8n-workflow": "2.35.1"
|
|
84
|
+
"n8n-workflow": "2.36.0",
|
|
85
|
+
"@n8n/utils": "1.44.0"
|
|
86
86
|
},
|
|
87
87
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
88
88
|
"homepage": "https://n8n.io",
|