n8n 1.74.2 → 1.75.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/commands/base-command.js +8 -1
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/start.js +13 -17
- package/dist/commands/start.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.d.ts +4 -2
- package/dist/concurrency/concurrency-control.service.js +68 -39
- package/dist/concurrency/concurrency-control.service.js.map +1 -1
- package/dist/concurrency/concurrency-queue.d.ts +1 -0
- package/dist/concurrency/concurrency-queue.js +3 -0
- package/dist/concurrency/concurrency-queue.js.map +1 -1
- package/dist/config/index.d.ts +1 -4
- package/dist/config/schema.d.ts +6 -14
- package/dist/config/schema.js +6 -14
- package/dist/config/schema.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +16 -13
- package/dist/controllers/project.controller.js +37 -29
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/controllers/tags.controller.d.ts +7 -8
- package/dist/controllers/tags.controller.js +21 -29
- package/dist/controllers/tags.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.js +1 -1
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.js +2 -10
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/databases/entities/project-relation.d.ts +1 -1
- package/dist/databases/entities/project-relation.js +1 -1
- package/dist/databases/entities/project-relation.js.map +1 -1
- package/dist/databases/entities/project.d.ts +1 -5
- package/dist/databases/entities/project.js +1 -1
- package/dist/databases/entities/project.js.map +1 -1
- package/dist/databases/entities/test-run.ee.d.ts +1 -1
- package/dist/databases/migrations/common/1714133768519-CreateProject.js.map +1 -1
- package/dist/databases/repositories/project-relation.repository.d.ts +3 -3
- package/dist/databases/repositories/project-relation.repository.js.map +1 -1
- package/dist/databases/repositories/shared-credentials.repository.d.ts +1 -1
- package/dist/databases/repositories/shared-credentials.repository.js.map +1 -1
- package/dist/databases/repositories/test-run.repository.ee.d.ts +1 -0
- package/dist/databases/repositories/test-run.repository.ee.js +3 -0
- package/dist/databases/repositories/test-run.repository.ee.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.js +1 -5
- package/dist/databases/repositories/workflow.repository.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-export.service.ee.d.ts +10 -2
- package/dist/environments.ee/source-control/source-control-export.service.ee.js +21 -11
- package/dist/environments.ee/source-control/source-control-export.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-helper.ee.d.ts +1 -1
- package/dist/environments.ee/source-control/source-control-helper.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.d.ts +18 -2
- package/dist/environments.ee/source-control/source-control-import.service.ee.js +44 -30
- package/dist/environments.ee/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.d.ts +5 -1
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.js +13 -11
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.config.d.ts +3 -0
- package/dist/environments.ee/source-control/source-control.config.js +27 -0
- package/dist/environments.ee/source-control/source-control.config.js.map +1 -0
- package/dist/environments.ee/source-control/source-control.controller.ee.d.ts +38 -6
- package/dist/environments.ee/source-control/source-control.controller.ee.js +12 -13
- package/dist/environments.ee/source-control/source-control.controller.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.service.ee.d.ts +25 -7
- package/dist/environments.ee/source-control/source-control.service.ee.js +5 -5
- package/dist/environments.ee/source-control/source-control.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/types/requests.d.ts +0 -4
- package/dist/environments.ee/variables/variables.service.ee.d.ts +6 -3
- package/dist/environments.ee/variables/variables.service.ee.js +19 -10
- package/dist/environments.ee/variables/variables.service.ee.js.map +1 -1
- package/dist/errors/response-errors/not-implemented.error.d.ts +4 -0
- package/dist/errors/response-errors/not-implemented.error.js +11 -0
- package/dist/errors/response-errors/not-implemented.error.js.map +1 -0
- package/dist/evaluation.ee/test-definitions.types.ee.d.ts +1 -0
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.d.ts +7 -2
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +109 -42
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.d.ts +8 -1
- package/dist/evaluation.ee/test-runs.controller.ee.js +46 -15
- package/dist/evaluation.ee/test-runs.controller.ee.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +4 -6
- package/dist/events/relays/log-streaming.event-relay.js +2 -2
- package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
- package/dist/license.d.ts +1 -2
- package/dist/license.js +9 -13
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +6 -1
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/manual-execution.service.js +1 -1
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/public-api/types.d.ts +0 -9
- package/dist/public-api/types.js +0 -4
- package/dist/public-api/types.js.map +1 -1
- package/dist/public-api/v1/handlers/projects/projects.handler.d.ts +5 -4
- package/dist/public-api/v1/handlers/projects/projects.handler.js +16 -3
- package/dist/public-api/v1/handlers/projects/projects.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/source-control/source-control.handler.d.ts +3 -3
- package/dist/public-api/v1/handlers/source-control/source-control.handler.js +4 -6
- package/dist/public-api/v1/handlers/source-control/source-control.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +5 -8
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.js +5 -5
- package/dist/public-api/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/push/index.js +5 -2
- package/dist/push/index.js.map +1 -1
- package/dist/requests.d.ts +2 -51
- package/dist/scaling/scaling.service.d.ts +1 -0
- package/dist/scaling/scaling.service.js +8 -0
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/server.js +3 -0
- package/dist/server.js.map +1 -1
- package/dist/services/frontend.service.js +2 -3
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +4 -8
- package/dist/services/project.service.ee.js +4 -15
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/role.service.d.ts +2 -1
- package/dist/services/role.service.js.map +1 -1
- package/dist/task-runners/auth/task-runner-auth.service.d.ts +1 -0
- package/dist/task-runners/auth/task-runner-auth.service.js +5 -1
- package/dist/task-runners/auth/task-runner-auth.service.js.map +1 -1
- package/dist/task-runners/task-runner-process.js +1 -1
- package/dist/task-runners/task-runner-process.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +1 -1
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook-request-handler.js +6 -1
- package/dist/webhooks/webhook-request-handler.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +1 -5
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.js +1 -1
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-sharing.service.d.ts +1 -1
- package/dist/workflows/workflow-sharing.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +3 -1
- package/dist/workflows/workflow.service.js +10 -6
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.js +5 -5
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +10 -10
- package/dist/environments.ee/source-control/types/source-control-pull-work-folder.d.ts +0 -15
- package/dist/environments.ee/source-control/types/source-control-pull-work-folder.js +0 -43
- package/dist/environments.ee/source-control/types/source-control-pull-work-folder.js.map +0 -1
- package/dist/environments.ee/source-control/types/source-control-push-work-folder.d.ts +0 -7
- package/dist/environments.ee/source-control/types/source-control-push-work-folder.js +0 -36
- package/dist/environments.ee/source-control/types/source-control-push-work-folder.js.map +0 -1
- package/dist/environments.ee/source-control/types/source-controlled-file.d.ts +0 -14
- package/dist/environments.ee/source-control/types/source-controlled-file.js +0 -3
- package/dist/environments.ee/source-control/types/source-controlled-file.js.map +0 -1
- package/dist/environments.ee/variables/environment-helpers.d.ts +0 -3
- package/dist/environments.ee/variables/environment-helpers.js +0 -27
- package/dist/environments.ee/variables/environment-helpers.js.map +0 -1
|
@@ -72,7 +72,14 @@ class BaseCommand extends core_1.Command {
|
|
|
72
72
|
}
|
|
73
73
|
async init() {
|
|
74
74
|
this.errorReporter = di_1.Container.get(n8n_core_1.ErrorReporter);
|
|
75
|
-
|
|
75
|
+
const { backendDsn, n8nVersion, environment, deploymentName } = this.globalConfig.sentry;
|
|
76
|
+
await this.errorReporter.init({
|
|
77
|
+
serverType: this.instanceSettings.instanceType,
|
|
78
|
+
dsn: backendDsn,
|
|
79
|
+
environment,
|
|
80
|
+
release: n8nVersion,
|
|
81
|
+
serverName: deploymentName,
|
|
82
|
+
});
|
|
76
83
|
(0, expression_evaluator_1.initExpressionEvaluator)();
|
|
77
84
|
process.once('SIGTERM', this.onTerminationSignal('SIGTERM'));
|
|
78
85
|
process.once('SIGINT', this.onTerminationSignal('SIGINT'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAC1B,wCAA2C;AAC3C,gCAAoC;AACpC,sCAA8C;AAC9C,uCAOkB;AAClB,+CAAoE;AAGpE,sDAA8B;AAC9B,2CAAsE;AACtE,8DAAgD;AAChD,yCAA2B;AAC3B,mDAA8D;AAC9D,2EAAuE;AACvE,sFAAiF;AACjF,iFAA4E;AAC5E,iEAAiE;AACjE,qDAAiD;AACjD,mGAA2F;AAC3F,uCAAoC;AACpC,6EAAuE;AACvE,6CAAyC;AACzC,uCAA0C;AAC1C,kEAA8D;AAC9D,6GAAqG;AAErG,MAAsB,WAAY,SAAQ,cAAO;IAAjD;;QACW,WAAM,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC;QAQ/B,qBAAgB,GAAqB,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;QAIrE,oBAAe,GAAoB,cAAS,CAAC,GAAG,CAAC,kCAAe,CAAC,CAAC;QAIzD,iBAAY,GAAG,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;QAKpD,+BAA0B,GACnC,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,OAAO,CAAC,uBAAuB,CAAC;QAGnD,2BAAsB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/start.js
CHANGED
|
@@ -37,7 +37,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.Start = void 0;
|
|
40
|
-
const config_1 = require("@n8n/config");
|
|
41
40
|
const di_1 = require("@n8n/di");
|
|
42
41
|
const core_1 = require("@oclif/core");
|
|
43
42
|
const fast_glob_1 = __importDefault(require("fast-glob"));
|
|
@@ -49,7 +48,7 @@ const replacestream_1 = __importDefault(require("replacestream"));
|
|
|
49
48
|
const promises_2 = require("stream/promises");
|
|
50
49
|
const active_executions_1 = require("../active-executions");
|
|
51
50
|
const active_workflow_manager_1 = require("../active-workflow-manager");
|
|
52
|
-
const
|
|
51
|
+
const config_1 = __importDefault(require("../config"));
|
|
53
52
|
const constants_1 = require("../constants");
|
|
54
53
|
const execution_repository_1 = require("../databases/repositories/execution.repository");
|
|
55
54
|
const settings_repository_1 = require("../databases/repositories/settings.repository");
|
|
@@ -57,7 +56,6 @@ const feature_not_licensed_error_1 = require("../errors/feature-not-licensed.err
|
|
|
57
56
|
const message_event_bus_1 = require("../eventbus/message-event-bus/message-event-bus");
|
|
58
57
|
const event_service_1 = require("../events/event.service");
|
|
59
58
|
const execution_service_1 = require("../executions/execution.service");
|
|
60
|
-
const license_1 = require("../license");
|
|
61
59
|
const pubsub_handler_1 = require("../scaling/pubsub/pubsub-handler");
|
|
62
60
|
const subscriber_service_1 = require("../scaling/pubsub/subscriber.service");
|
|
63
61
|
const server_1 = require("../server");
|
|
@@ -102,7 +100,7 @@ class Start extends base_command_1.BaseCommand {
|
|
|
102
100
|
}
|
|
103
101
|
async generateStaticAssets() {
|
|
104
102
|
const n8nPath = this.globalConfig.path;
|
|
105
|
-
const hooksUrls =
|
|
103
|
+
const hooksUrls = config_1.default.getEnv('externalFrontendHooksUrls');
|
|
106
104
|
let scriptsString = '';
|
|
107
105
|
if (hooksUrls) {
|
|
108
106
|
scriptsString = hooksUrls.split(';').reduce((acc, curr) => {
|
|
@@ -141,7 +139,7 @@ class Start extends base_command_1.BaseCommand {
|
|
|
141
139
|
async init() {
|
|
142
140
|
await this.initCrashJournal();
|
|
143
141
|
this.logger.info('Initializing n8n process');
|
|
144
|
-
if (
|
|
142
|
+
if (config_1.default.getEnv('executions.mode') === 'queue') {
|
|
145
143
|
const scopedLogger = this.logger.scoped('scaling');
|
|
146
144
|
scopedLogger.debug('Starting main instance in scaling mode');
|
|
147
145
|
scopedLogger.debug(`Host ID: ${this.instanceSettings.hostId}`);
|
|
@@ -159,12 +157,14 @@ class Start extends base_command_1.BaseCommand {
|
|
|
159
157
|
}
|
|
160
158
|
await super.init();
|
|
161
159
|
this.activeWorkflowManager = di_1.Container.get(active_workflow_manager_1.ActiveWorkflowManager);
|
|
162
|
-
|
|
163
|
-
|
|
160
|
+
const isMultiMainEnabled = config_1.default.getEnv('executions.mode') === 'queue' && this.globalConfig.multiMainSetup.enabled;
|
|
161
|
+
this.instanceSettings.setMultiMainEnabled(isMultiMainEnabled);
|
|
162
|
+
if (isMultiMainEnabled)
|
|
163
|
+
this.instanceSettings.setMultiMainLicensed(true);
|
|
164
164
|
await this.initOrchestration();
|
|
165
|
-
this.
|
|
166
|
-
if (
|
|
167
|
-
|
|
165
|
+
await this.initLicense();
|
|
166
|
+
if (isMultiMainEnabled && !this.license.isMultiMainLicensed()) {
|
|
167
|
+
throw new feature_not_licensed_error_1.FeatureNotLicensedError(constants_1.LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
|
|
168
168
|
}
|
|
169
169
|
di_1.Container.get(wait_tracker_1.WaitTracker).init();
|
|
170
170
|
this.logger.debug('Wait tracker init complete');
|
|
@@ -189,14 +189,10 @@ class Start extends base_command_1.BaseCommand {
|
|
|
189
189
|
}
|
|
190
190
|
}
|
|
191
191
|
async initOrchestration() {
|
|
192
|
-
if (
|
|
192
|
+
if (config_1.default.getEnv('executions.mode') === 'regular') {
|
|
193
193
|
this.instanceSettings.markAsLeader();
|
|
194
194
|
return;
|
|
195
195
|
}
|
|
196
|
-
if (di_1.Container.get(config_1.GlobalConfig).multiMainSetup.enabled &&
|
|
197
|
-
!di_1.Container.get(license_1.License).isMultipleMainInstancesLicensed()) {
|
|
198
|
-
throw new feature_not_licensed_error_1.FeatureNotLicensedError(constants_1.LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
|
|
199
|
-
}
|
|
200
196
|
const orchestrationService = di_1.Container.get(orchestration_service_1.OrchestrationService);
|
|
201
197
|
await orchestrationService.init();
|
|
202
198
|
di_1.Container.get(pubsub_handler_1.PubSubHandler).init();
|
|
@@ -222,7 +218,7 @@ class Start extends base_command_1.BaseCommand {
|
|
|
222
218
|
loadOnStartup: true,
|
|
223
219
|
});
|
|
224
220
|
databaseSettings.forEach((setting) => {
|
|
225
|
-
|
|
221
|
+
config_1.default.set(setting.key, (0, n8n_workflow_1.jsonParse)(setting.value, { fallbackValue: setting.value }));
|
|
226
222
|
});
|
|
227
223
|
const { type: dbType } = this.globalConfig.database;
|
|
228
224
|
if (dbType === 'sqlite') {
|
|
@@ -250,7 +246,7 @@ class Start extends base_command_1.BaseCommand {
|
|
|
250
246
|
}
|
|
251
247
|
await this.server.start();
|
|
252
248
|
di_1.Container.get(pruning_service_1.PruningService).init();
|
|
253
|
-
if (
|
|
249
|
+
if (config_1.default.getEnv('executions.mode') === 'regular') {
|
|
254
250
|
await this.runEnqueuedExecutions();
|
|
255
251
|
}
|
|
256
252
|
await this.activeWorkflowManager.init();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,15 @@ import type { IExecutingWorkflowData } from '../interfaces';
|
|
|
6
6
|
import { Telemetry } from '../telemetry';
|
|
7
7
|
export declare const CLOUD_TEMP_PRODUCTION_LIMIT = 999;
|
|
8
8
|
export declare const CLOUD_TEMP_REPORTABLE_THRESHOLDS: number[];
|
|
9
|
+
export type ConcurrencyQueueType = 'production' | 'evaluation';
|
|
9
10
|
export declare class ConcurrencyControlService {
|
|
10
11
|
private readonly logger;
|
|
11
12
|
private readonly executionRepository;
|
|
12
13
|
private readonly telemetry;
|
|
13
14
|
private readonly eventService;
|
|
14
15
|
private isEnabled;
|
|
15
|
-
private readonly
|
|
16
|
-
private readonly
|
|
16
|
+
private readonly limits;
|
|
17
|
+
private readonly queues;
|
|
17
18
|
private readonly limitsToReport;
|
|
18
19
|
constructor(logger: Logger, executionRepository: ExecutionRepository, telemetry: Telemetry, eventService: EventService);
|
|
19
20
|
has(executionId: string): boolean;
|
|
@@ -35,4 +36,5 @@ export declare class ConcurrencyControlService {
|
|
|
35
36
|
private logInit;
|
|
36
37
|
private isUnlimited;
|
|
37
38
|
private shouldReport;
|
|
39
|
+
private getQueue;
|
|
38
40
|
}
|
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.ConcurrencyControlService = exports.CLOUD_TEMP_REPORTABLE_THRESHOLDS = exports.CLOUD_TEMP_PRODUCTION_LIMIT = void 0;
|
|
16
16
|
const di_1 = require("@n8n/di");
|
|
17
|
+
const lodash_1 = require("lodash");
|
|
17
18
|
const n8n_core_1 = require("n8n-core");
|
|
18
19
|
const config_1 = __importDefault(require("../config"));
|
|
19
20
|
const execution_repository_1 = require("../databases/repositories/execution.repository");
|
|
@@ -32,62 +33,83 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
32
33
|
this.eventService = eventService;
|
|
33
34
|
this.limitsToReport = exports.CLOUD_TEMP_REPORTABLE_THRESHOLDS.map((t) => exports.CLOUD_TEMP_PRODUCTION_LIMIT - t);
|
|
34
35
|
this.logger = this.logger.scoped('concurrency');
|
|
35
|
-
this.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
36
|
+
this.limits = new Map([
|
|
37
|
+
['production', config_1.default.getEnv('executions.concurrency.productionLimit')],
|
|
38
|
+
['evaluation', config_1.default.getEnv('executions.concurrency.evaluationLimit')],
|
|
39
|
+
]);
|
|
40
|
+
this.limits.forEach((limit, type) => {
|
|
41
|
+
if (limit === 0) {
|
|
42
|
+
throw new invalid_concurrency_limit_error_1.InvalidConcurrencyLimitError(limit);
|
|
43
|
+
}
|
|
44
|
+
if (limit < -1) {
|
|
45
|
+
this.limits.set(type, -1);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
if (Array.from(this.limits.values()).every((limit) => limit === -1) ||
|
|
49
|
+
config_1.default.getEnv('executions.mode') === 'queue') {
|
|
43
50
|
this.isEnabled = false;
|
|
44
51
|
return;
|
|
45
52
|
}
|
|
46
|
-
this.
|
|
47
|
-
this.
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
if (this.shouldReport(capacity)) {
|
|
51
|
-
this.telemetry.track('User hit concurrency limit', {
|
|
52
|
-
threshold: exports.CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
|
|
53
|
-
});
|
|
53
|
+
this.queues = new Map();
|
|
54
|
+
this.limits.forEach((limit, type) => {
|
|
55
|
+
if (limit > 0) {
|
|
56
|
+
this.queues.set(type, new concurrency_queue_1.ConcurrencyQueue(limit));
|
|
54
57
|
}
|
|
55
58
|
});
|
|
56
|
-
this.
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
this.logInit();
|
|
60
|
+
this.isEnabled = true;
|
|
61
|
+
this.queues.forEach((queue, type) => {
|
|
62
|
+
queue.on('concurrency-check', ({ capacity }) => {
|
|
63
|
+
if (this.shouldReport(capacity)) {
|
|
64
|
+
this.telemetry.track('User hit concurrency limit', {
|
|
65
|
+
threshold: exports.CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
|
|
66
|
+
concurrencyQueue: type,
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
queue.on('execution-throttled', ({ executionId }) => {
|
|
71
|
+
this.logger.debug('Execution throttled', { executionId, type });
|
|
72
|
+
this.eventService.emit('execution-throttled', { executionId, type });
|
|
73
|
+
});
|
|
74
|
+
queue.on('execution-released', (executionId) => {
|
|
75
|
+
this.logger.debug('Execution released', { executionId, type });
|
|
76
|
+
});
|
|
62
77
|
});
|
|
63
78
|
}
|
|
64
79
|
has(executionId) {
|
|
65
80
|
if (!this.isEnabled)
|
|
66
81
|
return false;
|
|
67
|
-
|
|
82
|
+
for (const queue of this.queues.values()) {
|
|
83
|
+
if (queue.has(executionId)) {
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
return false;
|
|
68
88
|
}
|
|
69
89
|
async throttle({ mode, executionId }) {
|
|
70
90
|
if (!this.isEnabled || this.isUnlimited(mode))
|
|
71
91
|
return;
|
|
72
|
-
await this.
|
|
92
|
+
await this.getQueue(mode)?.enqueue(executionId);
|
|
73
93
|
}
|
|
74
94
|
release({ mode }) {
|
|
75
95
|
if (!this.isEnabled || this.isUnlimited(mode))
|
|
76
96
|
return;
|
|
77
|
-
this.
|
|
97
|
+
this.getQueue(mode)?.dequeue();
|
|
78
98
|
}
|
|
79
99
|
remove({ mode, executionId }) {
|
|
80
100
|
if (!this.isEnabled || this.isUnlimited(mode))
|
|
81
101
|
return;
|
|
82
|
-
this.
|
|
102
|
+
this.getQueue(mode)?.remove(executionId);
|
|
83
103
|
}
|
|
84
104
|
async removeAll(activeExecutions) {
|
|
85
105
|
if (!this.isEnabled)
|
|
86
106
|
return;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
107
|
+
this.queues.forEach((queue) => {
|
|
108
|
+
const enqueuedExecutionIds = queue.getAll();
|
|
109
|
+
for (const id of enqueuedExecutionIds) {
|
|
110
|
+
queue.remove(id);
|
|
111
|
+
}
|
|
112
|
+
});
|
|
91
113
|
const executionIds = Object.entries(activeExecutions)
|
|
92
114
|
.filter(([_, execution]) => execution.status === 'new' && execution.responsePromise)
|
|
93
115
|
.map(([executionId, _]) => executionId);
|
|
@@ -101,27 +123,34 @@ let ConcurrencyControlService = class ConcurrencyControlService {
|
|
|
101
123
|
}
|
|
102
124
|
logInit() {
|
|
103
125
|
this.logger.debug('Enabled');
|
|
104
|
-
this.
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
126
|
+
this.limits.forEach((limit, type) => {
|
|
127
|
+
this.logger.debug([
|
|
128
|
+
`${(0, lodash_1.capitalize)(type)} execution concurrency is`,
|
|
129
|
+
limit === -1 ? 'unlimited' : 'limited to ' + limit.toString(),
|
|
130
|
+
].join(' '));
|
|
131
|
+
});
|
|
108
132
|
}
|
|
109
133
|
isUnlimited(mode) {
|
|
134
|
+
return this.getQueue(mode) === undefined;
|
|
135
|
+
}
|
|
136
|
+
shouldReport(capacity) {
|
|
137
|
+
return config_1.default.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
|
|
138
|
+
}
|
|
139
|
+
getQueue(mode) {
|
|
110
140
|
if (mode === 'error' ||
|
|
111
141
|
mode === 'integrated' ||
|
|
112
142
|
mode === 'cli' ||
|
|
113
143
|
mode === 'internal' ||
|
|
114
144
|
mode === 'manual' ||
|
|
115
145
|
mode === 'retry') {
|
|
116
|
-
return
|
|
146
|
+
return undefined;
|
|
117
147
|
}
|
|
118
148
|
if (mode === 'webhook' || mode === 'trigger')
|
|
119
|
-
return this.
|
|
149
|
+
return this.queues.get('production');
|
|
150
|
+
if (mode === 'evaluation')
|
|
151
|
+
return this.queues.get('evaluation');
|
|
120
152
|
throw new unknown_execution_mode_error_1.UnknownExecutionModeError(mode);
|
|
121
153
|
}
|
|
122
|
-
shouldReport(capacity) {
|
|
123
|
-
return config_1.default.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
|
|
124
|
-
}
|
|
125
154
|
};
|
|
126
155
|
exports.ConcurrencyControlService = ConcurrencyControlService;
|
|
127
156
|
exports.ConcurrencyControlService = ConcurrencyControlService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrency-control.service.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-control.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAAkC;AAClC,uCAAkC;AAGlC,sDAA8B;AAC9B,wFAAoF;AACpF,8FAAwF;AACxF,wFAAkF;AAClF,0DAAsD;AAEtD,2CAAwC;AAExC,2DAAuD;AAE1C,QAAA,2BAA2B,GAAG,GAAG,CAAC;AAClC,QAAA,gCAAgC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"concurrency-control.service.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-control.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,9 @@ let ConcurrencyQueue = class ConcurrencyQueue extends typed_emitter_1.TypedEmitt
|
|
|
44
44
|
getAll() {
|
|
45
45
|
return new Set(this.queue.map((item) => item.executionId));
|
|
46
46
|
}
|
|
47
|
+
has(executionId) {
|
|
48
|
+
return this.queue.some((item) => item.executionId === executionId);
|
|
49
|
+
}
|
|
47
50
|
resolveNext() {
|
|
48
51
|
const item = this.queue.shift();
|
|
49
52
|
if (!item)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrency-queue.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-queue.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,mDAA+C;AASxC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAA+B;IAMpE,YAAoB,QAAgB;QACnC,KAAK,EAAE,CAAC;QADW,aAAQ,GAAR,QAAQ,CAAQ;QALnB,UAAK,GAGjB,EAAE,CAAC;IAIR,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAmB;QAChC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAErE,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;YAGlD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAClF,CAAC;IACF,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,OAAO;QACN,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,WAAmB;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC;QAE/E,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAE5B,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEhB,IAAI,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;IACF,CAAC;IAED,MAAM;QACL,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEO,WAAW;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAEhC,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;QAE7C,OAAO,EAAE,CAAC;IACX,CAAC;CACD,CAAA;
|
|
1
|
+
{"version":3,"file":"concurrency-queue.js","sourceRoot":"","sources":["../../src/concurrency/concurrency-queue.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,mDAA+C;AASxC,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,4BAA+B;IAMpE,YAAoB,QAAgB;QACnC,KAAK,EAAE,CAAC;QADW,aAAQ,GAAR,QAAQ,CAAQ;QALnB,UAAK,GAGjB,EAAE,CAAC;IAIR,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,WAAmB;QAChC,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,aAAa,CAAC,mBAAmB,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAErE,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;YAGlD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAClF,CAAC;IACF,CAAC;IAED,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,OAAO;QACN,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,WAAmB;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC;QAE/E,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAE5B,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEhB,IAAI,CAAC,WAAW,EAAE,CAAC;QACpB,CAAC;IACF,CAAC;IAED,MAAM;QACL,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,GAAG,CAAC,WAAmB;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC;IACpE,CAAC;IAEO,WAAW;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAEhC,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC;QAE7C,OAAO,EAAE,CAAC;IACX,CAAC;CACD,CAAA;AAhEY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;;GACG,gBAAgB,CAgE5B"}
|
package/dist/config/index.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ declare const config: convict.Config<{
|
|
|
5
5
|
mode: string;
|
|
6
6
|
concurrency: {
|
|
7
7
|
productionLimit: number;
|
|
8
|
+
evaluationLimit: number;
|
|
8
9
|
};
|
|
9
10
|
timeout: number;
|
|
10
11
|
maxTimeout: number;
|
|
@@ -21,7 +22,6 @@ declare const config: convict.Config<{
|
|
|
21
22
|
ssl_key: string;
|
|
22
23
|
ssl_cert: string;
|
|
23
24
|
editorBaseUrl: string;
|
|
24
|
-
workflowTagsDisabled: boolean;
|
|
25
25
|
userManagement: {
|
|
26
26
|
jwtSecret: string;
|
|
27
27
|
jwtSessionDurationHours: number;
|
|
@@ -78,9 +78,6 @@ declare const config: convict.Config<{
|
|
|
78
78
|
evaluator: string;
|
|
79
79
|
reportDifference: boolean;
|
|
80
80
|
};
|
|
81
|
-
sourceControl: {
|
|
82
|
-
defaultKeyPairType: string;
|
|
83
|
-
};
|
|
84
81
|
workflowHistory: {
|
|
85
82
|
enabled: boolean;
|
|
86
83
|
pruneTime: number;
|
package/dist/config/schema.d.ts
CHANGED
|
@@ -19,6 +19,12 @@ export declare const schema: {
|
|
|
19
19
|
default: number;
|
|
20
20
|
env: string;
|
|
21
21
|
};
|
|
22
|
+
evaluationLimit: {
|
|
23
|
+
doc: string;
|
|
24
|
+
format: NumberConstructor;
|
|
25
|
+
default: number;
|
|
26
|
+
env: string;
|
|
27
|
+
};
|
|
22
28
|
};
|
|
23
29
|
timeout: {
|
|
24
30
|
doc: string;
|
|
@@ -95,12 +101,6 @@ export declare const schema: {
|
|
|
95
101
|
env: string;
|
|
96
102
|
doc: string;
|
|
97
103
|
};
|
|
98
|
-
workflowTagsDisabled: {
|
|
99
|
-
format: BooleanConstructor;
|
|
100
|
-
default: boolean;
|
|
101
|
-
env: string;
|
|
102
|
-
doc: string;
|
|
103
|
-
};
|
|
104
104
|
userManagement: {
|
|
105
105
|
jwtSecret: {
|
|
106
106
|
doc: string;
|
|
@@ -283,14 +283,6 @@ export declare const schema: {
|
|
|
283
283
|
env: string;
|
|
284
284
|
};
|
|
285
285
|
};
|
|
286
|
-
sourceControl: {
|
|
287
|
-
defaultKeyPairType: {
|
|
288
|
-
doc: string;
|
|
289
|
-
format: readonly ["rsa", "ed25519"];
|
|
290
|
-
default: string;
|
|
291
|
-
env: string;
|
|
292
|
-
};
|
|
293
|
-
};
|
|
294
286
|
workflowHistory: {
|
|
295
287
|
enabled: {
|
|
296
288
|
doc: string;
|
package/dist/config/schema.js
CHANGED
|
@@ -36,6 +36,12 @@ exports.schema = {
|
|
|
36
36
|
default: -1,
|
|
37
37
|
env: 'N8N_CONCURRENCY_PRODUCTION_LIMIT',
|
|
38
38
|
},
|
|
39
|
+
evaluationLimit: {
|
|
40
|
+
doc: 'Max evaluation executions allowed to run concurrently.',
|
|
41
|
+
format: Number,
|
|
42
|
+
default: -1,
|
|
43
|
+
env: 'N8N_CONCURRENCY_EVALUATION_LIMIT',
|
|
44
|
+
},
|
|
39
45
|
},
|
|
40
46
|
timeout: {
|
|
41
47
|
doc: 'Max run time (seconds) before stopping the workflow execution',
|
|
@@ -112,12 +118,6 @@ exports.schema = {
|
|
|
112
118
|
env: 'N8N_EDITOR_BASE_URL',
|
|
113
119
|
doc: 'Public URL where the editor is accessible. Also used for emails sent from n8n.',
|
|
114
120
|
},
|
|
115
|
-
workflowTagsDisabled: {
|
|
116
|
-
format: Boolean,
|
|
117
|
-
default: false,
|
|
118
|
-
env: 'N8N_WORKFLOW_TAGS_DISABLED',
|
|
119
|
-
doc: 'Disable workflow tags.',
|
|
120
|
-
},
|
|
121
121
|
userManagement: {
|
|
122
122
|
jwtSecret: {
|
|
123
123
|
doc: 'Set a specific JWT secret (optional - n8n can generate one)',
|
|
@@ -300,14 +300,6 @@ exports.schema = {
|
|
|
300
300
|
env: 'N8N_EXPRESSION_REPORT_DIFFERENCE',
|
|
301
301
|
},
|
|
302
302
|
},
|
|
303
|
-
sourceControl: {
|
|
304
|
-
defaultKeyPairType: {
|
|
305
|
-
doc: 'Default SSH key type to use when generating SSH keys',
|
|
306
|
-
format: ['rsa', 'ed25519'],
|
|
307
|
-
default: 'ed25519',
|
|
308
|
-
env: 'N8N_SOURCECONTROL_DEFAULT_SSH_KEY_TYPE',
|
|
309
|
-
},
|
|
310
|
-
},
|
|
311
303
|
workflowHistory: {
|
|
312
304
|
enabled: {
|
|
313
305
|
doc: 'Whether to save workflow history versions',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -129,7 +129,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
|
|
|
129
129
|
if (Object.keys(req.query).length > 2) {
|
|
130
130
|
(0, set_1.default)(oauthToken.data, 'callbackQueryString', (0, omit_1.default)(req.query, 'state', 'code'));
|
|
131
131
|
}
|
|
132
|
-
if (decryptedDataOriginal.oauthTokenData) {
|
|
132
|
+
if (typeof decryptedDataOriginal.oauthTokenData === 'object') {
|
|
133
133
|
Object.assign(decryptedDataOriginal.oauthTokenData, oauthToken.data);
|
|
134
134
|
}
|
|
135
135
|
else {
|