mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

getExecution can now return undefined if there is no active execution for that id

Browse source
This commit is contained in:
Danny Martini 2024-09-19 11:01:35 +02:00
parent 9b0b0fbf57
commit 047b1d13c0
No known key found for this signature in database
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
packages/cli/src/active-executions.ts
View file

@ -127,14 +127,20 @@ export class ActiveExecutions {
*/
attachWorkflowExecution(executionId: string, workflowExecution: PCancelable<IRun>) {
this.getExecution(executionId).workflowExecution = workflowExecution;
const execution = this.getExecution(executionId);
if (execution) {
execution.workflowExecution = workflowExecution;
}
}
attachResponsePromise(
executionId: string,
responsePromise: IDeferredPromise<IExecuteResponsePromiseData>,
): void {
this.getExecution(executionId).responsePromise = responsePromise;
const execution = this.getExecution(executionId);
if (execution) {
execution.responsePromise = responsePromise;
}
}
resolveResponsePromise(executionId: string, response: IExecuteResponsePromiseData): void {
@ -145,23 +151,31 @@ export class ActiveExecutions {
/** Cancel the execution promise and reject its post-execution promise. */
stopExecution(executionId: string): void {
const execution = this.getExecution(executionId);
if (execution) {
execution.workflowExecution?.cancel();
execution.postExecutePromise.reject(new ExecutionCancelledError(executionId));
this.logger.debug('Execution cancelled', { executionId });
}
}
/** Resolve the post-execution promise in an execution. */
finalizeExecution(executionId: string, fullRunData?: IRun) {
const execution = this.getExecution(executionId);
if (execution) {
execution.postExecutePromise.resolve(fullRunData);
this.logger.debug('Execution finalized', { executionId });
}
}
/**
* Returns a promise which will resolve with the data of the execution with the given id
*/
async getPostExecutePromise(executionId: string): Promise<IRun | undefined> {
return await this.getExecution(executionId).postExecutePromise.promise;
const execution = this.getExecution(executionId);
if (execution) {
return await execution.postExecutePromise.promise;
}
return undefined;
}
/**
@ -188,11 +202,14 @@ export class ActiveExecutions {
}
setStatus(executionId: string, status: ExecutionStatus) {
this.getExecution(executionId).status = status;
const execution = this.getExecution(executionId);
if (execution) {
execution.status = status;
}
}
getStatus(executionId: string): ExecutionStatus {
return this.getExecution(executionId).status;
getStatus(executionId: string): ExecutionStatus | undefined {
return this.getExecution(executionId)?.status;
}
/** Wait for all active executions to finish */
@ -224,7 +241,7 @@ export class ActiveExecutions {
}
}
private getExecution(executionId: string): IExecutingWorkflowData {
private getExecution(executionId: string): IExecutingWorkflowData | undefined {
const execution = this.activeExecutions[executionId];
if (!execution) {
ErrorReporterProxy.error(new ExecutionNotFoundError(executionId));

5
packages/cli/src/workflow-runner.ts
View file

@ -334,7 +334,10 @@ export class WorkflowRunner {
if (workflowExecution.isCanceled) {
fullRunData.finished = false;
}
fullRunData.status = this.activeExecutions.getStatus(executionId);
const status = this.activeExecutions.getStatus(executionId);
if (status) {
fullRunData.status = status;
}
this.activeExecutions.finalizeExecution(executionId, fullRunData);
})
.catch(