n8n 1.15.2 → 1.16.0

package/dist/AbstractServer.js

@@ -50,6 +50,9 @@ class AbstractServer {
         this.testWebhooksEnabled = false;
         this.app = (0, express_1.default)();
         this.app.disable('x-powered-by');
+        const proxyHops = config_1.default.getEnv('proxy_hops');
+        if (proxyHops > 0)
+            this.app.set('trust proxy', proxyHops);
         this.protocol = config_1.default.getEnv('protocol');
         this.sslKey = config_1.default.getEnv('ssl_key');
         this.sslCert = config_1.default.getEnv('ssl_cert');

package/dist/AbstractServer.js.map

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

package/dist/ActiveWorkflowRunner.d.ts

@@ -1,39 +1,61 @@
+import { ActiveWorkflows } from 'n8n-core';
 import type { ExecutionError, IDeferredPromise, IExecuteResponsePromiseData, IGetExecutePollFunctions, IGetExecuteTriggerFunctions, INode, INodeExecutionData, IWorkflowBase, IWorkflowExecuteAdditionalData as IWorkflowExecuteAdditionalDataWorkflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
 import { Workflow } from 'n8n-workflow';
 import type express from 'express';
-import type { IActivationError, IResponseCallbackData, IWebhookManager, IWorkflowDb, WebhookRequest } from './Interfaces';
+import type { IResponseCallbackData, IWebhookManager, IWorkflowDb, WebhookRequest } from './Interfaces';
 import type { User } from './databases/entities/User';
+import type { WorkflowEntity } from './databases/entities/WorkflowEntity';
 import { ActiveExecutions } from './ActiveExecutions';
 import { NodeTypes } from './NodeTypes';
 import { ExternalHooks } from './ExternalHooks';
 import { WebhookService } from './services/webhook.service';
 import { Logger } from './Logger';
+import { WorkflowRepository } from './databases/repositories';
+import type { MultiMainInstancePublisher } from './services/orchestration/main/MultiMainInstance.publisher.ee';
 export declare class ActiveWorkflowRunner implements IWebhookManager {
     private readonly logger;
     private readonly activeExecutions;
     private readonly externalHooks;
     private readonly nodeTypes;
     private readonly webhookService;
-    private activeWorkflows;
+    private readonly workflowRepository;
+    activeWorkflows: ActiveWorkflows;
     private activationErrors;
-    private queuedWorkflowActivations;
-    constructor(logger: Logger, activeExecutions: ActiveExecutions, externalHooks: ExternalHooks, nodeTypes: NodeTypes, webhookService: WebhookService);
+    private queuedActivations;
+    isMultiMainScenario: boolean;
+    multiMainInstancePublisher: MultiMainInstancePublisher | undefined;
+    constructor(logger: Logger, activeExecutions: ActiveExecutions, externalHooks: ExternalHooks, nodeTypes: NodeTypes, webhookService: WebhookService, workflowRepository: WorkflowRepository);
     init(): Promise<void>;
     removeAll(): Promise<void>;
     executeWebhook(request: WebhookRequest, response: express.Response): Promise<IResponseCallbackData>;
     getWebhookMethods(path: string): Promise<import("n8n-workflow").IHttpRequestMethods[]>;
-    getActiveWorkflows(user?: User): Promise<string[]>;
-    isActive(id: string): Promise<boolean>;
-    getActivationError(id: string): IActivationError | undefined;
-    addWorkflowWebhooks(workflow: Workflow, additionalData: IWorkflowExecuteAdditionalDataWorkflow, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): Promise<void>;
-    removeWorkflowWebhooks(workflowId: string): Promise<void>;
+    allActiveInMemory(): string[];
+    allActiveInStorage(user?: User): Promise<string[]>;
+    isActive(workflowId: string): Promise<boolean>;
+    getActivationError(workflowId: string): {
+        time: number;
+        error: {
+            message: string;
+        };
+    };
+    addWebhooks(workflow: Workflow, additionalData: IWorkflowExecuteAdditionalDataWorkflow, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): Promise<void>;
+    clearWebhooks(workflowId: string): Promise<void>;
     runWorkflow(workflowData: IWorkflowDb, node: INode, data: INodeExecutionData[][], additionalData: IWorkflowExecuteAdditionalDataWorkflow, mode: WorkflowExecuteMode, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>): Promise<string>;
     getExecutePollFunctions(workflowData: IWorkflowDb, additionalData: IWorkflowExecuteAdditionalDataWorkflow, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): IGetExecutePollFunctions;
     getExecuteTriggerFunctions(workflowData: IWorkflowDb, additionalData: IWorkflowExecuteAdditionalDataWorkflow, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): IGetExecuteTriggerFunctions;
     executeErrorWorkflow(error: ExecutionError, workflowData: IWorkflowBase, mode: WorkflowExecuteMode): void;
-    add(workflowId: string, activation: WorkflowActivateMode, workflowData?: IWorkflowDb): Promise<void>;
-    addQueuedWorkflowActivation(activationMode: WorkflowActivateMode, workflowData: IWorkflowDb): void;
+    addActiveWorkflows(activationMode: WorkflowActivateMode): Promise<void>;
+    addAllTriggerAndPollerBasedWorkflows(): Promise<void>;
+    removeAllTriggerAndPollerBasedWorkflows(): Promise<void>;
+    add(workflowId: string, activationMode: WorkflowActivateMode, existingWorkflow?: WorkflowEntity): Promise<void>;
+    private countTriggers;
+    addQueuedWorkflowActivation(activationMode: WorkflowActivateMode, workflowData: WorkflowEntity): void;
     removeQueuedWorkflowActivation(workflowId: string): void;
     removeAllQueuedWorkflowActivations(): void;
     remove(workflowId: string): Promise<void>;
+    addTriggersAndPollers(dbWorkflow: WorkflowEntity, workflow: Workflow, { activationMode, executionMode, additionalData, }: {
+        activationMode: WorkflowActivateMode;
+        executionMode: WorkflowExecuteMode;
+        additionalData: IWorkflowExecuteAdditionalDataWorkflow;
+    }): Promise<void>;
 }

package/dist/ActiveWorkflowRunner.js

@@ -31,9 +31,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActiveWorkflowRunner = void 0;
-const typedi_1 = require("typedi");
+const typedi_1 = __importStar(require("typedi"));
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const Db = __importStar(require("./Db"));
@@ -52,57 +55,29 @@ const utils_1 = require("./utils");
 const typeorm_1 = require("typeorm");
 const webhook_service_1 = require("./services/webhook.service");
 const Logger_1 = require("./Logger");
+const repositories_1 = require("./databases/repositories");
+const config_1 = __importDefault(require("./config"));
 const WEBHOOK_PROD_UNREGISTERED_HINT = "The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
 let ActiveWorkflowRunner = class ActiveWorkflowRunner {
-    constructor(logger, activeExecutions, externalHooks, nodeTypes, webhookService) {
+    constructor(logger, activeExecutions, externalHooks, nodeTypes, webhookService, workflowRepository) {
         this.logger = logger;
         this.activeExecutions = activeExecutions;
         this.externalHooks = externalHooks;
         this.nodeTypes = nodeTypes;
         this.webhookService = webhookService;
+        this.workflowRepository = workflowRepository;
         this.activeWorkflows = new n8n_core_1.ActiveWorkflows();
         this.activationErrors = {};
-        this.queuedWorkflowActivations = {};
+        this.queuedActivations = {};
+        this.isMultiMainScenario = config_1.default.getEnv('executions.mode') === 'queue' && config_1.default.getEnv('leaderSelection.enabled');
     }
     async init() {
-        const workflowsData = (await Db.collections.Workflow.find({
-            where: { active: true },
-            relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
-        }));
-        if (workflowsData.length !== 0) {
-            this.logger.info(' ================================');
-            this.logger.info('   Start Active Workflows:');
-            this.logger.info(' ================================');
-            for (const workflowData of workflowsData) {
-                this.logger.info(`   - ${workflowData.name} (ID: ${workflowData.id})`);
-                this.logger.debug(`Initializing active workflow "${workflowData.name}" (startup)`, {
-                    workflowName: workflowData.name,
-                    workflowId: workflowData.id,
-                });
-                try {
-                    await this.add(workflowData.id, 'init', workflowData);
-                    this.logger.verbose(`Successfully started workflow "${workflowData.name}"`, {
-                        workflowName: workflowData.name,
-                        workflowId: workflowData.id,
-                    });
-                    this.logger.info('     => Started');
-                }
-                catch (error) {
-                    n8n_workflow_1.ErrorReporterProxy.error(error);
-                    this.logger.info('     => ERROR: Workflow could not be activated on first try, keep on trying if not an auth issue');
-                    this.logger.info(`               ${error.message}`);
-                    this.logger.error(`Issue on initial workflow activation try "${workflowData.name}" (startup)`, {
-                        workflowName: workflowData.name,
-                        workflowId: workflowData.id,
-                    });
-                    this.executeErrorWorkflow(error, workflowData, 'internal');
-                    if (!error.message.includes('Authorization')) {
-                        this.addQueuedWorkflowActivation('init', workflowData);
-                    }
-                }
-            }
-            this.logger.verbose('Finished initializing active workflows (startup)');
+        if (this.isMultiMainScenario) {
+            const { MultiMainInstancePublisher } = await Promise.resolve().then(() => __importStar(require('./services/orchestration/main/MultiMainInstance.publisher.ee')));
+            this.multiMainInstancePublisher = typedi_1.default.get(MultiMainInstancePublisher);
+            await this.multiMainInstancePublisher.init();
         }
+        await this.addActiveWorkflows('init');
         await this.externalHooks.run('activeWorkflows.initialized', []);
         await this.webhookService.populateCache();
     }
@@ -110,7 +85,7 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
         let activeWorkflowIds = [];
         this.logger.verbose('Call to remove all active workflows received (removeAll)');
         activeWorkflowIds.push(...this.activeWorkflows.allActiveWorkflows());
-        const activeWorkflows = await this.getActiveWorkflows();
+        const activeWorkflows = await this.allActiveInStorage();
         activeWorkflowIds = [...activeWorkflowIds, ...activeWorkflows];
         activeWorkflowIds = Array.from(new Set(activeWorkflowIds));
         const removePromises = [];
@@ -175,10 +150,13 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
     async getWebhookMethods(path) {
         return this.webhookService.getWebhookMethods(path);
     }
-    async getActiveWorkflows(user) {
-        let activeWorkflows = [];
-        if (!user || user.globalRole.name === 'owner') {
-            activeWorkflows = await Db.collections.Workflow.find({
+    allActiveInMemory() {
+        return this.activeWorkflows.allActiveWorkflows();
+    }
+    async allActiveInStorage(user) {
+        const isFullAccess = !user || user.globalRole.name === 'owner';
+        if (isFullAccess) {
+            const activeWorkflows = await this.workflowRepository.find({
                 select: ['id'],
                 where: { active: true },
             });
@@ -186,40 +164,35 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
                 .map((workflow) => workflow.id)
                 .filter((workflowId) => !this.activationErrors[workflowId]);
         }
-        else {
-            const active = await Db.collections.Workflow.find({
-                select: ['id'],
-                where: { active: true },
-            });
-            const activeIds = active.map((workflow) => workflow.id);
-            const where = (0, UserManagementHelper_1.whereClause)({
-                user,
-                entityType: 'workflow',
-            });
-            Object.assign(where, { workflowId: (0, typeorm_1.In)(activeIds) });
-            const shared = await Db.collections.SharedWorkflow.find({
-                select: ['workflowId'],
-                where,
-            });
-            return shared
-                .map((id) => id.workflowId)
-                .filter((workflowId) => !this.activationErrors[workflowId]);
-        }
+        const where = (0, UserManagementHelper_1.whereClause)({
+            user,
+            entityType: 'workflow',
+        });
+        const activeWorkflows = await this.workflowRepository.find({
+            select: ['id'],
+            where: { active: true },
+        });
+        const activeIds = activeWorkflows.map((workflow) => workflow.id);
+        Object.assign(where, { workflowId: (0, typeorm_1.In)(activeIds) });
+        const sharings = await Db.collections.SharedWorkflow.find({
+            select: ['workflowId'],
+            where,
+        });
+        return sharings
+            .map((sharing) => sharing.workflowId)
+            .filter((workflowId) => !this.activationErrors[workflowId]);
     }
-    async isActive(id) {
-        const workflow = await Db.collections.Workflow.findOne({
+    async isActive(workflowId) {
+        const workflow = await this.workflowRepository.findOne({
             select: ['active'],
-            where: { id },
+            where: { id: workflowId },
         });
         return !!(workflow === null || workflow === void 0 ? void 0 : workflow.active);
     }
-    getActivationError(id) {
-        if (this.activationErrors[id] === undefined) {
-            return undefined;
-        }
-        return this.activationErrors[id];
+    getActivationError(workflowId) {
+        return this.activationErrors[workflowId];
     }
-    async addWorkflowWebhooks(workflow, additionalData, mode, activation) {
+    async addWebhooks(workflow, additionalData, mode, activation) {
         const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
         let path = '';
         for (const webhookData of webhooks) {
@@ -251,7 +224,7 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
                     continue;
                 }
                 try {
-                    await this.removeWorkflowWebhooks(workflow.id);
+                    await this.clearWebhooks(workflow.id);
                 }
                 catch (error1) {
                     n8n_workflow_1.ErrorReporterProxy.error(error1);
@@ -269,7 +242,7 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
         await this.webhookService.populateCache();
         await workflows_services_1.WorkflowsService.saveStaticData(workflow);
     }
-    async removeWorkflowWebhooks(workflowId) {
+    async clearWebhooks(workflowId) {
         const workflowData = await Db.collections.Workflow.findOne({
             where: { id: workflowId },
             relations: ['shared', 'shared.user', 'shared.user.globalRole'],
@@ -410,62 +383,110 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
         };
         WorkflowExecuteAdditionalData.executeErrorWorkflow(workflowData, fullRunData, mode);
     }
-    async add(workflowId, activation, workflowData) {
-        let workflowInstance;
-        try {
-            if (workflowData === undefined) {
-                workflowData = (await Db.collections.Workflow.findOne({
-                    where: { id: workflowId },
-                    relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
-                }));
+    async addActiveWorkflows(activationMode) {
+        const dbWorkflows = await this.workflowRepository.getAllActive();
+        if (dbWorkflows.length === 0)
+            return;
+        this.logger.info(' ================================');
+        this.logger.info('   Start Active Workflows:');
+        this.logger.info(' ================================');
+        for (const dbWorkflow of dbWorkflows) {
+            this.logger.info(`   - ${dbWorkflow.display()}`);
+            this.logger.debug(`Initializing active workflow ${dbWorkflow.display()} (startup)`, {
+                workflowName: dbWorkflow.name,
+                workflowId: dbWorkflow.id,
+            });
+            try {
+                await this.add(dbWorkflow.id, activationMode, dbWorkflow);
+                this.logger.verbose(`Successfully started workflow ${dbWorkflow.display()}`, {
+                    workflowName: dbWorkflow.name,
+                    workflowId: dbWorkflow.id,
+                });
+                this.logger.info('     => Started');
             }
-            if (!workflowData) {
-                throw new Error(`Could not find workflow with id "${workflowId}".`);
+            catch (error) {
+                n8n_workflow_1.ErrorReporterProxy.error(error);
+                this.logger.info('     => ERROR: Workflow could not be activated on first try, keep on trying if not an auth issue');
+                this.logger.info(`               ${error.message}`);
+                this.logger.error(`Issue on initial workflow activation try of ${dbWorkflow.display()} (startup)`, {
+                    workflowName: dbWorkflow.name,
+                    workflowId: dbWorkflow.id,
+                });
+                this.executeErrorWorkflow(error, dbWorkflow, 'internal');
+                if (error.message.includes('Authorization'))
+                    continue;
+                this.addQueuedWorkflowActivation('init', dbWorkflow);
             }
-            workflowInstance = new n8n_workflow_1.Workflow({
-                id: workflowId,
-                name: workflowData.name,
-                nodes: workflowData.nodes,
-                connections: workflowData.connections,
-                active: workflowData.active,
+        }
+        this.logger.verbose('Finished activating workflows (startup)');
+    }
+    async addAllTriggerAndPollerBasedWorkflows() {
+        this.logger.debug('[Leadership change] Adding all trigger- and poller-based workflows...');
+        await this.addActiveWorkflows('leadershipChange');
+    }
+    async removeAllTriggerAndPollerBasedWorkflows() {
+        this.logger.debug('[Leadership change] Removing all trigger- and poller-based workflows...');
+        await this.activeWorkflows.removeAllTriggerAndPollerBasedWorkflows();
+    }
+    async add(workflowId, activationMode, existingWorkflow) {
+        var _a, _b, _c, _d;
+        let workflow;
+        let shouldAddWebhooks = true;
+        let shouldAddTriggersAndPollers = true;
+        if (this.isMultiMainScenario && activationMode !== 'leadershipChange') {
+            shouldAddWebhooks = (_b = (_a = this.multiMainInstancePublisher) === null || _a === void 0 ? void 0 : _a.isLeader) !== null && _b !== void 0 ? _b : false;
+            shouldAddTriggersAndPollers = (_d = (_c = this.multiMainInstancePublisher) === null || _c === void 0 ? void 0 : _c.isLeader) !== null && _d !== void 0 ? _d : false;
+        }
+        if (this.isMultiMainScenario && activationMode === 'leadershipChange') {
+            shouldAddWebhooks = false;
+            shouldAddTriggersAndPollers = true;
+        }
+        try {
+            const dbWorkflow = existingWorkflow !== null && existingWorkflow !== void 0 ? existingWorkflow : (await this.workflowRepository.findById(workflowId));
+            if (!dbWorkflow) {
+                throw new n8n_workflow_1.WorkflowActivationError(`Failed to find workflow with ID "${workflowId}"`);
+            }
+            workflow = new n8n_workflow_1.Workflow({
+                id: dbWorkflow.id,
+                name: dbWorkflow.name,
+                nodes: dbWorkflow.nodes,
+                connections: dbWorkflow.connections,
+                active: dbWorkflow.active,
                 nodeTypes: this.nodeTypes,
-                staticData: workflowData.staticData,
-                settings: workflowData.settings,
+                staticData: dbWorkflow.staticData,
+                settings: dbWorkflow.settings,
             });
-            const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated(constants_1.STARTING_NODES);
+            const canBeActivated = workflow.checkIfWorkflowCanBeActivated(constants_1.STARTING_NODES);
             if (!canBeActivated) {
-                this.logger.error(`Unable to activate workflow "${workflowData.name}"`);
-                throw new Error('The workflow can not be activated because it does not contain any nodes which could start the workflow. Only workflows which have trigger or webhook nodes can be activated.');
+                throw new n8n_workflow_1.WorkflowActivationError(`Workflow ${dbWorkflow.display()} has no node to start the workflow - at least one trigger, poller or webhook node is required`);
             }
-            const mode = 'trigger';
-            const workflowOwner = workflowData.shared.find((shared) => shared.role.name === 'owner');
-            if (!workflowOwner) {
-                throw new Error('Workflow cannot be activated because it has no owner');
+            const sharing = dbWorkflow.shared.find((shared) => shared.role.name === 'owner');
+            if (!sharing) {
+                throw new n8n_workflow_1.WorkflowActivationError(`Workflow ${dbWorkflow.display()} has no owner`);
             }
-            const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowOwner.user.id);
-            const getTriggerFunctions = this.getExecuteTriggerFunctions(workflowData, additionalData, mode, activation);
-            const getPollFunctions = this.getExecutePollFunctions(workflowData, additionalData, mode, activation);
-            await this.addWorkflowWebhooks(workflowInstance, additionalData, mode, activation);
-            if (workflowInstance.getTriggerNodes().length !== 0 ||
-                workflowInstance.getPollNodes().length !== 0) {
-                await this.activeWorkflows.add(workflowId, workflowInstance, additionalData, mode, activation, getTriggerFunctions, getPollFunctions);
-                this.logger.verbose(`Successfully activated workflow "${workflowData.name}"`, {
-                    workflowId,
-                    workflowName: workflowData.name,
+            const additionalData = await WorkflowExecuteAdditionalData.getBase(sharing.user.id);
+            if (shouldAddWebhooks) {
+                this.logger.debug('============');
+                this.logger.debug(`Adding webhooks for workflow "${dbWorkflow.display()}"`);
+                this.logger.debug('============');
+                await this.addWebhooks(workflow, additionalData, 'trigger', activationMode);
+            }
+            if (shouldAddTriggersAndPollers) {
+                this.logger.debug('============');
+                this.logger.debug(`Adding triggers and pollers for workflow "${dbWorkflow.display()}"`);
+                this.logger.debug('============');
+                await this.addTriggersAndPollers(dbWorkflow, workflow, {
+                    activationMode,
+                    executionMode: 'trigger',
+                    additionalData,
                 });
             }
             this.removeQueuedWorkflowActivation(workflowId);
-            if (this.activationErrors[workflowId] !== undefined) {
+            if (this.activationErrors[workflowId]) {
                 delete this.activationErrors[workflowId];
             }
-            if (workflowInstance.id) {
-                const triggerFilter = (nodeType) => !!nodeType.trigger && !nodeType.description.name.includes('manualTrigger');
-                const triggerCount = workflowInstance.queryNodes(triggerFilter).length +
-                    workflowInstance.getPollNodes().length +
-                    WebhookHelpers.getWorkflowWebhooks(workflowInstance, additionalData, undefined, true)
-                        .length;
-                await workflows_services_1.WorkflowsService.updateWorkflowTriggerCount(workflowInstance.id, triggerCount);
-            }
+            const triggerCount = this.countTriggers(workflow, additionalData);
+            await workflows_services_1.WorkflowsService.updateWorkflowTriggerCount(workflow.id, triggerCount);
         }
         catch (error) {
             this.activationErrors[workflowId] = {
@@ -476,7 +497,13 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
             };
             throw error;
         }
-        await workflows_services_1.WorkflowsService.saveStaticData(workflowInstance);
+        await workflows_services_1.WorkflowsService.saveStaticData(workflow);
+    }
+    countTriggers(workflow, additionalData) {
+        const triggerFilter = (nodeType) => !!nodeType.trigger && !nodeType.description.name.includes('manualTrigger');
+        return (workflow.queryNodes(triggerFilter).length +
+            workflow.getPollNodes().length +
+            WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true).length);
     }
     addQueuedWorkflowActivation(activationMode, workflowData) {
         const workflowId = workflowData.id;
@@ -491,7 +518,7 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
             }
             catch (error) {
                 n8n_workflow_1.ErrorReporterProxy.error(error);
-                let lastTimeout = this.queuedWorkflowActivations[workflowId].lastTimeout;
+                let lastTimeout = this.queuedActivations[workflowId].lastTimeout;
                 if (lastTimeout < constants_1.WORKFLOW_REACTIVATE_MAX_TIMEOUT) {
                     lastTimeout = Math.min(lastTimeout * 2, constants_1.WORKFLOW_REACTIVATE_MAX_TIMEOUT);
                 }
@@ -499,8 +526,8 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
                     workflowId,
                     workflowName,
                 });
-                this.queuedWorkflowActivations[workflowId].lastTimeout = lastTimeout;
-                this.queuedWorkflowActivations[workflowId].timeout = setTimeout(retryFunction, lastTimeout);
+                this.queuedActivations[workflowId].lastTimeout = lastTimeout;
+                this.queuedActivations[workflowId].timeout = setTimeout(retryFunction, lastTimeout);
                 return;
             }
             this.logger.info(` -> Activation of workflow "${workflowName}" (${workflowId}) was successful!`, {
@@ -509,7 +536,7 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
             });
         };
         this.removeQueuedWorkflowActivation(workflowId);
-        this.queuedWorkflowActivations[workflowId] = {
+        this.queuedActivations[workflowId] = {
             activationMode,
             lastTimeout: constants_1.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT,
             timeout: setTimeout(retryFunction, constants_1.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT),
@@ -517,19 +544,19 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
         };
     }
     removeQueuedWorkflowActivation(workflowId) {
-        if (this.queuedWorkflowActivations[workflowId]) {
-            clearTimeout(this.queuedWorkflowActivations[workflowId].timeout);
-            delete this.queuedWorkflowActivations[workflowId];
+        if (this.queuedActivations[workflowId]) {
+            clearTimeout(this.queuedActivations[workflowId].timeout);
+            delete this.queuedActivations[workflowId];
         }
     }
     removeAllQueuedWorkflowActivations() {
-        for (const workflowId in this.queuedWorkflowActivations) {
+        for (const workflowId in this.queuedActivations) {
             this.removeQueuedWorkflowActivation(workflowId);
         }
     }
     async remove(workflowId) {
         try {
-            await this.removeWorkflowWebhooks(workflowId);
+            await this.clearWebhooks(workflowId);
         }
         catch (error) {
             n8n_workflow_1.ErrorReporterProxy.error(error);
@@ -538,7 +565,7 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
         if (this.activationErrors[workflowId] !== undefined) {
             delete this.activationErrors[workflowId];
         }
-        if (this.queuedWorkflowActivations[workflowId] !== undefined) {
+        if (this.queuedActivations[workflowId] !== undefined) {
             this.removeQueuedWorkflowActivation(workflowId);
         }
         if (this.activeWorkflows.isActive(workflowId)) {
@@ -548,6 +575,17 @@ let ActiveWorkflowRunner = class ActiveWorkflowRunner {
             }
         }
     }
+    async addTriggersAndPollers(dbWorkflow, workflow, { activationMode, executionMode, additionalData, }) {
+        const getTriggerFunctions = this.getExecuteTriggerFunctions(dbWorkflow, additionalData, executionMode, activationMode);
+        const getPollFunctions = this.getExecutePollFunctions(dbWorkflow, additionalData, executionMode, activationMode);
+        if (workflow.getTriggerNodes().length !== 0 || workflow.getPollNodes().length !== 0) {
+            await this.activeWorkflows.add(workflow.id, workflow, additionalData, executionMode, activationMode, getTriggerFunctions, getPollFunctions);
+            this.logger.verbose(`Workflow ${dbWorkflow.display()} activated`, {
+                workflowId: dbWorkflow.id,
+                workflowName: dbWorkflow.name,
+            });
+        }
+    }
 };
 exports.ActiveWorkflowRunner = ActiveWorkflowRunner;
 exports.ActiveWorkflowRunner = ActiveWorkflowRunner = __decorate([
@@ -556,6 +594,7 @@ exports.ActiveWorkflowRunner = ActiveWorkflowRunner = __decorate([
         ActiveExecutions_1.ActiveExecutions,
         ExternalHooks_1.ExternalHooks,
         NodeTypes_1.NodeTypes,
-        webhook_service_1.WebhookService])
+        webhook_service_1.WebhookService,
+        repositories_1.WorkflowRepository])
 ], ActiveWorkflowRunner);
 //# sourceMappingURL=ActiveWorkflowRunner.js.map