n8n 1.121.1 → 1.122.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/active-workflow-manager.js +35 -13
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/auth/auth.service.js +1 -0
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.d.ts +2 -1
- package/dist/commands/base-command.js +1 -0
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/execute-batch.d.ts +2 -2
- package/dist/commands/start.js +2 -1
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +1 -1
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +2 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/controllers/ai.controller.d.ts +1 -0
- package/dist/credentials/credentials-finder.service.d.ts +18 -3
- package/dist/credentials/credentials-finder.service.js +63 -7
- package/dist/credentials/credentials-finder.service.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +4 -0
- package/dist/credentials/credentials.controller.js +9 -0
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +25 -1
- package/dist/credentials/credentials.service.ee.d.ts +2 -0
- package/dist/credentials/credentials.service.js +100 -67
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-export.service.ee.js +2 -1
- package/dist/environments.ee/source-control/source-control-export.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.js +21 -8
- package/dist/environments.ee/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-status.service.ee.js +2 -1
- package/dist/environments.ee/source-control/source-control-status.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/types/exportable-credential.d.ts +1 -0
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +2 -2
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.js +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +9 -0
- package/dist/events/relays/telemetry.event-relay.d.ts +2 -0
- package/dist/events/relays/telemetry.event-relay.js +12 -0
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/shared/shared-hook-functions.js +1 -0
- package/dist/execution-lifecycle/shared/shared-hook-functions.js.map +1 -1
- package/dist/executions/execution-data.service.d.ts +1 -1
- package/dist/executions/execution-data.service.js +3 -2
- package/dist/executions/execution-data.service.js.map +1 -1
- package/dist/executions/execution-recovery.service.js +1 -1
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/execution.service.js +1 -0
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.utils.d.ts +2 -0
- package/dist/executions/execution.utils.js +7 -0
- package/dist/executions/execution.utils.js.map +1 -0
- package/dist/executions/pre-execution-checks/credentials-permission-checker.d.ts +4 -2
- package/dist/executions/pre-execution-checks/credentials-permission-checker.js +16 -2
- package/dist/executions/pre-execution-checks/credentials-permission-checker.js.map +1 -1
- package/dist/metrics/prometheus-metrics.service.d.ts +7 -2
- package/dist/metrics/prometheus-metrics.service.js +95 -2
- package/dist/metrics/prometheus-metrics.service.js.map +1 -1
- package/dist/metrics/types.d.ts +1 -1
- package/dist/middlewares/body-parser.js +3 -0
- package/dist/middlewares/body-parser.js.map +1 -1
- package/dist/middlewares/list-query/dtos/workflow.select.dto.js +1 -0
- package/dist/middlewares/list-query/dtos/workflow.select.dto.js.map +1 -1
- package/dist/modules/breaking-changes/breaking-changes.service.js +2 -2
- package/dist/modules/breaking-changes/breaking-changes.service.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v2/binary-data-storage.rule.d.ts +3 -1
- package/dist/modules/breaking-changes/rules/v2/binary-data-storage.rule.js +27 -19
- package/dist/modules/breaking-changes/rules/v2/binary-data-storage.rule.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js +1 -0
- package/dist/modules/chat-hub/chat-hub-agent.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-credentials.service.js +2 -2
- package/dist/modules/chat-hub/chat-hub-credentials.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-message.entity.d.ts +2 -0
- package/dist/modules/chat-hub/chat-hub-message.entity.js +4 -0
- package/dist/modules/chat-hub/chat-hub-message.entity.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +4 -2
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +147 -22
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.attachment.service.d.ts +28 -0
- package/dist/modules/chat-hub/chat-hub.attachment.service.js +96 -0
- package/dist/modules/chat-hub/chat-hub.attachment.service.js.map +1 -0
- package/dist/modules/chat-hub/chat-hub.constants.d.ts +1 -0
- package/dist/modules/chat-hub/chat-hub.constants.js +46 -1
- package/dist/modules/chat-hub/chat-hub.constants.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.controller.d.ts +6 -3
- package/dist/modules/chat-hub/chat-hub.controller.js +59 -12
- package/dist/modules/chat-hub/chat-hub.controller.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.module.d.ts +13 -1
- package/dist/modules/chat-hub/chat-hub.module.js +3 -2
- package/dist/modules/chat-hub/chat-hub.module.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.d.ts +23 -8
- package/dist/modules/chat-hub/chat-hub.service.js +578 -102
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.settings.controller.d.ts +39 -5
- package/dist/modules/chat-hub/chat-hub.settings.controller.js +28 -11
- package/dist/modules/chat-hub/chat-hub.settings.controller.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.settings.service.d.ts +5 -0
- package/dist/modules/chat-hub/chat-hub.settings.service.js +62 -3
- package/dist/modules/chat-hub/chat-hub.settings.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.types.d.ts +37 -1
- package/dist/modules/chat-hub/chat-hub.types.js +12 -0
- package/dist/modules/chat-hub/chat-hub.types.js.map +1 -1
- package/dist/modules/chat-hub/chat-message.repository.d.ts +2 -0
- package/dist/modules/chat-hub/chat-message.repository.js.map +1 -1
- package/dist/modules/chat-hub/chat-session.repository.d.ts +1 -1
- package/dist/modules/chat-hub/chat-session.repository.js +20 -5
- package/dist/modules/chat-hub/chat-session.repository.js.map +1 -1
- package/dist/modules/chat-hub/context-limits.js +11 -0
- package/dist/modules/chat-hub/context-limits.js.map +1 -1
- package/dist/modules/chat-hub/dto/chat-models-request.dto.d.ts +1 -1
- package/dist/modules/community-packages/community-node.command.js +1 -1
- package/dist/modules/community-packages/community-node.command.js.map +1 -1
- package/dist/modules/community-packages/community-packages.controller.js +3 -2
- package/dist/modules/community-packages/community-packages.controller.js.map +1 -1
- package/dist/modules/community-packages/community-packages.service.d.ts +1 -1
- package/dist/modules/community-packages/community-packages.service.js +9 -9
- package/dist/modules/community-packages/community-packages.service.js.map +1 -1
- package/dist/modules/data-table/csv-parser.service.d.ts +22 -0
- package/dist/modules/data-table/csv-parser.service.js +157 -0
- package/dist/modules/data-table/csv-parser.service.js.map +1 -0
- package/dist/modules/data-table/data-table-file-cleanup.service.d.ts +12 -0
- package/dist/modules/data-table/data-table-file-cleanup.service.js +81 -0
- package/dist/modules/data-table/data-table-file-cleanup.service.js.map +1 -0
- package/dist/modules/data-table/data-table-size-validator.service.d.ts +0 -1
- package/dist/modules/data-table/data-table-size-validator.service.js +2 -4
- package/dist/modules/data-table/data-table-size-validator.service.js.map +1 -1
- package/dist/modules/data-table/data-table-uploads.controller.d.ts +13 -0
- package/dist/modules/data-table/data-table-uploads.controller.js +68 -0
- package/dist/modules/data-table/data-table-uploads.controller.js.map +1 -0
- package/dist/modules/data-table/data-table.controller.d.ts +7 -0
- package/dist/modules/data-table/data-table.controller.js +28 -0
- package/dist/modules/data-table/data-table.controller.js.map +1 -1
- package/dist/modules/data-table/data-table.module.js +5 -0
- package/dist/modules/data-table/data-table.module.js.map +1 -1
- package/dist/modules/data-table/data-table.service.d.ts +14 -1
- package/dist/modules/data-table/data-table.service.js +115 -2
- package/dist/modules/data-table/data-table.service.js.map +1 -1
- package/dist/modules/data-table/errors/data-table-file-upload.error.d.ts +4 -0
- package/dist/modules/data-table/errors/data-table-file-upload.error.js +13 -0
- package/dist/modules/data-table/errors/data-table-file-upload.error.js.map +1 -0
- package/dist/modules/data-table/multer-upload-middleware.d.ts +15 -0
- package/dist/modules/data-table/multer-upload-middleware.js +98 -0
- package/dist/modules/data-table/multer-upload-middleware.js.map +1 -0
- package/dist/modules/data-table/types.d.ts +12 -0
- package/dist/modules/data-table/types.js +7 -0
- package/dist/modules/data-table/types.js.map +1 -0
- package/dist/modules/data-table/utils/size-utils.d.ts +2 -0
- package/dist/modules/data-table/utils/size-utils.js +19 -0
- package/dist/modules/data-table/utils/size-utils.js.map +1 -0
- package/dist/modules/insights/insights-collection.service.d.ts +2 -1
- package/dist/modules/insights/insights-collection.service.js +12 -1
- package/dist/modules/insights/insights-collection.service.js.map +1 -1
- package/dist/modules/insights/insights.module.js +4 -7
- package/dist/modules/insights/insights.module.js.map +1 -1
- package/dist/modules/insights/insights.service.d.ts +3 -16
- package/dist/modules/insights/insights.service.js +51 -25
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/modules/insights/insights.settings.d.ts +17 -0
- package/dist/modules/insights/insights.settings.js +44 -0
- package/dist/modules/insights/insights.settings.js.map +1 -0
- package/dist/modules/mcp/mcp-api-key.service.d.ts +3 -2
- package/dist/modules/mcp/mcp-api-key.service.js +22 -3
- package/dist/modules/mcp/mcp-api-key.service.js.map +1 -1
- package/dist/modules/mcp/mcp-oauth-token.service.d.ts +4 -3
- package/dist/modules/mcp/mcp-oauth-token.service.js +24 -6
- package/dist/modules/mcp/mcp-oauth-token.service.js.map +1 -1
- package/dist/modules/mcp/mcp-server-middleware.service.d.ts +4 -4
- package/dist/modules/mcp/mcp-server-middleware.service.js +43 -18
- package/dist/modules/mcp/mcp-server-middleware.service.js.map +1 -1
- package/dist/modules/mcp/mcp.errors.d.ts +7 -0
- package/dist/modules/mcp/mcp.errors.js +16 -1
- package/dist/modules/mcp/mcp.errors.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.controller.js +2 -2
- package/dist/modules/mcp/mcp.settings.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.types.d.ts +12 -0
- package/dist/modules/mcp/tools/execute-workflow.tool.js +2 -2
- package/dist/modules/mcp/tools/execute-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js.map +1 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js +2 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js.map +1 -1
- package/dist/modules/provisioning.ee/provisioning.service.ee.d.ts +3 -1
- package/dist/modules/provisioning.ee/provisioning.service.ee.js +14 -2
- package/dist/modules/provisioning.ee/provisioning.service.ee.js.map +1 -1
- package/dist/permissions.ee/check-access.js +13 -1
- package/dist/permissions.ee/check-access.js.map +1 -1
- package/dist/public-api/types.d.ts +3 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +36 -14
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.d.ts +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.js +6 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +48 -3
- package/dist/requests.d.ts +1 -0
- package/dist/scaling/job-processor.d.ts +1 -0
- package/dist/scaling/job-processor.js +13 -2
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/scaling.service.js +13 -2
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/scaling/scaling.types.d.ts +1 -0
- package/dist/security-audit/risk-reporters/credentials-risk-reporter.js +4 -3
- package/dist/security-audit/risk-reporters/credentials-risk-reporter.js.map +1 -1
- package/dist/security-audit/risk-reporters/instance-risk-reporter.js +1 -1
- package/dist/security-audit/risk-reporters/instance-risk-reporter.js.map +1 -1
- package/dist/security-audit/security-audit.service.js +1 -1
- package/dist/security-audit/security-audit.service.js.map +1 -1
- package/dist/services/ai-workflow-builder.service.d.ts +5 -1
- package/dist/services/ai-workflow-builder.service.js +12 -3
- package/dist/services/ai-workflow-builder.service.js.map +1 -1
- package/dist/services/import.service.js +2 -1
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/role.service.js +8 -1
- package/dist/services/role.service.js.map +1 -1
- package/dist/task-runners/task-managers/data-request-response-builder.js +3 -2
- package/dist/task-runners/task-managers/data-request-response-builder.js.map +1 -1
- package/dist/task-runners/task-managers/data-request-response-stripper.js +3 -2
- package/dist/task-runners/task-managers/data-request-response-stripper.js.map +1 -1
- package/dist/webhooks/live-webhooks.js +11 -4
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-forms.d.ts +1 -1
- package/dist/webhooks/waiting-forms.js +2 -1
- package/dist/webhooks/waiting-forms.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.d.ts +2 -1
- package/dist/webhooks/waiting-webhooks.js +2 -1
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +13 -7
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-helpers.d.ts +2 -0
- package/dist/workflow-helpers.js +10 -0
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.js +3 -3
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.js +4 -3
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow-finder.service.d.ts +3 -0
- package/dist/workflows/workflow-finder.service.js +1 -0
- package/dist/workflows/workflow-finder.service.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history-manager.js +1 -1
- package/dist/workflows/workflow-history/workflow-history-manager.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.service.d.ts +5 -3
- package/dist/workflows/workflow-history/workflow-history.service.js +18 -4
- package/dist/workflows/workflow-history/workflow-history.service.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +11 -0
- package/dist/workflows/workflow.service.d.ts +8 -1
- package/dist/workflows/workflow.service.ee.js +3 -3
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +145 -46
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +74 -8
- package/dist/workflows/workflows.controller.js +65 -10
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +18 -17
- package/dist/modules/chat-hub/dto/chat-message-request.dto.d.ts +0 -9
- package/dist/modules/chat-hub/dto/chat-message-request.dto.js +0 -12
- package/dist/modules/chat-hub/dto/chat-message-request.dto.js.map +0 -1
- package/dist/modules/chat-hub/dto/update-chat-settings.dto.d.ts +0 -8
- package/dist/modules/chat-hub/dto/update-chat-settings.dto.js +0 -11
- package/dist/modules/chat-hub/dto/update-chat-settings.dto.js.map +0 -1
|
@@ -0,0 +1,98 @@
|
|
|
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.MulterUploadMiddleware = void 0;
|
|
16
|
+
const config_1 = require("@n8n/config");
|
|
17
|
+
const di_1 = require("@n8n/di");
|
|
18
|
+
const promises_1 = require("fs/promises");
|
|
19
|
+
const multer_1 = __importDefault(require("multer"));
|
|
20
|
+
const nanoid_1 = require("nanoid");
|
|
21
|
+
const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
|
|
22
|
+
const data_table_size_validator_service_1 = require("./data-table-size-validator.service");
|
|
23
|
+
const data_table_repository_1 = require("./data-table.repository");
|
|
24
|
+
const size_utils_1 = require("./utils/size-utils");
|
|
25
|
+
const ALLOWED_MIME_TYPES = ['text/csv'];
|
|
26
|
+
let MulterUploadMiddleware = class MulterUploadMiddleware {
|
|
27
|
+
constructor(globalConfig, sizeValidator, dataTableRepository) {
|
|
28
|
+
this.globalConfig = globalConfig;
|
|
29
|
+
this.sizeValidator = sizeValidator;
|
|
30
|
+
this.dataTableRepository = dataTableRepository;
|
|
31
|
+
this.uploadDir = this.globalConfig.dataTable.uploadDir;
|
|
32
|
+
void this.ensureUploadDirExists();
|
|
33
|
+
const storage = multer_1.default.diskStorage({
|
|
34
|
+
destination: (_req, _file, cb) => {
|
|
35
|
+
cb(null, this.uploadDir);
|
|
36
|
+
},
|
|
37
|
+
filename: (_req, _file, cb) => {
|
|
38
|
+
const filename = (0, nanoid_1.nanoid)(10);
|
|
39
|
+
cb(null, filename);
|
|
40
|
+
},
|
|
41
|
+
});
|
|
42
|
+
this.upload = (0, multer_1.default)({
|
|
43
|
+
storage,
|
|
44
|
+
limits: this.globalConfig.dataTable.uploadMaxFileSize
|
|
45
|
+
? { fileSize: this.globalConfig.dataTable.uploadMaxFileSize }
|
|
46
|
+
: undefined,
|
|
47
|
+
fileFilter: async (req, file, cb) => {
|
|
48
|
+
if (!ALLOWED_MIME_TYPES.includes(file.mimetype)) {
|
|
49
|
+
cb(new bad_request_error_1.BadRequestError(`Only the following file types are allowed: ${ALLOWED_MIME_TYPES.join(', ')}`));
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const fileSize = parseInt(req.headers['content-length'] ?? '0', 10);
|
|
53
|
+
if (this.globalConfig.dataTable.uploadMaxFileSize) {
|
|
54
|
+
cb(null, true);
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
try {
|
|
58
|
+
const sizeData = await this.sizeValidator.getCachedSizeData(async () => {
|
|
59
|
+
return await this.dataTableRepository.findDataTablesSize();
|
|
60
|
+
});
|
|
61
|
+
const remainingSpace = Math.max(0, this.globalConfig.dataTable.maxSize - sizeData.totalBytes);
|
|
62
|
+
if (fileSize > remainingSpace) {
|
|
63
|
+
const message = remainingSpace === 0
|
|
64
|
+
? `Storage limit exceeded. Current usage: ${(0, size_utils_1.formatBytes)(sizeData.totalBytes)}, Limit: ${(0, size_utils_1.formatBytes)(this.globalConfig.dataTable.maxSize)}`
|
|
65
|
+
: `File size exceeds remaining storage space. Available: ${(0, size_utils_1.formatBytes)(remainingSpace)}, File: ${(0, size_utils_1.formatBytes)(fileSize)}`;
|
|
66
|
+
cb(new bad_request_error_1.BadRequestError(message));
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
cb(null, true);
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
cb(new bad_request_error_1.BadRequestError('Failed to validate file size'));
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
async ensureUploadDirExists() {
|
|
78
|
+
await (0, promises_1.mkdir)(this.uploadDir, { recursive: true });
|
|
79
|
+
}
|
|
80
|
+
single(fieldName) {
|
|
81
|
+
return (req, res, next) => {
|
|
82
|
+
void this.upload.single(fieldName)(req, res, (error) => {
|
|
83
|
+
if (error) {
|
|
84
|
+
req.fileUploadError = error;
|
|
85
|
+
}
|
|
86
|
+
next();
|
|
87
|
+
});
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
exports.MulterUploadMiddleware = MulterUploadMiddleware;
|
|
92
|
+
exports.MulterUploadMiddleware = MulterUploadMiddleware = __decorate([
|
|
93
|
+
(0, di_1.Service)(),
|
|
94
|
+
__metadata("design:paramtypes", [config_1.GlobalConfig,
|
|
95
|
+
data_table_size_validator_service_1.DataTableSizeValidator,
|
|
96
|
+
data_table_repository_1.DataTableRepository])
|
|
97
|
+
], MulterUploadMiddleware);
|
|
98
|
+
//# sourceMappingURL=multer-upload-middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multer-upload-middleware.js","sourceRoot":"","sources":["../../../src/modules/data-table/multer-upload-middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { AuthenticatedRequest } from '@n8n/db';
|
|
2
|
+
import type { RequestHandler } from 'express';
|
|
3
|
+
export interface UploadMiddleware {
|
|
4
|
+
single(fieldName: string): RequestHandler;
|
|
5
|
+
}
|
|
6
|
+
export type MulterDestinationCallback = (error: Error | null, destination: string) => void;
|
|
7
|
+
export type MulterFilenameCallback = (error: Error | null, filename: string) => void;
|
|
8
|
+
export type AuthenticatedRequestWithFile<RouteParams = {}, ResponseBody = {}, RequestBody = {}, RequestQuery = {}> = AuthenticatedRequest<RouteParams, ResponseBody, RequestBody, RequestQuery> & {
|
|
9
|
+
file?: Express.Multer.File;
|
|
10
|
+
fileUploadError?: Error;
|
|
11
|
+
};
|
|
12
|
+
export declare function hasStringProperty<K extends string>(obj: unknown, key: K): obj is Record<K, string> & object;
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.hasStringProperty = hasStringProperty;
|
|
4
|
+
function hasStringProperty(obj, key) {
|
|
5
|
+
return typeof obj === 'object' && obj !== null && key in obj;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/modules/data-table/types.ts"],"names":[],"mappings":";;AAoBA,8CAKC;AALD,SAAgB,iBAAiB,CAChC,GAAY,EACZ,GAAM;IAEN,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,IAAI,GAAG,CAAC;AAC9D,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toMb = toMb;
|
|
4
|
+
exports.formatBytes = formatBytes;
|
|
5
|
+
function toMb(sizeInBytes) {
|
|
6
|
+
return Math.round(sizeInBytes / (1024 * 1024));
|
|
7
|
+
}
|
|
8
|
+
function formatBytes(sizeInBytes) {
|
|
9
|
+
if (sizeInBytes < 1024) {
|
|
10
|
+
return `${sizeInBytes}B`;
|
|
11
|
+
}
|
|
12
|
+
else if (sizeInBytes < 1024 * 1024) {
|
|
13
|
+
return `${Math.round(sizeInBytes / 1024)}KB`;
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
return `${Math.round(sizeInBytes / (1024 * 1024))}MB`;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=size-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"size-utils.js","sourceRoot":"","sources":["../../../../src/modules/data-table/utils/size-utils.ts"],"names":[],"mappings":";;AAGA,oBAEC;AAKD,kCAQC;AAfD,SAAgB,IAAI,CAAC,WAAmB;IACvC,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;AAChD,CAAC;AAKD,SAAgB,WAAW,CAAC,WAAmB;IAC9C,IAAI,WAAW,GAAG,IAAI,EAAE,CAAC;QACxB,OAAO,GAAG,WAAW,GAAG,CAAC;IAC1B,CAAC;SAAM,IAAI,WAAW,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC;QACtC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;IAC9C,CAAC;SAAM,CAAC;QACP,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC;IACvD,CAAC;AACF,CAAC"}
|
|
@@ -15,8 +15,9 @@ export declare class InsightsCollectionService {
|
|
|
15
15
|
private flushInsightsRawBufferTimer;
|
|
16
16
|
private isAsynchronouslySavingInsights;
|
|
17
17
|
private flushesInProgress;
|
|
18
|
+
private isInitialized;
|
|
18
19
|
constructor(sharedWorkflowRepository: SharedWorkflowRepository, insightsRawRepository: InsightsRawRepository, insightsMetadataRepository: InsightsMetadataRepository, insightsConfig: InsightsConfig, logger: Logger);
|
|
19
|
-
|
|
20
|
+
init(): void;
|
|
20
21
|
scheduleFlushing(): void;
|
|
21
22
|
cancelScheduledFlushing(): void;
|
|
22
23
|
stopFlushingTimer(): void;
|
|
@@ -57,14 +57,18 @@ let InsightsCollectionService = class InsightsCollectionService {
|
|
|
57
57
|
this.bufferedInsights = new Set();
|
|
58
58
|
this.isAsynchronouslySavingInsights = true;
|
|
59
59
|
this.flushesInProgress = new Set();
|
|
60
|
+
this.isInitialized = false;
|
|
60
61
|
this.logger = this.logger.scoped('insights');
|
|
61
62
|
}
|
|
62
|
-
|
|
63
|
+
init() {
|
|
64
|
+
this.isInitialized = true;
|
|
63
65
|
this.isAsynchronouslySavingInsights = true;
|
|
64
66
|
this.scheduleFlushing();
|
|
65
67
|
this.logger.debug('Started flushing timer');
|
|
66
68
|
}
|
|
67
69
|
scheduleFlushing() {
|
|
70
|
+
if (!this.isInitialized)
|
|
71
|
+
return;
|
|
68
72
|
this.cancelScheduledFlushing();
|
|
69
73
|
this.flushInsightsRawBufferTimer = setTimeout(async () => await this.flushEvents(), this.insightsConfig.flushIntervalSeconds * 1000);
|
|
70
74
|
}
|
|
@@ -83,8 +87,12 @@ let InsightsCollectionService = class InsightsCollectionService {
|
|
|
83
87
|
this.isAsynchronouslySavingInsights = false;
|
|
84
88
|
this.logger.debug('Flushing remaining insights before shutdown');
|
|
85
89
|
await Promise.all([...this.flushesInProgress, this.flushEvents()]);
|
|
90
|
+
this.isInitialized = false;
|
|
86
91
|
}
|
|
87
92
|
async handleWorkflowExecuteAfter(ctx) {
|
|
93
|
+
if (!this.isInitialized) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
88
96
|
if (shouldSkipStatus[ctx.runData.status] || shouldSkipMode[ctx.runData.mode]) {
|
|
89
97
|
return;
|
|
90
98
|
}
|
|
@@ -177,6 +185,9 @@ let InsightsCollectionService = class InsightsCollectionService {
|
|
|
177
185
|
await this.insightsRawRepository.insert(events);
|
|
178
186
|
}
|
|
179
187
|
async flushEvents() {
|
|
188
|
+
if (!this.isInitialized) {
|
|
189
|
+
return;
|
|
190
|
+
}
|
|
180
191
|
if (this.bufferedInsights.size === 0) {
|
|
181
192
|
this.scheduleFlushing();
|
|
182
193
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insights-collection.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights-collection.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAmD;AACnD,gDAAqF;AACrF,gCAAkC;AAClC,0CAAkC;AAClC,iCAAiC;AACjC,+CAA+F;AAE/F,8FAA0F;AAC1F,oFAAgF;AAEhF,uGAAkG;AAClG,6FAAwF;AACxF,uDAAmD;AAEnD,MAAM,gBAAgB,GAAqC;IAC1D,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,KAAK;IACd,KAAK,EAAE,KAAK;IAEZ,QAAQ,EAAE,IAAI;IACd,GAAG,EAAE,IAAI;IACT,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;CACb,CAAC;AAEF,MAAM,cAAc,GAAyC;IAC5D,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,KAAK;IACZ,OAAO,EAAE,KAAK;IACd,OAAO,EAAE,KAAK;IACd,UAAU,EAAE,KAAK;IAGjB,UAAU,EAAE,IAAI;IAGhB,QAAQ,EAAE,IAAI;IAEd,MAAM,EAAE,IAAI;IAGZ,IAAI,EAAE,IAAI;CACV,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,CAAC;AAGtB,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAYzB,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;
|
|
1
|
+
{"version":3,"file":"insights-collection.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights-collection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,14 +45,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
45
45
|
exports.InsightsModule = void 0;
|
|
46
46
|
const decorators_1 = require("@n8n/decorators");
|
|
47
47
|
const di_1 = require("@n8n/di");
|
|
48
|
-
const n8n_core_1 = require("n8n-core");
|
|
49
48
|
let InsightsModule = class InsightsModule {
|
|
50
49
|
async init() {
|
|
51
|
-
if (di_1.Container.get(n8n_core_1.InstanceSettings).instanceType === 'worker')
|
|
52
|
-
return;
|
|
53
50
|
await Promise.resolve().then(() => __importStar(require('./insights.controller')));
|
|
54
51
|
const { InsightsService } = await Promise.resolve().then(() => __importStar(require('./insights.service')));
|
|
55
|
-
di_1.Container.get(InsightsService).
|
|
52
|
+
await di_1.Container.get(InsightsService).init();
|
|
56
53
|
}
|
|
57
54
|
async entities() {
|
|
58
55
|
const { InsightsByPeriod } = await Promise.resolve().then(() => __importStar(require('./database/entities/insights-by-period')));
|
|
@@ -61,8 +58,8 @@ let InsightsModule = class InsightsModule {
|
|
|
61
58
|
return [InsightsByPeriod, InsightsMetadata, InsightsRaw];
|
|
62
59
|
}
|
|
63
60
|
async settings() {
|
|
64
|
-
const {
|
|
65
|
-
return di_1.Container.get(
|
|
61
|
+
const { InsightsSettings } = await Promise.resolve().then(() => __importStar(require('./insights.settings')));
|
|
62
|
+
return di_1.Container.get(InsightsSettings).settings();
|
|
66
63
|
}
|
|
67
64
|
async shutdown() {
|
|
68
65
|
const { InsightsService } = await Promise.resolve().then(() => __importStar(require('./insights.service')));
|
|
@@ -77,6 +74,6 @@ __decorate([
|
|
|
77
74
|
__metadata("design:returntype", Promise)
|
|
78
75
|
], InsightsModule.prototype, "shutdown", null);
|
|
79
76
|
exports.InsightsModule = InsightsModule = __decorate([
|
|
80
|
-
(0, decorators_1.BackendModule)({ name: 'insights' })
|
|
77
|
+
(0, decorators_1.BackendModule)({ name: 'insights', instanceTypes: ['main', 'webhook'] })
|
|
81
78
|
], InsightsModule);
|
|
82
79
|
//# sourceMappingURL=insights.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insights.module.js","sourceRoot":"","sources":["../../../src/modules/insights/insights.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA4D;AAC5D,gCAAoC;
|
|
1
|
+
{"version":3,"file":"insights.module.js","sourceRoot":"","sources":["../../../src/modules/insights/insights.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA4D;AAC5D,gCAAoC;AAO7B,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,KAAK,CAAC,IAAI;QACT,wDAAa,uBAAuB,GAAC,CAAC;QAEtC,MAAM,EAAE,eAAe,EAAE,GAAG,wDAAa,oBAAoB,GAAC,CAAC;QAC/D,MAAM,cAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,wCAAwC,GAAC,CAAC;QACpF,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,uCAAuC,GAAC,CAAC;QACnF,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,kCAAkC,GAAC,CAAC;QAEzE,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,qBAAqB,GAAC,CAAC;QAEjE,OAAO,cAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC;IACnD,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,eAAe,EAAE,GAAG,wDAAa,oBAAoB,GAAC,CAAC;QAE/D,MAAM,cAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC;IACjD,CAAC;CACD,CAAA;AA5BY,wCAAc;AAuBpB;IADL,IAAA,uBAAU,GAAE;;;;8CAKZ;yBA3BW,cAAc;IAD1B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC;GAC3D,cAAc,CA4B1B"}
|
|
@@ -3,24 +3,18 @@ import { LicenseState, Logger } from '@n8n/backend-common';
|
|
|
3
3
|
import { InstanceSettings } from 'n8n-core';
|
|
4
4
|
import type { TypeUnit } from './database/entities/insights-shared';
|
|
5
5
|
import { InsightsByPeriodRepository } from './database/repositories/insights-by-period.repository';
|
|
6
|
-
import { InsightsCollectionService } from './insights-collection.service';
|
|
7
6
|
import { InsightsCompactionService } from './insights-compaction.service';
|
|
8
7
|
import { InsightsPruningService } from './insights-pruning.service';
|
|
9
8
|
export declare class InsightsService {
|
|
10
9
|
private readonly insightsByPeriodRepository;
|
|
11
10
|
private readonly compactionService;
|
|
12
|
-
private readonly collectionService;
|
|
13
11
|
private readonly pruningService;
|
|
14
12
|
private readonly licenseState;
|
|
15
13
|
private readonly instanceSettings;
|
|
16
14
|
private readonly logger;
|
|
17
|
-
constructor(insightsByPeriodRepository: InsightsByPeriodRepository, compactionService: InsightsCompactionService,
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
dashboard: boolean;
|
|
21
|
-
dateRanges: DateRange[];
|
|
22
|
-
};
|
|
23
|
-
startTimers(): void;
|
|
15
|
+
constructor(insightsByPeriodRepository: InsightsByPeriodRepository, compactionService: InsightsCompactionService, pruningService: InsightsPruningService, licenseState: LicenseState, instanceSettings: InstanceSettings, logger: Logger);
|
|
16
|
+
private toggleCollectionService;
|
|
17
|
+
init(): Promise<void>;
|
|
24
18
|
startCompactionAndPruningTimers(): void;
|
|
25
19
|
stopCompactionAndPruningTimers(): void;
|
|
26
20
|
shutdown(): Promise<void>;
|
|
@@ -75,11 +69,4 @@ export declare class InsightsService {
|
|
|
75
69
|
endDate: Date;
|
|
76
70
|
}): void;
|
|
77
71
|
private getDateFiltersGranularity;
|
|
78
|
-
private getAvailableDateRanges;
|
|
79
72
|
}
|
|
80
|
-
type DateRange = {
|
|
81
|
-
key: 'day' | 'week' | '2weeks' | 'month' | 'quarter' | '6months' | 'year';
|
|
82
|
-
licensed: boolean;
|
|
83
|
-
granularity: 'hour' | 'day' | 'week';
|
|
84
|
-
};
|
|
85
|
-
export {};
|
|
@@ -1,10 +1,43 @@
|
|
|
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 () {
|
|
25
|
+
var ownKeys = function(o) {
|
|
26
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
+
var ar = [];
|
|
28
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
+
return ar;
|
|
30
|
+
};
|
|
31
|
+
return ownKeys(o);
|
|
32
|
+
};
|
|
33
|
+
return function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
})();
|
|
8
41
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
42
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
43
|
};
|
|
@@ -18,30 +51,35 @@ const n8n_core_1 = require("n8n-core");
|
|
|
18
51
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
19
52
|
const insights_shared_1 = require("./database/entities/insights-shared");
|
|
20
53
|
const insights_by_period_repository_1 = require("./database/repositories/insights-by-period.repository");
|
|
21
|
-
const insights_collection_service_1 = require("./insights-collection.service");
|
|
22
54
|
const insights_compaction_service_1 = require("./insights-compaction.service");
|
|
23
55
|
const insights_pruning_service_1 = require("./insights-pruning.service");
|
|
24
|
-
const insights_constants_1 = require("./insights.constants");
|
|
25
56
|
let InsightsService = class InsightsService {
|
|
26
|
-
constructor(insightsByPeriodRepository, compactionService,
|
|
57
|
+
constructor(insightsByPeriodRepository, compactionService, pruningService, licenseState, instanceSettings, logger) {
|
|
27
58
|
this.insightsByPeriodRepository = insightsByPeriodRepository;
|
|
28
59
|
this.compactionService = compactionService;
|
|
29
|
-
this.collectionService = collectionService;
|
|
30
60
|
this.pruningService = pruningService;
|
|
31
61
|
this.licenseState = licenseState;
|
|
32
62
|
this.instanceSettings = instanceSettings;
|
|
33
63
|
this.logger = logger;
|
|
34
64
|
this.logger = this.logger.scoped('insights');
|
|
35
65
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
66
|
+
async toggleCollectionService(enable) {
|
|
67
|
+
if (this.instanceSettings.instanceType !== 'main' &&
|
|
68
|
+
this.instanceSettings.instanceType !== 'webhook') {
|
|
69
|
+
this.logger.debug('Instance is not main or webhook, skipping collection');
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
const { InsightsCollectionService } = await Promise.resolve().then(() => __importStar(require('./insights-collection.service')));
|
|
73
|
+
const collectionService = di_1.Container.get(InsightsCollectionService);
|
|
74
|
+
if (enable) {
|
|
75
|
+
collectionService.init();
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
await collectionService.shutdown();
|
|
79
|
+
}
|
|
42
80
|
}
|
|
43
|
-
|
|
44
|
-
this.
|
|
81
|
+
async init() {
|
|
82
|
+
await this.toggleCollectionService(true);
|
|
45
83
|
if (this.instanceSettings.isLeader)
|
|
46
84
|
this.startCompactionAndPruningTimers();
|
|
47
85
|
}
|
|
@@ -56,7 +94,7 @@ let InsightsService = class InsightsService {
|
|
|
56
94
|
this.pruningService.stopPruningTimer();
|
|
57
95
|
}
|
|
58
96
|
async shutdown() {
|
|
59
|
-
await this.
|
|
97
|
+
await this.toggleCollectionService(false);
|
|
60
98
|
this.stopCompactionAndPruningTimers();
|
|
61
99
|
}
|
|
62
100
|
async getInsightsSummary({ startDate, endDate, projectId, }) {
|
|
@@ -188,17 +226,6 @@ let InsightsService = class InsightsService {
|
|
|
188
226
|
}
|
|
189
227
|
return 'week';
|
|
190
228
|
}
|
|
191
|
-
getAvailableDateRanges() {
|
|
192
|
-
const maxHistoryInDays = this.licenseState.getInsightsMaxHistory() === -1
|
|
193
|
-
? Number.MAX_SAFE_INTEGER
|
|
194
|
-
: this.licenseState.getInsightsMaxHistory();
|
|
195
|
-
const isHourlyDateLicensed = this.licenseState.isInsightsHourlyDataLicensed();
|
|
196
|
-
return insights_constants_1.INSIGHTS_DATE_RANGE_KEYS.map((key) => ({
|
|
197
|
-
key,
|
|
198
|
-
licensed: key === 'day' ? (isHourlyDateLicensed ?? false) : maxHistoryInDays >= insights_constants_1.keyRangeToDays[key],
|
|
199
|
-
granularity: key === 'day' ? 'hour' : insights_constants_1.keyRangeToDays[key] <= 30 ? 'day' : 'week',
|
|
200
|
-
}));
|
|
201
|
-
}
|
|
202
229
|
};
|
|
203
230
|
exports.InsightsService = InsightsService;
|
|
204
231
|
__decorate([
|
|
@@ -217,7 +244,6 @@ exports.InsightsService = InsightsService = __decorate([
|
|
|
217
244
|
(0, di_1.Service)(),
|
|
218
245
|
__metadata("design:paramtypes", [insights_by_period_repository_1.InsightsByPeriodRepository,
|
|
219
246
|
insights_compaction_service_1.InsightsCompactionService,
|
|
220
|
-
insights_collection_service_1.InsightsCollectionService,
|
|
221
247
|
insights_pruning_service_1.InsightsPruningService,
|
|
222
248
|
backend_common_1.LicenseState,
|
|
223
249
|
n8n_core_1.InstanceSettings,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insights.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"insights.service.js","sourceRoot":"","sources":["../../../src/modules/insights/insights.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { LicenseState } from '@n8n/backend-common';
|
|
2
|
+
export declare class InsightsSettings {
|
|
3
|
+
private readonly licenseState;
|
|
4
|
+
constructor(licenseState: LicenseState);
|
|
5
|
+
settings(): {
|
|
6
|
+
summary: boolean;
|
|
7
|
+
dashboard: boolean;
|
|
8
|
+
dateRanges: DateRange[];
|
|
9
|
+
};
|
|
10
|
+
private getAvailableDateRanges;
|
|
11
|
+
}
|
|
12
|
+
type DateRange = {
|
|
13
|
+
key: 'day' | 'week' | '2weeks' | 'month' | 'quarter' | '6months' | 'year';
|
|
14
|
+
licensed: boolean;
|
|
15
|
+
granularity: 'hour' | 'day' | 'week';
|
|
16
|
+
};
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,44 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.InsightsSettings = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
14
|
+
const di_1 = require("@n8n/di");
|
|
15
|
+
const insights_constants_1 = require("./insights.constants");
|
|
16
|
+
let InsightsSettings = class InsightsSettings {
|
|
17
|
+
constructor(licenseState) {
|
|
18
|
+
this.licenseState = licenseState;
|
|
19
|
+
}
|
|
20
|
+
settings() {
|
|
21
|
+
return {
|
|
22
|
+
summary: this.licenseState.isInsightsSummaryLicensed(),
|
|
23
|
+
dashboard: this.licenseState.isInsightsDashboardLicensed(),
|
|
24
|
+
dateRanges: this.getAvailableDateRanges(),
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
getAvailableDateRanges() {
|
|
28
|
+
const maxHistoryInDays = this.licenseState.getInsightsMaxHistory() === -1
|
|
29
|
+
? Number.MAX_SAFE_INTEGER
|
|
30
|
+
: this.licenseState.getInsightsMaxHistory();
|
|
31
|
+
const isHourlyDateLicensed = this.licenseState.isInsightsHourlyDataLicensed();
|
|
32
|
+
return insights_constants_1.INSIGHTS_DATE_RANGE_KEYS.map((key) => ({
|
|
33
|
+
key,
|
|
34
|
+
licensed: key === 'day' ? (isHourlyDateLicensed ?? false) : maxHistoryInDays >= insights_constants_1.keyRangeToDays[key],
|
|
35
|
+
granularity: key === 'day' ? 'hour' : insights_constants_1.keyRangeToDays[key] <= 30 ? 'day' : 'week',
|
|
36
|
+
}));
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
exports.InsightsSettings = InsightsSettings;
|
|
40
|
+
exports.InsightsSettings = InsightsSettings = __decorate([
|
|
41
|
+
(0, di_1.Service)(),
|
|
42
|
+
__metadata("design:paramtypes", [backend_common_1.LicenseState])
|
|
43
|
+
], InsightsSettings);
|
|
44
|
+
//# sourceMappingURL=insights.settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"insights.settings.js","sourceRoot":"","sources":["../../../src/modules/insights/insights.settings.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAmD;AACnD,gCAAkC;AAElC,6DAAgF;AAGzE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAE3D,QAAQ;QACP,OAAO;YACN,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE;YACtD,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE;YAC1D,UAAU,EAAE,IAAI,CAAC,sBAAsB,EAAE;SACzC,CAAC;IACH,CAAC;IAEO,sBAAsB;QAC7B,MAAM,gBAAgB,GACrB,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC,CAAC,MAAM,CAAC,gBAAgB;YACzB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC;QAC9C,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,4BAA4B,EAAE,CAAC;QAE9E,OAAO,6CAAwB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC7C,GAAG;YACH,QAAQ,EACP,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,IAAI,mCAAc,CAAC,GAAG,CAAC;YAC1F,WAAW,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,mCAAc,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;SAChF,CAAC,CAAC,CAAC;IACL,CAAC;CACD,CAAA;AAzBY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAEkC,6BAAY;GAD3C,gBAAgB,CAyB5B"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { ApiKey, ApiKeyRepository, User, UserRepository } from '@n8n/db';
|
|
2
2
|
import { EntityManager } from '@n8n/typeorm';
|
|
3
|
-
import { JwtService } from '../../services/jwt.service';
|
|
4
3
|
import { AccessTokenRepository } from './database/repositories/oauth-access-token.repository';
|
|
4
|
+
import { UserWithContext } from './mcp.types';
|
|
5
|
+
import { JwtService } from '../../services/jwt.service';
|
|
5
6
|
export declare class McpServerApiKeyService {
|
|
6
7
|
private readonly apiKeyRepository;
|
|
7
8
|
private readonly jwtService;
|
|
@@ -13,7 +14,7 @@ export declare class McpServerApiKeyService {
|
|
|
13
14
|
redact?: boolean | undefined;
|
|
14
15
|
}): Promise<ApiKey | null>;
|
|
15
16
|
getUserForApiKey(apiKey: string): Promise<User | null>;
|
|
16
|
-
verifyApiKey(apiKey: string): Promise<
|
|
17
|
+
verifyApiKey(apiKey: string): Promise<UserWithContext>;
|
|
17
18
|
getUserForAccessToken(token: string): Promise<User | null>;
|
|
18
19
|
deleteAllMcpApiKeysForUser(user: User, trx?: EntityManager): Promise<void>;
|
|
19
20
|
private redactApiKey;
|
|
@@ -13,8 +13,9 @@ exports.McpServerApiKeyService = void 0;
|
|
|
13
13
|
const db_1 = require("@n8n/db");
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
15
|
const crypto_1 = require("crypto");
|
|
16
|
-
const
|
|
16
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
17
|
const oauth_access_token_repository_1 = require("./database/repositories/oauth-access-token.repository");
|
|
18
|
+
const jwt_service_1 = require("../../services/jwt.service");
|
|
18
19
|
const API_KEY_AUDIENCE = 'mcp-server-api';
|
|
19
20
|
const API_KEY_ISSUER = 'n8n';
|
|
20
21
|
const REDACT_API_KEY_REVEAL_COUNT = 4;
|
|
@@ -75,10 +76,28 @@ let McpServerApiKeyService = class McpServerApiKeyService {
|
|
|
75
76
|
issuer: API_KEY_ISSUER,
|
|
76
77
|
audience: API_KEY_AUDIENCE,
|
|
77
78
|
});
|
|
78
|
-
|
|
79
|
+
const user = await this.getUserForApiKey(apiKey);
|
|
80
|
+
if (!user) {
|
|
81
|
+
return {
|
|
82
|
+
user: null,
|
|
83
|
+
context: {
|
|
84
|
+
reason: 'user_not_found',
|
|
85
|
+
auth_type: 'api_key',
|
|
86
|
+
},
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
return { user };
|
|
79
90
|
}
|
|
80
91
|
catch (error) {
|
|
81
|
-
|
|
92
|
+
const errorForSure = (0, n8n_workflow_1.ensureError)(error);
|
|
93
|
+
return {
|
|
94
|
+
user: null,
|
|
95
|
+
context: {
|
|
96
|
+
reason: errorForSure.name === 'JsonWebTokenError' ? 'invalid_token' : 'unknown_error',
|
|
97
|
+
auth_type: 'api_key',
|
|
98
|
+
error_details: errorForSure.message,
|
|
99
|
+
},
|
|
100
|
+
};
|
|
82
101
|
}
|
|
83
102
|
}
|
|
84
103
|
async getUserForAccessToken(token) {
|