n8n 1.50.0 → 1.51.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/ActiveExecutions.d.ts +2 -1
- package/dist/ActiveExecutions.js +16 -6
- package/dist/ActiveExecutions.js.map +1 -1
- package/dist/InternalHooks.d.ts +1 -25
- package/dist/InternalHooks.js +0 -12
- package/dist/InternalHooks.js.map +1 -1
- package/dist/License.d.ts +3 -3
- package/dist/License.js +6 -6
- package/dist/License.js.map +1 -1
- package/dist/Queue.d.ts +3 -1
- package/dist/Queue.js +10 -2
- package/dist/Queue.js.map +1 -1
- package/dist/Server.js +6 -4
- package/dist/Server.js.map +1 -1
- package/dist/WaitTracker.d.ts +1 -1
- package/dist/WaitTracker.js +1 -11
- package/dist/WaitTracker.js.map +1 -1
- package/dist/WaitingWebhooks.js +3 -0
- package/dist/WaitingWebhooks.js.map +1 -1
- package/dist/WorkflowRunner.js +3 -1
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/BaseCommand.js +2 -0
- package/dist/commands/BaseCommand.js.map +1 -1
- package/dist/commands/worker.js +2 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +3 -3
- package/dist/controllers/project.controller.js +15 -15
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/credentials/credentials.service.js +1 -1
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/databases/repositories/execution.repository.d.ts +1 -1
- package/dist/databases/repositories/execution.repository.js +10 -8
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/repositories/{usageMetrics.repository.d.ts → license-metrics.repository.d.ts} +2 -2
- package/dist/databases/repositories/{usageMetrics.repository.js → license-metrics.repository.js} +11 -11
- package/dist/databases/repositories/license-metrics.repository.js.map +1 -0
- package/dist/eventbus/event.types.d.ts +22 -0
- package/dist/executions/execution.service.js +4 -4
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/{services/usageMetrics.service.d.ts → metrics/license-metrics.service.d.ts} +4 -4
- package/dist/{services/usageMetrics.service.js → metrics/license-metrics.service.js} +11 -11
- package/dist/metrics/license-metrics.service.js.map +1 -0
- package/dist/{services/metrics.service.d.ts → metrics/prometheus-metrics.service.d.ts} +1 -1
- package/dist/{services/metrics.service.js → metrics/prometheus-metrics.service.js} +6 -6
- package/dist/metrics/prometheus-metrics.service.js.map +1 -0
- package/dist/services/project.service.d.ts +3 -2
- package/dist/services/project.service.js +3 -2
- package/dist/services/project.service.js.map +1 -1
- package/dist/telemetry/telemetry-event-relay.service.d.ts +12 -0
- package/dist/telemetry/telemetry-event-relay.service.js +66 -0
- package/dist/telemetry/telemetry-event-relay.service.js.map +1 -0
- package/dist/timezones.json +1 -0
- package/package.json +8 -8
- package/dist/databases/repositories/usageMetrics.repository.js.map +0 -1
- package/dist/services/metrics.service.js.map +0 -1
- package/dist/services/usageMetrics.service.js.map +0 -1
|
@@ -17,7 +17,8 @@ export declare class ActiveExecutions {
|
|
|
17
17
|
resolveResponsePromise(executionId: string, response: IExecuteResponsePromiseData): void;
|
|
18
18
|
getPostExecutePromiseCount(executionId: string): number;
|
|
19
19
|
remove(executionId: string, fullRunData?: IRun): void;
|
|
20
|
-
stopExecution(executionId: string):
|
|
20
|
+
stopExecution(executionId: string): void;
|
|
21
|
+
private postExecuteCleanup;
|
|
21
22
|
getPostExecutePromise(executionId: string): Promise<IRun | undefined>;
|
|
22
23
|
getActiveExecutions(): IExecutionsCurrentSummary[];
|
|
23
24
|
setStatus(executionId: string, status: ExecutionStatus): void;
|
package/dist/ActiveExecutions.js
CHANGED
|
@@ -98,16 +98,27 @@ let ActiveExecutions = class ActiveExecutions {
|
|
|
98
98
|
for (const promise of execution.postExecutePromises) {
|
|
99
99
|
promise.resolve(fullRunData);
|
|
100
100
|
}
|
|
101
|
-
|
|
102
|
-
this.concurrencyControl.release({ mode: execution.executionData.executionMode });
|
|
101
|
+
this.postExecuteCleanup(executionId);
|
|
103
102
|
}
|
|
104
|
-
|
|
103
|
+
stopExecution(executionId) {
|
|
105
104
|
const execution = this.activeExecutions[executionId];
|
|
106
105
|
if (execution === undefined) {
|
|
107
106
|
return;
|
|
108
107
|
}
|
|
109
108
|
execution.workflowExecution.cancel();
|
|
110
|
-
|
|
109
|
+
const reason = new n8n_workflow_1.ExecutionCancelledError(executionId);
|
|
110
|
+
for (const promise of execution.postExecutePromises) {
|
|
111
|
+
promise.reject(reason);
|
|
112
|
+
}
|
|
113
|
+
this.postExecuteCleanup(executionId);
|
|
114
|
+
}
|
|
115
|
+
postExecuteCleanup(executionId) {
|
|
116
|
+
const execution = this.activeExecutions[executionId];
|
|
117
|
+
if (execution === undefined) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
delete this.activeExecutions[executionId];
|
|
121
|
+
this.concurrencyControl.release({ mode: execution.executionData.executionMode });
|
|
111
122
|
}
|
|
112
123
|
async getPostExecutePromise(executionId) {
|
|
113
124
|
const waitPromise = await (0, n8n_workflow_1.createDeferredPromise)();
|
|
@@ -145,8 +156,7 @@ let ActiveExecutions = class ActiveExecutions {
|
|
|
145
156
|
if (config_1.default.getEnv('executions.mode') === 'regular') {
|
|
146
157
|
await this.concurrencyControl.removeAll(this.activeExecutions);
|
|
147
158
|
}
|
|
148
|
-
|
|
149
|
-
await Promise.allSettled(stopPromises);
|
|
159
|
+
executionIds.forEach((executionId) => this.stopExecution(executionId));
|
|
150
160
|
}
|
|
151
161
|
let count = 0;
|
|
152
162
|
while (executionIds.length !== 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActiveExecutions.js","sourceRoot":"","sources":["../src/ActiveExecutions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AAQjC,+
|
|
1
|
+
{"version":3,"file":"ActiveExecutions.js","sourceRoot":"","sources":["../src/ActiveExecutions.ts"],"names":[],"mappings":"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"}
|
package/dist/InternalHooks.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { GlobalConfig } from '@n8n/config';
|
|
|
2
2
|
import type { IRun, IWorkflowBase } from 'n8n-workflow';
|
|
3
3
|
import { InstanceSettings } from 'n8n-core';
|
|
4
4
|
import type { AuthProviderType } from './databases/entities/AuthIdentity';
|
|
5
|
-
import type {
|
|
5
|
+
import type { User } from './databases/entities/User';
|
|
6
6
|
import { SharedWorkflowRepository } from './databases/repositories/sharedWorkflow.repository';
|
|
7
7
|
import { WorkflowRepository } from './databases/repositories/workflow.repository';
|
|
8
8
|
import type { ITelemetryUserDeletionData, IWorkflowDb } from './Interfaces';
|
|
@@ -11,7 +11,6 @@ import { EventsService } from './services/events.service';
|
|
|
11
11
|
import { NodeTypes } from './NodeTypes';
|
|
12
12
|
import { Telemetry } from './telemetry';
|
|
13
13
|
import type { Project } from './databases/entities/Project';
|
|
14
|
-
import type { ProjectRole } from './databases/entities/ProjectRelation';
|
|
15
14
|
import { ProjectRelationRepository } from './databases/repositories/projectRelation.repository';
|
|
16
15
|
import { SharedCredentialsRepository } from './databases/repositories/sharedCredentials.repository';
|
|
17
16
|
import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
|
|
@@ -263,27 +262,4 @@ export declare class InternalHooks {
|
|
|
263
262
|
is_new: boolean;
|
|
264
263
|
error_message?: string | undefined;
|
|
265
264
|
}): Promise<void>;
|
|
266
|
-
onTeamProjectCreated(data: {
|
|
267
|
-
user_id: string;
|
|
268
|
-
role: GlobalRole;
|
|
269
|
-
}): Promise<void>;
|
|
270
|
-
onTeamProjectDeleted(data: {
|
|
271
|
-
user_id: string;
|
|
272
|
-
role: GlobalRole;
|
|
273
|
-
project_id: string;
|
|
274
|
-
removal_type: 'delete' | 'transfer';
|
|
275
|
-
target_project_id?: string;
|
|
276
|
-
}): Promise<void>;
|
|
277
|
-
onTeamProjectUpdated(data: {
|
|
278
|
-
user_id: string;
|
|
279
|
-
role: GlobalRole;
|
|
280
|
-
project_id: string;
|
|
281
|
-
members: Array<{
|
|
282
|
-
user_id: string;
|
|
283
|
-
role: ProjectRole;
|
|
284
|
-
}>;
|
|
285
|
-
}): Promise<void>;
|
|
286
|
-
onConcurrencyLimitHit({ threshold }: {
|
|
287
|
-
threshold: number;
|
|
288
|
-
}): Promise<void>;
|
|
289
265
|
}
|
package/dist/InternalHooks.js
CHANGED
|
@@ -505,18 +505,6 @@ let InternalHooks = class InternalHooks {
|
|
|
505
505
|
async onExternalSecretsProviderSettingsSaved(saveData) {
|
|
506
506
|
return await this.telemetry.track('User updated external secrets settings', saveData);
|
|
507
507
|
}
|
|
508
|
-
async onTeamProjectCreated(data) {
|
|
509
|
-
return await this.telemetry.track('User created project', data);
|
|
510
|
-
}
|
|
511
|
-
async onTeamProjectDeleted(data) {
|
|
512
|
-
return await this.telemetry.track('User deleted project', data);
|
|
513
|
-
}
|
|
514
|
-
async onTeamProjectUpdated(data) {
|
|
515
|
-
return await this.telemetry.track('Project settings updated', data);
|
|
516
|
-
}
|
|
517
|
-
async onConcurrencyLimitHit({ threshold }) {
|
|
518
|
-
await this.telemetry.track('User hit concurrency limit', { threshold });
|
|
519
|
-
}
|
|
520
508
|
};
|
|
521
509
|
exports.InternalHooks = InternalHooks;
|
|
522
510
|
exports.InternalHooks = InternalHooks = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalHooks.js","sourceRoot":"","sources":["../src/InternalHooks.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"InternalHooks.js","sourceRoot":"","sources":["../src/InternalHooks.ts"],"names":[],"mappings":"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"}
|
package/dist/License.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { Logger } from './Logger';
|
|
|
4
4
|
import { SettingsRepository } from './databases/repositories/settings.repository';
|
|
5
5
|
import type { BooleanLicenseFeature, N8nInstanceType, NumericLicenseFeature } from './Interfaces';
|
|
6
6
|
import { OrchestrationService } from './services/orchestration.service';
|
|
7
|
-
import {
|
|
7
|
+
import { LicenseMetricsService } from './metrics/license-metrics.service';
|
|
8
8
|
type FeatureReturnType = Partial<{
|
|
9
9
|
planName: string;
|
|
10
10
|
} & {
|
|
@@ -17,11 +17,11 @@ export declare class License {
|
|
|
17
17
|
private readonly instanceSettings;
|
|
18
18
|
private readonly orchestrationService;
|
|
19
19
|
private readonly settingsRepository;
|
|
20
|
-
private readonly
|
|
20
|
+
private readonly licenseMetricsService;
|
|
21
21
|
private manager;
|
|
22
22
|
private redisPublisher;
|
|
23
23
|
private isShuttingDown;
|
|
24
|
-
constructor(logger: Logger, instanceSettings: InstanceSettings, orchestrationService: OrchestrationService, settingsRepository: SettingsRepository,
|
|
24
|
+
constructor(logger: Logger, instanceSettings: InstanceSettings, orchestrationService: OrchestrationService, settingsRepository: SettingsRepository, licenseMetricsService: LicenseMetricsService);
|
|
25
25
|
private renewalEnabled;
|
|
26
26
|
init(instanceType?: N8nInstanceType, forceRecreate?: boolean): Promise<void>;
|
|
27
27
|
loadCertStr(): Promise<TLicenseBlock>;
|
package/dist/License.js
CHANGED
|
@@ -46,14 +46,14 @@ const settings_repository_1 = require("./databases/repositories/settings.reposit
|
|
|
46
46
|
const redis_service_1 = require("./services/redis.service");
|
|
47
47
|
const orchestration_service_1 = require("./services/orchestration.service");
|
|
48
48
|
const OnShutdown_1 = require("./decorators/OnShutdown");
|
|
49
|
-
const
|
|
49
|
+
const license_metrics_service_1 = require("./metrics/license-metrics.service");
|
|
50
50
|
let License = class License {
|
|
51
|
-
constructor(logger, instanceSettings, orchestrationService, settingsRepository,
|
|
51
|
+
constructor(logger, instanceSettings, orchestrationService, settingsRepository, licenseMetricsService) {
|
|
52
52
|
this.logger = logger;
|
|
53
53
|
this.instanceSettings = instanceSettings;
|
|
54
54
|
this.orchestrationService = orchestrationService;
|
|
55
55
|
this.settingsRepository = settingsRepository;
|
|
56
|
-
this.
|
|
56
|
+
this.licenseMetricsService = licenseMetricsService;
|
|
57
57
|
this.isShuttingDown = false;
|
|
58
58
|
}
|
|
59
59
|
renewalEnabled(instanceType) {
|
|
@@ -85,10 +85,10 @@ let License = class License {
|
|
|
85
85
|
? async (features) => await this.onFeatureChange(features)
|
|
86
86
|
: async () => { };
|
|
87
87
|
const collectUsageMetrics = isMainInstance
|
|
88
|
-
? async () => await this.
|
|
88
|
+
? async () => await this.licenseMetricsService.collectUsageMetrics()
|
|
89
89
|
: async () => [];
|
|
90
90
|
const collectPassthroughData = isMainInstance
|
|
91
|
-
? async () => await this.
|
|
91
|
+
? async () => await this.licenseMetricsService.collectPassthroughData()
|
|
92
92
|
: async () => ({});
|
|
93
93
|
const renewalEnabled = this.renewalEnabled(instanceType);
|
|
94
94
|
try {
|
|
@@ -332,6 +332,6 @@ exports.License = License = __decorate([
|
|
|
332
332
|
n8n_core_1.InstanceSettings,
|
|
333
333
|
orchestration_service_1.OrchestrationService,
|
|
334
334
|
settings_repository_1.SettingsRepository,
|
|
335
|
-
|
|
335
|
+
license_metrics_service_1.LicenseMetricsService])
|
|
336
336
|
], License);
|
|
337
337
|
//# sourceMappingURL=License.js.map
|
package/dist/License.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"License.js","sourceRoot":"","sources":["../src/License.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAAqD;AACrD,uCAAgE;AAChE,iDAA4C;AAC5C,qCAAkC;AAClC,sDAA8B;AAC9B,2CAMqB;AACrB,8EAA0E;AAG1E,4DAAwD;AACxD,4EAAwE;AACxE,wDAAqD;AACrD
|
|
1
|
+
{"version":3,"file":"License.js","sourceRoot":"","sources":["../src/License.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAAqD;AACrD,uCAAgE;AAChE,iDAA4C;AAC5C,qCAAkC;AAClC,sDAA8B;AAC9B,2CAMqB;AACrB,8EAA0E;AAG1E,4DAAwD;AACxD,4EAAwE;AACxE,wDAAqD;AACrD,+EAA0E;AASnE,IAAM,OAAO,GAAb,MAAM,OAAO;IAOnB,YACkB,MAAc,EACd,gBAAkC,EAClC,oBAA0C,EAC1C,kBAAsC,EACtC,qBAA4C;QAJ5C,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;QAPtD,mBAAc,GAAG,KAAK,CAAC;IAQ5B,CAAC;IAKI,cAAc,CAAC,YAA6B;QACnD,IAAI,YAAY,KAAK,MAAM;YAAE,OAAO,KAAK,CAAC;QAE1C,MAAM,gBAAgB,GAAG,gBAAM,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC;QAOnE,IAAI,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAC7C,OAAO,gBAAgB,IAAI,gBAAM,CAAC,MAAM,CAAC,6BAA6B,CAAC,KAAK,QAAQ,CAAC;QACtF,CAAC;QAED,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,eAAgC,MAAM,EAAE,aAAa,GAAG,KAAK;QACvE,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACzE,OAAO;QACR,CAAC;QACD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAC1D,OAAO;QACR,CAAC;QAED,MAAM,cAAc,GAAG,YAAY,KAAK,MAAM,CAAC;QAC/C,MAAM,MAAM,GAAG,gBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,CAAC,cAAc,CAAC;QACpC,MAAM,eAAe,GAAG,gBAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,cAAc;YACjC,CAAC,CAAC,KAAK,EAAE,KAAoB,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAC/D,CAAC,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;QAClB,MAAM,eAAe,GAAG,cAAc;YACrC,CAAC,CAAC,KAAK,EAAE,QAAmB,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;YACrE,CAAC,CAAC,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;QAClB,MAAM,mBAAmB,GAAG,cAAc;YACzC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,EAAE;YACpE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,CAAC;QAClB,MAAM,sBAAsB,GAAG,cAAc;YAC5C,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,sBAAsB,EAAE;YACvE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpB,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,IAAI,4BAAc,CAAC;gBACjC,MAAM;gBACN,QAAQ,EAAE,gBAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC;gBAC3C,iBAAiB,EAAE,OAAO,uBAAW,EAAE;gBACvC,gBAAgB,EAAE,cAAc;gBAChC,WAAW,EAAE,cAAc;gBAC3B,eAAe;gBACf,WAAW;gBACX,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE;gBACjD,WAAW;gBACX,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU;gBACzD,mBAAmB;gBACnB,sBAAsB;gBACtB,eAAe;aACf,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACrB,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gBACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;YAClE,CAAC;QACF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,WAAW;;QAEhB,MAAM,gBAAgB,GAAG,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACpD,IAAI,gBAAgB,EAAE,CAAC;YACtB,OAAO,gBAAgB,CAAC;QACzB,CAAC;QACD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YAC9D,KAAK,EAAE;gBACN,GAAG,EAAE,qCAAyB;aAC9B;SACD,CAAC,CAAC;QAEH,OAAO,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,KAAK,mCAAI,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,SAAoB;QACzC,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,IAAI,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,EAAE,CAAC;YAC7F,MAAM,mBAAmB,GAAG,SAAS,CAAC,4BAAgB,CAAC,uBAAuB,CAElE,CAAC;YAEb,IAAI,CAAC,oBAAoB,CAAC,yBAAyB,CAAC,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,KAAK,CAAC,CAAC;YAElF,IACC,IAAI,CAAC,oBAAoB,CAAC,uBAAuB;gBACjD,IAAI,CAAC,oBAAoB,CAAC,UAAU,EACnC,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,yFAAyF,CACzF,CAAC;gBACF,OAAO;YACR,CAAC;YAED,IAAI,IAAI,CAAC,oBAAoB,CAAC,uBAAuB,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC/E,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,0MAA0M,CAC1M,CAAC;YACH,CAAC;QACF,CAAC;QAED,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,EAAE,CAAC;YAClD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBACtE,IAAI,CAAC,cAAc,GAAG,MAAM,gBAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,kBAAkB,EAAE,CAAC;YAC9E,CAAC;YACD,MAAM,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC;gBACjD,OAAO,EAAE,eAAe;aACxB,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,YAAY,GAAG,gBAAM,CAAC,MAAM,CAAC,wBAAwB,CAAC,KAAK,IAAI,CAAC;QACtE,MAAM,aAAa,GAAG,gBAAM,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvF,MAAM,YAAY,GAAG,SAAS,CAAC,mBAAmB,CAAC,CAAC;QAEpD,IAAI,YAAY,IAAI,aAAa,IAAI,CAAC,YAAY,EAAE,CAAC;YACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,oKAAoK,CACpK,CAAC;YAEF,gBAAS,CAAC,GAAG,CAAC,6BAAkB,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACrD,CAAC;IACF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAoB;QAErC,IAAI,gBAAM,CAAC,GAAG,CAAC,cAAc,CAAC;YAAE,OAAO;QACvC,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CACnC;YACC,GAAG,EAAE,qCAAyB;YAC9B,KAAK;YACL,aAAa,EAAE,KAAK;SACpB,EACD,CAAC,KAAK,CAAC,CACP,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,aAAqB;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM;QACX,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QAGb,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,gBAAgB,CAAC,OAA8B;;QAC9C,OAAO,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,iBAAiB,CAAC,OAAO,CAAC,mCAAI,KAAK,CAAC;IAC1D,CAAC;IAED,gBAAgB;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,qBAAqB;QACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,aAAa,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,iCAAiC;QAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,0BAA0B,CAAC,CAAC;IAC3E,CAAC;IAED,6BAA6B;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,oBAAoB,CAAC,CAAC;IACrE,CAAC;IAED,uBAAuB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,eAAe,CAAC,CAAC;IAChE,CAAC;IAED,sBAAsB;QACrB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,cAAc,CAAC,CAAC;IAC/D,CAAC;IAED,+BAA+B;QAC9B,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,uBAAuB,CAAC,CAAC;IACxE,CAAC;IAED,kBAAkB;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED,uBAAuB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,cAAc,CAAC,CAAC;IAC/D,CAAC;IAED,wBAAwB;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,gBAAgB,CAAC,CAAC;IACjE,CAAC;IAED,yBAAyB;QACxB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,gBAAgB,CAAC,CAAC;IACjE,CAAC;IAED,aAAa;QACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,YAAY,CAAC,CAAC;IAC7D,CAAC;IAED,oBAAoB;QACnB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;IAED,0BAA0B;QACzB,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,kBAAkB,CAAC,CAAC;IACnE,CAAC;IAED,2BAA2B;QAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,mBAAmB,CAAC,CAAC;IACpE,CAAC;IAED,2BAA2B;QAC1B,OAAO,IAAI,CAAC,gBAAgB,CAAC,4BAAgB,CAAC,mBAAmB,CAAC,CAAC;IACpE,CAAC;IAED,sBAAsB;;QACrB,OAAO,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,sBAAsB,EAAE,mCAAI,EAAE,CAAC;IACrD,CAAC;IAED,eAAe,CAAoC,OAAU;;QAC5D,OAAO,MAAA,IAAI,CAAC,OAAO,0CAAE,eAAe,CAAC,OAAO,CAAyB,CAAC;IACvE,CAAC;IAED,gBAAgB;QACf,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACX,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;IACxC,CAAC;IAKD,WAAW;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACnD,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YAC1B,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,OAAO,YAAY,CAAC,IAAI,CACvB,CAAC,WAAW,EAAE,EAAE,eAAC,OAAA,MAAC,MAAA,WAAW,CAAC,eAAe,0CAAE,KAAkC,0CAAE,UAAU,CAAA,EAAA,CAC7F,CAAC;IACH,CAAC;IAED,aAAa;;QACZ,OAAO,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,aAAa,EAAE,mCAAI,SAAS,CAAC;IACnD,CAAC;IAGD,aAAa;;QACZ,OAAO,MAAA,IAAI,CAAC,eAAe,CAAC,0BAAc,CAAC,WAAW,CAAC,mCAAI,mCAAuB,CAAC;IACpF,CAAC;IAED,eAAe;;QACd,OAAO,MAAA,IAAI,CAAC,eAAe,CAAC,0BAAc,CAAC,aAAa,CAAC,mCAAI,mCAAuB,CAAC;IACtF,CAAC;IAED,iBAAiB;;QAChB,OAAO,MAAA,IAAI,CAAC,eAAe,CAAC,0BAAc,CAAC,eAAe,CAAC,mCAAI,mCAAuB,CAAC;IACxF,CAAC;IAED,4BAA4B;;QAC3B,OAAO,CACN,MAAA,IAAI,CAAC,eAAe,CAAC,0BAAc,CAAC,4BAA4B,CAAC,mCAAI,mCAAuB,CAC5F,CAAC;IACH,CAAC;IAED,mBAAmB;;QAClB,OAAO,MAAA,IAAI,CAAC,eAAe,CAAC,0BAAc,CAAC,kBAAkB,CAAC,mCAAI,CAAC,CAAC;IACrE,CAAC;IAED,WAAW;;QACV,OAAO,MAAA,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,mCAAI,WAAW,CAAC;IACxD,CAAC;IAED,OAAO;QACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IAChC,CAAC;IAED,kBAAkB;QACjB,OAAO,IAAI,CAAC,aAAa,EAAE,KAAK,mCAAuB,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,MAAM;;QACX,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,EAAE,CAAC;QACtB,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;CACD,CAAA;AAvWY,0BAAO;AA+Lb;IADL,IAAA,uBAAU,GAAE;;;;uCAWZ;kBAzMW,OAAO;IADnB,IAAA,gBAAO,GAAE;qCASiB,eAAM;QACI,2BAAgB;QACZ,4CAAoB;QACtB,wCAAkB;QACf,+CAAqB;GAZlD,OAAO,CAuWnB"}
|
package/dist/Queue.d.ts
CHANGED
|
@@ -19,6 +19,8 @@ export interface WebhookResponse {
|
|
|
19
19
|
export declare class Queue {
|
|
20
20
|
private activeExecutions;
|
|
21
21
|
private jobQueue;
|
|
22
|
+
private concurrency;
|
|
23
|
+
setConcurrency(concurrency: number): void;
|
|
22
24
|
constructor(activeExecutions: ActiveExecutions);
|
|
23
25
|
init(): Promise<void>;
|
|
24
26
|
findRunningJobBy({ executionId }: {
|
|
@@ -29,7 +31,7 @@ export declare class Queue {
|
|
|
29
31
|
getJob(jobId: JobId): Promise<Job | null>;
|
|
30
32
|
getJobs(jobTypes: Bull.JobStatus[]): Promise<Job[]>;
|
|
31
33
|
getInProgressExecutionIds(): Promise<Set<string>>;
|
|
32
|
-
process(
|
|
34
|
+
process(fn: Bull.ProcessCallbackFunction<JobData>): Promise<void>;
|
|
33
35
|
ping(): Promise<string>;
|
|
34
36
|
pause(): Promise<void>;
|
|
35
37
|
getBullObjectInstance(): JobQueue;
|
package/dist/Queue.js
CHANGED
|
@@ -43,8 +43,16 @@ const config_1 = __importDefault(require("./config"));
|
|
|
43
43
|
const OnShutdown_1 = require("./decorators/OnShutdown");
|
|
44
44
|
const constants_1 = require("./constants");
|
|
45
45
|
let Queue = class Queue {
|
|
46
|
+
setConcurrency(concurrency) {
|
|
47
|
+
this.concurrency = concurrency;
|
|
48
|
+
this.jobQueue.setMaxListeners(4 +
|
|
49
|
+
2 +
|
|
50
|
+
2 +
|
|
51
|
+
concurrency * 2);
|
|
52
|
+
}
|
|
46
53
|
constructor(activeExecutions) {
|
|
47
54
|
this.activeExecutions = activeExecutions;
|
|
55
|
+
this.concurrency = 0;
|
|
48
56
|
}
|
|
49
57
|
async init() {
|
|
50
58
|
const { default: Bull } = await Promise.resolve().then(() => __importStar(require('bull')));
|
|
@@ -87,8 +95,8 @@ let Queue = class Queue {
|
|
|
87
95
|
const inProgressJobs = await this.getJobs(['active', 'waiting']);
|
|
88
96
|
return new Set(inProgressJobs.map((job) => job.data.executionId));
|
|
89
97
|
}
|
|
90
|
-
async process(
|
|
91
|
-
return await this.jobQueue.process(concurrency, fn);
|
|
98
|
+
async process(fn) {
|
|
99
|
+
return await this.jobQueue.process(this.concurrency, fn);
|
|
92
100
|
}
|
|
93
101
|
async ping() {
|
|
94
102
|
return await this.jobQueue.client.ping();
|
package/dist/Queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../src/Queue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iDAA4C;AAC5C,+CAMsB;AACtB,yDAAsD;AACtD,sDAA8B;AAC9B,wDAAqD;AACrD,2CAAwD;AAsBjD,IAAM,KAAK,GAAX,MAAM,KAAK;
|
|
1
|
+
{"version":3,"file":"Queue.js","sourceRoot":"","sources":["../src/Queue.ts"],"names":[],"mappings":"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"}
|
package/dist/Server.js
CHANGED
|
@@ -38,6 +38,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
38
38
|
exports.Server = void 0;
|
|
39
39
|
const typedi_1 = require("typedi");
|
|
40
40
|
const child_process_1 = require("child_process");
|
|
41
|
+
const path_1 = require("path");
|
|
41
42
|
const promises_1 = require("fs/promises");
|
|
42
43
|
const util_1 = require("util");
|
|
43
44
|
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
@@ -45,7 +46,6 @@ const express_1 = __importDefault(require("express"));
|
|
|
45
46
|
const helmet_1 = __importDefault(require("helmet"));
|
|
46
47
|
const config_1 = require("@n8n/config");
|
|
47
48
|
const n8n_core_1 = require("n8n-core");
|
|
48
|
-
const google_timezones_json_1 = __importDefault(require("google-timezones-json"));
|
|
49
49
|
const config_2 = __importDefault(require("./config"));
|
|
50
50
|
const constants_1 = require("./constants");
|
|
51
51
|
const decorators_1 = require("./decorators");
|
|
@@ -155,8 +155,8 @@ let Server = class Server extends AbstractServer_1.AbstractServer {
|
|
|
155
155
|
}
|
|
156
156
|
async configure() {
|
|
157
157
|
if (config_2.default.getEnv('endpoints.metrics.enable')) {
|
|
158
|
-
const {
|
|
159
|
-
await typedi_1.Container.get(
|
|
158
|
+
const { PrometheusMetricsService } = await Promise.resolve().then(() => __importStar(require('./metrics/prometheus-metrics.service')));
|
|
159
|
+
await typedi_1.Container.get(PrometheusMetricsService).configureMetrics(this.app);
|
|
160
160
|
}
|
|
161
161
|
const { frontendService } = this;
|
|
162
162
|
if (frontendService) {
|
|
@@ -191,7 +191,8 @@ let Server = class Server extends AbstractServer_1.AbstractServer {
|
|
|
191
191
|
await (0, helpers_1.handleMfaDisable)();
|
|
192
192
|
await this.registerAdditionalControllers();
|
|
193
193
|
typedi_1.Container.get(decorators_1.ControllerRegistry).activate(app);
|
|
194
|
-
|
|
194
|
+
const tzDataFile = (0, path_1.resolve)(constants_1.CLI_DIR, 'dist/timezones.json');
|
|
195
|
+
this.app.get(`/${this.restEndpoint}/options/timezones`, (_, res) => res.sendFile(tzDataFile));
|
|
195
196
|
if (frontendService) {
|
|
196
197
|
this.app.get(`/${this.restEndpoint}/settings`, ResponseHelper.send(async (req) => frontendService.getSettings(req.headers['push-ref'])));
|
|
197
198
|
}
|
|
@@ -253,6 +254,7 @@ let Server = class Server extends AbstractServer_1.AbstractServer {
|
|
|
253
254
|
: false,
|
|
254
255
|
});
|
|
255
256
|
const nonUIRoutes = [
|
|
257
|
+
'favicon.ico',
|
|
256
258
|
'assets',
|
|
257
259
|
'static',
|
|
258
260
|
'types',
|
package/dist/Server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA4C;AAC5C,iDAAqD;AACrD,0CAAiD;AACjD,+BAAiC;AACjC,kEAAyC;AACzC,sDAA8B;AAC9B,oDAA4B;AAC5B,wCAA2C;AAC3C,uCAA4C;
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../src/Server.ts"],"names":[],"mappings":"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"}
|
package/dist/WaitTracker.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export declare class WaitTracker {
|
|
|
16
16
|
init(): void;
|
|
17
17
|
private startTracking;
|
|
18
18
|
getWaitingExecutions(): Promise<void>;
|
|
19
|
-
stopExecution(executionId: string):
|
|
19
|
+
stopExecution(executionId: string): void;
|
|
20
20
|
startExecution(executionId: string): void;
|
|
21
21
|
stopTracking(): void;
|
|
22
22
|
}
|
package/dist/WaitTracker.js
CHANGED
|
@@ -57,16 +57,6 @@ let WaitTracker = class WaitTracker {
|
|
|
57
57
|
for (const execution of executions) {
|
|
58
58
|
const executionId = execution.id;
|
|
59
59
|
if (this.waitingExecutions[executionId] === undefined) {
|
|
60
|
-
if (!(execution.waitTill instanceof Date)) {
|
|
61
|
-
n8n_workflow_1.ErrorReporterProxy.error('Wait Till is not a date object', {
|
|
62
|
-
extra: {
|
|
63
|
-
variableType: typeof execution.waitTill,
|
|
64
|
-
},
|
|
65
|
-
});
|
|
66
|
-
if (typeof execution.waitTill === 'string') {
|
|
67
|
-
execution.waitTill = new Date(execution.waitTill);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
60
|
const triggerTime = execution.waitTill.getTime() - new Date().getTime();
|
|
71
61
|
this.waitingExecutions[executionId] = {
|
|
72
62
|
executionId,
|
|
@@ -77,7 +67,7 @@ let WaitTracker = class WaitTracker {
|
|
|
77
67
|
}
|
|
78
68
|
}
|
|
79
69
|
}
|
|
80
|
-
|
|
70
|
+
stopExecution(executionId) {
|
|
81
71
|
if (!this.waitingExecutions[executionId])
|
|
82
72
|
return;
|
|
83
73
|
clearTimeout(this.waitingExecutions[executionId].timer);
|
package/dist/WaitTracker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WaitTracker.js","sourceRoot":"","sources":["../src/WaitTracker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAqF;AACrF,mCAAiC;AAEjC,qDAAkD;AAClD,gFAA4E;AAC5E,oEAAgE;AAChE,qCAAkC;AAClC,4EAAwE;AAGjE,IAAM,WAAW,GAAjB,MAAM,WAAW;IAUvB,YACkB,MAAc,EACd,mBAAwC,EACxC,gBAAkC,EAClC,cAA8B,EAC9B,oBAA0C;QAJ1C,WAAM,GAAN,MAAM,CAAQ;QACd,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,yBAAoB,GAApB,oBAAoB,CAAsB;QAdpD,sBAAiB,GAKrB,EAAE,CAAC;IAUJ,CAAC;IAEJ,GAAG,CAAC,WAAmB;QACtB,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;IAC1D,CAAC;IAKD,IAAI;QACH,MAAM,EAAE,QAAQ,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAExE,IAAI,QAAQ;YAAE,IAAI,CAAC,aAAa,EAAE,CAAC;QAEnC,IAAI,uBAAuB,EAAE,CAAC;YAC7B,IAAI,CAAC,oBAAoB,CAAC,cAAc;iBACtC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;iBACjD,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACpD,CAAC;IACF,CAAC;IAEO,aAAa;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QAGtE,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;YACjC,KAAK,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,CAAC,EAAE,KAAK,CAAC,CAAC;QAEV,KAAK,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,oBAAoB;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAE3E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,CAAC;QAEzE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO;QACR,CAAC;QAED,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,sBAAsB,UAAU,CAAC,MAAM,uCAAuC,YAAY,EAAE,CAC5F,CAAC;QAIF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,SAAS,EAAE,CAAC;gBACvD,
|
|
1
|
+
{"version":3,"file":"WaitTracker.js","sourceRoot":"","sources":["../src/WaitTracker.ts"],"names":[],"mappings":"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"}
|
package/dist/WaitingWebhooks.js
CHANGED
|
@@ -66,6 +66,9 @@ let WaitingWebhooks = class WaitingWebhooks {
|
|
|
66
66
|
if (!execution) {
|
|
67
67
|
throw new not_found_error_1.NotFoundError(`The execution "${executionId} does not exist.`);
|
|
68
68
|
}
|
|
69
|
+
if (execution.status === 'running') {
|
|
70
|
+
throw new conflict_error_1.ConflictError(`The execution "${executionId} is running already.`);
|
|
71
|
+
}
|
|
69
72
|
if (execution.finished || execution.data.resultData.error) {
|
|
70
73
|
throw new conflict_error_1.ConflictError(`The execution "${executionId} has finished already.`);
|
|
71
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WaitingWebhooks.js","sourceRoot":"","sources":["../src/WaitingWebhooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAqD;AACrD,mCAAiC;AAGjC,iEAAmD;AACnD,2CAAwC;AAQxC,+FAAiF;AACjF,gFAA4E;AAC5E,qCAAkC;AAClC,4EAAwE;AACxE,8EAAyE;AAGlE,IAAM,eAAe,GAArB,MAAM,eAAe;IAG3B,YACoB,MAAc,EAChB,SAAoB,EACpB,mBAAwC;QAFtC,WAAM,GAAN,MAAM,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAW;QACpB,wBAAmB,GAAnB,mBAAmB,CAAqB;QALhD,iBAAY,GAAG,KAAK,CAAC;IAM5B,CAAC;IAIM,kBAAkB,CAAC,MAAc,EAAE,WAAmB;QAC/D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,MAAM,oBAAoB,WAAW,GAAG,CAAC,CAAC;IAC1F,CAAC;IAES,WAAW,CAAC,SAA6B,EAAE,OAAgB;QACpE,SAAS,CAAC,IAAI,CAAC,aAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,cAAc,CACnB,GAA0B,EAC1B,GAAqB;QAErB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAEjD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAGjD,GAAG,CAAC,MAAM,GAAG,EAAqC,CAAC;QAEnD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE;YACjF,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,MAAM,IAAI,+BAAa,CAAC,kBAAkB,WAAW,kBAAkB,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC3D,MAAM,IAAI,8BAAa,CAAC,kBAAkB,WAAW,wBAAwB,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,gBAA0B,CAAC;QAI9E,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QAGxC,SAAS,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAGpC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,GAAG,EAAE,CAAC;QAE1D,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;QAEnC,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;YAC7B,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,YAAY,CAAC,UAAU;YACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;SAC/B,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC7D,IAAI,iBAAiB,KAAK,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,+BAAa,CAAC,yCAAyC,CAAC,CAAC;QACpE,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,6BAA6B,CAAC,OAAO,EAAE,CAAC;QACrE,MAAM,WAAW,GAAG,0BAAW,CAAC,eAAe,CAC9C,QAAQ,EACR,iBAAiB,EACjB,cAAc,CACd,CAAC,IAAI,CACL,CAAC,OAAO,EAAE,EAAE,CACX,OAAO,CAAC,UAAU,KAAK,GAAG,CAAC,MAAM;YACjC,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC;YAC/B,OAAO,CAAC,kBAAkB,CAAC,cAAc,KAAK,IAAI;YAClD,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC,YAAY,CACnE,CAAC;QAEF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAG/B,MAAM,YAAY,GAAG,+BAA+B,WAAW,mEAAmE,CAAC;YACnI,MAAM,IAAI,+BAAa,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC;QAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC;QAExC,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5C,MAAM,aAAa,GAAG,SAAS,CAAC;YAChC,KAAK,cAAc,CAAC,cAAc,CACjC,QAAQ,EACR,WAAW,EACX,YAA2B,EAC3B,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,gBAAgB,EAChB,SAAS,CAAC,EAAE,EACZ,GAAG,EACH,GAAG,EAEH,CAAC,KAAmB,EAAE,IAAY,EAAE,EAAE;gBACrC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACpB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtB,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC;YACf,CAAC,CACD,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;
|
|
1
|
+
{"version":3,"file":"WaitingWebhooks.js","sourceRoot":"","sources":["../src/WaitingWebhooks.ts"],"names":[],"mappings":"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"}
|
package/dist/WorkflowRunner.js
CHANGED
|
@@ -157,6 +157,8 @@ let WorkflowRunner = class WorkflowRunner {
|
|
|
157
157
|
}
|
|
158
158
|
})
|
|
159
159
|
.catch((error) => {
|
|
160
|
+
if (error instanceof n8n_workflow_1.ExecutionCancelledError)
|
|
161
|
+
return;
|
|
160
162
|
n8n_workflow_1.ErrorReporterProxy.error(error);
|
|
161
163
|
this.logger.error('There was a problem running internal hook "onWorkflowPostExecute"', error);
|
|
162
164
|
});
|
|
@@ -288,7 +290,7 @@ let WorkflowRunner = class WorkflowRunner {
|
|
|
288
290
|
const queue = typedi_1.Container.get(Queue_1.Queue);
|
|
289
291
|
await queue.stopJob(job);
|
|
290
292
|
const hooksWorker = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
|
|
291
|
-
const error = new n8n_workflow_1.
|
|
293
|
+
const error = new n8n_workflow_1.ExecutionCancelledError(executionId);
|
|
292
294
|
await this.processError(error, new Date(), data.executionMode, executionId, hooksWorker);
|
|
293
295
|
reject(error);
|
|
294
296
|
});
|