n8n 1.83.2 → 1.84.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/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.js +3 -1
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/webhook.js +0 -4
- package/dist/commands/webhook.js.map +1 -1
- package/dist/controllers/folder.controller.d.ts +13 -1
- package/dist/controllers/folder.controller.js +45 -1
- package/dist/controllers/folder.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +3 -1
- package/dist/controllers/users.controller.js +6 -2
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/databases/entities/folder.d.ts +3 -1
- package/dist/databases/entities/folder.js +4 -0
- package/dist/databases/entities/folder.js.map +1 -1
- package/dist/databases/repositories/folder.repository.d.ts +7 -5
- package/dist/databases/repositories/folder.repository.js +40 -1
- package/dist/databases/repositories/folder.repository.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +2 -2
- package/dist/executions/execution-data.service.d.ts +4 -0
- package/dist/executions/execution-data.service.js +67 -0
- package/dist/executions/execution-data.service.js.map +1 -0
- package/dist/{user-management/permission-checker.d.ts → executions/pre-execution-checks/credentials-permission-checker.d.ts} +4 -4
- package/dist/{user-management/permission-checker.js → executions/pre-execution-checks/credentials-permission-checker.js} +29 -16
- package/dist/executions/pre-execution-checks/credentials-permission-checker.js.map +1 -0
- package/dist/executions/pre-execution-checks/index.d.ts +2 -0
- package/dist/executions/pre-execution-checks/index.js +8 -0
- package/dist/executions/pre-execution-checks/index.js.map +1 -0
- package/dist/{subworkflows/subworkflow-policy-checker.service.d.ts → executions/pre-execution-checks/subworkflow-policy-checker.d.ts} +3 -3
- package/dist/{subworkflows/subworkflow-policy-checker.service.js → executions/pre-execution-checks/subworkflow-policy-checker.js} +5 -5
- package/dist/executions/pre-execution-checks/subworkflow-policy-checker.js.map +1 -0
- package/dist/license.js +6 -1
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +2 -2
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/permissions.ee/project-roles.js +4 -0
- package/dist/permissions.ee/project-roles.js.map +1 -1
- package/dist/scaling/scaling.service.d.ts +1 -0
- package/dist/scaling/scaling.service.js +7 -4
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/server.js +1 -1
- package/dist/server.js.map +1 -1
- package/dist/services/folder.service.d.ts +10 -1
- package/dist/services/folder.service.js +62 -1
- package/dist/services/folder.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +1 -0
- package/dist/services/project.service.ee.js +7 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +8 -19
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-helpers.d.ts +1 -2
- package/dist/workflow-helpers.js +0 -43
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.d.ts +5 -3
- package/dist/workflow-runner.js +11 -9
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +4 -2
- package/dist/workflows/workflow-execution.service.js +7 -5
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +1 -0
- package/package.json +12 -12
- package/templates/form-trigger.handlebars +4 -1
- package/dist/subworkflows/subworkflow-policy-checker.service.js.map +0 -1
- package/dist/user-management/permission-checker.js.map +0 -1
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.FolderService = void 0;
|
|
13
13
|
const di_1 = require("@n8n/di");
|
|
14
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
14
15
|
const folder_1 = require("../databases/entities/folder");
|
|
15
16
|
const folder_tag_mapping_repository_1 = require("../databases/repositories/folder-tag-mapping.repository");
|
|
16
17
|
const folder_repository_1 = require("../databases/repositories/folder.repository");
|
|
@@ -35,7 +36,7 @@ let FolderService = class FolderService {
|
|
|
35
36
|
const { homeProject, ...folder } = await this.folderRepository.save(folderEntity);
|
|
36
37
|
return folder;
|
|
37
38
|
}
|
|
38
|
-
async updateFolder(folderId, projectId, { name, tagIds }) {
|
|
39
|
+
async updateFolder(folderId, projectId, { name, tagIds, parentFolderId }) {
|
|
39
40
|
await this.findFolderInProjectOrFail(folderId, projectId);
|
|
40
41
|
if (name) {
|
|
41
42
|
await this.folderRepository.update({ id: folderId }, { name });
|
|
@@ -43,6 +44,15 @@ let FolderService = class FolderService {
|
|
|
43
44
|
if (tagIds) {
|
|
44
45
|
await this.folderTagMappingRepository.overwriteTags(folderId, tagIds);
|
|
45
46
|
}
|
|
47
|
+
if (parentFolderId) {
|
|
48
|
+
if (folderId === parentFolderId) {
|
|
49
|
+
throw new n8n_workflow_1.UserError('Cannot set a folder as its own parent');
|
|
50
|
+
}
|
|
51
|
+
if (parentFolderId !== n8n_workflow_1.PROJECT_ROOT) {
|
|
52
|
+
await this.findFolderInProjectOrFail(parentFolderId, projectId);
|
|
53
|
+
}
|
|
54
|
+
await this.folderRepository.update({ id: folderId }, { parentFolder: parentFolderId !== n8n_workflow_1.PROJECT_ROOT ? { id: parentFolderId } : null });
|
|
55
|
+
}
|
|
46
56
|
}
|
|
47
57
|
async findFolderInProjectOrFail(folderId, projectId, em) {
|
|
48
58
|
try {
|
|
@@ -89,6 +99,9 @@ let FolderService = class FolderService {
|
|
|
89
99
|
await this.folderRepository.delete({ id: folderId });
|
|
90
100
|
return;
|
|
91
101
|
}
|
|
102
|
+
if (folderId === transferToFolderId) {
|
|
103
|
+
throw new n8n_workflow_1.UserError('Cannot transfer folder contents to the folder being deleted');
|
|
104
|
+
}
|
|
92
105
|
await this.findFolderInProjectOrFail(transferToFolderId, projectId);
|
|
93
106
|
return await this.folderRepository.manager.transaction(async (tx) => {
|
|
94
107
|
await this.folderRepository.moveAllToFolder(folderId, transferToFolderId, tx);
|
|
@@ -97,6 +110,9 @@ let FolderService = class FolderService {
|
|
|
97
110
|
return;
|
|
98
111
|
});
|
|
99
112
|
}
|
|
113
|
+
async transferAllFoldersToProject(fromProjectId, toProjectId, tx) {
|
|
114
|
+
return await this.folderRepository.transferAllFoldersToProject(fromProjectId, toProjectId, tx);
|
|
115
|
+
}
|
|
100
116
|
transformFolderPathToTree(flatPath) {
|
|
101
117
|
if (!flatPath || flatPath.length === 0) {
|
|
102
118
|
return [];
|
|
@@ -122,6 +138,51 @@ let FolderService = class FolderService {
|
|
|
122
138
|
});
|
|
123
139
|
return rootNode ? [rootNode] : [];
|
|
124
140
|
}
|
|
141
|
+
async getFolderAndWorkflowCount(folderId, projectId) {
|
|
142
|
+
await this.findFolderInProjectOrFail(folderId, projectId);
|
|
143
|
+
const baseQuery = this.folderRepository
|
|
144
|
+
.createQueryBuilder('folder')
|
|
145
|
+
.select('folder.id', 'id')
|
|
146
|
+
.where('folder.id = :folderId', { folderId });
|
|
147
|
+
const recursiveQuery = this.folderRepository
|
|
148
|
+
.createQueryBuilder('f')
|
|
149
|
+
.select('f.id', 'id')
|
|
150
|
+
.innerJoin('folder_path', 'fp', 'f.parentFolderId = fp.id');
|
|
151
|
+
const subFolderCountQuery = this.folderRepository
|
|
152
|
+
.createQueryBuilder('folder')
|
|
153
|
+
.addCommonTableExpression(`${baseQuery.getQuery()} UNION ALL ${recursiveQuery.getQuery()}`, 'folder_path', { recursive: true })
|
|
154
|
+
.select('COUNT(DISTINCT folder.id) - 1', 'count')
|
|
155
|
+
.where((qb) => {
|
|
156
|
+
const subQuery = qb.subQuery().select('fp.id').from('folder_path', 'fp').getQuery();
|
|
157
|
+
return `folder.id IN ${subQuery}`;
|
|
158
|
+
})
|
|
159
|
+
.setParameters({
|
|
160
|
+
folderId,
|
|
161
|
+
});
|
|
162
|
+
const workflowCountQuery = this.workflowRepository
|
|
163
|
+
.createQueryBuilder('workflow')
|
|
164
|
+
.select('COUNT(workflow.id)', 'count')
|
|
165
|
+
.where((qb) => {
|
|
166
|
+
const folderQuery = qb.subQuery().from('folder_path', 'fp').select('fp.id').getQuery();
|
|
167
|
+
return `workflow.parentFolderId IN ${folderQuery}`;
|
|
168
|
+
})
|
|
169
|
+
.addCommonTableExpression(`${baseQuery.getQuery()} UNION ALL ${recursiveQuery.getQuery()}`, 'folder_path', { recursive: true })
|
|
170
|
+
.setParameters({
|
|
171
|
+
folderId,
|
|
172
|
+
});
|
|
173
|
+
const [subFolderResult, workflowResult] = await Promise.all([
|
|
174
|
+
subFolderCountQuery.getRawOne(),
|
|
175
|
+
workflowCountQuery.getRawOne(),
|
|
176
|
+
]);
|
|
177
|
+
return {
|
|
178
|
+
totalSubFolders: parseInt(subFolderResult?.count ?? '0', 10),
|
|
179
|
+
totalWorkflows: parseInt(workflowResult?.count ?? '0', 10),
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
async getManyAndCount(projectId, options) {
|
|
183
|
+
options.filter = { ...options.filter, projectId };
|
|
184
|
+
return await this.folderRepository.getManyAndCount(options);
|
|
185
|
+
}
|
|
125
186
|
};
|
|
126
187
|
exports.FolderService = FolderService;
|
|
127
188
|
exports.FolderService = FolderService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folder.service.js","sourceRoot":"","sources":["../../src/services/folder.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAAkC;
|
|
1
|
+
{"version":3,"file":"folder.service.js","sourceRoot":"","sources":["../../src/services/folder.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ export declare class ProjectService {
|
|
|
29
29
|
constructor(sharedWorkflowRepository: SharedWorkflowRepository, projectRepository: ProjectRepository, projectRelationRepository: ProjectRelationRepository, roleService: RoleService, sharedCredentialsRepository: SharedCredentialsRepository, cacheService: CacheService, license: License);
|
|
30
30
|
private get workflowService();
|
|
31
31
|
private get credentialsService();
|
|
32
|
+
private get folderService();
|
|
32
33
|
deleteProject(user: User, projectId: string, { migrateToProject }?: {
|
|
33
34
|
migrateToProject?: string;
|
|
34
35
|
}): Promise<void>;
|
|
@@ -87,6 +87,9 @@ let ProjectService = class ProjectService {
|
|
|
87
87
|
get credentialsService() {
|
|
88
88
|
return Promise.resolve().then(() => __importStar(require('../credentials/credentials.service'))).then(({ CredentialsService }) => di_1.Container.get(CredentialsService));
|
|
89
89
|
}
|
|
90
|
+
get folderService() {
|
|
91
|
+
return Promise.resolve().then(() => __importStar(require('../services/folder.service'))).then(({ FolderService }) => di_1.Container.get(FolderService));
|
|
92
|
+
}
|
|
90
93
|
async deleteProject(user, projectId, { migrateToProject } = {}) {
|
|
91
94
|
const workflowService = await this.workflowService;
|
|
92
95
|
const credentialsService = await this.credentialsService;
|
|
@@ -133,6 +136,10 @@ let ProjectService = class ProjectService {
|
|
|
133
136
|
await credentialsService.delete(user, sharedCredential.credentials.id);
|
|
134
137
|
}
|
|
135
138
|
}
|
|
139
|
+
if (targetProject) {
|
|
140
|
+
const folderService = await this.folderService;
|
|
141
|
+
await folderService.transferAllFoldersToProject(project.id, targetProject.id);
|
|
142
|
+
}
|
|
136
143
|
await this.projectRepository.remove(project);
|
|
137
144
|
}
|
|
138
145
|
async findProjectsWorkflowIsIn(workflowId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.service.ee.js","sourceRoot":"","sources":["../../src/services/project.service.ee.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project.service.ee.js","sourceRoot":"","sources":["../../src/services/project.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,13 +49,13 @@ const execution_repository_1 = require("./databases/repositories/execution.repos
|
|
|
49
49
|
const workflow_repository_1 = require("./databases/repositories/workflow.repository");
|
|
50
50
|
const event_service_1 = require("./events/event.service");
|
|
51
51
|
const execution_lifecycle_hooks_1 = require("./execution-lifecycle/execution-lifecycle-hooks");
|
|
52
|
+
const execution_data_service_1 = require("./executions/execution-data.service");
|
|
53
|
+
const pre_execution_checks_1 = require("./executions/pre-execution-checks");
|
|
52
54
|
const node_types_1 = require("./node-types");
|
|
53
55
|
const push_1 = require("./push");
|
|
54
56
|
const secrets_helpers_ee_1 = require("./secrets-helpers.ee");
|
|
55
57
|
const url_service_1 = require("./services/url.service");
|
|
56
|
-
const subworkflow_policy_checker_service_1 = require("./subworkflows/subworkflow-policy-checker.service");
|
|
57
58
|
const task_requester_1 = require("./task-runners/task-managers/task-requester");
|
|
58
|
-
const permission_checker_1 = require("./user-management/permission-checker");
|
|
59
59
|
const utils_1 = require("./utils");
|
|
60
60
|
const object_to_error_1 = require("./utils/object-to-error");
|
|
61
61
|
const WorkflowHelpers = __importStar(require("./workflow-helpers"));
|
|
@@ -152,10 +152,11 @@ async function startExecution(additionalData, options, executionId, runData, wor
|
|
|
152
152
|
settings: workflowData.settings,
|
|
153
153
|
});
|
|
154
154
|
await executionRepository.setRunning(executionId);
|
|
155
|
+
const startTime = Date.now();
|
|
155
156
|
let data;
|
|
156
157
|
try {
|
|
157
|
-
await di_1.Container.get(
|
|
158
|
-
await di_1.Container.get(
|
|
158
|
+
await di_1.Container.get(pre_execution_checks_1.CredentialsPermissionChecker).check(workflowData.id, workflowData.nodes);
|
|
159
|
+
await di_1.Container.get(pre_execution_checks_1.SubworkflowPolicyChecker).check(workflow, options.parentWorkflowId, options.node, additionalData.userId);
|
|
159
160
|
const additionalDataIntegrated = await getBase();
|
|
160
161
|
additionalDataIntegrated.hooks = (0, execution_lifecycle_hooks_1.getLifecycleHooksForSubExecutions)(runData.executionMode, executionId, workflowData, additionalData.userId);
|
|
161
162
|
additionalDataIntegrated.executionId = executionId;
|
|
@@ -164,7 +165,7 @@ async function startExecution(additionalData, options, executionId, runData, wor
|
|
|
164
165
|
let subworkflowTimeout = additionalData.executionTimeoutTimestamp;
|
|
165
166
|
const workflowSettings = workflowData.settings;
|
|
166
167
|
if (workflowSettings?.executionTimeout !== undefined && workflowSettings.executionTimeout > 0) {
|
|
167
|
-
subworkflowTimeout = Math.min(additionalData.executionTimeoutTimestamp || Number.MAX_SAFE_INTEGER,
|
|
168
|
+
subworkflowTimeout = Math.min(additionalData.executionTimeoutTimestamp || Number.MAX_SAFE_INTEGER, startTime + workflowSettings.executionTimeout * 1000);
|
|
168
169
|
}
|
|
169
170
|
additionalDataIntegrated.executionTimeoutTimestamp = subworkflowTimeout;
|
|
170
171
|
const runExecutionData = runData.executionData;
|
|
@@ -174,20 +175,8 @@ async function startExecution(additionalData, options, executionId, runData, wor
|
|
|
174
175
|
data = await execution;
|
|
175
176
|
}
|
|
176
177
|
catch (error) {
|
|
177
|
-
const executionError = error
|
|
178
|
-
const fullRunData =
|
|
179
|
-
data: {
|
|
180
|
-
resultData: {
|
|
181
|
-
error: executionError,
|
|
182
|
-
runData: {},
|
|
183
|
-
},
|
|
184
|
-
},
|
|
185
|
-
finished: false,
|
|
186
|
-
mode: 'integrated',
|
|
187
|
-
startedAt: new Date(),
|
|
188
|
-
stoppedAt: new Date(),
|
|
189
|
-
status: 'error',
|
|
190
|
-
};
|
|
178
|
+
const executionError = error;
|
|
179
|
+
const fullRunData = di_1.Container.get(execution_data_service_1.ExecutionDataService).generateFailedExecutionFromError(runData.executionMode, executionError, 'node' in executionError ? executionError.node : undefined, startTime);
|
|
191
180
|
const fullExecutionData = {
|
|
192
181
|
data: fullRunData.data,
|
|
193
182
|
mode: fullRunData.mode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-execute-additional-data.js","sourceRoot":"","sources":["../src/workflow-execute-additional-data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"workflow-execute-additional-data.js","sourceRoot":"","sources":["../src/workflow-execute-additional-data.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsDA,gCA+CC;AAED,0CAsCC;AAKD,0CA8BC;AA4JD,gDAQC;AAED,oCAcC;AAKD,0BAoEC;AAxaD,wCAA2C;AAC3C,gCAAoC;AACpC,uCAAmD;AACnD,+CAAyD;AAwBzD,2DAAuD;AACvD,6DAAyD;AACzD,wFAAoF;AACpF,sFAAkF;AAClF,0DAAsD;AAEtD,+FAAoG;AACpG,gFAA2E;AAC3E,4EAG2C;AAE3C,6CAAyC;AACzC,iCAA8B;AAC9B,6DAAqD;AACrD,wDAAoD;AACpD,gFAA4E;AAC5E,mCAA+C;AAC/C,6DAAwD;AACxD,oEAAsD;AAE/C,KAAK,UAAU,UAAU,CAC/B,YAA2B,EAC3B,SAAgC,EAChC,eAAkC;IAElC,MAAM,IAAI,GAAG,YAAY,CAAC;IAE1B,MAAM,YAAY,GAAG,IAAA,4BAAoB,EAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAG9D,SAAS,GAAG,SAAS,IAAI;QACxB;YACC,IAAI,EAAE,EAAE;SACR;KACD,CAAC;IAGF,MAAM,kBAAkB,GAAmB,EAAE,CAAC;IAC9C,kBAAkB,CAAC,IAAI,CAAC;QACvB,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE;YACL,IAAI,EAAE,CAAC,SAAS,CAAC;SACjB;QACD,QAAQ,EAAE,EAAE,eAAe,EAAE;QAC7B,MAAM,EAAE,IAAI;KACZ,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAsB;QAC3C,SAAS,EAAE,EAAE;QACb,UAAU,EAAE;YACX,OAAO,EAAE,EAAE;SACX;QACD,aAAa,EAAE;YACd,WAAW,EAAE,EAAE;YACf,QAAQ,EAAE,EAAE;YACZ,kBAAkB;YAClB,gBAAgB,EAAE,EAAE;YACpB,sBAAsB,EAAE,EAAE;SAC1B;QACD,eAAe;KACf,CAAC;IAEF,OAAO;QACN,aAAa,EAAE,IAAI;QACnB,aAAa,EAAE,gBAAgB;QAC/B,YAAY;KACZ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,eAAe,CACpC,YAAkC,EAClC,gBAAwB,EACxB,sBAA0C;IAE1C,IAAI,YAAY,CAAC,EAAE,KAAK,SAAS,IAAI,YAAY,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACtE,MAAM,IAAI,8BAAe,CACxB,+FAA+F,CAC/F,CAAC;IACH,CAAC;IAED,IAAI,YAAkC,CAAC;IACvC,IAAI,YAAY,CAAC,EAAE,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAE5E,YAAY,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC,GAAG,CACzD,EAAE,EAAE,EAAE,YAAY,CAAC,EAAE,EAAE,EACvB,EAAE,SAAS,EAAE,CACb,CAAC;QAEF,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YACzD,MAAM,IAAI,8BAAe,CAAC,0BAA0B,EAAE;gBACrD,KAAK,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,EAAE,EAAE;aACtC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;SAAM,CAAC;QACP,YAAY,GAAG,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC;QACzC,IAAI,YAAY,EAAE,CAAC;YAClB,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;gBACtB,YAAY,CAAC,EAAE,GAAG,gBAAgB,CAAC;YACpC,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC5B,YAAY,CAAC,QAAQ,GAAG,sBAAsB,CAAC;YAChD,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,YAAa,CAAC;AACtB,CAAC;AAKM,KAAK,UAAU,eAAe,CACpC,YAAkC,EAClC,cAA8C,EAC9C,OAA+B;IAE/B,MAAM,gBAAgB,GAAG,cAAS,CAAC,GAAG,CAAC,oCAAgB,CAAC,CAAC;IAEzD,MAAM,YAAY,GACjB,OAAO,CAAC,kBAAkB;QAC1B,CAAC,MAAM,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAEjG,MAAM,OAAO,GACZ,OAAO,CAAC,aAAa;QACrB,CAAC,MAAM,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;IAE9E,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAExD,MAAM,gBAAgB,GAAG,cAAc,CACtC,cAAc,EACd,OAAO,EACP,WAAW,EACX,OAAO,EACP,YAAY,CACZ,CAAC;IAEF,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC/B,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;IACtC,CAAC;IAED,OAAO,MAAM,gBAAgB,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,cAAc,CAC5B,cAA8C,EAC9C,OAA+B,EAC/B,WAAmB,EACnB,OAAsC,EACtC,YAA2B;IAE3B,MAAM,SAAS,GAAG,cAAS,CAAC,GAAG,CAAC,sBAAS,CAAC,CAAC;IAC3C,MAAM,gBAAgB,GAAG,cAAS,CAAC,GAAG,CAAC,oCAAgB,CAAC,CAAC;IACzD,MAAM,mBAAmB,GAAG,cAAS,CAAC,GAAG,CAAC,0CAAmB,CAAC,CAAC;IAE/D,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;QAC7B,EAAE,EAAE,YAAY,CAAC,EAAE;QACnB,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE,YAAY,CAAC,KAAK;QACzB,WAAW,EAAE,YAAY,CAAC,WAAW;QACrC,MAAM,EAAE,YAAY,CAAC,MAAM;QAC3B,SAAS;QACT,UAAU,EAAE,YAAY,CAAC,UAAU;QACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;KAC/B,CAAC,CAAC;IAOH,MAAM,mBAAmB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAElD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE7B,IAAI,IAAI,CAAC;IACT,IAAI,CAAC;QACJ,MAAM,cAAS,CAAC,GAAG,CAAC,mDAA4B,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC7F,MAAM,cAAS,CAAC,GAAG,CAAC,+CAAwB,CAAC,CAAC,KAAK,CAClD,QAAQ,EACR,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,IAAI,EACZ,cAAc,CAAC,MAAM,CACrB,CAAC;QAIF,MAAM,wBAAwB,GAAG,MAAM,OAAO,EAAE,CAAC;QACjD,wBAAwB,CAAC,KAAK,GAAG,IAAA,6DAAiC,EACjE,OAAO,CAAC,aAAa,EACrB,WAAW,EACX,YAAY,EACZ,cAAc,CAAC,MAAM,CACrB,CAAC;QACF,wBAAwB,CAAC,WAAW,GAAG,WAAW,CAAC;QACnD,wBAAwB,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;QAK/E,wBAAwB,CAAC,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;QAE1E,IAAI,kBAAkB,GAAG,cAAc,CAAC,yBAAyB,CAAC;QAClE,MAAM,gBAAgB,GAAG,YAAY,CAAC,QAAQ,CAAC;QAC/C,IAAI,gBAAgB,EAAE,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,CAAC,gBAAgB,GAAG,CAAC,EAAE,CAAC;YAI/F,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAC5B,cAAc,CAAC,yBAAyB,IAAI,MAAM,CAAC,gBAAgB,EACnE,SAAS,GAAG,gBAAgB,CAAC,gBAAgB,GAAG,IAAI,CACpD,CAAC;QACH,CAAC;QAED,wBAAwB,CAAC,yBAAyB,GAAG,kBAAkB,CAAC;QAExE,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAkC,CAAC;QAGpE,MAAM,eAAe,GAAG,IAAI,0BAAe,CAC1C,wBAAwB,EACxB,OAAO,CAAC,aAAa,EACrB,gBAAgB,CAChB,CAAC;QACF,MAAM,SAAS,GAAG,eAAe,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QACpE,gBAAgB,CAAC,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QACjE,IAAI,GAAG,MAAM,SAAS,CAAC;IACxB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,cAAc,GAAG,KAAuB,CAAC;QAC/C,MAAM,WAAW,GAAG,cAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC,gCAAgC,CACvF,OAAO,CAAC,aAAa,EACrB,cAAc,EACd,MAAM,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAC1D,SAAS,CACT,CAAC;QAMF,MAAM,iBAAiB,GAA2B;YACjD,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,QAAQ,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK;YAC7D,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,YAAY;YACZ,UAAU,EAAE,YAAY,CAAC,EAAE;SAC3B,CAAC;QACF,IAAI,YAAY,CAAC,EAAE,EAAE,CAAC;YACrB,iBAAiB,CAAC,UAAU,GAAG,YAAY,CAAC,EAAE,CAAC;QAChD,CAAC;QAED,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAE7D,MAAM,mBAAmB,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QAClF,MAAM,IAAA,+BAAa,EAClB;YACC,GAAG,cAAc;YACjB,WAAW;YACX,UAAU,EAAE,YAAY,CAAC,EAAE;YAC3B,KAAK,EAAE,cAAc,EAAE,KAAK;YAC5B,OAAO,EAAE,cAAc,EAAE,OAAO;SAChC,EACD,QAAQ,CACR,CAAC;IACH,CAAC;IAGD,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAGzD,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,eAAe,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACrE,OAAO;YACN,WAAW;YACX,IAAI,EAAE,UAAW,CAAC,IAAK,CAAC,IAAI;YAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAC;IACH,CAAC;IACD,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAGtD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAEvC,MAAM,IAAA,+BAAa,EAClB;QACC,GAAG,KAAK;QACR,WAAW;QACX,UAAU,EAAE,YAAY,CAAC,EAAE;QAC3B,KAAK,EAAE,KAAK,EAAE,KAAK;KACnB,EACD,QAAQ,CACR,CAAC;AACH,CAAC;AAED,SAAgB,kBAAkB,CAAC,MAAuB;IACzD,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC;IACrC,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,6BAA6B,MAAM,2CAA2C,CAAC,CAAC;QAC7F,OAAO;IACR,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,WAAW,QAAQ,MAAM,GAAG,CAAC,CAAC;IAChF,cAAS,CAAC,GAAG,CAAC,oCAAgB,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACrE,CAAC;AAED,SAAgB,YAAY,CAAC,IAAc,EAAE,IAAiC;IAC7E,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACzB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;IACR,CAAC;IAGD,IAAI,CAAC;QACJ,MAAM,YAAY,GAAG,cAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC;QACzC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAiB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,cAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,8CAA8C,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5E,CAAC;AACF,CAAC;AAKM,KAAK,UAAU,OAAO,CAC5B,MAAe,EACf,qBAAuC,EACvC,yBAAkC;IAElC,MAAM,cAAc,GAAG,cAAS,CAAC,GAAG,CAAC,wBAAU,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAErE,MAAM,YAAY,GAAG,cAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;IAEjD,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,YAAY,EAAE,CAAC;IAEvD,MAAM,YAAY,GAAG,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC;IAEjD,OAAO;QACN,iBAAiB,EAAE,cAAS,CAAC,GAAG,CAAC,sCAAiB,CAAC;QACnD,eAAe;QACf,UAAU,EAAE,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,IAAI;QACxD,eAAe,EAAE,cAAc;QAC/B,kBAAkB,EAAE,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,WAAW;QACvE,cAAc,EAAE,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO;QAC/D,qBAAqB,EAAE,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,cAAc;QAC7E,kBAAkB,EAAE,cAAc,GAAG,YAAY,CAAC,SAAS,CAAC,WAAW;QACvE,qBAAqB;QACrB,yBAAyB;QACzB,MAAM;QACN,kBAAkB;QAClB,SAAS;QACT,cAAc,EAAE,cAAS,CAAC,GAAG,CAAC,kCAAa,CAAC;QAC5C,KAAK,CAAC,eAAe,CACpB,cAA8C,EAC9C,OAAe,EACf,QAAiB,EACjB,gBAAmC,EACnC,SAA+B,EAC/B,IAAW,EACX,QAAkB,EAClB,gBAAmC,EACnC,QAAgB,EAChB,SAAiB,EACjB,cAAsB,EACtB,mBAAyC,EACzC,iBAAkC,EAClC,IAAyB,EACzB,gBAAkC,EAClC,WAA0B;YAE1B,OAAO,MAAM,cAAS,CAAC,GAAG,CAAC,8BAAa,CAAC,CAAC,SAAS,CAClD,cAAc,EACd,OAAO,EACP,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,IAAI,EACJ,gBAAgB,EAChB,WAAW,CACX,CAAC;QACH,CAAC;QACD,UAAU,EAAE,CAAC,SAA2B,EAAE,OAAuB,EAAE,EAAE,CACpE,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;KACtC,CAAC;AACH,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type { IDataObject,
|
|
2
|
-
export declare function generateFailedExecutionFromError(mode: WorkflowExecuteMode, error: NodeApiError | NodeOperationError | WorkflowOperationError, node: INode): IRun;
|
|
1
|
+
import type { IDataObject, IRun, ITaskData, IWorkflowBase } from 'n8n-workflow';
|
|
3
2
|
export declare function getDataLastExecutedNodeData(inputData: IRun): ITaskData | undefined;
|
|
4
3
|
export declare function addNodeIds(workflow: IWorkflowBase): void;
|
|
5
4
|
export declare function replaceInvalidCredentials<T extends IWorkflowBase>(workflow: T): Promise<T>;
|
package/dist/workflow-helpers.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.generateFailedExecutionFromError = generateFailedExecutionFromError;
|
|
4
3
|
exports.getDataLastExecutedNodeData = getDataLastExecutedNodeData;
|
|
5
4
|
exports.addNodeIds = addNodeIds;
|
|
6
5
|
exports.replaceInvalidCredentials = replaceInvalidCredentials;
|
|
@@ -9,48 +8,6 @@ const di_1 = require("@n8n/di");
|
|
|
9
8
|
const uuid_1 = require("uuid");
|
|
10
9
|
const credentials_repository_1 = require("./databases/repositories/credentials.repository");
|
|
11
10
|
const variables_service_ee_1 = require("./environments.ee/variables/variables.service.ee");
|
|
12
|
-
function generateFailedExecutionFromError(mode, error, node) {
|
|
13
|
-
return {
|
|
14
|
-
data: {
|
|
15
|
-
startData: {
|
|
16
|
-
destinationNode: node.name,
|
|
17
|
-
runNodeFilter: [node.name],
|
|
18
|
-
},
|
|
19
|
-
resultData: {
|
|
20
|
-
error,
|
|
21
|
-
runData: {
|
|
22
|
-
[node.name]: [
|
|
23
|
-
{
|
|
24
|
-
startTime: 0,
|
|
25
|
-
executionTime: 0,
|
|
26
|
-
error,
|
|
27
|
-
source: [],
|
|
28
|
-
},
|
|
29
|
-
],
|
|
30
|
-
},
|
|
31
|
-
lastNodeExecuted: node.name,
|
|
32
|
-
},
|
|
33
|
-
executionData: {
|
|
34
|
-
contextData: {},
|
|
35
|
-
metadata: {},
|
|
36
|
-
nodeExecutionStack: [
|
|
37
|
-
{
|
|
38
|
-
node,
|
|
39
|
-
data: {},
|
|
40
|
-
source: null,
|
|
41
|
-
},
|
|
42
|
-
],
|
|
43
|
-
waitingExecution: {},
|
|
44
|
-
waitingExecutionSource: {},
|
|
45
|
-
},
|
|
46
|
-
},
|
|
47
|
-
finished: false,
|
|
48
|
-
mode,
|
|
49
|
-
startedAt: new Date(),
|
|
50
|
-
stoppedAt: new Date(),
|
|
51
|
-
status: 'error',
|
|
52
|
-
};
|
|
53
|
-
}
|
|
54
11
|
function getDataLastExecutedNodeData(inputData) {
|
|
55
12
|
const { runData, pinData = {} } = inputData.data.resultData;
|
|
56
13
|
const { lastNodeExecuted } = inputData.data.resultData;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-helpers.js","sourceRoot":"","sources":["../src/workflow-helpers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"workflow-helpers.js","sourceRoot":"","sources":["../src/workflow-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,10 @@ import type { ExecutionError, IDeferredPromise, IExecuteResponsePromiseData, Wor
|
|
|
4
4
|
import { ActiveExecutions } from './active-executions';
|
|
5
5
|
import { ExecutionRepository } from './databases/repositories/execution.repository';
|
|
6
6
|
import { ExecutionNotFoundError } from './errors/execution-not-found-error';
|
|
7
|
+
import { ExecutionDataService } from './executions/execution-data.service';
|
|
8
|
+
import { CredentialsPermissionChecker } from './executions/pre-execution-checks';
|
|
7
9
|
import { ManualExecutionService } from './manual-execution.service';
|
|
8
10
|
import { NodeTypes } from './node-types';
|
|
9
|
-
import { PermissionChecker } from './user-management/permission-checker';
|
|
10
11
|
import { WorkflowStaticDataService } from './workflows/workflow-static-data.service';
|
|
11
12
|
export declare class WorkflowRunner {
|
|
12
13
|
private readonly logger;
|
|
@@ -15,12 +16,13 @@ export declare class WorkflowRunner {
|
|
|
15
16
|
private readonly executionRepository;
|
|
16
17
|
private readonly workflowStaticDataService;
|
|
17
18
|
private readonly nodeTypes;
|
|
18
|
-
private readonly
|
|
19
|
+
private readonly credentialsPermissionChecker;
|
|
19
20
|
private readonly instanceSettings;
|
|
20
21
|
private readonly manualExecutionService;
|
|
22
|
+
private readonly executionDataService;
|
|
21
23
|
private scalingService;
|
|
22
24
|
private executionsMode;
|
|
23
|
-
constructor(logger: Logger, errorReporter: ErrorReporter, activeExecutions: ActiveExecutions, executionRepository: ExecutionRepository, workflowStaticDataService: WorkflowStaticDataService, nodeTypes: NodeTypes,
|
|
25
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, activeExecutions: ActiveExecutions, executionRepository: ExecutionRepository, workflowStaticDataService: WorkflowStaticDataService, nodeTypes: NodeTypes, credentialsPermissionChecker: CredentialsPermissionChecker, instanceSettings: InstanceSettings, manualExecutionService: ManualExecutionService, executionDataService: ExecutionDataService);
|
|
24
26
|
processError(error: ExecutionError | ExecutionNotFoundError, startedAt: Date, executionMode: WorkflowExecuteMode, executionId: string, hooks?: ExecutionLifecycleHooks): Promise<void>;
|
|
25
27
|
run(data: IWorkflowExecutionDataProcess, loadStaticData?: boolean, realtime?: boolean, restartExecutionId?: string, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>): Promise<string>;
|
|
26
28
|
private runMainProcess;
|
package/dist/workflow-runner.js
CHANGED
|
@@ -54,25 +54,26 @@ const active_executions_1 = require("./active-executions");
|
|
|
54
54
|
const config_1 = __importDefault(require("./config"));
|
|
55
55
|
const execution_repository_1 = require("./databases/repositories/execution.repository");
|
|
56
56
|
const execution_not_found_error_1 = require("./errors/execution-not-found-error");
|
|
57
|
+
const max_stalled_count_error_1 = require("./errors/max-stalled-count.error");
|
|
57
58
|
const execution_lifecycle_hooks_1 = require("./execution-lifecycle/execution-lifecycle-hooks");
|
|
59
|
+
const execution_data_service_1 = require("./executions/execution-data.service");
|
|
60
|
+
const pre_execution_checks_1 = require("./executions/pre-execution-checks");
|
|
58
61
|
const manual_execution_service_1 = require("./manual-execution.service");
|
|
59
62
|
const node_types_1 = require("./node-types");
|
|
60
|
-
const permission_checker_1 = require("./user-management/permission-checker");
|
|
61
63
|
const WorkflowExecuteAdditionalData = __importStar(require("./workflow-execute-additional-data"));
|
|
62
|
-
const workflow_helpers_1 = require("./workflow-helpers");
|
|
63
64
|
const workflow_static_data_service_1 = require("./workflows/workflow-static-data.service");
|
|
64
|
-
const max_stalled_count_error_1 = require("./errors/max-stalled-count.error");
|
|
65
65
|
let WorkflowRunner = class WorkflowRunner {
|
|
66
|
-
constructor(logger, errorReporter, activeExecutions, executionRepository, workflowStaticDataService, nodeTypes,
|
|
66
|
+
constructor(logger, errorReporter, activeExecutions, executionRepository, workflowStaticDataService, nodeTypes, credentialsPermissionChecker, instanceSettings, manualExecutionService, executionDataService) {
|
|
67
67
|
this.logger = logger;
|
|
68
68
|
this.errorReporter = errorReporter;
|
|
69
69
|
this.activeExecutions = activeExecutions;
|
|
70
70
|
this.executionRepository = executionRepository;
|
|
71
71
|
this.workflowStaticDataService = workflowStaticDataService;
|
|
72
72
|
this.nodeTypes = nodeTypes;
|
|
73
|
-
this.
|
|
73
|
+
this.credentialsPermissionChecker = credentialsPermissionChecker;
|
|
74
74
|
this.instanceSettings = instanceSettings;
|
|
75
75
|
this.manualExecutionService = manualExecutionService;
|
|
76
|
+
this.executionDataService = executionDataService;
|
|
76
77
|
this.executionsMode = config_1.default.getEnv('executions.mode');
|
|
77
78
|
}
|
|
78
79
|
async processError(error, startedAt, executionMode, executionId, hooks) {
|
|
@@ -116,10 +117,10 @@ let WorkflowRunner = class WorkflowRunner {
|
|
|
116
117
|
const executionId = await this.activeExecutions.add(data, restartExecutionId);
|
|
117
118
|
const { id: workflowId, nodes } = data.workflowData;
|
|
118
119
|
try {
|
|
119
|
-
await this.
|
|
120
|
+
await this.credentialsPermissionChecker.check(workflowId, nodes);
|
|
120
121
|
}
|
|
121
122
|
catch (error) {
|
|
122
|
-
const runData =
|
|
123
|
+
const runData = this.executionDataService.generateFailedExecutionFromError(data.executionMode, error, error.node);
|
|
123
124
|
const lifecycleHooks = (0, execution_lifecycle_hooks_1.getLifecycleHooksForRegularMain)(data, executionId);
|
|
124
125
|
await lifecycleHooks.runHook('workflowExecuteBefore', [undefined, data.executionData]);
|
|
125
126
|
await lifecycleHooks.runHook('workflowExecuteAfter', [runData]);
|
|
@@ -313,8 +314,9 @@ exports.WorkflowRunner = WorkflowRunner = __decorate([
|
|
|
313
314
|
execution_repository_1.ExecutionRepository,
|
|
314
315
|
workflow_static_data_service_1.WorkflowStaticDataService,
|
|
315
316
|
node_types_1.NodeTypes,
|
|
316
|
-
|
|
317
|
+
pre_execution_checks_1.CredentialsPermissionChecker,
|
|
317
318
|
n8n_core_1.InstanceSettings,
|
|
318
|
-
manual_execution_service_1.ManualExecutionService
|
|
319
|
+
manual_execution_service_1.ManualExecutionService,
|
|
320
|
+
execution_data_service_1.ExecutionDataService])
|
|
319
321
|
], WorkflowRunner);
|
|
320
322
|
//# sourceMappingURL=workflow-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-runner.js","sourceRoot":"","sources":["../src/workflow-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,gCAA6C;AAE7C,uCAAoF;AAUpF,+CAAiE;AACjE,gEAAuC;AAEvC,2DAAuD;AACvD,sDAA8B;AAC9B,wFAAoF;AACpF,kFAA4E;AAC5E,+FAIyD;AACzD,yEAAoE;AACpE,6CAAyC;AAGzC,6EAAyE;AACzE,kGAAoF;AACpF,yDAAsE;AACtE,2FAAqF;AAErF,8EAAwE;AAGjE,IAAM,cAAc,GAApB,MAAM,cAAc;IAK1B,YACkB,MAAc,EACd,aAA4B,EAC5B,gBAAkC,EAClC,mBAAwC,EACxC,yBAAoD,EACpD,SAAoB,EACpB,iBAAoC,EACpC,gBAAkC,EAClC,sBAA8C;QAR9C,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,cAAS,GAAT,SAAS,CAAW;QACpB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAXxD,mBAAc,GAAG,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAYvD,CAAC;IAGJ,KAAK,CAAC,YAAY,CACjB,KAA8C,EAC9C,SAAe,EACf,aAAkC,EAClC,WAAmB,EACnB,KAA+B;QAO/B,IACC,KAAK,YAAY,kDAAsB;YACvC,KAAK,YAAY,sCAAuB;YACxC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAClC,CAAC;YACF,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,WAAW,KAAK,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;QACxF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAEjD,MAAM,WAAW,GAAG,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC;QAKjE,IAAI,WAAW,EAAE,CAAC;YACjB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBAC5F,WAAW,EAAE,KAAK;aAClB,CAAC,CAAC;YACH,IAAI,oBAAoB,EAAE,QAAQ,KAAK,IAAI,IAAI,oBAAoB,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;gBAE3F,OAAO;YACR,CAAC;QACF,CAAC;QAED,MAAM,WAAW,GAAS;YACzB,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX,KAAK,EAAE;wBACN,GAAG,KAAK;wBACR,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;qBAClB;oBACD,OAAO,EAAE,EAAE;iBACX;aACD;YACD,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,aAAa;YACnB,SAAS;YACT,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,MAAM,EAAE,OAAO;SACf,CAAC;QAIF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAElE,MAAM,KAAK,EAAE,OAAO,CAAC,sBAAsB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7D,CAAC;IAKD,KAAK,CAAC,GAAG,CACR,IAAmC,EACnC,cAAwB,EACxB,QAAkB,EAClB,kBAA2B,EAC3B,eAA+D;QAG/D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAE9E,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACpD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEhB,MAAM,OAAO,GAAG,IAAA,mDAAgC,EAAC,IAAI,CAAC,aAAa,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACxF,MAAM,cAAc,GAAG,IAAA,2DAA+B,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC1E,MAAM,cAAc,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YACvF,MAAM,cAAc,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YAChE,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACrD,OAAO,WAAW,CAAC;QACpB,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC3E,CAAC;QAGD,MAAM,aAAa,GAClB,OAAO,CAAC,GAAG,CAAC,oCAAoC,KAAK,MAAM;YAC1D,CAAC,CAAC,IAAI,CAAC,cAAc,KAAK,OAAO;YACjC,CAAC,CAAC,IAAI,CAAC,cAAc,KAAK,OAAO,IAAI,IAAI,CAAC,aAAa,KAAK,QAAQ,CAAC;QAEvE,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAClF,CAAC;QAID,IACC,IAAI,CAAC,cAAc,KAAK,OAAO;YAC/B,IAAI,CAAC,gBAAgB,CAAC,YAAY,KAAK,QAAQ;YAC/C,IAAI,CAAC,aAAa,KAAK,QAAQ,EAC9B,CAAC;YACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;YACpF,kBAAkB,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAClC,IAAI,KAAK,YAAY,sCAAuB;oBAAE,OAAO;gBACrD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE;oBAC/B,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;iBAClC,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE;oBACrE,KAAK;oBACL,WAAW;oBACX,UAAU;iBACV,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC;IAIO,KAAK,CAAC,cAAc,CAC3B,WAAmB,EACnB,IAAmC,EACnC,cAAwB,EACxB,kBAA2B;QAE3B,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,IAAI,cAAc,KAAK,IAAI,IAAI,UAAU,EAAE,CAAC;YAC3C,IAAI,CAAC,YAAY,CAAC,UAAU;gBAC3B,MAAM,IAAI,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;QAKD,IAAI,gBAAgC,CAAC;QAErC,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC1D,IAAI,eAAe,GAAG,gBAAgB,CAAC,gBAAgB,IAAI,gBAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAC/F,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;YACzB,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,gBAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,IAAI,OAA6B,CAAC;QAClC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3D,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QACrD,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;YAC7B,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;YAC5B,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK;YAC9B,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;YAC1C,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;YAChC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU;YACxC,QAAQ,EAAE,gBAAgB;YAC1B,OAAO;SACP,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,6BAA6B,CAAC,OAAO,CACjE,IAAI,CAAC,MAAM,EACX,SAAS,EACT,eAAe,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,GAAG,IAAI,CACtE,CAAC;QAEF,cAAc,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAEvD,cAAc,CAAC,WAAW,GAAG,WAAW,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,0BAA0B,IAAI,CAAC,YAAY,CAAC,IAAI,oBAAoB,WAAW,EAAE,EACjF,EAAE,WAAW,EAAE,CACf,CAAC;QACF,IAAI,iBAAoC,CAAC;QACzC,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAEvD,IAAI,CAAC;YACJ,MAAM,cAAc,GAAG,IAAA,2DAA+B,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC1E,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC;YAEtC,cAAc,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACtD,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;YAEH,cAAc,CAAC,kBAAkB,GAAG,6BAA6B,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBACzF,WAAW;aACX,CAAC,CAAC;YAEH,cAAc,CAAC,YAAY,GAAG,6BAA6B,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC7E,OAAO,EAAE,IAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,WAAW,4CAA4C,EAAE;oBAC1F,WAAW;iBACX,CAAC,CAAC;gBACH,MAAM,eAAe,GAAG,IAAI,0BAAe,CAC1C,cAAc,EACd,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,aAAa,CAClB,CAAC;gBACF,iBAAiB,GAAG,eAAe,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACP,iBAAiB,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAC1D,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,OAAO,CACP,CAAC;YACH,CAAC;YAED,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YAE9E,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,gBAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,GAAG,IAAI,CAAC;gBACzF,gBAAgB,GAAG,UAAU,CAAC,GAAG,EAAE;oBAClC,KAAK,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBACvD,CAAC,EAAE,OAAO,CAAC,CAAC;YACb,CAAC;YAED,iBAAiB;iBACf,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;gBACrB,YAAY,CAAC,gBAAgB,CAAC,CAAC;gBAC/B,IAAI,iBAAiB,CAAC,UAAU,EAAE,CAAC;oBAClC,WAAW,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC9B,CAAC;gBACD,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBAClE,IAAI,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,WAAW,CAAC,CAAC;gBACnE,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACnE,CAAC,CAAC;iBACD,KAAK,CACL,KAAK,EAAE,KAAK,EAAE,EAAE,CACf,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CAAC,KAAK,CACpB,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CAAC,KAAK,CACpB,CAAC;YAEF,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC7B,WAAmB,EACnB,IAAmC,EACnC,cAAwB,EACxB,QAAkB;QAElB,MAAM,OAAO,GAAY;YACxB,WAAW;YACX,cAAc,EAAE,CAAC,CAAC,cAAc;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,2BAA2B,GAAC,CAAC;YACrE,IAAI,CAAC,cAAc,GAAG,cAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACrD,CAAC;QAID,IAAI,GAAQ,CAAC;QACb,IAAI,cAAuC,CAAC;QAC5C,IAAI,CAAC;YACJ,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YAEnF,cAAc,GAAG,IAAA,2DAA+B,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAIpE,MAAM,cAAc,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;QACxF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAGhB,MAAM,cAAc,GAAG,IAAA,6DAAiC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YAC5F,MAAM,KAAK,CAAC;QACb,CAAC;QAED,MAAM,iBAAiB,GAAsB,IAAI,sBAAW,CAC3D,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;YACnC,QAAQ,CAAC,YAAY,GAAG,KAAK,CAAC;YAC9B,QAAQ,CAAC,KAAK,IAAI,EAAE;gBACnB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAIvC,MAAM,cAAc,GAAG,IAAA,6DAAiC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC5E,MAAM,KAAK,GAAG,IAAI,sCAAuB,CAAC,WAAW,CAAC,CAAC;gBACvD,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CACd,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC;gBACJ,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IACC,KAAK,YAAY,KAAK;oBACtB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,uCAAuC,CAAC,EAC9D,CAAC;oBACF,KAAK,GAAG,IAAI,8CAAoB,CAAC,KAAK,CAAC,CAAC;gBACzC,CAAC;gBAID,MAAM,cAAc,GAAG,IAAA,6DAAiC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAE5E,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CACd,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC,CAAC;YACf,CAAC;YAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBACzF,WAAW,EAAE,IAAI;gBACjB,aAAa,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACxB,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,WAAW,GAAG,CAAC,CAAC,CAAC;YAC/E,CAAC;YAED,MAAM,OAAO,GAAS;gBACrB,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;gBACpC,IAAI,EAAE,iBAAiB,CAAC,IAAI;gBAC5B,SAAS,EAAE,iBAAiB,CAAC,SAAS;gBACtC,SAAS,EAAE,iBAAiB,CAAC,SAAS;gBACtC,MAAM,EAAE,iBAAiB,CAAC,MAAM;gBAChC,IAAI,EAAE,iBAAiB,CAAC,IAAI;aAC5B,CAAC;YAEF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAI9D,MAAM,cAAc,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YAEhE,OAAO,CAAC,OAAO,CAAC,CAAC;QAClB,CAAC,CACD,CAAC;QAEF,iBAAiB,CAAC,KAAK,CAAC,GAAG,EAAE;QAI7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAC/E,CAAC;CACD,CAAA;AAlZY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,YAAO,GAAE;qCAOiB,iBAAM;QACC,wBAAa;QACV,oCAAgB;QACb,0CAAmB;QACb,wDAAyB;QACzC,sBAAS;QACD,sCAAiB;QAClB,2BAAgB;QACV,iDAAsB;GAdpD,cAAc,CAkZ1B"}
|
|
1
|
+
{"version":3,"file":"workflow-runner.js","sourceRoot":"","sources":["../src/workflow-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,gCAA6C;AAE7C,uCAAoF;AAUpF,+CAAiE;AACjE,gEAAuC;AAEvC,2DAAuD;AACvD,sDAA8B;AAC9B,wFAAoF;AACpF,kFAA4E;AAC5E,8EAAwE;AACxE,+FAIyD;AACzD,gFAA2E;AAC3E,4EAAiF;AACjF,yEAAoE;AACpE,6CAAyC;AAGzC,kGAAoF;AACpF,2FAAqF;AAG9E,IAAM,cAAc,GAApB,MAAM,cAAc;IAK1B,YACkB,MAAc,EACd,aAA4B,EAC5B,gBAAkC,EAClC,mBAAwC,EACxC,yBAAoD,EACpD,SAAoB,EACpB,4BAA0D,EAC1D,gBAAkC,EAClC,sBAA8C,EAC9C,oBAA0C;QAT1C,WAAM,GAAN,MAAM,CAAQ;QACd,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,cAAS,GAAT,SAAS,CAAW;QACpB,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,yBAAoB,GAApB,oBAAoB,CAAsB;QAZpD,mBAAc,GAAG,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAavD,CAAC;IAGJ,KAAK,CAAC,YAAY,CACjB,KAA8C,EAC9C,SAAe,EACf,aAAkC,EAClC,WAAmB,EACnB,KAA+B;QAO/B,IACC,KAAK,YAAY,kDAAsB;YACvC,KAAK,YAAY,sCAAuB;YACxC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAClC,CAAC;YACF,OAAO;QACR,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,WAAW,KAAK,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;QACxF,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAEjD,MAAM,WAAW,GAAG,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC;QAKjE,IAAI,WAAW,EAAE,CAAC;YACjB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBAC5F,WAAW,EAAE,KAAK;aAClB,CAAC,CAAC;YACH,IAAI,oBAAoB,EAAE,QAAQ,KAAK,IAAI,IAAI,oBAAoB,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;gBAE3F,OAAO;YACR,CAAC;QACF,CAAC;QAED,MAAM,WAAW,GAAS;YACzB,IAAI,EAAE;gBACL,UAAU,EAAE;oBACX,KAAK,EAAE;wBACN,GAAG,KAAK;wBACR,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;qBAClB;oBACD,OAAO,EAAE,EAAE;iBACX;aACD;YACD,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,aAAa;YACnB,SAAS;YACT,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,MAAM,EAAE,OAAO;SACf,CAAC;QAIF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAElE,MAAM,KAAK,EAAE,OAAO,CAAC,sBAAsB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7D,CAAC;IAKD,KAAK,CAAC,GAAG,CACR,IAAmC,EACnC,cAAwB,EACxB,QAAkB,EAClB,kBAA2B,EAC3B,eAA+D;QAG/D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;QAE9E,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACpD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,gCAAgC,CACzE,IAAI,CAAC,aAAa,EAClB,KAAK,EACL,KAAK,CAAC,IAAI,CACV,CAAC;YACF,MAAM,cAAc,GAAG,IAAA,2DAA+B,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC1E,MAAM,cAAc,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YACvF,MAAM,cAAc,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YAChE,eAAe,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/B,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACrD,OAAO,WAAW,CAAC;QACpB,CAAC;QAED,IAAI,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC3E,CAAC;QAGD,MAAM,aAAa,GAClB,OAAO,CAAC,GAAG,CAAC,oCAAoC,KAAK,MAAM;YAC1D,CAAC,CAAC,IAAI,CAAC,cAAc,KAAK,OAAO;YACjC,CAAC,CAAC,IAAI,CAAC,cAAc,KAAK,OAAO,IAAI,IAAI,CAAC,aAAa,KAAK,QAAQ,CAAC;QAEvE,IAAI,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAClF,CAAC;QAID,IACC,IAAI,CAAC,cAAc,KAAK,OAAO;YAC/B,IAAI,CAAC,gBAAgB,CAAC,YAAY,KAAK,QAAQ;YAC/C,IAAI,CAAC,aAAa,KAAK,QAAQ,EAC9B,CAAC;YACF,MAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;YACpF,kBAAkB,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBAClC,IAAI,KAAK,YAAY,sCAAuB;oBAAE,OAAO;gBACrD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE;oBAC/B,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;iBAClC,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,EAAE;oBACrE,KAAK;oBACL,WAAW;oBACX,UAAU;iBACV,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC;IAIO,KAAK,CAAC,cAAc,CAC3B,WAAmB,EACnB,IAAmC,EACnC,cAAwB,EACxB,kBAA2B;QAE3B,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,IAAI,cAAc,KAAK,IAAI,IAAI,UAAU,EAAE,CAAC;YAC3C,IAAI,CAAC,YAAY,CAAC,UAAU;gBAC3B,MAAM,IAAI,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACrE,CAAC;QAKD,IAAI,gBAAgC,CAAC;QAErC,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC1D,IAAI,eAAe,GAAG,gBAAgB,CAAC,gBAAgB,IAAI,gBAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAC/F,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;YACzB,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,gBAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACrF,CAAC;QAED,IAAI,OAA6B,CAAC;QAClC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3D,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QACrD,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,uBAAQ,CAAC;YAC7B,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;YAC5B,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK;YAC9B,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;YAC1C,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM;YAChC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU;YACxC,QAAQ,EAAE,gBAAgB;YAC1B,OAAO;SACP,CAAC,CAAC;QACH,MAAM,cAAc,GAAG,MAAM,6BAA6B,CAAC,OAAO,CACjE,IAAI,CAAC,MAAM,EACX,SAAS,EACT,eAAe,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,eAAe,GAAG,IAAI,CACtE,CAAC;QAEF,cAAc,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAEvD,cAAc,CAAC,WAAW,GAAG,WAAW,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,0BAA0B,IAAI,CAAC,YAAY,CAAC,IAAI,oBAAoB,WAAW,EAAE,EACjF,EAAE,WAAW,EAAE,CACf,CAAC;QACF,IAAI,iBAAoC,CAAC;QACzC,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAEvD,IAAI,CAAC;YACJ,MAAM,cAAc,GAAG,IAAA,2DAA+B,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC1E,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC;YAEtC,cAAc,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACtD,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;YAEH,cAAc,CAAC,kBAAkB,GAAG,6BAA6B,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBACzF,WAAW;aACX,CAAC,CAAC;YAEH,cAAc,CAAC,YAAY,GAAG,6BAA6B,CAAC,YAAY,CAAC,IAAI,CAAC;gBAC7E,OAAO,EAAE,IAAI,CAAC,OAAO;aACrB,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,WAAW,4CAA4C,EAAE;oBAC1F,WAAW;iBACX,CAAC,CAAC;gBACH,MAAM,eAAe,GAAG,IAAI,0BAAe,CAC1C,cAAc,EACd,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,aAAa,CAClB,CAAC;gBACF,iBAAiB,GAAG,eAAe,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACP,iBAAiB,GAAG,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAC1D,IAAI,EACJ,QAAQ,EACR,cAAc,EACd,WAAW,EACX,OAAO,CACP,CAAC;YACH,CAAC;YAED,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YAE9E,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,gBAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,GAAG,IAAI,CAAC;gBACzF,gBAAgB,GAAG,UAAU,CAAC,GAAG,EAAE;oBAClC,KAAK,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;gBACvD,CAAC,EAAE,OAAO,CAAC,CAAC;YACb,CAAC;YAED,iBAAiB;iBACf,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;gBACrB,YAAY,CAAC,gBAAgB,CAAC,CAAC;gBAC/B,IAAI,iBAAiB,CAAC,UAAU,EAAE,CAAC;oBAClC,WAAW,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC9B,CAAC;gBACD,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBAClE,IAAI,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,WAAW,CAAC,CAAC;gBACnE,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACnE,CAAC,CAAC;iBACD,KAAK,CACL,KAAK,EAAE,KAAK,EAAE,EAAE,CACf,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CAAC,KAAK,CACpB,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CAAC,KAAK,CACpB,CAAC;YAEF,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC7B,WAAmB,EACnB,IAAmC,EACnC,cAAwB,EACxB,QAAkB;QAElB,MAAM,OAAO,GAAY;YACxB,WAAW;YACX,cAAc,EAAE,CAAC,CAAC,cAAc;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO;SACrB,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,2BAA2B,GAAC,CAAC;YACrE,IAAI,CAAC,cAAc,GAAG,cAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACrD,CAAC;QAID,IAAI,GAAQ,CAAC;QACb,IAAI,cAAuC,CAAC;QAC5C,IAAI,CAAC;YACJ,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;YAEnF,cAAc,GAAG,IAAA,2DAA+B,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAIpE,MAAM,cAAc,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;QACxF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAGhB,MAAM,cAAc,GAAG,IAAA,6DAAiC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC5E,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YAC5F,MAAM,KAAK,CAAC;QACb,CAAC;QAED,MAAM,iBAAiB,GAAsB,IAAI,sBAAW,CAC3D,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;YACnC,QAAQ,CAAC,YAAY,GAAG,KAAK,CAAC;YAC9B,QAAQ,CAAC,KAAK,IAAI,EAAE;gBACnB,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAIvC,MAAM,cAAc,GAAG,IAAA,6DAAiC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAC5E,MAAM,KAAK,GAAG,IAAI,sCAAuB,CAAC,WAAW,CAAC,CAAC;gBACvD,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CACd,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC,CAAC;YACf,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC;gBACJ,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IACC,KAAK,YAAY,KAAK;oBACtB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,uCAAuC,CAAC,EAC9D,CAAC;oBACF,KAAK,GAAG,IAAI,8CAAoB,CAAC,KAAK,CAAC,CAAC;gBACzC,CAAC;gBAID,MAAM,cAAc,GAAG,IAAA,6DAAiC,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAE5E,MAAM,IAAI,CAAC,YAAY,CACtB,KAAK,EACL,IAAI,IAAI,EAAE,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,EACX,cAAc,CACd,CAAC;gBAEF,MAAM,CAAC,KAAK,CAAC,CAAC;YACf,CAAC;YAED,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,EAAE;gBACzF,WAAW,EAAE,IAAI;gBACjB,aAAa,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACxB,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,qCAAqC,WAAW,GAAG,CAAC,CAAC,CAAC;YAC/E,CAAC;YAED,MAAM,OAAO,GAAS;gBACrB,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;gBACpC,IAAI,EAAE,iBAAiB,CAAC,IAAI;gBAC5B,SAAS,EAAE,iBAAiB,CAAC,SAAS;gBACtC,SAAS,EAAE,iBAAiB,CAAC,SAAS;gBACtC,MAAM,EAAE,iBAAiB,CAAC,MAAM;gBAChC,IAAI,EAAE,iBAAiB,CAAC,IAAI;aAC5B,CAAC;YAEF,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAI9D,MAAM,cAAc,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YAEhE,OAAO,CAAC,OAAO,CAAC,CAAC;QAClB,CAAC,CACD,CAAC;QAEF,iBAAiB,CAAC,KAAK,CAAC,GAAG,EAAE;QAI7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAC/E,CAAC;CACD,CAAA;AAvZY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,YAAO,GAAE;qCAOiB,iBAAM;QACC,wBAAa;QACV,oCAAgB;QACb,0CAAmB;QACb,wDAAyB;QACzC,sBAAS;QACU,mDAA4B;QACxC,2BAAgB;QACV,iDAAsB;QACxB,6CAAoB;GAfhD,cAAc,CAuZ1B"}
|
|
@@ -5,9 +5,10 @@ import type { Project } from '../databases/entities/project';
|
|
|
5
5
|
import type { User } from '../databases/entities/user';
|
|
6
6
|
import { ExecutionRepository } from '../databases/repositories/execution.repository';
|
|
7
7
|
import { WorkflowRepository } from '../databases/repositories/workflow.repository';
|
|
8
|
+
import { ExecutionDataService } from '../executions/execution-data.service';
|
|
9
|
+
import { SubworkflowPolicyChecker } from '../executions/pre-execution-checks';
|
|
8
10
|
import type { IWorkflowErrorData } from '../interfaces';
|
|
9
11
|
import { NodeTypes } from '../node-types';
|
|
10
|
-
import { SubworkflowPolicyChecker } from '../subworkflows/subworkflow-policy-checker.service';
|
|
11
12
|
import { TestWebhooks } from '../webhooks/test-webhooks';
|
|
12
13
|
import { WorkflowRunner } from '../workflow-runner';
|
|
13
14
|
import type { WorkflowRequest } from '../workflows/workflow.request';
|
|
@@ -21,7 +22,8 @@ export declare class WorkflowExecutionService {
|
|
|
21
22
|
private readonly workflowRunner;
|
|
22
23
|
private readonly globalConfig;
|
|
23
24
|
private readonly subworkflowPolicyChecker;
|
|
24
|
-
|
|
25
|
+
private readonly executionDataService;
|
|
26
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, testWebhooks: TestWebhooks, workflowRunner: WorkflowRunner, globalConfig: GlobalConfig, subworkflowPolicyChecker: SubworkflowPolicyChecker, executionDataService: ExecutionDataService);
|
|
25
27
|
runWorkflow(workflowData: IWorkflowBase, node: INode, data: INodeExecutionData[][], additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>): Promise<string>;
|
|
26
28
|
private isDestinationNodeATrigger;
|
|
27
29
|
executeManually({ workflowData, runData, startNodes, destinationNode, dirtyNodeNames, triggerToStartFrom, }: WorkflowRequest.ManualRunPayload, user: User, pushRef?: string, partialExecutionVersion?: 1 | 2): Promise<{
|
|
@@ -53,14 +53,14 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
53
53
|
const config_2 = __importDefault(require("../config"));
|
|
54
54
|
const execution_repository_1 = require("../databases/repositories/execution.repository");
|
|
55
55
|
const workflow_repository_1 = require("../databases/repositories/workflow.repository");
|
|
56
|
+
const execution_data_service_1 = require("../executions/execution-data.service");
|
|
57
|
+
const pre_execution_checks_1 = require("../executions/pre-execution-checks");
|
|
56
58
|
const node_types_1 = require("../node-types");
|
|
57
|
-
const subworkflow_policy_checker_service_1 = require("../subworkflows/subworkflow-policy-checker.service");
|
|
58
59
|
const test_webhooks_1 = require("../webhooks/test-webhooks");
|
|
59
60
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
60
|
-
const WorkflowHelpers = __importStar(require("../workflow-helpers"));
|
|
61
61
|
const workflow_runner_1 = require("../workflow-runner");
|
|
62
62
|
let WorkflowExecutionService = class WorkflowExecutionService {
|
|
63
|
-
constructor(logger, errorReporter, executionRepository, workflowRepository, nodeTypes, testWebhooks, workflowRunner, globalConfig, subworkflowPolicyChecker) {
|
|
63
|
+
constructor(logger, errorReporter, executionRepository, workflowRepository, nodeTypes, testWebhooks, workflowRunner, globalConfig, subworkflowPolicyChecker, executionDataService) {
|
|
64
64
|
this.logger = logger;
|
|
65
65
|
this.errorReporter = errorReporter;
|
|
66
66
|
this.executionRepository = executionRepository;
|
|
@@ -70,6 +70,7 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
70
70
|
this.workflowRunner = workflowRunner;
|
|
71
71
|
this.globalConfig = globalConfig;
|
|
72
72
|
this.subworkflowPolicyChecker = subworkflowPolicyChecker;
|
|
73
|
+
this.executionDataService = executionDataService;
|
|
73
74
|
}
|
|
74
75
|
async runWorkflow(workflowData, node, data, additionalData, mode, responsePromise) {
|
|
75
76
|
const nodeExecutionStack = [
|
|
@@ -209,7 +210,7 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
209
210
|
const initialNode = workflowInstance.getStartNode();
|
|
210
211
|
if (initialNode) {
|
|
211
212
|
const errorWorkflowPermissionError = new n8n_workflow_1.SubworkflowOperationError(`Another workflow: (ID ${workflowErrorData.workflow.id}) tried to invoke this workflow to handle errors.`, "Unfortunately current permissions do not allow this. Please check that this workflow's settings allow it to be called by others");
|
|
212
|
-
const fakeExecution =
|
|
213
|
+
const fakeExecution = this.executionDataService.generateFailedExecutionFromError('error', errorWorkflowPermissionError, initialNode);
|
|
213
214
|
const fullExecutionData = {
|
|
214
215
|
data: fakeExecution.data,
|
|
215
216
|
mode: fakeExecution.mode,
|
|
@@ -323,6 +324,7 @@ exports.WorkflowExecutionService = WorkflowExecutionService = __decorate([
|
|
|
323
324
|
test_webhooks_1.TestWebhooks,
|
|
324
325
|
workflow_runner_1.WorkflowRunner,
|
|
325
326
|
config_1.GlobalConfig,
|
|
326
|
-
|
|
327
|
+
pre_execution_checks_1.SubworkflowPolicyChecker,
|
|
328
|
+
execution_data_service_1.ExecutionDataService])
|
|
327
329
|
], WorkflowExecutionService);
|
|
328
330
|
//# sourceMappingURL=workflow-execution.service.js.map
|