n8n 1.67.1 → 1.69.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/auth/auth.service.js +2 -0
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/start.js +1 -1
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/worker.js +4 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +0 -11
- package/dist/config/index.js +1 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/schema.d.ts +0 -36
- package/dist/config/schema.js +0 -36
- package/dist/config/schema.js.map +1 -1
- package/dist/constants.d.ts +1 -6
- package/dist/constants.js +4 -9
- package/dist/constants.js.map +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.d.ts +13 -6
- package/dist/controllers/oauth/abstract-oauth.controller.js +29 -5
- package/dist/controllers/oauth/abstract-oauth.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth1-credential.controller.js +13 -47
- package/dist/controllers/oauth/oauth1-credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +5 -31
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/databases/entities/execution-entity.js.map +1 -1
- package/dist/databases/entities/index.d.ts +1 -1
- package/dist/databases/entities/index.js +2 -2
- package/dist/databases/entities/index.js.map +1 -1
- package/dist/databases/entities/{test-definition.d.ts → test-definition.ee.d.ts} +4 -3
- package/dist/databases/entities/{test-definition.js → test-definition.ee.js} +14 -9
- package/dist/databases/entities/test-definition.ee.js.map +1 -0
- package/dist/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.d.ts +5 -0
- package/dist/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.js +13 -0
- package/dist/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.js.map +1 -0
- package/dist/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.js +6 -5
- package/dist/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.js.map +1 -1
- package/dist/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.d.ts +4 -0
- package/dist/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.js +14 -0
- package/dist/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +4 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.d.ts +4 -0
- package/dist/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.js +20 -0
- package/dist/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.js.map +1 -0
- package/dist/databases/migrations/postgresdb/index.js +4 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.d.ts +4 -0
- package/dist/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.js +12 -0
- package/dist/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.js.map +1 -0
- package/dist/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.d.ts +5 -0
- package/dist/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.js +20 -0
- package/dist/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.js.map +1 -0
- package/dist/databases/migrations/sqlite/index.js +4 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/databases/repositories/execution.repository.js +5 -5
- package/dist/databases/repositories/execution.repository.js.map +1 -1
- package/dist/databases/repositories/license-metrics.repository.js +2 -8
- package/dist/databases/repositories/license-metrics.repository.js.map +1 -1
- package/dist/databases/repositories/test-definition.repository.ee.d.ts +17 -0
- package/dist/databases/repositories/test-definition.repository.ee.js +66 -0
- package/dist/databases/repositories/test-definition.repository.ee.js.map +1 -0
- package/dist/evaluation/test-definition.schema.d.ts +36 -0
- package/dist/evaluation/test-definition.schema.js +22 -0
- package/dist/evaluation/test-definition.schema.js.map +1 -0
- package/dist/evaluation/test-definition.service.ee.d.ts +42 -0
- package/dist/evaluation/test-definition.service.ee.js +99 -0
- package/dist/evaluation/test-definition.service.ee.js.map +1 -0
- package/dist/evaluation/test-definitions.controller.ee.d.ts +22 -0
- package/dist/evaluation/test-definitions.controller.ee.js +123 -0
- package/dist/evaluation/test-definitions.controller.ee.js.map +1 -0
- package/dist/evaluation/test-definitions.types.ee.d.ts +25 -0
- package/dist/evaluation/test-definitions.types.ee.js +3 -0
- package/dist/evaluation/test-definitions.types.ee.js.map +1 -0
- package/dist/events/relays/telemetry.event-relay.js +3 -3
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle-hooks/save-execution-progress.js +1 -1
- package/dist/execution-lifecycle-hooks/save-execution-progress.js.map +1 -1
- package/dist/execution-lifecycle-hooks/to-save-settings.d.ts +2 -2
- package/dist/execution-lifecycle-hooks/to-save-settings.js +7 -12
- package/dist/execution-lifecycle-hooks/to-save-settings.js.map +1 -1
- package/dist/generic-helpers.d.ts +1 -1
- package/dist/interfaces.d.ts +1 -7
- package/dist/interfaces.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +9 -1
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/posthog/index.js +3 -7
- package/dist/posthog/index.js.map +1 -1
- package/dist/requests.d.ts +2 -2
- package/dist/response-helper.js +5 -0
- package/dist/response-helper.js.map +1 -1
- package/dist/runners/default-task-runner-disconnect-analyzer.d.ts +2 -3
- package/dist/runners/default-task-runner-disconnect-analyzer.js +11 -2
- package/dist/runners/default-task-runner-disconnect-analyzer.js.map +1 -1
- package/dist/runners/errors/missing-auth-token.error.d.ts +3 -0
- package/dist/runners/errors/missing-auth-token.error.js +10 -0
- package/dist/runners/errors/missing-auth-token.error.js.map +1 -0
- package/dist/runners/errors/task-runner-failed-heartbeat.error.d.ts +5 -0
- package/dist/runners/errors/task-runner-failed-heartbeat.error.js +25 -0
- package/dist/runners/errors/task-runner-failed-heartbeat.error.js.map +1 -0
- package/dist/runners/errors/task-runner-oom-error.d.ts +1 -0
- package/dist/runners/errors/task-runner-oom-error.js +6 -5
- package/dist/runners/errors/task-runner-oom-error.js.map +1 -1
- package/dist/runners/errors/task-runner-timeout.error.d.ts +5 -0
- package/dist/runners/errors/task-runner-timeout.error.js +25 -0
- package/dist/runners/errors/task-runner-timeout.error.js.map +1 -0
- package/dist/runners/errors.d.ts +3 -0
- package/dist/runners/errors.js +7 -1
- package/dist/runners/errors.js.map +1 -1
- package/dist/runners/internal-task-runner-disconnect-analyzer.d.ts +2 -2
- package/dist/runners/internal-task-runner-disconnect-analyzer.js +3 -3
- package/dist/runners/internal-task-runner-disconnect-analyzer.js.map +1 -1
- package/dist/runners/runner-lifecycle-events.d.ts +8 -0
- package/dist/runners/runner-lifecycle-events.js +18 -0
- package/dist/runners/runner-lifecycle-events.js.map +1 -0
- package/dist/runners/runner-types.d.ts +7 -7
- package/dist/runners/runner-ws-server.d.ts +22 -3
- package/dist/runners/runner-ws-server.js +58 -6
- package/dist/runners/runner-ws-server.js.map +1 -1
- package/dist/runners/task-broker.service.d.ts +10 -3
- package/dist/runners/task-broker.service.js +56 -8
- package/dist/runners/task-broker.service.js.map +1 -1
- package/dist/runners/task-managers/data-request-response-builder.d.ts +3 -15
- package/dist/runners/task-managers/data-request-response-builder.js +30 -110
- package/dist/runners/task-managers/data-request-response-builder.js.map +1 -1
- package/dist/runners/task-managers/data-request-response-stripper.d.ts +15 -0
- package/dist/runners/task-managers/data-request-response-stripper.js +85 -0
- package/dist/runners/task-managers/data-request-response-stripper.js.map +1 -0
- package/dist/runners/task-managers/task-manager.d.ts +2 -0
- package/dist/runners/task-managers/task-manager.js +37 -4
- package/dist/runners/task-managers/task-manager.js.map +1 -1
- package/dist/runners/task-runner-module.js +26 -11
- package/dist/runners/task-runner-module.js.map +1 -1
- package/dist/runners/task-runner-process.d.ts +4 -4
- package/dist/runners/task-runner-process.js +27 -41
- package/dist/runners/task-runner-process.js.map +1 -1
- package/dist/runners/task-runner-server.d.ts +2 -2
- package/dist/runners/task-runner-server.js +16 -16
- package/dist/runners/task-runner-server.js.map +1 -1
- package/dist/scaling/multi-main-setup.ee.js +1 -1
- package/dist/scaling/multi-main-setup.ee.js.map +1 -1
- package/dist/security-audit/risk-reporters/instance-risk-reporter.js +1 -1
- package/dist/security-audit/risk-reporters/instance-risk-reporter.js.map +1 -1
- package/dist/server.d.ts +1 -0
- package/dist/server.js +1 -0
- package/dist/server.js.map +1 -1
- package/dist/services/cache/cache.service.js +1 -1
- package/dist/services/cache/cache.service.js.map +1 -1
- package/dist/services/community-packages.service.js +1 -0
- package/dist/services/community-packages.service.js.map +1 -1
- package/dist/services/frontend.service.js +10 -9
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/ownership.service.js +1 -3
- package/dist/services/ownership.service.js.map +1 -1
- package/dist/services/pruning/pruning.service.d.ts +3 -3
- package/dist/services/pruning/pruning.service.js +6 -6
- package/dist/services/pruning/pruning.service.js.map +1 -1
- package/dist/sso/saml/errors/invalid-saml-metadata.error.d.ts +4 -0
- package/dist/sso/saml/errors/invalid-saml-metadata.error.js +11 -0
- package/dist/sso/saml/errors/invalid-saml-metadata.error.js.map +1 -0
- package/dist/sso/saml/saml-validator.js +18 -49
- package/dist/sso/saml/saml-validator.js.map +1 -1
- package/dist/sso/saml/saml.service.ee.d.ts +1 -0
- package/dist/sso/saml/saml.service.ee.js +22 -6
- package/dist/sso/saml/saml.service.ee.js.map +1 -1
- package/dist/sso/saml/schema/metadata-exchange.xsd.d.ts +2 -0
- package/dist/sso/saml/schema/metadata-exchange.xsd.js +119 -0
- package/dist/sso/saml/schema/metadata-exchange.xsd.js.map +1 -0
- package/dist/sso/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.d.ts +2 -0
- package/dist/sso/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.js +202 -0
- package/dist/sso/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.js.map +1 -0
- package/dist/sso/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.d.ts +2 -0
- package/dist/sso/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.js +115 -0
- package/dist/sso/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.js.map +1 -0
- package/dist/sso/saml/schema/saml-schema-assertion-2.0.xsd.d.ts +2 -1
- package/dist/sso/saml/schema/saml-schema-assertion-2.0.xsd.js +6 -3
- package/dist/sso/saml/schema/saml-schema-assertion-2.0.xsd.js.map +1 -1
- package/dist/sso/saml/schema/saml-schema-metadata-2.0.xsd.d.ts +2 -1
- package/dist/sso/saml/schema/saml-schema-metadata-2.0.xsd.js +8 -3
- package/dist/sso/saml/schema/saml-schema-metadata-2.0.xsd.js.map +1 -1
- package/dist/sso/saml/schema/saml-schema-protocol-2.0.xsd.d.ts +2 -1
- package/dist/sso/saml/schema/saml-schema-protocol-2.0.xsd.js +6 -3
- package/dist/sso/saml/schema/saml-schema-protocol-2.0.xsd.js.map +1 -1
- package/dist/sso/saml/schema/ws-addr.xsd.d.ts +2 -0
- package/dist/sso/saml/schema/ws-addr.xsd.js +144 -0
- package/dist/sso/saml/schema/ws-addr.xsd.js.map +1 -0
- package/dist/sso/saml/schema/ws-authorization.xsd.d.ts +2 -0
- package/dist/sso/saml/schema/ws-authorization.xsd.js +152 -0
- package/dist/sso/saml/schema/ws-authorization.xsd.js.map +1 -0
- package/dist/sso/saml/schema/ws-federation.xsd.d.ts +2 -0
- package/dist/sso/saml/schema/ws-federation.xsd.js +477 -0
- package/dist/sso/saml/schema/ws-federation.xsd.js.map +1 -0
- package/dist/sso/saml/schema/ws-securitypolicy-1.2.xsd.d.ts +2 -0
- package/dist/sso/saml/schema/ws-securitypolicy-1.2.xsd.js +1212 -0
- package/dist/sso/saml/schema/ws-securitypolicy-1.2.xsd.js.map +1 -0
- package/dist/sso/saml/schema/xenc-schema.xsd.d.ts +2 -1
- package/dist/sso/saml/schema/xenc-schema.xsd.js +6 -3
- package/dist/sso/saml/schema/xenc-schema.xsd.js.map +1 -1
- package/dist/sso/saml/schema/xml.xsd.d.ts +2 -1
- package/dist/sso/saml/schema/xml.xsd.js +6 -3
- package/dist/sso/saml/schema/xml.xsd.js.map +1 -1
- package/dist/sso/saml/schema/xmldsig-core-schema.xsd.d.ts +2 -1
- package/dist/sso/saml/schema/xmldsig-core-schema.xsd.js +6 -3
- package/dist/sso/saml/schema/xmldsig-core-schema.xsd.js.map +1 -1
- package/dist/subworkflows/subworkflow-policy-checker.service.js +1 -3
- package/dist/subworkflows/subworkflow-policy-checker.service.js.map +1 -1
- package/dist/telemetry/index.js +2 -4
- package/dist/telemetry/index.js.map +1 -1
- package/dist/webhooks/waiting-forms.d.ts +3 -0
- package/dist/webhooks/waiting-forms.js +24 -20
- package/dist/webhooks/waiting-forms.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.js +1 -1
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +3 -0
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/workflow-execute-additional-data.d.ts +3 -4
- package/dist/workflow-execute-additional-data.js +36 -44
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history-manager.ee.js +2 -2
- package/dist/workflows/workflow-history/workflow-history-manager.ee.js.map +1 -1
- package/package.json +11 -10
- package/templates/form-trigger-409.handlebars +74 -0
- package/templates/form-trigger.handlebars +1 -8
- package/dist/databases/entities/test-definition.js.map +0 -1
- package/dist/workflows/workflow-history/constants.d.ts +0 -1
- package/dist/workflows/workflow-history/constants.js +0 -6
- package/dist/workflows/workflow-history/constants.js.map +0 -1
|
@@ -1,19 +1,7 @@
|
|
|
1
|
-
import type { DataRequestResponse,
|
|
1
|
+
import type { DataRequestResponse, TaskData } from '@n8n/task-runner';
|
|
2
2
|
export declare class DataRequestResponseBuilder {
|
|
3
|
-
|
|
4
|
-
private readonly requestParams;
|
|
5
|
-
private requestedNodeNames;
|
|
6
|
-
constructor(taskData: TaskData, requestParams: BrokerMessage.ToRequester.TaskDataRequest['requestParams']);
|
|
7
|
-
build(): DataRequestResponse;
|
|
3
|
+
buildFromTaskData(taskData: TaskData): DataRequestResponse;
|
|
8
4
|
private buildAdditionalData;
|
|
9
|
-
private buildExecuteData;
|
|
10
|
-
private buildRunExecutionData;
|
|
11
|
-
private buildRunData;
|
|
12
|
-
private buildPinData;
|
|
13
|
-
private buildEnvProviderState;
|
|
14
|
-
private buildInputData;
|
|
15
|
-
private buildConnectionInputData;
|
|
16
5
|
private buildWorkflow;
|
|
17
|
-
private
|
|
18
|
-
private determinePrevNodeName;
|
|
6
|
+
private buildRunExecutionData;
|
|
19
7
|
}
|
|
@@ -2,34 +2,23 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DataRequestResponseBuilder = void 0;
|
|
4
4
|
class DataRequestResponseBuilder {
|
|
5
|
-
|
|
6
|
-
this.taskData = taskData;
|
|
7
|
-
this.requestParams = requestParams;
|
|
8
|
-
this.requestedNodeNames = new Set();
|
|
9
|
-
this.requestedNodeNames = new Set(requestParams.dataOfNodes);
|
|
10
|
-
if (this.requestParams.prevNode && this.requestParams.dataOfNodes !== 'all') {
|
|
11
|
-
this.requestedNodeNames.add(this.determinePrevNodeName());
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
build() {
|
|
15
|
-
const { taskData: td } = this;
|
|
5
|
+
buildFromTaskData(taskData) {
|
|
16
6
|
return {
|
|
17
|
-
workflow: this.buildWorkflow(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
itemIndex:
|
|
21
|
-
activeNodeName:
|
|
22
|
-
contextNodeName:
|
|
23
|
-
defaultReturnRunIndex:
|
|
24
|
-
mode:
|
|
25
|
-
envProviderState:
|
|
26
|
-
node:
|
|
27
|
-
runExecutionData: this.buildRunExecutionData(
|
|
28
|
-
runIndex:
|
|
29
|
-
selfData:
|
|
30
|
-
siblingParameters:
|
|
31
|
-
|
|
32
|
-
additionalData: this.buildAdditionalData(td.additionalData),
|
|
7
|
+
workflow: this.buildWorkflow(taskData.workflow),
|
|
8
|
+
inputData: taskData.inputData,
|
|
9
|
+
connectionInputSource: taskData.executeData?.source ?? null,
|
|
10
|
+
itemIndex: taskData.itemIndex,
|
|
11
|
+
activeNodeName: taskData.activeNodeName,
|
|
12
|
+
contextNodeName: taskData.contextNodeName,
|
|
13
|
+
defaultReturnRunIndex: taskData.defaultReturnRunIndex,
|
|
14
|
+
mode: taskData.mode,
|
|
15
|
+
envProviderState: taskData.envProviderState,
|
|
16
|
+
node: taskData.node,
|
|
17
|
+
runExecutionData: this.buildRunExecutionData(taskData.runExecutionData),
|
|
18
|
+
runIndex: taskData.runIndex,
|
|
19
|
+
selfData: taskData.selfData,
|
|
20
|
+
siblingParameters: taskData.siblingParameters,
|
|
21
|
+
additionalData: this.buildAdditionalData(taskData.additionalData),
|
|
33
22
|
};
|
|
34
23
|
}
|
|
35
24
|
buildAdditionalData(additionalData) {
|
|
@@ -48,68 +37,6 @@ class DataRequestResponseBuilder {
|
|
|
48
37
|
userId: additionalData.userId,
|
|
49
38
|
};
|
|
50
39
|
}
|
|
51
|
-
buildExecuteData(executeData) {
|
|
52
|
-
if (executeData === undefined) {
|
|
53
|
-
return undefined;
|
|
54
|
-
}
|
|
55
|
-
return {
|
|
56
|
-
node: executeData.node,
|
|
57
|
-
data: this.requestParams.input ? executeData.data : {},
|
|
58
|
-
source: executeData.source,
|
|
59
|
-
};
|
|
60
|
-
}
|
|
61
|
-
buildRunExecutionData(runExecutionData) {
|
|
62
|
-
if (this.requestParams.dataOfNodes === 'all') {
|
|
63
|
-
return runExecutionData;
|
|
64
|
-
}
|
|
65
|
-
return {
|
|
66
|
-
startData: runExecutionData.startData,
|
|
67
|
-
resultData: {
|
|
68
|
-
error: runExecutionData.resultData.error,
|
|
69
|
-
lastNodeExecuted: runExecutionData.resultData.lastNodeExecuted,
|
|
70
|
-
metadata: runExecutionData.resultData.metadata,
|
|
71
|
-
runData: this.buildRunData(runExecutionData.resultData.runData),
|
|
72
|
-
pinData: this.buildPinData(runExecutionData.resultData.pinData),
|
|
73
|
-
},
|
|
74
|
-
executionData: runExecutionData.executionData
|
|
75
|
-
? {
|
|
76
|
-
contextData: runExecutionData.executionData?.contextData,
|
|
77
|
-
nodeExecutionStack: runExecutionData.executionData.nodeExecutionStack,
|
|
78
|
-
metadata: runExecutionData.executionData.metadata,
|
|
79
|
-
waitingExecution: runExecutionData.executionData.waitingExecution,
|
|
80
|
-
waitingExecutionSource: runExecutionData.executionData.waitingExecutionSource,
|
|
81
|
-
}
|
|
82
|
-
: undefined,
|
|
83
|
-
};
|
|
84
|
-
}
|
|
85
|
-
buildRunData(runData) {
|
|
86
|
-
return this.filterObjectByNodeNames(runData);
|
|
87
|
-
}
|
|
88
|
-
buildPinData(pinData) {
|
|
89
|
-
return pinData ? this.filterObjectByNodeNames(pinData) : undefined;
|
|
90
|
-
}
|
|
91
|
-
buildEnvProviderState(envProviderState) {
|
|
92
|
-
if (this.requestParams.env) {
|
|
93
|
-
return envProviderState;
|
|
94
|
-
}
|
|
95
|
-
return {
|
|
96
|
-
env: {},
|
|
97
|
-
isEnvAccessBlocked: envProviderState.isEnvAccessBlocked,
|
|
98
|
-
isProcessAvailable: envProviderState.isProcessAvailable,
|
|
99
|
-
};
|
|
100
|
-
}
|
|
101
|
-
buildInputData(inputData) {
|
|
102
|
-
if (this.requestParams.input) {
|
|
103
|
-
return inputData;
|
|
104
|
-
}
|
|
105
|
-
return {};
|
|
106
|
-
}
|
|
107
|
-
buildConnectionInputData(connectionInputData) {
|
|
108
|
-
if (this.requestParams.input) {
|
|
109
|
-
return connectionInputData;
|
|
110
|
-
}
|
|
111
|
-
return [];
|
|
112
|
-
}
|
|
113
40
|
buildWorkflow(workflow) {
|
|
114
41
|
return {
|
|
115
42
|
id: workflow.id,
|
|
@@ -122,27 +49,20 @@ class DataRequestResponseBuilder {
|
|
|
122
49
|
staticData: workflow.staticData,
|
|
123
50
|
};
|
|
124
51
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
}
|
|
140
|
-
determinePrevNodeName() {
|
|
141
|
-
const sourceData = this.taskData.executeData?.source?.main?.[0];
|
|
142
|
-
if (!sourceData) {
|
|
143
|
-
return '';
|
|
144
|
-
}
|
|
145
|
-
return sourceData.previousNode;
|
|
52
|
+
buildRunExecutionData(runExecutionData) {
|
|
53
|
+
return {
|
|
54
|
+
startData: runExecutionData.startData,
|
|
55
|
+
resultData: runExecutionData.resultData,
|
|
56
|
+
executionData: runExecutionData.executionData
|
|
57
|
+
? {
|
|
58
|
+
contextData: runExecutionData.executionData.contextData,
|
|
59
|
+
metadata: runExecutionData.executionData.metadata,
|
|
60
|
+
nodeExecutionStack: [],
|
|
61
|
+
waitingExecution: {},
|
|
62
|
+
waitingExecutionSource: null,
|
|
63
|
+
}
|
|
64
|
+
: undefined,
|
|
65
|
+
};
|
|
146
66
|
}
|
|
147
67
|
}
|
|
148
68
|
exports.DataRequestResponseBuilder = DataRequestResponseBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-request-response-builder.js","sourceRoot":"","sources":["../../../src/runners/task-managers/data-request-response-builder.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"data-request-response-builder.js","sourceRoot":"","sources":["../../../src/runners/task-managers/data-request-response-builder.ts"],"names":[],"mappings":";;;AAcA,MAAa,0BAA0B;IACtC,iBAAiB,CAAC,QAAkB;QACnC,OAAO;YACN,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC/C,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,IAAI,IAAI;YAC3D,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB;YACrD,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;YAC3C,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,gBAAgB,EAAE,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACvE,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;YAC7C,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC;SACjE,CAAC;IACH,CAAC;IAEO,mBAAmB,CAC1B,cAA8C;QAE9C,OAAO;YACN,kBAAkB,EAAE,cAAc,CAAC,kBAAkB;YACrD,eAAe,EAAE,cAAc,CAAC,eAAe;YAC/C,UAAU,EAAE,cAAc,CAAC,UAAU;YACrC,SAAS,EAAE,cAAc,CAAC,SAAS;YACnC,cAAc,EAAE,cAAc,CAAC,cAAc;YAC7C,kBAAkB,EAAE,cAAc,CAAC,kBAAkB;YACrD,qBAAqB,EAAE,cAAc,CAAC,qBAAqB;YAC3D,qBAAqB,EAAE,cAAc,CAAC,qBAAqB;YAC3D,WAAW,EAAE,cAAc,CAAC,WAAW;YACvC,yBAAyB,EAAE,cAAc,CAAC,yBAAyB;YACnE,kBAAkB,EAAE,cAAc,CAAC,kBAAkB;YACrD,MAAM,EAAE,cAAc,CAAC,MAAM;SAC7B,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,QAAkB;QACvC,OAAO;YACN,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,WAAW,EAAE,QAAQ,CAAC,uBAAuB;YAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YACpC,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;SAC/B,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,gBAAmC;QAChE,OAAO;YACN,SAAS,EAAE,gBAAgB,CAAC,SAAS;YACrC,UAAU,EAAE,gBAAgB,CAAC,UAAU;YACvC,aAAa,EAAE,gBAAgB,CAAC,aAAa;gBAC5C,CAAC,CAAC;oBACA,WAAW,EAAE,gBAAgB,CAAC,aAAa,CAAC,WAAW;oBACvD,QAAQ,EAAE,gBAAgB,CAAC,aAAa,CAAC,QAAQ;oBAIjD,kBAAkB,EAAE,EAAE;oBACtB,gBAAgB,EAAE,EAAE;oBACpB,sBAAsB,EAAE,IAAI;iBAC5B;gBACF,CAAC,CAAC,SAAS;SACZ,CAAC;IACH,CAAC;CACD;AAvED,gEAuEC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { DataRequestResponse, BrokerMessage } from '@n8n/task-runner';
|
|
2
|
+
export declare class DataRequestResponseStripper {
|
|
3
|
+
private readonly dataResponse;
|
|
4
|
+
private readonly stripParams;
|
|
5
|
+
private requestedNodeNames;
|
|
6
|
+
constructor(dataResponse: DataRequestResponse, stripParams: BrokerMessage.ToRequester.TaskDataRequest['requestParams']);
|
|
7
|
+
strip(): DataRequestResponse;
|
|
8
|
+
private stripRunExecutionData;
|
|
9
|
+
private stripRunData;
|
|
10
|
+
private stripPinData;
|
|
11
|
+
private stripEnvProviderState;
|
|
12
|
+
private stripInputData;
|
|
13
|
+
private filterObjectByNodeNames;
|
|
14
|
+
private determinePrevNodeName;
|
|
15
|
+
}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DataRequestResponseStripper = void 0;
|
|
4
|
+
class DataRequestResponseStripper {
|
|
5
|
+
constructor(dataResponse, stripParams) {
|
|
6
|
+
this.dataResponse = dataResponse;
|
|
7
|
+
this.stripParams = stripParams;
|
|
8
|
+
this.requestedNodeNames = new Set();
|
|
9
|
+
this.requestedNodeNames = new Set(stripParams.dataOfNodes);
|
|
10
|
+
if (this.stripParams.prevNode && this.stripParams.dataOfNodes !== 'all') {
|
|
11
|
+
this.requestedNodeNames.add(this.determinePrevNodeName());
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
strip() {
|
|
15
|
+
const { dataResponse: dr } = this;
|
|
16
|
+
return {
|
|
17
|
+
...dr,
|
|
18
|
+
inputData: this.stripInputData(dr.inputData),
|
|
19
|
+
envProviderState: this.stripEnvProviderState(dr.envProviderState),
|
|
20
|
+
runExecutionData: this.stripRunExecutionData(dr.runExecutionData),
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
stripRunExecutionData(runExecutionData) {
|
|
24
|
+
if (this.stripParams.dataOfNodes === 'all') {
|
|
25
|
+
return runExecutionData;
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
startData: runExecutionData.startData,
|
|
29
|
+
resultData: {
|
|
30
|
+
error: runExecutionData.resultData.error,
|
|
31
|
+
lastNodeExecuted: runExecutionData.resultData.lastNodeExecuted,
|
|
32
|
+
metadata: runExecutionData.resultData.metadata,
|
|
33
|
+
runData: this.stripRunData(runExecutionData.resultData.runData),
|
|
34
|
+
pinData: this.stripPinData(runExecutionData.resultData.pinData),
|
|
35
|
+
},
|
|
36
|
+
executionData: runExecutionData.executionData,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
stripRunData(runData) {
|
|
40
|
+
return this.filterObjectByNodeNames(runData);
|
|
41
|
+
}
|
|
42
|
+
stripPinData(pinData) {
|
|
43
|
+
return pinData ? this.filterObjectByNodeNames(pinData) : undefined;
|
|
44
|
+
}
|
|
45
|
+
stripEnvProviderState(envProviderState) {
|
|
46
|
+
if (this.stripParams.env) {
|
|
47
|
+
return envProviderState;
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
env: {},
|
|
51
|
+
isEnvAccessBlocked: envProviderState.isEnvAccessBlocked,
|
|
52
|
+
isProcessAvailable: envProviderState.isProcessAvailable,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
stripInputData(inputData) {
|
|
56
|
+
if (this.stripParams.input) {
|
|
57
|
+
return inputData;
|
|
58
|
+
}
|
|
59
|
+
return {};
|
|
60
|
+
}
|
|
61
|
+
filterObjectByNodeNames(obj) {
|
|
62
|
+
if (this.stripParams.dataOfNodes === 'all') {
|
|
63
|
+
return obj;
|
|
64
|
+
}
|
|
65
|
+
const filteredObj = {};
|
|
66
|
+
for (const nodeName in obj) {
|
|
67
|
+
if (!Object.prototype.hasOwnProperty.call(obj, nodeName)) {
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
if (this.requestedNodeNames.has(nodeName)) {
|
|
71
|
+
filteredObj[nodeName] = obj[nodeName];
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return filteredObj;
|
|
75
|
+
}
|
|
76
|
+
determinePrevNodeName() {
|
|
77
|
+
const sourceData = this.dataResponse.connectionInputSource?.main?.[0];
|
|
78
|
+
if (!sourceData) {
|
|
79
|
+
return '';
|
|
80
|
+
}
|
|
81
|
+
return sourceData.previousNode;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
exports.DataRequestResponseStripper = DataRequestResponseStripper;
|
|
85
|
+
//# sourceMappingURL=data-request-response-stripper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"data-request-response-stripper.js","sourceRoot":"","sources":["../../../src/runners/task-managers/data-request-response-stripper.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,8 @@ export declare abstract class TaskManager {
|
|
|
28
28
|
}>;
|
|
29
29
|
pendingRequests: Map<string, TaskRequest>;
|
|
30
30
|
tasks: Map<string, Task>;
|
|
31
|
+
private readonly runnerConfig;
|
|
32
|
+
private readonly dataResponseBuilder;
|
|
31
33
|
constructor(nodeTypes: NodeTypes);
|
|
32
34
|
startTask<TData, TError>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, envProviderState: EnvProviderState, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<Result<TData, TError>>;
|
|
33
35
|
sendMessage(_message: RequesterMessage.ToBroker.All): void;
|
|
@@ -1,21 +1,47 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
2
18
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
19
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
20
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
21
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
23
|
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
+
if (mod && mod.__esModule) return mod;
|
|
26
|
+
var result = {};
|
|
27
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
+
__setModuleDefault(result, mod);
|
|
29
|
+
return result;
|
|
30
|
+
};
|
|
8
31
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
32
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
33
|
};
|
|
11
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
35
|
exports.TaskManager = void 0;
|
|
36
|
+
const config_1 = require("@n8n/config");
|
|
13
37
|
const task_runner_1 = require("@n8n/task-runner");
|
|
14
38
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
15
39
|
const nanoid_1 = require("nanoid");
|
|
16
|
-
const
|
|
40
|
+
const a = __importStar(require("node:assert/strict"));
|
|
41
|
+
const typedi_1 = __importStar(require("typedi"));
|
|
17
42
|
const node_types_1 = require("../../node-types");
|
|
18
43
|
const data_request_response_builder_1 = require("./data-request-response-builder");
|
|
44
|
+
const data_request_response_stripper_1 = require("./data-request-response-stripper");
|
|
19
45
|
let TaskManager = class TaskManager {
|
|
20
46
|
constructor(nodeTypes) {
|
|
21
47
|
this.nodeTypes = nodeTypes;
|
|
@@ -23,6 +49,8 @@ let TaskManager = class TaskManager {
|
|
|
23
49
|
this.taskAcceptRejects = new Map();
|
|
24
50
|
this.pendingRequests = new Map();
|
|
25
51
|
this.tasks = new Map();
|
|
52
|
+
this.runnerConfig = typedi_1.default.get(config_1.TaskRunnersConfig);
|
|
53
|
+
this.dataResponseBuilder = new data_request_response_builder_1.DataRequestResponseBuilder();
|
|
26
54
|
}
|
|
27
55
|
async startTask(additionalData, taskType, settings, executeFunctions, inputData, node, workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, envProviderState, executeData, defaultReturnRunIndex = -1, selfData = {}, contextNodeName = activeNodeName) {
|
|
28
56
|
const data = {
|
|
@@ -157,13 +185,18 @@ let TaskManager = class TaskManager {
|
|
|
157
185
|
if (!job) {
|
|
158
186
|
return;
|
|
159
187
|
}
|
|
160
|
-
const
|
|
161
|
-
|
|
188
|
+
const dataRequestResponse = this.dataResponseBuilder.buildFromTaskData(job.data);
|
|
189
|
+
if (this.runnerConfig.assertDeduplicationOutput) {
|
|
190
|
+
const reconstruct = new task_runner_1.DataRequestResponseReconstruct();
|
|
191
|
+
a.deepStrictEqual(reconstruct.reconstructConnectionInputData(dataRequestResponse.inputData), job.data.connectionInputData);
|
|
192
|
+
a.deepStrictEqual(reconstruct.reconstructExecuteData(dataRequestResponse), job.data.executeData);
|
|
193
|
+
}
|
|
194
|
+
const strippedData = new data_request_response_stripper_1.DataRequestResponseStripper(dataRequestResponse, requestParams).strip();
|
|
162
195
|
this.sendMessage({
|
|
163
196
|
type: 'requester:taskdataresponse',
|
|
164
197
|
taskId,
|
|
165
198
|
requestId,
|
|
166
|
-
data:
|
|
199
|
+
data: strippedData,
|
|
167
200
|
});
|
|
168
201
|
}
|
|
169
202
|
sendNodeTypes(taskId, requestId, neededNodeTypes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,29 +36,38 @@ exports.TaskRunnerModule = void 0;
|
|
|
36
36
|
const config_1 = require("@n8n/config");
|
|
37
37
|
const a = __importStar(require("node:assert/strict"));
|
|
38
38
|
const typedi_1 = __importStar(require("typedi"));
|
|
39
|
+
const on_shutdown_1 = require("../decorators/on-shutdown");
|
|
40
|
+
const missing_auth_token_error_1 = require("./errors/missing-auth-token.error");
|
|
39
41
|
const runner_ws_server_1 = require("./runner-ws-server");
|
|
40
42
|
let TaskRunnerModule = class TaskRunnerModule {
|
|
41
43
|
constructor(runnerConfig) {
|
|
42
44
|
this.runnerConfig = runnerConfig;
|
|
43
45
|
}
|
|
44
46
|
async start() {
|
|
45
|
-
a.ok(
|
|
47
|
+
a.ok(this.runnerConfig.enabled, 'Task runner is disabled');
|
|
48
|
+
const { mode, authToken } = this.runnerConfig;
|
|
49
|
+
if (mode === 'external' && !authToken)
|
|
50
|
+
throw new missing_auth_token_error_1.MissingAuthTokenError();
|
|
46
51
|
await this.loadTaskManager();
|
|
47
52
|
await this.loadTaskRunnerServer();
|
|
48
|
-
if (
|
|
49
|
-
this.runnerConfig.mode === 'internal_launcher') {
|
|
53
|
+
if (mode === 'internal') {
|
|
50
54
|
await this.startInternalTaskRunner();
|
|
51
55
|
}
|
|
52
56
|
}
|
|
53
57
|
async stop() {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
const stopRunnerProcessTask = (async () => {
|
|
59
|
+
if (this.taskRunnerProcess) {
|
|
60
|
+
await this.taskRunnerProcess.stop();
|
|
61
|
+
this.taskRunnerProcess = undefined;
|
|
62
|
+
}
|
|
63
|
+
})();
|
|
64
|
+
const stopRunnerServerTask = (async () => {
|
|
65
|
+
if (this.taskRunnerHttpServer) {
|
|
66
|
+
await this.taskRunnerHttpServer.stop();
|
|
67
|
+
this.taskRunnerHttpServer = undefined;
|
|
68
|
+
}
|
|
69
|
+
})();
|
|
70
|
+
await Promise.all([stopRunnerProcessTask, stopRunnerServerTask]);
|
|
62
71
|
}
|
|
63
72
|
async loadTaskManager() {
|
|
64
73
|
const { TaskManager } = await Promise.resolve().then(() => __importStar(require('../runners/task-managers/task-manager')));
|
|
@@ -82,6 +91,12 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
82
91
|
}
|
|
83
92
|
};
|
|
84
93
|
exports.TaskRunnerModule = TaskRunnerModule;
|
|
94
|
+
__decorate([
|
|
95
|
+
(0, on_shutdown_1.OnShutdown)(),
|
|
96
|
+
__metadata("design:type", Function),
|
|
97
|
+
__metadata("design:paramtypes", []),
|
|
98
|
+
__metadata("design:returntype", Promise)
|
|
99
|
+
], TaskRunnerModule.prototype, "stop", null);
|
|
85
100
|
exports.TaskRunnerModule = TaskRunnerModule = __decorate([
|
|
86
101
|
(0, typedi_1.Service)(),
|
|
87
102
|
__metadata("design:paramtypes", [config_1.TaskRunnersConfig])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAgD;AAChD,sDAAwC;AACxC,iDAA4C;
|
|
1
|
+
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/runners/task-runner-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { TaskRunnersConfig } from '@n8n/config';
|
|
2
2
|
import { Logger } from '../logging/logger.service';
|
|
3
3
|
import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
|
|
4
|
+
import { RunnerLifecycleEvents } from './runner-lifecycle-events';
|
|
4
5
|
import { TypedEmitter } from '../typed-emitter';
|
|
5
6
|
export type ExitReason = 'unknown' | 'oom';
|
|
6
7
|
export type TaskRunnerProcessEventMap = {
|
|
@@ -11,23 +12,22 @@ export type TaskRunnerProcessEventMap = {
|
|
|
11
12
|
export declare class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEventMap> {
|
|
12
13
|
private readonly runnerConfig;
|
|
13
14
|
private readonly authService;
|
|
15
|
+
private readonly runnerLifecycleEvents;
|
|
14
16
|
get isRunning(): boolean;
|
|
15
17
|
get pid(): number | undefined;
|
|
16
18
|
get runPromise(): Promise<void> | null;
|
|
17
|
-
private get useLauncher();
|
|
18
19
|
private process;
|
|
19
20
|
private _runPromise;
|
|
20
21
|
private oomDetector;
|
|
21
22
|
private isShuttingDown;
|
|
22
23
|
private logger;
|
|
23
24
|
private readonly passthroughEnvVars;
|
|
24
|
-
constructor(logger: Logger, runnerConfig: TaskRunnersConfig, authService: TaskRunnerAuthService);
|
|
25
|
+
constructor(logger: Logger, runnerConfig: TaskRunnersConfig, authService: TaskRunnerAuthService, runnerLifecycleEvents: RunnerLifecycleEvents);
|
|
25
26
|
start(): Promise<void>;
|
|
26
27
|
startNode(grantToken: string, n8nUri: string): import("child_process").ChildProcessWithoutNullStreams;
|
|
27
|
-
startLauncher(grantToken: string, n8nUri: string): import("child_process").ChildProcessWithoutNullStreams;
|
|
28
28
|
stop(): Promise<void>;
|
|
29
|
+
forceRestart(): Promise<void>;
|
|
29
30
|
killNode(): void;
|
|
30
|
-
killLauncher(): Promise<void>;
|
|
31
31
|
private monitorProcess;
|
|
32
32
|
private onProcessExit;
|
|
33
33
|
private getProcessEnvVars;
|