n8n 2.19.2 → 2.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/chat/chat-execution-manager.js +7 -1
- package/dist/chat/chat-execution-manager.js.map +1 -1
- package/dist/collaboration/collaboration.service.d.ts +1 -0
- package/dist/collaboration/collaboration.service.js +31 -0
- package/dist/collaboration/collaboration.service.js.map +1 -1
- package/dist/commands/execute.d.ts +2 -2
- package/dist/commands/export/credentials.d.ts +2 -2
- package/dist/commands/export/credentials.js +1 -1
- package/dist/commands/export/credentials.js.map +1 -1
- package/dist/commands/export/workflow.d.ts +4 -4
- package/dist/commands/import/credentials.d.ts +12 -2
- package/dist/commands/import/credentials.js +89 -11
- package/dist/commands/import/credentials.js.map +1 -1
- package/dist/commands/import/workflow.d.ts +2 -2
- package/dist/commands/ttwf/generate.d.ts +3 -3
- package/dist/controllers/e2e.controller.js +1 -1
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.d.ts +6 -4
- package/dist/controllers/oauth/oauth2-credential.controller.js +12 -5
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.js +1 -1
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +2 -2
- package/dist/credentials/credentials.service.ee.js +2 -2
- package/dist/credentials/credentials.service.ee.js.map +1 -1
- package/dist/credentials/credentials.service.js +13 -16
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/credentials/dynamic-credentials-proxy.js +1 -1
- package/dist/credentials/dynamic-credentials-proxy.js.map +1 -1
- package/dist/credentials-helper.d.ts +1 -0
- package/dist/credentials-helper.js +12 -4
- package/dist/credentials-helper.js.map +1 -1
- package/dist/credentials-overwrites.js +2 -2
- package/dist/credentials-overwrites.js.map +1 -1
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.d.ts +5 -0
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.js +22 -12
- package/dist/evaluation.ee/test-runner/evaluation-metrics.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.d.ts +4 -2
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +152 -89
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.d.ts +8 -2
- package/dist/evaluation.ee/test-runs.controller.ee.js +31 -5
- package/dist/evaluation.ee/test-runs.controller.ee.js.map +1 -1
- package/dist/eventbus/event-message-classes/index.d.ts +3 -2
- package/dist/eventbus/event-message-classes/index.js +11 -1
- package/dist/eventbus/event-message-classes/index.js.map +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.d.ts +5 -2
- package/dist/eventbus/message-event-bus/message-event-bus.js +101 -73
- package/dist/eventbus/message-event-bus/message-event-bus.js.map +1 -1
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.d.ts +3 -0
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js +3 -1
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js.map +1 -1
- package/dist/eventbus/message-event-bus-writer/resolve-event-log-path.d.ts +12 -0
- package/dist/eventbus/message-event-bus-writer/resolve-event-log-path.js +34 -0
- package/dist/eventbus/message-event-bus-writer/resolve-event-log-path.js.map +1 -0
- package/dist/execution-lifecycle/execute-error-workflow.js +1 -1
- package/dist/execution-lifecycle/execute-error-workflow.js.map +1 -1
- package/dist/executions/execution-recovery.service.d.ts +1 -1
- package/dist/executions/execution-recovery.service.js +11 -6
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/execution.service.d.ts +7 -2
- package/dist/executions/execution.service.js +18 -1
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/executions.controller.d.ts +1 -3
- package/dist/executions/executions.controller.js +3 -17
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/instance-settings-loader/instance-settings-loader.service.d.ts +3 -1
- package/dist/instance-settings-loader/instance-settings-loader.service.js +6 -2
- package/dist/instance-settings-loader/instance-settings-loader.service.js.map +1 -1
- package/dist/instance-settings-loader/loaders/mcp-settings.loader.d.ts +10 -0
- package/dist/instance-settings-loader/loaders/mcp-settings.loader.js +42 -0
- package/dist/instance-settings-loader/loaders/mcp-settings.loader.js.map +1 -0
- package/dist/instance-settings-loader/loaders/sso.instance-settings-loader.js +9 -4
- package/dist/instance-settings-loader/loaders/sso.instance-settings-loader.js.map +1 -1
- package/dist/mfa/mfa.service.d.ts +2 -2
- package/dist/mfa/mfa.service.js +11 -10
- package/dist/mfa/mfa.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-extractor.js +1 -1
- package/dist/modules/chat-hub/chat-hub-extractor.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +4 -4
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/community-packages/community-node-types.service.js +3 -1
- package/dist/modules/community-packages/community-node-types.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/n8n-credential-resolver.js +2 -2
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/n8n-credential-resolver.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.js +2 -2
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/slack-credential-resolver.js +2 -2
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/slack-credential-resolver.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.js +2 -2
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/credential-check-proxy.service.js +1 -1
- package/dist/modules/dynamic-credentials.ee/services/credential-check-proxy.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.js +1 -1
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver-workflow.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.js +14 -14
- package/dist/modules/dynamic-credentials.ee/services/credential-resolver.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential-storage.service.js +1 -1
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential-storage.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js +4 -4
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js.map +1 -1
- package/dist/modules/encryption-key-manager/encryption-bootstrap.service.d.ts +6 -1
- package/dist/modules/encryption-key-manager/encryption-bootstrap.service.js +14 -2
- package/dist/modules/encryption-key-manager/encryption-bootstrap.service.js.map +1 -1
- package/dist/modules/encryption-key-manager/encryption-key.controller.js +1 -0
- package/dist/modules/encryption-key-manager/encryption-key.controller.js.map +1 -1
- package/dist/modules/encryption-key-manager/key-manager.service.d.ts +2 -1
- package/dist/modules/encryption-key-manager/key-manager.service.js +24 -5
- package/dist/modules/encryption-key-manager/key-manager.service.js.map +1 -1
- package/dist/modules/external-secrets.ee/constants.d.ts +1 -0
- package/dist/modules/external-secrets.ee/constants.js +2 -1
- package/dist/modules/external-secrets.ee/constants.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js +4 -4
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-cache.service.d.ts +1 -0
- package/dist/modules/external-secrets.ee/secrets-cache.service.js +18 -1
- package/dist/modules/external-secrets.ee/secrets-cache.service.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js +3 -3
- 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 +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js +15 -13
- 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.js +3 -3
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/settings-store.service.js +6 -6
- package/dist/modules/external-secrets.ee/settings-store.service.js.map +1 -1
- package/dist/modules/insights/insights-collection.service.js +7 -1
- package/dist/modules/insights/insights-collection.service.js.map +1 -1
- package/dist/modules/insights/insights-pruning.service.d.ts +2 -4
- package/dist/modules/insights/insights-pruning.service.js +13 -10
- package/dist/modules/insights/insights-pruning.service.js.map +1 -1
- package/dist/modules/insights/insights.config.js +2 -1
- package/dist/modules/insights/insights.config.js.map +1 -1
- package/dist/modules/insights/insights.constants.d.ts +2 -0
- package/dist/modules/insights/insights.constants.js +3 -1
- package/dist/modules/insights/insights.constants.js.map +1 -1
- package/dist/modules/insights/insights.service.js +1 -3
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/modules/instance-ai/compaction.service.d.ts +7 -2
- package/dist/modules/instance-ai/compaction.service.js +17 -17
- package/dist/modules/instance-ai/compaction.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai-settings.service.js +4 -4
- package/dist/modules/instance-ai/instance-ai-settings.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.adapter.service.d.ts +38 -1
- package/dist/modules/instance-ai/instance-ai.adapter.service.js +179 -60
- package/dist/modules/instance-ai/instance-ai.adapter.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.controller.d.ts +2 -2
- package/dist/modules/instance-ai/instance-ai.controller.js +7 -17
- package/dist/modules/instance-ai/instance-ai.controller.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.service.d.ts +15 -4
- package/dist/modules/instance-ai/instance-ai.service.js +489 -76
- package/dist/modules/instance-ai/instance-ai.service.js.map +1 -1
- package/dist/modules/instance-ai/storage/typeorm-memory-storage.js +11 -1
- package/dist/modules/instance-ai/storage/typeorm-memory-storage.js.map +1 -1
- package/dist/modules/instance-ai/web-research/fetch-and-extract.d.ts +3 -1
- package/dist/modules/instance-ai/web-research/fetch-and-extract.js +13 -11
- package/dist/modules/instance-ai/web-research/fetch-and-extract.js.map +1 -1
- package/dist/modules/instance-ai/web-research/index.d.ts +0 -1
- package/dist/modules/instance-ai/web-research/index.js +1 -3
- package/dist/modules/instance-ai/web-research/index.js.map +1 -1
- package/dist/modules/instance-registry/checks/check.service.d.ts +43 -0
- package/dist/modules/instance-registry/checks/check.service.js +248 -0
- package/dist/modules/instance-registry/checks/check.service.js.map +1 -0
- package/dist/modules/instance-registry/checks/hostid-clash.check.d.ts +8 -0
- package/dist/modules/instance-registry/checks/hostid-clash.check.js +68 -0
- package/dist/modules/instance-registry/checks/hostid-clash.check.js.map +1 -0
- package/dist/modules/instance-registry/checks/index.d.ts +4 -0
- package/dist/modules/instance-registry/checks/index.js +7 -0
- package/dist/modules/instance-registry/checks/index.js.map +1 -0
- package/dist/modules/instance-registry/checks/lifecycle.check.d.ts +8 -0
- package/dist/modules/instance-registry/checks/lifecycle.check.js +52 -0
- package/dist/modules/instance-registry/checks/lifecycle.check.js.map +1 -0
- package/dist/modules/instance-registry/checks/split-brain.check.d.ts +8 -0
- package/dist/modules/instance-registry/checks/split-brain.check.js +67 -0
- package/dist/modules/instance-registry/checks/split-brain.check.js.map +1 -0
- package/dist/modules/instance-registry/checks/version-mismatch.check.d.ts +8 -0
- package/dist/modules/instance-registry/checks/version-mismatch.check.js +55 -0
- package/dist/modules/instance-registry/checks/version-mismatch.check.js.map +1 -0
- package/dist/modules/instance-registry/instance-registry.controller.d.ts +3 -1
- package/dist/modules/instance-registry/instance-registry.controller.js +41 -5
- package/dist/modules/instance-registry/instance-registry.controller.js.map +1 -1
- package/dist/modules/instance-registry/instance-registry.module.js +3 -9
- package/dist/modules/instance-registry/instance-registry.module.js.map +1 -1
- package/dist/modules/ldap.ee/helpers.ee.js +1 -1
- package/dist/modules/ldap.ee/helpers.ee.js.map +1 -1
- package/dist/modules/ldap.ee/ldap.service.ee.js +2 -2
- package/dist/modules/ldap.ee/ldap.service.ee.js.map +1 -1
- package/dist/modules/mcp/dto/update-workflows-availability.dto.d.ts +15 -0
- package/dist/modules/mcp/dto/update-workflows-availability.dto.js +14 -0
- package/dist/modules/mcp/dto/update-workflows-availability.dto.js.map +1 -0
- package/dist/modules/mcp/mcp-oauth-service.d.ts +6 -0
- package/dist/modules/mcp/mcp-oauth-service.js +15 -3
- package/dist/modules/mcp/mcp-oauth-service.js.map +1 -1
- package/dist/modules/mcp/mcp-oauth-token.service.d.ts +1 -0
- package/dist/modules/mcp/mcp-oauth-token.service.js +3 -0
- package/dist/modules/mcp/mcp-oauth-token.service.js.map +1 -1
- package/dist/modules/mcp/mcp.controller.d.ts +2 -0
- package/dist/modules/mcp/mcp.controller.js +49 -11
- package/dist/modules/mcp/mcp.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.errors.d.ts +6 -0
- package/dist/modules/mcp/mcp.errors.js +12 -1
- package/dist/modules/mcp/mcp.errors.js.map +1 -1
- package/dist/modules/mcp/mcp.module.d.ts +1 -0
- package/dist/modules/mcp/mcp.module.js +3 -1
- package/dist/modules/mcp/mcp.module.js.map +1 -1
- package/dist/modules/mcp/mcp.oauth-clients.controller.d.ts +2 -1
- package/dist/modules/mcp/mcp.oauth-clients.controller.js +10 -0
- package/dist/modules/mcp/mcp.oauth-clients.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.oauth.controller.js +20 -1
- package/dist/modules/mcp/mcp.oauth.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.service.js +3 -0
- package/dist/modules/mcp/mcp.service.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.controller.d.ts +11 -12
- package/dist/modules/mcp/mcp.settings.controller.js +19 -50
- package/dist/modules/mcp/mcp.settings.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.service.d.ts +30 -2
- package/dist/modules/mcp/mcp.settings.service.js +165 -2
- package/dist/modules/mcp/mcp.settings.service.js.map +1 -1
- package/dist/modules/mcp/tools/search-executions.tool.d.ts +16 -0
- package/dist/modules/mcp/tools/search-executions.tool.js +140 -0
- package/dist/modules/mcp/tools/search-executions.tool.js.map +1 -0
- package/dist/modules/mcp/tools/workflow-builder/get-workflow-node-types.tool.d.ts +2 -2
- package/dist/modules/oauth-jwe/oauth-jwe-decrypt.service.d.ts +7 -0
- package/dist/modules/oauth-jwe/oauth-jwe-decrypt.service.js +48 -0
- package/dist/modules/oauth-jwe/oauth-jwe-decrypt.service.js.map +1 -0
- package/dist/modules/oauth-jwe/oauth-jwe-key.service.d.ts +31 -0
- package/dist/modules/oauth-jwe/oauth-jwe-key.service.js +174 -0
- package/dist/modules/oauth-jwe/oauth-jwe-key.service.js.map +1 -0
- package/dist/modules/oauth-jwe/oauth-jwe.config.d.ts +3 -0
- package/dist/modules/oauth-jwe/oauth-jwe.config.js +27 -0
- package/dist/modules/oauth-jwe/oauth-jwe.config.js.map +1 -0
- package/dist/modules/oauth-jwe/oauth-jwe.constants.d.ts +9 -0
- package/dist/modules/oauth-jwe/oauth-jwe.constants.js +15 -0
- package/dist/modules/oauth-jwe/oauth-jwe.constants.js.map +1 -0
- package/dist/modules/oauth-jwe/oauth-jwe.controller.d.ts +10 -0
- package/dist/modules/oauth-jwe/oauth-jwe.controller.js +60 -0
- package/dist/modules/oauth-jwe/oauth-jwe.controller.js.map +1 -0
- package/dist/modules/oauth-jwe/oauth-jwe.module.d.ts +8 -0
- package/dist/modules/oauth-jwe/oauth-jwe.module.js +70 -0
- package/dist/modules/oauth-jwe/oauth-jwe.module.js.map +1 -0
- package/dist/modules/oauth-jwe/oauth-jwe.schemas.d.ts +131 -0
- package/dist/modules/oauth-jwe/oauth-jwe.schemas.js +34 -0
- package/dist/modules/oauth-jwe/oauth-jwe.schemas.js.map +1 -0
- package/dist/modules/oauth-jwe/oauth-jwe.utils.d.ts +4 -0
- package/dist/modules/oauth-jwe/oauth-jwe.utils.js +27 -0
- package/dist/modules/oauth-jwe/oauth-jwe.utils.js.map +1 -0
- package/dist/modules/source-control.ee/source-control-export.service.ee.js +1 -1
- package/dist/modules/source-control.ee/source-control-export.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-import.service.ee.js +6 -6
- package/dist/modules/source-control.ee/source-control-import.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-preferences.service.ee.js +6 -6
- package/dist/modules/source-control.ee/source-control-preferences.service.ee.js.map +1 -1
- package/dist/modules/sso-oidc/oidc.service.ee.js +2 -2
- package/dist/modules/sso-oidc/oidc.service.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml.service.ee.js +6 -6
- package/dist/modules/sso-saml/saml.service.ee.js.map +1 -1
- package/dist/oauth/oauth-jwe-service.proxy.d.ts +9 -0
- package/dist/oauth/oauth-jwe-service.proxy.js +27 -0
- package/dist/oauth/oauth-jwe-service.proxy.js.map +1 -0
- package/dist/oauth/oauth.service.d.ts +2 -2
- package/dist/oauth/oauth.service.js +13 -12
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/posthog/index.d.ts +2 -0
- package/dist/posthog/index.js +16 -0
- package/dist/posthog/index.js.map +1 -1
- package/dist/public-api/v1/handlers/credentials/credentials.service.js +2 -2
- package/dist/public-api/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/services/dynamic-node-parameters.service.d.ts +1 -0
- package/dist/services/dynamic-node-parameters.service.js +29 -12
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/services/export.service.js +2 -2
- package/dist/services/export.service.js.map +1 -1
- package/dist/services/frontend.service.js +18 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/import.service.d.ts +5 -1
- package/dist/services/import.service.js +62 -5
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/redis-client.service.d.ts +6 -5
- package/dist/services/redis-client.service.js +19 -12
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/services/user.service.js +0 -9
- package/dist/services/user.service.js.map +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.d.ts +4 -4
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.js +9 -8
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker-server.js +1 -1
- package/dist/task-runners/task-broker/task-broker-server.js.map +1 -1
- package/dist/webhooks/test-webhooks.js +16 -2
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +4 -2
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflows/workflow-finder.service.d.ts +2 -0
- package/dist/workflows/workflow-finder.service.js +12 -1
- package/dist/workflows/workflow-finder.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +7 -2
- package/dist/workflows/workflows.controller.js +43 -10
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +30 -28
- package/dist/modules/instance-ai/web-research/ssrf-guard.d.ts +0 -1
- package/dist/modules/instance-ai/web-research/ssrf-guard.js +0 -85
- package/dist/modules/instance-ai/web-research/ssrf-guard.js.map +0 -1
- package/dist/modules/mcp/dto/update-workflow-availability.dto.d.ts +0 -9
- package/dist/modules/mcp/dto/update-workflow-availability.dto.js +0 -11
- package/dist/modules/mcp/dto/update-workflow-availability.dto.js.map +0 -1
|
@@ -51,7 +51,7 @@ let ExportService = class ExportService {
|
|
|
51
51
|
const migrationsJsonl = allMigrations
|
|
52
52
|
.map((migration) => JSON.stringify(migration))
|
|
53
53
|
.join('\n');
|
|
54
|
-
await (0, promises_1.appendFile)(filePath, this.cipher.
|
|
54
|
+
await (0, promises_1.appendFile)(filePath, await this.cipher.encryptV2(migrationsJsonl ?? '' + '\n', customEncryptionKey), 'utf8');
|
|
55
55
|
this.logger.info(` ✅ Completed export for ${migrationsTableName}: ${allMigrations.length} entities in 1 file`);
|
|
56
56
|
systemTablesExported = 1;
|
|
57
57
|
}
|
|
@@ -122,7 +122,7 @@ let ExportService = class ExportService {
|
|
|
122
122
|
const entitiesJsonl = pageEntities
|
|
123
123
|
.map((entity) => JSON.stringify(entity))
|
|
124
124
|
.join('\n');
|
|
125
|
-
await (0, promises_1.appendFile)(filePath, this.cipher.
|
|
125
|
+
await (0, promises_1.appendFile)(filePath, (await this.cipher.encryptV2(entitiesJsonl, customEncryptionKey)) + '\n', 'utf8');
|
|
126
126
|
totalEntityCount += pageEntities.length;
|
|
127
127
|
currentFileEntityCount += pageEntities.length;
|
|
128
128
|
offset += pageEntities.length;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.service.js","sourceRoot":"","sources":["../../src/services/export.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA2D;AAC3D,0CAAuE;AAEvE,gCAAkC;AAGlC,0CAA0C;AAC1C,2EAAiF;AACjF,uCAAkC;AAClC,+DAA0D;AAGnD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACzB,YACkB,MAAc,EACd,UAAsB,EACtB,MAAc;QAFd,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAY;QACtB,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEI,KAAK,CAAC,wBAAwB,CAAC,SAAiB,EAAE,UAAkB;QAC3E,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,EAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CACvC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACtE,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,iBAAiB,WAAW,CAAC,MAAM,yBAAyB,UAAU,eAAe,CACrF,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;gBAChC,MAAM,IAAA,aAAE,EAAC,IAAA,6BAAY,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;YAC5C,CAAC;QACF,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAClC,SAAiB,EACjB,mBAA4B;QAE5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAGnD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;QAC/D,MAAM,mBAAmB,GAAG,GAAG,WAAW,YAAY,CAAC;QAEvD,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAG7B,IAAI,CAAC;YAEJ,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAC1B,kBAAkB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAC9E,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,mBAAmB,EAAE,CAAC,CAAC;YAGzE,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YAG7D,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAC9E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,iBAAiB,kBAAkB,EAAE,CAAC,CAAC;YAEzF,MAAM,QAAQ,GAAG,kBAAkB,CAAC;YACpC,MAAM,QAAQ,GAAG,IAAA,6BAAY,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAEnD,MAAM,eAAe,GAAW,aAAa;iBAC3C,GAAG,CAAC,CAAC,SAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;iBACtD,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,MAAM,IAAA,qBAAU,EACf,QAAQ,EACR,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"export.service.js","sourceRoot":"","sources":["../../src/services/export.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -169,6 +169,7 @@ let FrontendService = class FrontendService {
|
|
|
169
169
|
oauth1: `${instanceBaseUrl}/${restEndpoint}/oauth1-credential/callback`,
|
|
170
170
|
oauth2: `${instanceBaseUrl}/${restEndpoint}/oauth2-credential/callback`,
|
|
171
171
|
},
|
|
172
|
+
jwksUri: `${instanceBaseUrl}/${restEndpoint}/.well-known/jwks.json`,
|
|
172
173
|
versionNotifications: {
|
|
173
174
|
enabled: this.globalConfig.versionNotifications.enabled,
|
|
174
175
|
endpoint: this.globalConfig.versionNotifications.endpoint,
|
|
@@ -231,6 +232,7 @@ let FrontendService = class FrontendService {
|
|
|
231
232
|
},
|
|
232
233
|
},
|
|
233
234
|
workflowTagsDisabled: this.globalConfig.tags.disabled,
|
|
235
|
+
workflowsAutosaveDisabled: this.globalConfig.workflows.autosaveDisabled,
|
|
234
236
|
logLevel: this.globalConfig.logging.level,
|
|
235
237
|
hiringBannerEnabled: this.globalConfig.hiringBanner.enabled,
|
|
236
238
|
aiAssistant: {
|
|
@@ -361,6 +363,7 @@ let FrontendService = class FrontendService {
|
|
|
361
363
|
oauth1: `${instanceBaseUrl}/${restEndpoint}/oauth1-credential/callback`,
|
|
362
364
|
oauth2: `${instanceBaseUrl}/${restEndpoint}/oauth2-credential/callback`,
|
|
363
365
|
};
|
|
366
|
+
this.settings.jwksUri = `${instanceBaseUrl}/${restEndpoint}/.well-known/jwks.json`;
|
|
364
367
|
Object.assign(this.settings.userManagement, {
|
|
365
368
|
quota: this.license.getUsersLimit(),
|
|
366
369
|
authenticationMethod: (0, sso_helpers_1.getCurrentAuthenticationMethod)(),
|
|
@@ -566,6 +569,21 @@ let FrontendService = class FrontendService {
|
|
|
566
569
|
if (skipTypes.includes(credential.name)) {
|
|
567
570
|
credential.__skipManagedCreation = true;
|
|
568
571
|
}
|
|
572
|
+
if (credential.name === 'oAuth2Api' && credential.properties) {
|
|
573
|
+
const isOAuth2JweEnabled = process.env.N8N_ENV_FEAT_OAUTH2_JWE === 'true';
|
|
574
|
+
if (!isOAuth2JweEnabled) {
|
|
575
|
+
credential.properties = credential.properties.filter((property) => property.name !== 'jweEnabled' && property.name !== 'jwksUriNotice');
|
|
576
|
+
}
|
|
577
|
+
else {
|
|
578
|
+
const jwksUri = `${this.urlService.getInstanceBaseUrl()}/${this.globalConfig.endpoints.rest}/.well-known/jwks.json`;
|
|
579
|
+
credential.properties = credential.properties.map((property) => property.name === 'jwksUriNotice'
|
|
580
|
+
? {
|
|
581
|
+
...property,
|
|
582
|
+
displayName: `Provide this JWKS URI to your IdP so it can encrypt tokens to this instance's public key: \`${jwksUri}\``,
|
|
583
|
+
}
|
|
584
|
+
: property);
|
|
585
|
+
}
|
|
586
|
+
}
|
|
569
587
|
}
|
|
570
588
|
}
|
|
571
589
|
};
|
|
@@ -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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"}
|
|
@@ -6,6 +6,7 @@ import { Cipher } from 'n8n-core';
|
|
|
6
6
|
import { ActiveWorkflowManager } from '../active-workflow-manager';
|
|
7
7
|
import type { IWorkflowWithVersionMetadata } from '../interfaces';
|
|
8
8
|
import { WorkflowIndexService } from '../modules/workflow-index/workflow-index.service';
|
|
9
|
+
import { DataTableDDLService } from '../modules/data-table/data-table-ddl.service';
|
|
9
10
|
export declare class ImportService {
|
|
10
11
|
private readonly logger;
|
|
11
12
|
private readonly credentialsRepository;
|
|
@@ -14,10 +15,11 @@ export declare class ImportService {
|
|
|
14
15
|
private readonly cipher;
|
|
15
16
|
private readonly activeWorkflowManager;
|
|
16
17
|
private readonly workflowIndexService;
|
|
18
|
+
private readonly dataTableDDLService;
|
|
17
19
|
private dbCredentials;
|
|
18
20
|
private dbTags;
|
|
19
21
|
private foreignKeyCommands;
|
|
20
|
-
constructor(logger: Logger, credentialsRepository: CredentialsRepository, tagRepository: TagRepository, dataSource: DataSource, cipher: Cipher, activeWorkflowManager: ActiveWorkflowManager, workflowIndexService: WorkflowIndexService);
|
|
22
|
+
constructor(logger: Logger, credentialsRepository: CredentialsRepository, tagRepository: TagRepository, dataSource: DataSource, cipher: Cipher, activeWorkflowManager: ActiveWorkflowManager, workflowIndexService: WorkflowIndexService, dataTableDDLService: DataTableDDLService);
|
|
21
23
|
initRecords(): Promise<void>;
|
|
22
24
|
importWorkflows(workflows: IWorkflowWithVersionMetadata[], projectId: string): Promise<void>;
|
|
23
25
|
replaceInvalidCreds(workflow: IWorkflowBase, projectId: string): Promise<void>;
|
|
@@ -34,6 +36,8 @@ export declare class ImportService {
|
|
|
34
36
|
importEntitiesFromFiles(inputDir: string, transactionManager: EntityManager, entityNames: string[], entityFiles: Record<string, string[]>, customEncryptionKey?: string): Promise<void>;
|
|
35
37
|
private toNewCredentialFormat;
|
|
36
38
|
private normalizeEntityJsonColumns;
|
|
39
|
+
dropExistingDataTableUserTables(transactionManager: EntityManager): Promise<void>;
|
|
40
|
+
recreateDataTableUserTablesFromRegistry(transactionManager: EntityManager): Promise<void>;
|
|
37
41
|
disableForeignKeyConstraints(transactionManager: EntityManager): Promise<void>;
|
|
38
42
|
enableForeignKeyConstraints(transactionManager: EntityManager): Promise<void>;
|
|
39
43
|
validateMigrations(inputDir: string, customEncryptionKey?: string): Promise<void>;
|
|
@@ -56,8 +56,10 @@ const compression_util_1 = require("../utils/compression.util");
|
|
|
56
56
|
const zod_1 = require("zod");
|
|
57
57
|
const active_workflow_manager_1 = require("../active-workflow-manager");
|
|
58
58
|
const workflow_index_service_1 = require("../modules/workflow-index/workflow-index.service");
|
|
59
|
+
const data_table_ddl_service_1 = require("../modules/data-table/data-table-ddl.service");
|
|
60
|
+
const data_table_column_entity_1 = require("../modules/data-table/data-table-column.entity");
|
|
59
61
|
let ImportService = class ImportService {
|
|
60
|
-
constructor(logger, credentialsRepository, tagRepository, dataSource, cipher, activeWorkflowManager, workflowIndexService) {
|
|
62
|
+
constructor(logger, credentialsRepository, tagRepository, dataSource, cipher, activeWorkflowManager, workflowIndexService, dataTableDDLService) {
|
|
61
63
|
this.logger = logger;
|
|
62
64
|
this.credentialsRepository = credentialsRepository;
|
|
63
65
|
this.tagRepository = tagRepository;
|
|
@@ -65,6 +67,7 @@ let ImportService = class ImportService {
|
|
|
65
67
|
this.cipher = cipher;
|
|
66
68
|
this.activeWorkflowManager = activeWorkflowManager;
|
|
67
69
|
this.workflowIndexService = workflowIndexService;
|
|
70
|
+
this.dataTableDDLService = dataTableDDLService;
|
|
68
71
|
this.dbCredentials = [];
|
|
69
72
|
this.dbTags = [];
|
|
70
73
|
this.foreignKeyCommands = {
|
|
@@ -258,7 +261,7 @@ let ImportService = class ImportService {
|
|
|
258
261
|
const entities = [];
|
|
259
262
|
const entitySchema = zod_1.z.record(zod_1.z.string(), zod_1.z.unknown());
|
|
260
263
|
for (const block of content.split('\n')) {
|
|
261
|
-
const lines = this.cipher.
|
|
264
|
+
const lines = (await this.cipher.decryptV2(block, customEncryptionKey)).split(/\r?\n/);
|
|
262
265
|
for (let i = 0; i < lines.length; i++) {
|
|
263
266
|
const line = lines[i].trim();
|
|
264
267
|
if (!line)
|
|
@@ -314,6 +317,7 @@ let ImportService = class ImportService {
|
|
|
314
317
|
const entityNames = Object.keys(entityFiles);
|
|
315
318
|
if (truncateTables) {
|
|
316
319
|
this.logger.info('\n🗑️ Truncating tables before import...');
|
|
320
|
+
await this.dropExistingDataTableUserTables(transactionManager);
|
|
317
321
|
this.logger.info(`Found ${tableNames.length} tables to truncate: ${tableNames.join(', ')}`);
|
|
318
322
|
await Promise.all(tableNames.map(async (tableName) => await this.truncateEntityTable(tableName, transactionManager)));
|
|
319
323
|
this.logger.info('✅ All tables truncated successfully');
|
|
@@ -323,6 +327,7 @@ let ImportService = class ImportService {
|
|
|
323
327
|
return;
|
|
324
328
|
}
|
|
325
329
|
await this.importEntitiesFromFiles(inputDir, transactionManager, entityNames, entityFiles, customEncryptionKey);
|
|
330
|
+
await this.recreateDataTableUserTablesFromRegistry(transactionManager);
|
|
326
331
|
if (!skipTogglingForeignKeyConstraints) {
|
|
327
332
|
await this.enableForeignKeyConstraints(transactionManager);
|
|
328
333
|
}
|
|
@@ -414,6 +419,58 @@ let ImportService = class ImportService {
|
|
|
414
419
|
}
|
|
415
420
|
return result;
|
|
416
421
|
}
|
|
422
|
+
async dropExistingDataTableUserTables(transactionManager) {
|
|
423
|
+
const tablePrefix = this.dataSource.options.entityPrefix || '';
|
|
424
|
+
const dataTableTableName = `${tablePrefix}data_table`;
|
|
425
|
+
let existing;
|
|
426
|
+
try {
|
|
427
|
+
existing = await transactionManager.query(`SELECT id FROM ${this.dataSource.driver.escape(dataTableTableName)}`);
|
|
428
|
+
}
|
|
429
|
+
catch (error) {
|
|
430
|
+
this.logger.info(` ⚠️ ${dataTableTableName} registry not found, skipping dynamic-table cleanup...`, { error });
|
|
431
|
+
return;
|
|
432
|
+
}
|
|
433
|
+
if (existing.length === 0)
|
|
434
|
+
return;
|
|
435
|
+
this.logger.info(`🗑️ Dropping ${existing.length} existing data-table backing table(s)...`);
|
|
436
|
+
for (const { id } of existing) {
|
|
437
|
+
await this.dataTableDDLService.dropTable(id, transactionManager);
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
async recreateDataTableUserTablesFromRegistry(transactionManager) {
|
|
441
|
+
const tablePrefix = this.dataSource.options.entityPrefix || '';
|
|
442
|
+
const dataTableTableName = `${tablePrefix}data_table`;
|
|
443
|
+
const dataTableColumnTableName = `${tablePrefix}data_table_column`;
|
|
444
|
+
let dataTables;
|
|
445
|
+
try {
|
|
446
|
+
dataTables = await transactionManager.query(`SELECT id FROM ${this.dataSource.driver.escape(dataTableTableName)}`);
|
|
447
|
+
}
|
|
448
|
+
catch (error) {
|
|
449
|
+
this.logger.info(` ⚠️ ${dataTableTableName} registry not present; skipping data-table backing-table recreation.`, { error });
|
|
450
|
+
return;
|
|
451
|
+
}
|
|
452
|
+
if (dataTables.length === 0)
|
|
453
|
+
return;
|
|
454
|
+
const escapedColumnTable = this.dataSource.driver.escape(dataTableColumnTableName);
|
|
455
|
+
const escapedDataTableId = this.dataSource.driver.escape('dataTableId');
|
|
456
|
+
const escapedIndex = this.dataSource.driver.escape('index');
|
|
457
|
+
const columnRows = await transactionManager.query(`SELECT id, ${escapedDataTableId}, name, type, ${escapedIndex} FROM ${escapedColumnTable}`);
|
|
458
|
+
const columnsByDataTableId = new Map();
|
|
459
|
+
for (const row of columnRows) {
|
|
460
|
+
const list = columnsByDataTableId.get(row.dataTableId) ?? [];
|
|
461
|
+
list.push(transactionManager.create(data_table_column_entity_1.DataTableColumn, row));
|
|
462
|
+
columnsByDataTableId.set(row.dataTableId, list);
|
|
463
|
+
}
|
|
464
|
+
this.logger.info(`\n📚 Recreating ${dataTables.length} data-table backing table(s)...`);
|
|
465
|
+
for (const { id: dataTableId } of dataTables) {
|
|
466
|
+
const cols = (columnsByDataTableId.get(dataTableId) ?? [])
|
|
467
|
+
.slice()
|
|
468
|
+
.sort((a, b) => a.index - b.index);
|
|
469
|
+
await this.dataTableDDLService.dropTable(dataTableId, transactionManager);
|
|
470
|
+
await this.dataTableDDLService.createTableWithColumns(dataTableId, cols, transactionManager);
|
|
471
|
+
}
|
|
472
|
+
this.logger.info(`✅ Recreated ${dataTables.length} data-table backing table(s)`);
|
|
473
|
+
}
|
|
417
474
|
async disableForeignKeyConstraints(transactionManager) {
|
|
418
475
|
const disableCommand = this.foreignKeyCommands.disable[this.dataSource.options.type];
|
|
419
476
|
if (!disableCommand) {
|
|
@@ -441,8 +498,7 @@ let ImportService = class ImportService {
|
|
|
441
498
|
throw new Error('Migrations file not found. Cannot proceed with import without migration validation.');
|
|
442
499
|
}
|
|
443
500
|
const migrationsFileContent = await (0, promises_1.readFile)(migrationsFilePath, 'utf8');
|
|
444
|
-
const importMigrations = this.cipher
|
|
445
|
-
.decrypt(migrationsFileContent, customEncryptionKey)
|
|
501
|
+
const importMigrations = (await this.cipher.decryptV2(migrationsFileContent, customEncryptionKey))
|
|
446
502
|
.trim()
|
|
447
503
|
.split('\n')
|
|
448
504
|
.filter((line) => line.trim())
|
|
@@ -494,6 +550,7 @@ exports.ImportService = ImportService = __decorate([
|
|
|
494
550
|
typeorm_1.DataSource,
|
|
495
551
|
n8n_core_1.Cipher,
|
|
496
552
|
active_workflow_manager_1.ActiveWorkflowManager,
|
|
497
|
-
workflow_index_service_1.WorkflowIndexService
|
|
553
|
+
workflow_index_service_1.WorkflowIndexService,
|
|
554
|
+
data_table_ddl_service_1.DataTableDDLService])
|
|
498
555
|
], ImportService);
|
|
499
556
|
//# sourceMappingURL=import.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.service.js","sourceRoot":"","sources":["../../src/services/import.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"import.service.js","sourceRoot":"","sources":["../../src/services/import.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,10 @@ type RedisEventMap = {
|
|
|
8
8
|
'connection-lost': number;
|
|
9
9
|
'connection-recovered': never;
|
|
10
10
|
};
|
|
11
|
+
type RedisClientCreateOptions = {
|
|
12
|
+
type: RedisClientType;
|
|
13
|
+
extraOptions?: RedisOptions;
|
|
14
|
+
};
|
|
11
15
|
export declare class RedisClientService extends TypedEmitter<RedisEventMap> {
|
|
12
16
|
private readonly logger;
|
|
13
17
|
private readonly globalConfig;
|
|
@@ -16,16 +20,13 @@ export declare class RedisClientService extends TypedEmitter<RedisEventMap> {
|
|
|
16
20
|
private lostConnection;
|
|
17
21
|
constructor(logger: Logger, globalConfig: GlobalConfig);
|
|
18
22
|
isConnected(): boolean;
|
|
19
|
-
createClient(
|
|
20
|
-
type: RedisClientType;
|
|
21
|
-
extraOptions?: RedisOptions;
|
|
22
|
-
}): ioRedis | Cluster;
|
|
23
|
+
createClient(options: RedisClientCreateOptions): ioRedis | Cluster;
|
|
23
24
|
toValidPrefix(prefix: string): string;
|
|
24
25
|
private createRegularClient;
|
|
25
26
|
private createClusterClient;
|
|
26
27
|
private getOptions;
|
|
27
28
|
private getClusterOptions;
|
|
28
|
-
private
|
|
29
|
+
private makeRetryStrategy;
|
|
29
30
|
private clusterNodes;
|
|
30
31
|
emit<Event extends keyof RedisEventMap>(event: Event, ...args: Array<RedisEventMap[Event]>): boolean;
|
|
31
32
|
private registerListeners;
|
|
@@ -39,16 +39,18 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
|
|
|
39
39
|
isConnected() {
|
|
40
40
|
return !this.lostConnection;
|
|
41
41
|
}
|
|
42
|
-
createClient(
|
|
42
|
+
createClient(options) {
|
|
43
|
+
const { retryStrategy, resetRetryState } = this.makeRetryStrategy();
|
|
43
44
|
const client = this.clusterNodes().length > 0
|
|
44
|
-
? this.createClusterClient(
|
|
45
|
-
: this.createRegularClient(
|
|
45
|
+
? this.createClusterClient(options, retryStrategy)
|
|
46
|
+
: this.createRegularClient(options, retryStrategy);
|
|
46
47
|
client.on('error', (error) => {
|
|
47
48
|
if ('code' in error && error.code === 'ECONNREFUSED')
|
|
48
49
|
return;
|
|
49
50
|
this.logger.error(`[Redis client] ${error.message}`, { error });
|
|
50
51
|
});
|
|
51
52
|
client.on('ready', () => {
|
|
53
|
+
resetRetryState();
|
|
52
54
|
if (this.lostConnection) {
|
|
53
55
|
this.emit('connection-recovered');
|
|
54
56
|
this.lostConnection = false;
|
|
@@ -66,8 +68,8 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
|
|
|
66
68
|
}
|
|
67
69
|
return prefix;
|
|
68
70
|
}
|
|
69
|
-
createRegularClient({ type, extraOptions,
|
|
70
|
-
const options = this.getOptions({ extraOptions });
|
|
71
|
+
createRegularClient({ type, extraOptions }, retryStrategy) {
|
|
72
|
+
const options = this.getOptions({ extraOptions, retryStrategy });
|
|
71
73
|
const { host, port } = this.globalConfig.queue.bull.redis;
|
|
72
74
|
options.host = host;
|
|
73
75
|
options.port = port;
|
|
@@ -75,15 +77,15 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
|
|
|
75
77
|
this.logger.debug(`Started Redis client ${type}`, { type, host, port });
|
|
76
78
|
return client;
|
|
77
79
|
}
|
|
78
|
-
createClusterClient({ type, extraOptions,
|
|
79
|
-
const options = this.getOptions({ extraOptions });
|
|
80
|
+
createClusterClient({ type, extraOptions }, retryStrategy) {
|
|
81
|
+
const options = this.getOptions({ extraOptions, retryStrategy });
|
|
80
82
|
const clusterNodes = this.clusterNodes();
|
|
81
|
-
const clusterOptions = this.getClusterOptions(options,
|
|
83
|
+
const clusterOptions = this.getClusterOptions(options, retryStrategy);
|
|
82
84
|
const clusterClient = new ioredis_1.default.Cluster(clusterNodes, clusterOptions);
|
|
83
85
|
this.logger.debug(`Started Redis cluster client ${type}`, { type, clusterNodes });
|
|
84
86
|
return clusterClient;
|
|
85
87
|
}
|
|
86
|
-
getOptions({ extraOptions }) {
|
|
88
|
+
getOptions({ extraOptions, retryStrategy, }) {
|
|
87
89
|
const { username, password, db, tls, dualStack, keepAlive, keepAliveDelay, keepAliveInterval, reconnectOnFailover, } = this.globalConfig.queue.bull.redis;
|
|
88
90
|
const options = {
|
|
89
91
|
username,
|
|
@@ -91,7 +93,7 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
|
|
|
91
93
|
db,
|
|
92
94
|
enableReadyCheck: false,
|
|
93
95
|
maxRetriesPerRequest: null,
|
|
94
|
-
retryStrategy
|
|
96
|
+
retryStrategy,
|
|
95
97
|
...extraOptions,
|
|
96
98
|
};
|
|
97
99
|
if (dualStack)
|
|
@@ -127,10 +129,10 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
|
|
|
127
129
|
}
|
|
128
130
|
return clusterOptions;
|
|
129
131
|
}
|
|
130
|
-
|
|
132
|
+
makeRetryStrategy() {
|
|
131
133
|
let lastAttemptTs = 0;
|
|
132
134
|
let cumulativeTimeout = 0;
|
|
133
|
-
|
|
135
|
+
const retryStrategy = () => {
|
|
134
136
|
const nowTs = Date.now();
|
|
135
137
|
if (nowTs - lastAttemptTs > this.config.resetLength) {
|
|
136
138
|
cumulativeTimeout = 0;
|
|
@@ -150,6 +152,11 @@ let RedisClientService = class RedisClientService extends typed_emitter_1.TypedE
|
|
|
150
152
|
this.emit('connection-lost', cumulativeTimeout);
|
|
151
153
|
return this.config.retryInterval;
|
|
152
154
|
};
|
|
155
|
+
const resetRetryState = () => {
|
|
156
|
+
lastAttemptTs = 0;
|
|
157
|
+
cumulativeTimeout = 0;
|
|
158
|
+
};
|
|
159
|
+
return { retryStrategy, resetRetryState };
|
|
153
160
|
}
|
|
154
161
|
clusterNodes() {
|
|
155
162
|
return this.globalConfig.queue.bull.redis.clusterNodes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-client.service.js","sourceRoot":"","sources":["../../src/services/redis-client.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA2C;AAC3C,gDAA2C;AAC3C,gCAAkC;AAClC,sDAA8B;AAG9B,mDAA+C;
|
|
1
|
+
{"version":3,"file":"redis-client.service.js","sourceRoot":"","sources":["../../src/services/redis-client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,6 @@ const di_1 = require("@n8n/di");
|
|
|
17
17
|
const permissions_1 = require("@n8n/permissions");
|
|
18
18
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
19
19
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
20
|
-
const forbidden_error_1 = require("../errors/response-errors/forbidden.error");
|
|
21
20
|
const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
|
|
22
21
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
23
22
|
const event_service_1 = require("../events/event.service");
|
|
@@ -63,14 +62,6 @@ let UserService = class UserService {
|
|
|
63
62
|
}
|
|
64
63
|
return;
|
|
65
64
|
}
|
|
66
|
-
const isInstanceAdmin = ['global:owner', 'global:admin'].includes(user.role.slug);
|
|
67
|
-
if (isInstanceAdmin) {
|
|
68
|
-
return;
|
|
69
|
-
}
|
|
70
|
-
const hasProjectUpdateScope = (await this.projectService.getProjectIdsWithScope(user, ['project:update'])).length > 0;
|
|
71
|
-
if (!hasProjectUpdateScope) {
|
|
72
|
-
throw new forbidden_error_1.ForbiddenError('Listing all users is limited to instance administrators and project admins. Filter by project to list project members.');
|
|
73
|
-
}
|
|
74
65
|
}
|
|
75
66
|
async updateSettings(userId, newSettings) {
|
|
76
67
|
const user = await this.userRepository.findOneOrFail({ where: { id: userId } });
|