n8n 1.63.4 → 1.64.0

package/dist/runners/task-managers/{single-main-task-manager.js → local-task-manager.js}

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SingleMainTaskManager = void 0;
+exports.LocalTaskManager = void 0;
 const typedi_1 = __importDefault(require("typedi"));
 const task_manager_1 = require("./task-manager");
 const task_broker_service_1 = require("../task-broker.service");
-class SingleMainTaskManager extends task_manager_1.TaskManager {
+class LocalTaskManager extends task_manager_1.TaskManager {
     constructor() {
         super();
         this.id = 'single-main';
@@ -21,5 +21,5 @@ class SingleMainTaskManager extends task_manager_1.TaskManager {
         void this.taskBroker.onRequesterMessage(this.id, message);
     }
 }
-exports.SingleMainTaskManager = SingleMainTaskManager;
-//# sourceMappingURL=single-main-task-manager.js.map
+exports.LocalTaskManager = LocalTaskManager;
+//# sourceMappingURL=local-task-manager.js.map

package/dist/runners/task-managers/local-task-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/local-task-manager.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA+B;AAE/B,iDAA6C;AAG7C,gEAAoD;AAEpD,MAAa,gBAAiB,SAAQ,0BAAW;IAKhD;QACC,KAAK,EAAE,CAAC;QAHT,OAAE,GAAW,aAAa,CAAC;QAI1B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC1B,CAAC;IAED,iBAAiB;QAChB,IAAI,CAAC,UAAU,GAAG,gBAAS,CAAC,GAAG,CAAC,gCAAU,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAChC,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAA6B,CACrD,CAAC;IACH,CAAC;IAED,WAAW,CAAC,OAAmC;QAC9C,KAAK,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CACD;AAtBD,4CAsBC"}

package/dist/runners/task-managers/task-manager.d.ts

@@ -1,4 +1,4 @@
-import type { EnvProviderState, IExecuteFunctions, Workflow, IRunExecutionData, INodeExecutionData, ITaskDataConnections, INode, WorkflowParameters, INodeParameters, WorkflowExecuteMode, IExecuteData, IDataObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import { type EnvProviderState, type IExecuteFunctions, type Workflow, type IRunExecutionData, type INodeExecutionData, type ITaskDataConnections, type INode, type WorkflowParameters, type INodeParameters, type WorkflowExecuteMode, type IExecuteData, type IDataObject, type IWorkflowExecuteAdditionalData, type Result } from 'n8n-workflow';
 import { type TaskResultData, type N8nMessage, type RequesterMessage } from '../runner-types';
 export type RequestAccept = (jobId: string) => void;
 export type RequestReject = (reason: string) => void;
@@ -77,7 +77,7 @@ export declare class TaskManager {
     }>;
     pendingRequests: Map<string, TaskRequest>;
     tasks: Map<string, Task>;
-    startTask<T>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, envProviderState: EnvProviderState, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<T>;
+    startTask<TData, TError>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, envProviderState: EnvProviderState, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<Result<TData, TError>>;
     sendMessage(_message: RequesterMessage.ToN8n.All): void;
     onMessage(message: N8nMessage.ToRequester.All): void;
     taskReady(requestId: string, taskId: string): void;

package/dist/runners/task-managers/task-manager.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskManager = void 0;
+const n8n_workflow_1 = require("n8n-workflow");
 const nanoid_1 = require("nanoid");
-const errors_1 = require("../../runners/errors");
 const runner_types_1 = require("../runner-types");
 const workflowToParameters = (workflow) => {
     return {
@@ -89,15 +89,10 @@ class TaskManager {
                     runExecutionData.resultData.metadata[k] = v;
                 });
             }
-            return resultData.result;
+            return (0, n8n_workflow_1.createResultOk)(resultData.result);
         }
         catch (e) {
-            if (typeof e === 'string') {
-                throw new errors_1.TaskError(e, {
-                    level: 'error',
-                });
-            }
-            throw e;
+            return (0, n8n_workflow_1.createResultError)(e);
         }
         finally {
             this.tasks.delete(taskId);

package/dist/runners/task-managers/task-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":";;;AAeA,mCAAgC;AAEhC,6CAA6C;AAE7C,kDAKyB;AAiFzB,MAAM,oBAAoB,GAAG,CAAC,QAAkB,EAAyC,EAAE;IAC1F,OAAO;QACN,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,WAAW,EAAE,QAAQ,CAAC,uBAAuB;QAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QACpC,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;KAC/B,CAAC;AACH,CAAC,CAAC;AAEF,MAAa,WAAW;IAAxB;QACC,yBAAoB,GAAkE,IAAI,GAAG,EAAE,CAAC;QAEhG,sBAAiB,GAA4D,IAAI,GAAG,EAAE,CAAC;QAEvF,oBAAe,GAA6B,IAAI,GAAG,EAAE,CAAC;QAEtD,UAAK,GAAsB,IAAI,GAAG,EAAE,CAAC;IAkStC,CAAC;IAhSA,KAAK,CAAC,SAAS,CACd,cAA8C,EAC9C,QAAgB,EAChB,QAAiB,EACjB,gBAAmC,EACnC,SAA+B,EAC/B,IAAW,EACX,QAAkB,EAClB,gBAAmC,EACnC,QAAgB,EAChB,SAAiB,EACjB,cAAsB,EACtB,mBAAyC,EACzC,iBAAkC,EAClC,IAAyB,EACzB,gBAAkC,EAClC,WAA0B,EAC1B,qBAAqB,GAAG,CAAC,CAAC,EAC1B,WAAwB,EAAE,EAC1B,kBAA0B,cAAc;QAExC,MAAM,IAAI,GAAa;YACtB,QAAQ;YACR,gBAAgB;YAChB,QAAQ;YACR,mBAAmB;YACnB,SAAS;YACT,IAAI;YACJ,gBAAgB;YAChB,SAAS;YACT,iBAAiB;YACjB,IAAI;YACJ,gBAAgB;YAChB,WAAW;YACX,qBAAqB;YACrB,QAAQ;YACR,eAAe;YACf,cAAc;YACd,cAAc;SACd,CAAC;QAEF,MAAM,OAAO,GAAgB;YAC5B,SAAS,EAAE,IAAA,eAAM,GAAE;YACnB,QAAQ;YACR,QAAQ;YACR,IAAI;SACJ,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAErD,MAAM,aAAa,GAAG,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7D,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE;gBAChD,MAAM,EAAE,OAAO;gBACf,MAAM;aACN,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC;YAChB,IAAI,EAAE,uBAAuB;YAC7B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,QAAQ;SACR,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;QAEnC,MAAM,IAAI,GAAS;YAClB,MAAM;YACN,IAAI;YACJ,QAAQ;SACR,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAElC,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,IAAI,OAAO,CAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;oBACvC,MAAM,EAAE,OAAO;oBACf,MAAM;iBACN,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,CAAC;gBAChB,IAAI,EAAE,wBAAwB;gBAC9B,MAAM;gBACN,QAAQ;aACR,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG,MAAM,WAAW,CAAC;YAErC,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;oBACxD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;wBAC3C,gBAAgB,CAAC,UAAU,CAAC,QAAQ,GAAG,EAAE,CAAC;oBAC3C,CAAC;oBACD,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;YACJ,CAAC;YACD,OAAO,UAAU,CAAC,MAAW,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC3B,MAAM,IAAI,kBAAS,CAAC,CAAC,EAAE;oBACtB,KAAK,EAAE,OAAO;iBACd,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,WAAW,CAAC,QAAoC,IAAG,CAAC;IAEpD,SAAS,CAAC,OAAmC;QAC5C,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;YACtB,KAAK,kBAAkB;gBACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClD,MAAM;YACP,KAAK,iBAAiB;gBACrB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAC5C,MAAM;YACP,KAAK,kBAAkB;gBACtB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC9C,MAAM;YACP,KAAK,wBAAwB;gBAC5B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;gBAC1E,MAAM;YACP,KAAK,YAAY;gBAChB,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClF,MAAM;QACR,CAAC;IACF,CAAC;IAED,SAAS,CAAC,SAAiB,EAAE,MAAc;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9D,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,IAAI,CAAC,UAAU,CACd,MAAM,EACN,sHAAsH,CACtH,CAAC;YACF,OAAO;QACR,CAAC;QAED,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5B,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,MAAc;QACvC,IAAI,CAAC,WAAW,CAAC;YAChB,IAAI,EAAE,sBAAsB;YAC5B,MAAM,EAAE,KAAK;YACb,MAAM;SACN,CAAC,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,MAAc,EAAE,IAAoB;QAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,YAAY,EAAE,CAAC;YAClB,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,KAAc;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,YAAY,EAAE,CAAC;YAClB,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3B,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;IAED,YAAY,CACX,MAAc,EACd,SAAiB,EACjB,WAAkE;QAElE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,EAAE,CAAC;YAEV,OAAO;QACR,CAAC;QACD,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YAC3B,MAAM,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;YACpB,MAAM,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC;YAC7B,MAAM,IAAI,GAAoB;gBAC7B,QAAQ,EAAE,oBAAoB,CAAC,EAAE,CAAC,QAAQ,CAAC;gBAC3C,mBAAmB,EAAE,EAAE,CAAC,mBAAmB;gBAC3C,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,SAAS,EAAE,EAAE,CAAC,SAAS;gBACvB,cAAc,EAAE,EAAE,CAAC,cAAc;gBACjC,eAAe,EAAE,EAAE,CAAC,eAAe;gBACnC,qBAAqB,EAAE,EAAE,CAAC,qBAAqB;gBAC/C,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,gBAAgB,EAAE,EAAE,CAAC,gBAAgB;gBACrC,IAAI,EAAE,EAAE,CAAC,IAAI;gBACb,gBAAgB,EAAE,EAAE,CAAC,gBAAgB;gBACrC,QAAQ,EAAE,EAAE,CAAC,QAAQ;gBACrB,QAAQ,EAAE,EAAE,CAAC,QAAQ;gBACrB,iBAAiB,EAAE,EAAE,CAAC,iBAAiB;gBACvC,WAAW,EAAE,EAAE,CAAC,WAAW;gBAC3B,cAAc,EAAE;oBACf,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;oBACzC,eAAe,EAAE,EAAE,CAAC,eAAe;oBACnC,UAAU,EAAE,EAAE,CAAC,UAAU;oBACzB,SAAS,EAAE,EAAE,CAAC,SAAS;oBACvB,cAAc,EAAE,EAAE,CAAC,cAAc;oBACjC,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;oBACzC,qBAAqB,EAAE,EAAE,CAAC,qBAAqB;oBAC/C,qBAAqB,EAAE,EAAE,CAAC,qBAAqB;oBAC/C,WAAW,EAAE,EAAE,CAAC,WAAW;oBAC3B,yBAAyB,EAAE,EAAE,CAAC,yBAAyB;oBACvD,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;oBACzC,MAAM,EAAE,EAAE,CAAC,MAAM;iBACjB;aACD,CAAC;YACF,IAAI,CAAC,WAAW,CAAC;gBAChB,IAAI,EAAE,4BAA4B;gBAClC,MAAM;gBACN,SAAS;gBACT,IAAI;aACJ,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,KAAK,CAAC,SAAS,CACd,MAAc,EACd,MAAc,EACd,IAAwC,EACxC,MAAiB;QAEjB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,EAAE,CAAC;YAEV,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,CAAC,6BAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACpC,IAAI,CAAC,WAAW,CAAC;oBAChB,IAAI,EAAE,uBAAuB;oBAC7B,MAAM;oBACN,MAAM;oBACN,MAAM,EAAE,OAAO;oBACf,IAAI,EAAE,oBAAoB;iBAC1B,CAAC,CAAC;gBACH,OAAO;YACR,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAElC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC;YAExC,IAAI,IAAI,GAA2D,SAAS,CAAC;YAC7E,IAAI,OAAO,GACV,KAAyC,CAAC;YAC3C,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;gBAC9B,OAAO,GAAI,OAAiC,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC;gBAChE,IAAI,CAAC,OAAO,EAAE,CAAC;oBACd,MAAM;gBACP,CAAC;YACF,CAAC;YACD,IAAI,GAAG,OAA8D,CAAC;YACtE,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,IAAI,CAAC,WAAW,CAAC;oBAChB,IAAI,EAAE,uBAAuB;oBAC7B,MAAM;oBACN,MAAM;oBACN,MAAM,EAAE,OAAO;oBACf,IAAI,EAAE,uBAAuB;iBAC7B,CAAC,CAAC;gBACH,OAAO;YACR,CAAC;YACD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,CAAY,CAAC;YAE5D,IAAI,CAAC,WAAW,CAAC;gBAChB,IAAI,EAAE,uBAAuB;gBAC7B,MAAM;gBACN,MAAM;gBACN,MAAM,EAAE,SAAS;gBACjB,IAAI;aACJ,CAAC,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,CAAC,WAAW,CAAC;gBAChB,IAAI,EAAE,uBAAuB;gBAC7B,MAAM;gBACN,MAAM;gBACN,MAAM,EAAE,OAAO;gBACf,IAAI,EAAE,CAAC;aACP,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;CACD;AAzSD,kCAySC"}
+{"version":3,"file":"task-manager.js","sourceRoot":"","sources":["../../../src/runners/task-managers/task-manager.ts"],"names":[],"mappings":"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"}

package/dist/runners/task-runner-process.d.ts

@@ -10,7 +10,11 @@ export declare class TaskRunnerProcess {
     private isShuttingDown;
     constructor(globalConfig: GlobalConfig, authService: TaskRunnerAuthService);
     start(): Promise<void>;
+    startNode(grantToken: string, n8nUri: string): import("child_process").ChildProcessWithoutNullStreams;
+    startLauncher(grantToken: string, n8nUri: string): import("child_process").ChildProcessWithoutNullStreams;
     stop(): Promise<void>;
+    killNode(): void;
+    killLauncher(): Promise<void>;
     private monitorProcess;
     private onProcessExit;
 }

package/dist/runners/task-runner-process.js

@@ -36,6 +36,7 @@ exports.TaskRunnerProcess = void 0;
 const config_1 = require("@n8n/config");
 const a = __importStar(require("node:assert/strict"));
 const node_child_process_1 = require("node:child_process");
+const process = __importStar(require("node:process"));
 const typedi_1 = require("typedi");
 const task_runner_auth_service_1 = require("./auth/task-runner-auth.service");
 const on_shutdown_1 = require("../decorators/on-shutdown");
@@ -56,30 +57,76 @@ let TaskRunnerProcess = class TaskRunnerProcess {
     async start() {
         a.ok(!this.process, 'Task Runner Process already running');
         const grantToken = await this.authService.createGrantToken();
+        const n8nUri = `127.0.0.1:${this.globalConfig.taskRunners.port}`;
+        this.process = this.globalConfig.taskRunners.useLauncher
+            ? this.startLauncher(grantToken, n8nUri)
+            : this.startNode(grantToken, n8nUri);
+        this.process.stdout?.pipe(process.stdout);
+        this.process.stderr?.pipe(process.stderr);
+        this.monitorProcess(this.process);
+    }
+    startNode(grantToken, n8nUri) {
         const startScript = require.resolve('@n8n/task-runner');
-        this.process = (0, node_child_process_1.spawn)('node', [startScript], {
+        return (0, node_child_process_1.spawn)('node', [startScript], {
             env: {
                 PATH: process.env.PATH,
                 N8N_RUNNERS_GRANT_TOKEN: grantToken,
-                N8N_RUNNERS_N8N_URI: `127.0.0.1:${this.globalConfig.taskRunners.port}`,
+                N8N_RUNNERS_N8N_URI: n8nUri,
+                NODE_FUNCTION_ALLOW_BUILTIN: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
+                NODE_FUNCTION_ALLOW_EXTERNAL: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
+            },
+        });
+    }
+    startLauncher(grantToken, n8nUri) {
+        return (0, node_child_process_1.spawn)(this.globalConfig.taskRunners.launcherPath, ['launch', this.globalConfig.taskRunners.launcherRunner], {
+            env: {
+                PATH: process.env.PATH,
+                N8N_RUNNERS_GRANT_TOKEN: grantToken,
+                N8N_RUNNERS_N8N_URI: n8nUri,
+                NODE_FUNCTION_ALLOW_BUILTIN: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
+                NODE_FUNCTION_ALLOW_EXTERNAL: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
+                RUST_LOG: process.env.RUST_LOG,
             },
         });
-        this.process.stdout?.pipe(process.stdout);
-        this.process.stderr?.pipe(process.stderr);
-        this.monitorProcess(this.process);
     }
     async stop() {
         if (!this.process) {
             return;
         }
         this.isShuttingDown = true;
-        this.process.kill();
+        if (this.globalConfig.taskRunners.useLauncher) {
+            await this.killLauncher();
+        }
+        else {
+            this.killNode();
+        }
         await this.runPromise;
         this.isShuttingDown = false;
     }
-    monitorProcess(process) {
+    killNode() {
+        if (!this.process) {
+            return;
+        }
+        this.process.kill();
+    }
+    async killLauncher() {
+        if (!this.process?.pid) {
+            return;
+        }
+        const killProcess = (0, node_child_process_1.spawn)(this.globalConfig.taskRunners.launcherPath, [
+            'kill',
+            this.globalConfig.taskRunners.launcherRunner,
+            this.process.pid.toString(),
+        ]);
+        await new Promise((resolve) => {
+            killProcess.on('exit', () => {
+                resolve();
+            });
+        });
+    }
+    monitorProcess(taskRunnerProcess) {
         this.runPromise = new Promise((resolve) => {
-            process.on('exit', (code) => {
+            taskRunnerProcess.on('exit', (code) => {
                 this.onProcessExit(code, resolve);
             });
         });

package/dist/runners/task-runner-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-runner-process.js","sourceRoot":"","sources":["../../src/runners/task-runner-process.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,sDAAwC;AACxC,2DAA2C;AAC3C,mCAAiC;AAEjC,8EAAwE;AACxE,2DAAuD;AAQhD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,IAAW,SAAS;QACnB,OAAO,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IAC9B,CAAC;IAGD,IAAW,GAAG;QACb,OAAO,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC;IAC1B,CAAC;IASD,YACkB,YAA0B,EAC1B,WAAkC;QADlC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,gBAAW,GAAX,WAAW,CAAuB;QAT5C,YAAO,GAAwB,IAAI,CAAC;QAGpC,eAAU,GAAyB,IAAI,CAAC;QAExC,mBAAc,GAAG,KAAK,CAAC;IAK5B,CAAC;IAEJ,KAAK,CAAC,KAAK;QACV,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,qCAAqC,CAAC,CAAC;QAE3D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,GAAG,IAAA,0BAAK,EAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE;YAC3C,GAAG,EAAE;gBACJ,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;gBACtB,uBAAuB,EAAE,UAAU;gBACnC,mBAAmB,EAAE,aAAa,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE;aACtE;SACD,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE1C,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;QACR,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAG3B,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,UAAU,CAAC;QAEtB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;IAC7B,CAAC;IAEO,cAAc,CAAC,OAAqB;QAC3C,IAAI,CAAC,UAAU,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACzC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,KAAoB,EAAE,SAAqB;QAChE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,SAAS,EAAE,CAAC;QAGZ,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1B,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC9C,CAAC;IACF,CAAC;CACD,CAAA;AA1EY,8CAAiB;AA2CvB;IADL,IAAA,wBAAU,GAAE;;;;6CAaZ;4BAvDW,iBAAiB;IAD7B,IAAA,gBAAO,GAAE;qCAmBuB,qBAAY;QACb,gDAAqB;GAnBxC,iBAAiB,CA0E7B"}
+{"version":3,"file":"task-runner-process.js","sourceRoot":"","sources":["../../src/runners/task-runner-process.ts"],"names":[],"mappings":"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"}

package/dist/scaling/job-processor.d.ts

@@ -1,4 +1,5 @@
 import type { RunningJobSummary } from '@n8n/api-types';
+import { InstanceSettings } from 'n8n-core';
 import { ExecutionRepository } from '../databases/repositories/execution.repository';
 import { WorkflowRepository } from '../databases/repositories/workflow.repository';
 import { Logger } from '../logging/logger.service';
@@ -9,8 +10,9 @@ export declare class JobProcessor {
     private readonly executionRepository;
     private readonly workflowRepository;
     private readonly nodeTypes;
+    private readonly instanceSettings;
     private readonly runningJobs;
-    constructor(logger: Logger, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes);
+    constructor(logger: Logger, executionRepository: ExecutionRepository, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, instanceSettings: InstanceSettings);
     processJob(job: Job): Promise<JobResult>;
     stopJob(jobId: JobId): void;
     getRunningJobIds(): JobId[];

package/dist/scaling/job-processor.js

@@ -46,12 +46,14 @@ const logger_service_1 = require("../logging/logger.service");
 const node_types_1 = require("../node-types");
 const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
 let JobProcessor = class JobProcessor {
-    constructor(logger, executionRepository, workflowRepository, nodeTypes) {
+    constructor(logger, executionRepository, workflowRepository, nodeTypes, instanceSettings) {
         this.logger = logger;
         this.executionRepository = executionRepository;
         this.workflowRepository = workflowRepository;
         this.nodeTypes = nodeTypes;
+        this.instanceSettings = instanceSettings;
         this.runningJobs = {};
+        this.logger = this.logger.withScope('scaling');
     }
     async processJob(job) {
         const { executionId, loadStaticData } = job.data;
@@ -60,13 +62,13 @@ let JobProcessor = class JobProcessor {
             unflattenData: true,
         });
         if (!execution) {
-            this.logger.error('[JobProcessor] Failed to find execution data', { executionId });
-            throw new n8n_workflow_1.ApplicationError('Failed to find execution data. Aborting execution.', {
-                extra: { executionId },
-            });
+            throw new n8n_workflow_1.ApplicationError(`Worker failed to find data for execution ${executionId} (job ${job.id})`, { level: 'warning' });
         }
         const workflowId = execution.workflowData.id;
-        this.logger.info(`[JobProcessor] Starting job ${job.id} (execution ${executionId})`);
+        this.logger.info(`Worker started execution ${executionId} (job ${job.id})`, {
+            executionId,
+            jobId: job.id,
+        });
         const startedAt = await this.executionRepository.setRunning(executionId);
         let { staticData } = execution.workflowData;
         if (loadStaticData) {
@@ -75,8 +77,7 @@ let JobProcessor = class JobProcessor {
                 where: { id: workflowId },
             });
             if (workflowData === null) {
-                this.logger.error('[JobProcessor] Failed to find workflow', { workflowId, executionId });
-                throw new n8n_workflow_1.ApplicationError('Failed to find workflow', { extra: { workflowId } });
+                throw new n8n_workflow_1.ApplicationError(`Worker failed to find workflow ${workflowId} to run execution ${executionId} (job ${job.id})`, { level: 'warning' });
             }
             staticData = workflowData.staticData;
         }
@@ -101,16 +102,18 @@ let JobProcessor = class JobProcessor {
         additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(execution.mode, job.data.executionId, execution.workflowData, { retryOf: execution.retryOf });
         additionalData.hooks.hookFunctions.sendResponse = [
             async (response) => {
-                await job.progress({
+                const msg = {
                     kind: 'respond-to-webhook',
                     executionId,
                     response: this.encodeWebhookResponse(response),
-                });
+                    workerId: this.instanceSettings.hostId,
+                };
+                await job.progress(msg);
             },
         ];
         additionalData.executionId = executionId;
         additionalData.setExecutionStatus = (status) => {
-            this.logger.debug(`[JobProcessor] Queued worker execution status for ${executionId} is "${status}"`);
+            this.logger.debug(`Queued worker execution status for execution ${executionId} (job ${job.id}) is "${status}"`);
         };
         let workflowExecute;
         let workflowRun;
@@ -135,7 +138,16 @@ let JobProcessor = class JobProcessor {
         this.runningJobs[job.id] = runningJob;
         await workflowRun;
         delete this.runningJobs[job.id];
-        this.logger.debug('[JobProcessor] Job finished running', { jobId: job.id, executionId });
+        this.logger.info(`Worker finished execution ${executionId} (job ${job.id})`, {
+            executionId,
+            jobId: job.id,
+        });
+        const msg = {
+            kind: 'job-finished',
+            executionId,
+            workerId: this.instanceSettings.hostId,
+        };
+        await job.progress(msg);
         return { success: true };
     }
     stopJob(jobId) {
@@ -163,6 +175,7 @@ exports.JobProcessor = JobProcessor = __decorate([
     __metadata("design:paramtypes", [logger_service_1.Logger,
         execution_repository_1.ExecutionRepository,
         workflow_repository_1.WorkflowRepository,
-        node_types_1.NodeTypes])
+        node_types_1.NodeTypes,
+        n8n_core_1.InstanceSettings])
 ], JobProcessor);
 //# sourceMappingURL=job-processor.js.map

package/dist/scaling/job-processor.js.map

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

package/dist/scaling/pubsub/publisher.service.d.ts

@@ -1,12 +1,14 @@
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
+import { InstanceSettings } from 'n8n-core';
 import { Logger } from '../../logging/logger.service';
 import { RedisClientService } from '../../services/redis-client.service';
 import type { PubSub } from './pubsub.types';
 export declare class Publisher {
     private readonly logger;
     private readonly redisClientService;
+    private readonly instanceSettings;
     private readonly client;
-    constructor(logger: Logger, redisClientService: RedisClientService);
+    constructor(logger: Logger, redisClientService: RedisClientService, instanceSettings: InstanceSettings);
     getClient(): SingleNodeClient | MultiNodeClient;
     shutdown(): void;
     publishCommand(msg: Omit<PubSub.Command, 'senderId'>): Promise<void>;

package/dist/scaling/pubsub/publisher.service.js

@@ -13,17 +13,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Publisher = void 0;
+const n8n_core_1 = require("n8n-core");
 const typedi_1 = require("typedi");
 const config_1 = __importDefault(require("../../config"));
 const logger_service_1 = require("../../logging/logger.service");
 const redis_client_service_1 = require("../../services/redis-client.service");
 const constants_1 = require("../constants");
 let Publisher = class Publisher {
-    constructor(logger, redisClientService) {
+    constructor(logger, redisClientService, instanceSettings) {
         this.logger = logger;
         this.redisClientService = redisClientService;
+        this.instanceSettings = instanceSettings;
         if (config_1.default.getEnv('executions.mode') !== 'queue')
             return;
+        this.logger = this.logger.withScope('scaling');
         this.client = this.redisClientService.createClient({ type: 'publisher(n8n)' });
     }
     getClient() {
@@ -35,7 +38,7 @@ let Publisher = class Publisher {
     async publishCommand(msg) {
         await this.client.publish('n8n.commands', JSON.stringify({
             ...msg,
-            senderId: config_1.default.getEnv('redis.queueModeId'),
+            senderId: this.instanceSettings.hostId,
             selfSend: constants_1.SELF_SEND_COMMANDS.has(msg.command),
             debounce: !constants_1.IMMEDIATE_COMMANDS.has(msg.command),
         }));
@@ -43,7 +46,7 @@ let Publisher = class Publisher {
     }
     async publishWorkerResponse(msg) {
         await this.client.publish('n8n.worker-response', JSON.stringify(msg));
-        this.logger.debug(`Published response for ${msg.command} to worker response channel`);
+        this.logger.debug(`Published ${msg.response} to worker response channel`);
     }
     async setIfNotExists(key, value) {
         const success = await this.client.setnx(key, value);
@@ -63,6 +66,7 @@ exports.Publisher = Publisher;
 exports.Publisher = Publisher = __decorate([
     (0, typedi_1.Service)(),
     __metadata("design:paramtypes", [logger_service_1.Logger,
-        redis_client_service_1.RedisClientService])
+        redis_client_service_1.RedisClientService,
+        n8n_core_1.InstanceSettings])
 ], Publisher);
 //# sourceMappingURL=publisher.service.js.map

package/dist/scaling/pubsub/publisher.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,mCAAiC;AAEjC,sDAA8B;AAC9B,6DAAkD;AAClD,0EAAqE;AAGrE,4CAAsE;AAM/D,IAAM,SAAS,GAAf,MAAM,SAAS;IAKrB,YACkB,MAAc,EACd,kBAAsC;QADtC,WAAM,GAAN,MAAM,CAAQ;QACd,uBAAkB,GAAlB,kBAAkB,CAAoB;QAGvD,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAAE,OAAO;QAEzD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,GAAqC;QACzD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CACxB,cAAc,EACd,IAAI,CAAC,SAAS,CAAC;YACd,GAAG,GAAG;YACN,QAAQ,EAAE,gBAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC;YAC5C,QAAQ,EAAE,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;YAC7C,QAAQ,EAAE,CAAC,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;SAC9C,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAClE,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAAC,GAA0B;QACrD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,CAAC,OAAO,6BAA6B,CAAC,CAAC;IACvF,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,KAAa;QAC9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAEpD,OAAO,CAAC,CAAC,OAAO,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,GAAW;QAC3C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACtB,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CAGD,CAAA;AA3EY,8BAAS;oBAAT,SAAS;IADrB,IAAA,gBAAO,GAAE;qCAOiB,uBAAM;QACM,yCAAkB;GAP5C,SAAS,CA2ErB"}
+{"version":3,"file":"publisher.service.js","sourceRoot":"","sources":["../../../src/scaling/pubsub/publisher.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,uCAA4C;AAC5C,mCAAiC;AAEjC,sDAA8B;AAC9B,6DAAkD;AAClD,0EAAqE;AAGrE,4CAAsE;AAM/D,IAAM,SAAS,GAAf,MAAM,SAAS;IAKrB,YACkB,MAAc,EACd,kBAAsC,EACtC,gBAAkC;QAFlC,WAAM,GAAN,MAAM,CAAQ;QACd,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAGnD,IAAI,gBAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,KAAK,OAAO;YAAE,OAAO;QAEzD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAChF,CAAC;IAED,SAAS;QACR,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAGD,QAAQ;QACP,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAOD,KAAK,CAAC,cAAc,CAAC,GAAqC;QACzD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CACxB,cAAc,EACd,IAAI,CAAC,SAAS,CAAC;YACd,GAAG,GAAG;YACN,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;YACtC,QAAQ,EAAE,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;YAC7C,QAAQ,EAAE,CAAC,8BAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;SAC9C,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAClE,CAAC;IAGD,KAAK,CAAC,qBAAqB,CAAC,GAA0B;QACrD,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,QAAQ,6BAA6B,CAAC,CAAC;IAC3E,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,KAAa;QAC9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAEpD,OAAO,CAAC,CAAC,OAAO,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,GAAW;QAC3C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACtB,MAAM,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CAGD,CAAA;AA9EY,8BAAS;oBAAT,SAAS;IADrB,IAAA,gBAAO,GAAE;qCAOiB,uBAAM;QACM,yCAAkB;QACpB,2BAAgB;GARxC,SAAS,CA8ErB"}

package/dist/scaling/pubsub/pubsub-handler.d.ts

@@ -1,11 +1,15 @@
 import { InstanceSettings } from 'n8n-core';
+import { ActiveWorkflowManager } from '../../active-workflow-manager';
+import { WorkflowRepository } from '../../databases/repositories/workflow.repository';
 import { MessageEventBus } from '../../eventbus/message-event-bus/message-event-bus';
 import { EventService } from '../../events/event.service';
 import { ExternalSecretsManager } from '../../external-secrets/external-secrets-manager.ee';
 import { License } from '../../license';
+import { Push } from '../../push';
 import { Publisher } from '../../scaling/pubsub/publisher.service';
 import { CommunityPackagesService } from '../../services/community-packages.service';
-import { WorkerStatus } from '../worker-status';
+import { TestWebhooks } from '../../webhooks/test-webhooks';
+import { WorkerStatusService } from '../worker-status.service';
 export declare class PubSubHandler {
     private readonly eventService;
     private readonly instanceSettings;
@@ -14,9 +18,14 @@ export declare class PubSubHandler {
     private readonly externalSecretsManager;
     private readonly communityPackagesService;
     private readonly publisher;
-    private readonly workerStatus;
-    constructor(eventService: EventService, instanceSettings: InstanceSettings, license: License, eventbus: MessageEventBus, externalSecretsManager: ExternalSecretsManager, communityPackagesService: CommunityPackagesService, publisher: Publisher, workerStatus: WorkerStatus);
+    private readonly workerStatusService;
+    private readonly activeWorkflowManager;
+    private readonly push;
+    private readonly workflowRepository;
+    private readonly testWebhooks;
+    constructor(eventService: EventService, instanceSettings: InstanceSettings, license: License, eventbus: MessageEventBus, externalSecretsManager: ExternalSecretsManager, communityPackagesService: CommunityPackagesService, publisher: Publisher, workerStatusService: WorkerStatusService, activeWorkflowManager: ActiveWorkflowManager, push: Push, workflowRepository: WorkflowRepository, testWebhooks: TestWebhooks);
     init(): void;
     private setupHandlers;
     private commonHandlers;
+    private multiMainHandlers;
 }

package/dist/scaling/pubsub/pubsub-handler.js

@@ -8,24 +8,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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.PubSubHandler = void 0;
 const n8n_core_1 = require("n8n-core");
+const n8n_workflow_1 = require("n8n-workflow");
 const typedi_1 = require("typedi");
-const config_1 = __importDefault(require("../../config"));
+const active_workflow_manager_1 = require("../../active-workflow-manager");
+const workflow_repository_1 = require("../../databases/repositories/workflow.repository");
 const message_event_bus_1 = require("../../eventbus/message-event-bus/message-event-bus");
 const event_service_1 = require("../../events/event.service");
 const external_secrets_manager_ee_1 = require("../../external-secrets/external-secrets-manager.ee");
 const license_1 = require("../../license");
+const push_1 = require("../../push");
 const publisher_service_1 = require("../../scaling/pubsub/publisher.service");
 const community_packages_service_1 = require("../../services/community-packages.service");
 const utils_1 = require("../../utils");
-const worker_status_1 = require("../worker-status");
+const test_webhooks_1 = require("../../webhooks/test-webhooks");
+const worker_status_service_1 = require("../worker-status.service");
 let PubSubHandler = class PubSubHandler {
-    constructor(eventService, instanceSettings, license, eventbus, externalSecretsManager, communityPackagesService, publisher, workerStatus) {
+    constructor(eventService, instanceSettings, license, eventbus, externalSecretsManager, communityPackagesService, publisher, workerStatusService, activeWorkflowManager, push, workflowRepository, testWebhooks) {
         this.eventService = eventService;
         this.instanceSettings = instanceSettings;
         this.license = license;
@@ -33,7 +34,11 @@ let PubSubHandler = class PubSubHandler {
         this.externalSecretsManager = externalSecretsManager;
         this.communityPackagesService = communityPackagesService;
         this.publisher = publisher;
-        this.workerStatus = workerStatus;
+        this.workerStatusService = workerStatusService;
+        this.activeWorkflowManager = activeWorkflowManager;
+        this.push = push;
+        this.workflowRepository = workflowRepository;
+        this.testWebhooks = testWebhooks;
         this.commonHandlers = {
             'reload-license': async () => await this.license.reload(),
             'restart-event-bus': async () => await this.eventbus.restart(),
@@ -42,6 +47,58 @@ let PubSubHandler = class PubSubHandler {
             'community-package-update': async ({ packageName, packageVersion }) => await this.communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion),
             'community-package-uninstall': async ({ packageName }) => await this.communityPackagesService.removeNpmPackage(packageName),
         };
+        this.multiMainHandlers = {
+            'add-webhooks-triggers-and-pollers': async ({ workflowId }) => {
+                if (this.instanceSettings.isFollower)
+                    return;
+                try {
+                    await this.activeWorkflowManager.add(workflowId, 'activate', undefined, {
+                        shouldPublish: false,
+                    });
+                    this.push.broadcast('workflowActivated', { workflowId });
+                    await this.publisher.publishCommand({
+                        command: 'display-workflow-activation',
+                        payload: { workflowId },
+                    });
+                }
+                catch (e) {
+                    const error = (0, n8n_workflow_1.ensureError)(e);
+                    const { message } = error;
+                    await this.workflowRepository.update(workflowId, { active: false });
+                    this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage: message });
+                    await this.publisher.publishCommand({
+                        command: 'display-workflow-activation-error',
+                        payload: { workflowId, errorMessage: message },
+                    });
+                }
+            },
+            'remove-triggers-and-pollers': async ({ workflowId }) => {
+                if (this.instanceSettings.isFollower)
+                    return;
+                await this.activeWorkflowManager.removeActivationError(workflowId);
+                await this.activeWorkflowManager.removeWorkflowTriggersAndPollers(workflowId);
+                this.push.broadcast('workflowDeactivated', { workflowId });
+                await this.publisher.publishCommand({
+                    command: 'display-workflow-deactivation',
+                    payload: { workflowId },
+                });
+            },
+            'display-workflow-activation': async ({ workflowId }) => this.push.broadcast('workflowActivated', { workflowId }),
+            'display-workflow-deactivation': async ({ workflowId }) => this.push.broadcast('workflowDeactivated', { workflowId }),
+            'display-workflow-activation-error': async ({ workflowId, errorMessage }) => this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage }),
+            'relay-execution-lifecycle-event': async ({ type, args, pushRef }) => {
+                if (!this.push.getBackend().hasPushRef(pushRef))
+                    return;
+                this.push.send(type, args, pushRef);
+            },
+            'clear-test-webhooks': async ({ webhookKey, workflowEntity, pushRef }) => {
+                if (!this.push.getBackend().hasPushRef(pushRef))
+                    return;
+                this.testWebhooks.clearTimeout(webhookKey);
+                const workflow = this.testWebhooks.toWorkflow(workflowEntity);
+                await this.testWebhooks.deactivateWebhooks(workflow);
+            },
+        };
     }
     init() {
         switch (this.instanceSettings.instanceType) {
@@ -52,13 +109,21 @@ let PubSubHandler = class PubSubHandler {
                 this.setupHandlers({
                     ...this.commonHandlers,
                     'get-worker-status': async () => await this.publisher.publishWorkerResponse({
-                        workerId: config_1.default.getEnv('redis.queueModeId'),
-                        command: 'get-worker-status',
-                        payload: this.workerStatus.generateStatus(),
+                        senderId: this.instanceSettings.hostId,
+                        response: 'response-to-get-worker-status',
+                        payload: this.workerStatusService.generateStatus(),
                     }),
                 });
                 break;
             case 'main':
+                this.setupHandlers({
+                    ...this.commonHandlers,
+                    ...this.multiMainHandlers,
+                    'response-to-get-worker-status': async (payload) => this.push.broadcast('sendWorkerStatusMessage', {
+                        workerId: payload.senderId,
+                        status: payload,
+                    }),
+                });
                 break;
             default:
                 (0, utils_1.assertNever)(this.instanceSettings.instanceType);
@@ -82,6 +147,10 @@ exports.PubSubHandler = PubSubHandler = __decorate([
         external_secrets_manager_ee_1.ExternalSecretsManager,
         community_packages_service_1.CommunityPackagesService,
         publisher_service_1.Publisher,
-        worker_status_1.WorkerStatus])
+        worker_status_service_1.WorkerStatusService,
+        active_workflow_manager_1.ActiveWorkflowManager,
+        push_1.Push,
+        workflow_repository_1.WorkflowRepository,
+        test_webhooks_1.TestWebhooks])
 ], PubSubHandler);
 //# sourceMappingURL=pubsub-handler.js.map