n8n-core 2.28.2 → 2.29.0

package/dist/execution-engine/scheduled-task-manager.js

@@ -15,21 +15,21 @@ const config_1 = require("@n8n/config");
 const constants_1 = require("@n8n/constants");
 const di_1 = require("@n8n/di");
 const cron_1 = require("cron");
-const errors_1 = require("../errors");
 const instance_settings_1 = require("../instance-settings");
 let ScheduledTaskManager = class ScheduledTaskManager {
     get loggableCrons() {
         const loggableCrons = {};
-        for (const [workflowId, crons] of this.cronsByWorkflow) {
-            loggableCrons[`workflowId-${workflowId}`] = Array.from(crons.values()).map(({ summary }) => summary);
+        for (const [groupType, cronsByGroup] of this.cronsByGroupType) {
+            for (const [groupId, crons] of cronsByGroup) {
+                loggableCrons[`${groupType}GroupId-${groupId}`] = Array.from(crons.values()).map(({ summary }) => summary);
+            }
         }
         return loggableCrons;
     }
-    constructor(instanceSettings, logger, { activeInterval }, errorReporter) {
+    constructor(instanceSettings, logger, { activeInterval }) {
         this.instanceSettings = instanceSettings;
         this.logger = logger;
-        this.errorReporter = errorReporter;
-        this.cronsByWorkflow = new Map();
+        this.cronsByGroupType = new Map();
         this.logger = this.logger.scoped('cron');
         if (activeInterval === 0)
             return;
@@ -38,27 +38,38 @@ let ScheduledTaskManager = class ScheduledTaskManager {
                 return;
             this.logger.debug('Currently active crons', { active: this.loggableCrons });
         }, activeInterval * constants_1.Time.minutes.toMilliseconds);
+        this.logInterval.unref?.();
     }
-    registerCron(ctx, onTick) {
-        const { workflowId, timezone, nodeId, expression, recurrence } = ctx;
+    register(ctx, onTick) {
+        const { group, targetId, timezone, expression, recurrence } = ctx;
+        if (!this.instanceSettings.isLeader) {
+            this.logger.debug('Skipped cron registration on follower instance', {
+                groupType: group.type,
+                groupId: group.id,
+                targetId,
+                timezone,
+                expression,
+                recurrence,
+                instanceRole: this.instanceSettings.instanceRole,
+            });
+            return false;
+        }
         const summary = recurrence?.activated
             ? `${expression} (every ${recurrence.intervalSize} ${recurrence.typeInterval})`
             : expression;
-        const workflowCrons = this.cronsByWorkflow.get(workflowId);
-        const key = this.toCronKey({ workflowId, nodeId, expression, timezone, recurrence });
-        if (workflowCrons?.has(key)) {
-            this.errorReporter.error('Skipped registration for already registered cron', {
-                tags: { cron: 'duplicate' },
-                extra: {
-                    workflowId,
-                    timezone,
-                    nodeId,
-                    expression,
-                    recurrence,
-                    instanceRole: this.instanceSettings.instanceRole,
-                },
+        const groupCrons = this.getGroupCrons(group);
+        const key = this.toCronKey(ctx);
+        if (groupCrons?.has(key)) {
+            this.logger.warn('Skipped registration for already registered cron', {
+                groupType: group.type,
+                groupId: group.id,
+                targetId,
+                timezone,
+                expression,
+                recurrence,
+                instanceRole: this.instanceSettings.instanceRole,
             });
-            return;
+            return false;
         }
         const cronTime = new cron_1.CronTime(expression, timezone);
         const computeNext = () => cronTime.sendAt().toJSDate();
@@ -68,98 +79,126 @@ let ScheduledTaskManager = class ScheduledTaskManager {
                 return;
             const firedFor = scheduledTime;
             scheduledTime = computeNext();
-            this.logger.debug('Executing cron for workflow', {
-                workflowId,
-                nodeId,
+            this.logger.debug('Executing cron', {
+                groupType: group.type,
+                groupId: group.id,
+                targetId,
                 cron: summary,
                 instanceRole: this.instanceSettings.instanceRole,
             });
             onTick(firedFor);
         };
         const job = new cron_1.CronJob(expression, handleTick, undefined, true, timezone);
-        const cron = { job, summary, ctx };
-        if (!workflowCrons) {
-            this.cronsByWorkflow.set(workflowId, new Map([[key, cron]]));
-        }
-        else {
-            workflowCrons.set(key, cron);
-        }
-        this.logger.debug('Registered cron for workflow', {
-            workflowId,
+        this.setCron(group, key, { job, summary, ctx });
+        this.logger.debug('Registered cron', {
+            groupType: group.type,
+            groupId: group.id,
+            targetId,
             cron: summary,
             instanceRole: this.instanceSettings.instanceRole,
         });
+        return true;
     }
-    deregisterCrons(workflowId) {
-        const workflowCrons = this.cronsByWorkflow.get(workflowId);
-        if (!workflowCrons || workflowCrons.size === 0)
+    deregisterGroup(group) {
+        const groupCrons = this.getGroupCrons(group);
+        if (!groupCrons || groupCrons.size === 0)
             return false;
         const summaries = [];
-        for (const cron of workflowCrons.values()) {
+        for (const cron of groupCrons.values()) {
             summaries.push(cron.summary);
             void cron.job.stop();
         }
-        this.cronsByWorkflow.delete(workflowId);
-        this.logger.info('Deregistered all crons for workflow', {
-            workflowId,
+        this.deleteGroupCrons(group);
+        this.logger.info('Deregistered all crons', {
+            groupType: group.type,
+            groupId: group.id,
             crons: summaries,
             instanceRole: this.instanceSettings.instanceRole,
         });
         return true;
     }
-    getWorkflowIdsWithCrons() {
-        return Array.from(this.cronsByWorkflow.keys());
+    getGroupIds(groupType) {
+        return Array.from(this.cronsByGroupType.get(groupType)?.keys() ?? []);
     }
-    getCronNodeIds(workflowId) {
-        const workflowCrons = this.cronsByWorkflow.get(workflowId);
-        if (!workflowCrons)
+    getTargetIds(group) {
+        const groupCrons = this.getGroupCrons(group);
+        if (!groupCrons)
             return [];
-        const nodeIds = new Set();
-        for (const cron of workflowCrons.values()) {
-            nodeIds.add(cron.ctx.nodeId);
+        const targetIds = new Set();
+        for (const cron of groupCrons.values()) {
+            targetIds.add(cron.ctx.targetId);
         }
-        return Array.from(nodeIds);
+        return Array.from(targetIds);
     }
-    deregisterCron(workflowId, nodeId) {
-        const workflowCrons = this.cronsByWorkflow.get(workflowId);
-        if (!workflowCrons || workflowCrons.size === 0)
+    deregisterTarget(group, targetId) {
+        const groupCrons = this.getGroupCrons(group);
+        if (!groupCrons || groupCrons.size === 0)
             return;
         const summaries = [];
-        for (const [key, cron] of workflowCrons) {
-            if (cron.ctx.nodeId !== nodeId)
+        for (const [key, cron] of groupCrons) {
+            if (cron.ctx.targetId !== targetId)
                 continue;
             summaries.push(cron.summary);
             void cron.job.stop();
-            workflowCrons.delete(key);
+            groupCrons.delete(key);
         }
-        if (workflowCrons.size === 0)
-            this.cronsByWorkflow.delete(workflowId);
+        if (groupCrons.size === 0)
+            this.deleteGroupCrons(group);
         if (summaries.length === 0)
             return;
-        this.logger.info('Deregistered crons for node', {
-            workflowId,
-            nodeId,
+        this.logger.info('Deregistered crons', {
+            groupType: group.type,
+            groupId: group.id,
+            targetId,
             crons: summaries,
             instanceRole: this.instanceSettings.instanceRole,
         });
     }
-    hasCrons(workflowId) {
-        const workflowCrons = this.cronsByWorkflow.get(workflowId);
-        return workflowCrons !== undefined && workflowCrons.size > 0;
+    hasGroup(group) {
+        const groupCrons = this.getGroupCrons(group);
+        return groupCrons !== undefined && groupCrons.size > 0;
+    }
+    hasTarget(group, targetId) {
+        return this.getTargetIds(group).includes(targetId);
+    }
+    deregisterGroups(groupType) {
+        for (const groupId of this.getGroupIds(groupType)) {
+            this.deregisterGroup({ type: groupType, id: groupId });
+        }
+    }
+    getGroupCrons(group) {
+        return this.cronsByGroupType.get(group.type)?.get(group.id);
     }
-    deregisterAllCrons() {
-        for (const workflowId of this.cronsByWorkflow.keys()) {
-            this.deregisterCrons(workflowId);
+    deleteGroupCrons(group) {
+        const cronsByGroup = this.cronsByGroupType.get(group.type);
+        if (!cronsByGroup)
+            return;
+        cronsByGroup.delete(group.id);
+        if (cronsByGroup.size === 0)
+            this.cronsByGroupType.delete(group.type);
+    }
+    setCron(group, key, cron) {
+        let cronsByGroup = this.cronsByGroupType.get(group.type);
+        if (!cronsByGroup) {
+            cronsByGroup = new Map();
+            this.cronsByGroupType.set(group.type, cronsByGroup);
+        }
+        const groupCrons = cronsByGroup.get(group.id);
+        if (!groupCrons) {
+            cronsByGroup.set(group.id, new Map([[key, cron]]));
+        }
+        else {
+            groupCrons.set(key, cron);
         }
-        clearInterval(this.logInterval);
-        this.logInterval = undefined;
     }
     toCronKey(ctx) {
-        const { recurrence, ...rest } = ctx;
+        const { recurrence, group, ...rest } = ctx;
         const flattened = !recurrence
-            ? rest
+            ? { ...rest, groupType: group.type, groupId: group.id }
             : {
                 ...rest,
+                groupType: group.type,
+                groupId: group.id,
                 recurrenceActivated: recurrence.activated,
                 ...(recurrence.activated && {
                     recurrenceIndex: recurrence.index,
@@ -181,7 +220,6 @@ exports.ScheduledTaskManager = ScheduledTaskManager = __decorate([
     (0, di_1.Service)(),
     __metadata("design:paramtypes", [instance_settings_1.InstanceSettings,
         backend_common_1.Logger,
-        config_1.CronLoggingConfig,
-        errors_1.ErrorReporter])
+        config_1.CronLoggingConfig])
 ], ScheduledTaskManager);
 //# sourceMappingURL=scheduled-task-manager.js.map

package/dist/execution-engine/scheduled-task-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-task-manager.js","sourceRoot":"","sources":["../../src/execution-engine/scheduled-task-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduled-task-manager.js","sourceRoot":"","sources":["../../src/execution-engine/scheduled-task-manager.ts"],"names":[],"mappings":"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"}

package/dist/execution-engine/workflow-active-triggers-state.d.ts

@@ -1,11 +1,20 @@
 import type { ITriggerResponse } from 'n8n-workflow';
+export type TriggerRegistrationToken = symbol;
 export declare class WorkflowActiveTriggersState {
-    private readonly triggersByNodeId;
-    add(nodeId: string, response: ITriggerResponse): void;
+    private readonly registrationsByNodeId;
+    private pendingRegistrations;
+    beginRegistration(): void;
+    finishRegistration(): void;
+    get hasPendingRegistrations(): boolean;
+    addTriggerResponse(nodeId: string, response: ITriggerResponse): TriggerRegistrationToken;
+    addScheduledTrigger(nodeId: string): TriggerRegistrationToken;
+    addPoller(nodeId: string): TriggerRegistrationToken;
+    private getOrCreateRegistration;
     get(nodeId: string): ITriggerResponse | undefined;
     has(nodeId: string): boolean;
+    isCurrent(nodeId: string, token: TriggerRegistrationToken): boolean;
     delete(nodeId: string): void;
     get isEmpty(): boolean;
     get nodeIds(): IterableIterator<string>;
-    get triggerResponses(): IterableIterator<ITriggerResponse>;
+    triggerResponses(): IterableIterator<ITriggerResponse>;
 }

package/dist/execution-engine/workflow-active-triggers-state.js

@@ -3,28 +3,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowActiveTriggersState = void 0;
 class WorkflowActiveTriggersState {
     constructor() {
-        this.triggersByNodeId = new Map();
+        this.registrationsByNodeId = new Map();
+        this.pendingRegistrations = 0;
     }
-    add(nodeId, response) {
-        this.triggersByNodeId.set(nodeId, response);
+    beginRegistration() {
+        this.pendingRegistrations += 1;
+    }
+    finishRegistration() {
+        this.pendingRegistrations -= 1;
+    }
+    get hasPendingRegistrations() {
+        return this.pendingRegistrations > 0;
+    }
+    addTriggerResponse(nodeId, response) {
+        const registration = this.getOrCreateRegistration(nodeId);
+        registration.response = response;
+        return registration.token;
+    }
+    addScheduledTrigger(nodeId) {
+        return this.getOrCreateRegistration(nodeId).token;
+    }
+    addPoller(nodeId) {
+        return this.getOrCreateRegistration(nodeId).token;
+    }
+    getOrCreateRegistration(nodeId) {
+        const existing = this.registrationsByNodeId.get(nodeId);
+        if (existing)
+            return existing;
+        const registration = { token: Symbol(nodeId) };
+        this.registrationsByNodeId.set(nodeId, registration);
+        return registration;
     }
     get(nodeId) {
-        return this.triggersByNodeId.get(nodeId);
+        return this.registrationsByNodeId.get(nodeId)?.response;
     }
     has(nodeId) {
-        return this.triggersByNodeId.has(nodeId);
+        return this.registrationsByNodeId.has(nodeId);
+    }
+    isCurrent(nodeId, token) {
+        return this.registrationsByNodeId.get(nodeId)?.token === token;
     }
     delete(nodeId) {
-        this.triggersByNodeId.delete(nodeId);
+        this.registrationsByNodeId.delete(nodeId);
     }
     get isEmpty() {
-        return this.triggersByNodeId.size === 0;
+        return this.registrationsByNodeId.size === 0;
     }
     get nodeIds() {
-        return this.triggersByNodeId.keys();
+        return this.registrationsByNodeId.keys();
     }
-    get triggerResponses() {
-        return this.triggersByNodeId.values();
+    *triggerResponses() {
+        for (const registration of this.registrationsByNodeId.values()) {
+            if (registration.response)
+                yield registration.response;
+        }
     }
 }
 exports.WorkflowActiveTriggersState = WorkflowActiveTriggersState;

package/dist/execution-engine/workflow-active-triggers-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-active-triggers-state.js","sourceRoot":"","sources":["../../src/execution-engine/workflow-active-triggers-state.ts"],"names":[],"mappings":";;;AAMA,MAAa,2BAA2B;IAAxC;QACkB,qBAAgB,GAAG,IAAI,GAAG,EAA4B,CAAC;IAoCzE,CAAC;IAjCA,GAAG,CAAC,MAAc,EAAE,QAA0B;QAC7C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAGD,GAAG,CAAC,MAAc;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAGD,GAAG,CAAC,MAAc;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAGD,MAAM,CAAC,MAAc;QACpB,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAGD,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC,CAAC;IACzC,CAAC;IAGD,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;IACrC,CAAC;IAGD,IAAI,gBAAgB;QACnB,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;IACvC,CAAC;CACD;AArCD,kEAqCC"}
+{"version":3,"file":"workflow-active-triggers-state.js","sourceRoot":"","sources":["../../src/execution-engine/workflow-active-triggers-state.ts"],"names":[],"mappings":";;;AAaA,MAAa,2BAA2B;IAAxC;QACkB,0BAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;QAExE,yBAAoB,GAAG,CAAC,CAAC;IAiFlC,CAAC;IA9EA,iBAAiB;QAChB,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAC;IAChC,CAAC;IAGD,kBAAkB;QACjB,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAC;IAChC,CAAC;IAGD,IAAI,uBAAuB;QAC1B,OAAO,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC;IACtC,CAAC;IAGD,kBAAkB,CAAC,MAAc,EAAE,QAA0B;QAC5D,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC1D,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEjC,OAAO,YAAY,CAAC,KAAK,CAAC;IAC3B,CAAC;IAGD,mBAAmB,CAAC,MAAc;QACjC,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC;IAGD,SAAS,CAAC,MAAc;QACvB,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;IACnD,CAAC;IAEO,uBAAuB,CAAC,MAAc;QAC7C,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,YAAY,GAAwB,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACpE,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAErD,OAAO,YAAY,CAAC;IACrB,CAAC;IAGD,GAAG,CAAC,MAAc;QACjB,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;IACzD,CAAC;IAGD,GAAG,CAAC,MAAc;QACjB,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAGD,SAAS,CAAC,MAAc,EAAE,KAA+B;QACxD,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,KAAK,CAAC;IAChE,CAAC;IAGD,MAAM,CAAC,MAAc;QACpB,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAGD,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,CAAC;IAC9C,CAAC;IAGD,IAAI,OAAO;QACV,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;IAGD,CAAC,gBAAgB;QAChB,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC;YAChE,IAAI,YAAY,CAAC,QAAQ;gBAAE,MAAM,YAAY,CAAC,QAAQ,CAAC;QACxD,CAAC;IACF,CAAC;CACD;AApFD,kEAoFC"}

package/dist/execution-engine/workflow-execute.js

@@ -139,17 +139,22 @@ class WorkflowExecute {
             let startNode;
             const parentNodes = workflow.getParentNodes(destinationNode.nodeName);
             for (const nodeName of parentNodes) {
-                if (runData[nodeName]) {
-                    startNode = workflow.getNode(nodeName);
+                const parentNode = workflow.getNode(nodeName);
+                if (parentNode && !parentNode.disabled && runData[nodeName]) {
+                    startNode = parentNode;
                     break;
                 }
             }
             if (!startNode) {
-                throw new n8n_workflow_1.UserError('Connect a trigger to run this node');
+                throw new n8n_workflow_1.UserError("Connect a trigger and make sure it's enabled to run this node");
             }
             trigger = startNode;
         }
-        graph = (0, partial_execution_utils_1.findSubgraph)({ graph: (0, partial_execution_utils_1.filterDisabledNodes)(graph), destination, trigger });
+        const filteredGraph = (0, partial_execution_utils_1.filterDisabledNodes)(graph);
+        if (destination.disabled) {
+            throw new n8n_workflow_1.UserError('Cannot execute a disabled node');
+        }
+        graph = (0, partial_execution_utils_1.findSubgraph)({ graph: filteredGraph, destination, trigger });
         const filteredNodes = graph.getNodes();
         const dirtyNodes = graph.getNodesByNames(dirtyNodeNames);
         runData = (0, partial_execution_utils_1.cleanRunData)(runData, graph, dirtyNodes);