n8n-nodes-chat2crm 0.1.7 → 0.1.8

package/dist/nodes/Chat2CrmSend/Chat2CrmSend.node.d.ts

@@ -3,6 +3,5 @@ export declare class Chat2CrmSend implements INodeType {
     description: INodeTypeDescription;
     getStreams(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]>;
     private static createRedisConnectionForLoadOptions;
-    private static getStreamDb;
     execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]>;
 }

package/dist/nodes/Chat2CrmSend/Chat2CrmSend.node.js

@@ -7,6 +7,7 @@ exports.Chat2CrmSend = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const ioredis_1 = __importDefault(require("ioredis"));
 const RedisConnection_1 = require("../Chat2CrmTrigger/Infra/RedisConnection");
+const StreamConfig_1 = require("../Chat2CrmTrigger/Infra/StreamConfig");
 class Chat2CrmSend {
     constructor() {
         this.description = {
@@ -35,63 +36,7 @@ class Chat2CrmSend {
                     type: 'multiOptions',
                     required: true,
                     description: 'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-                    options: [
-                        {
-                            name: 'Chat Incoming Message',
-                            value: 'chat_incoming_message',
-                            description: 'Messages to chat (DB 0)',
-                        },
-                        {
-                            name: 'Chat Outgoing Message',
-                            value: 'chat_outgoing_message',
-                            description: 'Messages from chat to CRM (DB 0)',
-                        },
-                        {
-                            name: 'Chat Outgoing Status',
-                            value: 'chat_outgoing_status',
-                            description: 'Status messages from chat (DB 0)',
-                        },
-                        {
-                            name: 'CRM Contacts',
-                            value: 'crm_contacts',
-                            description: 'CRM contacts stream (DB 1)',
-                        },
-                        {
-                            name: 'CRM Incoming Message',
-                            value: 'crm_incoming_message',
-                            description: 'Messages to CRM (DB 1)',
-                        },
-                        {
-                            name: 'CRM Incoming Status',
-                            value: 'crm_incoming_status',
-                            description: 'Status messages to CRM (DB 0)',
-                        },
-                        {
-                            name: 'CRM Lazy Incoming Message',
-                            value: 'crm_lazy_incoming_message',
-                            description: 'Lazy incoming messages to CRM (DB 1)',
-                        },
-                        {
-                            name: 'CRM Outgoing Message',
-                            value: 'crm_outgoing_message',
-                            description: 'Messages from CRM to chat (DB 1)',
-                        },
-                        {
-                            name: 'CRM Outgoing Status',
-                            value: 'crm_outgoing_status',
-                            description: 'Status messages from CRM (DB 0)',
-                        },
-                        {
-                            name: 'N8N Incoming Message',
-                            value: 'n8n_incoming_message',
-                            description: 'Incoming messages to N8N (DB 0)',
-                        },
-                        {
-                            name: 'N8N Outgoing Message',
-                            value: 'n8n_outgoing_message',
-                            description: 'Outgoing messages from N8N (DB 0)',
-                        },
-                    ],
+                    options: (0, StreamConfig_1.getStreamOptions)(),
                     default: [],
                 },
                 {
@@ -292,37 +237,21 @@ class Chat2CrmSend {
         });
         return redis;
     }
-    // Определяем базу данных для стрима
-    static getStreamDb(stream) {
-        // Streams в DB 1 (CrmWorker)
-        if (stream === 'crm_outgoing_message' ||
-            stream === 'crm_incoming_message' ||
-            stream === 'crm_lazy_incoming_message' ||
-            stream === 'crm_contacts') {
-            return 1;
-        }
-        // Все остальные streams находятся в DB 0
-        return 0;
-    }
     async execute() {
         const items = this.getInputData();
         const returnData = [];
         const credentials = await this.getCredentials('chat2CrmRedisApi');
         const selectedStreams = this.getNodeParameter('streams', 0);
         const messageId = this.getNodeParameter('messageId', 0);
-        // Проверяем, что выбраны streams
+        // Валидация входных данных
         if (!selectedStreams || selectedStreams.length === 0) {
             throw new n8n_workflow_1.ApplicationError('Please select at least one stream to send message to', { level: 'warning' });
         }
-        // Группируем выбранные streams по базам данных
-        const streamsByDb = new Map();
-        selectedStreams.forEach(stream => {
-            const db = Chat2CrmSend.getStreamDb(stream);
-            if (!streamsByDb.has(db)) {
-                streamsByDb.set(db, []);
-            }
-            streamsByDb.get(db).push(stream);
-        });
+        if (messageId && typeof messageId !== 'string') {
+            throw new n8n_workflow_1.ApplicationError('Message ID must be a string', { level: 'error' });
+        }
+        // Группируем выбранные streams по базам данных используя общую функцию
+        const streamsByDb = (0, StreamConfig_1.groupStreamsByDb)(selectedStreams);
         // Создаем подключения к Redis только для нужных баз данных
         const redisConnections = new Map();
         try {

package/dist/nodes/Chat2CrmTrigger/Chat2CrmTrigger.node.js

@@ -3,6 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Chat2CrmTrigger = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const RedisConnection_1 = require("./Infra/RedisConnection");
+const StreamConfig_1 = require("./Infra/StreamConfig");
+// Константы для валидации
+const MIN_POLL_INTERVAL_SECONDS = 0.01;
+const MAX_POLL_INTERVAL_SECONDS = 60;
+const MIN_BLOCK_TIME_MS = 0;
+const MAX_BLOCK_TIME_MS = 60000; // 60 секунд
+const MIN_COUNT = 1;
+const MAX_COUNT = 1000;
+const MAX_BLOCK_TIME_FOR_RESPONSIVENESS_MS = 500;
 class Chat2CrmTrigger {
     constructor() {
         this.description = {
@@ -29,70 +38,9 @@ class Chat2CrmTrigger {
                     displayName: 'Streams',
                     name: 'streams',
                     type: 'multiOptions',
-                    required: true, // Вернули required: true
+                    required: true,
                     description: 'Select Redis streams to listen to',
-                    options: [
-                        {
-                            name: 'Chat Incoming Message',
-                            value: 'chat_incoming_message',
-                            description: 'Messages to chat (DB 0)',
-                        },
-                        {
-                            name: 'Chat Outgoing Message',
-                            value: 'chat_outgoing_message',
-                            description: 'Messages from chat to CRM (DB 0)',
-                        },
-                        {
-                            name: 'Chat Outgoing Status',
-                            value: 'chat_outgoing_status',
-                            description: 'Status messages from chat (DB 0)',
-                        },
-                        {
-                            name: 'Chat Outgoing Status (CRM)',
-                            value: 'chat_outgoing_status',
-                            description: 'Chat outgoing status in CRM DB (DB 1)',
-                        },
-                        {
-                            name: 'CRM Contacts',
-                            value: 'crm_contacts',
-                            description: 'CRM contacts stream (DB 1)',
-                        },
-                        {
-                            name: 'CRM Incoming Message',
-                            value: 'crm_incoming_message',
-                            description: 'Messages to CRM (DB 1)',
-                        },
-                        {
-                            name: 'CRM Incoming Status',
-                            value: 'crm_incoming_status',
-                            description: 'Status messages to CRM (DB 0)',
-                        },
-                        {
-                            name: 'CRM Lazy Incoming Message',
-                            value: 'crm_lazy_incoming_message',
-                            description: 'Lazy incoming messages to CRM (DB 1)',
-                        },
-                        {
-                            name: 'CRM Outgoing Message',
-                            value: 'crm_outgoing_message',
-                            description: 'Messages from CRM to chat (DB 1)',
-                        },
-                        {
-                            name: 'CRM Outgoing Status',
-                            value: 'crm_outgoing_status',
-                            description: 'Status messages from CRM (DB 1)',
-                        },
-                        {
-                            name: 'N8N Incoming Message',
-                            value: 'n8n_incoming_message',
-                            description: 'Incoming messages to N8N (DB 0)',
-                        },
-                        {
-                            name: 'N8N Outgoing Message',
-                            value: 'n8n_outgoing_message',
-                            description: 'Outgoing messages from N8N (DB 0)',
-                        },
-                    ],
+                    options: (0, StreamConfig_1.getStreamOptions)(),
                     default: ['chat_outgoing_message'],
                 },
                 {
@@ -125,29 +73,22 @@ class Chat2CrmTrigger {
         const block = this.getNodeParameter('block', 1000);
         const count = this.getNodeParameter('count', 10);
         const pollIntervalSeconds = this.getNodeParameter('pollInterval', 0.5);
-        const pollInterval = Math.min(pollIntervalSeconds * 1000, 500); // Максимум 500ms
-        // Проверяем, что выбраны streams
+        // Валидация входных данных
         if (!selectedStreams || selectedStreams.length === 0) {
             throw new n8n_workflow_1.ApplicationError('Please select at least one stream to monitor', { level: 'warning' });
         }
-        // Группируем выбранные streams по базам данных
-        const streamsByDb = new Map();
-        selectedStreams.forEach(stream => {
-            let db = 0; // По умолчанию DB 0
-            // Streams в DB 1 (CrmWorker)
-            if (stream === 'crm_outgoing_message' ||
-                stream === 'crm_incoming_message' ||
-                stream === 'crm_lazy_incoming_message' ||
-                stream === 'crm_contacts') {
-                db = 1;
-            }
-            // Все остальные streams (chat_incoming_message, chat_outgoing_message, 
-            // crm_incoming_status, crm_outgoing_status) находятся в DB 0
-            if (!streamsByDb.has(db)) {
-                streamsByDb.set(db, []);
-            }
-            streamsByDb.get(db).push(stream);
-        });
+        if (pollIntervalSeconds < MIN_POLL_INTERVAL_SECONDS || pollIntervalSeconds > MAX_POLL_INTERVAL_SECONDS) {
+            throw new n8n_workflow_1.ApplicationError(`Poll interval must be between ${MIN_POLL_INTERVAL_SECONDS} and ${MAX_POLL_INTERVAL_SECONDS} seconds`, { level: 'error' });
+        }
+        if (block < MIN_BLOCK_TIME_MS || block > MAX_BLOCK_TIME_MS) {
+            throw new n8n_workflow_1.ApplicationError(`Block time must be between ${MIN_BLOCK_TIME_MS} and ${MAX_BLOCK_TIME_MS} milliseconds`, { level: 'error' });
+        }
+        if (count < MIN_COUNT || count > MAX_COUNT) {
+            throw new n8n_workflow_1.ApplicationError(`Count must be between ${MIN_COUNT} and ${MAX_COUNT}`, { level: 'error' });
+        }
+        const pollInterval = Math.min(pollIntervalSeconds * 1000, MAX_BLOCK_TIME_FOR_RESPONSIVENESS_MS);
+        // Группируем выбранные streams по базам данных используя общую функцию
+        const streamsByDb = (0, StreamConfig_1.groupStreamsByDb)(selectedStreams);
         // Создаем подключения к Redis только для нужных баз данных
         const redisConnections = new Map();
         for (const db of streamsByDb.keys()) {
@@ -241,7 +182,7 @@ class Chat2CrmTrigger {
                     try {
                         const lastId = lastReadIds.get(stream) || '$';
                         // Используем более короткий block time для возможности быстрого закрытия
-                        const blockTime = isClosing ? 0 : Math.min(block, 500); // Максимум 500ms для более быстрого отклика
+                        const blockTime = isClosing ? 0 : Math.min(block, MAX_BLOCK_TIME_FOR_RESPONSIVENESS_MS);
                         // Используем XREAD чтобы читать все сообщения напрямую из stream
                         // Это позволяет читать сообщения даже если они уже обработаны другими consumer'ами
                         const messages = await redis.xread('COUNT', count, 'BLOCK', blockTime, 'STREAMS', stream, lastId);

package/dist/nodes/Chat2CrmTrigger/Infra/StreamConfig.d.ts

@@ -0,0 +1,35 @@
+import { INodePropertyOptions } from 'n8n-workflow';
+/**
+ * Интерфейс для определения stream
+ */
+export interface StreamDefinition {
+    name: string;
+    value: string;
+    description: string;
+    db: number;
+}
+/**
+ * Полный список всех доступных streams с их конфигурацией
+ */
+export declare const STREAM_DEFINITIONS: StreamDefinition[];
+/**
+ * Маппинг stream names к номерам баз данных
+ */
+export declare const STREAM_DB_MAP: Record<string, number>;
+/**
+ * Определяет номер базы данных для указанного stream
+ * @param stream - Имя stream
+ * @returns Номер базы данных (0 или 1)
+ */
+export declare function getStreamDb(stream: string): number;
+/**
+ * Группирует streams по базам данных
+ * @param streams - Массив имен streams
+ * @returns Map с ключом - номер DB, значением - массив streams
+ */
+export declare function groupStreamsByDb(streams: string[]): Map<number, string[]>;
+/**
+ * Возвращает опции streams для n8n properties
+ * @returns Массив опций для multiOptions
+ */
+export declare function getStreamOptions(): INodePropertyOptions[];

package/dist/nodes/Chat2CrmTrigger/Infra/StreamConfig.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STREAM_DB_MAP = exports.STREAM_DEFINITIONS = void 0;
+exports.getStreamDb = getStreamDb;
+exports.groupStreamsByDb = groupStreamsByDb;
+exports.getStreamOptions = getStreamOptions;
+/**
+ * Полный список всех доступных streams с их конфигурацией
+ */
+exports.STREAM_DEFINITIONS = [
+    {
+        name: 'Chat Incoming Message',
+        value: 'chat_incoming_message',
+        description: 'Messages to chat (DB 0)',
+        db: 0,
+    },
+    {
+        name: 'Chat Outgoing Message',
+        value: 'chat_outgoing_message',
+        description: 'Messages from chat to CRM (DB 0)',
+        db: 0,
+    },
+    {
+        name: 'Chat Outgoing Status',
+        value: 'chat_outgoing_status',
+        description: 'Status messages from chat (DB 0)',
+        db: 0,
+    },
+    {
+        name: 'Chat Outgoing Status (CRM)',
+        value: 'chat_outgoing_status',
+        description: 'Chat outgoing status in CRM DB (DB 1)',
+        db: 1,
+    },
+    {
+        name: 'CRM Contacts',
+        value: 'crm_contacts',
+        description: 'CRM contacts stream (DB 1)',
+        db: 1,
+    },
+    {
+        name: 'CRM Incoming Message',
+        value: 'crm_incoming_message',
+        description: 'Messages to CRM (DB 1)',
+        db: 1,
+    },
+    {
+        name: 'CRM Incoming Status',
+        value: 'crm_incoming_status',
+        description: 'Status messages to CRM (DB 0)',
+        db: 0,
+    },
+    {
+        name: 'CRM Lazy Incoming Message',
+        value: 'crm_lazy_incoming_message',
+        description: 'Lazy incoming messages to CRM (DB 1)',
+        db: 1,
+    },
+    {
+        name: 'CRM Outgoing Message',
+        value: 'crm_outgoing_message',
+        description: 'Messages from CRM to chat (DB 1)',
+        db: 1,
+    },
+    {
+        name: 'CRM Outgoing Status',
+        value: 'crm_outgoing_status',
+        description: 'Status messages from CRM (DB 1)',
+        db: 1,
+    },
+    {
+        name: 'N8N Incoming Message',
+        value: 'n8n_incoming_message',
+        description: 'Incoming messages to N8N (DB 0)',
+        db: 0,
+    },
+    {
+        name: 'N8N Outgoing Message',
+        value: 'n8n_outgoing_message',
+        description: 'Outgoing messages from N8N (DB 0)',
+        db: 0,
+    },
+];
+/**
+ * Маппинг stream names к номерам баз данных
+ */
+exports.STREAM_DB_MAP = {
+    crm_outgoing_message: 1,
+    crm_incoming_message: 1,
+    crm_lazy_incoming_message: 1,
+    crm_contacts: 1,
+    crm_outgoing_status: 1,
+};
+/**
+ * Определяет номер базы данных для указанного stream
+ * @param stream - Имя stream
+ * @returns Номер базы данных (0 или 1)
+ */
+function getStreamDb(stream) {
+    return exports.STREAM_DB_MAP[stream] ?? 0;
+}
+/**
+ * Группирует streams по базам данных
+ * @param streams - Массив имен streams
+ * @returns Map с ключом - номер DB, значением - массив streams
+ */
+function groupStreamsByDb(streams) {
+    const streamsByDb = new Map();
+    streams.forEach(stream => {
+        const db = getStreamDb(stream);
+        if (!streamsByDb.has(db)) {
+            streamsByDb.set(db, []);
+        }
+        streamsByDb.get(db).push(stream);
+    });
+    return streamsByDb;
+}
+/**
+ * Возвращает опции streams для n8n properties
+ * @returns Массив опций для multiOptions
+ */
+function getStreamOptions() {
+    return exports.STREAM_DEFINITIONS.map(def => ({
+        name: def.name,
+        value: def.value,
+        description: def.description,
+    }));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "n8n-nodes-chat2crm",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "description": "n8n node for Chat2Crm Redis integration",
     "keywords": [
         "n8n-community-node-package",