@open-wa/wa-automate 4.64.3 → 4.64.5

package/dist/cli/integrations/chatwoot.js

@@ -474,92 +474,101 @@ class ChatwootClient {
     processWAMessage(message) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let isNewConversation = false;
-            if (message.chatId.includes('g')) {
-                //chatwoot integration does not support group chats
-                return;
-            }
-            /**
-             * Does the contact exist in chatwoot?
-             */
-            if (!contactReg[message.chatId]) {
-                const contact = yield this.searchContact(message.chatId);
-                if (contact) {
-                    contactReg[message.chatId] = contact.id;
-                }
-                else {
-                    //create the contact
-                    contactReg[message.chatId] = (yield this.createContact(message.sender)).id;
+            try {
+                let isNewConversation = false;
+                if (message.chatId.includes('g')) {
+                    //chatwoot integration does not support group chats
+                    return;
                 }
-            }
-            if (!convoReg[message.chatId]) {
-                const conversation = yield this.getContactConversation(message.chatId);
-                if (conversation) {
-                    convoReg[message.chatId] = conversation.id;
+                if (message.chatId.includes('broadcast')) {
+                    //chatwoot integration does not support broadcast or story messages
+                    return;
                 }
-                else {
-                    //create the conversation
-                    convoReg[message.chatId] = (yield this.createConversation(contactReg[message.chatId])).id;
-                    isNewConversation = convoReg[message.chatId];
+                /**
+                 * Does the contact exist in chatwoot?
+                 */
+                if (!contactReg[message.chatId]) {
+                    const contact = yield this.searchContact(message.chatId);
+                    if (contact) {
+                        contactReg[message.chatId] = contact.id;
+                    }
+                    else {
+                        //create the contact
+                        contactReg[message.chatId] = (yield this.createContact(message.sender)).id;
+                    }
                 }
-            }
-            /**
-             * Does the conversation exist in
-             */
-            let text = message.body;
-            let hasAttachments = false;
-            switch (message.type) {
-                case 'list_response':
-                    /**
-                     * Possible CSAT response:
-                     */
-                    yield this.processCSATResponse(message);
-                    break;
-                case 'location':
-                    text = `Location Message:\n\n${message.loc}\n\nhttps://www.google.com/maps?q=${message.lat},${message.lng}`;
-                    break;
-                case 'buttons_response':
-                    text = message.selectedButtonId;
-                    break;
-                case 'document':
-                case 'image':
-                case 'audio':
-                case 'ptt':
-                case 'video':
-                    if (message.cloudUrl) {
-                        text = `FILE:\t${message.cloudUrl}\n\nMESSAGE:\t${message.text}`;
+                if (!convoReg[message.chatId]) {
+                    const conversation = yield this.getContactConversation(message.chatId);
+                    if (conversation) {
+                        convoReg[message.chatId] = conversation.id;
                     }
                     else {
-                        text = message.text;
-                        hasAttachments = true;
+                        //create the conversation
+                        convoReg[message.chatId] = (yield this.createConversation(contactReg[message.chatId])).id;
+                        isNewConversation = convoReg[message.chatId];
                     }
-                    break;
-                default:
-                    text = ((_a = message === null || message === void 0 ? void 0 : message.ctwaContext) === null || _a === void 0 ? void 0 : _a.sourceUrl) ? `${message.body}\n\n${message.ctwaContext.sourceUrl}` : message.body || "__UNHANDLED__";
-                    break;
-            }
-            const newCWMessage = hasAttachments ? yield this.sendAttachmentMessage(text, message.chatId, message) : yield this.sendConversationMessage(text, message.chatId, message);
-            if (isNewConversation !== false) {
-                /**
-                 * Wait 3 seconds before trying to check for an automated message
-                */
-                yield (0, tools_1.timeout)(3000);
-                /**
-                 * Check the messages to see if a message_type: 3 comes through after the initial message;
-                 */
-                const msgs = yield this.getAllInboxMessages(`${isNewConversation}`);
-                if (!msgs)
-                    return;
-                /**
-                 * Message IDs are numbers (for now)
-                 */
-                const possibleWelcomeMessage = msgs.filter(m => m.id > newCWMessage.id).find(m => m.message_type === 3 && m.content_type !== 'input_csat');
-                if (!possibleWelcomeMessage)
-                    return;
+                }
                 /**
-                 * Ok reply with the welcome message now
+                 * Does the conversation exist in
                  */
-                yield this.client.sendText(message.chatId, possibleWelcomeMessage.content || "...");
+                let text = message.body;
+                let hasAttachments = false;
+                switch (message.type) {
+                    case 'list_response':
+                        /**
+                         * Possible CSAT response:
+                         */
+                        yield this.processCSATResponse(message);
+                        break;
+                    case 'location':
+                        text = `Location Message:\n\n${message.loc}\n\nhttps://www.google.com/maps?q=${message.lat},${message.lng}`;
+                        break;
+                    case 'buttons_response':
+                        text = message.selectedButtonId;
+                        break;
+                    case 'document':
+                    case 'image':
+                    case 'audio':
+                    case 'ptt':
+                    case 'video':
+                        if (message.cloudUrl) {
+                            text = `FILE:\t${message.cloudUrl}\n\nMESSAGE:\t${message.text}`;
+                        }
+                        else {
+                            text = message.text;
+                            hasAttachments = true;
+                        }
+                        break;
+                    default:
+                        text = ((_a = message === null || message === void 0 ? void 0 : message.ctwaContext) === null || _a === void 0 ? void 0 : _a.sourceUrl) ? `${message.body}\n\n${message.ctwaContext.sourceUrl}` : message.body || "__UNHANDLED__";
+                        break;
+                }
+                const newCWMessage = hasAttachments ? yield this.sendAttachmentMessage(text, message.chatId, message) : yield this.sendConversationMessage(text, message.chatId, message);
+                if (isNewConversation !== false) {
+                    /**
+                     * Wait 3 seconds before trying to check for an automated message
+                    */
+                    yield (0, tools_1.timeout)(3000);
+                    /**
+                     * Check the messages to see if a message_type: 3 comes through after the initial message;
+                     */
+                    const msgs = yield this.getAllInboxMessages(`${isNewConversation}`);
+                    if (!msgs)
+                        return;
+                    /**
+                     * Message IDs are numbers (for now)
+                     */
+                    const possibleWelcomeMessage = msgs.filter(m => m.id > newCWMessage.id).find(m => m.message_type === 3 && m.content_type !== 'input_csat');
+                    if (!possibleWelcomeMessage)
+                        return;
+                    /**
+                     * Ok reply with the welcome message now
+                     */
+                    yield this.client.sendText(message.chatId, possibleWelcomeMessage.content || "...");
+                }
+            }
+            catch (error) {
+                console.error(`Something went wrong processing this message: ${message.id}`, error);
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.64.3",
+  "version": "4.64.5",
   "licenseCheckUrl": "https://funcs.openwa.dev/license-check",
   "brokenMethodReportUrl": "https://funcs.openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -154,7 +154,7 @@
     "pidtree": "^0.6.0",
     "pidusage": "^3.0.0",
     "postman-2-swagger": "^0.5.0",
-    "puppeteer": "^19.4.1",
+    "puppeteer": "^19.9.0",
     "puppeteer-extra": "^3.3.4",
     "puppeteer-extra-plugin-block-resources": "^2.4.2",
     "puppeteer-extra-plugin-devtools": "^2.4.4",