@open-wa/wa-automate 4.44.11 → 4.45.0

package/dist/cli/cli-options.js

@@ -29,6 +29,11 @@ exports.optionList = [{
         type: String,
         typeLabel: '{blue {underline mEEwUGEEML2ZThMm252rLg1M}}',
         description: "The access token of the specific Chatwoot inbox you set up for this session"
+    }, {
+        name: 'force-update-cw-webhook',
+        type: Boolean,
+        default: false,
+        description: "Updates the chatwoot inbox webhook with the --api-host value on every launch"
     },
     {
         name: 'port',

package/dist/cli/index.js

@@ -21,6 +21,7 @@ const setup_1 = require("./setup");
 const collections_1 = require("./collections");
 const server_1 = require("./server");
 const localtunnel_1 = __importDefault(require("localtunnel"));
+const chatwoot_1 = require("./integrations/chatwoot");
 let checkUrl = (s) => (typeof s === "string") && (0, is_url_superb_1.default)(s);
 const ready = (config) => __awaiter(void 0, void 0, void 0, function* () {
     (0, index_1.processSend)('ready');
@@ -199,7 +200,7 @@ function start() {
                 if (cliConfig.tunnel) {
                     spinner.info(`\n• Setting up external tunnel`);
                     const tunnel = yield (0, localtunnel_1.default)({ port: PORT });
-                    cliConfig.tunnel = tunnel.url;
+                    cliConfig.apiHost = cliConfig.tunnel = tunnel.url;
                     spinner.succeed(`\n\t${(0, terminal_link_1.default)('External address', tunnel.url)}`);
                 }
                 const apiDocsUrl = cliConfig.apiHost ? `${cliConfig.apiHost}/api-docs/ ` : `${cliConfig.host.includes('http') ? '' : 'http://'}${cliConfig.host}:${PORT}/api-docs/ `;
@@ -211,6 +212,7 @@ function start() {
                     const statsLink = (0, terminal_link_1.default)('API Stats', swaggerStatsUrl);
                     spinner.succeed(`\n\t${statsLink}`);
                 }
+                yield (0, chatwoot_1.setupChatwootOutgoingMessageHandler)(cliConfig, client);
             }
             yield ready(Object.assign(Object.assign(Object.assign(Object.assign({}, createConfig), cliConfig), client.getSessionInfo()), { hostAccountNumber: yield client.getHostNumber() }));
             if (cliConfig.emitUnread) {

package/dist/cli/integrations/chatwoot.d.ts

@@ -1,6 +1,7 @@
 import { Client } from '../..';
 import { cliFlags } from '../server';
 import { Request, Response } from "express";
+export declare const chatwoot_webhook_check_event_name = "cli.integrations.chatwoot.check";
 export declare type expressMiddleware = (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
 export declare const chatwootMiddleware: (cliConfig: cliFlags, client: Client) => expressMiddleware;
 export declare const setupChatwootOutgoingMessageHandler: (cliConfig: cliFlags, client: Client) => Promise<void>;

package/dist/cli/integrations/chatwoot.js

@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupChatwootOutgoingMessageHandler = exports.chatwootMiddleware = void 0;
+exports.setupChatwootOutgoingMessageHandler = exports.chatwootMiddleware = exports.chatwoot_webhook_check_event_name = void 0;
+const uuid_apikey_1 = __importDefault(require("uuid-apikey"));
+const __1 = require("../..");
 const axios_1 = __importDefault(require("axios"));
 const form_data_1 = __importDefault(require("form-data"));
 const mime_types_1 = __importDefault(require("mime-types"));
@@ -24,6 +26,7 @@ const convoReg = {
     //WID : chatwoot conversation ID
     "example@c.us": "1"
 };
+exports.chatwoot_webhook_check_event_name = "cli.integrations.chatwoot.check";
 const chatwootMiddleware = (cliConfig, client) => {
     return (req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const processMesssage = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -48,10 +51,10 @@ const chatwootMiddleware = (cliConfig, client) => {
             if ((attachments === null || attachments === void 0 ? void 0 : attachments.length) > 0) {
                 //has attachments
                 const [firstAttachment, ...restAttachments] = attachments;
-                const sendAttachment = (attachment, c) => __awaiter(void 0, void 0, void 0, function* () { return client.sendImage(to, attachment.data_url, attachment.data_url.substring(attachment.data_url.lastIndexOf('/') + 1), c || '', null, true); });
+                const sendAttachment = (attachment, c) => __awaiter(void 0, void 0, void 0, function* () { return attachment && client.sendImage(to, attachment.data_url, attachment.data_url.substring(attachment.data_url.lastIndexOf('/') + 1), c || '', null, true); });
                 //send the text as the caption with the first message only
                 promises.push(sendAttachment(firstAttachment, content));
-                (restAttachments || []).map(sendAttachment).map(promises.push);
+                ((restAttachments || []).map(attachment => sendAttachment(attachment)) || []).map(p => promises.push(p));
             }
             else {
                 //no attachments
@@ -71,7 +74,15 @@ const chatwootMiddleware = (cliConfig, client) => {
                 }
                 else {
                     //not a location message
-                    promises.push(client.sendText(to, content));
+                    /**
+                     * Check for url
+                     */
+                    const urlregex = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/g;
+                    if (content.match(urlregex) && content.match(urlregex)[0]) {
+                        promises.push(client.sendLinkWithAutoPreview(to, content.match(urlregex)[0], content));
+                    }
+                    else
+                        promises.push(client.sendText(to, content));
                 }
             }
             return yield Promise.all(promises);
@@ -89,15 +100,66 @@ const chatwootMiddleware = (cliConfig, client) => {
 };
 exports.chatwootMiddleware = chatwootMiddleware;
 const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(void 0, void 0, void 0, function* () {
+    __1.log.info(`Setting up chatwoot integration: ${cliConfig.chatwootUrl}`);
     const u = cliConfig.chatwootUrl; //e.g `"localhost:3000/api/v1/accounts/3"
     const api_access_token = cliConfig.chatwootApiAccessToken;
     const _u = new URL(u);
     const origin = _u.origin;
     const port = _u.port || 80;
-    const [accountId, inboxId] = u.match(/\/(app|(api\/v1))\/accounts\/\d*\/(inbox|inboxes)\/\d*/g)[0].split('/').filter(Number);
+    const accountNumber = yield client.getHostNumber();
+    const proms = [];
+    let expectedSelfWebhookUrl = cliConfig.apiHost ? `${cliConfig.apiHost}/chatwoot ` : `${cliConfig.host.includes('http') ? '' : 'http://'}${cliConfig.host}:${cliConfig.port}/chatwoot `;
+    expectedSelfWebhookUrl = expectedSelfWebhookUrl.trim();
+    if (cliConfig.key)
+        expectedSelfWebhookUrl = `${expectedSelfWebhookUrl}?api_key=${cliConfig.key}`;
+    let [accountId, inboxId] = (u.match(/\/(app|(api\/v1))\/accounts\/\d*\/(inbox|inboxes)\/\d*/g) || [''])[0].split('/').filter(Number);
+    inboxId = inboxId || u.match(/inboxes\/\d*/g) && u.match(/inboxes\/\d*/g)[0].replace('inboxes/', '');
     // const accountId = u.match(/accounts\/\d*/g) && u.match(/accounts\/\d*/g)[0].replace('accounts/', '')
-    const resolvedInbox = inboxId || u.match(/inboxes\/\d*/g) && u.match(/inboxes\/\d*/g)[0].replace('inboxes/', '');
-    const cwReq = (path, method, data, _headers) => {
+    /**
+     * Is the inbox and or account id undefined??
+     */
+    if (!accountId) {
+        __1.log.info(`CHATWOOT INTEGRATION: account ID missing. Attempting to infer from access token....`);
+        /**
+         * If the account ID is undefined then get the account ID from the access_token
+         */
+        accountId = (yield axios_1.default.get(`${origin}/api/v1/profile`, { headers: { api_access_token } })).data.account_id;
+        __1.log.info(`CHATWOOT INTEGRATION: Got account ID: ${accountId}`);
+    }
+    if (!inboxId) {
+        __1.log.info(`CHATWOOT INTEGRATION: inbox ID missing. Attempting to find correct inbox....`);
+        /**
+         * Find the inbox with the correct setup.
+         */
+        const inboxArray = (yield axios_1.default.get(`${origin}/api/v1/accounts/${accountId}/inboxes`, { headers: { api_access_token } })).data.payload;
+        const possibleInbox = inboxArray.find(inbox => { var _a; return ((_a = inbox === null || inbox === void 0 ? void 0 : inbox.additional_attributes) === null || _a === void 0 ? void 0 : _a.hostAccountNumber) === accountNumber; });
+        if (possibleInbox) {
+            __1.log.info(`CHATWOOT INTEGRATION: found inbox: ${JSON.stringify(possibleInbox)}`);
+            __1.log.info(`CHATWOOT INTEGRATION: found inbox id: ${possibleInbox.channel_id}`);
+            inboxId = possibleInbox.channel_id;
+        }
+        else {
+            __1.log.info(`CHATWOOT INTEGRATION: inbox not found. Attempting to create inbox....`);
+            /**
+             * Create inbox
+             */
+            const { data: new_inbox } = (yield axios_1.default.post(`${origin}/api/v1/accounts/${accountId}/inboxes`, {
+                "name": `open-wa-${accountNumber}`,
+                "channel": {
+                    "phone_number": `${accountNumber}`,
+                    "type": "api",
+                    "webhook_url": expectedSelfWebhookUrl,
+                    "additional_attributes": {
+                        "sessionId": client.getSessionId(),
+                        "hostAccountNumber": `${accountNumber}`
+                    }
+                }
+            }, { headers: { api_access_token } }));
+            inboxId = new_inbox.id;
+            __1.log.info(`CHATWOOT INTEGRATION: inbox created. id: ${inboxId}`);
+        }
+    }
+    const cwReq = (method, path, data, _headers) => {
         const url = `${origin}/api/v1/accounts/${accountId}/${path}`.replace('app.bentonow.com', 'chat.bentonow.com');
         // console.log(url,method,data)
         return (0, axios_1.default)({
@@ -107,20 +169,74 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
             headers: Object.assign({ api_access_token }, _headers)
         });
     };
-    const { data: get_inbox } = yield cwReq(`inboxes/${resolvedInbox}`, 'get');
-    // const inboxId = `openwa_${sessionId}`
+    let { data: get_inbox } = yield cwReq('get', `inboxes/${inboxId}`);
+    /**
+     * Update the webhook
+     */
+    const updatePayload = {
+        "channel": {
+            "additional_attributes": {
+                "sessionId": client.getSessionId(),
+                "hostAccountNumber": `${accountNumber}`,
+                "instanceId": `${client.getInstanceId()}`
+            }
+        }
+    };
+    if (cliConfig.forceUpdateCwWebhook)
+        updatePayload.channel['webhook_url'] = expectedSelfWebhookUrl;
+    const updateInboxPromise = cwReq('patch', `inboxes/${inboxId}`, updatePayload);
+    if (cliConfig.forceUpdateCwWebhook)
+        get_inbox = (yield updateInboxPromise).data;
+    else
+        proms.push(updateInboxPromise);
     /**
      * Get the inbox and test it.
      */
     if (!((get_inbox === null || get_inbox === void 0 ? void 0 : get_inbox.webhook_url) || "").includes("/chatwoot"))
         console.log("Please set the chatwoot inbox webhook to this sessions URL with path /chatwoot");
+    /**
+     * Check the webhook URL
+     */
+    const chatwootWebhookCheck = () => __awaiter(void 0, void 0, void 0, function* () {
+        let checkCodePromise;
+        const cancelCheckProm = () => (checkCodePromise.cancel && typeof checkCodePromise.cancel === "function") && checkCodePromise.cancel();
+        try {
+            const wUrl = get_inbox.webhook_url.split('?')[0].replace(/\/+$/, "").trim();
+            const checkWhURL = `${wUrl}${wUrl.endsWith("/") ? '' : `/`}checkWebhook${cliConfig.key ? `?api_key=${cliConfig.key}` : ''}`;
+            __1.log.info(`Verifying webhook url: ${checkWhURL}`);
+            const checkCode = uuid_apikey_1.default.create().apiKey; //random generated string
+            yield new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+                var _a;
+                checkCodePromise = __1.ev.waitFor(exports.chatwoot_webhook_check_event_name, 5000).catch(reject);
+                yield axios_1.default.post(checkWhURL, {
+                    checkCode
+                }, { headers: { api_key: cliConfig.key || '' } }).catch(reject);
+                const checkCodeResponse = yield checkCodePromise;
+                if (checkCodeResponse && ((_a = checkCodeResponse[0]) === null || _a === void 0 ? void 0 : _a.checkCode) == checkCode)
+                    resolve(true);
+                else
+                    reject(`Webhook check code is incorrect. Expected ${checkCode} - incoming ${((checkCodeResponse || [])[0] || {}).checkCode}`);
+            }));
+            __1.log.info('Chatwoot webhook verification successful');
+        }
+        catch (error) {
+            cancelCheckProm();
+            const e = `Unable to verify the chatwoot webhook URL on this inbox: ${error.message}`;
+            console.error(e);
+            __1.log.error(e);
+        }
+        finally {
+            cancelCheckProm();
+        }
+    });
+    proms.push(chatwootWebhookCheck());
     /**
      * Get Contacts and conversations
      */
     const searchContact = (number) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const n = number.replace('@c.us', '');
-            const { data } = yield cwReq(`contacts/search?q=${n}&sort=phone_number`, 'get');
+            const { data } = yield cwReq('get', `contacts/search?q=${n}&sort=phone_number`);
             if (data.payload.length) {
                 return data.payload.find(x => (x.phone_number || "").includes(n)) || false;
             }
@@ -133,8 +249,8 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
     });
     const getContactConversation = (number) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            const { data } = yield cwReq(`contacts/${contactReg[number]}/conversations`, 'get');
-            const allContactConversations = data.payload.filter(c => c.inbox_id === resolvedInbox).sort((a, b) => a.id - b.id);
+            const { data } = yield cwReq('get', `contacts/${contactReg[number]}/conversations`);
+            const allContactConversations = data.payload.filter(c => c.inbox_id === inboxId).sort((a, b) => a.id - b.id);
             const [opened, notOpen] = [allContactConversations.filter(c => c.status === 'open'), allContactConversations.filter(c => c.status != 'open')];
             return opened[0] || notOpen[0];
         }
@@ -144,9 +260,9 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
     });
     const createConversation = (contact_id) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            const { data } = yield cwReq(`conversations`, 'post', {
+            const { data } = yield cwReq('post', `conversations`, {
                 contact_id,
-                "inbox_id": resolvedInbox
+                "inbox_id": inboxId
             });
             return data;
         }
@@ -156,7 +272,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
     });
     const createContact = (contact) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            const { data } = yield cwReq(`contacts`, 'post', {
+            const { data } = yield cwReq('post', `contacts`, {
                 "identifier": contact.id,
                 "name": contact.formattedName || contact.id,
                 "phone_number": `+${contact.id.replace('@c.us', '')}`,
@@ -170,7 +286,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
     });
     const sendConversationMessage = (content, contactId, message) => __awaiter(void 0, void 0, void 0, function* () {
         try {
-            const { data } = yield cwReq(`conversations/${convoReg[contactId]}/messages`, 'post', {
+            const { data } = yield cwReq('post', `conversations/${convoReg[contactId]}/messages`, {
                 content,
                 "message_type": 0,
                 "private": false
@@ -193,7 +309,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
         formData.append('content', content);
         formData.append('message_type', 'incoming');
         try {
-            const { data } = yield cwReq(`conversations/${convoReg[contactId]}/messages`, 'post', formData, formData.getHeaders());
+            const { data } = yield cwReq('post', `conversations/${convoReg[contactId]}/messages`, formData, formData.getHeaders());
             return data;
         }
         catch (error) {
@@ -204,7 +320,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
     /**
      * Update the chatwoot contact and conversation registries
      */
-    client.onMessage((message) => __awaiter(void 0, void 0, void 0, function* () {
+    const setOnMessageProm = client.onMessage((message) => __awaiter(void 0, void 0, void 0, function* () {
         if (message.from.includes('g')) {
             //chatwoot integration does not support group chats
             return;
@@ -266,5 +382,8 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
         else
             yield sendConversationMessage(text, message.from, message);
     }));
+    proms.push(setOnMessageProm);
+    yield Promise.all(proms);
+    return;
 });
 exports.setupChatwootOutgoingMessageHandler = setupChatwootOutgoingMessageHandler;

package/dist/cli/server.js

@@ -298,7 +298,13 @@ const setupTwilioCompatibleWebhook = (cliConfig, client) => {
 exports.setupTwilioCompatibleWebhook = setupTwilioCompatibleWebhook;
 const setupChatwoot = (cliConfig, client) => __awaiter(void 0, void 0, void 0, function* () {
     exports.app.post('/chatwoot', (0, chatwoot_1.chatwootMiddleware)(cliConfig, client));
-    yield (0, chatwoot_1.setupChatwootOutgoingMessageHandler)(cliConfig, client);
+    exports.app.post(`/chatwoot/checkWebhook`, (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        const { body } = req;
+        __1.log.info(`chatwoot webhook check request received: ${body.checkCode}`);
+        yield __1.ev.emitAsync(chatwoot_1.chatwoot_webhook_check_event_name, body);
+        return res.send({});
+    }));
+    // await setupChatwootOutgoingMessageHandler(cliConfig, client);
 });
 exports.setupChatwoot = setupChatwoot;
 const setupBotPressHandler = (cliConfig, client) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.44.11",
+  "version": "4.45.0",
   "licenseCheckUrl": "https://funcs.openwa.dev/license-check",
   "brokenMethodReportUrl": "https://funcs.openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -123,7 +123,7 @@
     "cross-spawn": "^7.0.3",
     "datauri": "^4.0.1",
     "death": "^1.1.0",
-    "eventemitter2": "^6.4.4",
+    "eventemitter2": "^6.4.7",
     "express": "^4.17.1",
     "express-ipfilter": "^1.3.1",
     "express-robots-txt": "^1.0.0",