n8n 1.111.1 → 1.112.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/controllers/dynamic-node-parameters.controller.js +6 -16
- package/dist/controllers/dynamic-node-parameters.controller.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.service.ee.js +2 -5
- package/dist/environments.ee/source-control/source-control.service.ee.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +4 -0
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +8 -1
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/executions/execution-recovery.service.js +2 -1
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +2 -2
- package/dist/executions/execution.service.js +14 -1
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.types.d.ts +2 -5
- package/dist/executions/executions.controller.d.ts +2 -2
- package/dist/modules/data-table/data-store-aggregate.controller.d.ts +7 -1
- package/dist/modules/data-table/data-store-aggregate.controller.js +15 -2
- package/dist/modules/data-table/data-store-aggregate.controller.js.map +1 -1
- package/dist/modules/data-table/data-store-column.repository.js +1 -1
- package/dist/modules/data-table/data-store-column.repository.js.map +1 -1
- package/dist/modules/data-table/data-store-proxy.service.d.ts +2 -2
- package/dist/modules/data-table/data-store-proxy.service.js +8 -8
- package/dist/modules/data-table/data-store-proxy.service.js.map +1 -1
- package/dist/modules/data-table/data-store-rows.repository.d.ts +13 -18
- package/dist/modules/data-table/data-store-rows.repository.js +112 -58
- package/dist/modules/data-table/data-store-rows.repository.js.map +1 -1
- package/dist/modules/data-table/data-store-size-validator.service.d.ts +16 -0
- package/dist/modules/data-table/data-store-size-validator.service.js +79 -0
- package/dist/modules/data-table/data-store-size-validator.service.js.map +1 -0
- package/dist/modules/data-table/data-store.controller.d.ts +6 -6
- package/dist/modules/data-table/data-store.controller.js +11 -9
- package/dist/modules/data-table/data-store.controller.js.map +1 -1
- package/dist/modules/data-table/data-store.repository.d.ts +4 -1
- package/dist/modules/data-table/data-store.repository.js +47 -5
- package/dist/modules/data-table/data-store.repository.js.map +1 -1
- package/dist/modules/data-table/data-store.service.d.ts +14 -7
- package/dist/modules/data-table/data-store.service.js +66 -33
- package/dist/modules/data-table/data-store.service.js.map +1 -1
- package/dist/modules/data-table/utils/sql-utils.d.ts +1 -0
- package/dist/modules/data-table/utils/sql-utils.js +7 -0
- package/dist/modules/data-table/utils/sql-utils.js.map +1 -1
- package/dist/public-api/types.d.ts +5 -0
- package/dist/public-api/v1/handlers/executions/executions.handler.d.ts +1 -0
- package/dist/public-api/v1/handlers/executions/executions.handler.js +34 -1
- package/dist/public-api/v1/handlers/executions/executions.handler.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +42 -2
- package/dist/push/abstract.push.d.ts +2 -2
- package/dist/push/abstract.push.js +4 -4
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/push/index.d.ts +3 -2
- package/dist/push/index.js +30 -26
- package/dist/push/index.js.map +1 -1
- package/dist/push/origin-validator.d.ts +13 -0
- package/dist/push/origin-validator.js +145 -0
- package/dist/push/origin-validator.js.map +1 -0
- package/dist/push/websocket.push.d.ts +1 -1
- package/dist/push/websocket.push.js +2 -2
- package/dist/push/websocket.push.js.map +1 -1
- package/dist/scaling/constants.d.ts +2 -2
- package/dist/scaling/pubsub/pubsub.event-map.d.ts +2 -0
- package/dist/scaling/pubsub/pubsub.registry.d.ts +1 -0
- package/dist/scaling/pubsub/pubsub.registry.js +9 -2
- package/dist/scaling/pubsub/pubsub.registry.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -1
- package/dist/scaling/scaling.service.d.ts +1 -1
- package/dist/scaling/scaling.service.js +0 -4
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/server.js +2 -0
- package/dist/server.js.map +1 -1
- package/dist/services/dynamic-node-parameters.service.d.ts +7 -1
- package/dist/services/dynamic-node-parameters.service.js +15 -2
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/services/frontend.service.js +5 -1
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/public-api-key.service.js +2 -0
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/sso.ee/oidc/oidc.service.ee.d.ts +7 -2
- package/dist/sso.ee/oidc/oidc.service.ee.js +63 -16
- package/dist/sso.ee/oidc/oidc.service.ee.js.map +1 -1
- package/dist/sso.ee/sso-helpers.d.ts +1 -0
- package/dist/sso.ee/sso-helpers.js +19 -0
- package/dist/sso.ee/sso-helpers.js.map +1 -1
- package/dist/task-runners/errors/missing-requirements.error.d.ts +6 -0
- package/dist/task-runners/errors/missing-requirements.error.js +17 -0
- package/dist/task-runners/errors/missing-requirements.error.js.map +1 -0
- package/dist/task-runners/internal-task-runner-disconnect-analyzer.d.ts +2 -2
- package/dist/task-runners/internal-task-runner-disconnect-analyzer.js +2 -2
- package/dist/task-runners/internal-task-runner-disconnect-analyzer.js.map +1 -1
- package/dist/task-runners/task-runner-module.d.ts +5 -3
- package/dist/task-runners/task-runner-module.js +25 -13
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/task-runners/task-runner-process-base.d.ts +39 -0
- package/dist/task-runners/task-runner-process-base.js +111 -0
- package/dist/task-runners/task-runner-process-base.js.map +1 -0
- package/dist/task-runners/task-runner-process-js.d.ts +21 -0
- package/dist/task-runners/{task-runner-process.js → task-runner-process-js.js} +35 -108
- package/dist/task-runners/task-runner-process-js.js.map +1 -0
- package/dist/task-runners/task-runner-process-py.d.ts +15 -0
- package/dist/task-runners/task-runner-process-py.js +76 -0
- package/dist/task-runners/task-runner-process-py.js.map +1 -0
- package/dist/task-runners/task-runner-process-restart-loop-detector.d.ts +2 -2
- package/dist/task-runners/task-runner-process-restart-loop-detector.js.map +1 -1
- package/package.json +20 -20
- package/dist/task-runners/task-runner-process.d.ts +0 -36
- package/dist/task-runners/task-runner-process.js.map +0 -1
|
@@ -58,6 +58,7 @@ const jwt_service_1 = require("../../services/jwt.service");
|
|
|
58
58
|
const url_service_1 = require("../../services/url.service");
|
|
59
59
|
const sso_helpers_1 = require("../sso-helpers");
|
|
60
60
|
const constants_1 = require("./constants");
|
|
61
|
+
const decorators_1 = require("@n8n/decorators");
|
|
61
62
|
const DEFAULT_OIDC_CONFIG = {
|
|
62
63
|
clientId: '',
|
|
63
64
|
clientSecret: '',
|
|
@@ -69,7 +70,7 @@ const DEFAULT_OIDC_RUNTIME_CONFIG = {
|
|
|
69
70
|
discoveryEndpoint: new URL('http://n8n.io/not-set'),
|
|
70
71
|
};
|
|
71
72
|
let OidcService = class OidcService {
|
|
72
|
-
constructor(settingsRepository, authIdentityRepository, urlService, globalConfig, userRepository, cipher, logger, jwtService) {
|
|
73
|
+
constructor(settingsRepository, authIdentityRepository, urlService, globalConfig, userRepository, cipher, logger, jwtService, instanceSettings) {
|
|
73
74
|
this.settingsRepository = settingsRepository;
|
|
74
75
|
this.authIdentityRepository = authIdentityRepository;
|
|
75
76
|
this.urlService = urlService;
|
|
@@ -78,7 +79,9 @@ let OidcService = class OidcService {
|
|
|
78
79
|
this.cipher = cipher;
|
|
79
80
|
this.logger = logger;
|
|
80
81
|
this.jwtService = jwtService;
|
|
82
|
+
this.instanceSettings = instanceSettings;
|
|
81
83
|
this.oidcConfig = DEFAULT_OIDC_RUNTIME_CONFIG;
|
|
84
|
+
this.isReloading = false;
|
|
82
85
|
}
|
|
83
86
|
async init() {
|
|
84
87
|
this.oidcConfig = await this.loadConfig(true);
|
|
@@ -255,15 +258,49 @@ let OidcService = class OidcService {
|
|
|
255
258
|
return user;
|
|
256
259
|
});
|
|
257
260
|
}
|
|
258
|
-
async
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
261
|
+
async broadcastReloadOIDCConfigurationCommand() {
|
|
262
|
+
if (this.instanceSettings.isMultiMain) {
|
|
263
|
+
const { Publisher } = await Promise.resolve().then(() => __importStar(require('../../scaling/pubsub/publisher.service')));
|
|
264
|
+
await di_1.Container.get(Publisher).publishCommand({ command: 'reload-oidc-config' });
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
async reload() {
|
|
268
|
+
if (this.isReloading) {
|
|
269
|
+
this.logger.warn('OIDC configuration reload already in progress');
|
|
270
|
+
return;
|
|
271
|
+
}
|
|
272
|
+
this.isReloading = true;
|
|
273
|
+
try {
|
|
274
|
+
this.logger.debug('OIDC configuration changed, starting to load it from the database');
|
|
275
|
+
const configFromDB = await this.loadConfigurationFromDatabase(true);
|
|
276
|
+
if (configFromDB) {
|
|
277
|
+
this.oidcConfig = configFromDB;
|
|
278
|
+
this.cachedOidcConfiguration = undefined;
|
|
279
|
+
}
|
|
280
|
+
else {
|
|
281
|
+
this.logger.warn('OIDC configuration not found in database, ignoring reload message');
|
|
282
|
+
}
|
|
283
|
+
await (0, sso_helpers_1.reloadAuthenticationMethod)();
|
|
284
|
+
const isOidcLoginEnabled = (0, sso_helpers_1.isOidcCurrentAuthenticationMethod)();
|
|
285
|
+
this.logger.debug(`OIDC login is now ${isOidcLoginEnabled ? 'enabled' : 'disabled'}.`);
|
|
286
|
+
di_1.Container.get(config_1.GlobalConfig).sso.oidc.loginEnabled = isOidcLoginEnabled;
|
|
287
|
+
}
|
|
288
|
+
catch (error) {
|
|
289
|
+
this.logger.error('OIDC configuration changed, failed to reload OIDC configuration', {
|
|
290
|
+
error,
|
|
291
|
+
});
|
|
292
|
+
}
|
|
293
|
+
finally {
|
|
294
|
+
this.isReloading = false;
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
async loadConfigurationFromDatabase(decryptSecret = false) {
|
|
298
|
+
const configFromDB = await this.settingsRepository.findByKey(constants_1.OIDC_PREFERENCES_DB_KEY);
|
|
299
|
+
if (configFromDB) {
|
|
263
300
|
try {
|
|
264
|
-
const oidcConfig = (0, n8n_workflow_1.jsonParse)(
|
|
301
|
+
const oidcConfig = (0, n8n_workflow_1.jsonParse)(configFromDB.value);
|
|
265
302
|
if (oidcConfig.discoveryEndpoint === '')
|
|
266
|
-
return
|
|
303
|
+
return undefined;
|
|
267
304
|
const discoveryUrl = new URL(oidcConfig.discoveryEndpoint);
|
|
268
305
|
if (oidcConfig.clientSecret && decryptSecret) {
|
|
269
306
|
oidcConfig.clientSecret = this.cipher.decrypt(oidcConfig.clientSecret);
|
|
@@ -277,11 +314,13 @@ let OidcService = class OidcService {
|
|
|
277
314
|
this.logger.warn('Failed to load OIDC configuration from database, falling back to default configuration.', { error });
|
|
278
315
|
}
|
|
279
316
|
}
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
317
|
+
return undefined;
|
|
318
|
+
}
|
|
319
|
+
async loadConfig(decryptSecret = false) {
|
|
320
|
+
const currentConfig = await this.loadConfigurationFromDatabase(decryptSecret);
|
|
321
|
+
if (currentConfig) {
|
|
322
|
+
return currentConfig;
|
|
323
|
+
}
|
|
285
324
|
return DEFAULT_OIDC_RUNTIME_CONFIG;
|
|
286
325
|
}
|
|
287
326
|
async updateConfig(newConfig) {
|
|
@@ -304,13 +343,13 @@ let OidcService = class OidcService {
|
|
|
304
343
|
this.logger.error('Failed to discover OIDC metadata', { error });
|
|
305
344
|
throw new n8n_workflow_1.UserError('Failed to discover OIDC metadata, based on the provided configuration');
|
|
306
345
|
}
|
|
307
|
-
await this.settingsRepository.
|
|
346
|
+
await this.settingsRepository.save({
|
|
308
347
|
key: constants_1.OIDC_PREFERENCES_DB_KEY,
|
|
309
|
-
}, {
|
|
310
348
|
value: JSON.stringify({
|
|
311
349
|
...newConfig,
|
|
312
350
|
clientSecret: this.cipher.encrypt(newConfig.clientSecret),
|
|
313
351
|
}),
|
|
352
|
+
loadOnStartup: true,
|
|
314
353
|
});
|
|
315
354
|
this.oidcConfig = {
|
|
316
355
|
...newConfig,
|
|
@@ -319,6 +358,7 @@ let OidcService = class OidcService {
|
|
|
319
358
|
this.cachedOidcConfiguration = undefined;
|
|
320
359
|
this.logger.debug(`OIDC login is now ${this.oidcConfig.loginEnabled ? 'enabled' : 'disabled'}.`);
|
|
321
360
|
await this.setOidcLoginEnabled(this.oidcConfig.loginEnabled);
|
|
361
|
+
await this.broadcastReloadOIDCConfigurationCommand();
|
|
322
362
|
}
|
|
323
363
|
async setOidcLoginEnabled(enabled) {
|
|
324
364
|
const currentAuthenticationMethod = (0, sso_helpers_1.getCurrentAuthenticationMethod)();
|
|
@@ -347,6 +387,12 @@ let OidcService = class OidcService {
|
|
|
347
387
|
}
|
|
348
388
|
};
|
|
349
389
|
exports.OidcService = OidcService;
|
|
390
|
+
__decorate([
|
|
391
|
+
(0, decorators_1.OnPubSubEvent)('reload-oidc-config'),
|
|
392
|
+
__metadata("design:type", Function),
|
|
393
|
+
__metadata("design:paramtypes", []),
|
|
394
|
+
__metadata("design:returntype", Promise)
|
|
395
|
+
], OidcService.prototype, "reload", null);
|
|
350
396
|
exports.OidcService = OidcService = __decorate([
|
|
351
397
|
(0, di_1.Service)(),
|
|
352
398
|
__metadata("design:paramtypes", [db_1.SettingsRepository,
|
|
@@ -356,6 +402,7 @@ exports.OidcService = OidcService = __decorate([
|
|
|
356
402
|
db_1.UserRepository,
|
|
357
403
|
n8n_core_1.Cipher,
|
|
358
404
|
backend_common_1.Logger,
|
|
359
|
-
jwt_service_1.JwtService
|
|
405
|
+
jwt_service_1.JwtService,
|
|
406
|
+
n8n_core_1.InstanceSettings])
|
|
360
407
|
], OidcService);
|
|
361
408
|
//# sourceMappingURL=oidc.service.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/oidc/oidc.service.ee.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oidc.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/oidc/oidc.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type AuthProviderType } from '@n8n/db';
|
|
2
2
|
export declare function setCurrentAuthenticationMethod(authenticationMethod: AuthProviderType): Promise<void>;
|
|
3
|
+
export declare function reloadAuthenticationMethod(): Promise<void>;
|
|
3
4
|
export declare function getCurrentAuthenticationMethod(): AuthProviderType;
|
|
4
5
|
export declare function isSamlCurrentAuthenticationMethod(): boolean;
|
|
5
6
|
export declare function isLdapCurrentAuthenticationMethod(): boolean;
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.setCurrentAuthenticationMethod = setCurrentAuthenticationMethod;
|
|
7
|
+
exports.reloadAuthenticationMethod = reloadAuthenticationMethod;
|
|
7
8
|
exports.getCurrentAuthenticationMethod = getCurrentAuthenticationMethod;
|
|
8
9
|
exports.isSamlCurrentAuthenticationMethod = isSamlCurrentAuthenticationMethod;
|
|
9
10
|
exports.isLdapCurrentAuthenticationMethod = isLdapCurrentAuthenticationMethod;
|
|
@@ -15,6 +16,7 @@ const config_1 = require("@n8n/config");
|
|
|
15
16
|
const db_1 = require("@n8n/db");
|
|
16
17
|
const di_1 = require("@n8n/di");
|
|
17
18
|
const config_2 = __importDefault(require("../config"));
|
|
19
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
18
20
|
async function setCurrentAuthenticationMethod(authenticationMethod) {
|
|
19
21
|
config_2.default.set('userManagement.authenticationMethod', authenticationMethod);
|
|
20
22
|
await di_1.Container.get(db_1.SettingsRepository).save({
|
|
@@ -23,6 +25,23 @@ async function setCurrentAuthenticationMethod(authenticationMethod) {
|
|
|
23
25
|
loadOnStartup: true,
|
|
24
26
|
}, { transaction: false });
|
|
25
27
|
}
|
|
28
|
+
async function reloadAuthenticationMethod() {
|
|
29
|
+
const settings = await di_1.Container.get(db_1.SettingsRepository).findByKey('userManagement.authenticationMethod');
|
|
30
|
+
if (settings) {
|
|
31
|
+
if ((0, db_1.isAuthProviderType)(settings.value)) {
|
|
32
|
+
const authenticationMethod = settings.value;
|
|
33
|
+
config_2.default.set('userManagement.authenticationMethod', authenticationMethod);
|
|
34
|
+
di_1.Container.get(backend_common_1.Logger).debug('Reloaded authentication method from the database', {
|
|
35
|
+
authenticationMethod,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
di_1.Container.get(backend_common_1.Logger).warn('Invalid authentication method read from the database', {
|
|
40
|
+
value: settings.value,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
26
45
|
function getCurrentAuthenticationMethod() {
|
|
27
46
|
return config_2.default.getEnv('userManagement.authenticationMethod');
|
|
28
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso-helpers.js","sourceRoot":"","sources":["../../src/sso.ee/sso-helpers.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"sso-helpers.js","sourceRoot":"","sources":["../../src/sso.ee/sso-helpers.ts"],"names":[],"mappings":";;;;;AAaA,wEAYC;AAED,gEAiBC;AAED,wEAEC;AAED,8EAEC;AAED,8EAEC;AAED,8EAEC;AAED,gFAEC;AAED,gFAEC;AAED,8EAEC;AAxED,wCAA2C;AAC3C,gCAAwF;AACxF,gCAAoC;AAEpC,sDAA8B;AAC9B,wDAA6C;AAQtC,KAAK,UAAU,8BAA8B,CACnD,oBAAsC;IAEtC,gBAAM,CAAC,GAAG,CAAC,qCAAqC,EAAE,oBAAoB,CAAC,CAAC;IACxE,MAAM,cAAS,CAAC,GAAG,CAAC,uBAAkB,CAAC,CAAC,IAAI,CAC3C;QACC,GAAG,EAAE,qCAAqC;QAC1C,KAAK,EAAE,oBAAoB;QAC3B,aAAa,EAAE,IAAI;KACnB,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,CACtB,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,0BAA0B;IAC/C,MAAM,QAAQ,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,uBAAkB,CAAC,CAAC,SAAS,CACjE,qCAAqC,CACrC,CAAC;IACF,IAAI,QAAQ,EAAE,CAAC;QACd,IAAI,IAAA,uBAAkB,EAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACxC,MAAM,oBAAoB,GAAG,QAAQ,CAAC,KAAK,CAAC;YAC5C,gBAAM,CAAC,GAAG,CAAC,qCAAqC,EAAE,oBAAoB,CAAC,CAAC;YACxE,cAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC,KAAK,CAAC,kDAAkD,EAAE;gBAC/E,oBAAoB;aACpB,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,cAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC,IAAI,CAAC,sDAAsD,EAAE;gBAClF,KAAK,EAAE,QAAQ,CAAC,KAAK;aACrB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAgB,8BAA8B;IAC7C,OAAO,gBAAM,CAAC,MAAM,CAAC,qCAAqC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAgB,iCAAiC;IAChD,OAAO,8BAA8B,EAAE,KAAK,MAAM,CAAC;AACpD,CAAC;AAED,SAAgB,iCAAiC;IAChD,OAAO,8BAA8B,EAAE,KAAK,MAAM,CAAC;AACpD,CAAC;AAED,SAAgB,iCAAiC;IAChD,OAAO,8BAA8B,EAAE,KAAK,MAAM,CAAC;AACpD,CAAC;AAED,SAAgB,kCAAkC;IACjD,OAAO,8BAA8B,EAAE,KAAK,OAAO,CAAC;AACrD,CAAC;AAED,SAAgB,kCAAkC;IACjD,OAAO,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC;AAC/D,CAAC;AAED,SAAgB,iCAAiC;IAChD,OAAO,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC;AAC3D,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MissingRequirementsError = void 0;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
const ERROR_MESSAGE = 'Failed to start Python task runner in internal mode.';
|
|
6
|
+
const HINT = 'Launching a Python runner in internal mode is intended only for debugging and is not recommended for production. Users are encouraged to deploy in external mode. See: https://docs.n8n.io/hosting/configuration/task-runners/#setting-up-external-mode';
|
|
7
|
+
class MissingRequirementsError extends n8n_workflow_1.UserError {
|
|
8
|
+
constructor(reasonId) {
|
|
9
|
+
const reason = {
|
|
10
|
+
python: 'because Python 3 is missing from this system.',
|
|
11
|
+
venv: 'because its virtual environment is missing from this system.',
|
|
12
|
+
}[reasonId];
|
|
13
|
+
super([ERROR_MESSAGE, reason, HINT].join(' '));
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.MissingRequirementsError = MissingRequirementsError;
|
|
17
|
+
//# sourceMappingURL=missing-requirements.error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"missing-requirements.error.js","sourceRoot":"","sources":["../../../src/task-runners/errors/missing-requirements.error.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAEzC,MAAM,aAAa,GAAG,sDAAsD,CAAC;AAI7E,MAAM,IAAI,GACT,yPAAyP,CAAC;AAE3P,MAAa,wBAAyB,SAAQ,wBAAS;IACtD,YAAY,QAAkB;QAC7B,MAAM,MAAM,GAAG;YACd,MAAM,EAAE,+CAA+C;YACvD,IAAI,EAAE,8DAA8D;SACpE,CAAC,QAAQ,CAAC,CAAC;QAEZ,KAAK,CAAC,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAChD,CAAC;CACD;AATD,4DASC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { TaskRunnersConfig } from '@n8n/config';
|
|
2
2
|
import type { DisconnectErrorOptions } from '../task-runners/task-broker/task-broker-types';
|
|
3
3
|
import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
|
|
4
|
-
import {
|
|
4
|
+
import { JsTaskRunnerProcess } from './task-runner-process-js';
|
|
5
5
|
export declare class InternalTaskRunnerDisconnectAnalyzer extends DefaultTaskRunnerDisconnectAnalyzer {
|
|
6
6
|
private readonly runnerConfig;
|
|
7
7
|
private readonly taskRunnerProcess;
|
|
8
8
|
private readonly exitReasonSignal;
|
|
9
|
-
constructor(runnerConfig: TaskRunnersConfig, taskRunnerProcess:
|
|
9
|
+
constructor(runnerConfig: TaskRunnersConfig, taskRunnerProcess: JsTaskRunnerProcess);
|
|
10
10
|
toDisconnectError(opts: DisconnectErrorOptions): Promise<Error>;
|
|
11
11
|
private awaitExitSignal;
|
|
12
12
|
}
|
|
@@ -15,7 +15,7 @@ const di_1 = require("@n8n/di");
|
|
|
15
15
|
const default_task_runner_disconnect_analyzer_1 = require("./default-task-runner-disconnect-analyzer");
|
|
16
16
|
const task_runner_oom_error_1 = require("./errors/task-runner-oom-error");
|
|
17
17
|
const sliding_window_signal_1 = require("./sliding-window-signal");
|
|
18
|
-
const
|
|
18
|
+
const task_runner_process_js_1 = require("./task-runner-process-js");
|
|
19
19
|
let InternalTaskRunnerDisconnectAnalyzer = class InternalTaskRunnerDisconnectAnalyzer extends default_task_runner_disconnect_analyzer_1.DefaultTaskRunnerDisconnectAnalyzer {
|
|
20
20
|
constructor(runnerConfig, taskRunnerProcess) {
|
|
21
21
|
super();
|
|
@@ -44,6 +44,6 @@ exports.InternalTaskRunnerDisconnectAnalyzer = InternalTaskRunnerDisconnectAnaly
|
|
|
44
44
|
exports.InternalTaskRunnerDisconnectAnalyzer = InternalTaskRunnerDisconnectAnalyzer = __decorate([
|
|
45
45
|
(0, di_1.Service)(),
|
|
46
46
|
__metadata("design:paramtypes", [config_1.TaskRunnersConfig,
|
|
47
|
-
|
|
47
|
+
task_runner_process_js_1.JsTaskRunnerProcess])
|
|
48
48
|
], InternalTaskRunnerDisconnectAnalyzer);
|
|
49
49
|
//# sourceMappingURL=internal-task-runner-disconnect-analyzer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-task-runner-disconnect-analyzer.js","sourceRoot":"","sources":["../../src/task-runners/internal-task-runner-disconnect-analyzer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAgD;AAChD,gCAAkC;AAIlC,uGAAgG;AAChG,0EAAoE;AACpE,mEAA8D;AAE9D
|
|
1
|
+
{"version":3,"file":"internal-task-runner-disconnect-analyzer.js","sourceRoot":"","sources":["../../src/task-runners/internal-task-runner-disconnect-analyzer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAgD;AAChD,gCAAkC;AAIlC,uGAAgG;AAChG,0EAAoE;AACpE,mEAA8D;AAE9D,qEAA+D;AAOxD,IAAM,oCAAoC,GAA1C,MAAM,oCAAqC,SAAQ,6EAAmC;IAG5F,YACkB,YAA+B,EAC/B,iBAAsC;QAEvD,KAAK,EAAE,CAAC;QAHS,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,sBAAiB,GAAjB,iBAAiB,CAAqB;QASvD,IAAI,CAAC,gBAAgB,GAAG,IAAI,2CAAmB,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,EAAE;YAC/E,cAAc,EAAE,GAAG;SACnB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,IAA4B;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC9C,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;YACxB,OAAO,IAAI,0CAAkB,CAAC,IAAI,CAAC,QAAQ,IAAI,mBAAmB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7F,CAAC;QAED,OAAO,MAAM,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,eAAe;QAC5B,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAI3C,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAE/D,OAAO,cAAc,EAAE,MAAM,IAAI,SAAS,CAAC;IAC5C,CAAC;CACD,CAAA;AAxCY,oFAAoC;+CAApC,oCAAoC;IADhD,IAAA,YAAO,GAAE;qCAKuB,0BAAiB;QACZ,4CAAmB;GAL5C,oCAAoC,CAwChD"}
|
|
@@ -8,13 +8,15 @@ export declare class TaskRunnerModule {
|
|
|
8
8
|
private taskBrokerHttpServer;
|
|
9
9
|
private taskBrokerWsServer;
|
|
10
10
|
private taskRequester;
|
|
11
|
-
private
|
|
12
|
-
private
|
|
11
|
+
private jsRunnerProcess;
|
|
12
|
+
private pyRunnerProcess;
|
|
13
|
+
private jsRunnerProcessRestartLoopDetector;
|
|
14
|
+
private pyRunnerProcessRestartLoopDetector;
|
|
13
15
|
constructor(logger: Logger, errorReporter: ErrorReporter, runnerConfig: TaskRunnersConfig);
|
|
14
16
|
start(): Promise<void>;
|
|
15
17
|
stop(): Promise<void>;
|
|
16
18
|
private loadTaskRequester;
|
|
17
19
|
private loadTaskBroker;
|
|
18
|
-
private
|
|
20
|
+
private startInternalTaskRunners;
|
|
19
21
|
private onRunnerRestartLoopDetected;
|
|
20
22
|
}
|
|
@@ -73,15 +73,20 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
73
73
|
throw new missing_auth_token_error_1.MissingAuthTokenError();
|
|
74
74
|
await this.loadTaskRequester();
|
|
75
75
|
await this.loadTaskBroker();
|
|
76
|
-
if (mode === 'internal')
|
|
77
|
-
await this.
|
|
78
|
-
}
|
|
76
|
+
if (mode === 'internal')
|
|
77
|
+
await this.startInternalTaskRunners();
|
|
79
78
|
}
|
|
80
79
|
async stop() {
|
|
81
80
|
const stopRunnerProcessTask = (async () => {
|
|
82
|
-
if (this.
|
|
83
|
-
await this.
|
|
84
|
-
this.
|
|
81
|
+
if (this.jsRunnerProcess) {
|
|
82
|
+
await this.jsRunnerProcess.stop();
|
|
83
|
+
this.jsRunnerProcess = undefined;
|
|
84
|
+
}
|
|
85
|
+
})();
|
|
86
|
+
const stopPythonRunnerProcessTask = (async () => {
|
|
87
|
+
if (this.pyRunnerProcess) {
|
|
88
|
+
await this.pyRunnerProcess.stop();
|
|
89
|
+
this.pyRunnerProcess = undefined;
|
|
85
90
|
}
|
|
86
91
|
})();
|
|
87
92
|
const stopRunnerServerTask = (async () => {
|
|
@@ -90,7 +95,7 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
90
95
|
this.taskBrokerHttpServer = undefined;
|
|
91
96
|
}
|
|
92
97
|
})();
|
|
93
|
-
await Promise.all([stopRunnerProcessTask, stopRunnerServerTask]);
|
|
98
|
+
await Promise.all([stopRunnerProcessTask, stopPythonRunnerProcessTask, stopRunnerServerTask]);
|
|
94
99
|
}
|
|
95
100
|
async loadTaskRequester() {
|
|
96
101
|
const { TaskRequester } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-managers/task-requester')));
|
|
@@ -104,13 +109,20 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
104
109
|
this.taskBrokerWsServer = di_1.Container.get(task_broker_ws_server_1.TaskBrokerWsServer);
|
|
105
110
|
await this.taskBrokerHttpServer.start();
|
|
106
111
|
}
|
|
107
|
-
async
|
|
112
|
+
async startInternalTaskRunners() {
|
|
108
113
|
a.ok(this.taskBrokerWsServer, 'Task Runner WS Server not loaded');
|
|
109
|
-
const {
|
|
110
|
-
this.
|
|
111
|
-
this.
|
|
112
|
-
this.
|
|
113
|
-
await this.
|
|
114
|
+
const { JsTaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-runner-process-js')));
|
|
115
|
+
this.jsRunnerProcess = di_1.Container.get(JsTaskRunnerProcess);
|
|
116
|
+
this.jsRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.jsRunnerProcess);
|
|
117
|
+
this.jsRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
|
|
118
|
+
await this.jsRunnerProcess.start();
|
|
119
|
+
if (this.runnerConfig.isNativePythonRunnerEnabled) {
|
|
120
|
+
const { PyTaskRunnerProcess } = await Promise.resolve().then(() => __importStar(require('../task-runners/task-runner-process-py')));
|
|
121
|
+
this.pyRunnerProcess = di_1.Container.get(PyTaskRunnerProcess);
|
|
122
|
+
this.pyRunnerProcessRestartLoopDetector = new task_runner_process_restart_loop_detector_1.TaskRunnerProcessRestartLoopDetector(this.pyRunnerProcess);
|
|
123
|
+
this.pyRunnerProcessRestartLoopDetector.on('restart-loop-detected', this.onRunnerRestartLoopDetected);
|
|
124
|
+
await this.pyRunnerProcess.start();
|
|
125
|
+
}
|
|
114
126
|
const { InternalTaskRunnerDisconnectAnalyzer } = await Promise.resolve().then(() => __importStar(require('../task-runners/internal-task-runner-disconnect-analyzer')));
|
|
115
127
|
this.taskBrokerWsServer.setDisconnectAnalyzer(di_1.Container.get(InternalTaskRunnerDisconnectAnalyzer));
|
|
116
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,gDAA6C;AAC7C,gCAA6C;AAC7C,uCAAyC;AACzC,+CAAqC;AACrC,sDAAwC;AAGxC,4FAAsF;
|
|
1
|
+
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,gDAA6C;AAC7C,gCAA6C;AAC7C,uCAAyC;AACzC,+CAAqC;AACrC,sDAAwC;AAGxC,4FAAsF;AAGtF,wHAAgH;AAEhH,gFAA0E;AAUnE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAe5B,YACkB,MAAc,EACd,aAA4B,EAC5B,YAA+B;QAF/B,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAmB;QAmGzC,gCAA2B,GAAG,KAAK,EAAE,KAAiC,EAAE,EAAE;YACjF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAGhC,MAAM,IAAA,oBAAK,EAAC,IAAI,CAAC,CAAC;YAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC,CAAC;QAxGD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,KAAK;QACV,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;QAE3D,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAE9C,IAAI,IAAI,KAAK,UAAU,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,gDAAqB,EAAE,CAAC;QAEzE,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,IAAI,IAAI,KAAK,UAAU;YAAE,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAChE,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI;QACT,MAAM,qBAAqB,GAAG,CAAC,KAAK,IAAI,EAAE;YACzC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;gBAClC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;YAClC,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,2BAA2B,GAAG,CAAC,KAAK,IAAI,EAAE;YAC/C,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;gBAClC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;YAClC,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,oBAAoB,GAAG,CAAC,KAAK,IAAI,EAAE;YACxC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC/B,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBACvC,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;YACvC,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,qBAAqB,EAAE,2BAA2B,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC/F,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC9B,MAAM,EAAE,aAAa,EAAE,GAAG,wDAAa,6CAA6C,GAAC,CAAC;QACtF,MAAM,EAAE,kBAAkB,EAAE,GAAG,wDAC9B,mDAAmD,GACnD,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,cAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACvD,cAAS,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,cAAc;QAG3B,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,+CAA+C,GAAC,CAAC;QAC3F,IAAI,CAAC,oBAAoB,GAAG,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC5D,IAAI,CAAC,kBAAkB,GAAG,cAAS,CAAC,GAAG,CAAC,0CAAkB,CAAC,CAAC;QAE5D,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,wBAAwB;QACrC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,kCAAkC,CAAC,CAAC;QAElE,MAAM,EAAE,mBAAmB,EAAE,GAAG,wDAAa,uCAAuC,GAAC,CAAC;QACtF,IAAI,CAAC,eAAe,GAAG,cAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC1D,IAAI,CAAC,kCAAkC,GAAG,IAAI,gFAAoC,CACjF,IAAI,CAAC,eAAe,CACpB,CAAC;QACF,IAAI,CAAC,kCAAkC,CAAC,EAAE,CACzC,uBAAuB,EACvB,IAAI,CAAC,2BAA2B,CAChC,CAAC;QAEF,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAEnC,IAAI,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE,CAAC;YACnD,MAAM,EAAE,mBAAmB,EAAE,GAAG,wDAAa,uCAAuC,GAAC,CAAC;YACtF,IAAI,CAAC,eAAe,GAAG,cAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YAC1D,IAAI,CAAC,kCAAkC,GAAG,IAAI,gFAAoC,CACjF,IAAI,CAAC,eAAe,CACpB,CAAC;YACF,IAAI,CAAC,kCAAkC,CAAC,EAAE,CACzC,uBAAuB,EACvB,IAAI,CAAC,2BAA2B,CAChC,CAAC;YACF,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,EAAE,oCAAoC,EAAE,GAAG,wDAChD,yDAAyD,GACzD,CAAC;QACF,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAC5C,cAAS,CAAC,GAAG,CAAC,oCAAoC,CAAC,CACnD,CAAC;IACH,CAAC;CAUD,CAAA;AA7HY,4CAAgB;AAqCtB;IADL,IAAA,uBAAU,GAAE;;;;4CAwBZ;2BA5DW,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAiBiB,uBAAM;QACC,wBAAa;QACd,0BAAiB;GAlBrC,gBAAgB,CA6H5B"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { Logger } from '@n8n/backend-common';
|
|
2
|
+
import { LogScope, TaskRunnersConfig } from '@n8n/config';
|
|
3
|
+
import { spawn } from 'node:child_process';
|
|
4
|
+
import { TypedEmitter } from '../typed-emitter';
|
|
5
|
+
import { TaskBrokerAuthService } from './task-broker/auth/task-broker-auth.service';
|
|
6
|
+
import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
|
|
7
|
+
export type ChildProcess = ReturnType<typeof spawn>;
|
|
8
|
+
export type ExitReason = 'unknown' | 'oom';
|
|
9
|
+
export type TaskRunnerProcessEventMap = {
|
|
10
|
+
exit: {
|
|
11
|
+
reason: ExitReason;
|
|
12
|
+
};
|
|
13
|
+
};
|
|
14
|
+
export declare abstract class TaskRunnerProcessBase extends TypedEmitter<TaskRunnerProcessEventMap> {
|
|
15
|
+
protected readonly logger: Logger;
|
|
16
|
+
protected readonly runnerConfig: TaskRunnersConfig;
|
|
17
|
+
protected readonly authService: TaskBrokerAuthService;
|
|
18
|
+
protected readonly runnerLifecycleEvents: TaskRunnerLifecycleEvents;
|
|
19
|
+
protected readonly name: string;
|
|
20
|
+
protected readonly loggerScope: LogScope;
|
|
21
|
+
protected process: ChildProcess | null;
|
|
22
|
+
protected _runPromise: Promise<void> | null;
|
|
23
|
+
protected isShuttingDown: boolean;
|
|
24
|
+
constructor(logger: Logger, runnerConfig: TaskRunnersConfig, authService: TaskBrokerAuthService, runnerLifecycleEvents: TaskRunnerLifecycleEvents);
|
|
25
|
+
get isRunning(): boolean;
|
|
26
|
+
get pid(): number | undefined;
|
|
27
|
+
get runPromise(): Promise<void> | null;
|
|
28
|
+
get isInternal(): boolean;
|
|
29
|
+
start(): Promise<void>;
|
|
30
|
+
stop(): Promise<void>;
|
|
31
|
+
protected forceRestart(): Promise<void>;
|
|
32
|
+
protected onProcessExit(code: number | null, resolveFn: () => void): void;
|
|
33
|
+
protected monitorProcess(taskRunnerProcess: ChildProcess): void;
|
|
34
|
+
abstract startProcess(grantToken: string, taskBrokerUri: string): Promise<ChildProcess>;
|
|
35
|
+
setupProcessMonitoring?(process: ChildProcess): void;
|
|
36
|
+
analyzeExitReason?(code: number | null): {
|
|
37
|
+
reason: ExitReason;
|
|
38
|
+
};
|
|
39
|
+
}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.TaskRunnerProcessBase = void 0;
|
|
16
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
17
|
+
const config_1 = require("@n8n/config");
|
|
18
|
+
const decorators_1 = require("@n8n/decorators");
|
|
19
|
+
const di_1 = require("@n8n/di");
|
|
20
|
+
const strict_1 = __importDefault(require("node:assert/strict"));
|
|
21
|
+
const typed_emitter_1 = require("../typed-emitter");
|
|
22
|
+
const forward_to_logger_1 = require("./forward-to-logger");
|
|
23
|
+
const task_broker_auth_service_1 = require("./task-broker/auth/task-broker-auth.service");
|
|
24
|
+
const task_runner_lifecycle_events_1 = require("./task-runner-lifecycle-events");
|
|
25
|
+
let TaskRunnerProcessBase = class TaskRunnerProcessBase extends typed_emitter_1.TypedEmitter {
|
|
26
|
+
constructor(logger, runnerConfig, authService, runnerLifecycleEvents) {
|
|
27
|
+
super();
|
|
28
|
+
this.logger = logger;
|
|
29
|
+
this.runnerConfig = runnerConfig;
|
|
30
|
+
this.authService = authService;
|
|
31
|
+
this.runnerLifecycleEvents = runnerLifecycleEvents;
|
|
32
|
+
this.process = null;
|
|
33
|
+
this._runPromise = null;
|
|
34
|
+
this.isShuttingDown = false;
|
|
35
|
+
this.logger = logger.scoped(this.loggerScope);
|
|
36
|
+
this.runnerLifecycleEvents.on('runner:failed-heartbeat-check', () => {
|
|
37
|
+
this.logger.warn('Task runner failed heartbeat check, restarting...');
|
|
38
|
+
void this.forceRestart();
|
|
39
|
+
});
|
|
40
|
+
this.runnerLifecycleEvents.on('runner:timed-out-during-task', () => {
|
|
41
|
+
this.logger.warn('Task runner timed out during task, restarting...');
|
|
42
|
+
void this.forceRestart();
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
get isRunning() {
|
|
46
|
+
return this.process !== null;
|
|
47
|
+
}
|
|
48
|
+
get pid() {
|
|
49
|
+
return this.process?.pid;
|
|
50
|
+
}
|
|
51
|
+
get runPromise() {
|
|
52
|
+
return this._runPromise;
|
|
53
|
+
}
|
|
54
|
+
get isInternal() {
|
|
55
|
+
return this.runnerConfig.mode === 'internal';
|
|
56
|
+
}
|
|
57
|
+
async start() {
|
|
58
|
+
(0, strict_1.default)(!this.process, `${this.name} already running`);
|
|
59
|
+
const grantToken = await this.authService.createGrantToken();
|
|
60
|
+
const taskBrokerUri = `http://127.0.0.1:${this.runnerConfig.port}`;
|
|
61
|
+
this.process = await this.startProcess(grantToken, taskBrokerUri);
|
|
62
|
+
(0, forward_to_logger_1.forwardToLogger)(this.logger, this.process, `[${this.name}] `);
|
|
63
|
+
this.monitorProcess(this.process);
|
|
64
|
+
}
|
|
65
|
+
async stop() {
|
|
66
|
+
if (!this.process)
|
|
67
|
+
return;
|
|
68
|
+
this.isShuttingDown = true;
|
|
69
|
+
this.process.kill();
|
|
70
|
+
await this._runPromise;
|
|
71
|
+
this.isShuttingDown = false;
|
|
72
|
+
}
|
|
73
|
+
async forceRestart() {
|
|
74
|
+
if (!this.process)
|
|
75
|
+
return;
|
|
76
|
+
this.process.kill('SIGKILL');
|
|
77
|
+
await this._runPromise;
|
|
78
|
+
}
|
|
79
|
+
onProcessExit(code, resolveFn) {
|
|
80
|
+
this.process = null;
|
|
81
|
+
const exitReason = this.analyzeExitReason?.(code) ?? { reason: 'unknown' };
|
|
82
|
+
this.emit('exit', exitReason);
|
|
83
|
+
resolveFn();
|
|
84
|
+
if (!this.isShuttingDown) {
|
|
85
|
+
setImmediate(async () => await this.start());
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
monitorProcess(taskRunnerProcess) {
|
|
89
|
+
this._runPromise = new Promise((resolve) => {
|
|
90
|
+
this.setupProcessMonitoring?.(taskRunnerProcess);
|
|
91
|
+
taskRunnerProcess.on('exit', (code) => {
|
|
92
|
+
this.onProcessExit(code, resolve);
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
exports.TaskRunnerProcessBase = TaskRunnerProcessBase;
|
|
98
|
+
__decorate([
|
|
99
|
+
(0, decorators_1.OnShutdown)(),
|
|
100
|
+
__metadata("design:type", Function),
|
|
101
|
+
__metadata("design:paramtypes", []),
|
|
102
|
+
__metadata("design:returntype", Promise)
|
|
103
|
+
], TaskRunnerProcessBase.prototype, "stop", null);
|
|
104
|
+
exports.TaskRunnerProcessBase = TaskRunnerProcessBase = __decorate([
|
|
105
|
+
(0, di_1.Service)(),
|
|
106
|
+
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
107
|
+
config_1.TaskRunnersConfig,
|
|
108
|
+
task_broker_auth_service_1.TaskBrokerAuthService,
|
|
109
|
+
task_runner_lifecycle_events_1.TaskRunnerLifecycleEvents])
|
|
110
|
+
], TaskRunnerProcessBase);
|
|
111
|
+
//# sourceMappingURL=task-runner-process-base.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-runner-process-base.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-process-base.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA0D;AAC1D,gDAA6C;AAC7C,gCAAkC;AAClC,gEAAwC;AAGxC,mDAA+C;AAE/C,2DAAsD;AACtD,0FAAoF;AACpF,iFAA2E;AAapE,IAAe,qBAAqB,GAApC,MAAe,qBAAsB,SAAQ,4BAAuC;IAW1F,YACoB,MAAc,EACd,YAA+B,EAC/B,WAAkC,EAClC,qBAAgD;QAEnE,KAAK,EAAE,CAAC;QALW,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAmB;QAC/B,gBAAW,GAAX,WAAW,CAAuB;QAClC,0BAAqB,GAArB,qBAAqB,CAA2B;QAV1D,YAAO,GAAwB,IAAI,CAAC;QAEpC,gBAAW,GAAyB,IAAI,CAAC;QAEzC,mBAAc,GAAG,KAAK,CAAC;QAShC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAE9C,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACnE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YACtE,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;YACrE,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IAC9B,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC;IAC1B,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,CAAC;IACzB,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,KAAK,UAAU,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,KAAK;QACV,IAAA,gBAAM,EAAC,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,kBAAkB,CAAC,CAAC;QAEtD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAC7D,MAAM,aAAa,GAAG,oBAAoB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAEnE,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAClE,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;QAC9D,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAE1B,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,WAAW,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC7B,CAAC;IAGS,KAAK,CAAC,YAAY;QAC3B,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAE1B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,WAAW,CAAC;IACxB,CAAC;IAES,aAAa,CAAC,IAAmB,EAAE,SAAqB;QACjE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC3E,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC9B,SAAS,EAAE,CAAC;QACZ,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC9C,CAAC;IACF,CAAC;IAES,cAAc,CAAC,iBAA+B;QACvD,IAAI,CAAC,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC,sBAAsB,EAAE,CAAC,iBAAiB,CAAC,CAAC;YACjD,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACrC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;CAKD,CAAA;AAlGqB,sDAAqB;AA2DpC;IADL,IAAA,uBAAU,GAAE;;;;iDAQZ;gCAlEoB,qBAAqB;IAD1C,IAAA,YAAO,GAAE;qCAamB,uBAAM;QACA,0BAAiB;QAClB,gDAAqB;QACX,wDAAyB;GAf/C,qBAAqB,CAkG1C"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Logger } from '@n8n/backend-common';
|
|
2
|
+
import { TaskRunnersConfig } from '@n8n/config';
|
|
3
|
+
import { TaskBrokerAuthService } from './task-broker/auth/task-broker-auth.service';
|
|
4
|
+
import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
|
|
5
|
+
import { ChildProcess, ExitReason, TaskRunnerProcessBase } from './task-runner-process-base';
|
|
6
|
+
export declare class JsTaskRunnerProcess extends TaskRunnerProcessBase {
|
|
7
|
+
readonly logger: Logger;
|
|
8
|
+
readonly runnerConfig: TaskRunnersConfig;
|
|
9
|
+
readonly authService: TaskBrokerAuthService;
|
|
10
|
+
readonly runnerLifecycleEvents: TaskRunnerLifecycleEvents;
|
|
11
|
+
readonly name = "runnner:js";
|
|
12
|
+
readonly loggerScope = "task-runner-js";
|
|
13
|
+
private oomDetector;
|
|
14
|
+
constructor(logger: Logger, runnerConfig: TaskRunnersConfig, authService: TaskBrokerAuthService, runnerLifecycleEvents: TaskRunnerLifecycleEvents);
|
|
15
|
+
startProcess(grantToken: string, taskBrokerUri: string): Promise<ChildProcess>;
|
|
16
|
+
setupProcessMonitoring(process: ChildProcess): void;
|
|
17
|
+
analyzeExitReason(): {
|
|
18
|
+
reason: ExitReason;
|
|
19
|
+
};
|
|
20
|
+
private getProcessEnvVars;
|
|
21
|
+
}
|