n8n 1.53.1 → 1.54.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/README.md +1 -5
- package/dist/AbstractServer.d.ts +2 -1
- package/dist/AbstractServer.js +18 -16
- package/dist/AbstractServer.js.map +1 -1
- package/dist/ActiveExecutions.js +2 -3
- package/dist/ActiveExecutions.js.map +1 -1
- package/dist/ActiveWorkflowManager.d.ts +1 -1
- package/dist/ActiveWorkflowManager.js +2 -2
- package/dist/ActiveWorkflowManager.js.map +1 -1
- package/dist/ExternalSecrets/ExternalSecretsManager.ee.d.ts +1 -1
- package/dist/ExternalSecrets/ExternalSecretsManager.ee.js +1 -1
- package/dist/ExternalSecrets/ExternalSecretsManager.ee.js.map +1 -1
- package/dist/Interfaces.d.ts +2 -37
- package/dist/Interfaces.js.map +1 -1
- package/dist/InternalHooks.d.ts +1 -66
- package/dist/InternalHooks.js +1 -234
- package/dist/InternalHooks.js.map +1 -1
- package/dist/Ldap/ldap.controller.ee.d.ts +1 -1
- package/dist/Ldap/ldap.controller.ee.js +1 -1
- package/dist/Ldap/ldap.controller.ee.js.map +1 -1
- package/dist/Ldap/ldap.service.ee.d.ts +1 -1
- package/dist/Ldap/ldap.service.ee.js +1 -1
- package/dist/Ldap/ldap.service.ee.js.map +1 -1
- package/dist/License.js +1 -1
- package/dist/License.js.map +1 -1
- package/dist/PublicApi/index.js +1 -1
- package/dist/PublicApi/index.js.map +1 -1
- package/dist/PublicApi/types.d.ts +6 -0
- package/dist/PublicApi/types.js.map +1 -1
- package/dist/PublicApi/v1/handlers/credentials/credentials.handler.d.ts +3 -0
- package/dist/PublicApi/v1/handlers/credentials/credentials.handler.js +10 -0
- package/dist/PublicApi/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/credentials/credentials.service.js +1 -1
- package/dist/PublicApi/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/PublicApi/v1/handlers/executions/executions.handler.js +9 -9
- package/dist/PublicApi/v1/handlers/executions/executions.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/projects/projects.handler.d.ts +17 -0
- package/dist/PublicApi/v1/handlers/projects/projects.handler.js +56 -0
- package/dist/PublicApi/v1/handlers/projects/projects.handler.js.map +1 -0
- package/dist/PublicApi/v1/handlers/sourceControl/sourceControl.handler.js +1 -1
- package/dist/PublicApi/v1/handlers/sourceControl/sourceControl.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/users/users.handler.ee.d.ts +12 -0
- package/dist/PublicApi/v1/handlers/users/users.handler.ee.js +39 -12
- package/dist/PublicApi/v1/handlers/users/users.handler.ee.js.map +1 -1
- package/dist/PublicApi/v1/handlers/users/users.service.ee.d.ts +1 -0
- package/dist/PublicApi/v1/handlers/users/users.service.ee.js +3 -1
- package/dist/PublicApi/v1/handlers/users/users.service.ee.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js +12 -12
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.service.d.ts +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.service.js +3 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/PublicApi/v1/openapi.yml +280 -1
- package/dist/Server.d.ts +2 -4
- package/dist/Server.js +12 -15
- package/dist/Server.js.map +1 -1
- package/dist/UserManagement/email/UserManagementMailer.js +1 -1
- package/dist/UserManagement/email/UserManagementMailer.js.map +1 -1
- package/dist/WaitingForms.d.ts +1 -1
- package/dist/WaitingForms.js +1 -1
- package/dist/WaitingForms.js.map +1 -1
- package/dist/WorkflowExecuteAdditionalData.js +9 -23
- package/dist/WorkflowExecuteAdditionalData.js.map +1 -1
- package/dist/WorkflowRunner.d.ts +1 -1
- package/dist/WorkflowRunner.js +2 -7
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/auth/auth.service.js +26 -4
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/auth/methods/email.js +1 -1
- package/dist/auth/methods/email.js.map +1 -1
- package/dist/auth/methods/ldap.js +5 -6
- package/dist/auth/methods/ldap.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/BaseCommand.d.ts +3 -1
- package/dist/commands/BaseCommand.js +8 -2
- package/dist/commands/BaseCommand.js.map +1 -1
- package/dist/commands/execute.d.ts +1 -0
- package/dist/commands/execute.js +4 -0
- package/dist/commands/execute.js.map +1 -1
- package/dist/commands/executeBatch.d.ts +1 -0
- package/dist/commands/executeBatch.js +4 -0
- package/dist/commands/executeBatch.js.map +1 -1
- package/dist/commands/start.d.ts +1 -0
- package/dist/commands/start.js +30 -25
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.d.ts +2 -1
- package/dist/commands/webhook.js +3 -2
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.d.ts +1 -0
- package/dist/commands/worker.js +13 -14
- package/dist/commands/worker.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.d.ts +1 -1
- package/dist/concurrency/concurrency-control.service.js +1 -1
- package/dist/concurrency/concurrency-control.service.js.map +1 -1
- package/dist/config/index.d.ts +2 -38
- package/dist/config/schema.d.ts +3 -180
- package/dist/config/schema.js +5 -181
- package/dist/config/schema.js.map +1 -1
- package/dist/controllers/auth.controller.d.ts +1 -1
- package/dist/controllers/auth.controller.js +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/communityPackages.controller.d.ts +1 -3
- package/dist/controllers/communityPackages.controller.js +4 -23
- package/dist/controllers/communityPackages.controller.js.map +1 -1
- package/dist/controllers/invitation.controller.d.ts +2 -4
- package/dist/controllers/invitation.controller.js +6 -9
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/me.controller.d.ts +2 -4
- package/dist/controllers/me.controller.js +8 -9
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/oauth/abstractOAuth.controller.d.ts +5 -4
- package/dist/controllers/oauth/abstractOAuth.controller.js +8 -6
- package/dist/controllers/oauth/abstractOAuth.controller.js.map +1 -1
- package/dist/controllers/oauth/oAuth1Credential.controller.js +7 -12
- package/dist/controllers/oauth/oAuth1Credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oAuth2Credential.controller.js +6 -9
- package/dist/controllers/oauth/oAuth2Credential.controller.js.map +1 -1
- package/dist/controllers/passwordReset.controller.d.ts +1 -1
- package/dist/controllers/passwordReset.controller.js +5 -6
- package/dist/controllers/passwordReset.controller.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +1 -1
- package/dist/controllers/project.controller.js +1 -1
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +2 -4
- package/dist/controllers/users.controller.js +14 -20
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +1 -1
- package/dist/credentials/credentials.controller.js +1 -1
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/repositories/projectRelation.repository.d.ts +2 -0
- package/dist/databases/repositories/projectRelation.repository.js +14 -0
- package/dist/databases/repositories/projectRelation.repository.js.map +1 -1
- package/dist/databases/repositories/sharedWorkflow.repository.d.ts +1 -0
- package/dist/databases/repositories/sharedWorkflow.repository.js +8 -0
- package/dist/databases/repositories/sharedWorkflow.repository.js.map +1 -1
- package/dist/decorators/controller.registry.d.ts +3 -1
- package/dist/decorators/controller.registry.js +6 -7
- package/dist/decorators/controller.registry.js.map +1 -1
- package/dist/environments/sourceControl/sourceControl.controller.ee.d.ts +1 -1
- package/dist/environments/sourceControl/sourceControl.controller.ee.js +1 -1
- package/dist/environments/sourceControl/sourceControl.controller.ee.js.map +1 -1
- package/dist/environments/sourceControl/sourceControl.service.ee.d.ts +1 -1
- package/dist/environments/sourceControl/sourceControl.service.ee.js +1 -1
- package/dist/environments/sourceControl/sourceControl.service.ee.js.map +1 -1
- package/dist/environments/sourceControl/sourceControlExport.service.ee.js +3 -1
- package/dist/environments/sourceControl/sourceControlExport.service.ee.js.map +1 -1
- package/dist/environments/sourceControl/sourceControlImport.service.ee.js +2 -1
- package/dist/environments/sourceControl/sourceControlImport.service.ee.js.map +1 -1
- package/dist/environments/variables/variables.service.ee.d.ts +1 -1
- package/dist/environments/variables/variables.service.ee.js +1 -1
- package/dist/environments/variables/variables.service.ee.js.map +1 -1
- package/dist/errors/redactable.error.js +1 -1
- package/dist/errors/redactable.error.js.map +1 -1
- package/dist/eventbus/MessageEventBus/MessageEventBus.js.map +1 -1
- package/dist/events/event-relay.d.ts +9 -0
- package/dist/events/event-relay.js +32 -0
- package/dist/events/event-relay.js.map +1 -0
- package/dist/events/event.service.d.ts +4 -0
- package/dist/events/event.service.js.map +1 -0
- package/dist/{eventbus/audit-event-relay.service.d.ts → events/log-streaming-event-relay.d.ts} +4 -4
- package/dist/{eventbus/audit-event-relay.service.js → events/log-streaming-event-relay.js} +78 -71
- package/dist/events/log-streaming-event-relay.js.map +1 -0
- package/dist/{eventbus/event.types.d.ts → events/relay-event-map.d.ts} +62 -17
- package/dist/events/relay-event-map.js +3 -0
- package/dist/events/relay-event-map.js.map +1 -0
- package/dist/{telemetry/telemetry-event-relay.service.d.ts → events/telemetry-event-relay.d.ts} +28 -6
- package/dist/events/telemetry-event-relay.js +607 -0
- package/dist/events/telemetry-event-relay.js.map +1 -0
- package/dist/executions/execution-recovery.service.d.ts +4 -2
- package/dist/executions/execution-recovery.service.js +10 -19
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +5 -1
- package/dist/executions/execution.service.js +13 -2
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/execution.types.d.ts +5 -1
- package/dist/executions/executions.controller.js +6 -2
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/license/license.controller.js +14 -1
- package/dist/license/license.controller.js.map +1 -1
- package/dist/license/license.service.d.ts +1 -1
- package/dist/license/license.service.js +1 -1
- package/dist/license/license.service.js.map +1 -1
- package/dist/metrics/prometheus-metrics.service.d.ts +3 -1
- package/dist/metrics/prometheus-metrics.service.js +16 -14
- package/dist/metrics/prometheus-metrics.service.js.map +1 -1
- package/dist/middlewares/bodyParser.js +3 -2
- package/dist/middlewares/bodyParser.js.map +1 -1
- package/dist/requests.d.ts +4 -5
- package/dist/requests.js.map +1 -1
- package/dist/services/cache/cache.service.d.ts +3 -0
- package/dist/services/cache/cache.service.js +16 -7
- package/dist/services/cache/cache.service.js.map +1 -1
- package/dist/services/communityPackages.service.d.ts +14 -11
- package/dist/services/communityPackages.service.js +42 -22
- package/dist/services/communityPackages.service.js.map +1 -1
- package/dist/services/frontend.service.js +7 -7
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/orchestration/main/MultiMainSetup.ee.d.ts +3 -1
- package/dist/services/orchestration/main/MultiMainSetup.ee.js +10 -7
- package/dist/services/orchestration/main/MultiMainSetup.ee.js.map +1 -1
- package/dist/services/orchestration/main/handleCommandMessageMain.js +17 -1
- package/dist/services/orchestration/main/handleCommandMessageMain.js.map +1 -1
- package/dist/services/orchestration/webhook/handleCommandMessageWebhook.js +16 -0
- package/dist/services/orchestration/webhook/handleCommandMessageWebhook.js.map +1 -1
- package/dist/services/orchestration/worker/handleCommandMessageWorker.js +15 -0
- package/dist/services/orchestration/worker/handleCommandMessageWorker.js.map +1 -1
- package/dist/services/orchestration.service.d.ts +3 -1
- package/dist/services/orchestration.service.js +7 -4
- package/dist/services/orchestration.service.js.map +1 -1
- package/dist/services/pruning.service.d.ts +3 -2
- package/dist/services/pruning.service.js +4 -2
- package/dist/services/pruning.service.js.map +1 -1
- package/dist/services/redis/RedisServiceCommands.d.ts +9 -2
- package/dist/services/user.service.d.ts +1 -1
- package/dist/services/user.service.js +4 -8
- package/dist/services/user.service.js.map +1 -1
- package/dist/sso/saml/routes/saml.controller.ee.d.ts +1 -1
- package/dist/sso/saml/routes/saml.controller.ee.js +1 -1
- package/dist/sso/saml/routes/saml.controller.ee.js.map +1 -1
- package/dist/{ActiveWebhooks.d.ts → webhooks/ActiveWebhooks.d.ts} +7 -7
- package/dist/{ActiveWebhooks.js → webhooks/ActiveWebhooks.js} +9 -9
- package/dist/webhooks/ActiveWebhooks.js.map +1 -0
- package/dist/{TestWebhooks.d.ts → webhooks/TestWebhooks.d.ts} +7 -6
- package/dist/{TestWebhooks.js → webhooks/TestWebhooks.js} +11 -11
- package/dist/webhooks/TestWebhooks.js.map +1 -0
- package/dist/{WaitingWebhooks.d.ts → webhooks/WaitingWebhooks.d.ts} +6 -5
- package/dist/{WaitingWebhooks.js → webhooks/WaitingWebhooks.js} +7 -7
- package/dist/webhooks/WaitingWebhooks.js.map +1 -0
- package/dist/{WebhookHelpers.d.ts → webhooks/WebhookHelpers.d.ts} +3 -2
- package/dist/{WebhookHelpers.js → webhooks/WebhookHelpers.js} +16 -13
- package/dist/webhooks/WebhookHelpers.js.map +1 -0
- package/dist/{WebhookServer.d.ts → webhooks/WebhookServer.d.ts} +1 -1
- package/dist/{WebhookServer.js → webhooks/WebhookServer.js} +1 -1
- package/dist/webhooks/WebhookServer.js.map +1 -0
- package/dist/{services → webhooks}/test-webhook-registrations.service.d.ts +1 -1
- package/dist/{services → webhooks}/test-webhook-registrations.service.js +1 -1
- package/dist/{services → webhooks}/test-webhook-registrations.service.js.map +1 -1
- package/dist/{services → webhooks}/webhook.service.js.map +1 -1
- package/dist/webhooks/webhook.types.d.ts +30 -0
- package/dist/{eventbus/event.types.js → webhooks/webhook.types.js} +1 -1
- package/dist/webhooks/webhook.types.js.map +1 -0
- package/dist/workflows/workflow.service.d.ts +1 -1
- package/dist/workflows/workflow.service.js +5 -8
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflowExecution.service.d.ts +1 -1
- package/dist/workflows/workflowExecution.service.js +1 -1
- package/dist/workflows/workflowExecution.service.js.map +1 -1
- package/dist/workflows/workflowSharing.service.d.ts +6 -1
- package/dist/workflows/workflowSharing.service.js +20 -3
- package/dist/workflows/workflowSharing.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +1 -1
- package/dist/workflows/workflows.controller.js +8 -3
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +7 -7
- package/templates/form-trigger.handlebars +8 -5
- package/dist/ActiveWebhooks.js.map +0 -1
- package/dist/TestWebhooks.js.map +0 -1
- package/dist/WaitingWebhooks.js.map +0 -1
- package/dist/WebhookHelpers.js.map +0 -1
- package/dist/WebhookServer.js.map +0 -1
- package/dist/eventbus/audit-event-relay.service.js.map +0 -1
- package/dist/eventbus/event.service.d.ts +0 -4
- package/dist/eventbus/event.service.js.map +0 -1
- package/dist/eventbus/event.types.js.map +0 -1
- package/dist/telemetry/telemetry-event-relay.service.js +0 -372
- package/dist/telemetry/telemetry-event-relay.service.js.map +0 -1
- /package/dist/{eventbus → events}/event.service.js +0 -0
- /package/dist/{services → webhooks}/webhook.service.d.ts +0 -0
- /package/dist/{services → webhooks}/webhook.service.js +0 -0
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
import { Push } from '../push';
|
|
2
2
|
import { ExecutionRepository } from '../databases/repositories/execution.repository';
|
|
3
|
+
import { InstanceSettings } from 'n8n-core';
|
|
3
4
|
import type { EventMessageTypes } from '../eventbus/EventMessageClasses';
|
|
4
5
|
import type { IExecutionResponse } from '../Interfaces';
|
|
5
6
|
import { Logger } from '../Logger';
|
|
6
7
|
import { OrchestrationService } from '../services/orchestration.service';
|
|
7
|
-
import { EventService } from '../
|
|
8
|
+
import { EventService } from '../events/event.service';
|
|
8
9
|
export declare class ExecutionRecoveryService {
|
|
9
10
|
private readonly logger;
|
|
11
|
+
private readonly instanceSettings;
|
|
10
12
|
private readonly push;
|
|
11
13
|
private readonly executionRepository;
|
|
12
14
|
private readonly orchestrationService;
|
|
13
15
|
private readonly eventService;
|
|
14
|
-
constructor(logger: Logger, push: Push, executionRepository: ExecutionRepository, orchestrationService: OrchestrationService, eventService: EventService);
|
|
16
|
+
constructor(logger: Logger, instanceSettings: InstanceSettings, push: Push, executionRepository: ExecutionRepository, orchestrationService: OrchestrationService, eventService: EventService);
|
|
15
17
|
init(): void;
|
|
16
18
|
private readonly queueRecoverySettings;
|
|
17
19
|
private isShuttingDown;
|
|
@@ -41,7 +41,7 @@ const push_1 = require("../push");
|
|
|
41
41
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
42
42
|
const execution_repository_1 = require("../databases/repositories/execution.repository");
|
|
43
43
|
const WorkflowExecuteAdditionalData_1 = require("../WorkflowExecuteAdditionalData");
|
|
44
|
-
const
|
|
44
|
+
const n8n_core_1 = require("n8n-core");
|
|
45
45
|
const node_crashed_error_1 = require("../errors/node-crashed.error");
|
|
46
46
|
const workflow_crashed_error_1 = require("../errors/workflow-crashed.error");
|
|
47
47
|
const constants_1 = require("../constants");
|
|
@@ -49,10 +49,11 @@ const Logger_1 = require("../Logger");
|
|
|
49
49
|
const config_1 = __importDefault(require("../config"));
|
|
50
50
|
const OnShutdown_1 = require("../decorators/OnShutdown");
|
|
51
51
|
const orchestration_service_1 = require("../services/orchestration.service");
|
|
52
|
-
const event_service_1 = require("../
|
|
52
|
+
const event_service_1 = require("../events/event.service");
|
|
53
53
|
let ExecutionRecoveryService = class ExecutionRecoveryService {
|
|
54
|
-
constructor(logger, push, executionRepository, orchestrationService, eventService) {
|
|
54
|
+
constructor(logger, instanceSettings, push, executionRepository, orchestrationService, eventService) {
|
|
55
55
|
this.logger = logger;
|
|
56
|
+
this.instanceSettings = instanceSettings;
|
|
56
57
|
this.push = push;
|
|
57
58
|
this.executionRepository = executionRepository;
|
|
58
59
|
this.orchestrationService = orchestrationService;
|
|
@@ -66,9 +67,10 @@ let ExecutionRecoveryService = class ExecutionRecoveryService {
|
|
|
66
67
|
init() {
|
|
67
68
|
if (config_1.default.getEnv('executions.mode') === 'regular')
|
|
68
69
|
return;
|
|
69
|
-
const { isLeader
|
|
70
|
+
const { isLeader } = this.instanceSettings;
|
|
70
71
|
if (isLeader)
|
|
71
72
|
this.scheduleQueueRecovery();
|
|
73
|
+
const { isMultiMainSetupEnabled } = this.orchestrationService;
|
|
72
74
|
if (isMultiMainSetupEnabled) {
|
|
73
75
|
this.orchestrationService.multiMainSetup
|
|
74
76
|
.on('leader-takeover', () => this.scheduleQueueRecovery())
|
|
@@ -76,7 +78,7 @@ let ExecutionRecoveryService = class ExecutionRecoveryService {
|
|
|
76
78
|
}
|
|
77
79
|
}
|
|
78
80
|
async recoverFromLogs(executionId, messages) {
|
|
79
|
-
if (this.
|
|
81
|
+
if (this.instanceSettings.isFollower)
|
|
80
82
|
return;
|
|
81
83
|
const amendedExecution = await this.amend(executionId, messages);
|
|
82
84
|
if (!amendedExecution)
|
|
@@ -228,21 +230,9 @@ let ExecutionRecoveryService = class ExecutionRecoveryService {
|
|
|
228
230
|
async runHooks(execution) {
|
|
229
231
|
var _a, _b;
|
|
230
232
|
(_a = execution.data) !== null && _a !== void 0 ? _a : (execution.data = { resultData: { runData: {} } });
|
|
231
|
-
await typedi_1.default.get(InternalHooks_1.InternalHooks).onWorkflowPostExecute(execution.id, execution.workflowData, {
|
|
232
|
-
data: execution.data,
|
|
233
|
-
finished: false,
|
|
234
|
-
mode: execution.mode,
|
|
235
|
-
waitTill: execution.waitTill,
|
|
236
|
-
startedAt: execution.startedAt,
|
|
237
|
-
stoppedAt: execution.stoppedAt,
|
|
238
|
-
status: execution.status,
|
|
239
|
-
});
|
|
240
233
|
this.eventService.emit('workflow-post-execute', {
|
|
241
|
-
|
|
242
|
-
workflowName: execution.workflowData.name,
|
|
234
|
+
workflow: execution.workflowData,
|
|
243
235
|
executionId: execution.id,
|
|
244
|
-
success: execution.status === 'success',
|
|
245
|
-
isManual: execution.mode === 'manual',
|
|
246
236
|
runData: execution,
|
|
247
237
|
});
|
|
248
238
|
const externalHooks = (0, WorkflowExecuteAdditionalData_1.getWorkflowHooksMain)({
|
|
@@ -271,7 +261,7 @@ let ExecutionRecoveryService = class ExecutionRecoveryService {
|
|
|
271
261
|
}
|
|
272
262
|
shouldScheduleQueueRecovery() {
|
|
273
263
|
return (config_1.default.getEnv('executions.mode') === 'queue' &&
|
|
274
|
-
|
|
264
|
+
this.instanceSettings.isLeader &&
|
|
275
265
|
!this.isShuttingDown);
|
|
276
266
|
}
|
|
277
267
|
};
|
|
@@ -285,6 +275,7 @@ __decorate([
|
|
|
285
275
|
exports.ExecutionRecoveryService = ExecutionRecoveryService = __decorate([
|
|
286
276
|
(0, typedi_1.Service)(),
|
|
287
277
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
278
|
+
n8n_core_1.InstanceSettings,
|
|
288
279
|
push_1.Push,
|
|
289
280
|
execution_repository_1.ExecutionRepository,
|
|
290
281
|
orchestration_service_1.OrchestrationService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-recovery.service.js","sourceRoot":"","sources":["../../src/executions/execution-recovery.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA4C;AAC5C,iCAA8B;AAC9B,+CAAoD;AACpD,gFAA4E;AAC5E,mFAAuE;
|
|
1
|
+
{"version":3,"file":"execution-recovery.service.js","sourceRoot":"","sources":["../../src/executions/execution-recovery.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA4C;AAC5C,iCAA8B;AAC9B,+CAAoD;AACpD,gFAA4E;AAC5E,mFAAuE;AAGvE,uCAA4C;AAG5C,oEAA+D;AAC/D,4EAAuE;AACvE,2CAAmD;AACnD,qCAAkC;AAClC,sDAA8B;AAC9B,wDAAqD;AAErD,4EAAwE;AACxE,0DAAsD;AAM/C,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YACkB,MAAc,EACd,gBAAkC,EAClC,IAAU,EACV,mBAAwC,EACxC,oBAA0C,EAC1C,YAA0B;QAL1B,WAAM,GAAN,MAAM,CAAQ;QACd,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,SAAI,GAAJ,IAAI,CAAM;QACV,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,iBAAY,GAAZ,YAAY,CAAc;QAoB3B,0BAAqB,GAA0B;YAC/D,SAAS,EAAE,gBAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;YAC9D,MAAM,EAAE,gBAAM,CAAC,MAAM,CAAC,mCAAmC,CAAC,GAAG,EAAE,GAAG,IAAI;SACtE,CAAC;QAEM,mBAAc,GAAG,KAAK,CAAC;IAxB5B,CAAC;IAKJ,IAAI;QACH,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,SAAS;YAAE,OAAO;QAE3D,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC3C,IAAI,QAAQ;YAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAE3C,MAAM,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAAC;QAC9D,IAAI,uBAAuB,EAAE,CAAC;YAC7B,IAAI,CAAC,oBAAoB,CAAC,cAAc;iBACtC,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;iBACzD,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACzD,CAAC;IACF,CAAC;IAYD,KAAK,CAAC,eAAe,CAAC,WAAmB,EAAE,QAA6B;QACvE,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU;YAAE,OAAO;QAE7C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAEjE,IAAI,CAAC,gBAAgB;YAAE,OAAO,IAAI,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;YAChE,WAAW,EAAE,gBAAgB,CAAC,EAAE;SAChC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QAEtF,MAAM,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QAEtC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,IAAA,oBAAK,EAAC,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAKD,qBAAqB,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM;QAC/D,IAAI,CAAC,IAAI,CAAC,2BAA2B,EAAE;YAAE,OAAO;QAEhD,IAAI,CAAC,qBAAqB,CAAC,OAAO,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YAC1D,IAAI,CAAC;gBACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACjD,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAEnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6DAA6D,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC1F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAE5C,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9B,CAAC;QACF,CAAC,EAAE,MAAM,CAAC,CAAC;QAEX,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sDAAsD,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,iBAAiB;QAChB,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC1B,CAAC;IAUO,KAAK,CAAC,gBAAgB;QAC7B,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAEzD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;QAEtF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,OAAO,MAAM,CAAC;QACf,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,wDAAa,SAAS,GAAC,CAAC;QAE1C,MAAM,SAAS,GAAG,MAAM,gBAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,yBAAyB,EAAE,CAAC;QAEzE,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,OAAO,MAAM,CAAC;QACf,CAAC;QAED,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAEjE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,OAAO,MAAM,CAAC;QACf,CAAC;QAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAE1D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0EAA0E,EAAE;YAC5F,WAAW;SACX,CAAC,CAAC;QAKH,OAAO,SAAS,CAAC,MAAM,IAAI,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACvF,CAAC;IAKO,KAAK,CAAC,KAAK,CAAC,WAAmB,EAAE,QAA6B;;QACrE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE3E,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE7E,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE3C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE;YACjF,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAE9D,MAAM,gBAAgB,GAAG,MAAA,SAAS,CAAC,IAAI,mCAAI,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC;QAE3E,IAAI,oBAA0C,CAAC;QAE/C,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YACjD,MAAM,kBAAkB,GAAG,YAAY,CAAC,IAAI,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS,KAAK,kBAAkB,CAC7E,CAAC;YAEF,IAAI,CAAC,kBAAkB;gBAAE,SAAS;YAElC,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;YAEpF,IAAI,cAAc;gBAAE,SAAS;YAE7B,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAC5C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS,KAAK,mBAAmB,CAC9E,CAAC;YAEF,MAAM,QAAQ,GAAc;gBAC3B,SAAS,EAAE,kBAAkB,CAAC,EAAE,CAAC,aAAa,EAAE;gBAChD,aAAa,EAAE,CAAC,CAAC;gBACjB,MAAM,EAAE,CAAC,IAAI,CAAC;aACd,CAAC;YAEF,IAAI,mBAAmB,EAAE,CAAC;gBACzB,QAAQ,CAAC,eAAe,GAAG,SAAS,CAAC;gBACrC,MAAA,QAAQ,CAAC,IAAI,oCAAb,QAAQ,CAAC,IAAI,GAAK,gCAAoB,EAAC;gBACvC,QAAQ,CAAC,aAAa,GAAG,mBAAmB,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACvF,oBAAoB,GAAG,mBAAmB,CAAC,EAAE,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACP,QAAQ,CAAC,eAAe,GAAG,SAAS,CAAC;gBACrC,QAAQ,CAAC,KAAK,GAAG,IAAI,qCAAgB,CAAC,IAAI,CAAC,CAAC;gBAC5C,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC;gBAC3B,gBAAgB,CAAC,UAAU,CAAC,KAAK,GAAG,IAAI,6CAAoB,EAAE,CAAC;gBAC/D,oBAAoB,GAAG,kBAAkB,CAAC,EAAE,CAAC;YAC9C,CAAC;YAED,gBAAgB,CAAC,UAAU,CAAC,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC;YACzD,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO;YACN,GAAG,SAAS;YACZ,MAAM,EAAE,SAAS,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YAC1D,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,oBAAoB,EAAE,gBAAgB,CAAC;YACnE,IAAI,EAAE,gBAAgB;SACA,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,WAAmB;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QAErF,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE;YACjF,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,OAAO,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,IAAI,CAAC;IAC1B,CAAC;IAEO,kBAAkB,CAAC,QAA6B;QACvD,OAAO,QAAQ,CAAC,MAAM,CAIrB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACZ,IAAI,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3C,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;iBAAM,IAAI,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;gBACtD,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;YAED,OAAO,GAAG,CAAC;QACZ,CAAC,EACD,EAAE,YAAY,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAC1C,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,SAA+B,EAAE,QAA6B;;QACjF,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;QAE3C,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;YACnC,sBAAsB;YACtB,sBAAsB;YACtB,qBAAqB;SACrB,CAAC,CAAC;QAEH,OAAO,MAAA,CACN,MAAA,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,mCAC1D,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,sBAAsB,CAAC,CAC5D,0CAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,SAA6B;;QACnD,MAAA,SAAS,CAAC,IAAI,oCAAd,SAAS,CAAC,IAAI,GAAK,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAC;QAEnD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,uBAAuB,EAAE;YAC/C,QAAQ,EAAE,SAAS,CAAC,YAAY;YAChC,WAAW,EAAE,SAAS,CAAC,EAAE;YACzB,OAAO,EAAE,SAAS;SAClB,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,IAAA,oDAAoB,EACzC;YACC,MAAM,EAAE,EAAE;YACV,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,aAAa,EAAE,SAAS,CAAC,IAAI;YAC7B,aAAa,EAAE,SAAS,CAAC,IAAI;YAC7B,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO;YAC1C,OAAO,EAAE,SAAS,CAAC,OAAO;SAC1B,EACD,SAAS,CAAC,EAAE,CACZ,CAAC;QAEF,MAAM,GAAG,GAAS;YACjB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,QAAQ,EAAE,MAAA,SAAS,CAAC,QAAQ,mCAAI,SAAS;YACzC,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;SACxB,CAAC;QAEF,MAAM,aAAa,CAAC,oBAAoB,CAAC,sBAAsB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,CAAC;IAEO,UAAU,CAAC,KAAc;QAChC,OAAO,KAAK,YAAY,KAAK;YAC5B,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,IAAA,4BAAa,EAAC,KAAK,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAEO,2BAA2B;QAClC,OAAO,CACN,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAC5C,IAAI,CAAC,gBAAgB,CAAC,QAAQ;YAC9B,CAAC,IAAI,CAAC,cAAc,CACpB,CAAC;IACH,CAAC;CACD,CAAA;AA/SY,4DAAwB;AA0FpC;IADC,IAAA,uBAAU,GAAE;;;;wDAIZ;mCA7FW,wBAAwB;IADpC,IAAA,gBAAO,GAAE;qCAGiB,eAAM;QACI,2BAAgB;QAC5B,WAAI;QACW,0CAAmB;QAClB,4CAAoB;QAC5B,4BAAY;GAPhC,wBAAwB,CA+SpC"}
|
|
@@ -13,6 +13,8 @@ import { Logger } from '../Logger';
|
|
|
13
13
|
import { WaitTracker } from '../WaitTracker';
|
|
14
14
|
import { ConcurrencyControlService } from '../concurrency/concurrency-control.service';
|
|
15
15
|
import { License } from '../License';
|
|
16
|
+
import type { User } from '../databases/entities/User';
|
|
17
|
+
import { WorkflowSharingService } from '../workflows/workflowSharing.service';
|
|
16
18
|
export declare const schemaGetExecutionsQueryFilter: {
|
|
17
19
|
$id: string;
|
|
18
20
|
type: string;
|
|
@@ -87,7 +89,8 @@ export declare class ExecutionService {
|
|
|
87
89
|
private readonly workflowRunner;
|
|
88
90
|
private readonly concurrencyControl;
|
|
89
91
|
private readonly license;
|
|
90
|
-
|
|
92
|
+
private readonly workflowSharingService;
|
|
93
|
+
constructor(globalConfig: GlobalConfig, logger: Logger, queue: Queue, activeExecutions: ActiveExecutions, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, waitTracker: WaitTracker, workflowRunner: WorkflowRunner, concurrencyControl: ConcurrencyControlService, license: License, workflowSharingService: WorkflowSharingService);
|
|
91
94
|
findOne(req: ExecutionRequest.GetOne, sharedWorkflowIds: string[]): Promise<IExecutionResponse | IExecutionFlattedResponse | undefined>;
|
|
92
95
|
retry(req: ExecutionRequest.Retry, sharedWorkflowIds: string[]): Promise<boolean>;
|
|
93
96
|
delete(req: ExecutionRequest.Delete, sharedWorkflowIds: string[]): Promise<void>;
|
|
@@ -107,4 +110,5 @@ export declare class ExecutionService {
|
|
|
107
110
|
private assertStoppable;
|
|
108
111
|
private stopInRegularMode;
|
|
109
112
|
private stopInScalingMode;
|
|
113
|
+
addScopes(user: User, summaries: ExecutionSummaries.ExecutionSummaryWithScopes[]): Promise<void>;
|
|
110
114
|
}
|
|
@@ -33,6 +33,7 @@ const queued_execution_retry_error_1 = require("../errors/queued-execution-retry
|
|
|
33
33
|
const concurrency_control_service_1 = require("../concurrency/concurrency-control.service");
|
|
34
34
|
const aborted_execution_retry_error_1 = require("../errors/aborted-execution-retry.error");
|
|
35
35
|
const License_1 = require("../License");
|
|
36
|
+
const workflowSharing_service_1 = require("../workflows/workflowSharing.service");
|
|
36
37
|
exports.schemaGetExecutionsQueryFilter = {
|
|
37
38
|
$id: '/IGetExecutionsQueryFilter',
|
|
38
39
|
type: 'object',
|
|
@@ -67,7 +68,7 @@ exports.schemaGetExecutionsQueryFilter = {
|
|
|
67
68
|
};
|
|
68
69
|
exports.allowedExecutionsQueryFilterFields = Object.keys(exports.schemaGetExecutionsQueryFilter.properties);
|
|
69
70
|
let ExecutionService = class ExecutionService {
|
|
70
|
-
constructor(globalConfig, logger, queue, activeExecutions, executionRepository, workflowRepository, nodeTypes, waitTracker, workflowRunner, concurrencyControl, license) {
|
|
71
|
+
constructor(globalConfig, logger, queue, activeExecutions, executionRepository, workflowRepository, nodeTypes, waitTracker, workflowRunner, concurrencyControl, license, workflowSharingService) {
|
|
71
72
|
this.globalConfig = globalConfig;
|
|
72
73
|
this.logger = logger;
|
|
73
74
|
this.queue = queue;
|
|
@@ -79,6 +80,7 @@ let ExecutionService = class ExecutionService {
|
|
|
79
80
|
this.workflowRunner = workflowRunner;
|
|
80
81
|
this.concurrencyControl = concurrencyControl;
|
|
81
82
|
this.license = license;
|
|
83
|
+
this.workflowSharingService = workflowSharingService;
|
|
82
84
|
}
|
|
83
85
|
async findOne(req, sharedWorkflowIds) {
|
|
84
86
|
if (!sharedWorkflowIds.length)
|
|
@@ -353,6 +355,14 @@ let ExecutionService = class ExecutionService {
|
|
|
353
355
|
}
|
|
354
356
|
return await this.executionRepository.stopDuringRun(execution);
|
|
355
357
|
}
|
|
358
|
+
async addScopes(user, summaries) {
|
|
359
|
+
var _a;
|
|
360
|
+
const workflowIds = [...new Set(summaries.map((s) => s.workflowId))];
|
|
361
|
+
const scopes = Object.fromEntries(await this.workflowSharingService.getSharedWorkflowScopes(workflowIds, user));
|
|
362
|
+
for (const s of summaries) {
|
|
363
|
+
s.scopes = (_a = scopes[s.workflowId]) !== null && _a !== void 0 ? _a : [];
|
|
364
|
+
}
|
|
365
|
+
}
|
|
356
366
|
};
|
|
357
367
|
exports.ExecutionService = ExecutionService;
|
|
358
368
|
exports.ExecutionService = ExecutionService = __decorate([
|
|
@@ -367,6 +377,7 @@ exports.ExecutionService = ExecutionService = __decorate([
|
|
|
367
377
|
WaitTracker_1.WaitTracker,
|
|
368
378
|
WorkflowRunner_1.WorkflowRunner,
|
|
369
379
|
concurrency_control_service_1.ConcurrencyControlService,
|
|
370
|
-
License_1.License
|
|
380
|
+
License_1.License,
|
|
381
|
+
workflowSharing_service_1.WorkflowSharingService])
|
|
371
382
|
], ExecutionService);
|
|
372
383
|
//# sourceMappingURL=execution.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.service.js","sourceRoot":"","sources":["../../src/executions/execution.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execution.service.js","sourceRoot":"","sources":["../../src/executions/execution.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ExecutionEntity } from '../databases/entities/ExecutionEntity';
|
|
2
2
|
import type { AuthenticatedRequest } from '../requests';
|
|
3
|
-
import type {
|
|
3
|
+
import type { Scope } from '@n8n/permissions';
|
|
4
|
+
import type { ExecutionStatus, ExecutionSummary, IDataObject, WorkflowExecuteMode } from 'n8n-workflow';
|
|
4
5
|
export declare namespace ExecutionRequest {
|
|
5
6
|
namespace QueryParams {
|
|
6
7
|
type GetMany = {
|
|
@@ -75,6 +76,9 @@ export declare namespace ExecutionSummaries {
|
|
|
75
76
|
stoppedAt?: 'DESC';
|
|
76
77
|
};
|
|
77
78
|
};
|
|
79
|
+
export type ExecutionSummaryWithScopes = ExecutionSummary & {
|
|
80
|
+
scopes: Scope[];
|
|
81
|
+
};
|
|
78
82
|
export {};
|
|
79
83
|
}
|
|
80
84
|
export type QueueRecoverySettings = {
|
|
@@ -52,9 +52,13 @@ let ExecutionsController = class ExecutionsController {
|
|
|
52
52
|
const noStatus = !query.status || query.status.length === 0;
|
|
53
53
|
const noRange = !query.range.lastId || !query.range.firstId;
|
|
54
54
|
if (noStatus && noRange) {
|
|
55
|
-
|
|
55
|
+
const executions = await this.executionService.findLatestCurrentAndCompleted(query);
|
|
56
|
+
await this.executionService.addScopes(req.user, executions.results);
|
|
57
|
+
return executions;
|
|
56
58
|
}
|
|
57
|
-
|
|
59
|
+
const executions = await this.executionService.findRangeWithCount(query);
|
|
60
|
+
await this.executionService.addScopes(req.user, executions.results);
|
|
61
|
+
return executions;
|
|
58
62
|
}
|
|
59
63
|
async getOne(req) {
|
|
60
64
|
if (!(0, utils_1.isPositiveInteger)(req.params.id)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executions.controller.js","sourceRoot":"","sources":["../../src/executions/executions.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2DAAuD;AACvD,6CAAyD;AACzD,iEAAqE;AACrE,uCAAoC;AACpC,iFAA6E;AAC7E,8EAAyE;AACzE,iFAAiE;AAGjE,mCAA4C;AAC5C,kFAA6E;AAGtE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,gBAAkC,EAClC,0BAAuD,EACvD,sBAA8C,EAC9C,OAAgB;QAHhB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,+BAA0B,GAA1B,0BAA0B,CAA6B;QACvD,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,YAAO,GAAP,OAAO,CAAS;IAC/B,CAAC;IAEI,KAAK,CAAC,wBAAwB,CAAC,IAAU,EAAE,KAAY;QAC9D,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACrC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC1F,CAAC;aAAM,CAAC;YACP,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,IAAI,EAAE;gBACnE,aAAa,EAAE,CAAC,gBAAgB,CAAC;gBACjC,YAAY,EAAE,CAAC,uBAAuB,CAAC;aACvC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAC,GAA6B;QAC1C,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAE7F,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACpD,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;QAElC,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3E,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QACpD,CAAC;QAED,KAAK,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iCAAiC,EAAE;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC;QAE7E,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QAE5D,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;YACzB,
|
|
1
|
+
{"version":3,"file":"executions.controller.js","sourceRoot":"","sources":["../../src/executions/executions.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.LicenseController = void 0;
|
|
13
13
|
const decorators_1 = require("../decorators");
|
|
14
14
|
const license_service_1 = require("./license.service");
|
|
15
|
+
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
15
16
|
let LicenseController = class LicenseController {
|
|
16
17
|
constructor(licenseService) {
|
|
17
18
|
this.licenseService = licenseService;
|
|
@@ -20,7 +21,19 @@ let LicenseController = class LicenseController {
|
|
|
20
21
|
return await this.licenseService.getLicenseData();
|
|
21
22
|
}
|
|
22
23
|
async requestEnterpriseTrial(req) {
|
|
23
|
-
|
|
24
|
+
var _a, _b, _c;
|
|
25
|
+
try {
|
|
26
|
+
await this.licenseService.requestEnterpriseTrial(req.user);
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
if (error instanceof Error) {
|
|
30
|
+
const errorMsg = (_c = (_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.message) !== null && _c !== void 0 ? _c : error.message;
|
|
31
|
+
throw new bad_request_error_1.BadRequestError(errorMsg);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
throw new bad_request_error_1.BadRequestError('Failed to request trial');
|
|
35
|
+
}
|
|
36
|
+
}
|
|
24
37
|
}
|
|
25
38
|
async activateLicense(req) {
|
|
26
39
|
const { activationKey } = req.body;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.controller.js","sourceRoot":"","sources":["../../src/license/license.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsE;AAEtE,uDAAmD;
|
|
1
|
+
{"version":3,"file":"license.controller.js","sourceRoot":"","sources":["../../src/license/license.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsE;AAEtE,uDAAmD;AACnD,kFAA6E;AAItE,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAGzD,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,GACb,MAAA,MAAA,MAAC,KAAyC,CAAC,QAAQ,0CAAE,IAAI,0CAAE,OAAO,mCAAI,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;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;AA7CY,8CAAiB;AAIvB;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;;;;uDAGR;AAIK;IAFL,IAAA,iBAAI,EAAC,2BAA2B,CAAC;IACjC,IAAA,wBAAW,EAAC,gBAAgB,CAAC;;;;+DAc7B;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;4BAtCW,iBAAiB;IAD7B,IAAA,2BAAc,EAAC,UAAU,CAAC;qCAEmB,gCAAc;GAD/C,iBAAiB,CA6C7B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Logger } from '../Logger';
|
|
2
2
|
import { License } from '../License';
|
|
3
|
-
import { EventService } from '../
|
|
3
|
+
import { EventService } from '../events/event.service';
|
|
4
4
|
import type { User } from '../databases/entities/User';
|
|
5
5
|
import { WorkflowRepository } from '../databases/repositories/workflow.repository';
|
|
6
6
|
import { UrlService } from '../services/url.service';
|
|
@@ -17,7 +17,7 @@ const typedi_1 = require("typedi");
|
|
|
17
17
|
const axios_1 = __importDefault(require("axios"));
|
|
18
18
|
const Logger_1 = require("../Logger");
|
|
19
19
|
const License_1 = require("../License");
|
|
20
|
-
const event_service_1 = require("../
|
|
20
|
+
const event_service_1 = require("../events/event.service");
|
|
21
21
|
const workflow_repository_1 = require("../databases/repositories/workflow.repository");
|
|
22
22
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
23
23
|
const url_service_1 = require("../services/url.service");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license.service.js","sourceRoot":"","sources":["../../src/license/license.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,kDAA0B;AAE1B,qCAAkC;AAClC,uCAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"license.service.js","sourceRoot":"","sources":["../../src/license/license.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,12 @@ import type express from 'express';
|
|
|
2
2
|
import { CacheService } from '../services/cache/cache.service';
|
|
3
3
|
import { MessageEventBus } from '../eventbus/MessageEventBus/MessageEventBus';
|
|
4
4
|
import type { MetricCategory, MetricLabel } from './types';
|
|
5
|
+
import { GlobalConfig } from '@n8n/config';
|
|
5
6
|
export declare class PrometheusMetricsService {
|
|
6
7
|
private readonly cacheService;
|
|
7
8
|
private readonly eventBus;
|
|
8
|
-
|
|
9
|
+
private readonly globalConfig;
|
|
10
|
+
constructor(cacheService: CacheService, eventBus: MessageEventBus, globalConfig: GlobalConfig);
|
|
9
11
|
private readonly counters;
|
|
10
12
|
private readonly prefix;
|
|
11
13
|
private readonly includes;
|
|
@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.PrometheusMetricsService = void 0;
|
|
16
|
-
const config_1 = __importDefault(require("../config"));
|
|
17
16
|
const constants_1 = require("../constants");
|
|
18
17
|
const express_prom_bundle_1 = __importDefault(require("express-prom-bundle"));
|
|
19
18
|
const prom_client_1 = __importDefault(require("prom-client"));
|
|
@@ -21,26 +20,28 @@ const parse_1 = __importDefault(require("semver/functions/parse"));
|
|
|
21
20
|
const typedi_1 = require("typedi");
|
|
22
21
|
const cache_service_1 = require("../services/cache/cache.service");
|
|
23
22
|
const MessageEventBus_1 = require("../eventbus/MessageEventBus/MessageEventBus");
|
|
23
|
+
const config_1 = require("@n8n/config");
|
|
24
24
|
let PrometheusMetricsService = class PrometheusMetricsService {
|
|
25
|
-
constructor(cacheService, eventBus) {
|
|
25
|
+
constructor(cacheService, eventBus, globalConfig) {
|
|
26
26
|
this.cacheService = cacheService;
|
|
27
27
|
this.eventBus = eventBus;
|
|
28
|
+
this.globalConfig = globalConfig;
|
|
28
29
|
this.counters = {};
|
|
29
|
-
this.prefix =
|
|
30
|
+
this.prefix = this.globalConfig.endpoints.metrics.prefix;
|
|
30
31
|
this.includes = {
|
|
31
32
|
metrics: {
|
|
32
|
-
default:
|
|
33
|
-
routes:
|
|
34
|
-
cache:
|
|
35
|
-
logs:
|
|
33
|
+
default: this.globalConfig.endpoints.metrics.includeDefaultMetrics,
|
|
34
|
+
routes: this.globalConfig.endpoints.metrics.includeApiEndpoints,
|
|
35
|
+
cache: this.globalConfig.endpoints.metrics.includeCacheMetrics,
|
|
36
|
+
logs: this.globalConfig.endpoints.metrics.includeMessageEventBusMetrics,
|
|
36
37
|
},
|
|
37
38
|
labels: {
|
|
38
|
-
credentialsType:
|
|
39
|
-
nodeType:
|
|
40
|
-
workflowId:
|
|
41
|
-
apiPath:
|
|
42
|
-
apiMethod:
|
|
43
|
-
apiStatusCode:
|
|
39
|
+
credentialsType: this.globalConfig.endpoints.metrics.includeCredentialTypeLabel,
|
|
40
|
+
nodeType: this.globalConfig.endpoints.metrics.includeNodeTypeLabel,
|
|
41
|
+
workflowId: this.globalConfig.endpoints.metrics.includeWorkflowIdLabel,
|
|
42
|
+
apiPath: this.globalConfig.endpoints.metrics.includeApiPathLabel,
|
|
43
|
+
apiMethod: this.globalConfig.endpoints.metrics.includeApiMethodLabel,
|
|
44
|
+
apiStatusCode: this.globalConfig.endpoints.metrics.includeApiStatusCodeLabel,
|
|
44
45
|
},
|
|
45
46
|
};
|
|
46
47
|
}
|
|
@@ -214,6 +215,7 @@ exports.PrometheusMetricsService = PrometheusMetricsService;
|
|
|
214
215
|
exports.PrometheusMetricsService = PrometheusMetricsService = __decorate([
|
|
215
216
|
(0, typedi_1.Service)(),
|
|
216
217
|
__metadata("design:paramtypes", [cache_service_1.CacheService,
|
|
217
|
-
MessageEventBus_1.MessageEventBus
|
|
218
|
+
MessageEventBus_1.MessageEventBus,
|
|
219
|
+
config_1.GlobalConfig])
|
|
218
220
|
], PrometheusMetricsService);
|
|
219
221
|
//# sourceMappingURL=prometheus-metrics.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prometheus-metrics.service.js","sourceRoot":"","sources":["../../src/metrics/prometheus-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"prometheus-metrics.service.js","sourceRoot":"","sources":["../../src/metrics/prometheus-metrics.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,15 +10,16 @@ const querystring_1 = require("querystring");
|
|
|
10
10
|
const xml2js_1 = require("xml2js");
|
|
11
11
|
const n8n_core_1 = require("n8n-core");
|
|
12
12
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
13
|
-
const config_1 = __importDefault(require("../config"));
|
|
14
13
|
const unprocessable_error_1 = require("../errors/response-errors/unprocessable.error");
|
|
14
|
+
const config_1 = require("@n8n/config");
|
|
15
|
+
const typedi_1 = __importDefault(require("typedi"));
|
|
15
16
|
const xmlParser = new xml2js_1.Parser({
|
|
16
17
|
async: true,
|
|
17
18
|
normalize: true,
|
|
18
19
|
normalizeTags: true,
|
|
19
20
|
explicitArray: false,
|
|
20
21
|
});
|
|
21
|
-
const payloadSizeMax =
|
|
22
|
+
const payloadSizeMax = typedi_1.default.get(config_1.GlobalConfig).endpoints.payloadSizeMax;
|
|
22
23
|
const rawBodyReader = async (req, _res, next) => {
|
|
23
24
|
(0, n8n_core_1.parseIncomingMessage)(req);
|
|
24
25
|
req.readRawBody = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bodyParser.js","sourceRoot":"","sources":["../../src/middlewares/bodyParser.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAkC;AAElC,+BAAmD;AAEnD,6CAAwD;AACxD,mCAA6C;AAC7C,uCAAgD;AAChD,+CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"bodyParser.js","sourceRoot":"","sources":["../../src/middlewares/bodyParser.ts"],"names":[],"mappings":"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"}
|
package/dist/requests.d.ts
CHANGED
|
@@ -26,9 +26,7 @@ export declare class UserRoleChangePayload {
|
|
|
26
26
|
export type APIRequest<RouteParams = {}, ResponseBody = {}, RequestBody = {}, RequestQuery = {}> = express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery> & {
|
|
27
27
|
browserId?: string;
|
|
28
28
|
};
|
|
29
|
-
export type AuthlessRequest<RouteParams = {}, ResponseBody = {}, RequestBody = {}, RequestQuery = {}> = APIRequest<RouteParams, ResponseBody, RequestBody, RequestQuery
|
|
30
|
-
user: never;
|
|
31
|
-
};
|
|
29
|
+
export type AuthlessRequest<RouteParams = {}, ResponseBody = {}, RequestBody = {}, RequestQuery = {}> = APIRequest<RouteParams, ResponseBody, RequestBody, RequestQuery>;
|
|
32
30
|
export type AuthenticatedRequest<RouteParams = {}, ResponseBody = {}, RequestBody = {}, RequestQuery = {}> = Omit<APIRequest<RouteParams, ResponseBody, RequestBody, RequestQuery>, 'user' | 'cookies'> & {
|
|
33
31
|
user: User;
|
|
34
32
|
cookies: Record<string, string | undefined>;
|
|
@@ -210,6 +208,7 @@ export declare namespace UserRequest {
|
|
|
210
208
|
offset?: number;
|
|
211
209
|
cursor?: string;
|
|
212
210
|
includeRole?: boolean;
|
|
211
|
+
projectId?: string;
|
|
213
212
|
}>;
|
|
214
213
|
type PasswordResetLink = AuthenticatedRequest<{
|
|
215
214
|
id: string;
|
|
@@ -258,7 +257,7 @@ export declare namespace OAuthRequest {
|
|
|
258
257
|
type Auth = AuthenticatedRequest<{}, {}, {}, {
|
|
259
258
|
id: string;
|
|
260
259
|
}>;
|
|
261
|
-
type Callback =
|
|
260
|
+
type Callback = AuthlessRequest<{}, {}, {}, {
|
|
262
261
|
oauth_verifier: string;
|
|
263
262
|
oauth_token: string;
|
|
264
263
|
state: string;
|
|
@@ -270,7 +269,7 @@ export declare namespace OAuthRequest {
|
|
|
270
269
|
type Auth = AuthenticatedRequest<{}, {}, {}, {
|
|
271
270
|
id: string;
|
|
272
271
|
}>;
|
|
273
|
-
type Callback =
|
|
272
|
+
type Callback = AuthlessRequest<{}, {}, {}, {
|
|
274
273
|
code: string;
|
|
275
274
|
state: string;
|
|
276
275
|
}>;
|
package/dist/requests.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":";;;;;;;;;;;;AAmKA,gCAIC;AA1JD,yDAA2C;AAC3C,qDAAyF;AACzF,iEAAmD;AAanD,MAAa,iBAAiB;CAgB7B;AAhBD,8CAgBC;AAbA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,yBAAO,GAAE;;gDACI;AAMd;IAJC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAK,GAAE;IACP,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC;IAC3D,IAAA,wBAAM,EAAC,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,kEAAkE,EAAE,CAAC;;oDAC7E;AAMlB;IAJC,IAAA,0BAAM,GAAE;IACR,IAAA,wBAAK,GAAE;IACP,IAAA,0BAAQ,EAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC;IAC1D,IAAA,wBAAM,EAAC,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,iEAAiE,EAAE,CAAC;;mDAC7E;AAGlB,MAAa,yBAAyB;CAUrC;AAVD,8DAUC;AANA;IAHC,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,EAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC;IAC3D,IAAA,4BAAU,GAAE;;gEACW;AAKxB;IAHC,IAAA,0BAAM,GAAE;IACR,IAAA,2BAAS,EAAC,EAAE,OAAO,EAAE,yCAAyC,EAAE,CAAC;IACjE,IAAA,4BAAU,GAAE;;sEACiB;AAG/B,MAAa,qBAAqB;CAIjC;AAJD,sDAIC;AADA;IAFC,IAAA,0BAAM,GAAE;IACR,IAAA,sBAAI,EAAC,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;;0DACZ;AAsG7B,SAAgB,UAAU,CACzB,SAAwE;IAExE,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;AAC7C,CAAC"}
|