n8n 0.209.3 → 0.210.0

package/bin/n8n

@@ -29,6 +29,9 @@ if (![14, 16, 18].includes(nodeVersionMajor)) {
 	process.exit(1);
 }
 
+// Prevent oclif from loading ts-node and typescript
+process.env.OCLIF_TS_NODE = '0';
+
 require('source-map-support').install();
 
 require('@oclif/command')

package/dist/AbstractServer.d.ts

@@ -0,0 +1,33 @@
+/// <reference types="node" />
+import type { Url } from 'url';
+import express from 'express';
+import * as ActiveWorkflowRunner from './ActiveWorkflowRunner';
+import type { IExternalHooksClass } from './Interfaces';
+export declare abstract class AbstractServer {
+    protected app: express.Application;
+    protected externalHooks: IExternalHooksClass;
+    protected activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner;
+    protected protocol: string;
+    protected sslKey: string;
+    protected sslCert: string;
+    protected timezone: string;
+    protected restEndpoint: string;
+    protected endpointWebhook: string;
+    protected endpointWebhookTest: string;
+    protected endpointWebhookWaiting: string;
+    abstract configure(): Promise<void>;
+    constructor();
+    private setupCommonMiddlewares;
+    private setupDevMiddlewares;
+    private setupHealthCheck;
+    private setupRedisChecks;
+    protected setupWebhookEndpoint(): void;
+    protected setupWaitingWebhookEndpoint(): void;
+    protected setupTestWebhookEndpoint(): void;
+    start(): Promise<void>;
+}
+declare module 'http' {
+    interface IncomingMessage {
+        parsedUrl: Url;
+    }
+}

package/dist/AbstractServer.js

@@ -0,0 +1,320 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractServer = void 0;
+const promises_1 = require("fs/promises");
+const express_1 = __importDefault(require("express"));
+const body_parser_1 = __importDefault(require("body-parser"));
+const body_parser_xml_1 = __importDefault(require("body-parser-xml"));
+const compression_1 = __importDefault(require("compression"));
+const parseurl_1 = __importDefault(require("parseurl"));
+const typeorm_1 = require("typeorm");
+const n8n_workflow_1 = require("n8n-workflow");
+const config_1 = __importDefault(require("./config"));
+const constants_1 = require("./constants");
+const ActiveWorkflowRunner = __importStar(require("./ActiveWorkflowRunner"));
+const Db = __importStar(require("./Db"));
+const ExternalHooks_1 = require("./ExternalHooks");
+const ResponseHelper_1 = require("./ResponseHelper");
+const cors_1 = require("./middlewares/cors");
+const TestWebhooks = __importStar(require("./TestWebhooks"));
+const WaitingWebhooks_1 = require("./WaitingWebhooks");
+const WebhookHelpers_1 = require("./WebhookHelpers");
+const emptyBuffer = Buffer.alloc(0);
+class AbstractServer {
+    constructor() {
+        this.app = (0, express_1.default)();
+        this.app.disable('x-powered-by');
+        this.protocol = config_1.default.getEnv('protocol');
+        this.sslKey = config_1.default.getEnv('ssl_key');
+        this.sslCert = config_1.default.getEnv('ssl_cert');
+        this.timezone = config_1.default.getEnv('generic.timezone');
+        this.restEndpoint = config_1.default.getEnv('endpoints.rest');
+        this.endpointWebhook = config_1.default.getEnv('endpoints.webhook');
+        this.endpointWebhookTest = config_1.default.getEnv('endpoints.webhookTest');
+        this.endpointWebhookWaiting = config_1.default.getEnv('endpoints.webhookWaiting');
+        this.externalHooks = (0, ExternalHooks_1.ExternalHooks)();
+        this.activeWorkflowRunner = ActiveWorkflowRunner.getInstance();
+    }
+    async setupCommonMiddlewares() {
+        const { app } = this;
+        const { Handlers: { requestHandler, errorHandler }, } = await Promise.resolve().then(() => __importStar(require('@sentry/node')));
+        app.use(requestHandler());
+        app.use(errorHandler());
+        app.use((0, compression_1.default)());
+        app.use((req, res, next) => {
+            req.parsedUrl = (0, parseurl_1.default)(req);
+            req.rawBody = emptyBuffer;
+            next();
+        });
+        const payloadSizeMax = config_1.default.getEnv('endpoints.payloadSizeMax');
+        app.use(body_parser_1.default.json({
+            limit: `${payloadSizeMax}mb`,
+            verify: (req, res, buf) => {
+                req.rawBody = buf;
+            },
+        }));
+        (0, body_parser_xml_1.default)(body_parser_1.default);
+        app.use(body_parser_1.default.xml({
+            limit: `${payloadSizeMax}mb`,
+            xmlParseOptions: {
+                normalize: true,
+                normalizeTags: true,
+                explicitArray: false,
+            },
+            verify: (req, res, buf) => {
+                req.rawBody = buf;
+            },
+        }));
+        app.use(body_parser_1.default.text({
+            limit: `${payloadSizeMax}mb`,
+            verify: (req, res, buf) => {
+                req.rawBody = buf;
+            },
+        }));
+        app.use(body_parser_1.default.urlencoded({
+            limit: `${payloadSizeMax}mb`,
+            extended: false,
+            verify: (req, res, buf) => {
+                req.rawBody = buf;
+            },
+        }));
+    }
+    setupDevMiddlewares() {
+        this.app.use(cors_1.corsMiddleware);
+    }
+    async setupHealthCheck() {
+        this.app.use((req, res, next) => {
+            if (!Db.isInitialized) {
+                (0, ResponseHelper_1.sendErrorResponse)(res, new ResponseHelper_1.ServiceUnavailableError('Database is not ready!'));
+            }
+            else
+                next();
+        });
+        this.app.get('/healthz', async (req, res) => {
+            n8n_workflow_1.LoggerProxy.debug('Health check started!');
+            const connection = (0, typeorm_1.getConnectionManager)().get();
+            try {
+                if (!connection.isConnected) {
+                    throw new ResponseHelper_1.ServiceUnavailableError('No active database connection!');
+                }
+                await connection.query('SELECT 1');
+            }
+            catch (error) {
+                n8n_workflow_1.ErrorReporterProxy.error(error);
+                n8n_workflow_1.LoggerProxy.error('No Database connection!');
+                return (0, ResponseHelper_1.sendErrorResponse)(res, new ResponseHelper_1.ServiceUnavailableError('No Database connection!'));
+            }
+            n8n_workflow_1.LoggerProxy.debug('Health check completed successfully!');
+            (0, ResponseHelper_1.sendSuccessResponse)(res, { status: 'ok' }, true, 200);
+        });
+        if (config_1.default.getEnv('executions.mode') === 'queue') {
+            await this.setupRedisChecks();
+        }
+    }
+    async setupRedisChecks() {
+        const { default: Redis } = await Promise.resolve().then(() => __importStar(require('ioredis')));
+        let lastTimer = 0;
+        let cumulativeTimeout = 0;
+        const { host, port, username, password, db } = config_1.default.getEnv('queue.bull.redis');
+        const redisConnectionTimeoutLimit = config_1.default.getEnv('queue.bull.redis.timeoutThreshold');
+        const redis = new Redis({
+            host,
+            port,
+            db,
+            username,
+            password,
+            retryStrategy: () => {
+                const now = Date.now();
+                if (now - lastTimer > 30000) {
+                    lastTimer = now;
+                    cumulativeTimeout = 0;
+                }
+                else {
+                    cumulativeTimeout += now - lastTimer;
+                    lastTimer = now;
+                    if (cumulativeTimeout > redisConnectionTimeoutLimit) {
+                        n8n_workflow_1.LoggerProxy.error(`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`);
+                        process.exit(1);
+                    }
+                }
+                return 500;
+            },
+        });
+        redis.on('close', () => {
+            n8n_workflow_1.LoggerProxy.warn('Redis unavailable - trying to reconnect...');
+        });
+        redis.on('error', (error) => {
+            if (!String(error).includes('ECONNREFUSED')) {
+                n8n_workflow_1.LoggerProxy.warn('Error with Redis: ', error);
+            }
+        });
+    }
+    setupWebhookEndpoint() {
+        const endpoint = this.endpointWebhook;
+        const activeWorkflowRunner = this.activeWorkflowRunner;
+        this.app.all(`/${endpoint}/*`, async (req, res) => {
+            const requestUrl = req.parsedUrl.pathname.slice(endpoint.length + 2);
+            const method = req.method.toUpperCase();
+            if (method === 'OPTIONS') {
+                let allowedMethods;
+                try {
+                    allowedMethods = await activeWorkflowRunner.getWebhookMethods(requestUrl);
+                    allowedMethods.push('OPTIONS');
+                    res.append('Allow', allowedMethods);
+                }
+                catch (error) {
+                    (0, ResponseHelper_1.sendErrorResponse)(res, error);
+                    return;
+                }
+                res.header('Access-Control-Allow-Origin', '*');
+                (0, ResponseHelper_1.sendSuccessResponse)(res, {}, true, 204);
+                return;
+            }
+            if (!WebhookHelpers_1.WEBHOOK_METHODS.includes(method)) {
+                (0, ResponseHelper_1.sendErrorResponse)(res, new Error(`The method ${method} is not supported.`));
+                return;
+            }
+            let response;
+            try {
+                response = await activeWorkflowRunner.executeWebhook(method, requestUrl, req, res);
+            }
+            catch (error) {
+                (0, ResponseHelper_1.sendErrorResponse)(res, error);
+                return;
+            }
+            if (response.noWebhookResponse === true) {
+                return;
+            }
+            (0, ResponseHelper_1.sendSuccessResponse)(res, response.data, true, response.responseCode, response.headers);
+        });
+    }
+    setupWaitingWebhookEndpoint() {
+        const endpoint = this.endpointWebhookWaiting;
+        const waitingWebhooks = new WaitingWebhooks_1.WaitingWebhooks();
+        this.app.all(`/${endpoint}/*`, async (req, res) => {
+            const requestUrl = req.parsedUrl.pathname.slice(endpoint.length + 2);
+            const method = req.method.toUpperCase();
+            if (!WebhookHelpers_1.WEBHOOK_METHODS.includes(method)) {
+                (0, ResponseHelper_1.sendErrorResponse)(res, new Error(`The method ${method} is not supported.`));
+                return;
+            }
+            let response;
+            try {
+                response = await waitingWebhooks.executeWebhook(method, requestUrl, req, res);
+            }
+            catch (error) {
+                (0, ResponseHelper_1.sendErrorResponse)(res, error);
+                return;
+            }
+            if (response.noWebhookResponse === true) {
+                return;
+            }
+            (0, ResponseHelper_1.sendSuccessResponse)(res, response.data, true, response.responseCode, response.headers);
+        });
+    }
+    setupTestWebhookEndpoint() {
+        const endpoint = this.endpointWebhookTest;
+        const testWebhooks = TestWebhooks.getInstance();
+        this.app.all(`/${endpoint}/*`, async (req, res) => {
+            const requestUrl = req.parsedUrl.pathname.slice(endpoint.length + 2);
+            const method = req.method.toUpperCase();
+            if (method === 'OPTIONS') {
+                let allowedMethods;
+                try {
+                    allowedMethods = await testWebhooks.getWebhookMethods(requestUrl);
+                    allowedMethods.push('OPTIONS');
+                    res.append('Allow', allowedMethods);
+                }
+                catch (error) {
+                    (0, ResponseHelper_1.sendErrorResponse)(res, error);
+                    return;
+                }
+                res.header('Access-Control-Allow-Origin', '*');
+                (0, ResponseHelper_1.sendSuccessResponse)(res, {}, true, 204);
+                return;
+            }
+            if (!WebhookHelpers_1.WEBHOOK_METHODS.includes(method)) {
+                (0, ResponseHelper_1.sendErrorResponse)(res, new Error(`The method ${method} is not supported.`));
+                return;
+            }
+            let response;
+            try {
+                response = await testWebhooks.callTestWebhook(method, requestUrl, req, res);
+            }
+            catch (error) {
+                (0, ResponseHelper_1.sendErrorResponse)(res, error);
+                return;
+            }
+            if (response.noWebhookResponse === true) {
+                return;
+            }
+            (0, ResponseHelper_1.sendSuccessResponse)(res, response.data, true, response.responseCode, response.headers);
+        });
+        this.app.delete(`/${this.restEndpoint}/test-webhook/:id`, (0, ResponseHelper_1.send)(async (req) => testWebhooks.cancelTestWebhook(req.params.id)));
+    }
+    async start() {
+        const { app, externalHooks, protocol, sslKey, sslCert } = this;
+        let server;
+        if (protocol === 'https' && sslKey && sslCert) {
+            const https = await Promise.resolve().then(() => __importStar(require('https')));
+            server = https.createServer({
+                key: await (0, promises_1.readFile)(this.sslKey, 'utf8'),
+                cert: await (0, promises_1.readFile)(this.sslCert, 'utf8'),
+            }, app);
+        }
+        else {
+            const http = await Promise.resolve().then(() => __importStar(require('http')));
+            server = http.createServer(app);
+        }
+        const PORT = config_1.default.getEnv('port');
+        const ADDRESS = config_1.default.getEnv('listen_address');
+        server.on('error', (error) => {
+            if (error.code === 'EADDRINUSE') {
+                console.log(`n8n's port ${PORT} is already in use. Do you have another instance of n8n running already?`);
+                process.exit(1);
+            }
+        });
+        await new Promise((resolve) => server.listen(PORT, ADDRESS, () => resolve()));
+        await this.setupCommonMiddlewares();
+        if (constants_1.inDevelopment) {
+            this.setupDevMiddlewares();
+        }
+        await this.setupHealthCheck();
+        await this.configure();
+        console.log(`n8n ready on ${ADDRESS}, port ${PORT}`);
+        console.log(`Version: ${constants_1.N8N_VERSION}`);
+        const defaultLocale = config_1.default.getEnv('defaultLocale');
+        if (defaultLocale !== 'en') {
+            console.log(`Locale: ${defaultLocale}`);
+        }
+        await externalHooks.run('n8n.ready', [app, config_1.default]);
+    }
+}
+exports.AbstractServer = AbstractServer;
+//# sourceMappingURL=AbstractServer.js.map

package/dist/AbstractServer.js.map

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

package/dist/ActiveExecutions.js

@@ -45,9 +45,9 @@ class ActiveExecutions {
             if (executionData.retryOf !== undefined) {
                 fullExecutionData.retryOf = executionData.retryOf.toString();
             }
-            if (executionData.workflowData.id !== undefined &&
-                WorkflowHelpers.isWorkflowIdValid(executionData.workflowData.id.toString())) {
-                fullExecutionData.workflowId = executionData.workflowData.id.toString();
+            const workflowId = executionData.workflowData.id;
+            if (workflowId !== undefined && WorkflowHelpers.isWorkflowIdValid(workflowId)) {
+                fullExecutionData.workflowId = workflowId;
             }
             const execution = ResponseHelper.flattenExecutionData(fullExecutionData);
             const executionResult = await Db.collections.Execution.save(execution);

package/dist/ActiveExecutions.js.map

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

package/dist/ActiveWorkflowRunner.d.ts

@@ -6,8 +6,8 @@ export declare class ActiveWorkflowRunner {
     private activeWorkflows;
     private activationErrors;
     private queuedWorkflowActivations;
+    constructor();
     init(): Promise<void>;
-    initWebhooks(): Promise<void>;
     removeAll(): Promise<void>;
     executeWebhook(httpMethod: WebhookHttpMethod, path: string, req: express.Request, res: express.Response): Promise<IResponseCallbackData>;
     getWebhookMethods(path: string): Promise<string[]>;

package/dist/ActiveWorkflowRunner.js

@@ -42,12 +42,13 @@ const NodeTypes_1 = require("./NodeTypes");
 const WorkflowRunner_1 = require("./WorkflowRunner");
 const ExternalHooks_1 = require("./ExternalHooks");
 const UserManagementHelper_1 = require("./UserManagement/UserManagementHelper");
-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)`;
+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)";
 class ActiveWorkflowRunner {
     constructor() {
         this.activeWorkflows = null;
         this.activationErrors = {};
         this.queuedWorkflowActivations = {};
+        this.activeWorkflows = new n8n_core_1.ActiveWorkflows();
     }
     async init() {
         const workflowsData = (await Db.collections.Workflow.find({
@@ -57,7 +58,6 @@ class ActiveWorkflowRunner {
         if (!config_1.default.getEnv('endpoints.skipWebhooksDeregistrationOnShutdown')) {
             await Db.collections.Webhook.clear();
         }
-        this.activeWorkflows = new n8n_core_1.ActiveWorkflows();
         if (workflowsData.length !== 0) {
             console.info(' ================================');
             console.info('   Start Active Workflows:');
@@ -69,16 +69,16 @@ class ActiveWorkflowRunner {
                     workflowId: workflowData.id,
                 });
                 try {
-                    await this.add(workflowData.id.toString(), 'init', workflowData);
+                    await this.add(workflowData.id, 'init', workflowData);
                     n8n_workflow_1.LoggerProxy.verbose(`Successfully started workflow "${workflowData.name}"`, {
                         workflowName: workflowData.name,
                         workflowId: workflowData.id,
                     });
-                    console.log(`     => Started`);
+                    console.log('     => Started');
                 }
                 catch (error) {
                     n8n_workflow_1.ErrorReporterProxy.error(error);
-                    console.log(`     => ERROR: Workflow could not be activated on first try, keep on trying`);
+                    console.log('     => ERROR: Workflow could not be activated on first try, keep on trying');
                     console.log(`               ${error.message}`);
                     n8n_workflow_1.LoggerProxy.error(`Issue on intital workflow activation try "${workflowData.name}" (startup)`, {
                         workflowName: workflowData.name,
@@ -93,9 +93,6 @@ class ActiveWorkflowRunner {
         const externalHooks = (0, ExternalHooks_1.ExternalHooks)();
         await externalHooks.run('activeWorkflows.initialized', []);
     }
-    async initWebhooks() {
-        this.activeWorkflows = new n8n_core_1.ActiveWorkflows();
-    }
     async removeAll() {
         let activeWorkflowIds = [];
         n8n_workflow_1.LoggerProxy.verbose('Call to remove all active workflows received (removeAll)');
@@ -103,10 +100,7 @@ class ActiveWorkflowRunner {
             activeWorkflowIds.push.apply(activeWorkflowIds, this.activeWorkflows.allActiveWorkflows());
         }
         const activeWorkflows = await this.getActiveWorkflows();
-        activeWorkflowIds = [
-            ...activeWorkflowIds,
-            ...activeWorkflows.map((workflow) => workflow.id.toString()),
-        ];
+        activeWorkflowIds = [...activeWorkflowIds, ...activeWorkflows.map((workflow) => workflow.id)];
         activeWorkflowIds = Array.from(new Set(activeWorkflowIds));
         const removePromises = [];
         for (const workflowId of activeWorkflowIds) {
@@ -123,10 +117,10 @@ class ActiveWorkflowRunner {
         if (path.endsWith('/')) {
             path = path.slice(0, -1);
         }
-        let webhook = (await Db.collections.Webhook.findOne({
+        let webhook = await Db.collections.Webhook.findOne({
             webhookPath: path,
             method: httpMethod,
-        }));
+        });
         let webhookId;
         if (webhook === undefined) {
             const pathElements = path.split('/');
@@ -172,7 +166,7 @@ class ActiveWorkflowRunner {
         }
         const nodeTypes = (0, NodeTypes_1.NodeTypes)();
         const workflow = new n8n_workflow_1.Workflow({
-            id: webhook.workflowId.toString(),
+            id: webhook.workflowId,
             name: workflowData.name,
             nodes: workflowData.nodes,
             connections: workflowData.connections,
@@ -316,10 +310,9 @@ class ActiveWorkflowRunner {
             await workflow.runWebhookMethod('delete', webhookData, n8n_core_1.NodeExecuteFunctions, mode, 'update', false);
         }
         await WorkflowHelpers.saveStaticData(workflow);
-        const webhook = {
+        await Db.collections.Webhook.delete({
             workflowId: workflowData.id,
-        };
-        await Db.collections.Webhook.delete(webhook);
+        });
     }
     async runWorkflow(workflowData, node, data, additionalData, mode, responsePromise) {
         const nodeExecutionStack = [
@@ -401,11 +394,11 @@ class ActiveWorkflowRunner {
                 var _a;
                 n8n_workflow_1.LoggerProxy.info(`The trigger node "${node.name}" of workflow "${workflowData.name}" failed with the error: "${error.message}". Will try to reactivate.`, {
                     nodeName: node.name,
-                    workflowId: workflowData.id.toString(),
+                    workflowId: workflowData.id,
                     workflowName: workflowData.name,
                 });
-                await ((_a = this.activeWorkflows) === null || _a === void 0 ? void 0 : _a.remove(workflowData.id.toString()));
-                this.activationErrors[workflowData.id.toString()] = {
+                await ((_a = this.activeWorkflows) === null || _a === void 0 ? void 0 : _a.remove(workflowData.id));
+                this.activationErrors[workflowData.id] = {
                     time: new Date().getTime(),
                     error: {
                         message: error.message,
@@ -435,7 +428,7 @@ class ActiveWorkflowRunner {
     }
     async add(workflowId, activation, workflowData) {
         if (this.activeWorkflows === null) {
-            throw new Error(`The "activeWorkflows" instance did not get initialized yet.`);
+            throw new Error('The "activeWorkflows" instance did not get initialized yet.');
         }
         let workflowInstance;
         try {
@@ -464,7 +457,7 @@ class ActiveWorkflowRunner {
             ]);
             if (!canBeActivated) {
                 n8n_workflow_1.LoggerProxy.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 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.');
             }
             const mode = 'trigger';
             const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowData.shared[0].user.id);
@@ -504,7 +497,7 @@ class ActiveWorkflowRunner {
         await WorkflowHelpers.saveStaticData(workflowInstance);
     }
     addQueuedWorkflowActivation(activationMode, workflowData) {
-        const workflowId = workflowData.id.toString();
+        const workflowId = workflowData.id;
         const workflowName = workflowData.name;
         const retryFunction = async () => {
             n8n_workflow_1.LoggerProxy.info(`Try to activate workflow "${workflowName}" (${workflowId})`, {
@@ -573,7 +566,7 @@ class ActiveWorkflowRunner {
             }
             return;
         }
-        throw new Error(`The "activeWorkflows" instance did not get initialized yet.`);
+        throw new Error('The "activeWorkflows" instance did not get initialized yet.');
     }
 }
 exports.ActiveWorkflowRunner = ActiveWorkflowRunner;