npm - n8n - Versions diffs - 1.77.3 → 1.78.0 - Mend

n8n 1.77.3 → 1.78.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.

Files changed (163) hide show

package/dist/active-executions.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { Logger } from 'n8n-core';
 import type { IDeferredPromise, IExecuteResponsePromiseData, IRun, ExecutionStatus, IWorkflowExecutionDataProcess } from 'n8n-workflow';
 import type PCancelable from 'p-cancelable';
 import { ExecutionRepository } from './databases/repositories/execution.repository';
-import type { IExecutionsCurrentSummary } from './interfaces';
+import type { IExecutingWorkflowData, IExecutionsCurrentSummary } from './interfaces';
 import { ConcurrencyControlService } from './concurrency/concurrency-control.service';
 export declare class ActiveExecutions {
     private readonly logger;
@@ -22,5 +22,5 @@ export declare class ActiveExecutions {
     setStatus(executionId: string, status: ExecutionStatus): void;
     getStatus(executionId: string): ExecutionStatus;
     shutdown(cancelAll?: boolean): Promise<void>;
-    private getExecution;
+    getExecution(executionId: string): IExecutingWorkflowData;
 }

package/dist/active-executions.js CHANGED Viewed

@@ -44,9 +44,7 @@ let ActiveExecutions = class ActiveExecutions {
                 status: executionStatus,
                 workflowId: executionData.workflowData.id,
             };
-            if (executionData.retryOf !== undefined) {
-                fullExecutionData.retryOf = executionData.retryOf.toString();
-            }
+            fullExecutionData.retryOf = executionData.retryOf ?? undefined;
             const workflowId = executionData.workflowData.id;
             if (workflowId !== undefined && (0, utils_1.isWorkflowIdValid)(workflowId)) {
                 fullExecutionData.workflowId = workflowId;
@@ -69,12 +67,14 @@ let ActiveExecutions = class ActiveExecutions {
             };
             await this.executionRepository.updateExistingExecution(executionId, execution);
         }
+        const resumingExecution = this.activeExecutions[executionId];
         const postExecutePromise = (0, n8n_workflow_1.createDeferredPromise)();
         this.activeExecutions[executionId] = {
             executionData,
-            startedAt: new Date(),
+            startedAt: resumingExecution?.startedAt ?? new Date(),
             postExecutePromise,
             status: executionStatus,
+            responsePromise: resumingExecution?.responsePromise,
         };
         void postExecutePromise.promise
             .catch((error) => {
@@ -84,8 +84,10 @@ let ActiveExecutions = class ActiveExecutions {
         })
             .finally(() => {
             this.concurrencyControl.release({ mode: executionData.executionMode });
-            delete this.activeExecutions[executionId];
-            this.logger.debug('Execution removed', { executionId });
+            if (this.activeExecutions[executionId]?.status !== 'waiting') {
+                delete this.activeExecutions[executionId];
+                this.logger.debug('Execution removed', { executionId });
+            }
         });
         this.logger.debug('Execution added', { executionId });
         return executionId;
@@ -126,7 +128,7 @@ let ActiveExecutions = class ActiveExecutions {
             data = this.activeExecutions[id];
             returnData.push({
                 id,
-                retryOf: data.executionData.retryOf,
+                retryOf: data.executionData.retryOf ?? undefined,
                 startedAt: data.startedAt,
                 mode: data.executionData.executionMode,
                 workflowId: data.executionData.workflowData.id,

package/dist/active-executions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"active-executions.js","sourceRoot":"","sources":["../src/active-executions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAAkC;AAClC,uCAAkC;AAQlC,+CAAqF;AACrF,6CAA+C;AAG/C,wFAAoF;AACpF,kFAA4E;AAO5E,mCAA4C;AAE5C,2FAAsF;AACtF,sDAA8B;AAGvB,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAQ5B,YACkB,MAAc,EACd,mBAAwC,EACxC,kBAA6C;QAF7C,WAAM,GAAN,MAAM,CAAQ;QACd,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,uBAAkB,GAAlB,kBAAkB,CAA2B;QAPvD,qBAAgB,GAEpB,EAAE,CAAC;IAMJ,CAAC;IAEJ,GAAG,CAAC,WAAmB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;IACzD,CAAC;IAKD,KAAK,CAAC,GAAG,CAAC,aAA4C,EAAE,WAAoB;QAC3E,IAAI,eAAe,GAAoB,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;QACvE,MAAM,IAAI,GAAG,aAAa,CAAC,aAAa,CAAC;QACzC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAG/B,MAAM,iBAAiB,GAA2B;gBACjD,IAAI,EAAE,aAAa,CAAC,aAAc;gBAClC,IAAI;gBACJ,QAAQ,EAAE,KAAK;gBACf,YAAY,EAAE,aAAa,CAAC,YAAY;gBACxC,MAAM,EAAE,eAAe;gBACvB,UAAU,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE;aACzC,CAAC;YAEF,~~IAAI,aAAa,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACzC,~~iBAAiB,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,~~CAAC~~,~~QAAQ~~,~~EAAE,~~CAAC;~~YAC9D~~,~~CAAC;YAED,~~MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YACjD,IAAI,UAAU,KAAK,SAAS,IAAI,IAAA,yBAAiB,EAAC,UAAU,CAAC,EAAE,CAAC;gBAC/D,iBAAiB,CAAC,UAAU,GAAG,UAAU,CAAC;YAC3C,CAAC;YAED,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;YACnF,IAAA,oBAAM,EAAC,WAAW,CAAC,CAAC;YAEpB,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,SAAS,EAAE,CAAC;gBACpD,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;gBAC9D,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YACxD,CAAC;YACD,eAAe,GAAG,SAAS,CAAC;QAC7B,CAAC;aAAM,CAAC;YAGP,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;YAE9D,MAAM,SAAS,GAA8D;gBAC5E,EAAE,EAAE,WAAW;gBACf,IAAI,EAAE,aAAa,CAAC,aAAc;gBAClC,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,eAAe;aAEvB,CAAC;YAEF,MAAM,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAChF,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAA,oCAAqB,GAAoB,CAAC;QAErE,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,GAAG;YACpC,aAAa;YACb,SAAS,EAAE,IAAI,IAAI,EAAE;~~YACrB~~,kBAAkB;YAClB,MAAM,EAAE,eAAe;~~SACvB~~,CAAC;QAGF,KAAK,kBAAkB,CAAC,OAAO;aAC7B,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAChB,IAAI,KAAK,YAAY,sCAAuB;gBAAE,OAAO;YACrD,MAAM,KAAK,CAAC;QACb,CAAC,CAAC;aACD,OAAO,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;~~YAC1C~~,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;~~QACzD~~,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;QAEtD,OAAO,WAAW,CAAC;IACpB,CAAC;IAMD,uBAAuB,CAAC,WAAmB,EAAE,iBAAoC;QAChF,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IACtE,CAAC;IAED,qBAAqB,CACpB,WAAmB,EACnB,eAA8D;QAE9D,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,eAAe,GAAG,eAAe,CAAC;IAClE,CAAC;IAED,sBAAsB,CAAC,WAAmB,EAAE,QAAqC;QAChF,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrD,SAAS,EAAE,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAGD,aAAa,CAAC,WAAmB;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAE7B,OAAO;QACR,CAAC;QACD,SAAS,CAAC,iBAAiB,EAAE,MAAM,EAAE,CAAC;QACtC,SAAS,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,sCAAuB,CAAC,WAAW,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAC3D,CAAC;IAGD,iBAAiB,CAAC,WAAmB,EAAE,WAAkB;QACxD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC;YAAE,OAAO;QACnC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACjD,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IAC3D,CAAC;IAKD,KAAK,CAAC,qBAAqB,CAAC,WAAmB;QAC9C,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC;IACxE,CAAC;IAKD,mBAAmB;QAClB,MAAM,UAAU,GAAgC,EAAE,CAAC;QAEnD,IAAI,IAAI,CAAC;QAET,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrD,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACjC,UAAU,CAAC,IAAI,CAAC;gBACf,EAAE;gBACF,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO;~~gBACnC~~,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,aAAa;gBACtC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE;gBAC9C,MAAM,EAAE,IAAI,CAAC,MAAM;aACnB,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAED,SAAS,CAAC,WAAmB,EAAE,MAAuB;QACrD,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,WAAmB;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;IAC9C,CAAC;IAGD,KAAK,CAAC,QAAQ,CAAC,SAAS,GAAG,KAAK;QAC/B,IAAI,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAEtD,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,SAAS,EAAE,CAAC;YAGpD,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,CAAC;QACnC,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACf,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,SAAS,EAAE,CAAC;gBACpD,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAChE,CAAC;YAED,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;QACxE,CAAC;QAED,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,OAAO,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,IAAI,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,YAAY,CAAC,MAAM,iCAAiC,CAAC,CAAC;YACvF,CAAC;YAED,MAAM,IAAA,oBAAK,EAAC,GAAG,CAAC,CAAC;YACjB,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACnD,CAAC;IACF,CAAC;~~IAEO~~,YAAY,CAAC,WAAmB;~~QACvC~~,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,MAAM,IAAI,kDAAsB,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;CACD,CAAA;~~AAjNY~~,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAUiB,iBAAM;QACO,0CAAmB;QACpB,uDAAyB;GAXnD,gBAAgB,~~CAiN5B~~"}
1	+ {"version":3,"file":"active-executions.js","sourceRoot":"","sources":["../src/active-executions.ts"],"names":[],"mappings":"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"}