n8n 2.7.4 → 2.8.1

package/dist/modules/chat-hub/chat-hub-execution-store.service.js

@@ -0,0 +1,159 @@
+"use strict";
+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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatHubExecutionStore = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const config_1 = require("@n8n/config");
+const constants_1 = require("@n8n/constants");
+const decorators_1 = require("@n8n/decorators");
+const di_1 = require("@n8n/di");
+const n8n_core_1 = require("n8n-core");
+const redis_client_service_1 = require("../../services/redis-client.service");
+let ChatHubExecutionStore = class ChatHubExecutionStore {
+    constructor(logger, instanceSettings, executionsConfig, globalConfig, chatHubConfig, redisClientService) {
+        this.logger = logger;
+        this.instanceSettings = instanceSettings;
+        this.executionsConfig = executionsConfig;
+        this.globalConfig = globalConfig;
+        this.chatHubConfig = chatHubConfig;
+        this.redisClientService = redisClientService;
+        this.memoryStore = new Map();
+        this.cleanupTimers = new Map();
+        this.redisClient = null;
+        this.logger = this.logger.scoped('chat-hub');
+        this.useRedis = this.instanceSettings.isMultiMain || this.executionsConfig.mode === 'queue';
+        this.redisPrefix = `${this.globalConfig.redis.prefix}:chat-hub:exec:`;
+        this.cleanupDelayMs = this.chatHubConfig.executionContextTtl * constants_1.Time.seconds.toMilliseconds;
+        if (this.useRedis) {
+            this.redisClient = this.redisClientService.createClient({ type: 'subscriber(n8n)' });
+        }
+    }
+    async register(context) {
+        const { executionId } = context;
+        if (this.useRedis) {
+            await this.setRedisContext(executionId, context);
+        }
+        else {
+            this.memoryStore.set(executionId, context);
+            this.scheduleCleanup(executionId);
+        }
+    }
+    async get(executionId) {
+        if (this.useRedis) {
+            return await this.getRedisContext(executionId);
+        }
+        return this.memoryStore.get(executionId) ?? null;
+    }
+    async update(executionId, updates) {
+        const context = await this.get(executionId);
+        if (!context) {
+            this.logger.warn(`Attempted to update non-existent execution context: ${executionId}`);
+            return;
+        }
+        const updatedContext = { ...context, ...updates };
+        if (this.useRedis) {
+            await this.setRedisContext(executionId, updatedContext);
+        }
+        else {
+            this.memoryStore.set(executionId, updatedContext);
+            this.scheduleCleanup(executionId);
+        }
+    }
+    async remove(executionId) {
+        if (this.useRedis) {
+            await this.deleteRedisContext(executionId);
+        }
+        else {
+            this.memoryStore.delete(executionId);
+            this.cancelCleanup(executionId);
+        }
+    }
+    shutdown() {
+        for (const timer of this.cleanupTimers.values()) {
+            clearTimeout(timer);
+        }
+        this.cleanupTimers.clear();
+        this.memoryStore.clear();
+        if (this.redisClient) {
+            this.redisClient.disconnect();
+        }
+    }
+    getContextKey(executionId) {
+        return `${this.redisPrefix}${executionId}`;
+    }
+    async getRedisContext(executionId) {
+        if (!this.redisClient)
+            return null;
+        try {
+            const data = await this.redisClient.get(this.getContextKey(executionId));
+            if (!data)
+                return null;
+            return JSON.parse(data);
+        }
+        catch (error) {
+            this.logger.error(`Failed to get Redis context for execution ${executionId}`, { error });
+            return null;
+        }
+    }
+    async setRedisContext(executionId, context) {
+        if (!this.redisClient)
+            return;
+        try {
+            await this.redisClient.set(this.getContextKey(executionId), JSON.stringify(context), 'EX', this.chatHubConfig.executionContextTtl);
+        }
+        catch (error) {
+            this.logger.error(`Failed to set Redis context for execution ${executionId}`, { error });
+        }
+    }
+    async deleteRedisContext(executionId) {
+        if (!this.redisClient)
+            return;
+        try {
+            await this.redisClient.del(this.getContextKey(executionId));
+        }
+        catch (error) {
+            this.logger.error(`Failed to delete Redis context for execution ${executionId}`, { error });
+        }
+    }
+    scheduleCleanup(executionId) {
+        this.cancelCleanup(executionId);
+        const timer = setTimeout(() => {
+            this.memoryStore.delete(executionId);
+            this.cleanupTimers.delete(executionId);
+            this.logger.debug(`Cleaned up expired execution context for ${executionId}`);
+        }, this.cleanupDelayMs);
+        this.cleanupTimers.set(executionId, timer);
+    }
+    cancelCleanup(executionId) {
+        const timer = this.cleanupTimers.get(executionId);
+        if (timer) {
+            clearTimeout(timer);
+            this.cleanupTimers.delete(executionId);
+        }
+    }
+};
+exports.ChatHubExecutionStore = ChatHubExecutionStore;
+__decorate([
+    (0, decorators_1.OnShutdown)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], ChatHubExecutionStore.prototype, "shutdown", null);
+exports.ChatHubExecutionStore = ChatHubExecutionStore = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger,
+        n8n_core_1.InstanceSettings,
+        config_1.ExecutionsConfig,
+        config_1.GlobalConfig,
+        config_1.ChatHubConfig,
+        redis_client_service_1.RedisClientService])
+], ChatHubExecutionStore);
+//# sourceMappingURL=chat-hub-execution-store.service.js.map

package/dist/modules/chat-hub/chat-hub-execution-store.service.js.map

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

package/dist/modules/chat-hub/chat-hub-execution-watcher.service.d.ts

@@ -0,0 +1,25 @@
+import { Logger } from '@n8n/backend-common';
+import { ExecutionRepository } from '@n8n/db';
+import { type WorkflowExecuteAfterContext, type WorkflowExecuteResumeContext } from '@n8n/decorators';
+import { ChatExecutionManager } from '../../chat/chat-execution-manager';
+import { ChatHubExecutionStore } from './chat-hub-execution-store.service';
+import { ChatHubExecutionService } from './chat-hub-execution.service';
+import { ChatHubMessageRepository } from './chat-message.repository';
+import { ChatStreamService } from './chat-stream.service';
+export declare class ChatHubExecutionWatcherService {
+    private readonly logger;
+    private readonly executionStore;
+    private readonly messageRepository;
+    private readonly chatHubExecutionService;
+    private readonly executionRepository;
+    private readonly chatStreamService;
+    private readonly executionManager;
+    constructor(logger: Logger, executionStore: ChatHubExecutionStore, messageRepository: ChatHubMessageRepository, chatHubExecutionService: ChatHubExecutionService, executionRepository: ExecutionRepository, chatStreamService: ChatStreamService, executionManager: ChatExecutionManager);
+    handleExecutionResumed(ctx: WorkflowExecuteResumeContext): Promise<void>;
+    handleWorkflowExecuteAfter(ctx: WorkflowExecuteAfterContext): Promise<void>;
+    private handleWaitingExecution;
+    private triggerAutoResume;
+    private createNextMessage;
+    private pushFinalResults;
+    private pushErrorResults;
+}

package/dist/modules/chat-hub/chat-hub-execution-watcher.service.js

@@ -0,0 +1,205 @@
+"use strict";
+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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChatHubExecutionWatcherService = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const db_1 = require("@n8n/db");
+const decorators_1 = require("@n8n/decorators");
+const di_1 = require("@n8n/di");
+const uuid_1 = require("uuid");
+const chat_execution_manager_1 = require("../../chat/chat-execution-manager");
+const chat_hub_execution_store_service_1 = require("./chat-hub-execution-store.service");
+const chat_hub_execution_service_1 = require("./chat-hub-execution.service");
+const chat_message_repository_1 = require("./chat-message.repository");
+const chat_stream_service_1 = require("./chat-stream.service");
+const utils_1 = require("../../chat/utils");
+let ChatHubExecutionWatcherService = class ChatHubExecutionWatcherService {
+    constructor(logger, executionStore, messageRepository, chatHubExecutionService, executionRepository, chatStreamService, executionManager) {
+        this.logger = logger;
+        this.executionStore = executionStore;
+        this.messageRepository = messageRepository;
+        this.chatHubExecutionService = chatHubExecutionService;
+        this.executionRepository = executionRepository;
+        this.chatStreamService = chatStreamService;
+        this.executionManager = executionManager;
+        this.logger = this.logger.scoped('chat-hub');
+    }
+    async handleExecutionResumed(ctx) {
+        const { executionId } = ctx;
+        const context = await this.executionStore.get(executionId);
+        if (!context)
+            return;
+        if (!context.awaitingResume)
+            return;
+        this.logger.debug('Chat hub execution resumed, notifying frontend', { executionId });
+        await this.chatStreamService.startExecution(context.userId, context.sessionId);
+        if (context.createMessageOnResume) {
+            const newMessageId = (0, uuid_1.v4)();
+            await this.messageRepository.updateChatMessage(context.messageId, { status: 'success' });
+            await this.createNextMessage(context, newMessageId, executionId);
+            await this.executionStore.update(executionId, {
+                previousMessageId: context.messageId,
+                messageId: newMessageId,
+                createMessageOnResume: false,
+                awaitingResume: false,
+            });
+            await this.chatStreamService.startStream({
+                userId: context.userId,
+                sessionId: context.sessionId,
+                messageId: newMessageId,
+                previousMessageId: context.messageId,
+                retryOfMessageId: null,
+                executionId: parseInt(executionId, 10),
+            });
+            return;
+        }
+        await this.executionStore.update(executionId, { awaitingResume: false });
+        await this.chatStreamService.startStream({
+            userId: context.userId,
+            sessionId: context.sessionId,
+            messageId: context.messageId,
+            previousMessageId: context.previousMessageId,
+            retryOfMessageId: null,
+            executionId: parseInt(executionId, 10),
+        });
+    }
+    async handleWorkflowExecuteAfter(ctx) {
+        const { runData, executionId } = ctx;
+        const context = await this.executionStore.get(executionId);
+        if (!context)
+            return;
+        this.logger.debug('Handling workflow execution completion', { executionId });
+        if (!['success', 'waiting', 'canceled'].includes(runData.status)) {
+            const errorMessage = this.chatHubExecutionService.extractErrorMessage(runData) ??
+                'Failed to generate a response';
+            await this.pushErrorResults(context, errorMessage);
+            await this.executionStore.remove(executionId);
+            return;
+        }
+        if (runData.status === 'canceled') {
+            await this.chatStreamService.endExecution(context.userId, context.sessionId, 'cancelled');
+            await this.executionStore.remove(executionId);
+            return;
+        }
+        const message = this.chatHubExecutionService.extractMessage(runData, context.responseMode);
+        if (runData.status === 'waiting') {
+            await this.handleWaitingExecution(context, executionId, message);
+            return;
+        }
+        if (runData.finished) {
+            await this.pushFinalResults(context, message);
+            await this.executionStore.remove(executionId);
+        }
+    }
+    async handleWaitingExecution(context, executionId, message) {
+        await this.messageRepository.updateChatMessage(context.messageId, {
+            content: message ?? '',
+            status: 'waiting',
+        });
+        if (message) {
+            await this.chatStreamService.sendChunk(context.sessionId, context.messageId, message);
+        }
+        await this.chatStreamService.endStream(context.sessionId, context.messageId, 'waiting');
+        await this.chatStreamService.endExecution(context.userId, context.sessionId, 'success');
+        if (context.responseMode === 'responseNodes') {
+            const execution = await this.executionRepository.findSingleExecution(executionId, {
+                includeData: true,
+                unflattenData: true,
+            });
+            if (execution) {
+                const lastNode = (0, utils_1.getLastNodeExecuted)(execution);
+                if (lastNode && (0, utils_1.shouldResumeImmediately)(lastNode)) {
+                    await this.triggerAutoResume(context, execution);
+                    return;
+                }
+            }
+        }
+        await this.executionStore.update(executionId, {
+            awaitingResume: true,
+            createMessageOnResume: true,
+        });
+    }
+    async triggerAutoResume(context, execution) {
+        this.logger.debug('Triggering auto-resume of execution', { executionId: execution.id });
+        await this.messageRepository.updateChatMessage(context.messageId, { status: 'success' });
+        const newMessageId = (0, uuid_1.v4)();
+        await this.createNextMessage(context, newMessageId, execution.id);
+        await this.executionStore.update(execution.id, {
+            previousMessageId: context.messageId,
+            messageId: newMessageId,
+            awaitingResume: true,
+            createMessageOnResume: false,
+        });
+        void this.executionManager.runWorkflow(execution, {
+            action: 'sendMessage',
+            chatInput: '',
+            sessionId: context.sessionId,
+        });
+    }
+    async createNextMessage(context, messageId, executionId) {
+        await this.messageRepository.createChatMessage({
+            id: messageId,
+            sessionId: context.sessionId,
+            previousMessageId: context.messageId,
+            executionId: parseInt(executionId, 10),
+            type: 'ai',
+            name: 'AI',
+            status: 'running',
+            content: '',
+            retryOfMessageId: null,
+            ...context.model,
+        });
+    }
+    async pushFinalResults(context, message) {
+        if (message) {
+            await this.chatStreamService.sendChunk(context.sessionId, context.messageId, message);
+        }
+        await this.chatStreamService.endStream(context.sessionId, context.messageId, 'success');
+        await this.chatStreamService.endExecution(context.userId, context.sessionId, 'success');
+        await this.messageRepository.updateChatMessage(context.messageId, {
+            content: message ?? '',
+            status: 'success',
+        });
+    }
+    async pushErrorResults(context, errorMessage) {
+        await this.chatStreamService.sendChunk(context.sessionId, context.messageId, errorMessage);
+        await this.chatStreamService.endStream(context.sessionId, context.messageId, 'error');
+        await this.chatStreamService.endExecution(context.userId, context.sessionId, 'error');
+        await this.messageRepository.updateChatMessage(context.messageId, {
+            content: errorMessage,
+            status: 'error',
+        });
+    }
+};
+exports.ChatHubExecutionWatcherService = ChatHubExecutionWatcherService;
+__decorate([
+    (0, decorators_1.OnLifecycleEvent)('workflowExecuteResume'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], ChatHubExecutionWatcherService.prototype, "handleExecutionResumed", null);
+__decorate([
+    (0, decorators_1.OnLifecycleEvent)('workflowExecuteAfter'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], ChatHubExecutionWatcherService.prototype, "handleWorkflowExecuteAfter", null);
+exports.ChatHubExecutionWatcherService = ChatHubExecutionWatcherService = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_common_1.Logger,
+        chat_hub_execution_store_service_1.ChatHubExecutionStore,
+        chat_message_repository_1.ChatHubMessageRepository,
+        chat_hub_execution_service_1.ChatHubExecutionService,
+        db_1.ExecutionRepository,
+        chat_stream_service_1.ChatStreamService,
+        chat_execution_manager_1.ChatExecutionManager])
+], ChatHubExecutionWatcherService);
+//# sourceMappingURL=chat-hub-execution-watcher.service.js.map

package/dist/modules/chat-hub/chat-hub-execution-watcher.service.js.map

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

package/dist/modules/chat-hub/chat-hub-execution.service.d.ts

@@ -2,13 +2,14 @@ import { type ChatMessageId, type ChatSessionId, ChatHubConversationModel } from
 import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository, IExecutionResponse, User } from '@n8n/db';
 import { InstanceSettings } from 'n8n-core';
-import { type IWorkflowBase, IRunExecutionData } from 'n8n-workflow';
+import { type IWorkflowBase, IRunExecutionData, IRun } from 'n8n-workflow';
 import { ActiveExecutions } from '../../active-executions';
 import { ChatExecutionManager } from '../../chat/chat-execution-manager';
 import { ExecutionService } from '../../executions/execution.service';
 import { WorkflowExecutionService } from '../../workflows/workflow-execution.service';
+import { ChatHubExecutionStore } from './chat-hub-execution-store.service';
 import { ChatHubWorkflowService } from './chat-hub-workflow.service';
-import { ChatTriggerResponseMode } from './chat-hub.types';
+import type { NonStreamingResponseMode, ChatTriggerResponseMode } from './chat-hub.types';
 import { ChatHubMessageRepository } from './chat-message.repository';
 import { ChatStreamService } from './chat-stream.service';
 export declare class ChatHubExecutionService {
@@ -21,8 +22,9 @@ export declare class ChatHubExecutionService {
     private readonly instanceSettings;
     private readonly chatStreamService;
     private readonly chatHubWorkflowService;
+    private readonly chatHubExecutionStore;
     private readonly messageRepository;
-    constructor(logger: Logger, executionService: ExecutionService, workflowExecutionService: WorkflowExecutionService, executionRepository: ExecutionRepository, executionManager: ChatExecutionManager, activeExecutions: ActiveExecutions, instanceSettings: InstanceSettings, chatStreamService: ChatStreamService, chatHubWorkflowService: ChatHubWorkflowService, messageRepository: ChatHubMessageRepository);
+    constructor(logger: Logger, executionService: ExecutionService, workflowExecutionService: WorkflowExecutionService, executionRepository: ExecutionRepository, executionManager: ChatExecutionManager, activeExecutions: ActiveExecutions, instanceSettings: InstanceSettings, chatStreamService: ChatStreamService, chatHubWorkflowService: ChatHubWorkflowService, chatHubExecutionStore: ChatHubExecutionStore, messageRepository: ChatHubMessageRepository);
     execute(user: User, workflowData: IWorkflowBase, executionData: IRunExecutionData): Promise<{
         executionId: string;
     }>;
@@ -30,19 +32,15 @@ export declare class ChatHubExecutionService {
     executeChatWorkflowWithCleanup(user: User, model: ChatHubConversationModel, workflowData: IWorkflowBase, executionData: IRunExecutionData, sessionId: ChatSessionId, previousMessageId: ChatMessageId, retryOfMessageId: ChatMessageId | null, responseMode: ChatTriggerResponseMode): Promise<void>;
     private executeChatWorkflow;
     private executeWithStreaming;
-    private executeLastNode;
-    resumeChatExecution(execution: IExecutionResponse, message: string, sessionId: ChatSessionId, user: User, previousMessageId: ChatMessageId, model: ChatHubConversationModel, responseMode: 'responseNodes'): Promise<void>;
-    private resumeExecution;
+    private executeNonStreaming;
+    resumeChatExecution(execution: IExecutionResponse, message: string, sessionId: ChatSessionId, _user: User, previousMessageId: ChatMessageId, model: ChatHubConversationModel, _responseMode: 'responseNodes'): Promise<void>;
     waitForExecutionCompletion(executionId: string): Promise<void>;
     private waitForExecutionPoller;
     private waitForExecutionPromise;
     private waitForErrorDetails;
-    getErrorMessage(execution: IExecutionResponse): string | undefined;
-    getAIOutput(execution: IExecutionResponse, nodeName: string): string | undefined;
-    private getMessageFromExecution;
-    private getLastNodeExecutedName;
-    private getNodeOutputs;
+    private createStreamAdapter;
+    extractErrorMessage(runData: IRun): string | undefined;
+    extractMessage(runData: IRun, responseMode: NonStreamingResponseMode): string | undefined;
     private getFirstOutputEntry;
     private extractMessageFromEntry;
-    private createStreamAdapter;
 }