n8n 1.62.4 → 1.63.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/active-workflow-manager.js +1 -1
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.js +2 -1
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/webhook.js +6 -2
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +6 -8
- package/dist/commands/worker.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.d.ts +0 -1
- package/dist/concurrency/concurrency-control.service.js +5 -8
- package/dist/concurrency/concurrency-control.service.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/controllers/ai.controller.d.ts +15 -0
- package/dist/controllers/{ai-assistant.controller.js → ai.controller.js} +31 -15
- package/dist/controllers/ai.controller.js.map +1 -0
- package/dist/controllers/orchestration.controller.d.ts +0 -1
- package/dist/controllers/orchestration.controller.js +0 -12
- package/dist/controllers/orchestration.controller.js.map +1 -1
- package/dist/environments/source-control/source-control-helper.ee.d.ts +1 -0
- package/dist/environments/source-control/source-control-helper.ee.js +12 -0
- package/dist/environments/source-control/source-control-helper.ee.js.map +1 -1
- package/dist/environments/source-control/source-control-import.service.ee.js +8 -6
- package/dist/environments/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/environments/source-control/source-control.controller.ee.js.map +1 -1
- package/dist/environments/source-control/source-control.service.ee.d.ts +1 -1
- package/dist/environments/source-control/source-control.service.ee.js +14 -7
- package/dist/environments/source-control/source-control.service.ee.js.map +1 -1
- package/dist/errors/response-errors/webhook-not-found.error.js +7 -3
- package/dist/errors/response-errors/webhook-not-found.error.js.map +1 -1
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js +1 -1
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js.map +1 -1
- package/dist/events/maps/pub-sub.event-map.d.ts +0 -9
- package/dist/events/maps/relay.event-map.d.ts +4 -0
- package/dist/events/relays/telemetry.event-relay.d.ts +1 -0
- package/dist/events/relays/telemetry.event-relay.js +7 -0
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle-hooks/shared/shared-hook-functions.d.ts +1 -1
- package/dist/execution-lifecycle-hooks/shared/shared-hook-functions.js +3 -1
- package/dist/execution-lifecycle-hooks/shared/shared-hook-functions.js.map +1 -1
- package/dist/license/license.controller.d.ts +11 -2
- package/dist/license/license.controller.js +28 -2
- package/dist/license/license.controller.js.map +1 -1
- package/dist/license/license.service.d.ts +9 -0
- package/dist/license/license.service.js +49 -5
- package/dist/license/license.service.js.map +1 -1
- package/dist/license.d.ts +1 -0
- package/dist/license.js +7 -3
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +6 -7
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/logging/logger.service.d.ts +10 -1
- package/dist/logging/logger.service.js +65 -12
- package/dist/logging/logger.service.js.map +1 -1
- package/dist/logging/types.d.ts +8 -5
- package/dist/requests.d.ts +2 -1
- package/dist/runners/task-managers/task-manager.d.ts +4 -2
- package/dist/runners/task-managers/task-manager.js +3 -1
- package/dist/runners/task-managers/task-manager.js.map +1 -1
- package/dist/runners/task-runner-process.js +1 -1
- package/dist/scaling/constants.d.ts +2 -0
- package/dist/scaling/constants.js +6 -1
- package/dist/scaling/constants.js.map +1 -1
- package/dist/scaling/pubsub/publisher.service.js +7 -1
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/pubsub-handler.d.ts +22 -0
- package/dist/scaling/pubsub/pubsub-handler.js +87 -0
- package/dist/scaling/pubsub/pubsub-handler.js.map +1 -0
- package/dist/scaling/pubsub/pubsub.types.d.ts +3 -7
- package/dist/scaling/pubsub/subscriber.service.d.ts +5 -1
- package/dist/scaling/pubsub/subscriber.service.js +35 -2
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/scaling/scaling.service.js +30 -24
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/scaling/worker-server.d.ts +5 -4
- package/dist/scaling/worker-server.js +24 -33
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/scaling/worker-status.d.ts +24 -0
- package/dist/scaling/worker-status.js +57 -0
- package/dist/scaling/worker-status.js.map +1 -0
- package/dist/server.d.ts +1 -1
- package/dist/server.js +1 -1
- package/dist/server.js.map +1 -1
- package/dist/services/{ai-assistant.service.d.ts → ai.service.d.ts} +2 -2
- package/dist/services/{ai-assistant.service.js → ai.service.js} +13 -6
- package/dist/services/ai.service.js.map +1 -0
- package/dist/services/frontend.service.js +7 -2
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/import.service.js +1 -2
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/orchestration/main/handle-command-message-main.d.ts +46 -0
- package/dist/services/orchestration/main/handle-command-message-main.js +1 -5
- package/dist/services/orchestration/main/handle-command-message-main.js.map +1 -1
- package/dist/services/orchestration/main/handle-worker-response-message-main.d.ts +0 -21
- package/dist/services/orchestration/main/handle-worker-response-message-main.js +2 -3
- package/dist/services/orchestration/main/handle-worker-response-message-main.js.map +1 -1
- package/dist/services/orchestration.service.d.ts +0 -1
- package/dist/services/orchestration.service.js +0 -7
- package/dist/services/orchestration.service.js.map +1 -1
- package/dist/services/redis-client.service.d.ts +1 -0
- package/dist/services/redis-client.service.js +3 -0
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/telemetry/index.js +8 -1
- package/dist/telemetry/index.js.map +1 -1
- package/dist/utils/path-util.d.ts +1 -0
- package/dist/utils/path-util.js +36 -0
- package/dist/utils/path-util.js.map +1 -0
- package/dist/wait-tracker.js +6 -5
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/live-webhooks.js +2 -1
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.d.ts +2 -0
- package/dist/webhooks/waiting-webhooks.js +37 -13
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/workflow-execute-additional-data.d.ts +1 -1
- package/dist/workflow-execute-additional-data.js +2 -2
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.service.ee.js +5 -1
- package/dist/workflows/workflow-history/workflow-history.service.ee.js.map +1 -1
- package/package.json +17 -18
- package/templates/form-trigger.handlebars +8 -0
- package/templates/send-and-wait-no-action-required.handlebars +73 -0
- package/dist/controllers/ai-assistant.controller.d.ts +0 -14
- package/dist/controllers/ai-assistant.controller.js.map +0 -1
- package/dist/errors/port-taken.error.d.ts +0 -4
- package/dist/errors/port-taken.error.js +0 -11
- package/dist/errors/port-taken.error.js.map +0 -1
- package/dist/services/ai-assistant.service.js.map +0 -1
- package/dist/services/orchestration/webhook/handle-command-message-webhook.d.ts +0 -124
- package/dist/services/orchestration/webhook/handle-command-message-webhook.js +0 -72
- package/dist/services/orchestration/webhook/handle-command-message-webhook.js.map +0 -1
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.d.ts +0 -7
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.js +0 -32
- package/dist/services/orchestration/webhook/orchestration.handler.webhook.service.js.map +0 -1
- package/dist/services/orchestration/worker/handle-command-message-worker.d.ts +0 -2
- package/dist/services/orchestration/worker/handle-command-message-worker.js +0 -147
- package/dist/services/orchestration/worker/handle-command-message-worker.js.map +0 -1
- package/dist/services/orchestration/worker/orchestration.handler.worker.service.d.ts +0 -8
- package/dist/services/orchestration/worker/orchestration.handler.worker.service.js +0 -34
- package/dist/services/orchestration/worker/orchestration.handler.worker.service.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.controller.js","sourceRoot":"","sources":["../../src/license/license.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"license.controller.js","sourceRoot":"","sources":["../../src/license/license.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA+D;AAE/D,uCAA4C;AAE5C,6CAA4E;AAC5E,kFAA6E;AAE7E,wDAAoD;AAEpD,uDAAmD;AAG5C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YACkB,cAA8B,EAC9B,gBAAkC,EAClC,UAAsB;QAFtB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,eAAU,GAAV,UAAU,CAAY;IACrC,CAAC;IAGE,AAAN,KAAK,CAAC,cAAc;QACnB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IACnD,CAAC;IAIK,AAAN,KAAK,CAAC,sBAAsB,CAAC,GAAyB;QACrD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC5B,MAAM,QAAQ,GACZ,KAAyC,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;gBAErF,MAAM,IAAI,mCAAe,CAAC,QAAQ,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,mCAAe,CAAC,yBAAyB,CAAC,CAAC;YACtD,CAAC;QACF,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,wBAAwB,CAC7B,IAAqB,EACrB,IAAc,EACR,OAAsC;QAE5C,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC;YACzD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU;YAC5C,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE;YACjD,WAAW,EAAE,sBAAsB;SACnC,CAAC,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,eAAe,CAAC,GAA4B;QACjD,MAAM,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QACnC,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QACzD,OAAO,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC;IAIK,AAAN,KAAK,CAAC,YAAY;QACjB,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,OAAO,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,eAAe;QAC5B,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QAC/D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QACxD,OAAO,EAAE,GAAG,IAAI,EAAE,eAAe,EAAE,CAAC;IACrC,CAAC;CACD,CAAA;AA/DY,8CAAiB;AAQvB;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;uDAGR;AAIK;IAFL,IAAA,iBAAI,EAAC,2BAA2B,CAAC;IACjC,IAAA,wBAAW,EAAC,gBAAgB,CAAC;;;;+DAc7B;AAGK;IADL,IAAA,iBAAI,EAAC,kCAAkC,CAAC;IAIvC,WAAA,iBAAI,CAAA;;6CADC,QAAQ;QACC,yCAA6B;;iEAQ5C;AAIK;IAFL,IAAA,iBAAI,EAAC,WAAW,CAAC;IACjB,IAAA,wBAAW,EAAC,gBAAgB,CAAC;;;;wDAK7B;AAIK;IAFL,IAAA,iBAAI,EAAC,QAAQ,CAAC;IACd,IAAA,wBAAW,EAAC,gBAAgB,CAAC;;;;qDAI7B;4BAxDW,iBAAiB;IAD7B,IAAA,2BAAc,EAAC,UAAU,CAAC;qCAGQ,gCAAc;QACZ,2BAAgB;QACtB,wBAAU;GAJ5B,iBAAiB,CA+D7B"}
|
|
@@ -33,6 +33,15 @@ export declare class LicenseService {
|
|
|
33
33
|
};
|
|
34
34
|
}>;
|
|
35
35
|
requestEnterpriseTrial(user: User): Promise<void>;
|
|
36
|
+
registerCommunityEdition({ email, instanceId, instanceUrl, licenseType, }: {
|
|
37
|
+
email: string;
|
|
38
|
+
instanceId: string;
|
|
39
|
+
instanceUrl: string;
|
|
40
|
+
licenseType: string;
|
|
41
|
+
}): Promise<{
|
|
42
|
+
title: string;
|
|
43
|
+
text: string;
|
|
44
|
+
}>;
|
|
36
45
|
getManagementJwt(): string;
|
|
37
46
|
activateLicense(activationKey: string): Promise<void>;
|
|
38
47
|
renewLicense(): Promise<void>;
|
|
@@ -1,19 +1,40 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
2
18
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
19
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
20
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
21
|
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
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
23
|
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
+
if (mod && mod.__esModule) return mod;
|
|
26
|
+
var result = {};
|
|
27
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
+
__setModuleDefault(result, mod);
|
|
29
|
+
return result;
|
|
30
|
+
};
|
|
8
31
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
32
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
33
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
35
|
exports.LicenseService = exports.LicenseErrors = void 0;
|
|
16
|
-
const axios_1 =
|
|
36
|
+
const axios_1 = __importStar(require("axios"));
|
|
37
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
38
|
const typedi_1 = require("typedi");
|
|
18
39
|
const workflow_repository_1 = require("../databases/repositories/workflow.repository");
|
|
19
40
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
@@ -23,7 +44,7 @@ const logger_service_1 = require("../logging/logger.service");
|
|
|
23
44
|
const url_service_1 = require("../services/url.service");
|
|
24
45
|
exports.LicenseErrors = {
|
|
25
46
|
SCHEMA_VALIDATION: 'Activation key is in the wrong format',
|
|
26
|
-
RESERVATION_EXHAUSTED: 'Activation key has been used too many times
|
|
47
|
+
RESERVATION_EXHAUSTED: 'Activation key has been used too many times',
|
|
27
48
|
RESERVATION_EXPIRED: 'Activation key has expired',
|
|
28
49
|
NOT_FOUND: 'Activation key not found',
|
|
29
50
|
RESERVATION_CONFLICT: 'Activation key not found',
|
|
@@ -63,6 +84,29 @@ let LicenseService = class LicenseService {
|
|
|
63
84
|
instanceUrl: this.urlService.getWebhookBaseUrl(),
|
|
64
85
|
});
|
|
65
86
|
}
|
|
87
|
+
async registerCommunityEdition({ email, instanceId, instanceUrl, licenseType, }) {
|
|
88
|
+
try {
|
|
89
|
+
const { data: { licenseKey, ...rest }, } = await axios_1.default.post('https://enterprise.n8n.io/community-registered', {
|
|
90
|
+
email,
|
|
91
|
+
instanceId,
|
|
92
|
+
instanceUrl,
|
|
93
|
+
licenseType,
|
|
94
|
+
});
|
|
95
|
+
this.eventService.emit('license-community-plus-registered', { email, licenseKey });
|
|
96
|
+
return rest;
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
if (e instanceof axios_1.AxiosError) {
|
|
100
|
+
const error = e;
|
|
101
|
+
const errorMsg = error.response?.data?.message ?? e.message;
|
|
102
|
+
throw new bad_request_error_1.BadRequestError('Failed to register community edition: ' + errorMsg);
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
this.logger.error('Failed to register community edition', { error: (0, n8n_workflow_1.ensureError)(e) });
|
|
106
|
+
throw new bad_request_error_1.BadRequestError('Failed to register community edition');
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
66
110
|
getManagementJwt() {
|
|
67
111
|
return this.license.getManagementJwt();
|
|
68
112
|
}
|
|
@@ -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/license.d.ts
CHANGED
|
@@ -36,6 +36,7 @@ export declare class License {
|
|
|
36
36
|
isLdapEnabled(): boolean;
|
|
37
37
|
isSamlEnabled(): boolean;
|
|
38
38
|
isAiAssistantEnabled(): boolean;
|
|
39
|
+
isAskAiEnabled(): boolean;
|
|
39
40
|
isAdvancedExecutionFiltersEnabled(): boolean;
|
|
40
41
|
isAdvancedPermissionsLicensed(): boolean;
|
|
41
42
|
isDebugInEditorLicensed(): boolean;
|
package/dist/license.js
CHANGED
|
@@ -54,6 +54,7 @@ let License = class License {
|
|
|
54
54
|
this.settingsRepository = settingsRepository;
|
|
55
55
|
this.licenseMetricsService = licenseMetricsService;
|
|
56
56
|
this.isShuttingDown = false;
|
|
57
|
+
this.logger = this.logger.withScope('license');
|
|
57
58
|
}
|
|
58
59
|
renewalEnabled() {
|
|
59
60
|
if (this.instanceSettings.instanceType !== 'main')
|
|
@@ -111,9 +112,9 @@ let License = class License {
|
|
|
111
112
|
await this.manager.initialize();
|
|
112
113
|
this.logger.debug('License initialized');
|
|
113
114
|
}
|
|
114
|
-
catch (
|
|
115
|
-
if (
|
|
116
|
-
this.logger.error('Could not initialize license manager sdk',
|
|
115
|
+
catch (error) {
|
|
116
|
+
if (error instanceof Error) {
|
|
117
|
+
this.logger.error('Could not initialize license manager sdk', { error });
|
|
117
118
|
}
|
|
118
119
|
}
|
|
119
120
|
}
|
|
@@ -211,6 +212,9 @@ let License = class License {
|
|
|
211
212
|
isAiAssistantEnabled() {
|
|
212
213
|
return this.isFeatureEnabled(constants_1.LICENSE_FEATURES.AI_ASSISTANT);
|
|
213
214
|
}
|
|
215
|
+
isAskAiEnabled() {
|
|
216
|
+
return this.isFeatureEnabled(constants_1.LICENSE_FEATURES.ASK_AI);
|
|
217
|
+
}
|
|
214
218
|
isAdvancedExecutionFiltersEnabled() {
|
|
215
219
|
return this.isFeatureEnabled(constants_1.LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS);
|
|
216
220
|
}
|
package/dist/license.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.js","sourceRoot":"","sources":["../src/license.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qDAAqD;AACrD,uCAAgE;AAChE,iDAA4C;AAE5C,sDAA8B;AAC9B,sFAAkF;AAClF,0DAAsD;AACtD,6DAAkD;AAClD,+EAA0E;AAC1E,4EAAwE;AAExE,2CAMqB;AAUd,IAAM,OAAO,GAAb,MAAM,OAAO;IAKnB,YACkB,MAAc,EACd,gBAAkC,EAClC,oBAA0C,EAC1C,kBAAsC,EACtC,qBAA4C;QAJ5C,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,0BAAqB,GAArB,qBAAqB,CAAuB;QAPtD,mBAAc,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"license.js","sourceRoot":"","sources":["../src/license.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,7 @@ const picocolors_1 = __importDefault(require("picocolors"));
|
|
|
46
46
|
const typedi_1 = require("typedi");
|
|
47
47
|
const constants_1 = require("./constants");
|
|
48
48
|
const logger_service_1 = require("./logging/logger.service");
|
|
49
|
+
const path_util_1 = require("./utils/path-util");
|
|
49
50
|
let LoadNodesAndCredentials = class LoadNodesAndCredentials {
|
|
50
51
|
constructor(logger, instanceSettings, globalConfig) {
|
|
51
52
|
this.logger = logger;
|
|
@@ -123,14 +124,12 @@ let LoadNodesAndCredentials = class LoadNodesAndCredentials {
|
|
|
123
124
|
}
|
|
124
125
|
resolveIcon(packageName, url) {
|
|
125
126
|
const loader = this.loaders[packageName];
|
|
126
|
-
if (loader) {
|
|
127
|
-
|
|
128
|
-
const filePath = path_1.default.resolve(loader.directory, url.substring(pathPrefix.length));
|
|
129
|
-
if (!path_1.default.relative(loader.directory, filePath).includes('..')) {
|
|
130
|
-
return filePath;
|
|
131
|
-
}
|
|
127
|
+
if (!loader) {
|
|
128
|
+
return undefined;
|
|
132
129
|
}
|
|
133
|
-
|
|
130
|
+
const pathPrefix = `/icons/${packageName}/`;
|
|
131
|
+
const filePath = path_1.default.resolve(loader.directory, url.substring(pathPrefix.length));
|
|
132
|
+
return (0, path_util_1.isContainedWithin)(loader.directory, filePath) ? filePath : undefined;
|
|
134
133
|
}
|
|
135
134
|
getCustomDirectories() {
|
|
136
135
|
const customDirectories = [this.instanceSettings.customExtensionDir];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load-nodes-and-credentials.js","sourceRoot":"","sources":["../src/load-nodes-and-credentials.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"load-nodes-and-credentials.js","sourceRoot":"","sources":["../src/load-nodes-and-credentials.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,0DAA6B;AAC7B,2DAAqC;AAErC,uCAMkB;AAQlB,+CAAkG;AAClG,gDAAwB;AACxB,4DAAoC;AACpC,mCAA4C;AAE5C,2CAMqB;AACrB,6DAAkD;AAClD,iDAAsD;AAQ/C,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAkBnC,YACkB,MAAc,EACd,gBAAkC,EAClC,YAA0B;QAF1B,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,iBAAY,GAAZ,YAAY,CAAc;QApBpC,UAAK,GAA6B,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAGzE,WAAM,GAA8B,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAInE,UAAK,GAAU,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAE9C,YAAO,GAAoC,EAAE,CAAC;QAE9C,iBAAY,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;QAE/C,iBAAY,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;QAEvC,mBAAc,GAA+B,EAAE,CAAC;IAMrD,CAAC;IAEJ,KAAK,CAAC,IAAI;QACT,IAAI,kBAAM;YAAE,MAAM,IAAI,+BAAgB,CAAC,wBAAwB,CAAC,CAAC;QAGjE,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAIrD,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAEhC,IAAI,CAAC,sBAAU,EAAE,CAAC;YACjB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YAC5C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAClD,CAAC;QAGD,MAAM,eAAe,GAAG;YAEvB,cAAI,CAAC,IAAI,CAAC,mBAAO,EAAE,IAAI,CAAC;YAGxB,cAAI,CAAC,IAAI,CAAC,mBAAO,EAAE,cAAc,CAAC;SAClC,CAAC;QAEF,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC9C,MAAM,IAAI,CAAC,wBAAwB,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;YACtE,MAAM,IAAI,CAAC,wBAAwB,CAAC,cAAc,EAAE,0BAA0B,CAAC,CAAC;QACjF,CAAC;QAID,MAAM,IAAI,CAAC,wBAAwB,CAClC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CACjE,CAAC;QAEF,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;QAC5C,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,gBAAgB,CAAC,EAAuB;QACvC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,IAAY;QACvB,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,IAAI,iBAAiB;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IAChC,CAAC;IAED,IAAI,WAAW;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,IAAI,gBAAgB;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAC/B,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,wBAAwB,CACrC,cAAsB,EACtB,WAAoB;QAEpB,MAAM,WAAW,GAAG;YACnB,GAAG,EAAE,cAAc;YACnB,eAAe,EAAE,IAAI;YACrB,IAAI,EAAE,CAAC;SACP,CAAC;QACF,MAAM,qBAAqB,GAAG,WAAW;YACxC,CAAC,CAAC,MAAM,IAAA,mBAAI,EAAC,WAAW,EAAE,WAAW,CAAC;YACtC,CAAC,CAAC;gBACA,GAAG,CAAC,MAAM,IAAA,mBAAI,EAAC,aAAa,EAAE,WAAW,CAAC,CAAC;gBAC3C,GAAG,CAAC,MAAM,IAAA,mBAAI,EAAC,gBAAgB,EAAE,EAAE,GAAG,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;aAC9D,CAAC;QAEJ,KAAK,MAAM,WAAW,IAAI,qBAAqB,EAAE,CAAC;YACjD,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,kBAAkB,CAC5B,qCAA0B,EAC1B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,CACtC,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC;gBAC5C,iCAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;QACF,CAAC;IACF,CAAC;IAED,WAAW,CAAC,WAAmB,EAAE,GAAW;QAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,MAAM,UAAU,GAAG,UAAU,WAAW,GAAG,CAAC;QAC5C,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAElF,OAAO,IAAA,6BAAiB,EAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,CAAC;IAED,oBAAoB;QACnB,MAAM,iBAAiB,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;QAErE,IAAI,OAAO,CAAC,GAAG,CAAC,+BAAoB,CAAC,KAAK,SAAS,EAAE,CAAC;YACrD,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,CAAC,+BAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5E,iBAAiB,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,iBAAiB,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,8BAA8B;QAC3C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,oBAAoB,EAAE,EAAE,CAAC;YACrD,MAAM,IAAI,CAAC,kBAAkB,CAAC,gCAAqB,EAAE,SAAS,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAmB;QACpC,MAAM,qBAAqB,GAAG,cAAI,CAAC,IAAI,CACtC,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EACtC,cAAc,EACd,WAAW,CACX,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,iCAAsB,EAAE,qBAAqB,CAAC,CAAC;IACrF,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAmB;QACtC,IAAI,WAAW,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAMO,iBAAiB,CAAC,WAAiC;QAC1D,IAAI,CAAC,WAAW,CAAC,WAAW;YAAE,OAAO,KAAK,CAAC;QAE3C,OAAO,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,mDAAmD,WAAW,CAAC,IAAI,+BAA+B,IAAI,GAAG,CACzG,CAAC;gBACF,OAAO,KAAK,CAAC;YACd,CAAC;YACD,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS;gBAAE,OAAO,IAAI,CAAC;YAErD,OAAO,CACN,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC/B,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CACpC,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAClE,CACD,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC;IAMO,0BAA0B;QACjC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAA0B,EAAE,EAAE;YACvD,MAAM,eAAe,GACpB,IAAI,CAAC,cAAc,KAAK,SAAS,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,CAAC,OAAO,CAAC;YAE3E,IAAI,eAAe,EAAE,CAAC;gBACrB,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;oBAAE,OAAO;gBAE1C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC7B,IACC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;wBAC1C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;wBACxB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,gCAAoB,EAC5D,CAAC;wBACF,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;4BACd,IAAI,EAAE,gCAAoB;4BAC1B,KAAK,EAAE,+BAAmB;yBAC1B,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAKO,KAAK,CAAC,kBAAkB,CAC/B,WAAoE,EACpE,GAAW;QAEX,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1E,IAAI,MAAM,YAAY,iCAAsB,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACpF,MAAM,IAAI,+BAAgB,CACzB,oBAAU,CAAC,GAAG,CACb,iBAAiB,MAAM,CAAC,WAAW,gEAAgE,GAAG,EAAE,CACxG,CACD,CAAC;QACH,CAAC;QACD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC;QAC1C,OAAO,MAAM,CAAC;IACf,CAAC;IAQD,aAAa;QACZ,MAAM,WAAW,GAChB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;QAEvE,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACtC,MAAM,WAAW,GAChB,eAAe,CAAC,UAAU,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,0BAAW,CAAC,mBAAmB,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,CAAC;YAE7E,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YAEpF,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;iBAC5D,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;iBAClF,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC;YAE5C,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAChC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAChE,CAAC;QACH,CAAC;IACF,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,IAAI,CAAC,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAC5C,IAAI,CAAC,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAE5C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAElD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YAC3C,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACxD,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAG1E,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;gBAC7C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAClE,CAAC;YAED,KAAK,MAAM,kBAAkB,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;gBACzD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;YAC1F,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACpD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;oBACxB,SAAS;oBACT,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC;iBAC5C,CAAC;YACH,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;gBACtC,MAAM,EACL,SAAS,EACT,UAAU,EACV,cAAc,EACd,OAAO,EAAE,UAAU,GACnB,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG;oBAC9B,SAAS;oBACT,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC;oBAC5C,cAAc,EACb,MAAM,YAAY,iCAAsB;wBACvC,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,IAAI,QAAQ,EAAE,CAAC;wBACxE,CAAC,CAAC,SAAS;oBACb,OAAO,EAAE,UAAU;iBACnB,CAAC;YACH,CAAC;QACF,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAElC,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACjD,MAAM,aAAa,EAAE,CAAC;QACvB,CAAC;IACF,CAAC;IAED,KAAK,CAAC,cAAc;QACnB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,wDAAa,iBAAiB,GAAC,CAAC;QAE9D,MAAM,EAAE,KAAK,EAAE,GAAG,wDAAa,UAAU,GAAC,CAAC;QAE3C,MAAM,EAAE,IAAI,EAAE,GAAG,wDAAa,QAAQ,GAAC,CAAC;QACxC,MAAM,IAAI,GAAG,kBAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEjC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACpD,IAAI,CAAC;gBACJ,MAAM,kBAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;YAAC,MAAM,CAAC;gBAER,OAAO;YACR,CAAC;YAED,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,kBAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,cAAI,CAAC,GAAG,CAAC,CAAC;YACxF,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,IAAI,EAAE;gBACpC,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CACtE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CACnC,CAAC;gBACF,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACpC,OAAO,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;gBACvB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;YAC9C,CAAC,EAAE,GAAG,CAAC,CAAC;YAER,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY;gBAClC,CAAC,CAAC,CAAC,eAAe,EAAE,qBAAqB,CAAC;gBAC1C,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YAC5B,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;AApWY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,gBAAO,GAAE;qCAoBiB,uBAAM;QACI,2BAAgB;QACpB,qBAAY;GArBhC,uBAAuB,CAoWnC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LogScope } from '@n8n/config';
|
|
1
2
|
import { GlobalConfig } from '@n8n/config';
|
|
2
3
|
import { InstanceSettings } from 'n8n-core';
|
|
3
4
|
import winston from 'winston';
|
|
@@ -5,12 +6,20 @@ import type { LogMetadata } from './types';
|
|
|
5
6
|
export declare class Logger {
|
|
6
7
|
private readonly globalConfig;
|
|
7
8
|
private readonly instanceSettings;
|
|
8
|
-
private
|
|
9
|
+
private internalLogger;
|
|
9
10
|
private readonly level;
|
|
11
|
+
private readonly scopes;
|
|
12
|
+
private get isScopingEnabled();
|
|
10
13
|
constructor(globalConfig: GlobalConfig, instanceSettings: InstanceSettings);
|
|
14
|
+
private setInternalLogger;
|
|
15
|
+
withScope(scope: LogScope): Logger;
|
|
11
16
|
private log;
|
|
12
17
|
private setLevel;
|
|
13
18
|
private setConsoleTransport;
|
|
19
|
+
private scopeFilter;
|
|
20
|
+
private debugDevConsoleFormat;
|
|
21
|
+
private debugProdConsoleFormat;
|
|
22
|
+
private devTsFormat;
|
|
14
23
|
private toPrintable;
|
|
15
24
|
private setFileTransport;
|
|
16
25
|
error(message: string, metadata?: LogMetadata): void;
|
|
@@ -34,6 +34,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
34
34
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
|
+
var Logger_1;
|
|
37
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
39
|
exports.Logger = void 0;
|
|
39
40
|
const config_1 = require("@n8n/config");
|
|
@@ -41,11 +42,16 @@ const callsites_1 = __importDefault(require("callsites"));
|
|
|
41
42
|
const n8n_core_1 = require("n8n-core");
|
|
42
43
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
43
44
|
const node_path_1 = __importStar(require("node:path"));
|
|
45
|
+
const picocolors_1 = __importDefault(require("picocolors"));
|
|
44
46
|
const typedi_1 = require("typedi");
|
|
45
47
|
const winston_1 = __importDefault(require("winston"));
|
|
48
|
+
const constants_1 = require("../constants");
|
|
46
49
|
const utils_1 = require("../utils");
|
|
47
|
-
const
|
|
48
|
-
let Logger = class Logger {
|
|
50
|
+
const constants_2 = require("./constants");
|
|
51
|
+
let Logger = Logger_1 = class Logger {
|
|
52
|
+
get isScopingEnabled() {
|
|
53
|
+
return this.scopes.size > 0;
|
|
54
|
+
}
|
|
49
55
|
constructor(globalConfig, instanceSettings) {
|
|
50
56
|
this.globalConfig = globalConfig;
|
|
51
57
|
this.instanceSettings = instanceSettings;
|
|
@@ -57,14 +63,24 @@ let Logger = class Logger {
|
|
|
57
63
|
});
|
|
58
64
|
if (!isSilent) {
|
|
59
65
|
this.setLevel();
|
|
60
|
-
const { outputs } = this.globalConfig.logging;
|
|
66
|
+
const { outputs, scopes } = this.globalConfig.logging;
|
|
61
67
|
if (outputs.includes('console'))
|
|
62
68
|
this.setConsoleTransport();
|
|
63
69
|
if (outputs.includes('file'))
|
|
64
70
|
this.setFileTransport();
|
|
71
|
+
this.scopes = new Set(scopes);
|
|
65
72
|
}
|
|
66
73
|
n8n_workflow_1.LoggerProxy.init(this);
|
|
67
74
|
}
|
|
75
|
+
setInternalLogger(internalLogger) {
|
|
76
|
+
this.internalLogger = internalLogger;
|
|
77
|
+
}
|
|
78
|
+
withScope(scope) {
|
|
79
|
+
const scopedLogger = new Logger_1(this.globalConfig, this.instanceSettings);
|
|
80
|
+
const childLogger = this.internalLogger.child({ scope });
|
|
81
|
+
scopedLogger.setInternalLogger(childLogger);
|
|
82
|
+
return scopedLogger;
|
|
83
|
+
}
|
|
68
84
|
log(level, message, metadata) {
|
|
69
85
|
const location = {};
|
|
70
86
|
const caller = (0, callsites_1.default)().at(2);
|
|
@@ -80,22 +96,59 @@ let Logger = class Logger {
|
|
|
80
96
|
const { levels } = this.internalLogger;
|
|
81
97
|
for (const logLevel of n8n_workflow_1.LOG_LEVELS) {
|
|
82
98
|
if (levels[logLevel] > levels[this.level]) {
|
|
83
|
-
Object.defineProperty(this, logLevel, { value:
|
|
99
|
+
Object.defineProperty(this, logLevel, { value: constants_2.noOp });
|
|
84
100
|
}
|
|
85
101
|
}
|
|
86
102
|
}
|
|
87
103
|
setConsoleTransport() {
|
|
88
|
-
const format = this.level === 'debug'
|
|
89
|
-
?
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
: winston_1.default.format.printf(({ message }) => message);
|
|
104
|
+
const format = this.level === 'debug' && constants_1.inDevelopment
|
|
105
|
+
? this.debugDevConsoleFormat()
|
|
106
|
+
: this.level === 'debug' && constants_1.inProduction
|
|
107
|
+
? this.debugProdConsoleFormat()
|
|
108
|
+
: winston_1.default.format.printf(({ message }) => message);
|
|
94
109
|
this.internalLogger.add(new winston_1.default.transports.Console({ format }));
|
|
95
110
|
}
|
|
111
|
+
scopeFilter() {
|
|
112
|
+
return winston_1.default.format((info) => {
|
|
113
|
+
const shouldIncludeScope = info.metadata.scope && this.scopes.has(info.metadata.scope);
|
|
114
|
+
if (this.isScopingEnabled && !shouldIncludeScope)
|
|
115
|
+
return false;
|
|
116
|
+
return info;
|
|
117
|
+
})();
|
|
118
|
+
}
|
|
119
|
+
debugDevConsoleFormat() {
|
|
120
|
+
return winston_1.default.format.combine(winston_1.default.format.metadata(), winston_1.default.format.timestamp({ format: () => this.devTsFormat() }), winston_1.default.format.colorize({ all: true }), this.scopeFilter(), winston_1.default.format.printf(({ level: _level, message, timestamp, metadata: _metadata }) => {
|
|
121
|
+
const SEPARATOR = ' '.repeat(3);
|
|
122
|
+
const LOG_LEVEL_COLUMN_WIDTH = 15;
|
|
123
|
+
const level = _level.toLowerCase().padEnd(LOG_LEVEL_COLUMN_WIDTH, ' ');
|
|
124
|
+
const metadata = this.toPrintable(_metadata);
|
|
125
|
+
return [timestamp, level, message + ' ' + picocolors_1.default.dim(metadata)].join(SEPARATOR);
|
|
126
|
+
}));
|
|
127
|
+
}
|
|
128
|
+
debugProdConsoleFormat() {
|
|
129
|
+
return winston_1.default.format.combine(winston_1.default.format.metadata(), winston_1.default.format.timestamp(), this.scopeFilter(), winston_1.default.format.printf(({ level, message, timestamp, metadata }) => {
|
|
130
|
+
const _metadata = this.toPrintable(metadata);
|
|
131
|
+
return `${timestamp} | ${level.padEnd(5)} | ${message}${_metadata ? ' ' + _metadata : ''}`;
|
|
132
|
+
}));
|
|
133
|
+
}
|
|
134
|
+
devTsFormat() {
|
|
135
|
+
const now = new Date();
|
|
136
|
+
const pad = (num, digits = 2) => num.toString().padStart(digits, '0');
|
|
137
|
+
const hours = pad(now.getHours());
|
|
138
|
+
const minutes = pad(now.getMinutes());
|
|
139
|
+
const seconds = pad(now.getSeconds());
|
|
140
|
+
const milliseconds = pad(now.getMilliseconds(), 3);
|
|
141
|
+
return `${hours}:${minutes}:${seconds}.${milliseconds}`;
|
|
142
|
+
}
|
|
96
143
|
toPrintable(metadata) {
|
|
97
144
|
if ((0, utils_1.isObjectLiteral)(metadata) && Object.keys(metadata).length > 0) {
|
|
98
|
-
return
|
|
145
|
+
return constants_1.inProduction
|
|
146
|
+
? JSON.stringify(metadata)
|
|
147
|
+
: JSON.stringify(metadata)
|
|
148
|
+
.replace(/{"/g, '{ "')
|
|
149
|
+
.replace(/,"/g, ', "')
|
|
150
|
+
.replace(/:/g, ': ')
|
|
151
|
+
.replace(/}/g, ' }');
|
|
99
152
|
}
|
|
100
153
|
return '';
|
|
101
154
|
}
|
|
@@ -127,7 +180,7 @@ let Logger = class Logger {
|
|
|
127
180
|
}
|
|
128
181
|
};
|
|
129
182
|
exports.Logger = Logger;
|
|
130
|
-
exports.Logger = Logger = __decorate([
|
|
183
|
+
exports.Logger = Logger = Logger_1 = __decorate([
|
|
131
184
|
(0, typedi_1.Service)(),
|
|
132
185
|
__metadata("design:paramtypes", [config_1.GlobalConfig,
|
|
133
186
|
n8n_core_1.InstanceSettings])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.service.js","sourceRoot":"","sources":["../../src/logging/logger.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.service.js","sourceRoot":"","sources":["../../src/logging/logger.service.ts"],"names":[],"mappings":"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"}
|
package/dist/logging/types.d.ts
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import type { LogScope } from '@n8n/config';
|
|
1
2
|
import type { LOG_LEVELS } from './constants';
|
|
2
3
|
export type LogLevel = (typeof LOG_LEVELS)[number];
|
|
3
|
-
export type
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
export type LogMetadata = {
|
|
5
|
+
[key: string]: unknown;
|
|
6
|
+
scope?: LogScope;
|
|
7
|
+
file?: string;
|
|
8
|
+
function?: string;
|
|
9
|
+
};
|
|
10
|
+
export type LogLocationMetadata = Pick<LogMetadata, 'file' | 'function'>;
|
package/dist/requests.d.ts
CHANGED
|
@@ -455,6 +455,7 @@ export declare namespace AiAssistantRequest {
|
|
|
455
455
|
sessionId: string;
|
|
456
456
|
suggestionId: string;
|
|
457
457
|
};
|
|
458
|
-
type
|
|
458
|
+
type ApplySuggestionPayload = AuthenticatedRequest<{}, {}, SuggestionPayload>;
|
|
459
|
+
type AskAiPayload = AuthenticatedRequest<{}, {}, AiAssistantSDK.AskAiRequestPayload>;
|
|
459
460
|
}
|
|
460
461
|
export {};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { EnvProviderState, IExecuteFunctions, Workflow, IRunExecutionData, INodeExecutionData, ITaskDataConnections, INode, WorkflowParameters, INodeParameters, WorkflowExecuteMode, IExecuteData, IDataObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
|
|
2
2
|
import { type TaskResultData, type N8nMessage, type RequesterMessage } from '../runner-types';
|
|
3
3
|
export type RequestAccept = (jobId: string) => void;
|
|
4
4
|
export type RequestReject = (reason: string) => void;
|
|
@@ -16,6 +16,7 @@ export interface TaskData {
|
|
|
16
16
|
connectionInputData: INodeExecutionData[];
|
|
17
17
|
siblingParameters: INodeParameters;
|
|
18
18
|
mode: WorkflowExecuteMode;
|
|
19
|
+
envProviderState: EnvProviderState;
|
|
19
20
|
executeData?: IExecuteData;
|
|
20
21
|
defaultReturnRunIndex: number;
|
|
21
22
|
selfData: IDataObject;
|
|
@@ -47,6 +48,7 @@ export interface AllCodeTaskData {
|
|
|
47
48
|
connectionInputData: INodeExecutionData[];
|
|
48
49
|
siblingParameters: INodeParameters;
|
|
49
50
|
mode: WorkflowExecuteMode;
|
|
51
|
+
envProviderState: EnvProviderState;
|
|
50
52
|
executeData?: IExecuteData;
|
|
51
53
|
defaultReturnRunIndex: number;
|
|
52
54
|
selfData: IDataObject;
|
|
@@ -75,7 +77,7 @@ export declare class TaskManager {
|
|
|
75
77
|
}>;
|
|
76
78
|
pendingRequests: Map<string, TaskRequest>;
|
|
77
79
|
tasks: Map<string, Task>;
|
|
78
|
-
startTask<T>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<T>;
|
|
80
|
+
startTask<T>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, envProviderState: EnvProviderState, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<T>;
|
|
79
81
|
sendMessage(_message: RequesterMessage.ToN8n.All): void;
|
|
80
82
|
onMessage(message: N8nMessage.ToRequester.All): void;
|
|
81
83
|
taskReady(requestId: string, taskId: string): void;
|
|
@@ -23,7 +23,7 @@ class TaskManager {
|
|
|
23
23
|
this.pendingRequests = new Map();
|
|
24
24
|
this.tasks = new Map();
|
|
25
25
|
}
|
|
26
|
-
async startTask(additionalData, taskType, settings, executeFunctions, inputData, node, workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, executeData, defaultReturnRunIndex = -1, selfData = {}, contextNodeName = activeNodeName) {
|
|
26
|
+
async startTask(additionalData, taskType, settings, executeFunctions, inputData, node, workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, envProviderState, executeData, defaultReturnRunIndex = -1, selfData = {}, contextNodeName = activeNodeName) {
|
|
27
27
|
const data = {
|
|
28
28
|
workflow,
|
|
29
29
|
runExecutionData,
|
|
@@ -35,6 +35,7 @@ class TaskManager {
|
|
|
35
35
|
itemIndex,
|
|
36
36
|
siblingParameters,
|
|
37
37
|
mode,
|
|
38
|
+
envProviderState,
|
|
38
39
|
executeData,
|
|
39
40
|
defaultReturnRunIndex,
|
|
40
41
|
selfData,
|
|
@@ -169,6 +170,7 @@ class TaskManager {
|
|
|
169
170
|
contextNodeName: jd.contextNodeName,
|
|
170
171
|
defaultReturnRunIndex: jd.defaultReturnRunIndex,
|
|
171
172
|
mode: jd.mode,
|
|
173
|
+
envProviderState: jd.envProviderState,
|
|
172
174
|
node: jd.node,
|
|
173
175
|
runExecutionData: jd.runExecutionData,
|
|
174
176
|
runIndex: jd.runIndex,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,7 @@ let TaskRunnerProcess = class TaskRunnerProcess {
|
|
|
61
61
|
env: {
|
|
62
62
|
PATH: process.env.PATH,
|
|
63
63
|
N8N_RUNNERS_GRANT_TOKEN: grantToken,
|
|
64
|
-
N8N_RUNNERS_N8N_URI: `
|
|
64
|
+
N8N_RUNNERS_N8N_URI: `127.0.0.1:${this.globalConfig.taskRunners.port}`,
|
|
65
65
|
},
|
|
66
66
|
});
|
|
67
67
|
this.process.stdout?.pipe(process.stdout);
|
|
@@ -2,3 +2,5 @@ export declare const QUEUE_NAME = "jobs";
|
|
|
2
2
|
export declare const JOB_TYPE_NAME = "job";
|
|
3
3
|
export declare const COMMAND_PUBSUB_CHANNEL = "n8n.commands";
|
|
4
4
|
export declare const WORKER_RESPONSE_PUBSUB_CHANNEL = "n8n.worker-response";
|
|
5
|
+
export declare const SELF_SEND_COMMANDS: Set<string>;
|
|
6
|
+
export declare const IMMEDIATE_COMMANDS: Set<string>;
|