n8n 0.216.1 → 0.217.0

package/bin/n8n

@@ -34,6 +34,7 @@ process.env.OCLIF_TS_NODE = '0';
 
 require('express-async-errors');
 require('source-map-support').install();
+require('reflect-metadata');
 
 require('@oclif/command')
 	.run()

package/dist/AbstractServer.d.ts

@@ -3,13 +3,13 @@
 import type { Server } from 'http';
 import type { Url } from 'url';
 import express from 'express';
-import * as ActiveWorkflowRunner from './ActiveWorkflowRunner';
+import { ActiveWorkflowRunner } from './ActiveWorkflowRunner';
 import type { IExternalHooksClass } from './Interfaces';
 export declare abstract class AbstractServer {
     protected server: Server;
     protected app: express.Application;
     protected externalHooks: IExternalHooksClass;
-    protected activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner;
+    protected activeWorkflowRunner: ActiveWorkflowRunner;
     protected protocol: string;
     protected sslKey: string;
     protected sslCert: string;

package/dist/AbstractServer.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractServer = void 0;
+const typedi_1 = require("typedi");
 const promises_1 = require("fs/promises");
 const express_1 = __importDefault(require("express"));
 const body_parser_1 = __importDefault(require("body-parser"));
@@ -36,12 +37,12 @@ const parseurl_1 = __importDefault(require("parseurl"));
 const n8n_workflow_1 = require("n8n-workflow");
 const config_1 = __importDefault(require("./config"));
 const constants_1 = require("./constants");
-const ActiveWorkflowRunner = __importStar(require("./ActiveWorkflowRunner"));
+const ActiveWorkflowRunner_1 = require("./ActiveWorkflowRunner");
 const Db = __importStar(require("./Db"));
 const ExternalHooks_1 = require("./ExternalHooks");
 const ResponseHelper_1 = require("./ResponseHelper");
 const middlewares_1 = require("./middlewares");
-const TestWebhooks = __importStar(require("./TestWebhooks"));
+const TestWebhooks_1 = require("./TestWebhooks");
 const WaitingWebhooks_1 = require("./WaitingWebhooks");
 const WebhookHelpers_1 = require("./WebhookHelpers");
 const emptyBuffer = Buffer.alloc(0);
@@ -57,8 +58,8 @@ class AbstractServer {
         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();
+        this.externalHooks = typedi_1.Container.get(ExternalHooks_1.ExternalHooks);
+        this.activeWorkflowRunner = typedi_1.Container.get(ActiveWorkflowRunner_1.ActiveWorkflowRunner);
     }
     async setupErrorHandlers() {
         const { app } = this;
@@ -243,7 +244,7 @@ class AbstractServer {
     }
     setupTestWebhookEndpoint() {
         const endpoint = this.endpointWebhookTest;
-        const testWebhooks = TestWebhooks.getInstance();
+        const testWebhooks = typedi_1.Container.get(TestWebhooks_1.TestWebhooks);
         this.app.all(`/${endpoint}/*`, async (req, res) => {
             const requestUrl = req.parsedUrl.pathname.slice(endpoint.length + 2);
             const method = req.method.toUpperCase();

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/ActiveExecutions.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { IDeferredPromise, IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
+import type { IDeferredPromise, IExecuteResponsePromiseData, IRun, ExecutionStatus } from 'n8n-workflow';
 import type { ChildProcess } from 'child_process';
 import type PCancelable from 'p-cancelable';
 import type { IExecutionsCurrentSummary, IWorkflowExecutionDataProcess } from './Interfaces';
@@ -13,5 +13,6 @@ export declare class ActiveExecutions {
     stopExecution(executionId: string, timeout?: string): Promise<IRun | undefined>;
     getPostExecutePromise(executionId: string): Promise<IRun | undefined>;
     getActiveExecutions(): IExecutionsCurrentSummary[];
+    setStatus(executionId: string, status: ExecutionStatus): Promise<void>;
+    getStatus(executionId: string): ExecutionStatus;
 }
-export declare function getInstance(): ActiveExecutions;

package/dist/ActiveExecutions.js

@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -23,17 +29,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInstance = exports.ActiveExecutions = void 0;
+exports.ActiveExecutions = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const flatted_1 = require("flatted");
 const Db = __importStar(require("./Db"));
 const ResponseHelper = __importStar(require("./ResponseHelper"));
 const WorkflowHelpers = __importStar(require("./WorkflowHelpers"));
-class ActiveExecutions {
+const typedi_1 = require("typedi");
+let ActiveExecutions = class ActiveExecutions {
     constructor() {
         this.activeExecutions = {};
     }
     async add(executionData, process, executionId) {
+        let executionStatus = executionId ? 'running' : 'new';
         if (executionId === undefined) {
             const fullExecutionData = {
                 data: executionData.executionData,
@@ -41,6 +49,7 @@ class ActiveExecutions {
                 finished: false,
                 startedAt: new Date(),
                 workflowData: executionData.workflowData,
+                status: executionStatus,
             };
             if (executionData.retryOf !== undefined) {
                 fullExecutionData.retryOf = executionData.retryOf.toString();
@@ -56,12 +65,17 @@ class ActiveExecutions {
                     ?
                         executionResult.id.toString()
                     : executionResult.id + '';
+            if (executionId === undefined) {
+                throw new Error('There was an issue assigning an execution id to the execution');
+            }
+            executionStatus = 'running';
         }
         else {
             const execution = {
                 id: executionId,
                 data: (0, flatted_1.stringify)(executionData.executionData),
                 waitTill: null,
+                status: executionStatus,
             };
             await Db.collections.Execution.update(executionId, execution);
         }
@@ -70,6 +84,7 @@ class ActiveExecutions {
             process,
             startedAt: new Date(),
             postExecutePromises: [],
+            status: executionStatus,
         };
         return executionId;
     }
@@ -138,18 +153,27 @@ class ActiveExecutions {
                 startedAt: data.startedAt,
                 mode: data.executionData.executionMode,
                 workflowId: data.executionData.workflowData.id,
+                status: data.status,
             });
         }
         return returnData;
     }
-}
-exports.ActiveExecutions = ActiveExecutions;
-let activeExecutionsInstance;
-function getInstance() {
-    if (activeExecutionsInstance === undefined) {
-        activeExecutionsInstance = new ActiveExecutions();
+    async setStatus(executionId, status) {
+        if (this.activeExecutions[executionId] === undefined) {
+            n8n_workflow_1.LoggerProxy.debug(`There is no active execution with id "${executionId}", can't update status to ${status}.`);
+            return;
+        }
+        this.activeExecutions[executionId].status = status;
     }
-    return activeExecutionsInstance;
-}
-exports.getInstance = getInstance;
+    getStatus(executionId) {
+        if (this.activeExecutions[executionId] === undefined) {
+            return 'unknown';
+        }
+        return this.activeExecutions[executionId].status;
+    }
+};
+ActiveExecutions = __decorate([
+    (0, typedi_1.Service)()
+], ActiveExecutions);
+exports.ActiveExecutions = ActiveExecutions;
 //# sourceMappingURL=ActiveExecutions.js.map

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/ActiveWebhooks.d.ts

@@ -0,0 +1,13 @@
+import type { IWebhookData, WebhookHttpMethod, Workflow, WorkflowActivateMode, WorkflowExecuteMode } from 'n8n-workflow';
+export declare class ActiveWebhooks {
+    private workflowWebhooks;
+    private webhookUrls;
+    testWebhooks: boolean;
+    add(workflow: Workflow, webhookData: IWebhookData, mode: WorkflowExecuteMode, activation: WorkflowActivateMode): Promise<void>;
+    get(httpMethod: WebhookHttpMethod, path: string, webhookId?: string): IWebhookData | undefined;
+    getWebhookMethods(path: string): string[];
+    getWorkflowIds(): string[];
+    getWebhookKey(httpMethod: WebhookHttpMethod, path: string, webhookId?: string): string;
+    removeWorkflow(workflow: Workflow): Promise<boolean>;
+    removeAll(workflows: Workflow[]): Promise<void>;
+}

package/dist/ActiveWebhooks.js

@@ -0,0 +1,145 @@
+"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 __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActiveWebhooks = void 0;
+const typedi_1 = require("typedi");
+const NodeExecuteFunctions = __importStar(require("n8n-core"));
+let ActiveWebhooks = class ActiveWebhooks {
+    constructor() {
+        this.workflowWebhooks = {};
+        this.webhookUrls = {};
+        this.testWebhooks = false;
+    }
+    async add(workflow, webhookData, mode, activation) {
+        if (workflow.id === undefined) {
+            throw new Error('Webhooks can only be added for saved workflows as an id is needed!');
+        }
+        if (webhookData.path.endsWith('/')) {
+            webhookData.path = webhookData.path.slice(0, -1);
+        }
+        const webhookKey = this.getWebhookKey(webhookData.httpMethod, webhookData.path, webhookData.webhookId);
+        if (this.webhookUrls[webhookKey] && !webhookData.webhookId) {
+            throw new Error(`The URL path that the "${webhookData.node}" node uses is already taken. Please change it to something else.`);
+        }
+        if (this.workflowWebhooks[webhookData.workflowId] === undefined) {
+            this.workflowWebhooks[webhookData.workflowId] = [];
+        }
+        if (!this.webhookUrls[webhookKey]) {
+            this.webhookUrls[webhookKey] = [];
+        }
+        this.webhookUrls[webhookKey].push(webhookData);
+        try {
+            const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, activation, this.testWebhooks);
+            if (webhookExists !== true) {
+                await workflow.runWebhookMethod('create', webhookData, NodeExecuteFunctions, mode, activation, this.testWebhooks);
+            }
+        }
+        catch (error) {
+            if (this.webhookUrls[webhookKey].length <= 1) {
+                delete this.webhookUrls[webhookKey];
+            }
+            else {
+                this.webhookUrls[webhookKey] = this.webhookUrls[webhookKey].filter((webhook) => webhook.path !== webhookData.path);
+            }
+            throw error;
+        }
+        this.workflowWebhooks[webhookData.workflowId].push(webhookData);
+    }
+    get(httpMethod, path, webhookId) {
+        const webhookKey = this.getWebhookKey(httpMethod, path, webhookId);
+        if (this.webhookUrls[webhookKey] === undefined) {
+            return undefined;
+        }
+        let webhook;
+        let maxMatches = 0;
+        const pathElementsSet = new Set(path.split('/'));
+        this.webhookUrls[webhookKey].forEach((dynamicWebhook) => {
+            const staticElements = dynamicWebhook.path.split('/').filter((ele) => !ele.startsWith(':'));
+            const allStaticExist = staticElements.every((staticEle) => pathElementsSet.has(staticEle));
+            if (allStaticExist && staticElements.length > maxMatches) {
+                maxMatches = staticElements.length;
+                webhook = dynamicWebhook;
+            }
+            else if (staticElements.length === 0 && !webhook) {
+                webhook = dynamicWebhook;
+            }
+        });
+        return webhook;
+    }
+    getWebhookMethods(path) {
+        const methods = [];
+        Object.keys(this.webhookUrls)
+            .filter((key) => key.includes(path))
+            .map((key) => {
+            methods.push(key.split('|')[0]);
+        });
+        return methods;
+    }
+    getWorkflowIds() {
+        return Object.keys(this.workflowWebhooks);
+    }
+    getWebhookKey(httpMethod, path, webhookId) {
+        if (webhookId) {
+            if (path.startsWith(webhookId)) {
+                const cutFromIndex = path.indexOf('/') + 1;
+                path = path.slice(cutFromIndex);
+            }
+            return `${httpMethod}|${webhookId}|${path.split('/').length}`;
+        }
+        return `${httpMethod}|${path}`;
+    }
+    async removeWorkflow(workflow) {
+        const workflowId = workflow.id.toString();
+        if (this.workflowWebhooks[workflowId] === undefined) {
+            return false;
+        }
+        const webhooks = this.workflowWebhooks[workflowId];
+        const mode = 'internal';
+        for (const webhookData of webhooks) {
+            await workflow.runWebhookMethod('delete', webhookData, NodeExecuteFunctions, mode, 'update', this.testWebhooks);
+            delete this.webhookUrls[this.getWebhookKey(webhookData.httpMethod, webhookData.path, webhookData.webhookId)];
+        }
+        delete this.workflowWebhooks[workflowId];
+        return true;
+    }
+    async removeAll(workflows) {
+        const removePromises = [];
+        for (const workflow of workflows) {
+            removePromises.push(this.removeWorkflow(workflow));
+        }
+        await Promise.all(removePromises);
+    }
+};
+ActiveWebhooks = __decorate([
+    (0, typedi_1.Service)()
+], ActiveWebhooks);
+exports.ActiveWebhooks = ActiveWebhooks;
+//# sourceMappingURL=ActiveWebhooks.js.map

package/dist/ActiveWebhooks.js.map

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

package/dist/ActiveWorkflowRunner.d.ts

@@ -3,11 +3,13 @@ import { Workflow } from 'n8n-workflow';
 import type express from 'express';
 import type { IActivationError, IResponseCallbackData, IWorkflowDb } from './Interfaces';
 import type { User } from './databases/entities/User';
+import { ExternalHooks } from './ExternalHooks';
 export declare class ActiveWorkflowRunner {
+    private externalHooks;
     private activeWorkflows;
     private activationErrors;
     private queuedWorkflowActivations;
-    constructor();
+    constructor(externalHooks: ExternalHooks);
     init(): Promise<void>;
     removeAll(): Promise<void>;
     executeWebhook(httpMethod: WebhookHttpMethod, path: string, req: express.Request, res: express.Response): Promise<IResponseCallbackData>;
@@ -27,4 +29,3 @@ export declare class ActiveWorkflowRunner {
     removeAllQueuedWorkflowActivations(): void;
     remove(workflowId: string): Promise<void>;
 }
-export declare function getInstance(): ActiveWorkflowRunner;