n8n-nodes-zalo-custom 1.0.9 → 1.1.0

package/nodes/utils/helper.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveFile = saveFile;
 exports.removeFile = removeFile;
+exports.parseHtmlToStyles = parseHtmlToStyles;
 const axios_1 = __importDefault(require("axios"));
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
@@ -39,3 +40,150 @@ function removeFile(filePath) {
         console.error('Lỗi khi xoá file:', error);
     }
 }
+function parseHtmlToStyles(html) {
+    var _a, _b;
+    let workingHtml = html
+        .replace(/"/g, '"')
+        .replace(/'/g, "'")
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&amp;/g, '&')
+        .replace(/&nbsp;/g, ' ');
+    workingHtml = workingHtml.replace(/<a[^>]*href="([^"]*)"[^>]*>(.*?)<\/a>/gi, '$2');
+    workingHtml = workingHtml.replace(/<br\s*\/?>/gi, '___BR___');
+    workingHtml = workingHtml.replace(/>\s+</g, '><');
+    workingHtml = workingHtml.replace(/___BR___/g, '<br>');
+    const styles = [];
+    const tagMappings = {
+        'b': 'b',
+        'strong': 'b',
+        'i': 'i',
+        'em': 'i',
+        'u': 'u',
+        's': 's',
+        'strike': 's',
+        'del': 's',
+        'small': 'f_13',
+        'big': 'f_18',
+        'red': 'c_db342e',
+        'orange': 'c_f27806',
+        'yellow': 'c_f7b503',
+        'green': 'c_15a85f',
+    };
+    const openTags = [];
+    let cleanText = '';
+    let htmlIndex = 0;
+    let textIndex = 0;
+    while (htmlIndex < workingHtml.length) {
+        const char = workingHtml[htmlIndex];
+        if (char === '<') {
+            const tagEndIndex = workingHtml.indexOf('>', htmlIndex);
+            if (tagEndIndex === -1) {
+                cleanText += char;
+                textIndex++;
+                htmlIndex++;
+                continue;
+            }
+            const tagContent = workingHtml.substring(htmlIndex + 1, tagEndIndex);
+            const isClosingTag = tagContent.startsWith('/');
+            const tagName = (isClosingTag ? tagContent.substring(1) : tagContent.split(/\s/)[0]).toLowerCase();
+            if (tagName === 'br') {
+                cleanText += '\n';
+                textIndex++;
+            }
+            else if (tagName === 'p') {
+                if (isClosingTag) {
+                    cleanText += '\n\n';
+                    textIndex += 2;
+                }
+            }
+            else if (tagName === 'div') {
+                if (isClosingTag) {
+                    cleanText += '\n';
+                    textIndex++;
+                }
+            }
+            else if (tagName.match(/^h[1-6]$/)) {
+                if (isClosingTag) {
+                    cleanText += '\n';
+                    textIndex++;
+                }
+            }
+            else if (tagName === 'li') {
+                if (!isClosingTag) {
+                    cleanText += '• ';
+                    textIndex += 2;
+                }
+                else {
+                    cleanText += '\n';
+                    textIndex++;
+                }
+            }
+            else if (tagName === 'ul' || tagName === 'ol') {
+                if (!isClosingTag) {
+                    cleanText += '\n';
+                    textIndex++;
+                }
+                else {
+                    cleanText += '\n';
+                    textIndex++;
+                }
+            }
+            else {
+                const styleType = tagMappings[tagName];
+                if (styleType) {
+                    if (isClosingTag) {
+                        for (let i = openTags.length - 1; i >= 0; i--) {
+                            if (openTags[i].tagName === tagName) {
+                                const openTag = openTags[i];
+                                if (textIndex > openTag.startPos) {
+                                    styles.push({
+                                        st: openTag.styleType,
+                                        start: openTag.startPos,
+                                        end: textIndex
+                                    });
+                                }
+                                openTags.splice(i, 1);
+                                break;
+                            }
+                        }
+                    }
+                    else {
+                        openTags.push({
+                            tagName: tagName,
+                            styleType: styleType,
+                            startPos: textIndex
+                        });
+                    }
+                }
+            }
+            htmlIndex = tagEndIndex + 1;
+        }
+        else {
+            cleanText += char;
+            textIndex++;
+            htmlIndex++;
+        }
+    }
+    for (const openTag of openTags) {
+        if (textIndex > openTag.startPos) {
+            styles.push({
+                st: openTag.styleType,
+                start: openTag.startPos,
+                end: textIndex
+            });
+        }
+    }
+    cleanText = cleanText
+        .replace(/\n\s*\n\s*\n/g, '\n\n')
+        .replace(/[ \t]+/g, ' ');
+    const trimStart = ((_b = (_a = cleanText.match(/^\s*/)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.length) || 0;
+    cleanText = cleanText.replace(/^\s+|\s+$/g, '');
+    if (trimStart > 0) {
+        for (const style of styles) {
+            style.start = Math.max(0, style.start - trimStart);
+            style.end = Math.max(style.start, style.end - trimStart);
+        }
+    }
+    return { cleanText, styles };
+}

package/nodes/utils/zalo.helper.js

@@ -8,6 +8,8 @@ const fs_1 = require("fs");
 const axios_1 = require("axios");
 const FormData = require("form-data");
 const sql_js_1 = require("sql.js");
+const https_proxy_agent_1 = require("https-proxy-agent");
+const node_fetch_1 = __importDefault(require("node-fetch"));
 const crypto_helper_1 = require("./crypto.helper");
 const path_1 = require("path");
 
@@ -65,12 +67,17 @@ async function persistDb() {
 async function imageMetadataGetter(filePath) {
     try {
         const stats = await fs_1.promises.stat(filePath);
-        const dimensions = (0, image_size_1.default)(filePath);
-        return {
-            height: dimensions.height,
-            width: dimensions.width,
-            size: stats.size,
-        };
+        try {
+            const dimensions = (0, image_size_1.default)(filePath);
+            return {
+                height: dimensions.height,
+                width: dimensions.width,
+                size: stats.size,
+            };
+        } catch (err) {
+            // Nếu không phải ảnh (ví dụ mp4), trả về size thực tế để API xử lý tiếp
+            return { height: 0, width: 0, size: stats.size };
+        }
     }
     catch (e) {
         if (e.code === 'ENOENT' || e.code === 'EACCES') {
@@ -79,6 +86,7 @@ async function imageMetadataGetter(filePath) {
         else {
             console.log(`Could not get metadata for file at path: ${filePath}. It might not be a valid image file. Error: ${e.message}`);
         }
+        return { height: 0, width: 0, size: 0 };
     }
 }
 exports.imageMetadataGetter = imageMetadataGetter;
@@ -86,8 +94,8 @@ exports.imageMetadataGetter = imageMetadataGetter;
 async function getZaloApiClient(node, options = {}) {
     const useSession = node.getNodeParameter('useSession', 0, false);
     const userId = node.getNodeParameter('connectToId', 0, '');
-    const { needsImageMetadataGetter = false, selfListen = false } = options;
-    let cookie, imei, userAgent, sessionInfo = null, actualZaloId = '';
+    const { needsImageMetadataGetter = false, selfListen = false, logging = false } = options;
+    let cookie, imei, userAgent, sessionInfo, proxy = null, actualZaloId = '';
     if (useSession && userId) {
         try {
 			await initDb();
@@ -125,6 +133,7 @@ async function getZaloApiClient(node, options = {}) {
 					cookie = sessionData.cookie;
 					imei = sessionData.imei;
 					userAgent = sessionData.userAgent;
+					proxy = sessionData.proxy;
 				}
 				catch (e) {
 					throw new n8n_workflow_1.NodeOperationError(node.getNode(), `[SS] Failed to decrypt session for Zalo ID: "${actualZaloId}". The file might be corrupt or the key has changed. Error: ${e.message}`);
@@ -144,14 +153,33 @@ async function getZaloApiClient(node, options = {}) {
         cookie = JSON.parse(zaloCred.cookie);
         imei = zaloCred.imei;
         userAgent = zaloCred.userAgent;
+        proxy = zaloCred.proxy;
+    }
+
+    const zaloOptions = {
+        logging,
+        selfListen,
+        settings: {
+            features: {
+                socket: {
+                    close_and_retry_codes: [1006, 1000, 3000, 3003],
+                    retries: {
+                        "1006": {
+                            max: 10,
+                            times: [5000, 10000, 30000],
+                        },
+                    },
+                },
+            },
+        },
+    };
+    if (proxy) {
+        zaloOptions.agent = new https_proxy_agent_1.HttpsProxyAgent(proxy);
+        zaloOptions.polyfill = node_fetch_1.default;
     }
-    const zaloOptions = {};
     if (needsImageMetadataGetter) {
         zaloOptions.imageMetadataGetter = imageMetadataGetter;
     }
-	if (selfListen) {
-		zaloOptions.selfListen = selfListen;
-	}
     const zalo = new zca_js_1.Zalo(zaloOptions);
     return zalo.login({ cookie, imei, userAgent });
 }
@@ -242,7 +270,7 @@ exports.deleteSessionByUserId = deleteSessionByUserId;
 
 async function sendToTelegram({ token, chatId, text, binaryData, fileName, caption, logger, }) {
     if (!token || !chatId) {
-        logger === null || logger === void 0 ? void 0 : logger.warn('Telegram token và chatId là bắt buộc nhưng không được cung cấp.');
+        logger === null || logger === void 0 ? void 0 : logger.warn('Telegram token và chatId là bắt buộc');
         return;
     }
     const baseUrl = `https://api.telegram.org/bot${token}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-zalo-custom",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "description": "n8n nodes for Zalo automation. Send messages, manage groups, friends, and listen to events without third-party services.",
   "keywords": [
     "n8n",
@@ -51,6 +51,8 @@
   "dependencies": {
     "axios": "^1.8.4",
     "express": "^5.1.0",
+    "https-proxy-agent": "^7.0.5",
+    "node-fetch": "^3.3.2",
     "zca-js": "^2.0.4",
     "image-size": "^1.1.1",
     "sql.js": "^1.10.3"