n8n 1.72.0 → 1.73.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/active-workflow-manager.d.ts +6 -4
- package/dist/active-workflow-manager.js +38 -13
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/collaboration/collaboration.service.d.ts +3 -1
- package/dist/collaboration/collaboration.service.js +6 -3
- package/dist/collaboration/collaboration.service.js.map +1 -1
- package/dist/commands/base-command.d.ts +2 -1
- package/dist/commands/base-command.js +3 -3
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/execute-batch.js +1 -1
- package/dist/commands/execute-batch.js.map +1 -1
- package/dist/commands/start.js +3 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/config/index.d.ts +0 -1
- package/dist/config/schema.d.ts +0 -6
- package/dist/config/schema.js +0 -6
- package/dist/config/schema.js.map +1 -1
- package/dist/databases/entities/workflow-entity.d.ts +1 -1
- package/dist/databases/entities/workflow-entity.js.map +1 -1
- package/dist/databases/repositories/execution.repository.d.ts +3 -2
- package/dist/databases/repositories/execution.repository.js +4 -2
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/repositories/settings.repository.d.ts +3 -1
- package/dist/databases/repositories/settings.repository.js +6 -4
- package/dist/databases/repositories/settings.repository.js.map +1 -1
- package/dist/databases/repositories/shared-workflow.repository.d.ts +1 -1
- package/dist/databases/subscribers/user-subscriber.d.ts +1 -0
- package/dist/databases/subscribers/user-subscriber.js +6 -2
- package/dist/databases/subscribers/user-subscriber.js.map +1 -1
- package/dist/db.js +2 -1
- package/dist/db.js.map +1 -1
- package/dist/environments/source-control/source-control-import.service.ee.d.ts +3 -2
- package/dist/environments/source-control/source-control-import.service.ee.js +4 -2
- package/dist/environments/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/evaluation/test-runner/test-runner.service.ee.d.ts +4 -1
- package/dist/evaluation/test-runner/test-runner.service.ee.js +36 -11
- package/dist/evaluation/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation/test-runner/utils.ee.d.ts +2 -1
- package/dist/evaluation/test-runner/utils.ee.js +8 -6
- package/dist/evaluation/test-runner/utils.ee.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.d.ts +3 -1
- package/dist/events/relays/telemetry.event-relay.js +5 -1
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle-hooks/save-execution-progress.js +2 -2
- package/dist/execution-lifecycle-hooks/save-execution-progress.js.map +1 -1
- package/dist/expression-evaluator.js +3 -1
- package/dist/expression-evaluator.js.map +1 -1
- package/dist/license.d.ts +1 -3
- package/dist/license.js +11 -10
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.d.ts +7 -3
- package/dist/load-nodes-and-credentials.js +76 -3
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/manual-execution.service.d.ts +9 -0
- package/dist/manual-execution.service.js +112 -0
- package/dist/manual-execution.service.js.map +1 -0
- package/dist/node-types.js +1 -1
- package/dist/node-types.js.map +1 -1
- package/dist/public-api/types.d.ts +4 -1
- package/dist/public-api/types.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +10 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +14 -0
- package/dist/push/abstract.push.d.ts +3 -1
- package/dist/push/abstract.push.js +6 -3
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/push/index.d.ts +3 -3
- package/dist/push/index.js +5 -5
- package/dist/push/index.js.map +1 -1
- package/dist/push/websocket.push.js +1 -1
- package/dist/push/websocket.push.js.map +1 -1
- package/dist/response-helper.js +2 -1
- package/dist/response-helper.js.map +1 -1
- package/dist/runners/runner-ws-server.js +1 -1
- package/dist/runners/runner-ws-server.js.map +1 -1
- package/dist/runners/task-managers/task-manager.js +11 -1
- package/dist/runners/task-managers/task-manager.js.map +1 -1
- package/dist/runners/task-runner-module.d.ts +3 -1
- package/dist/runners/task-runner-module.js +5 -2
- package/dist/runners/task-runner-module.js.map +1 -1
- package/dist/scaling/job-processor.d.ts +3 -2
- package/dist/scaling/job-processor.js +4 -2
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/pubsub/publisher.service.d.ts +1 -1
- package/dist/scaling/pubsub/publisher.service.js +9 -1
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -2
- package/dist/scaling/pubsub/subscriber.service.js +10 -6
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/scaling/scaling.service.d.ts +3 -2
- package/dist/scaling/scaling.service.js +9 -6
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/server.d.ts +1 -3
- package/dist/server.js +2 -5
- package/dist/server.js.map +1 -1
- package/dist/services/credentials-tester.service.d.ts +3 -1
- package/dist/services/credentials-tester.service.js +6 -4
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/dynamic-node-parameters.service.js +6 -2
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +0 -1
- package/dist/services/frontend.service.js +1 -12
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/orchestration.service.d.ts +0 -5
- package/dist/services/orchestration.service.js +2 -18
- package/dist/services/orchestration.service.js.map +1 -1
- package/dist/services/pruning/pruning.service.js +1 -1
- package/dist/services/pruning/pruning.service.js.map +1 -1
- package/dist/shutdown/shutdown.service.d.ts +3 -2
- package/dist/shutdown/shutdown.service.js +6 -3
- package/dist/shutdown/shutdown.service.js.map +1 -1
- package/dist/user-management/email/node-mailer.d.ts +3 -1
- package/dist/user-management/email/node-mailer.js +6 -4
- package/dist/user-management/email/node-mailer.js.map +1 -1
- package/dist/wait-tracker.js +2 -3
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/live-webhooks.js +3 -1
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/test-webhook-registrations.service.d.ts +3 -3
- package/dist/webhooks/test-webhook-registrations.service.js +5 -5
- package/dist/webhooks/test-webhook-registrations.service.js.map +1 -1
- package/dist/webhooks/test-webhooks.d.ts +5 -3
- package/dist/webhooks/test-webhooks.js +11 -9
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.d.ts +3 -1
- package/dist/webhooks/waiting-webhooks.js +8 -3
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +5 -4
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook.service.d.ts +13 -4
- package/dist/webhooks/webhook.service.js +100 -3
- package/dist/webhooks/webhook.service.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +5 -5
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-helpers.d.ts +1 -2
- package/dist/workflow-helpers.js +0 -9
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.d.ts +6 -6
- package/dist/workflow-runner.js +11 -52
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +3 -1
- package/dist/workflows/workflow-execution.service.js +5 -2
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow-static-data.service.d.ts +4 -2
- package/dist/workflows/workflow-static-data.service.js +5 -3
- package/dist/workflows/workflow-static-data.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +4 -4
- package/package.json +10 -10
- package/templates/form-trigger.handlebars +5 -1
- package/dist/error-reporting.d.ts +0 -1
- package/dist/error-reporting.js +0 -137
- package/dist/error-reporting.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { TaskRunnersConfig } from '@n8n/config';
|
|
2
|
+
import { ErrorReporter } from 'n8n-core';
|
|
2
3
|
import { Logger } from '../logging/logger.service';
|
|
3
4
|
export declare class TaskRunnerModule {
|
|
4
5
|
private readonly logger;
|
|
6
|
+
private readonly errorReporter;
|
|
5
7
|
private readonly runnerConfig;
|
|
6
8
|
private taskRunnerHttpServer;
|
|
7
9
|
private taskRunnerWsServer;
|
|
8
10
|
private taskManager;
|
|
9
11
|
private taskRunnerProcess;
|
|
10
12
|
private taskRunnerProcessRestartLoopDetector;
|
|
11
|
-
constructor(logger: Logger, runnerConfig: TaskRunnersConfig);
|
|
13
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, runnerConfig: TaskRunnersConfig);
|
|
12
14
|
start(): Promise<void>;
|
|
13
15
|
stop(): Promise<void>;
|
|
14
16
|
private loadTaskManager;
|
|
@@ -44,6 +44,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.TaskRunnerModule = void 0;
|
|
46
46
|
const config_1 = require("@n8n/config");
|
|
47
|
+
const n8n_core_1 = require("n8n-core");
|
|
47
48
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
48
49
|
const a = __importStar(require("node:assert/strict"));
|
|
49
50
|
const typedi_1 = __importStar(require("typedi"));
|
|
@@ -53,12 +54,13 @@ const task_runner_process_restart_loop_detector_1 = require("../runners/task-run
|
|
|
53
54
|
const missing_auth_token_error_1 = require("./errors/missing-auth-token.error");
|
|
54
55
|
const runner_ws_server_1 = require("./runner-ws-server");
|
|
55
56
|
let TaskRunnerModule = class TaskRunnerModule {
|
|
56
|
-
constructor(logger, runnerConfig) {
|
|
57
|
+
constructor(logger, errorReporter, runnerConfig) {
|
|
57
58
|
this.logger = logger;
|
|
59
|
+
this.errorReporter = errorReporter;
|
|
58
60
|
this.runnerConfig = runnerConfig;
|
|
59
61
|
this.onRunnerRestartLoopDetected = async (error) => {
|
|
60
62
|
this.logger.error(error.message);
|
|
61
|
-
|
|
63
|
+
this.errorReporter.error(error);
|
|
62
64
|
await (0, n8n_workflow_1.sleep)(1000);
|
|
63
65
|
process.exit(1);
|
|
64
66
|
};
|
|
@@ -123,6 +125,7 @@ __decorate([
|
|
|
123
125
|
exports.TaskRunnerModule = TaskRunnerModule = __decorate([
|
|
124
126
|
(0, typedi_1.Service)(),
|
|
125
127
|
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
128
|
+
n8n_core_1.ErrorReporter,
|
|
126
129
|
config_1.TaskRunnersConfig])
|
|
127
130
|
], TaskRunnerModule);
|
|
128
131
|
//# sourceMappingURL=task-runner-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAgD;AAChD,+
|
|
1
|
+
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/runners/task-runner-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { RunningJobSummary } from '@n8n/api-types';
|
|
2
|
-
import { InstanceSettings } from 'n8n-core';
|
|
2
|
+
import { ErrorReporter, InstanceSettings } from 'n8n-core';
|
|
3
3
|
import { ExecutionRepository } from '../databases/repositories/execution.repository';
|
|
4
4
|
import { WorkflowRepository } from '../databases/repositories/workflow.repository';
|
|
5
5
|
import { Logger } from '../logging/logger.service';
|
|
@@ -7,12 +7,13 @@ import { NodeTypes } from '../node-types';
|
|
|
7
7
|
import type { Job, JobId, JobResult } from './scaling.types';
|
|
8
8
|
export declare class JobProcessor {
|
|
9
9
|
private readonly logger;
|
|
10
|
+
private readonly errorReporter;
|
|
10
11
|
private readonly executionRepository;
|
|
11
12
|
private readonly workflowRepository;
|
|
12
13
|
private readonly nodeTypes;
|
|
13
14
|
private readonly instanceSettings;
|
|
14
15
|
private readonly runningJobs;
|
|
15
|
-
constructor(logger: Logger, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, instanceSettings: InstanceSettings);
|
|
16
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, instanceSettings: InstanceSettings);
|
|
16
17
|
processJob(job: Job): Promise<JobResult>;
|
|
17
18
|
stopJob(jobId: JobId): void;
|
|
18
19
|
getRunningJobIds(): JobId[];
|
|
@@ -56,8 +56,9 @@ const logger_service_1 = require("../logging/logger.service");
|
|
|
56
56
|
const node_types_1 = require("../node-types");
|
|
57
57
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
58
58
|
let JobProcessor = class JobProcessor {
|
|
59
|
-
constructor(logger, executionRepository, workflowRepository, nodeTypes, instanceSettings) {
|
|
59
|
+
constructor(logger, errorReporter, executionRepository, workflowRepository, nodeTypes, instanceSettings) {
|
|
60
60
|
this.logger = logger;
|
|
61
|
+
this.errorReporter = errorReporter;
|
|
61
62
|
this.executionRepository = executionRepository;
|
|
62
63
|
this.workflowRepository = workflowRepository;
|
|
63
64
|
this.nodeTypes = nodeTypes;
|
|
@@ -134,7 +135,7 @@ let JobProcessor = class JobProcessor {
|
|
|
134
135
|
workflowRun = workflowExecute.processRunExecutionData(workflow);
|
|
135
136
|
}
|
|
136
137
|
else {
|
|
137
|
-
|
|
138
|
+
this.errorReporter.info(`Worker found execution ${executionId} without data`);
|
|
138
139
|
workflowExecute = new n8n_core_1.WorkflowExecute(additionalData, execution.mode);
|
|
139
140
|
workflowRun = workflowExecute.run(workflow);
|
|
140
141
|
}
|
|
@@ -186,6 +187,7 @@ exports.JobProcessor = JobProcessor;
|
|
|
186
187
|
exports.JobProcessor = JobProcessor = __decorate([
|
|
187
188
|
(0, typedi_1.Service)(),
|
|
188
189
|
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
190
|
+
n8n_core_1.ErrorReporter,
|
|
189
191
|
execution_repository_1.ExecutionRepository,
|
|
190
192
|
workflow_repository_1.WorkflowRepository,
|
|
191
193
|
node_types_1.NodeTypes,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-processor.js","sourceRoot":"","sources":["../../src/scaling/job-processor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"job-processor.js","sourceRoot":"","sources":["../../src/scaling/job-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class Publisher {
|
|
|
11
11
|
constructor(logger: Logger, redisClientService: RedisClientService, instanceSettings: InstanceSettings);
|
|
12
12
|
getClient(): SingleNodeClient | MultiNodeClient;
|
|
13
13
|
shutdown(): void;
|
|
14
|
-
publishCommand(msg:
|
|
14
|
+
publishCommand(msg: PubSub.Command): Promise<void>;
|
|
15
15
|
publishWorkerResponse(msg: PubSub.WorkerResponse): Promise<void>;
|
|
16
16
|
setIfNotExists(key: string, value: string): Promise<boolean>;
|
|
17
17
|
setExpiration(key: string, ttl: number): Promise<void>;
|
|
@@ -44,7 +44,15 @@ let Publisher = class Publisher {
|
|
|
44
44
|
selfSend: constants_1.SELF_SEND_COMMANDS.has(msg.command),
|
|
45
45
|
debounce: !constants_1.IMMEDIATE_COMMANDS.has(msg.command),
|
|
46
46
|
}));
|
|
47
|
-
|
|
47
|
+
let msgName = msg.command;
|
|
48
|
+
const metadata = { msg: msg.command, channel: 'n8n.commands' };
|
|
49
|
+
if (msg.command === 'relay-execution-lifecycle-event') {
|
|
50
|
+
const { args, type } = msg.payload;
|
|
51
|
+
msgName += ` (${type})`;
|
|
52
|
+
metadata.type = type;
|
|
53
|
+
metadata.executionId = args.executionId;
|
|
54
|
+
}
|
|
55
|
+
this.logger.debug(`Published pubsub msg: ${msgName}`, metadata);
|
|
48
56
|
}
|
|
49
57
|
async publishWorkerResponse(msg) {
|
|
50
58
|
await this.client.publish('n8n.worker-response', JSON.stringify(msg));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uCAA4C;AAC5C,mCAAiC;AAEjC,sDAA8B;AAC9B,6DAAkD;
|
|
1
|
+
{"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ export declare namespace PubSub {
|
|
|
5
5
|
export type Channel = typeof COMMAND_PUBSUB_CHANNEL | typeof WORKER_RESPONSE_PUBSUB_CHANNEL;
|
|
6
6
|
export type HandlerFn = (msg: string) => void;
|
|
7
7
|
type _ToCommand<CommandKey extends keyof PubSubCommandMap> = {
|
|
8
|
-
senderId: string;
|
|
9
|
-
targets?: string[];
|
|
10
8
|
command: CommandKey;
|
|
9
|
+
senderId?: string;
|
|
10
|
+
targets?: string[];
|
|
11
11
|
selfSend?: boolean;
|
|
12
12
|
debounce?: boolean;
|
|
13
13
|
} & (PubSubCommandMap[CommandKey] extends never ? {
|
|
@@ -66,7 +66,7 @@ let Subscriber = class Subscriber {
|
|
|
66
66
|
fallbackValue: null,
|
|
67
67
|
});
|
|
68
68
|
if (!msg) {
|
|
69
|
-
this.logger.error(
|
|
69
|
+
this.logger.error('Received malformed pubsub message', {
|
|
70
70
|
msg: str,
|
|
71
71
|
channel,
|
|
72
72
|
});
|
|
@@ -78,11 +78,15 @@ let Subscriber = class Subscriber {
|
|
|
78
78
|
(msg.senderId === hostId || (msg.targets && !msg.targets.includes(hostId)))) {
|
|
79
79
|
return null;
|
|
80
80
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
81
|
+
let msgName = 'command' in msg ? msg.command : msg.response;
|
|
82
|
+
const metadata = { msg: msgName, channel };
|
|
83
|
+
if ('command' in msg && msg.command === 'relay-execution-lifecycle-event') {
|
|
84
|
+
const { args, type } = msg.payload;
|
|
85
|
+
msgName += ` (${type})`;
|
|
86
|
+
metadata.type = type;
|
|
87
|
+
metadata.executionId = args.executionId;
|
|
88
|
+
}
|
|
89
|
+
this.logger.debug(`Received pubsub msg: ${msgName}`, metadata);
|
|
86
90
|
return msg;
|
|
87
91
|
}
|
|
88
92
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriber.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/subscriber.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+DAAuC;AACvC,uCAA4C;AAC5C,+CAAyC;AACzC,mCAAiC;AAEjC,sDAA8B;AAC9B,0DAAsD;AACtD,6DAAkD;
|
|
1
|
+
{"version":3,"file":"subscriber.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/subscriber.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { GlobalConfig } from '@n8n/config';
|
|
2
|
-
import { InstanceSettings } from 'n8n-core';
|
|
2
|
+
import { ErrorReporter, InstanceSettings } from 'n8n-core';
|
|
3
3
|
import { ActiveExecutions } from '../active-executions';
|
|
4
4
|
import { ExecutionRepository } from '../databases/repositories/execution.repository';
|
|
5
5
|
import { EventService } from '../events/event.service';
|
|
@@ -9,6 +9,7 @@ import { JobProcessor } from './job-processor';
|
|
|
9
9
|
import type { Job, JobData, JobStatus, JobId } from './scaling.types';
|
|
10
10
|
export declare class ScalingService {
|
|
11
11
|
private readonly logger;
|
|
12
|
+
private readonly errorReporter;
|
|
12
13
|
private readonly activeExecutions;
|
|
13
14
|
private readonly jobProcessor;
|
|
14
15
|
private readonly globalConfig;
|
|
@@ -17,7 +18,7 @@ export declare class ScalingService {
|
|
|
17
18
|
private readonly orchestrationService;
|
|
18
19
|
private readonly eventService;
|
|
19
20
|
private queue;
|
|
20
|
-
constructor(logger: Logger, activeExecutions: ActiveExecutions, jobProcessor: JobProcessor, globalConfig: GlobalConfig, executionRepository: ExecutionRepository, instanceSettings: InstanceSettings, orchestrationService: OrchestrationService, eventService: EventService);
|
|
21
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, activeExecutions: ActiveExecutions, jobProcessor: JobProcessor, globalConfig: GlobalConfig, executionRepository: ExecutionRepository, instanceSettings: InstanceSettings, orchestrationService: OrchestrationService, eventService: EventService);
|
|
21
22
|
setupQueue(): Promise<void>;
|
|
22
23
|
setupWorker(concurrency: number): void;
|
|
23
24
|
private reportJobProcessingError;
|
|
@@ -64,8 +64,9 @@ const utils_1 = require("../utils");
|
|
|
64
64
|
const constants_2 = require("./constants");
|
|
65
65
|
const job_processor_1 = require("./job-processor");
|
|
66
66
|
let ScalingService = class ScalingService {
|
|
67
|
-
constructor(logger, activeExecutions, jobProcessor, globalConfig, executionRepository, instanceSettings, orchestrationService, eventService) {
|
|
67
|
+
constructor(logger, errorReporter, activeExecutions, jobProcessor, globalConfig, executionRepository, instanceSettings, orchestrationService, eventService) {
|
|
68
68
|
this.logger = logger;
|
|
69
|
+
this.errorReporter = errorReporter;
|
|
69
70
|
this.activeExecutions = activeExecutions;
|
|
70
71
|
this.jobProcessor = jobProcessor;
|
|
71
72
|
this.globalConfig = globalConfig;
|
|
@@ -92,9 +93,10 @@ let ScalingService = class ScalingService {
|
|
|
92
93
|
createClient: (type) => service.createClient({ type: `${type}(bull)` }),
|
|
93
94
|
});
|
|
94
95
|
this.registerListeners();
|
|
95
|
-
|
|
96
|
+
const { isLeader, isMultiMain } = this.instanceSettings;
|
|
97
|
+
if (isLeader)
|
|
96
98
|
this.scheduleQueueRecovery();
|
|
97
|
-
if (
|
|
99
|
+
if (isMultiMain) {
|
|
98
100
|
this.orchestrationService.multiMainSetup
|
|
99
101
|
.on('leader-takeover', () => this.scheduleQueueRecovery())
|
|
100
102
|
.on('leader-stepdown', () => this.stopQueueRecovery());
|
|
@@ -130,7 +132,7 @@ let ScalingService = class ScalingService {
|
|
|
130
132
|
errorStack: error.stack ?? '',
|
|
131
133
|
};
|
|
132
134
|
await job.progress(msg);
|
|
133
|
-
|
|
135
|
+
this.errorReporter.error(error, { executionId });
|
|
134
136
|
throw error;
|
|
135
137
|
}
|
|
136
138
|
async stop() {
|
|
@@ -141,7 +143,7 @@ let ScalingService = class ScalingService {
|
|
|
141
143
|
await this.stopWorker();
|
|
142
144
|
}
|
|
143
145
|
async stopMain() {
|
|
144
|
-
if (this.
|
|
146
|
+
if (this.instanceSettings.isSingleMain) {
|
|
145
147
|
await this.queue.pause(true, true);
|
|
146
148
|
this.logger.debug('Queue paused');
|
|
147
149
|
}
|
|
@@ -308,7 +310,7 @@ let ScalingService = class ScalingService {
|
|
|
308
310
|
get isQueueMetricsEnabled() {
|
|
309
311
|
return (this.globalConfig.endpoints.metrics.includeQueueMetrics &&
|
|
310
312
|
this.instanceSettings.instanceType === 'main' &&
|
|
311
|
-
|
|
313
|
+
this.instanceSettings.isSingleMain);
|
|
312
314
|
}
|
|
313
315
|
scheduleQueueMetrics() {
|
|
314
316
|
if (!this.isQueueMetricsEnabled || this.queueMetricsInterval)
|
|
@@ -391,6 +393,7 @@ __decorate([
|
|
|
391
393
|
exports.ScalingService = ScalingService = __decorate([
|
|
392
394
|
(0, typedi_1.Service)(),
|
|
393
395
|
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
396
|
+
n8n_core_1.ErrorReporter,
|
|
394
397
|
active_executions_1.ActiveExecutions,
|
|
395
398
|
job_processor_1.JobProcessor,
|
|
396
399
|
config_1.GlobalConfig,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaling.service.js","sourceRoot":"","sources":["../../src/scaling/scaling.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"scaling.service.js","sourceRoot":"","sources":["../../src/scaling/scaling.service.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ import { AbstractServer } from './abstract-server';
|
|
|
3
3
|
import { EventService } from './events/event.service';
|
|
4
4
|
import { LoadNodesAndCredentials } from './load-nodes-and-credentials';
|
|
5
5
|
import { PostHogClient } from './posthog';
|
|
6
|
-
import { OrchestrationService } from './services/orchestration.service';
|
|
7
6
|
import './controllers/active-workflows.controller';
|
|
8
7
|
import './controllers/annotation-tags.controller.ee';
|
|
9
8
|
import './controllers/auth.controller';
|
|
@@ -40,14 +39,13 @@ import './workflows/workflow-history/workflow-history.controller.ee';
|
|
|
40
39
|
import './workflows/workflows.controller';
|
|
41
40
|
export declare class Server extends AbstractServer {
|
|
42
41
|
private readonly loadNodesAndCredentials;
|
|
43
|
-
private readonly orchestrationService;
|
|
44
42
|
private readonly postHogClient;
|
|
45
43
|
private readonly eventService;
|
|
46
44
|
private readonly instanceSettings;
|
|
47
45
|
private endpointPresetCredentials;
|
|
48
46
|
private presetCredentialsLoaded;
|
|
49
47
|
private frontendService?;
|
|
50
|
-
constructor(loadNodesAndCredentials: LoadNodesAndCredentials,
|
|
48
|
+
constructor(loadNodesAndCredentials: LoadNodesAndCredentials, postHogClient: PostHogClient, eventService: EventService, instanceSettings: InstanceSettings);
|
|
51
49
|
start(): Promise<void>;
|
|
52
50
|
private registerAdditionalControllers;
|
|
53
51
|
configure(): Promise<void>;
|
package/dist/server.js
CHANGED
|
@@ -68,7 +68,6 @@ const posthog_1 = require("./posthog");
|
|
|
68
68
|
const public_api_1 = require("./public-api");
|
|
69
69
|
const push_1 = require("./push");
|
|
70
70
|
const ResponseHelper = __importStar(require("./response-helper"));
|
|
71
|
-
const orchestration_service_1 = require("./services/orchestration.service");
|
|
72
71
|
require("./controllers/active-workflows.controller");
|
|
73
72
|
require("./controllers/annotation-tags.controller.ee");
|
|
74
73
|
require("./controllers/auth.controller");
|
|
@@ -104,10 +103,9 @@ require("./evaluation/test-runs.controller.ee");
|
|
|
104
103
|
require("./workflows/workflow-history/workflow-history.controller.ee");
|
|
105
104
|
require("./workflows/workflows.controller");
|
|
106
105
|
let Server = class Server extends abstract_server_1.AbstractServer {
|
|
107
|
-
constructor(loadNodesAndCredentials,
|
|
106
|
+
constructor(loadNodesAndCredentials, postHogClient, eventService, instanceSettings) {
|
|
108
107
|
super();
|
|
109
108
|
this.loadNodesAndCredentials = loadNodesAndCredentials;
|
|
110
|
-
this.orchestrationService = orchestrationService;
|
|
111
109
|
this.postHogClient = postHogClient;
|
|
112
110
|
this.eventService = eventService;
|
|
113
111
|
this.instanceSettings = instanceSettings;
|
|
@@ -129,7 +127,7 @@ let Server = class Server extends abstract_server_1.AbstractServer {
|
|
|
129
127
|
this.eventService.emit('server-started');
|
|
130
128
|
}
|
|
131
129
|
async registerAdditionalControllers() {
|
|
132
|
-
if (!constants_1.inProduction && this.
|
|
130
|
+
if (!constants_1.inProduction && this.instanceSettings.isMultiMain) {
|
|
133
131
|
await Promise.resolve().then(() => __importStar(require('./controllers/debug.controller')));
|
|
134
132
|
}
|
|
135
133
|
if ((0, helpers_ee_1.isLdapEnabled)()) {
|
|
@@ -333,7 +331,6 @@ exports.Server = Server;
|
|
|
333
331
|
exports.Server = Server = __decorate([
|
|
334
332
|
(0, typedi_1.Service)(),
|
|
335
333
|
__metadata("design:paramtypes", [load_nodes_and_credentials_1.LoadNodesAndCredentials,
|
|
336
|
-
orchestration_service_1.OrchestrationService,
|
|
337
334
|
posthog_1.PostHogClient,
|
|
338
335
|
event_service_1.EventService,
|
|
339
336
|
n8n_core_1.InstanceSettings])
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ErrorReporter } from 'n8n-core';
|
|
1
2
|
import type { ICredentialsDecrypted, ICredentialTestFunction, ICredentialTestRequestData, INodeCredentialTestResult } from 'n8n-workflow';
|
|
2
3
|
import { CredentialTypes } from '../credential-types';
|
|
3
4
|
import type { User } from '../databases/entities/user';
|
|
@@ -6,10 +7,11 @@ import { NodeTypes } from '../node-types';
|
|
|
6
7
|
import { CredentialsHelper } from '../credentials-helper';
|
|
7
8
|
export declare class CredentialsTester {
|
|
8
9
|
private readonly logger;
|
|
10
|
+
private readonly errorReporter;
|
|
9
11
|
private readonly credentialTypes;
|
|
10
12
|
private readonly nodeTypes;
|
|
11
13
|
private readonly credentialsHelper;
|
|
12
|
-
constructor(logger: Logger, credentialTypes: CredentialTypes, nodeTypes: NodeTypes, credentialsHelper: CredentialsHelper);
|
|
14
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, credentialTypes: CredentialTypes, nodeTypes: NodeTypes, credentialsHelper: CredentialsHelper);
|
|
13
15
|
private static hasAccessToken;
|
|
14
16
|
getCredentialTestFunction(credentialType: string): ICredentialTestFunction | ICredentialTestRequestData | undefined;
|
|
15
17
|
testCredentials(user: User, credentialType: string, credentialsDecrypted: ICredentialsDecrypted): Promise<INodeCredentialTestResult>;
|
|
@@ -84,8 +84,9 @@ const mockNodeTypes = {
|
|
|
84
84
|
},
|
|
85
85
|
};
|
|
86
86
|
let CredentialsTester = CredentialsTester_1 = class CredentialsTester {
|
|
87
|
-
constructor(logger, credentialTypes, nodeTypes, credentialsHelper) {
|
|
87
|
+
constructor(logger, errorReporter, credentialTypes, nodeTypes, credentialsHelper) {
|
|
88
88
|
this.logger = logger;
|
|
89
|
+
this.errorReporter = errorReporter;
|
|
89
90
|
this.credentialTypes = credentialTypes;
|
|
90
91
|
this.nodeTypes = nodeTypes;
|
|
91
92
|
this.credentialsHelper = credentialsHelper;
|
|
@@ -250,13 +251,13 @@ let CredentialsTester = CredentialsTester_1 = class CredentialsTester {
|
|
|
250
251
|
},
|
|
251
252
|
};
|
|
252
253
|
const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id, node.parameters);
|
|
253
|
-
const routingNode = new
|
|
254
|
+
const routingNode = new n8n_core_1.RoutingNode(workflow, node, connectionInputData, runExecutionData ?? null, additionalData, mode);
|
|
254
255
|
let response;
|
|
255
256
|
try {
|
|
256
|
-
response = await routingNode.runNode(inputData, runIndex, nodeTypeCopy, { node, data: {}, source: null },
|
|
257
|
+
response = await routingNode.runNode(inputData, runIndex, nodeTypeCopy, { node, data: {}, source: null }, credentialsDecrypted);
|
|
257
258
|
}
|
|
258
259
|
catch (error) {
|
|
259
|
-
|
|
260
|
+
this.errorReporter.error(error);
|
|
260
261
|
if (error.cause?.response) {
|
|
261
262
|
const errorResponseData = {
|
|
262
263
|
statusCode: error.cause.response.status,
|
|
@@ -321,6 +322,7 @@ exports.CredentialsTester = CredentialsTester;
|
|
|
321
322
|
exports.CredentialsTester = CredentialsTester = CredentialsTester_1 = __decorate([
|
|
322
323
|
(0, typedi_1.Service)(),
|
|
323
324
|
__metadata("design:paramtypes", [logger_service_1.Logger,
|
|
325
|
+
n8n_core_1.ErrorReporter,
|
|
324
326
|
credential_types_1.CredentialTypes,
|
|
325
327
|
node_types_1.NodeTypes,
|
|
326
328
|
credentials_helper_1.CredentialsHelper])
|