npm - n8n - Versions diffs - 2.37.6 → 2.37.7 - Mend

n8n 2.37.6 → 2.37.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (109) hide show

package/dist/chat/chat-execution-manager.d.ts CHANGED Viewed

@@ -17,6 +17,11 @@ export declare class ChatExecutionManager {
     findExecution(executionId: string): Promise<IExecutionResponse | undefined>;
     private getWorkflow;
     private mapFilesToBinaryData;
+    private resolveResumeTarget;
+    private tryResolveResumeTarget;
+    canResumeOverChat(execution: IExecutionResponse): boolean;
+    resolveResumeNodeType(execution: IExecutionResponse): string | undefined;
+    private isChatDrivenExecution;
     private runNode;
     private getRunData;
 }

package/dist/chat/chat-execution-manager.js CHANGED Viewed

@@ -55,6 +55,7 @@ const workflow_runner_1 = require("../workflow-runner");
 const utils_1 = require("./utils");
 const node_types_1 = require("../node-types");
 const ownership_service_1 = require("../services/ownership.service");
+const utils_2 = require("../utils");
 let ChatExecutionManager = class ChatExecutionManager {
     constructor(executionRepository, executionPersistence, workflowRunner, ownershipService, nodeTypes) {
         this.executionRepository = executionRepository;
@@ -64,6 +65,11 @@ let ChatExecutionManager = class ChatExecutionManager {
         this.nodeTypes = nodeTypes;
     }
     async runWorkflow(execution, message) {
+        if (!this.isChatDrivenExecution(execution)) {
+            throw new n8n_workflow_1.UnexpectedError('Refusing to resume a non-chat node over chat', {
+                extra: { executionId: execution.id },
+            });
+        }
         await this.workflowRunner.run(await this.getRunData(execution, message), true, true, {
             executionId: execution.id,
             expectedStatus: 'waiting',
@@ -76,6 +82,8 @@ let ChatExecutionManager = class ChatExecutionManager {
         });
         if (!execution)
             return;
+        if (!this.isChatDrivenExecution(execution))
+            return;
         if (['running', 'waiting', 'unknown'].includes(execution.status)) {
             await this.executionRepository.update({ id: executionId }, { status: 'canceled' });
         }
@@ -111,22 +119,53 @@ let ChatExecutionManager = class ChatExecutionManager {
         }
         return binary;
     }
-    async runNode(execution, message) {
-        const workflow = this.getWorkflow(execution);
-        const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
-        let node = workflow.getNode(lastNodeExecuted);
-        const additionalData = await WorkflowExecuteAdditionalData.getBase({ workflowId: workflow.id });
+    resolveResumeTarget(execution, workflow) {
         const executionData = execution.data.executionData?.nodeExecutionStack[0];
         if (!executionData)
             return null;
-        if (!node) {
-            node = (0, utils_1.redirectIfToolExecutor)(execution, executionData, workflow);
-        }
+        const node = (0, utils_1.findResumeNode)(executionData, workflow);
         if (!node)
             return null;
+        const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+        return { node, nodeType, executionData };
+    }
+    tryResolveResumeTarget(execution) {
+        try {
+            return this.resolveResumeTarget(execution, this.getWorkflow(execution));
+        }
+        catch {
+            return null;
+        }
+    }
+    canResumeOverChat(execution) {
+        const target = this.tryResolveResumeTarget(execution);
+        if (!target)
+            return false;
+        const { node, nodeType } = target;
+        if (typeof nodeType.onMessage !== 'function')
+            return false;
+        const isChatBasedNode = (0, utils_2.stripToolSuffix)(node.type) === n8n_workflow_1.CHAT_NODE_TYPE;
+        if (isChatBasedNode && node.parameters?.blockUserInput === true)
+            return false;
+        return true;
+    }
+    resolveResumeNodeType(execution) {
+        return this.tryResolveResumeTarget(execution)?.node.type;
+    }
+    isChatDrivenExecution(execution) {
+        const target = this.tryResolveResumeTarget(execution);
+        return !!target && typeof target.nodeType.onMessage === 'function';
+    }
+    async runNode(execution, message) {
+        const workflow = this.getWorkflow(execution);
+        const target = this.resolveResumeTarget(execution, workflow);
+        if (!target)
+            return null;
+        const { node, nodeType, executionData } = target;
+        const additionalData = await WorkflowExecuteAdditionalData.getBase({ workflowId: workflow.id });
+        (0, utils_1.redirectIfToolExecutor)(execution, executionData, workflow);
         const inputData = executionData.data;
         const connectionInputData = executionData.data.main[0];
-        const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
         const context = new n8n_core_1.ExecuteContext(workflow, node, additionalData, 'manual', execution.data, 0, connectionInputData ?? [], inputData, executionData, []);
         const { sessionId, action, chatInput, files } = message;
         const binary = await this.mapFilesToBinaryData(context, files);
@@ -155,7 +194,8 @@ let ChatExecutionManager = class ChatExecutionManager {
             [{ json: message }],
         ];
         const resumingNode = runExecutionData.executionData.nodeExecutionStack[0].node;
-        if (resumingNode.type === n8n_workflow_1.CHAT_TOOL_NODE_TYPE || (0, n8n_workflow_1.isHitlToolType)(resumingNode.type)) {
+        const isChatBasedHitlTool = (0, n8n_workflow_1.isHitlToolType)(resumingNode.type) && (0, utils_2.stripToolSuffix)(resumingNode.type) === n8n_workflow_1.CHAT_NODE_TYPE;
+        if (resumingNode.type === n8n_workflow_1.CHAT_TOOL_NODE_TYPE || isChatBasedHitlTool) {
             runExecutionData.waitTill = undefined;
             resumingNode.disabled = true;
             resumingNode.rewireOutputLogTo = n8n_workflow_1.NodeConnectionTypes.AiTool;

package/dist/chat/chat-execution-manager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chat-execution-manager.js","sourceRoot":"","sources":["../../src/chat/chat-execution-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAA8C;AAE9C,gCAAkC;AAClC,uCAA2D;AAM3D,+~~CAOsB~~;AAEtB,+EAA0E;AAC1E,+EAA2E;AAC3E,MAAY,6BAA6B,gEAA4C;AACrF,0DAA4D;AAC5D,wDAAoD;AAEpD,~~mCAAiD~~;~~AACjD~~,8CAA0C;AAC1C,qEAAiE;~~AAG1D~~,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YACkB,mBAAwC,EACxC,oBAA0C,EAC1C,cAA8B,EAC9B,gBAAkC,EAClC,SAAoB;mCAJpB,mBAAmB;oCACnB,oBAAoB;8BACpB,cAAc;gCACd,gBAAgB;yBAChB,SAAS;IACxB,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,SAA6B,EAAE,OAAoB;~~QACpE~~,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE;YACpF,WAAW,EAAE,SAAS,CAAC,EAAE;YACzB,cAAc,EAAE,SAAS;SACzB,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,WAAmB;QACxC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,WAAW,EAAE;YAClF,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS;YAAE,OAAO;QAEvB,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YAClE,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACpF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAmB;QACtC,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,WAAW,EAAE;YACvE,WAAW,EAAE,IAAI;YACjB,aAAa,EAAE,IAAI;SACnB,CAAC,CAAC;IACJ,CAAC;IACO,WAAW,CAAC,SAA6B;QAChD,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;QACnC,OAAO,IAAI,uBAAQ,CAAC;YACnB,EAAE,EAAE,YAAY,CAAC,EAAE;YACnB,IAAI,EAAE,YAAY,CAAC,IAAI;YACvB,KAAK,EAAE,YAAY,CAAC,KAAK;YACzB,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,UAAU,EAAE,YAAY,CAAC,UAAU;YACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;SAC/B,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,OAAuB,EAAE,KAA2B;QACtF,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,MAAM,GAAmB,EAAE,CAAC;QAElC,KAAK,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,8BAAe,CAAC,CAAC;YACpD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAEzF,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC,GAAG,UAAU,CAAC;QACtC,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;~~IAEO~~,~~KAAK~~,CAAC,~~OAAO,CAAC,~~SAA6B,EAAE,~~OAAoB~~;~~QACxE~~,MAAM,~~QAAQ~~,GAAG,IAAI,CAAC,~~WAAW~~,CAAC,~~SAAS~~,CAAC,CAAC;~~QAC7C~~,MAAM,~~gBAAgB~~,GAAG,SAAS,CAAC,IAAI,CAAC,~~UAAU~~,CAAC,~~gBAA0B~~,CAAC;~~QAC9E~~,~~IAAI~~,IAAI,~~GAAG~~,QAAQ,CAAC,OAAO,CAAC,~~gBAAgB~~,CAAC,CAAC;QAC9C,MAAM,~~cAAc~~,GAAG,~~MAAM~~,~~6BAA6B~~,CAAC,OAAO,CAAC,EAAE,~~UAAU~~,EAAE,QAAQ,CAAC,~~EAAE~~,~~EAAE~~,CAAC,CAAC;~~QAChG~~,MAAM,~~aAAa~~,GAAG,~~SAAS~~,CAAC,IAAI,CAAC,~~aAAa~~,~~EAAE~~,~~kBAAkB~~,CAAC,CAAC,CAAC,CAAC;~~QAE1E~~,~~IAAI~~,CAAC,~~aAAa~~;~~YAAE~~,OAAO,IAAI,CAAC~~;QAIhC~~,IAAI,CAAC,IAAI,~~EAAE~~,CAAC;~~YACX~~,~~IAAI~~,GAAG,~~IAAA~~,~~8BAAsB~~,~~EAAC~~,SAAS,~~EAAE~~,~~aAAa~~,~~EAAE~~,QAAQ,CAAC,CAAC;~~QACnE~~,CAAC;~~QAED~~,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;~~QAEvB~~,MAAM,~~SAAS~~,~~GAAG~~,aAAa,~~CAAC~~,~~IAAI~~,CAAC;~~QACrC~~,MAAM,~~mBAAmB~~,GAAG,~~aAAa~~,CAAC,~~IAAI~~,CAAC,~~IAAI~~,CAAC,CAAC,CAAC,CAAC;~~QACvD~~,MAAM,~~QAAQ~~,GAAG,~~QAAQ~~,CAAC,~~SAAS~~,CAAC,mBAAmB,~~CAAC~~,~~IAAI~~,CAAC,IAAI,~~EAAE~~,IAAI,CAAC,~~WAAW~~,CAAC,CAAC;~~QACrF~~,MAAM,OAAO,GAAG,IAAI,yBAAc,CACjC,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,QAAQ,EACR,SAAS,CAAC,IAAI,EACd,CAAC,EACD,mBAAmB,IAAI,EAAE,EACzB,SAAS,EACT,aAAa,EACb,EAAE,CACF,CAAC;QAEF,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;QACxD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE/D,MAAM,iBAAiB,GAAuB,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC;QACzF,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,iBAAiB,CAAC,MAAM,GAAG,MAAM,CAAC;QACnC,CAAC;QAED,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;YACxB,MAAM,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC3C,IAAI,CAAC;gBACJ,OAAO,MAAM,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAC7D,CAAC;oBAAS,CAAC;gBACV,MAAM,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;YAC5C,CAAC;QACF,CAAC;QAED,OAAO,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,SAA6B,EAAE,OAAoB;QAC3E,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,SAAS,CAAC;QAEhF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEtD,IAAI,IAAA,0BAAe,EAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,8BAAe,CAAC,+CAA+C,CAAC,CAAC;QAC5E,CAAC;QAED,gBAAgB,CAAC,aAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI;YAC3E,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SACnB,CAAC;~~QAOF~~,MAAM,YAAY,GAAG,gBAAgB,CAAC,aAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChF,~~IAAI~~,YAAY,CAAC,IAAI,~~KAAK~~,~~kCAAmB,~~IAAI,IAAA,~~6BAAc~~,EAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;~~YACpF~~,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC;YACtC,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC;YAC7B,YAAY,CAAC,iBAAiB,GAAG,kCAAmB,CAAC,MAAM,CAAC;YAE5D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,gBAA0B,CAAC;YAChF,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YAC3E,IAAI,YAAY,EAAE,MAAM;gBAAE,IAAA,wCAAqB,EAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAED,IAAI,OAAO,GAAwB,SAAS,CAAC;QAC7C,IAAI,CAAC;YACJ,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACjF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,+BAAa,CAAC,sBAAsB,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,OAAO,GAAkC;YAC9C,aAAa;YACb,aAAa,EAAE,gBAAgB;YAC/B,OAAO,EAAE,gBAAgB,CAAC,OAAO;YACjC,YAAY;YACZ,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,OAAO;YAC5C,SAAS,EAAE,OAAO,EAAE,EAAE;SACtB,CAAC;QAEF,OAAO,OAAO,CAAC;IAChB,CAAC;CACD,CAAA;;+~~BApKY~~,oBAAoB;IADhC,IAAA,YAAO,GAAE;qCAG8B,wBAAmB,EAClB,4CAAoB,EAC1B,gCAAc,EACZ,oCAAgB,EACvB,sBAAS;GAN1B,oBAAoB,~~CAoKhC~~"}
1	+ {"version":3,"file":"chat-execution-manager.js","sourceRoot":"","sources":["../../src/chat/chat-execution-manager.ts"],"names":[],"mappings":"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"}

package/dist/chat/chat-service.d.ts CHANGED Viewed

@@ -21,6 +21,5 @@ export declare class ChatService {
     private cleanupSession;
     private parseChatMessage;
     private checkHeartbeats;
-    private shouldResumeOnMessage;
     shutdown(): void;
 }

package/dist/chat/chat-service.js CHANGED Viewed

@@ -116,8 +116,9 @@ let ChatService = class ChatService {
                 chatInput: (0, utils_1.getLastNodeMessage)(execution, lastNode),
                 sessionId: session.sessionId,
             };
-            await this.resumeExecution(session.executionId, data, sessionKey);
-            session.nodeWaitingForChatResponse = undefined;
+            const resumed = await this.resumeExecution(session.executionId, data, sessionKey);
+            if (resumed)
+                session.nodeWaitingForChatResponse = undefined;
         }
         else {
             session.nodeWaitingForChatResponse = lastNode?.name;
@@ -186,10 +187,9 @@ let ChatService = class ChatService {
                     return;
                 }
                 const executionId = session.executionId;
-                if (await this.shouldResumeOnMessage(executionId)) {
-                    await this.resumeExecution(executionId, this.parseChatMessage(message), sessionKey);
+                const resumed = await this.resumeExecution(executionId, this.parseChatMessage(message), sessionKey);
+                if (resumed)
                     session.nodeWaitingForChatResponse = undefined;
-                }
             }
             catch (e) {
                 const error = (0, ensure_error_1.ensureError)(e);
@@ -201,8 +201,14 @@ let ChatService = class ChatService {
     async resumeExecution(executionId, message, sessionKey) {
         const execution = await this.getExecutionOrCleanupSession(executionId, sessionKey);
         if (!execution || execution.status !== 'waiting')
-            return;
+            return false;
+        if (!this.executionManager.canResumeOverChat(execution)) {
+            const nodeType = this.executionManager.resolveResumeNodeType(execution);
+            this.logger.warn(`Refused chat resume for execution ${executionId}: suspended node (type: ${nodeType ?? 'unknown'}) is not resumable over chat`);
+            return false;
+        }
         await this.executionManager.runWorkflow(execution, message);
+        return true;
     }
     async getExecutionOrCleanupSession(executionId, sessionKey) {
         const execution = await this.executionManager.findExecution(executionId);
@@ -282,18 +288,6 @@ let ChatService = class ChatService {
             this.logger.error(`Error checking heartbeats: ${error.message}`);
         }
     }
-    async shouldResumeOnMessage(executionId) {
-        const execution = await this.executionManager.findExecution(executionId);
-        if (!execution) {
-            return true;
-        }
-        const lastNode = (0, utils_1.getLastNodeExecuted)(execution);
-        const isChatNode = lastNode?.type === n8n_workflow_1.CHAT_NODE_TYPE || lastNode?.type === n8n_workflow_1.CHAT_TOOL_NODE_TYPE;
-        if (isChatNode && lastNode?.parameters?.blockUserInput === true) {
-            return false;
-        }
-        return true;
-    }
     shutdown() {
         for (const [key, session] of this.sessions.entries()) {
             this.cleanupSession(session, key);

package/dist/chat/chat-service.js.map CHANGED Viewed

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

package/dist/chat/utils.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import type { IExecutionResponse } from '@n8n/db';
 import type { ChatNodeMessage, IExecuteData, INode, Workflow } from 'n8n-workflow';
+export declare function findResumeNode(executionData: IExecuteData, workflow: Workflow): INode | null;
 export declare function redirectIfToolExecutor(execution: IExecutionResponse, executionData: IExecuteData, workflow: Workflow): INode | null;
 export declare function getMessage(execution: IExecutionResponse): ChatNodeMessage | undefined;
 export declare function getLastNodeExecuted(execution: IExecutionResponse): INode | undefined;

package/dist/chat/utils.js CHANGED Viewed

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.findResumeNode = findResumeNode;
 exports.redirectIfToolExecutor = redirectIfToolExecutor;
 exports.getMessage = getMessage;
 exports.getLastNodeExecuted = getLastNodeExecuted;
@@ -8,12 +9,21 @@ exports.getLastNodeMessage = getLastNodeMessage;
 const constants_1 = require("@n8n/constants");
 const n8n_workflow_1 = require("n8n-workflow");
 const AI_TOOL = 'ai_tool';
-function redirectIfToolExecutor(execution, executionData, workflow) {
-    const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
-    if (lastNodeExecuted !== constants_1.TOOL_EXECUTOR_NODE_NAME)
+function getToolExecutorTargetNode(executionData, workflow) {
+    if (executionData.node.name !== constants_1.TOOL_EXECUTOR_NODE_NAME)
         return null;
     const toolNodeName = executionData.node.parameters?.node;
-    const toolNode = toolNodeName ? workflow.getNode(toolNodeName) : null;
+    return toolNodeName ? workflow.getNode(toolNodeName) : null;
+}
+function findResumeNode(executionData, workflow) {
+    const parkedNode = executionData.node;
+    if (parkedNode.name === constants_1.TOOL_EXECUTOR_NODE_NAME) {
+        return getToolExecutorTargetNode(executionData, workflow);
+    }
+    return workflow.getNode(parkedNode.name);
+}
+function redirectIfToolExecutor(execution, executionData, workflow) {
+    const toolNode = getToolExecutorTargetNode(executionData, workflow);
     if (!toolNode)
         return null;
     executionData.node = toolNode;

package/dist/chat/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/chat/utils.ts"],"names":[],"mappings":"~~;;;;;;;~~AAAA,8CAAyD;AAGzD,+CAMsB;AAEtB,MAAM,OAAO,GAAG,SAAS,CAAC;~~AAa1B~~,~~gCACC~~,~~SAA6B~~,~~EAC7B~~,aAA2B,~~EAC3B~~,QAAkB;~~IAElB~~,~~MAAM~~,~~gBAAgB~~,~~GAAG,SAAS,~~CAAC,IAAI,CAAC,~~UAAU,CAAC,gBAAgB,CAAC;IACpE,~~IAAI,~~gBAAgB,~~KAAK,mCAAuB;QAAE,OAAO,IAAI,CAAC;~~IAE9D~~,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAA0B,CAAC;IAC/E,~~MAAM~~,QAAQ,~~GAAG~~,YAAY,CAAC,CAAC,CAAC,~~QAAQ~~,CAAC,OAAO,CAAC,~~YAAY~~,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;~~IACtE~~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"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/chat/utils.ts"],"names":[],"mappings":"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"}

package/dist/controllers/role.controller.d.ts CHANGED Viewed

@@ -3,11 +3,13 @@ import type { RoleAssignmentsResponse, RoleMembersResponse, RoleProjectMembersRe
 import { AuthenticatedRequest } from '@n8n/db';
 import { Role as RoleDTO } from '@n8n/permissions';
 import { EventService } from '../events/event.service';
+import { ProjectService } from '../services/project.service.ee';
 import { RoleService } from '../services/role.service';
 export declare class RoleController {
     private readonly roleService;
     private readonly eventService;
-    constructor(roleService: RoleService, eventService: EventService);
+    private readonly projectService;
+    constructor(roleService: RoleService, eventService: EventService, projectService: ProjectService);
     getAllRoles(_req: AuthenticatedRequest, _res: Response, query: RoleListQueryDto): Promise<Record<string, RoleDTO[]>>;
     getRoleProjectMembers(req: AuthenticatedRequest, _res: Response, slug: string, projectId: string): Promise<RoleProjectMembersResponse>;
     getRoleAssignments(req: AuthenticatedRequest, _res: Response, slug: string): Promise<RoleAssignmentsResponse>;

package/dist/controllers/role.controller.js CHANGED Viewed

@@ -16,13 +16,16 @@ exports.RoleController = void 0;
 const api_types_1 = require("@n8n/api-types");
 const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
+const not_found_error_1 = require("../errors/response-errors/not-found.error");
 const event_service_1 = require("../events/event.service");
+const project_service_ee_1 = require("../services/project.service.ee");
 const role_authorization_1 = require("../services/role-authorization");
 const role_service_1 = require("../services/role.service");
 let RoleController = class RoleController {
-    constructor(roleService, eventService) {
+    constructor(roleService, eventService, projectService) {
         this.roleService = roleService;
         this.eventService = eventService;
+        this.projectService = projectService;
     }
     async getAllRoles(_req, _res, query) {
         const allRoles = await this.roleService.getAllRoles(query.withUsageCount);
@@ -39,6 +42,12 @@ let RoleController = class RoleController {
             roleType: role.roleType,
             user: req.user,
         });
+        const project = await this.projectService.getProjectWithScope(req.user, projectId, [
+            'project:list',
+        ]);
+        if (!project) {
+            throw new not_found_error_1.NotFoundError('Project not found');
+        }
         const result = await this.roleService.getRoleProjectMembers(slug, projectId);
         return api_types_1.RoleProjectMembersResponseDto.parse(result);
     }
@@ -49,7 +58,14 @@ let RoleController = class RoleController {
             user: req.user,
         });
         const result = await this.roleService.getRoleAssignments(slug);
-        return api_types_1.RoleAssignmentsResponseDto.parse(result);
+        if (result.projects.length === 0) {
+            return api_types_1.RoleAssignmentsResponseDto.parse(result);
+        }
+        const visibleProjectIds = new Set(await this.projectService.getProjectIdsWithScope(req.user, ['project:list'], result.projects.map((project) => project.projectId)));
+        return api_types_1.RoleAssignmentsResponseDto.parse({
+            ...result,
+            projects: result.projects.filter((project) => visibleProjectIds.has(project.projectId)),
+        });
     }
     async getRoleMembers(_req, _res, slug) {
         const result = await this.roleService.getRoleMembers(slug);
@@ -166,6 +182,6 @@ __decorate([
 ], RoleController.prototype, "createRole", null);
 exports.RoleController = RoleController = __decorate([
     (0, decorators_1.RestController)('/roles'),
-    __metadata("design:paramtypes", [role_service_1.RoleService, event_service_1.EventService])
+    __metadata("design:paramtypes", [role_service_1.RoleService, event_service_1.EventService, project_service_ee_1.ProjectService])
 ], RoleController);
 //# sourceMappingURL=role.controller.js.map

package/dist/controllers/role.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../src/controllers/role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CASwB;AAMxB,8CAAkD;AAElD,gDAWyB;AAGzB,0DAAsD;AACtD,sEAA0F;AAC1F,0DAAsD;AAG/C,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,WAAwB,EACxB,YAA0B;~~2BAD1B~~,WAAW;4BACX,YAAY;~~IAC3B~~,CAAC;IAGE,AAAN,KAAK,CAAC,WAAW,CAChB,IAA0B,EAC1B,IAAc,EACP,KAAuB;QAE9B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC1E,OAAO;YACN,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;YACvD,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC;YACzD,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,YAAY,CAAC;YAC/D,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC;SAC3D,CAAC;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,qBAAqB,CAC1B,GAAyB,EACzB,IAAc,EACC,IAAY,EACP,SAAiB;QAErC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,4CAAuB,EAAC;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;SACd,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC7E,OAAO,yCAA6B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CACvB,GAAyB,EACzB,IAAc,EACC,IAAY;QAE3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,4CAAuB,EAAC;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;SACd,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;~~QAC~~/D,OAAO,sCAA0B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;~~IACjD~~,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc,CACnB,IAA0B,EAC1B,IAAc,EACC,IAAY;QAE3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3D,OAAO,kCAAsB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAClB,IAA0B,EAC1B,IAAc,EACC,IAAY,EACpB,KAAsB;QAE7B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnE,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACC,IAAY,EACrB,UAAyB;QAE/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,4CAAuB,EAAC;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;SACd,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC;YAC9C,IAAI;YACJ,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;SACnB,CAAC,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACC,IAAY,EACpB,KAAyB;QAEhC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAA,4CAAuB,EAAC;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;SACd,CAAC,CAAC;QACH,MAAM,gBAAgB,GAAG,IAAA,qCAAgB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;YAClE,CAAC,CAAC,KAAK,CAAC,gBAAgB;YACxB,CAAC,CAAC,SAAS,CAAC;QACb,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC;YAC9C,IAAI;YACJ,gBAAgB;YAChB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;SACnB,CAAC,CAAC;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACf,GAAyB,EACzB,IAAc,EACR,UAAyB;QAE/B,IAAA,4CAAuB,EAAC;YACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;SACd,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACnB,QAAQ,EAAE,MAAM,CAAC,IAAI;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IACf,CAAC;CACD,CAAA;;~~AAhIM~~;IADL,IAAA,gBAAG,EAAC,GAAG,CAAC;IAIP,WAAA,kBAAK,CAAA;;6CADA,QAAQ,EACA,4BAAgB;;iDAS9B;AAGK;IADL,IAAA,gBAAG,EAAC,uCAAuC,CAAC;IAI3C,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAA;;6CAFb,QAAQ;;~~2DAWd~~;AAGK;IADL,IAAA,gBAAG,EAAC,oBAAoB,CAAC;IAIxB,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;~~wDAUd~~;AAIK;IAFL,IAAA,gBAAG,EAAC,gBAAgB,CAAC;IACrB,IAAA,wBAAW,EAAC,WAAW,CAAC;IAIvB,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;;6CADR,QAAQ;;oDAKd;AAGK;IADL,IAAA,gBAAG,EAAC,QAAQ,CAAC;IAIZ,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,kBAAK,CAAA;;6CAFA,QAAQ,UAEA,2BAAe;;mDAG7B;AAIK;IAFL,IAAA,kBAAK,EAAC,QAAQ,CAAC;IACf,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,iBAAI,CAAA;;6CAFC,QAAQ,UAEI,yBAAa;;gDAY/B;AAIK;IAFL,IAAA,mBAAM,EAAC,QAAQ,CAAC;IAChB,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,IAAA,kBAAK,EAAC,MAAM,CAAC,CAAA;IACb,WAAA,kBAAK,CAAA;;6CAFA,QAAQ,UAEA,8BAAkB;;gDAehC;AAIK;IAFL,IAAA,iBAAI,EAAC,GAAG,CAAC;IACT,IAAA,qBAAQ,EAAC,4BAAgB,CAAC,YAAY,CAAC;IAItC,WAAA,iBAAI,CAAA;;6CADC,QAAQ,EACI,yBAAa;;gDAa/B;~~yBAtIW~~,cAAc;IAD1B,IAAA,2BAAc,EAAC,QAAQ,CAAC;qCAGO,0BAAW,EACV,4BAAY;~~GAHhC~~,cAAc,~~CAuI1B~~"}
1	+ {"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../src/controllers/role.controller.ts"],"names":[],"mappings":"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"}

package/dist/credentials/credentials.service.js CHANGED Viewed

@@ -43,6 +43,17 @@ const external_secrets_utils_1 = require("./external-secrets.utils");
 const instance_credential_use_registry_1 = require("./instance-credential-use.registry");
 const validation_1 = require("./validation");
 const CUSTOM_AUTH_JSON_REDACTED_VALUE = '***';
+function parseHttpUrl(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    try {
+        const url = new URL(value);
+        return url.protocol === 'http:' || url.protocol === 'https:' ? url : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 function parseAcceptedStatusCodes(raw) {
     if (typeof raw !== 'string' || raw.trim() === '')
         return undefined;
@@ -655,16 +666,26 @@ let CredentialsService = class CredentialsService {
             throw new credential_not_found_error_1.CredentialNotFoundError(credentialId);
         }
         const data = await this.decrypt(storedCredential, true);
-        const testUrl = data.testUrl;
-        if (typeof testUrl !== 'string' || !/^https?:\/\//i.test(testUrl)) {
+        const testTarget = parseHttpUrl(data.testUrl);
+        if (!testTarget) {
             throw new bad_request_error_1.BadRequestError('The credential has no test URL to probe');
         }
+        const storedOrigin = typeof data.serviceOrigin === 'string' ? data.serviceOrigin.trim() : '';
+        const serviceOrigin = parseHttpUrl(storedOrigin);
+        if (!serviceOrigin ||
+            serviceOrigin.origin !== storedOrigin ||
+            serviceOrigin.origin !== testTarget.origin) {
+            throw new bad_request_error_1.BadRequestError('The credential test URL is not bound to its service origin');
+        }
         return await this.credentialsTester.probeCredentialAuth(user.id, storedCredential.type, {
             id: storedCredential.id,
             name: storedCredential.name,
             type: storedCredential.type,
             data,
-        }, testUrl, { acceptedStatusCodes: parseAcceptedStatusCodes(data.acceptedStatusCodes) });
+        }, testTarget.href, {
+            acceptedStatusCodes: parseAcceptedStatusCodes(data.acceptedStatusCodes),
+            allowedDomains: testTarget.hostname,
+        });
     }
     redact(data, credential) {
         const copiedData = (0, n8n_workflow_1.deepCopy)(data);