n8n 1.46.0 → 1.47.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 +3 -1
- package/dist/ActiveExecutions.js +17 -3
- package/dist/ActiveExecutions.js.map +1 -1
- package/dist/Interfaces.d.ts +2 -0
- package/dist/Interfaces.js.map +1 -1
- package/dist/InternalHooks.d.ts +9 -25
- package/dist/InternalHooks.js +129 -488
- package/dist/InternalHooks.js.map +1 -1
- package/dist/Ldap/helpers.d.ts +0 -1
- package/dist/Ldap/helpers.js +4 -7
- package/dist/Ldap/helpers.js.map +1 -1
- package/dist/License.js +4 -0
- package/dist/License.js.map +1 -1
- package/dist/PublicApi/v1/handlers/credentials/credentials.service.js +13 -0
- package/dist/PublicApi/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/PublicApi/v1/handlers/executions/executions.handler.js +12 -0
- package/dist/PublicApi/v1/handlers/executions/executions.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js +10 -0
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/PublicApi/v1/openapi.yml +2 -0
- package/dist/Queue.d.ts +1 -0
- package/dist/Queue.js +10 -10
- package/dist/Queue.js.map +1 -1
- package/dist/Server.d.ts +36 -3
- package/dist/Server.js +67 -104
- package/dist/Server.js.map +1 -1
- package/dist/UserManagement/email/UserManagementMailer.js +13 -1
- package/dist/UserManagement/email/UserManagementMailer.js.map +1 -1
- package/dist/WaitTracker.js +6 -8
- package/dist/WaitTracker.js.map +1 -1
- package/dist/WorkflowExecuteAdditionalData.js +33 -9
- package/dist/WorkflowExecuteAdditionalData.js.map +1 -1
- package/dist/WorkflowRunner.d.ts +3 -1
- package/dist/WorkflowRunner.js +14 -3
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/auth/methods/ldap.js +2 -0
- package/dist/auth/methods/ldap.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/start.d.ts +1 -2
- package/dist/commands/start.js +31 -19
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/worker.js +5 -2
- package/dist/commands/worker.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.d.ts +33 -0
- package/dist/concurrency/concurrency-control.service.js +120 -0
- package/dist/concurrency/concurrency-control.service.js.map +1 -0
- package/dist/concurrency/concurrency-queue.d.ts +12 -0
- package/dist/concurrency/concurrency-queue.js +57 -0
- package/dist/concurrency/concurrency-queue.js.map +1 -0
- package/dist/config/index.d.ts +7 -0
- package/dist/config/schema.d.ts +22 -0
- package/dist/config/schema.js +23 -1
- package/dist/config/schema.js.map +1 -1
- package/dist/config/types.d.ts +2 -1
- package/dist/controllers/auth.controller.d.ts +3 -1
- package/dist/controllers/auth.controller.js +9 -5
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/communityPackages.controller.d.ts +3 -1
- package/dist/controllers/communityPackages.controller.js +40 -2
- package/dist/controllers/communityPackages.controller.js.map +1 -1
- package/dist/controllers/invitation.controller.d.ts +3 -1
- package/dist/controllers/invitation.controller.js +6 -2
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/me.controller.d.ts +3 -1
- package/dist/controllers/me.controller.js +14 -19
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/passwordReset.controller.d.ts +3 -1
- package/dist/controllers/passwordReset.controller.js +11 -6
- package/dist/controllers/passwordReset.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +3 -1
- package/dist/controllers/users.controller.js +6 -2
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +9 -1
- package/dist/credentials/credentials.controller.js +44 -2
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +15 -1
- package/dist/credentials/credentials.service.js +37 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/databases/entities/User.d.ts +1 -1
- package/dist/databases/repositories/credentials.repository.d.ts +9 -1
- package/dist/databases/repositories/credentials.repository.js +36 -2
- package/dist/databases/repositories/credentials.repository.js.map +1 -1
- package/dist/databases/repositories/execution.repository.d.ts +5 -1
- package/dist/databases/repositories/execution.repository.js +36 -9
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/repositories/user.repository.d.ts +2 -0
- package/dist/databases/repositories/user.repository.js +20 -0
- package/dist/databases/repositories/user.repository.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +1 -1
- package/dist/databases/utils/generators.js +2 -1
- package/dist/databases/utils/generators.js.map +1 -1
- package/dist/decorators/Licensed.d.ts +1 -1
- package/dist/decorators/Licensed.js +4 -9
- package/dist/decorators/Licensed.js.map +1 -1
- package/dist/decorators/Middleware.js +3 -6
- package/dist/decorators/Middleware.js.map +1 -1
- package/dist/decorators/Redactable.d.ts +3 -0
- package/dist/decorators/Redactable.js +29 -0
- package/dist/decorators/Redactable.js.map +1 -0
- package/dist/decorators/RestController.js +3 -2
- package/dist/decorators/RestController.js.map +1 -1
- package/dist/decorators/Route.d.ts +1 -1
- package/dist/decorators/Route.js +9 -14
- package/dist/decorators/Route.js.map +1 -1
- package/dist/decorators/Scoped.d.ts +2 -2
- package/dist/decorators/Scoped.js +6 -19
- package/dist/decorators/Scoped.js.map +1 -1
- package/dist/decorators/controller.registry.d.ts +16 -0
- package/dist/decorators/controller.registry.js +116 -0
- package/dist/decorators/controller.registry.js.map +1 -0
- package/dist/decorators/index.d.ts +1 -1
- package/dist/decorators/index.js +3 -3
- package/dist/decorators/index.js.map +1 -1
- package/dist/decorators/types.d.ts +16 -14
- package/dist/errors/invalid-concurrency-limit.error.d.ts +4 -0
- package/dist/errors/invalid-concurrency-limit.error.js +11 -0
- package/dist/errors/invalid-concurrency-limit.error.js.map +1 -0
- package/dist/errors/queued-execution-retry.error.d.ts +4 -0
- package/dist/errors/queued-execution-retry.error.js +13 -0
- package/dist/errors/queued-execution-retry.error.js.map +1 -0
- package/dist/errors/redactable.error.d.ts +4 -0
- package/dist/errors/redactable.error.js +11 -0
- package/dist/errors/redactable.error.js.map +1 -0
- package/dist/errors/unknown-execution-mode.error.d.ts +4 -0
- package/dist/errors/unknown-execution-mode.error.js +11 -0
- package/dist/errors/unknown-execution-mode.error.js.map +1 -0
- package/dist/eventbus/MessageEventBus/MessageEventBus.d.ts +1 -1
- package/dist/eventbus/MessageEventBus/MessageEventBus.js +5 -11
- package/dist/eventbus/MessageEventBus/MessageEventBus.js.map +1 -1
- package/dist/eventbus/audit-event-relay.service.d.ts +35 -0
- package/dist/eventbus/audit-event-relay.service.js +392 -0
- package/dist/eventbus/audit-event-relay.service.js.map +1 -0
- package/dist/eventbus/event-relay.service.d.ts +7 -0
- package/dist/eventbus/event-relay.service.js +26 -0
- package/dist/eventbus/event-relay.service.js.map +1 -0
- package/dist/eventbus/event.types.d.ts +149 -0
- package/dist/eventbus/event.types.js +3 -0
- package/dist/eventbus/event.types.js.map +1 -0
- package/dist/executions/execution-recovery.service.d.ts +18 -2
- package/dist/executions/execution-recovery.service.js +129 -9
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +8 -3
- package/dist/executions/execution.service.js +40 -14
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.types.d.ts +8 -1
- package/dist/executions/executionHelpers.d.ts +0 -1
- package/dist/executions/executionHelpers.js +1 -8
- package/dist/executions/executionHelpers.js.map +1 -1
- package/dist/executions/executions.controller.d.ts +1 -1
- package/dist/executions/executions.controller.js +1 -1
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/license/license.controller.d.ts +2 -1
- package/dist/license/license.controller.js +10 -0
- package/dist/license/license.controller.js.map +1 -1
- package/dist/license/license.service.d.ts +5 -1
- package/dist/license/license.service.js +18 -2
- package/dist/license/license.service.js.map +1 -1
- package/dist/push/index.d.ts +1 -1
- package/dist/requests.d.ts +6 -6
- package/dist/requests.js.map +1 -1
- package/dist/services/cache/cache.service.js +10 -4
- package/dist/services/cache/cache.service.js.map +1 -1
- package/dist/services/orchestration/helpers.js +2 -2
- package/dist/services/orchestration/helpers.js.map +1 -1
- package/dist/services/orchestration/main/MultiMainSetup.ee.d.ts +4 -2
- package/dist/services/orchestration/main/MultiMainSetup.ee.js +8 -4
- package/dist/services/orchestration/main/MultiMainSetup.ee.js.map +1 -1
- package/dist/services/orchestration/main/orchestration.handler.main.service.js +3 -3
- package/dist/services/orchestration/main/orchestration.handler.main.service.js.map +1 -1
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.js +2 -2
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.js.map +1 -1
- package/dist/services/orchestration/worker/handleCommandMessageWorker.js +4 -4
- package/dist/services/orchestration/worker/handleCommandMessageWorker.js.map +1 -1
- package/dist/services/pruning.service.d.ts +4 -1
- package/dist/services/pruning.service.js +14 -2
- package/dist/services/pruning.service.js.map +1 -1
- package/dist/services/redis/RedisConstants.d.ts +6 -0
- package/dist/services/redis/RedisConstants.js +10 -0
- package/dist/services/redis/RedisConstants.js.map +1 -0
- package/dist/services/redis/RedisServiceBaseClasses.d.ts +3 -1
- package/dist/services/redis/RedisServiceBaseClasses.js +6 -4
- package/dist/services/redis/RedisServiceBaseClasses.js.map +1 -1
- package/dist/services/redis/RedisServicePubSubPublisher.js +3 -3
- package/dist/services/redis/RedisServicePubSubPublisher.js.map +1 -1
- package/dist/services/redis/RedisServicePubSubSubscriber.js +5 -5
- package/dist/services/redis/RedisServicePubSubSubscriber.js.map +1 -1
- package/dist/services/redis/redis-client.service.d.ts +20 -0
- package/dist/services/redis/redis-client.service.js +125 -0
- package/dist/services/redis/redis-client.service.js.map +1 -0
- package/dist/services/role.service.d.ts +5 -0
- package/dist/services/role.service.js.map +1 -1
- package/dist/services/usageMetrics.service.d.ts +6 -1
- package/dist/services/usageMetrics.service.js +10 -2
- package/dist/services/usageMetrics.service.js.map +1 -1
- package/dist/services/user.service.d.ts +3 -1
- package/dist/services/user.service.js +10 -2
- package/dist/services/user.service.js.map +1 -1
- package/dist/sso/saml/routes/saml.controller.ee.d.ts +3 -3
- package/dist/sso/saml/routes/saml.controller.ee.js +9 -9
- package/dist/sso/saml/routes/saml.controller.ee.js.map +1 -1
- package/dist/sso/saml/samlHelpers.d.ts +1 -2
- package/dist/sso/saml/samlHelpers.js +11 -31
- package/dist/sso/saml/samlHelpers.js.map +1 -1
- package/dist/types/commands.types.d.ts +2 -2
- package/dist/utils.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +1 -2
- package/dist/workflows/workflow.service.d.ts +4 -2
- package/dist/workflows/workflow.service.ee.js +5 -6
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +11 -2
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflowExecution.service.d.ts +1 -1
- package/dist/workflows/workflowExecution.service.js +2 -1
- package/dist/workflows/workflowExecution.service.js.map +1 -1
- package/dist/workflows/workflowStaticData.service.js +17 -2
- package/dist/workflows/workflowStaticData.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +15 -13
- package/dist/workflows/workflows.controller.js +6 -2
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/dist/workflows/workflows.types.d.ts +2 -3
- package/package.json +10 -10
- package/templates/oauth-callback.handlebars +2 -1
- package/templates/oauth-error-callback.handlebars +4 -1
- package/dist/decorators/constants.d.ts +0 -5
- package/dist/decorators/constants.js +0 -9
- package/dist/decorators/constants.js.map +0 -1
- package/dist/decorators/registerController.d.ts +0 -7
- package/dist/decorators/registerController.js +0 -83
- package/dist/decorators/registerController.js.map +0 -1
- package/dist/services/redis/RedisServiceHelper.d.ts +0 -17
- package/dist/services/redis/RedisServiceHelper.js +0 -151
- package/dist/services/redis/RedisServiceHelper.js.map +0 -1
|
@@ -8,14 +8,19 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.LicenseService = exports.LicenseErrors = void 0;
|
|
13
16
|
const typedi_1 = require("typedi");
|
|
17
|
+
const axios_1 = __importDefault(require("axios"));
|
|
14
18
|
const Logger_1 = require("../Logger");
|
|
15
19
|
const License_1 = require("../License");
|
|
16
20
|
const InternalHooks_1 = require("../InternalHooks");
|
|
17
21
|
const workflow_repository_1 = require("../databases/repositories/workflow.repository");
|
|
18
22
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
23
|
+
const url_service_1 = require("../services/url.service");
|
|
19
24
|
exports.LicenseErrors = {
|
|
20
25
|
SCHEMA_VALIDATION: 'Activation key is in the wrong format',
|
|
21
26
|
RESERVATION_EXHAUSTED: 'Activation key has been used too many times. Please contact sales@n8n.io if you would like to extend it',
|
|
@@ -25,11 +30,12 @@ exports.LicenseErrors = {
|
|
|
25
30
|
RESERVATION_DUPLICATE: 'Activation key has already been used on this instance',
|
|
26
31
|
};
|
|
27
32
|
let LicenseService = class LicenseService {
|
|
28
|
-
constructor(logger, license, internalHooks, workflowRepository) {
|
|
33
|
+
constructor(logger, license, internalHooks, workflowRepository, urlService) {
|
|
29
34
|
this.logger = logger;
|
|
30
35
|
this.license = license;
|
|
31
36
|
this.internalHooks = internalHooks;
|
|
32
37
|
this.workflowRepository = workflowRepository;
|
|
38
|
+
this.urlService = urlService;
|
|
33
39
|
}
|
|
34
40
|
async getLicenseData() {
|
|
35
41
|
var _a;
|
|
@@ -49,6 +55,15 @@ let LicenseService = class LicenseService {
|
|
|
49
55
|
},
|
|
50
56
|
};
|
|
51
57
|
}
|
|
58
|
+
async requestEnterpriseTrial(user) {
|
|
59
|
+
await axios_1.default.post('https://enterprise.n8n.io/enterprise-trial', {
|
|
60
|
+
licenseType: 'enterprise',
|
|
61
|
+
firstName: user.firstName,
|
|
62
|
+
lastName: user.lastName,
|
|
63
|
+
email: user.email,
|
|
64
|
+
instanceUrl: this.urlService.getWebhookBaseUrl(),
|
|
65
|
+
});
|
|
66
|
+
}
|
|
52
67
|
getManagementJwt() {
|
|
53
68
|
return this.license.getManagementJwt();
|
|
54
69
|
}
|
|
@@ -88,6 +103,7 @@ exports.LicenseService = LicenseService = __decorate([
|
|
|
88
103
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
89
104
|
License_1.License,
|
|
90
105
|
InternalHooks_1.InternalHooks,
|
|
91
|
-
workflow_repository_1.WorkflowRepository
|
|
106
|
+
workflow_repository_1.WorkflowRepository,
|
|
107
|
+
url_service_1.UrlService])
|
|
92
108
|
], LicenseService);
|
|
93
109
|
//# sourceMappingURL=license.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.service.js","sourceRoot":"","sources":["../../src/license/license.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"license.service.js","sourceRoot":"","sources":["../../src/license/license.service.ts"],"names":[],"mappings":"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"}
|
package/dist/push/index.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ export declare class Push extends EventEmitter {
|
|
|
16
16
|
handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse): void;
|
|
17
17
|
broadcast(type: IPushDataType, data?: unknown): void;
|
|
18
18
|
send(type: IPushDataType, data: unknown, pushRef: string): void;
|
|
19
|
-
getBackend():
|
|
19
|
+
getBackend(): SSEPush | WebSocketPush;
|
|
20
20
|
sendToUsers(type: IPushDataType, data: unknown, userIds: Array<User['id']>): void;
|
|
21
21
|
onShutdown(): void;
|
|
22
22
|
}
|
package/dist/requests.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ import type { WorkflowHistory } from './databases/entities/WorkflowHistory';
|
|
|
10
10
|
import type { Project, ProjectType } from './databases/entities/Project';
|
|
11
11
|
import type { ProjectRole } from './databases/entities/ProjectRelation';
|
|
12
12
|
import type { Scope } from '@n8n/permissions';
|
|
13
|
+
import type { ScopesField } from './services/role.service';
|
|
13
14
|
export declare class UserUpdatePayload implements Pick<User, 'email' | 'firstName' | 'lastName'> {
|
|
14
15
|
email: string;
|
|
15
16
|
firstName: string;
|
|
@@ -56,9 +57,6 @@ export declare namespace ListQuery {
|
|
|
56
57
|
ownedBy: SlimUser | null;
|
|
57
58
|
homeProject: SlimProject | null;
|
|
58
59
|
};
|
|
59
|
-
type ScopesField = {
|
|
60
|
-
scopes: Scope[];
|
|
61
|
-
};
|
|
62
60
|
export type Plain = BaseFields;
|
|
63
61
|
export type WithSharing = BaseFields & SharedField;
|
|
64
62
|
export type WithOwnership = BaseFields & OwnedByField;
|
|
@@ -78,9 +76,6 @@ export declare namespace ListQuery {
|
|
|
78
76
|
type SharedWithField = {
|
|
79
77
|
sharedWithProjects: SlimProject[];
|
|
80
78
|
};
|
|
81
|
-
type ScopesField = {
|
|
82
|
-
scopes: Scope[];
|
|
83
|
-
};
|
|
84
79
|
export type WithSharing = CredentialsEntity & SharedField;
|
|
85
80
|
export type WithOwnedByAndSharedWith = CredentialsEntity & OwnedByField & SharedWithField & SharedField;
|
|
86
81
|
export type WithScopes = CredentialsEntity & ScopesField & SharedField;
|
|
@@ -135,6 +130,11 @@ export declare namespace CredentialRequest {
|
|
|
135
130
|
}, {}, {
|
|
136
131
|
destinationProjectId: string;
|
|
137
132
|
}>;
|
|
133
|
+
type ForWorkflow = AuthenticatedRequest<{}, {}, {}, {
|
|
134
|
+
workflowId: string;
|
|
135
|
+
} | {
|
|
136
|
+
projectId: string;
|
|
137
|
+
}>;
|
|
138
138
|
}
|
|
139
139
|
export declare namespace MeRequest {
|
|
140
140
|
type UserSettingsUpdate = AuthenticatedRequest<{}, {}, UserSettingsUpdatePayload>;
|
package/dist/requests.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":";;;;;;;;;;;;AAaA,yDAA2C;AAC3C,qDAAyF;AACzF,iEAAmD;
|
|
1
|
+
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":";;;;;;;;;;;;AAaA,yDAA2C;AAC3C,qDAAyF;AACzF,iEAAmD;AAanD,MAAa,iBAAiB;CAgB7B;AAhBD,8CAgBC;AAbA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;;gDACI;AAMd;IAJC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAK,GAAE;IACP,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC;IAC3D,IAAA,wBAAM,EAAC,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,kEAAkE,EAAE,CAAC;;oDAC7E;AAMlB;IAJC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAK,GAAE;IACP,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC;IAC1D,IAAA,wBAAM,EAAC,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,iEAAiE,EAAE,CAAC;;mDAC7E;AAGlB,MAAa,yBAAyB;CAUrC;AAVD,8DAUC;AANA;IAHC,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,EAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC;IAC3D,IAAA,4BAAU,GAAE;;gEACW;AAKxB;IAHC,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,EAAC,EAAE,OAAO,EAAE,yCAAyC,EAAE,CAAC;IACjE,IAAA,4BAAU,GAAE;;sEACiB;AAG/B,MAAa,qBAAqB;CAIjC;AAJD,sDAIC;AADA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,sBAAI,EAAC,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;;0DACZ;AAwG7B,SAAgB,UAAU,CACzB,SAAwE;IAExE,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;AAC7C,CAAC;AAJD,gCAIC"}
|
|
@@ -34,11 +34,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
35
|
exports.CacheService = void 0;
|
|
36
36
|
const node_events_1 = __importDefault(require("node:events"));
|
|
37
|
-
const typedi_1 = require("typedi");
|
|
37
|
+
const typedi_1 = __importStar(require("typedi"));
|
|
38
38
|
const cache_manager_1 = require("cache-manager");
|
|
39
39
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
40
40
|
const config_1 = __importDefault(require("../../config"));
|
|
41
|
-
const RedisServiceHelper_1 = require("../../services/redis/RedisServiceHelper");
|
|
42
41
|
const uncacheable_value_error_1 = require("../../errors/cache-errors/uncacheable-value.error");
|
|
43
42
|
const malformed_refresh_value_error_1 = require("../../errors/cache-errors/malformed-refresh-value.error");
|
|
44
43
|
const constants_1 = require("../../constants");
|
|
@@ -49,8 +48,15 @@ let CacheService = class CacheService extends node_events_1.default {
|
|
|
49
48
|
const ttl = config_1.default.getEnv('cache.redis.ttl');
|
|
50
49
|
const useRedis = backend === 'redis' || (backend === 'auto' && mode === 'queue');
|
|
51
50
|
if (useRedis) {
|
|
52
|
-
const
|
|
53
|
-
const
|
|
51
|
+
const { RedisClientService } = await Promise.resolve().then(() => __importStar(require('../redis/redis-client.service')));
|
|
52
|
+
const redisClientService = typedi_1.default.get(RedisClientService);
|
|
53
|
+
const prefixBase = config_1.default.getEnv('redis.prefix');
|
|
54
|
+
const cachePrefix = config_1.default.getEnv('cache.redis.prefix');
|
|
55
|
+
const prefix = redisClientService.toValidPrefix(`${prefixBase}:${cachePrefix}:`);
|
|
56
|
+
const redisClient = redisClientService.createClient({
|
|
57
|
+
type: 'client(cache)',
|
|
58
|
+
extraOptions: { keyPrefix: prefix },
|
|
59
|
+
});
|
|
54
60
|
const { redisStoreUsingClient } = await Promise.resolve().then(() => __importStar(require('../../services/cache/redis.cache-manager')));
|
|
55
61
|
const redisStore = redisStoreUsingClient(redisClient, { ttl });
|
|
56
62
|
const redisCache = await (0, cache_manager_1.caching)(redisStore);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/services/cache/cache.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/services/cache/cache.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ exports.getOsCpuString = exports.debounceMessageReceiver = exports.messageToRedi
|
|
|
27
27
|
const typedi_1 = require("typedi");
|
|
28
28
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
29
29
|
const Logger_1 = require("../../Logger");
|
|
30
|
-
const
|
|
30
|
+
const RedisConstants_1 = require("../redis/RedisConstants");
|
|
31
31
|
const os = __importStar(require("os"));
|
|
32
32
|
function messageToRedisServiceCommandObject(messageString) {
|
|
33
33
|
if (!messageString)
|
|
@@ -37,7 +37,7 @@ function messageToRedisServiceCommandObject(messageString) {
|
|
|
37
37
|
message = (0, n8n_workflow_1.jsonParse)(messageString);
|
|
38
38
|
}
|
|
39
39
|
catch {
|
|
40
|
-
typedi_1.Container.get(Logger_1.Logger).debug(`Received invalid message via channel ${
|
|
40
|
+
typedi_1.Container.get(Logger_1.Logger).debug(`Received invalid message via channel ${RedisConstants_1.COMMAND_REDIS_CHANNEL}: "${messageString}"`);
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
return message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/services/orchestration/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,+CAAyC;AACzC,qCAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/services/orchestration/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAmC;AACnC,+CAAyC;AACzC,qCAAkC;AAElC,4DAAgE;AAChE,uCAAyB;AAMzB,SAAgB,kCAAkC,CAAC,aAAqB;IACvE,IAAI,CAAC,aAAa;QAAE,OAAO;IAC3B,IAAI,OAAkC,CAAC;IACvC,IAAI,CAAC;QACJ,OAAO,GAAG,IAAA,wBAAS,EAA4B,aAAa,CAAC,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACR,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,KAAK,CAC1B,wCAAwC,sCAAqB,MAAM,aAAa,GAAG,CACnF,CAAC;QACF,OAAO;IACR,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAZD,gFAYC;AAED,MAAM,YAAY,GAAoC,EAAE,CAAC;AAEzD,SAAgB,uBAAuB,CAAC,OAAkC,EAAE,UAAkB,GAAG;IAChG,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,gBAAgB,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;QAC9E,OAAO,KAAK,CAAC;IACd,CAAC;IACD,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC;IACpC,OAAO,IAAI,CAAC;AACb,CAAC;AARD,0DAQC;AAED,SAAgB,cAAc;IAC7B,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;IACvB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,aAAa,CAAC;IAC5C,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;AACrE,CAAC;AAJD,wCAIC"}
|
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
import { EventEmitter } from 'node:events';
|
|
3
3
|
import { Logger } from '../../../Logger';
|
|
4
4
|
import { RedisServicePubSubPublisher } from '../../../services/redis/RedisServicePubSubPublisher';
|
|
5
|
+
import { RedisClientService } from '../../../services/redis/redis-client.service';
|
|
5
6
|
export declare class MultiMainSetup extends EventEmitter {
|
|
6
7
|
private readonly logger;
|
|
7
8
|
private readonly redisPublisher;
|
|
8
|
-
|
|
9
|
+
private readonly redisClientService;
|
|
10
|
+
constructor(logger: Logger, redisPublisher: RedisServicePubSubPublisher, redisClientService: RedisClientService);
|
|
9
11
|
get instanceId(): string;
|
|
10
|
-
private
|
|
12
|
+
private leaderKey;
|
|
11
13
|
private readonly leaderKeyTtl;
|
|
12
14
|
private leaderCheckInterval;
|
|
13
15
|
init(): Promise<void>;
|
|
@@ -17,22 +17,25 @@ const node_events_1 = require("node:events");
|
|
|
17
17
|
const config_1 = __importDefault(require("../../../config"));
|
|
18
18
|
const typedi_1 = require("typedi");
|
|
19
19
|
const constants_1 = require("../../../constants");
|
|
20
|
-
const RedisServiceHelper_1 = require("../../../services/redis/RedisServiceHelper");
|
|
21
20
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
22
21
|
const Logger_1 = require("../../../Logger");
|
|
23
22
|
const RedisServicePubSubPublisher_1 = require("../../../services/redis/RedisServicePubSubPublisher");
|
|
23
|
+
const redis_client_service_1 = require("../../../services/redis/redis-client.service");
|
|
24
24
|
let MultiMainSetup = class MultiMainSetup extends node_events_1.EventEmitter {
|
|
25
|
-
constructor(logger, redisPublisher) {
|
|
25
|
+
constructor(logger, redisPublisher, redisClientService) {
|
|
26
26
|
super();
|
|
27
27
|
this.logger = logger;
|
|
28
28
|
this.redisPublisher = redisPublisher;
|
|
29
|
-
this.
|
|
29
|
+
this.redisClientService = redisClientService;
|
|
30
30
|
this.leaderKeyTtl = config_1.default.getEnv('multiMainSetup.ttl');
|
|
31
31
|
}
|
|
32
32
|
get instanceId() {
|
|
33
33
|
return config_1.default.getEnv('redis.queueModeId');
|
|
34
34
|
}
|
|
35
35
|
async init() {
|
|
36
|
+
const prefix = config_1.default.getEnv('redis.prefix');
|
|
37
|
+
const validPrefix = this.redisClientService.toValidPrefix(prefix);
|
|
38
|
+
this.leaderKey = validPrefix + ':main_instance_leader';
|
|
36
39
|
await this.tryBecomeLeader();
|
|
37
40
|
this.leaderCheckInterval = setInterval(async () => {
|
|
38
41
|
await this.checkLeader();
|
|
@@ -87,6 +90,7 @@ exports.MultiMainSetup = MultiMainSetup;
|
|
|
87
90
|
exports.MultiMainSetup = MultiMainSetup = __decorate([
|
|
88
91
|
(0, typedi_1.Service)(),
|
|
89
92
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
90
|
-
RedisServicePubSubPublisher_1.RedisServicePubSubPublisher
|
|
93
|
+
RedisServicePubSubPublisher_1.RedisServicePubSubPublisher,
|
|
94
|
+
redis_client_service_1.RedisClientService])
|
|
91
95
|
], MultiMainSetup);
|
|
92
96
|
//# sourceMappingURL=MultiMainSetup.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiMainSetup.ee.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/MultiMainSetup.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA2C;AAC3C,sDAA8B;AAC9B,mCAAiC;AACjC,2CAAmC;AACnC
|
|
1
|
+
{"version":3,"file":"MultiMainSetup.ee.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/MultiMainSetup.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.OrchestrationHandlerMainService = void 0;
|
|
10
10
|
const typedi_1 = require("typedi");
|
|
11
|
-
const
|
|
11
|
+
const RedisConstants_1 = require("../../redis/RedisConstants");
|
|
12
12
|
const handleWorkerResponseMessageMain_1 = require("./handleWorkerResponseMessageMain");
|
|
13
13
|
const handleCommandMessageMain_1 = require("./handleCommandMessageMain");
|
|
14
14
|
const orchestration_handler_base_service_1 = require("../../orchestration.handler.base.service");
|
|
@@ -18,10 +18,10 @@ let OrchestrationHandlerMainService = class OrchestrationHandlerMainService exte
|
|
|
18
18
|
await this.redisSubscriber.subscribeToCommandChannel();
|
|
19
19
|
await this.redisSubscriber.subscribeToWorkerResponseChannel();
|
|
20
20
|
this.redisSubscriber.addMessageHandler('OrchestrationMessageReceiver', async (channel, messageString) => {
|
|
21
|
-
if (channel ===
|
|
21
|
+
if (channel === RedisConstants_1.WORKER_RESPONSE_REDIS_CHANNEL) {
|
|
22
22
|
await (0, handleWorkerResponseMessageMain_1.handleWorkerResponseMessageMain)(messageString);
|
|
23
23
|
}
|
|
24
|
-
else if (channel ===
|
|
24
|
+
else if (channel === RedisConstants_1.COMMAND_REDIS_CHANNEL) {
|
|
25
25
|
await (0, handleCommandMessageMain_1.handleCommandMessageMain)(messageString);
|
|
26
26
|
}
|
|
27
27
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestration.handler.main.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/orchestration.handler.main.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAiC;AACjC
|
|
1
|
+
{"version":3,"file":"orchestration.handler.main.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/main/orchestration.handler.main.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAiC;AACjC,+DAAkG;AAClG,uFAAoF;AACpF,yEAAsE;AACtE,iGAAuF;AAGhF,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,gEAA2B;IAC/E,KAAK,CAAC,cAAc;QACnB,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAErE,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,EAAE,CAAC;QACvD,MAAM,IAAI,CAAC,eAAe,CAAC,gCAAgC,EAAE,CAAC;QAE9D,IAAI,CAAC,eAAe,CAAC,iBAAiB,CACrC,8BAA8B,EAC9B,KAAK,EAAE,OAAe,EAAE,aAAqB,EAAE,EAAE;YAChD,IAAI,OAAO,KAAK,8CAA6B,EAAE,CAAC;gBAC/C,MAAM,IAAA,iEAA+B,EAAC,aAAa,CAAC,CAAC;YACtD,CAAC;iBAAM,IAAI,OAAO,KAAK,sCAAqB,EAAE,CAAC;gBAC9C,MAAM,IAAA,mDAAwB,EAAC,aAAa,CAAC,CAAC;YAC/C,CAAC;QACF,CAAC,CACD,CAAC;IACH,CAAC;CACD,CAAA;AAlBY,0EAA+B;0CAA/B,+BAA+B;IAD3C,IAAA,gBAAO,GAAE;GACG,+BAA+B,CAkB3C"}
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.OrchestrationHandlerWebhookService = void 0;
|
|
10
10
|
const typedi_1 = require("typedi");
|
|
11
|
-
const
|
|
11
|
+
const RedisConstants_1 = require("../../redis/RedisConstants");
|
|
12
12
|
const orchestration_handler_base_service_1 = require("../../orchestration.handler.base.service");
|
|
13
13
|
const handleCommandMessageWebhook_1 = require("./handleCommandMessageWebhook");
|
|
14
14
|
let OrchestrationHandlerWebhookService = class OrchestrationHandlerWebhookService extends orchestration_handler_base_service_1.OrchestrationHandlerService {
|
|
@@ -16,7 +16,7 @@ let OrchestrationHandlerWebhookService = class OrchestrationHandlerWebhookServic
|
|
|
16
16
|
this.redisSubscriber = await this.redisService.getPubSubSubscriber();
|
|
17
17
|
await this.redisSubscriber.subscribeToCommandChannel();
|
|
18
18
|
this.redisSubscriber.addMessageHandler('OrchestrationMessageReceiver', async (channel, messageString) => {
|
|
19
|
-
if (channel ===
|
|
19
|
+
if (channel === RedisConstants_1.COMMAND_REDIS_CHANNEL) {
|
|
20
20
|
await (0, handleCommandMessageWebhook_1.handleCommandMessageWebhook)(messageString);
|
|
21
21
|
}
|
|
22
22
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestration.handler.webhook.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/webhook/orchestration.handler.webhook.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAiC;AACjC
|
|
1
|
+
{"version":3,"file":"orchestration.handler.webhook.service.js","sourceRoot":"","sources":["../../../../src/services/orchestration/webhook/orchestration.handler.webhook.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,mCAAiC;AACjC,+DAAmE;AACnE,iGAAuF;AACvF,+EAA4E;AAGrE,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,gEAA2B;IAClF,KAAK,CAAC,cAAc;QACnB,IAAI,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC;QAErE,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,EAAE,CAAC;QAEvD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CACrC,8BAA8B,EAC9B,KAAK,EAAE,OAAe,EAAE,aAAqB,EAAE,EAAE;YAChD,IAAI,OAAO,KAAK,sCAAqB,EAAE,CAAC;gBACvC,MAAM,IAAA,yDAA2B,EAAC,aAAa,CAAC,CAAC;YAClD,CAAC;QACF,CAAC,CACD,CAAC;IACH,CAAC;CACD,CAAA;AAfY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,gBAAO,GAAE;GACG,kCAAkC,CAe9C"}
|
|
@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
29
29
|
exports.getWorkerCommandReceivedHandler = void 0;
|
|
30
30
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
31
31
|
const typedi_1 = __importDefault(require("typedi"));
|
|
32
|
-
const
|
|
32
|
+
const RedisConstants_1 = require("../../../services/redis/RedisConstants");
|
|
33
33
|
const os = __importStar(require("os"));
|
|
34
34
|
const License_1 = require("../../../License");
|
|
35
35
|
const MessageEventBus_1 = require("../../../eventbus/MessageEventBus/MessageEventBus");
|
|
@@ -39,7 +39,7 @@ const Logger_1 = require("../../../Logger");
|
|
|
39
39
|
const constants_1 = require("../../../constants");
|
|
40
40
|
function getWorkerCommandReceivedHandler(options) {
|
|
41
41
|
return async (channel, messageString) => {
|
|
42
|
-
if (channel ===
|
|
42
|
+
if (channel === RedisConstants_1.COMMAND_REDIS_CHANNEL) {
|
|
43
43
|
if (!messageString)
|
|
44
44
|
return;
|
|
45
45
|
const logger = typedi_1.default.get(Logger_1.Logger);
|
|
@@ -48,7 +48,7 @@ function getWorkerCommandReceivedHandler(options) {
|
|
|
48
48
|
message = (0, n8n_workflow_1.jsonParse)(messageString);
|
|
49
49
|
}
|
|
50
50
|
catch {
|
|
51
|
-
logger.debug(`Received invalid message via channel ${
|
|
51
|
+
logger.debug(`Received invalid message via channel ${RedisConstants_1.COMMAND_REDIS_CHANNEL}: "${messageString}"`);
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
54
|
if (message) {
|
|
@@ -156,7 +156,7 @@ function getWorkerCommandReceivedHandler(options) {
|
|
|
156
156
|
message.command === 'clear-test-webhooks') {
|
|
157
157
|
break;
|
|
158
158
|
}
|
|
159
|
-
logger.debug(`Received unknown command via channel ${
|
|
159
|
+
logger.debug(`Received unknown command via channel ${RedisConstants_1.COMMAND_REDIS_CHANNEL}: "${message.command}"`);
|
|
160
160
|
break;
|
|
161
161
|
}
|
|
162
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleCommandMessageWorker.js","sourceRoot":"","sources":["../../../../src/services/orchestration/worker/handleCommandMessageWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAyC;AACzC,oDAA+B;AAE/B,
|
|
1
|
+
{"version":3,"file":"handleCommandMessageWorker.js","sourceRoot":"","sources":["../../../../src/services/orchestration/worker/handleCommandMessageWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,16 +2,19 @@
|
|
|
2
2
|
import { BinaryDataService } from 'n8n-core';
|
|
3
3
|
import { ExecutionRepository } from '../databases/repositories/execution.repository';
|
|
4
4
|
import { Logger } from '../Logger';
|
|
5
|
+
import { OrchestrationService } from './orchestration.service';
|
|
5
6
|
export declare class PruningService {
|
|
6
7
|
private readonly logger;
|
|
7
8
|
private readonly executionRepository;
|
|
8
9
|
private readonly binaryDataService;
|
|
10
|
+
private readonly orchestrationService;
|
|
9
11
|
private hardDeletionBatchSize;
|
|
10
12
|
private rates;
|
|
11
13
|
softDeletionInterval: NodeJS.Timer | undefined;
|
|
12
14
|
hardDeletionTimeout: NodeJS.Timeout | undefined;
|
|
13
15
|
private isShuttingDown;
|
|
14
|
-
constructor(logger: Logger, executionRepository: ExecutionRepository, binaryDataService: BinaryDataService);
|
|
16
|
+
constructor(logger: Logger, executionRepository: ExecutionRepository, binaryDataService: BinaryDataService, orchestrationService: OrchestrationService);
|
|
17
|
+
init(): void;
|
|
15
18
|
private isPruningEnabled;
|
|
16
19
|
startPruning(): void;
|
|
17
20
|
stopPruning(): void;
|
|
@@ -21,11 +21,13 @@ const execution_repository_1 = require("../databases/repositories/execution.repo
|
|
|
21
21
|
const Logger_1 = require("../Logger");
|
|
22
22
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
23
23
|
const OnShutdown_1 = require("../decorators/OnShutdown");
|
|
24
|
+
const orchestration_service_1 = require("./orchestration.service");
|
|
24
25
|
let PruningService = class PruningService {
|
|
25
|
-
constructor(logger, executionRepository, binaryDataService) {
|
|
26
|
+
constructor(logger, executionRepository, binaryDataService, orchestrationService) {
|
|
26
27
|
this.logger = logger;
|
|
27
28
|
this.executionRepository = executionRepository;
|
|
28
29
|
this.binaryDataService = binaryDataService;
|
|
30
|
+
this.orchestrationService = orchestrationService;
|
|
29
31
|
this.hardDeletionBatchSize = 100;
|
|
30
32
|
this.rates = {
|
|
31
33
|
softDeletion: config_1.default.getEnv('executions.pruneDataIntervals.softDelete') * constants_1.TIME.MINUTE,
|
|
@@ -33,6 +35,15 @@ let PruningService = class PruningService {
|
|
|
33
35
|
};
|
|
34
36
|
this.isShuttingDown = false;
|
|
35
37
|
}
|
|
38
|
+
init() {
|
|
39
|
+
const { isLeader, isMultiMainSetupEnabled } = this.orchestrationService;
|
|
40
|
+
if (isLeader)
|
|
41
|
+
this.startPruning();
|
|
42
|
+
if (isMultiMainSetupEnabled) {
|
|
43
|
+
this.orchestrationService.multiMainSetup.on('leader-takeover', () => this.startPruning());
|
|
44
|
+
this.orchestrationService.multiMainSetup.on('leader-stepdown', () => this.stopPruning());
|
|
45
|
+
}
|
|
46
|
+
}
|
|
36
47
|
isPruningEnabled() {
|
|
37
48
|
if (!config_1.default.getEnv('executions.pruneData') ||
|
|
38
49
|
constants_1.inTest ||
|
|
@@ -131,6 +142,7 @@ exports.PruningService = PruningService = __decorate([
|
|
|
131
142
|
(0, typedi_1.Service)(),
|
|
132
143
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
133
144
|
execution_repository_1.ExecutionRepository,
|
|
134
|
-
n8n_core_1.BinaryDataService
|
|
145
|
+
n8n_core_1.BinaryDataService,
|
|
146
|
+
orchestration_service_1.OrchestrationService])
|
|
135
147
|
], PruningService);
|
|
136
148
|
//# sourceMappingURL=pruning.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pruning.service.js","sourceRoot":"","sources":["../../src/services/pruning.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,uCAA6C;AAC7C,2CAA2C;AAC3C,sDAA8B;AAC9B,gFAA4E;AAC5E,qCAAkC;AAClC,+CAA6C;AAC7C,wDAAqD;
|
|
1
|
+
{"version":3,"file":"pruning.service.js","sourceRoot":"","sources":["../../src/services/pruning.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export declare const EVENT_BUS_REDIS_STREAM = "n8n:eventstream";
|
|
2
|
+
export declare const COMMAND_REDIS_STREAM = "n8n:commandstream";
|
|
3
|
+
export declare const WORKER_RESPONSE_REDIS_STREAM = "n8n:workerstream";
|
|
4
|
+
export declare const COMMAND_REDIS_CHANNEL = "n8n.commands";
|
|
5
|
+
export declare const WORKER_RESPONSE_REDIS_CHANNEL = "n8n.worker-response";
|
|
6
|
+
export declare const WORKER_RESPONSE_REDIS_LIST = "n8n:list:worker-response";
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.WORKER_RESPONSE_REDIS_LIST = exports.WORKER_RESPONSE_REDIS_CHANNEL = exports.COMMAND_REDIS_CHANNEL = exports.WORKER_RESPONSE_REDIS_STREAM = exports.COMMAND_REDIS_STREAM = exports.EVENT_BUS_REDIS_STREAM = void 0;
|
|
4
|
+
exports.EVENT_BUS_REDIS_STREAM = 'n8n:eventstream';
|
|
5
|
+
exports.COMMAND_REDIS_STREAM = 'n8n:commandstream';
|
|
6
|
+
exports.WORKER_RESPONSE_REDIS_STREAM = 'n8n:workerstream';
|
|
7
|
+
exports.COMMAND_REDIS_CHANNEL = 'n8n.commands';
|
|
8
|
+
exports.WORKER_RESPONSE_REDIS_CHANNEL = 'n8n.worker-response';
|
|
9
|
+
exports.WORKER_RESPONSE_REDIS_LIST = 'n8n:list:worker-response';
|
|
10
|
+
//# sourceMappingURL=RedisConstants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RedisConstants.js","sourceRoot":"","sources":["../../../src/services/redis/RedisConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,sBAAsB,GAAG,iBAAiB,CAAC;AAC3C,QAAA,oBAAoB,GAAG,mBAAmB,CAAC;AAC3C,QAAA,4BAA4B,GAAG,kBAAkB,CAAC;AAClD,QAAA,qBAAqB,GAAG,cAAc,CAAC;AACvC,QAAA,6BAA6B,GAAG,qBAAqB,CAAC;AACtD,QAAA,0BAA0B,GAAG,0BAA0B,CAAC"}
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
import type Redis from 'ioredis';
|
|
2
2
|
import type { Cluster } from 'ioredis';
|
|
3
3
|
import { Logger } from '../../Logger';
|
|
4
|
+
import { RedisClientService } from './redis-client.service';
|
|
4
5
|
export type RedisClientType = 'subscriber' | 'client' | 'bclient' | 'subscriber(bull)' | 'client(bull)' | 'bclient(bull)' | 'client(cache)' | 'publisher' | 'consumer' | 'producer' | 'list-sender' | 'list-receiver';
|
|
5
6
|
export type RedisServiceMessageHandler = ((channel: string, message: string) => void) | ((stream: string, id: string, message: string[]) => void);
|
|
6
7
|
declare class RedisServiceBase {
|
|
7
8
|
protected readonly logger: Logger;
|
|
9
|
+
private readonly redisClientService;
|
|
8
10
|
redisClient: Redis | Cluster | undefined;
|
|
9
11
|
isInitialized: boolean;
|
|
10
|
-
constructor(logger: Logger);
|
|
12
|
+
constructor(logger: Logger, redisClientService: RedisClientService);
|
|
11
13
|
init(type?: RedisClientType): Promise<void>;
|
|
12
14
|
destroy(): Promise<void>;
|
|
13
15
|
}
|
|
@@ -16,17 +16,18 @@ exports.RedisServiceBaseReceiver = exports.RedisServiceBaseSender = void 0;
|
|
|
16
16
|
const typedi_1 = require("typedi");
|
|
17
17
|
const config_1 = __importDefault(require("../../config"));
|
|
18
18
|
const Logger_1 = require("../../Logger");
|
|
19
|
-
const
|
|
19
|
+
const redis_client_service_1 = require("./redis-client.service");
|
|
20
20
|
let RedisServiceBase = class RedisServiceBase {
|
|
21
|
-
constructor(logger) {
|
|
21
|
+
constructor(logger, redisClientService) {
|
|
22
22
|
this.logger = logger;
|
|
23
|
+
this.redisClientService = redisClientService;
|
|
23
24
|
this.isInitialized = false;
|
|
24
25
|
}
|
|
25
26
|
async init(type = 'client') {
|
|
26
27
|
if (this.redisClient && this.isInitialized) {
|
|
27
28
|
return;
|
|
28
29
|
}
|
|
29
|
-
this.redisClient =
|
|
30
|
+
this.redisClient = this.redisClientService.createClient({ type });
|
|
30
31
|
this.redisClient.on('close', () => {
|
|
31
32
|
this.logger.warn('Redis unavailable - trying to reconnect...');
|
|
32
33
|
});
|
|
@@ -47,7 +48,8 @@ let RedisServiceBase = class RedisServiceBase {
|
|
|
47
48
|
};
|
|
48
49
|
RedisServiceBase = __decorate([
|
|
49
50
|
(0, typedi_1.Service)(),
|
|
50
|
-
__metadata("design:paramtypes", [Logger_1.Logger
|
|
51
|
+
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
52
|
+
redis_client_service_1.RedisClientService])
|
|
51
53
|
], RedisServiceBase);
|
|
52
54
|
class RedisServiceBaseSender extends RedisServiceBase {
|
|
53
55
|
async init(type = 'client') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisServiceBaseClasses.js","sourceRoot":"","sources":["../../../src/services/redis/RedisServiceBaseClasses.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,mCAAiC;AACjC,sDAA8B;AAC9B,qCAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"RedisServiceBaseClasses.js","sourceRoot":"","sources":["../../../src/services/redis/RedisServiceBaseClasses.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,mCAAiC;AACjC,sDAA8B;AAC9B,qCAAkC;AAClC,iEAA4D;AAoB5D,IACM,gBAAgB,GADtB,MACM,gBAAgB;IAKrB,YACoB,MAAc,EAChB,kBAAsC;QADpC,WAAM,GAAN,MAAM,CAAQ;QAChB,uBAAkB,GAAlB,kBAAkB,CAAoB;QAJxD,kBAAa,GAAG,KAAK,CAAC;IAKnB,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAC,OAAwB,QAAQ;QAC1C,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YAC5C,OAAO;QACR,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAE7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACvB,OAAO;QACR,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;IAC9B,CAAC;CACD,CAAA;AApCK,gBAAgB;IADrB,IAAA,gBAAO,GAAE;qCAOmB,eAAM;QACI,yCAAkB;GAPnD,gBAAgB,CAoCrB;AAED,MAAsB,sBAAuB,SAAQ,gBAAgB;IAGpE,KAAK,CAAC,IAAI,CAAC,OAAwB,QAAQ;QAC1C,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,gBAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACjD,CAAC;CACD;AAPD,wDAOC;AAED,MAAsB,wBAAyB,SAAQ,gBAAgB;IAAvE;;QACC,oBAAe,GAA4C,IAAI,GAAG,EAAE,CAAC;IAStE,CAAC;IAPA,iBAAiB,CAAC,WAAmB,EAAE,OAAmC;QACzE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,oBAAoB,CAAC,WAAmB;QACvC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;CACD;AAVD,4DAUC"}
|