@kichat/n8n-nodes-kirimchat 1.3.0 → 1.3.2

package/dist/nodes/KirimChat/KirimChat.node.js

@@ -41,6 +41,114 @@ function validateInteractiveMessage(interactive) {
     }
     return true;
 }
+/**
+ * Count unique placeholder numbers in text (e.g., "{{1}} and {{2}} and {{1}}" = 2)
+ */
+function countUniquePlaceholders(text) {
+    if (!text)
+        return 0;
+    const matches = text.match(/\{\{\d+\}\}/g);
+    if (!matches)
+        return 0;
+    const unique = new Set(matches.map((m) => m.replace(/[{}]/g, '')));
+    return unique.size;
+}
+/**
+ * Build WhatsApp template components with correct variable distribution
+ * across header, body, and button components
+ */
+function buildTemplateComponentsFromStructure(variables, structure) {
+    var _a, _b;
+    const components = [];
+    let varIdx = 0;
+    // Header component
+    if (((_a = structure.headerType) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === 'TEXT' && structure.headerContent) {
+        const headerVarCount = countUniquePlaceholders(structure.headerContent);
+        if (headerVarCount > 0 && varIdx < variables.length) {
+            const headerParams = variables.slice(varIdx, varIdx + headerVarCount).map((v) => ({
+                type: 'text',
+                text: v,
+            }));
+            components.push({ type: 'header', parameters: headerParams });
+            varIdx += headerVarCount;
+        }
+    }
+    else if (['IMAGE', 'VIDEO', 'DOCUMENT'].includes(((_b = structure.headerType) === null || _b === void 0 ? void 0 : _b.toUpperCase()) || '')) {
+        if (varIdx < variables.length) {
+            const mediaValue = variables[varIdx];
+            const mediaType = structure.headerType.toLowerCase();
+            const isUrl = mediaValue.startsWith('http');
+            components.push({
+                type: 'header',
+                parameters: [{
+                        type: mediaType,
+                        [mediaType]: isUrl ? { link: mediaValue } : { id: mediaValue },
+                    }],
+            });
+            varIdx += 1;
+        }
+    }
+    // Body component
+    const bodyVarCount = countUniquePlaceholders(structure.content);
+    if (bodyVarCount > 0 && varIdx < variables.length) {
+        const bodyParams = variables.slice(varIdx, varIdx + bodyVarCount).map((v) => ({
+            type: 'text',
+            text: v,
+        }));
+        components.push({ type: 'body', parameters: bodyParams });
+        varIdx += bodyVarCount;
+    }
+    else if (!structure.content && variables.length > 0) {
+        // Fallback for old dropdown format (no structure info): all variables go to body
+        const bodyParams = variables.map((v) => ({ type: 'text', text: v }));
+        components.push({ type: 'body', parameters: bodyParams });
+        return components;
+    }
+    // Button components (URL buttons with dynamic variables)
+    if (structure.buttons && Array.isArray(structure.buttons)) {
+        structure.buttons.forEach((btn, index) => {
+            var _a;
+            if (btn.type === 'URL' && ((_a = btn.url) === null || _a === void 0 ? void 0 : _a.includes('{{1}}')) && varIdx < variables.length) {
+                components.push({
+                    type: 'button',
+                    sub_type: 'url',
+                    index,
+                    parameters: [{ type: 'text', text: variables[varIdx] }],
+                });
+                varIdx += 1;
+            }
+        });
+    }
+    return components;
+}
+const MAX_TEMPLATE_VARS = 20;
+const templateVariableCountOptions = [
+    { name: 'No variables', value: 0 },
+    ...Array.from({ length: MAX_TEMPLATE_VARS }, (_, i) => ({
+        name: `${i + 1}`,
+        value: i + 1,
+    })),
+];
+// Generate individual template variable fields with displayOptions
+// Each field shows only when templateVariableCount >= its number
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const templateVariableFields = Array.from({ length: MAX_TEMPLATE_VARS }, (_, idx) => {
+    const varNum = idx + 1;
+    return {
+        displayName: `Variable {{${varNum}}}`,
+        name: `templateVar${varNum}`,
+        type: 'string',
+        displayOptions: {
+            show: {
+                operation: ['sendMessage'],
+                messageType: ['template'],
+                templateVariableCount: Array.from({ length: MAX_TEMPLATE_VARS - idx }, (_, j) => varNum + j),
+            },
+        },
+        default: '',
+        description: `Value for template placeholder {{${varNum}}}`,
+    };
+});
 class KirimChat {
     constructor() {
         this.description = {
@@ -99,6 +207,12 @@ class KirimChat {
                             description: 'Send typing indicator to show you are typing',
                             action: 'Send typing indicator',
                         },
+                        {
+                            name: 'Get Message Status',
+                            value: 'getMessageStatus',
+                            description: 'Check the delivery status of a sent message (sent, delivered, read, failed)',
+                            action: 'Get message status',
+                        },
                     ],
                     default: 'sendMessage',
                 },
@@ -483,19 +597,21 @@ class KirimChat {
                     placeholder: 'en',
                 },
                 {
-                    displayName: 'Template Variables',
-                    name: 'templateVariables',
-                    type: 'string',
+                    displayName: 'Number of Variables',
+                    name: 'templateVariableCount',
+                    type: 'options',
                     displayOptions: {
                         show: {
                             operation: ['sendMessage'],
                             messageType: ['template'],
                         },
                     },
-                    default: '',
-                    description: 'Comma-separated values for template variables. Example: "John, ORD-123" replaces {{1}} with John and {{2}} with ORD-123. Leave empty if template has no variables.',
-                    placeholder: 'value1, value2, value3',
+                    options: templateVariableCountOptions,
+                    default: 0,
+                    noDataExpression: true,
+                    description: 'Match the variable count shown in template name (e.g., [12 var] = select 12)',
                 },
+                ...templateVariableFields,
                 {
                     displayName: 'Advanced: Template Components (JSON)',
                     name: 'templateComponents',
@@ -934,6 +1050,23 @@ class KirimChat {
                     placeholder: 'tpl_abc123',
                 },
                 // ============================================
+                // GET MESSAGE STATUS FIELDS
+                // ============================================
+                {
+                    displayName: 'Message ID',
+                    name: 'statusMessageId',
+                    type: 'string',
+                    required: true,
+                    displayOptions: {
+                        show: {
+                            operation: ['getMessageStatus'],
+                        },
+                    },
+                    default: '',
+                    description: 'The message ID returned from Send Message operation',
+                    placeholder: 'cmlacq91h000pltieyh3w20rh',
+                },
+                // ============================================
                 // SEND TYPING FIELDS
                 // ============================================
                 {
@@ -1192,25 +1325,51 @@ class KirimChat {
                         if (templates.length === 0) {
                             return [{ name: '-- No approved templates --', value: '' }];
                         }
-                        // Count variables in content
-                        const countVariables = (content) => {
-                            const matches = content === null || content === void 0 ? void 0 : content.match(/\{\{\d+\}\}/g);
-                            return matches ? matches.length : 0;
+                        // Count unique placeholder numbers in text
+                        const countUniqueVars = (text) => {
+                            if (!text)
+                                return 0;
+                            const matches = text.match(/\{\{\d+\}\}/g);
+                            if (!matches)
+                                return 0;
+                            const unique = new Set(matches.map((m) => m.replace(/[{}]/g, '')));
+                            return unique.size;
+                        };
+                        // Count variables across all template components
+                        const countAllVariables = (t) => {
+                            var _a, _b, _c;
+                            let count = 0;
+                            if (((_a = t.header_type) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === 'TEXT') {
+                                count += countUniqueVars(t.header_content);
+                            }
+                            else if (['IMAGE', 'VIDEO', 'DOCUMENT'].includes(((_b = t.header_type) === null || _b === void 0 ? void 0 : _b.toUpperCase()) || '')) {
+                                count += 1;
+                            }
+                            count += countUniqueVars(t.content);
+                            if (t.buttons && Array.isArray(t.buttons)) {
+                                for (const btn of t.buttons) {
+                                    if (btn.type === 'URL' && ((_c = btn.url) === null || _c === void 0 ? void 0 : _c.includes('{{1}}'))) {
+                                        count += 1;
+                                    }
+                                }
+                            }
+                            return count;
                         };
                         return templates.map((t) => {
                             var _a;
-                            const varCount = countVariables(t.content);
+                            const varCount = countAllVariables(t);
                             const varInfo = varCount > 0 ? ` [${varCount} var]` : '';
                             return {
                                 name: `${t.template_name} (${t.language})${varInfo}`,
                                 value: JSON.stringify({
                                     name: t.template_name,
                                     language: t.language,
-                                    has_variables: varCount > 0,
-                                    variable_count: varCount,
-                                    content: t.content,
+                                    header_type: t.header_type || null,
+                                    header_content: t.header_content || null,
+                                    content: t.content || null,
+                                    buttons: t.buttons || null,
                                 }),
-                                description: ((_a = t.content) === null || _a === void 0 ? void 0 : _a.substring(0, 80)) || '',
+                                description: ((_a = t.content) === null || _a === void 0 ? void 0 : _a.substring(0, 100)) || '',
                             };
                         });
                     }
@@ -1276,6 +1435,12 @@ class KirimChat {
                         let templateName;
                         let templateLanguage;
                         let templateComponents = [];
+                        let templateStructure = {
+                            headerType: null,
+                            headerContent: null,
+                            content: null,
+                            buttons: null,
+                        };
                         if (manualEntry) {
                             // Manual entry mode - user types name and language
                             templateName = this.getNodeParameter('templateName', i);
@@ -1305,30 +1470,28 @@ class KirimChat {
                                 const templateData = JSON.parse(templateSelectValue);
                                 templateName = templateData.name;
                                 templateLanguage = templateData.language;
+                                templateStructure = {
+                                    headerType: templateData.header_type || null,
+                                    headerContent: templateData.header_content || null,
+                                    content: templateData.content || null,
+                                    buttons: templateData.buttons || null,
+                                };
                             }
                             catch (error) {
                                 throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Invalid template selection. Please re-select the template.', { itemIndex: i });
                             }
                         }
-                        // Handle comma-separated variables
-                        const templateVariablesStr = this.getNodeParameter('templateVariables', i, '');
-                        const templateVariables = templateVariablesStr
-                            ? templateVariablesStr.split(',').map((v) => v.trim()).filter((v) => v.length > 0)
-                            : [];
+                        // Handle template variables from individual fields
+                        const templateVarCount = this.getNodeParameter('templateVariableCount', i, 0);
+                        const templateVariables = [];
+                        for (let v = 1; v <= templateVarCount; v++) {
+                            const val = this.getNodeParameter(`templateVar${v}`, i, '');
+                            templateVariables.push(val);
+                        }
                         if (templateVariables.length > 0) {
-                            // Build body component with parameters
-                            const bodyParameters = templateVariables.map((v) => ({
-                                type: 'text',
-                                text: v,
-                            }));
-                            // If no components provided, create body component with variables
+                            // If no components provided, build from template structure
                             if (!Array.isArray(templateComponents) || templateComponents.length === 0) {
-                                templateComponents = [
-                                    {
-                                        type: 'body',
-                                        parameters: bodyParameters,
-                                    },
-                                ];
+                                templateComponents = buildTemplateComponentsFromStructure(templateVariables, templateStructure);
                             }
                         }
                         body.template = {
@@ -1653,6 +1816,17 @@ class KirimChat {
                         json: true,
                     });
                 }
+                else if (operation === 'getMessageStatus') {
+                    // ============================================
+                    // GET MESSAGE STATUS OPERATION
+                    // ============================================
+                    const statusMsgId = this.getNodeParameter('statusMessageId', i);
+                    responseData = await this.helpers.httpRequestWithAuthentication.call(this, 'kirimChatApi', {
+                        method: 'GET',
+                        url: `${baseUrl}/messages/${statusMsgId}/status`,
+                        json: true,
+                    });
+                }
                 else {
                     throw new n8n_workflow_1.NodeOperationError(this.getNode(), `The operation "${operation}" is not supported!`);
                 }

package/dist/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["../credentials/kirimchatapi.credentials.ts","../nodes/kirimchat/kirimchat.node.ts"],"version":"5.9.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kichat/n8n-nodes-kirimchat",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "n8n community node for KirimChat - Send WhatsApp, Instagram & Messenger messages with interactive buttons, flexible customer lookup, and typing indicators",
   "keywords": [
     "n8n-community-node-package",