n8n 2.7.4 → 2.8.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/active-workflow-manager.js +0 -1
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/auth/auth-handler.registry.d.ts +15 -0
- package/dist/auth/auth-handler.registry.js +87 -0
- package/dist/auth/auth-handler.registry.js.map +1 -0
- package/dist/auth/handlers/email.auth-handler.d.ts +19 -0
- package/dist/auth/handlers/email.auth-handler.js +52 -0
- package/dist/auth/handlers/email.auth-handler.js.map +1 -0
- package/dist/build.tsbuildinfo +1 -1
- package/dist/chat/chat-service.types.d.ts +2 -2
- package/dist/commands/base-command.js +5 -2
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/start.js +17 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/controllers/ai.controller.js +2 -0
- package/dist/controllers/ai.controller.js.map +1 -1
- package/dist/controllers/auth.controller.d.ts +8 -1
- package/dist/controllers/auth.controller.js +66 -85
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/dynamic-node-parameters.controller.d.ts +2 -2
- package/dist/controllers/dynamic-node-parameters.controller.js +13 -13
- package/dist/controllers/dynamic-node-parameters.controller.js.map +1 -1
- package/dist/controllers/e2e.controller.d.ts +4 -0
- package/dist/controllers/e2e.controller.js +18 -0
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/controllers/me.controller.d.ts +2 -2
- package/dist/controllers/me.controller.js +1 -1
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/mfa.controller.js +11 -0
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/controllers/security-settings.controller.d.ts +18 -0
- package/dist/controllers/security-settings.controller.js +96 -0
- package/dist/controllers/security-settings.controller.js.map +1 -0
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials-finder.service.d.ts +1 -5
- package/dist/credentials/credentials-finder.service.js +2 -2
- package/dist/credentials/credentials-finder.service.js.map +1 -1
- package/dist/eventbus/event-message-classes/event-message-audit.d.ts +4 -0
- package/dist/eventbus/event-message-classes/event-message-audit.js.map +1 -1
- package/dist/eventbus/event-message-classes/index.d.ts +2 -2
- package/dist/eventbus/event-message-classes/index.js +7 -0
- package/dist/eventbus/event-message-classes/index.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +14 -0
- package/dist/events/relays/log-streaming.event-relay.d.ts +2 -0
- package/dist/events/relays/log-streaming.event-relay.js +60 -2
- package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.d.ts +1 -0
- package/dist/events/relays/telemetry.event-relay.js +7 -0
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +14 -0
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-execution-store.service.d.ts +44 -0
- package/dist/modules/chat-hub/chat-hub-execution-store.service.js +159 -0
- package/dist/modules/chat-hub/chat-hub-execution-store.service.js.map +1 -0
- package/dist/modules/chat-hub/chat-hub-execution-watcher.service.d.ts +25 -0
- package/dist/modules/chat-hub/chat-hub-execution-watcher.service.js +205 -0
- package/dist/modules/chat-hub/chat-hub-execution-watcher.service.js.map +1 -0
- package/dist/modules/chat-hub/chat-hub-execution.service.d.ts +10 -12
- package/dist/modules/chat-hub/chat-hub-execution.service.js +93 -187
- package/dist/modules/chat-hub/chat-hub-execution.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-title.service.js +2 -2
- package/dist/modules/chat-hub/chat-hub-title.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +1 -0
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +101 -9
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.constants.js +7 -3
- package/dist/modules/chat-hub/chat-hub.constants.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.models.service.d.ts +2 -2
- package/dist/modules/chat-hub/chat-hub.models.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.module.js +7 -0
- package/dist/modules/chat-hub/chat-hub.module.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.js +3 -6
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-stream-state.service.d.ts +4 -2
- package/dist/modules/chat-hub/chat-stream-state.service.js +11 -11
- package/dist/modules/chat-hub/chat-stream-state.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-stream.service.d.ts +1 -1
- package/dist/modules/chat-hub/chat-stream.service.js +1 -1
- package/dist/modules/chat-hub/chat-stream.service.js.map +1 -1
- package/dist/modules/chat-hub/dto/chat-models-request.dto.d.ts +3 -2
- package/dist/modules/chat-hub/dto/chat-models-request.dto.js +1 -2
- package/dist/modules/chat-hub/dto/chat-models-request.dto.js.map +1 -1
- package/dist/modules/community-packages/community-node-types.service.d.ts +1 -0
- package/dist/modules/community-packages/community-node-types.service.js +30 -0
- package/dist/modules/community-packages/community-node-types.service.js.map +1 -1
- package/dist/modules/data-table/data-table.controller.d.ts +4 -1
- package/dist/modules/data-table/data-table.controller.js +23 -2
- package/dist/modules/data-table/data-table.controller.js.map +1 -1
- package/dist/modules/data-table/middleware/branch-write-access-middleware.d.ts +2 -0
- package/dist/modules/data-table/middleware/branch-write-access-middleware.js +15 -0
- package/dist/modules/data-table/middleware/branch-write-access-middleware.js.map +1 -0
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.d.ts +2 -2
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential-web.service.js +2 -2
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential-web.service.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.d.ts +16 -7
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js +63 -20
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-providers.ee.d.ts +2 -0
- package/dist/modules/external-secrets.ee/external-secrets-providers.ee.js +8 -0
- package/dist/modules/external-secrets.ee/external-secrets-providers.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.controller.ee.d.ts +7 -3
- package/dist/modules/external-secrets.ee/external-secrets.module.js +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.module.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.d.ts +10 -5
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js +7 -45
- package/dist/modules/external-secrets.ee/external-secrets.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/redaction.service.ee.d.ts +7 -0
- package/dist/modules/external-secrets.ee/redaction.service.ee.js +56 -0
- package/dist/modules/external-secrets.ee/redaction.service.ee.js.map +1 -0
- package/dist/modules/external-secrets.ee/secrets-providers-completions.controller.ee.d.ts +15 -0
- package/dist/modules/external-secrets.ee/secrets-providers-completions.controller.ee.js +76 -0
- package/dist/modules/external-secrets.ee/secrets-providers-completions.controller.ee.js.map +1 -0
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.d.ts +10 -12
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js +21 -42
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.d.ts +16 -3
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js +60 -5
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.d.ts +8 -4
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js +20 -9
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-types.controller.ee.d.ts +9 -5
- package/dist/modules/external-secrets.ee/secrets-providers-types.controller.ee.js +33 -13
- package/dist/modules/external-secrets.ee/secrets-providers-types.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers.responses.ee.d.ts +9 -3
- package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts +3 -3
- package/dist/modules/insights/insights.service.d.ts +3 -3
- package/dist/modules/ldap.ee/ldap.module.js +1 -4
- package/dist/modules/ldap.ee/ldap.module.js.map +1 -1
- package/dist/modules/ldap.ee/ldap.service.ee.d.ts +11 -4
- package/dist/modules/ldap.ee/ldap.service.ee.js +5 -2
- package/dist/modules/ldap.ee/ldap.service.ee.js.map +1 -1
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-syslog.ee.js +1 -1
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-syslog.ee.js.map +1 -1
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-webhook.ee.js +10 -1
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-webhook.ee.js.map +1 -1
- package/dist/modules/mcp/dto/approve-consent-request.dto.d.ts +3 -2
- package/dist/modules/mcp/dto/approve-consent-request.dto.js +2 -2
- package/dist/modules/mcp/dto/approve-consent-request.dto.js.map +1 -1
- package/dist/modules/mcp/dto/update-mcp-settings.dto.d.ts +3 -2
- package/dist/modules/mcp/dto/update-mcp-settings.dto.js +2 -2
- package/dist/modules/mcp/dto/update-mcp-settings.dto.js.map +1 -1
- package/dist/modules/mcp/dto/update-workflow-availability.dto.d.ts +3 -2
- package/dist/modules/mcp/dto/update-workflow-availability.dto.js +2 -2
- package/dist/modules/mcp/dto/update-workflow-availability.dto.js.map +1 -1
- package/dist/modules/mcp/mcp.service.d.ts +15 -2
- package/dist/modules/mcp/mcp.service.js +66 -3
- package/dist/modules/mcp/mcp.service.js.map +1 -1
- package/dist/modules/mcp/tools/execute-workflow.tool.d.ts +3 -2
- package/dist/modules/mcp/tools/execute-workflow.tool.js +18 -9
- package/dist/modules/mcp/tools/execute-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js.map +1 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js +1 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js.map +1 -1
- package/dist/modules/quick-connect/handlers/quick-connect.handler.d.ts +11 -0
- package/dist/modules/quick-connect/handlers/quick-connect.handler.js +26 -0
- package/dist/modules/quick-connect/handlers/quick-connect.handler.js.map +1 -0
- package/dist/modules/quick-connect/handlers/sample.handler.d.ts +7 -0
- package/dist/modules/quick-connect/handlers/sample.handler.js +27 -0
- package/dist/modules/quick-connect/handlers/sample.handler.js.map +1 -0
- package/dist/modules/quick-connect/quick-connect.config.d.ts +95 -0
- package/dist/modules/quick-connect/quick-connect.config.js +48 -0
- package/dist/modules/quick-connect/quick-connect.config.js.map +1 -0
- package/dist/modules/quick-connect/quick-connect.controller.d.ts +10 -0
- package/dist/modules/quick-connect/quick-connect.controller.js +39 -0
- package/dist/modules/quick-connect/quick-connect.controller.js.map +1 -0
- package/dist/modules/quick-connect/quick-connect.errors.d.ts +5 -0
- package/dist/modules/quick-connect/quick-connect.errors.js +12 -0
- package/dist/modules/quick-connect/quick-connect.errors.js.map +1 -0
- package/dist/modules/quick-connect/quick-connect.module.d.ts +15 -0
- package/dist/modules/quick-connect/quick-connect.module.js +70 -0
- package/dist/modules/quick-connect/quick-connect.module.js.map +1 -0
- package/dist/modules/quick-connect/quick-connect.service.d.ts +17 -0
- package/dist/modules/quick-connect/quick-connect.service.js +87 -0
- package/dist/modules/quick-connect/quick-connect.service.js.map +1 -0
- package/dist/modules/source-control.ee/constants.d.ts +2 -0
- package/dist/modules/source-control.ee/constants.js +3 -1
- package/dist/modules/source-control.ee/constants.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-export.service.ee.d.ts +6 -1
- package/dist/modules/source-control.ee/source-control-export.service.ee.js +136 -19
- package/dist/modules/source-control.ee/source-control-export.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-helper.ee.d.ts +10 -2
- package/dist/modules/source-control.ee/source-control-helper.ee.js +81 -5
- package/dist/modules/source-control.ee/source-control-helper.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-import.service.ee.d.ts +15 -1
- package/dist/modules/source-control.ee/source-control-import.service.ee.js +209 -3
- package/dist/modules/source-control.ee/source-control-import.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-scoped.service.d.ts +2 -0
- package/dist/modules/source-control.ee/source-control-scoped.service.js +8 -0
- package/dist/modules/source-control.ee/source-control-scoped.service.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-status.service.ee.d.ts +3 -0
- package/dist/modules/source-control.ee/source-control-status.service.ee.js +494 -328
- package/dist/modules/source-control.ee/source-control-status.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control.controller.ee.d.ts +2 -2
- package/dist/modules/source-control.ee/source-control.service.ee.d.ts +1 -1
- package/dist/modules/source-control.ee/source-control.service.ee.js +12 -1
- package/dist/modules/source-control.ee/source-control.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/types/exportable-data-table.d.ts +20 -0
- package/dist/modules/source-control.ee/types/exportable-data-table.js +3 -0
- package/dist/modules/source-control.ee/types/exportable-data-table.js.map +1 -0
- package/dist/modules/source-control.ee/types/source-control-get-status.d.ts +4 -0
- package/dist/modules/source-control.ee/types/source-control-get-status.js.map +1 -1
- package/dist/modules/sso-oidc/oidc.service.ee.js +7 -4
- package/dist/modules/sso-oidc/oidc.service.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml.controller.ee.d.ts +10 -3
- package/dist/modules/workflow-index/workflow-index.service.d.ts +4 -2
- package/dist/modules/workflow-index/workflow-index.service.js +56 -29
- package/dist/modules/workflow-index/workflow-index.service.js.map +1 -1
- package/dist/oauth/oauth.service.js +9 -3
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/public-api/types.d.ts +5 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.d.ts +15 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js +37 -0
- package/dist/public-api/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.service.d.ts +8 -0
- package/dist/public-api/v1/handlers/credentials/credentials.service.js +13 -0
- package/dist/public-api/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/public-api/v1/handlers/projects/projects.handler.d.ts +4 -0
- package/dist/public-api/v1/handlers/projects/projects.handler.js +57 -0
- package/dist/public-api/v1/handlers/projects/projects.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +15 -15
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +185 -31
- package/dist/push/abstract.push.js +2 -0
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/scaling/constants.d.ts +1 -0
- package/dist/scaling/constants.js +2 -1
- package/dist/scaling/constants.js.map +1 -1
- package/dist/scaling/job-processor.d.ts +1 -0
- package/dist/scaling/job-processor.js +106 -0
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/pubsub/publisher.service.d.ts +4 -0
- package/dist/scaling/pubsub/publisher.service.js +14 -0
- package/dist/scaling/pubsub/publisher.service.js.map +1 -1
- package/dist/scaling/pubsub/subscriber.service.d.ts +10 -0
- package/dist/scaling/pubsub/subscriber.service.js +25 -0
- package/dist/scaling/pubsub/subscriber.service.js.map +1 -1
- package/dist/scaling/scaling.service.d.ts +1 -0
- package/dist/scaling/scaling.service.js +54 -0
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/scaling/scaling.types.d.ts +20 -1
- package/dist/server.d.ts +1 -0
- package/dist/server.js +1 -0
- package/dist/server.js.map +1 -1
- package/dist/services/dynamic-node-parameters.service.d.ts +5 -3
- package/dist/services/dynamic-node-parameters.service.js +20 -3
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/services/folder.service.js +1 -1
- package/dist/services/folder.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +1 -0
- package/dist/services/frontend.service.js +9 -2
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/rate-limit.service.d.ts +1 -1
- package/dist/services/rate-limit.service.js +1 -1
- package/dist/services/rate-limit.service.js.map +1 -1
- package/dist/services/role.service.d.ts +6 -3
- package/dist/services/role.service.js +39 -2
- package/dist/services/role.service.js.map +1 -1
- package/dist/services/security-settings.service.d.ts +20 -0
- package/dist/services/security-settings.service.js +68 -0
- package/dist/services/security-settings.service.js.map +1 -0
- package/dist/task-runners/task-broker/task-broker-ws-server.d.ts +4 -2
- package/dist/task-runners/task-broker/task-broker-ws-server.js +24 -2
- package/dist/task-runners/task-broker/task-broker-ws-server.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker.service.d.ts +4 -0
- package/dist/task-runners/task-broker/task-broker.service.js +19 -0
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -1
- package/dist/telemetry/index.js +3 -0
- package/dist/telemetry/index.js.map +1 -1
- package/dist/webhooks/live-webhooks.js +2 -3
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +66 -7
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/workflow-runner.js +8 -2
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-finder.service.d.ts +2 -0
- package/dist/workflows/workflow-finder.service.js +22 -2
- package/dist/workflows/workflow-finder.service.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history-manager.d.ts +3 -1
- package/dist/workflows/workflow-history/workflow-history-manager.js +7 -3
- package/dist/workflows/workflow-history/workflow-history-manager.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.controller.d.ts +6 -1
- package/dist/workflows/workflow-history/workflow-history.controller.js +24 -0
- package/dist/workflows/workflow-history/workflow-history.controller.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.service.d.ts +7 -3
- package/dist/workflows/workflow-history/workflow-history.service.js +41 -4
- package/dist/workflows/workflow-history/workflow-history.service.js.map +1 -1
- package/dist/workflows/workflow-sharing.service.d.ts +1 -1
- package/dist/workflows/workflow-sharing.service.js +2 -2
- package/dist/workflows/workflow-sharing.service.js.map +1 -1
- package/dist/workflows/workflow-validation.service.d.ts +4 -2
- package/dist/workflows/workflow-validation.service.js +93 -1
- package/dist/workflows/workflow-validation.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +13 -6
- package/dist/workflows/workflow.service.ee.js +11 -4
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +70 -47
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +3 -3
- package/dist/workflows/workflows.controller.js +16 -8
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +29 -24
- package/templates/form-trigger-completion.handlebars +1 -1
- package/dist/auth/index.d.ts +0 -1
- package/dist/auth/index.js +0 -18
- package/dist/auth/index.js.map +0 -1
- package/dist/auth/methods/email.d.ts +0 -2
- package/dist/auth/methods/email.js +0 -26
- package/dist/auth/methods/email.js.map +0 -1
- package/dist/modules/external-secrets.ee/secrets-providers-autocomplete.controller.ee.d.ts +0 -11
- package/dist/modules/external-secrets.ee/secrets-providers-autocomplete.controller.ee.js +0 -64
- package/dist/modules/external-secrets.ee/secrets-providers-autocomplete.controller.ee.js.map +0 -1
|
@@ -259,6 +259,7 @@ let FrontendService = class FrontendService {
|
|
|
259
259
|
advancedPermissions: false,
|
|
260
260
|
apiKeyScopes: false,
|
|
261
261
|
workflowDiffs: false,
|
|
262
|
+
namedVersions: false,
|
|
262
263
|
provisioning: false,
|
|
263
264
|
projects: {
|
|
264
265
|
team: {
|
|
@@ -394,6 +395,7 @@ let FrontendService = class FrontendService {
|
|
|
394
395
|
advancedPermissions: this.license.isAdvancedPermissionsLicensed(),
|
|
395
396
|
apiKeyScopes: this.license.isApiKeyScopesEnabled(),
|
|
396
397
|
workflowDiffs: this.licenseState.isWorkflowDiffsLicensed(),
|
|
398
|
+
namedVersions: this.license.isLicensed(constants_1.LICENSE_FEATURES.NAMED_VERSIONS),
|
|
397
399
|
customRoles: this.licenseState.isCustomRolesLicensed(),
|
|
398
400
|
});
|
|
399
401
|
if (this.license.isLdapEnabled()) {
|
|
@@ -448,11 +450,15 @@ let FrontendService = class FrontendService {
|
|
|
448
450
|
return this.settings;
|
|
449
451
|
}
|
|
450
452
|
async getPublicSettings(includeMfaSettings) {
|
|
451
|
-
const { defaultLocale, userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup }, sso: { saml: ssoSaml, ldap: ssoLdap, oidc: ssoOidc }, authCookie, previewMode, enterprise: { saml, ldap, oidc }, mfa, } = await this.getSettings();
|
|
453
|
+
const { defaultLocale, userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup }, sso: { saml: ssoSaml, ldap: ssoLdap, oidc: ssoOidc }, authCookie, previewMode, enterprise: { saml, ldap, oidc }, mfa, communityNodesEnabled, } = await this.getSettings();
|
|
452
454
|
const publicSettings = {
|
|
453
455
|
settingsMode: 'public',
|
|
454
456
|
defaultLocale,
|
|
455
|
-
userManagement: {
|
|
457
|
+
userManagement: {
|
|
458
|
+
authenticationMethod,
|
|
459
|
+
showSetupOnFirstLoad: previewMode ? false : showSetupOnFirstLoad,
|
|
460
|
+
smtpSetup,
|
|
461
|
+
},
|
|
456
462
|
sso: {
|
|
457
463
|
saml: {
|
|
458
464
|
loginEnabled: ssoSaml.loginEnabled,
|
|
@@ -466,6 +472,7 @@ let FrontendService = class FrontendService {
|
|
|
466
472
|
authCookie,
|
|
467
473
|
previewMode,
|
|
468
474
|
enterprise: { saml, ldap, oidc },
|
|
475
|
+
communityNodesEnabled,
|
|
469
476
|
};
|
|
470
477
|
if (includeMfaSettings) {
|
|
471
478
|
publicSettings.mfa = mfa;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { RateLimiterLimits, UserKeyedRateLimiterConfig } from '@n8n/decorators';
|
|
2
2
|
import { BodyKeyedRateLimiterConfig } from '@n8n/decorators';
|
|
3
3
|
import type { RequestHandler } from 'express';
|
|
4
|
-
import type { ZodClass } from '
|
|
4
|
+
import type { ZodClass } from '@n8n/api-types';
|
|
5
5
|
export declare class RateLimitService {
|
|
6
6
|
createIpRateLimitMiddleware(rateLimit: boolean | RateLimiterLimits): RequestHandler;
|
|
7
7
|
createBodyKeyedRateLimitMiddleware(bodyDtoClass: ZodClass, config: BodyKeyedRateLimiterConfig): RequestHandler;
|
|
@@ -30,7 +30,7 @@ let RateLimitService = class RateLimitService {
|
|
|
30
30
|
}
|
|
31
31
|
createBodyKeyedRateLimitMiddleware(bodyDtoClass, config) {
|
|
32
32
|
const fieldName = config.field;
|
|
33
|
-
const bodyFieldSchema = bodyDtoClass.shape[fieldName];
|
|
33
|
+
const bodyFieldSchema = bodyDtoClass.schema.shape[fieldName];
|
|
34
34
|
(0, node_assert_1.default)(bodyFieldSchema, `Missing field ${fieldName} in DTO schema`);
|
|
35
35
|
return (0, express_rate_limit_1.rateLimit)({
|
|
36
36
|
limit: config.limit ?? defaultLimits.limit,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.service.js","sourceRoot":"","sources":["../../src/services/rate-limit.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAsC;AAItC,gCAAkC;AAElC,2DAAmE;AACnE,8DAAiC;AAIjC,MAAM,aAAa,GAAgC;IAClD,KAAK,EAAE,CAAC;IACR,QAAQ,EAAE,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc;CACzC,CAAC;AAWK,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAK5B,2BAA2B,CAAC,SAAsC;QACjE,IAAI,OAAO,SAAS,KAAK,SAAS;YAAE,SAAS,GAAG,EAAE,CAAC;QAEnD,OAAO,IAAA,8BAAgB,EAAC;YACvB,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,aAAa,CAAC,KAAK;YAC7C,QAAQ,EAAE,SAAS,CAAC,QAAQ,IAAI,aAAa,CAAC,QAAQ;YACtD,OAAO,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE;SACzC,CAAC,CAAC;IACJ,CAAC;IAMD,kCAAkC,CACjC,YAAsB,EACtB,MAAkC;QAElC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QAC/B,MAAM,eAAe,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limit.service.js","sourceRoot":"","sources":["../../src/services/rate-limit.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CreateRoleDto, UpdateRoleDto } from '@n8n/api-types';
|
|
2
|
-
import { LicenseState } from '@n8n/backend-common';
|
|
3
|
-
import { CredentialsEntity, SharedCredentials, SharedWorkflow, User, ListQueryDb, ScopesField, ProjectRelation, RoleRepository, ScopeRepository } from '@n8n/db';
|
|
2
|
+
import { LicenseState, Logger } from '@n8n/backend-common';
|
|
3
|
+
import { CredentialsEntity, SharedCredentials, SharedWorkflow, User, ListQueryDb, ScopesField, ProjectRelation, RoleRepository, Role, ScopeRepository } from '@n8n/db';
|
|
4
4
|
import type { EntityManager } from '@n8n/db';
|
|
5
5
|
import type { Scope, Role as RoleDTO, AssignableProjectRole, RoleNamespace } from '@n8n/permissions';
|
|
6
6
|
import { RoleCacheService } from './role-cache.service';
|
|
@@ -9,7 +9,8 @@ export declare class RoleService {
|
|
|
9
9
|
private readonly roleRepository;
|
|
10
10
|
private readonly scopeRepository;
|
|
11
11
|
private readonly roleCacheService;
|
|
12
|
-
|
|
12
|
+
private readonly logger;
|
|
13
|
+
constructor(license: LicenseState, roleRepository: RoleRepository, scopeRepository: ScopeRepository, roleCacheService: RoleCacheService, logger: Logger);
|
|
13
14
|
private dbRoleToRoleDTO;
|
|
14
15
|
getAllRoles(withCount?: boolean): Promise<RoleDTO[]>;
|
|
15
16
|
getRole(slug: string, withCount?: boolean): Promise<RoleDTO>;
|
|
@@ -57,4 +58,6 @@ export declare class RoleService {
|
|
|
57
58
|
combineResourceScopes(type: 'workflow' | 'credential', user: User, shared: SharedCredentials[] | SharedWorkflow[], userProjectRelations: ProjectRelation[]): Scope[];
|
|
58
59
|
rolesWithScope(namespace: RoleNamespace, scopes: Scope | Scope[], trx?: EntityManager): Promise<string[]>;
|
|
59
60
|
isRoleLicensed(role: AssignableProjectRole): boolean;
|
|
61
|
+
addScopesToRole(roleSlug: Role['slug'], scopeSlugs: string[]): Promise<void>;
|
|
62
|
+
removeScopesFromRole(roleSlug: string, scopeSlugs: string[]): Promise<void>;
|
|
60
63
|
}
|
|
@@ -20,11 +20,12 @@ const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
|
20
20
|
const response_helper_1 = require("../response-helper");
|
|
21
21
|
const role_cache_service_1 = require("./role-cache.service");
|
|
22
22
|
let RoleService = class RoleService {
|
|
23
|
-
constructor(license, roleRepository, scopeRepository, roleCacheService) {
|
|
23
|
+
constructor(license, roleRepository, scopeRepository, roleCacheService, logger) {
|
|
24
24
|
this.license = license;
|
|
25
25
|
this.roleRepository = roleRepository;
|
|
26
26
|
this.scopeRepository = scopeRepository;
|
|
27
27
|
this.roleCacheService = roleCacheService;
|
|
28
|
+
this.logger = logger;
|
|
28
29
|
}
|
|
29
30
|
dbRoleToRoleDTO(role, usedByUsers) {
|
|
30
31
|
return {
|
|
@@ -205,6 +206,41 @@ let RoleService = class RoleService {
|
|
|
205
206
|
return true;
|
|
206
207
|
}
|
|
207
208
|
}
|
|
209
|
+
async addScopesToRole(roleSlug, scopeSlugs) {
|
|
210
|
+
const role = await this.roleRepository.findBySlug(roleSlug);
|
|
211
|
+
if (!role) {
|
|
212
|
+
this.logger.error(`Role ${roleSlug} not found - unable to add scopes ${scopeSlugs.join(', ')}`);
|
|
213
|
+
throw new not_found_error_1.NotFoundError(`Role ${roleSlug} not found`);
|
|
214
|
+
}
|
|
215
|
+
const scopes = await this.scopeRepository.findByListOrFail(scopeSlugs);
|
|
216
|
+
const alreadyAssignedSlugs = new Set(role.scopes.map((s) => s.slug));
|
|
217
|
+
const scopesToAdd = scopes.filter((s) => !alreadyAssignedSlugs.has(s.slug));
|
|
218
|
+
if (scopesToAdd.length === 0) {
|
|
219
|
+
this.logger.debug(`All requested scopes ${scopeSlugs.join(', ')} are already assigned on role ${roleSlug}`);
|
|
220
|
+
return;
|
|
221
|
+
}
|
|
222
|
+
if (scopesToAdd.length < scopes.length) {
|
|
223
|
+
const alreadyAssigned = scopes.filter((s) => alreadyAssignedSlugs.has(s.slug));
|
|
224
|
+
this.logger.debug(`Scopes ${alreadyAssigned.map((s) => s.slug).join(', ')} are already assigned on role ${roleSlug}`);
|
|
225
|
+
}
|
|
226
|
+
this.logger.debug(`Adding scopes ${scopesToAdd.map((s) => s.slug).join(', ')} to role ${roleSlug}`);
|
|
227
|
+
role.scopes.push(...scopesToAdd);
|
|
228
|
+
await this.roleRepository.save(role);
|
|
229
|
+
await this.roleCacheService.refreshCache();
|
|
230
|
+
this.logger.debug(`Added scopes ${scopesToAdd.map((s) => s.slug).join(', ')} to role ${roleSlug}`);
|
|
231
|
+
}
|
|
232
|
+
async removeScopesFromRole(roleSlug, scopeSlugs) {
|
|
233
|
+
const role = await this.roleRepository.findBySlug(roleSlug);
|
|
234
|
+
if (!role) {
|
|
235
|
+
this.logger.error(`Role ${roleSlug} not found - unable to remove scopes ${scopeSlugs.join(', ')}`);
|
|
236
|
+
throw new not_found_error_1.NotFoundError(`Role ${roleSlug} not found`);
|
|
237
|
+
}
|
|
238
|
+
this.logger.debug(`Removing scopes ${scopeSlugs.join(', ')} from role ${roleSlug}`);
|
|
239
|
+
role.scopes = role.scopes.filter((s) => !scopeSlugs.includes(s.slug));
|
|
240
|
+
await this.roleRepository.save(role);
|
|
241
|
+
await this.roleCacheService.refreshCache();
|
|
242
|
+
this.logger.debug(`Removed scopes ${scopeSlugs.join(', ')} from role ${roleSlug}`);
|
|
243
|
+
}
|
|
208
244
|
};
|
|
209
245
|
exports.RoleService = RoleService;
|
|
210
246
|
exports.RoleService = RoleService = __decorate([
|
|
@@ -212,6 +248,7 @@ exports.RoleService = RoleService = __decorate([
|
|
|
212
248
|
__metadata("design:paramtypes", [backend_common_1.LicenseState,
|
|
213
249
|
db_1.RoleRepository,
|
|
214
250
|
db_1.ScopeRepository,
|
|
215
|
-
role_cache_service_1.RoleCacheService
|
|
251
|
+
role_cache_service_1.RoleCacheService,
|
|
252
|
+
backend_common_1.Logger])
|
|
216
253
|
], RoleService);
|
|
217
254
|
//# sourceMappingURL=role.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { SettingsRepository, SharedCredentialsRepository, SharedWorkflowRepository, WorkflowRepository } from '@n8n/db';
|
|
2
|
+
import { PERSONAL_SPACE_PUBLISHING_SETTING, PERSONAL_SPACE_SHARING_SETTING } from '@n8n/permissions';
|
|
3
|
+
import { RoleService } from '../services/role.service';
|
|
4
|
+
export declare class SecuritySettingsService {
|
|
5
|
+
private readonly settingsRepository;
|
|
6
|
+
private readonly roleService;
|
|
7
|
+
private readonly workflowRepository;
|
|
8
|
+
private readonly sharedWorkflowRepository;
|
|
9
|
+
private readonly sharedCredentialsRepository;
|
|
10
|
+
private readonly PERSONAL_OWNER_ROLE_SLUG;
|
|
11
|
+
constructor(settingsRepository: SettingsRepository, roleService: RoleService, workflowRepository: WorkflowRepository, sharedWorkflowRepository: SharedWorkflowRepository, sharedCredentialsRepository: SharedCredentialsRepository);
|
|
12
|
+
setPersonalSpaceSetting(setting: typeof PERSONAL_SPACE_PUBLISHING_SETTING | typeof PERSONAL_SPACE_SHARING_SETTING, enabled: boolean): Promise<void>;
|
|
13
|
+
arePersonalSpaceSettingsEnabled(): Promise<{
|
|
14
|
+
personalSpacePublishing: boolean;
|
|
15
|
+
personalSpaceSharing: boolean;
|
|
16
|
+
}>;
|
|
17
|
+
getPublishedPersonalWorkflowsCount(): Promise<number>;
|
|
18
|
+
getSharedPersonalWorkflowsCount(): Promise<number>;
|
|
19
|
+
getSharedPersonalCredentialsCount(): Promise<number>;
|
|
20
|
+
}
|
|
@@ -0,0 +1,68 @@
|
|
|
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.SecuritySettingsService = void 0;
|
|
13
|
+
const db_1 = require("@n8n/db");
|
|
14
|
+
const di_1 = require("@n8n/di");
|
|
15
|
+
const permissions_1 = require("@n8n/permissions");
|
|
16
|
+
const role_service_1 = require("../services/role.service");
|
|
17
|
+
let SecuritySettingsService = class SecuritySettingsService {
|
|
18
|
+
constructor(settingsRepository, roleService, workflowRepository, sharedWorkflowRepository, sharedCredentialsRepository) {
|
|
19
|
+
this.settingsRepository = settingsRepository;
|
|
20
|
+
this.roleService = roleService;
|
|
21
|
+
this.workflowRepository = workflowRepository;
|
|
22
|
+
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
23
|
+
this.sharedCredentialsRepository = sharedCredentialsRepository;
|
|
24
|
+
this.PERSONAL_OWNER_ROLE_SLUG = 'project:personalOwner';
|
|
25
|
+
}
|
|
26
|
+
async setPersonalSpaceSetting(setting, enabled) {
|
|
27
|
+
await this.settingsRepository.upsert({
|
|
28
|
+
key: setting.key,
|
|
29
|
+
value: enabled.toString(),
|
|
30
|
+
loadOnStartup: true,
|
|
31
|
+
}, ['key']);
|
|
32
|
+
if (enabled) {
|
|
33
|
+
await this.roleService.addScopesToRole(this.PERSONAL_OWNER_ROLE_SLUG, setting.scopes);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
await this.roleService.removeScopesFromRole(this.PERSONAL_OWNER_ROLE_SLUG, setting.scopes);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
async arePersonalSpaceSettingsEnabled() {
|
|
40
|
+
const settingKeys = [permissions_1.PERSONAL_SPACE_PUBLISHING_SETTING.key, permissions_1.PERSONAL_SPACE_SHARING_SETTING.key];
|
|
41
|
+
const rows = await this.settingsRepository.findByKeys(settingKeys);
|
|
42
|
+
const personalSpacePublishingValue = rows.find((r) => r.key === permissions_1.PERSONAL_SPACE_PUBLISHING_SETTING.key)?.value;
|
|
43
|
+
const personalSpaceSharingValue = rows.find((r) => r.key === permissions_1.PERSONAL_SPACE_SHARING_SETTING.key)?.value;
|
|
44
|
+
return {
|
|
45
|
+
personalSpacePublishing: personalSpacePublishingValue !== 'false',
|
|
46
|
+
personalSpaceSharing: personalSpaceSharingValue !== 'false',
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
async getPublishedPersonalWorkflowsCount() {
|
|
50
|
+
return await this.workflowRepository.getPublishedPersonalWorkflowsCount();
|
|
51
|
+
}
|
|
52
|
+
async getSharedPersonalWorkflowsCount() {
|
|
53
|
+
return await this.sharedWorkflowRepository.getSharedPersonalWorkflowsCount();
|
|
54
|
+
}
|
|
55
|
+
async getSharedPersonalCredentialsCount() {
|
|
56
|
+
return await this.sharedCredentialsRepository.getSharedPersonalCredentialsCount();
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
exports.SecuritySettingsService = SecuritySettingsService;
|
|
60
|
+
exports.SecuritySettingsService = SecuritySettingsService = __decorate([
|
|
61
|
+
(0, di_1.Service)(),
|
|
62
|
+
__metadata("design:paramtypes", [db_1.SettingsRepository,
|
|
63
|
+
role_service_1.RoleService,
|
|
64
|
+
db_1.WorkflowRepository,
|
|
65
|
+
db_1.SharedWorkflowRepository,
|
|
66
|
+
db_1.SharedCredentialsRepository])
|
|
67
|
+
], SecuritySettingsService);
|
|
68
|
+
//# sourceMappingURL=security-settings.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"security-settings.service.js","sourceRoot":"","sources":["../../src/services/security-settings.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAKiB;AACjB,gCAAkC;AAClC,kDAG0B;AAE1B,0DAAsD;AAG/C,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAGnC,YACkB,kBAAsC,EACtC,WAAwB,EACxB,kBAAsC,EACtC,wBAAkD,EAClD,2BAAwD;QAJxD,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,gBAAW,GAAX,WAAW,CAAa;QACxB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,gCAA2B,GAA3B,2BAA2B,CAA6B;QAPzD,6BAAwB,GAAG,uBAAuB,CAAC;IAQjE,CAAC;IAEJ,KAAK,CAAC,uBAAuB,CAC5B,OAAyF,EACzF,OAAgB;QAEhB,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CACnC;YACC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE;YACzB,aAAa,EAAE,IAAI;SACnB,EACD,CAAC,KAAK,CAAC,CACP,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,IAAI,CAAC,wBAAwB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5F,CAAC;IACF,CAAC;IAED,KAAK,CAAC,+BAA+B;QAIpC,MAAM,WAAW,GAAG,CAAC,+CAAiC,CAAC,GAAG,EAAE,4CAA8B,CAAC,GAAG,CAAC,CAAC;QAChG,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,4BAA4B,GAAG,IAAI,CAAC,IAAI,CAC7C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,+CAAiC,CAAC,GAAG,CACtD,EAAE,KAAK,CAAC;QACT,MAAM,yBAAyB,GAAG,IAAI,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,4CAA8B,CAAC,GAAG,CACnD,EAAE,KAAK,CAAC;QAET,OAAO;YACN,uBAAuB,EAAE,4BAA4B,KAAK,OAAO;YACjE,oBAAoB,EAAE,yBAAyB,KAAK,OAAO;SAC3D,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kCAAkC;QACvC,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,kCAAkC,EAAE,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,+BAA+B;QACpC,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,+BAA+B,EAAE,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,iCAAiC;QACtC,OAAO,MAAM,IAAI,CAAC,2BAA2B,CAAC,iCAAiC,EAAE,CAAC;IACnF,CAAC;CACD,CAAA;AA7DY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,YAAO,GAAE;qCAK6B,uBAAkB;QACzB,0BAAW;QACJ,uBAAkB;QACZ,6BAAwB;QACrB,gCAA2B;GAR9D,uBAAuB,CA6DnC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
|
-
import { TaskRunnersConfig } from '@n8n/config';
|
|
2
|
+
import { GlobalConfig, TaskRunnersConfig } from '@n8n/config';
|
|
3
3
|
import type { BrokerMessage } from '@n8n/task-runner';
|
|
4
4
|
import type WebSocket from 'ws';
|
|
5
5
|
import { WsStatusCodes } from '../../constants';
|
|
@@ -14,9 +14,10 @@ export declare class TaskBrokerWsServer {
|
|
|
14
14
|
private disconnectAnalyzer;
|
|
15
15
|
private readonly taskTunnersConfig;
|
|
16
16
|
private readonly runnerLifecycleEvents;
|
|
17
|
+
private readonly globalConfig;
|
|
17
18
|
runnerConnections: Map<TaskRunner['id'], WebSocket>;
|
|
18
19
|
private heartbeatTimer;
|
|
19
|
-
constructor(logger: Logger, taskBroker: TaskBroker, disconnectAnalyzer: DefaultTaskRunnerDisconnectAnalyzer, taskTunnersConfig: TaskRunnersConfig, runnerLifecycleEvents: TaskRunnerLifecycleEvents);
|
|
20
|
+
constructor(logger: Logger, taskBroker: TaskBroker, disconnectAnalyzer: DefaultTaskRunnerDisconnectAnalyzer, taskTunnersConfig: TaskRunnersConfig, runnerLifecycleEvents: TaskRunnerLifecycleEvents, globalConfig: GlobalConfig);
|
|
20
21
|
start(): void;
|
|
21
22
|
private startHeartbeatChecks;
|
|
22
23
|
stop(): Promise<void>;
|
|
@@ -27,5 +28,6 @@ export declare class TaskBrokerWsServer {
|
|
|
27
28
|
removeConnection(id: TaskRunner['id'], reason?: DisconnectReason, code?: WsStatusCode): Promise<void>;
|
|
28
29
|
handleRequest(req: TaskBrokerServerInitRequest, _res: TaskBrokerServerInitResponse): void;
|
|
29
30
|
private stopConnectedRunners;
|
|
31
|
+
private drainActiveTasks;
|
|
30
32
|
}
|
|
31
33
|
export {};
|
|
@@ -23,12 +23,13 @@ function heartbeat() {
|
|
|
23
23
|
this.isAlive = true;
|
|
24
24
|
}
|
|
25
25
|
let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
26
|
-
constructor(logger, taskBroker, disconnectAnalyzer, taskTunnersConfig, runnerLifecycleEvents) {
|
|
26
|
+
constructor(logger, taskBroker, disconnectAnalyzer, taskTunnersConfig, runnerLifecycleEvents, globalConfig) {
|
|
27
27
|
this.logger = logger;
|
|
28
28
|
this.taskBroker = taskBroker;
|
|
29
29
|
this.disconnectAnalyzer = disconnectAnalyzer;
|
|
30
30
|
this.taskTunnersConfig = taskTunnersConfig;
|
|
31
31
|
this.runnerLifecycleEvents = runnerLifecycleEvents;
|
|
32
|
+
this.globalConfig = globalConfig;
|
|
32
33
|
this.runnerConnections = new Map();
|
|
33
34
|
}
|
|
34
35
|
start() {
|
|
@@ -131,8 +132,28 @@ let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
|
131
132
|
this.add(req.query.id, req.ws);
|
|
132
133
|
}
|
|
133
134
|
async stopConnectedRunners() {
|
|
135
|
+
await this.drainActiveTasks();
|
|
134
136
|
await Promise.all(Array.from(this.runnerConnections.keys()).map(async (id) => await this.removeConnection(id, 'shutting-down', constants_2.WsStatusCodes.CloseGoingAway)));
|
|
135
137
|
}
|
|
138
|
+
async drainActiveTasks() {
|
|
139
|
+
const drainTimeout = Math.floor(this.globalConfig.generic.gracefulShutdownTimeout * 0.8);
|
|
140
|
+
const drainTimeoutMs = drainTimeout * constants_1.Time.seconds.toMilliseconds;
|
|
141
|
+
this.taskBroker.startDraining();
|
|
142
|
+
for (const connection of this.runnerConnections.values()) {
|
|
143
|
+
try {
|
|
144
|
+
connection.send(JSON.stringify({ type: 'broker:drain' }));
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
const start = Date.now();
|
|
150
|
+
while (this.taskBroker.hasActiveTasks() && Date.now() - start < drainTimeoutMs) {
|
|
151
|
+
await (0, n8n_workflow_1.sleep)(100);
|
|
152
|
+
}
|
|
153
|
+
if (this.taskBroker.hasActiveTasks()) {
|
|
154
|
+
this.logger.warn(`Drain timeout reached after ${drainTimeout}s, will force-shutdown with active tasks...`);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
136
157
|
};
|
|
137
158
|
exports.TaskBrokerWsServer = TaskBrokerWsServer;
|
|
138
159
|
exports.TaskBrokerWsServer = TaskBrokerWsServer = __decorate([
|
|
@@ -141,6 +162,7 @@ exports.TaskBrokerWsServer = TaskBrokerWsServer = __decorate([
|
|
|
141
162
|
task_broker_service_1.TaskBroker,
|
|
142
163
|
default_task_runner_disconnect_analyzer_1.DefaultTaskRunnerDisconnectAnalyzer,
|
|
143
164
|
config_1.TaskRunnersConfig,
|
|
144
|
-
task_runner_lifecycle_events_1.TaskRunnerLifecycleEvents
|
|
165
|
+
task_runner_lifecycle_events_1.TaskRunnerLifecycleEvents,
|
|
166
|
+
config_1.GlobalConfig])
|
|
145
167
|
], TaskBrokerWsServer);
|
|
146
168
|
//# sourceMappingURL=task-broker-ws-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker-ws-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-ws-server.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"task-broker-ws-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-ws-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,7 @@ export declare class TaskBroker {
|
|
|
43
43
|
private knownRunners;
|
|
44
44
|
private requesters;
|
|
45
45
|
private tasks;
|
|
46
|
+
private isDraining;
|
|
46
47
|
private runnerAcceptRejects;
|
|
47
48
|
private requesterAcceptRejects;
|
|
48
49
|
private pendingTaskOffers;
|
|
@@ -82,6 +83,9 @@ export declare class TaskBroker {
|
|
|
82
83
|
settleTasks(): void;
|
|
83
84
|
taskRequested(request: TaskRequest): void;
|
|
84
85
|
taskOffered(offer: TaskOffer): void;
|
|
86
|
+
startDraining(): void;
|
|
87
|
+
hasActiveTasks(): boolean;
|
|
88
|
+
stopDraining(): void;
|
|
85
89
|
getTasks(): Map<string, Task>;
|
|
86
90
|
getPendingTaskOffers(): TaskOffer[];
|
|
87
91
|
getPendingTaskRequests(): TaskRequest[];
|
|
@@ -30,6 +30,7 @@ let TaskBroker = class TaskBroker {
|
|
|
30
30
|
this.knownRunners = new Map();
|
|
31
31
|
this.requesters = new Map();
|
|
32
32
|
this.tasks = new Map();
|
|
33
|
+
this.isDraining = false;
|
|
33
34
|
this.runnerAcceptRejects = new Map();
|
|
34
35
|
this.requesterAcceptRejects = new Map();
|
|
35
36
|
this.pendingTaskOffers = [];
|
|
@@ -471,6 +472,15 @@ let TaskBroker = class TaskBroker {
|
|
|
471
472
|
}
|
|
472
473
|
}
|
|
473
474
|
taskRequested(request) {
|
|
475
|
+
if (this.isDraining) {
|
|
476
|
+
clearTimeout(request.timeout);
|
|
477
|
+
void this.requesters.get(request.requesterId)?.({
|
|
478
|
+
type: 'broker:requestexpired',
|
|
479
|
+
requestId: request.requestId,
|
|
480
|
+
reason: 'draining',
|
|
481
|
+
});
|
|
482
|
+
return;
|
|
483
|
+
}
|
|
474
484
|
this.pendingTaskRequests.push(request);
|
|
475
485
|
this.settleTasks();
|
|
476
486
|
}
|
|
@@ -478,6 +488,15 @@ let TaskBroker = class TaskBroker {
|
|
|
478
488
|
this.pendingTaskOffers.push(offer);
|
|
479
489
|
this.settleTasks();
|
|
480
490
|
}
|
|
491
|
+
startDraining() {
|
|
492
|
+
this.isDraining = true;
|
|
493
|
+
}
|
|
494
|
+
hasActiveTasks() {
|
|
495
|
+
return this.tasks.size > 0;
|
|
496
|
+
}
|
|
497
|
+
stopDraining() {
|
|
498
|
+
this.isDraining = false;
|
|
499
|
+
}
|
|
481
500
|
getTasks() {
|
|
482
501
|
return this.tasks;
|
|
483
502
|
}
|