@open-wa/wa-automate 4.27.1 → 4.27.5

package/dist/cli/index.js

@@ -113,12 +113,6 @@ function start() {
                     process.exit();
                 }
             }));
-            if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.chatwootUrl) {
-                spinner.info('Setting Up Chatwoot handler');
-                spinner.info('Make sure to set up the Chatwoot inbox webhook to the following path on this process: /chatwoot');
-                yield server_1.setupChatwoot(cliConfig, client);
-                spinner.succeed('Chatwoot handler set up successfully');
-            }
             if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.botPressUrl) {
                 spinner.info('Setting Up Botpress handler');
                 server_1.setupBotPressHandler(cliConfig, client);
@@ -150,6 +144,12 @@ function start() {
                     console.log(`Please use the following api key for requests as a header:\napi_key: ${cliConfig.key}`);
                     server_1.setupAuthenticationLayer(cliConfig);
                 }
+                if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.chatwootUrl) {
+                    spinner.info('Setting Up Chatwoot handler');
+                    spinner.info(`Make sure to set up the Chatwoot inbox webhook to the following path on this process: /chatwoot${cliConfig.key ? `?api_key=YOUR-API-KEY` : ''}`);
+                    yield server_1.setupChatwoot(cliConfig, client);
+                    spinner.succeed('Chatwoot handler set up successfully');
+                }
                 server_1.setupRefocusDisengageMiddleware(cliConfig);
                 if (cliConfig && cliConfig.generateApiDocs && collections_1.collections["swagger"]) {
                     spinner.info('Setting Up API Explorer');

package/dist/cli/integrations/chatwoot.js

@@ -14,11 +14,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupChatwootOutgoingMessageHandler = exports.chatwootMiddleware = void 0;
 const axios_1 = __importDefault(require("axios"));
+const form_data_1 = __importDefault(require("form-data"));
+const mime_types_1 = __importDefault(require("mime-types"));
 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* () {
             const promises = [];
             const { body } = req;
+            if (!body)
+                return;
+            if (!body.conversation)
+                return;
             const m = body.conversation.messages[0];
             const contact = (body.conversation.meta.sender.phone_number || "").replace('+', '');
             if (body.message_type === "incoming" ||
@@ -81,16 +87,14 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
     const [accountId, inboxId] = u.match(/\/(app|(api\/v1))\/accounts\/\d*\/inbox\/\d*/g)[0].split('/').filter(Number);
     // 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) => {
+    const cwReq = (path, method, data, _headers) => {
         const url = `${origin}/api/v1/accounts/${accountId}/${path}`.replace('app.bentonow.com', 'chat.bentonow.com');
-        console.log(url, method, data);
+        // console.log(url,method,data)
         return axios_1.default({
             method,
             data,
             url,
-            headers: {
-                api_access_token
-            }
+            headers: Object.assign({ api_access_token }, _headers)
         });
     };
     const contactReg = {
@@ -128,7 +132,7 @@ 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');
-            return data.payload[0];
+            return data.payload.sort((a, b) => a.id - b.id)[0];
         }
         catch (error) {
             return;
@@ -140,7 +144,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
                 contact_id,
                 "inbox_id": resolvedInbox
             });
-            return data.payload;
+            return data;
         }
         catch (error) {
             return;
@@ -173,6 +177,25 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
             return;
         }
     });
+    const sendAttachmentMessage = (content, contactId, message) => __awaiter(void 0, void 0, void 0, function* () {
+        // decrypt message
+        const file = yield client.decryptMedia(message);
+        let formData = new form_data_1.default();
+        formData.append('attachments[]', Buffer.from(file.split(',')[1], 'base64'), {
+            knownLength: 1,
+            filename: `${message.t}.${mime_types_1.default.extension(message.mimetype)}`,
+            contentType: (file.match(/[^:\s*]\w+\/[\w-+\d.]+(?=[;| ])/) || ["application/octet-stream"])[0]
+        });
+        formData.append('content', content);
+        formData.append('message_type', 'incoming');
+        try {
+            const { data } = yield cwReq(`conversations/${convoReg[contactId]}/messages`, 'post', formData, formData.getHeaders());
+            return data;
+        }
+        catch (error) {
+            return;
+        }
+    });
     // const inboxId = s.match(/conversations\/\d*/g) && s.match(/conversations\/\d*/g)[0].replace('conversations/','')
     /**
      * Update the chatwoot contact and conversation registries
@@ -209,6 +232,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
          * Does the conversation exist in
          */
         let text = message.body;
+        let hasAttachments = false;
         switch (message.type) {
             case 'location':
                 text = `${message.lat},${message.lng}`;
@@ -221,14 +245,22 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
             case 'audio':
             case 'ptt':
             case 'video':
-                if (message.cloudUrl)
+                if (message.cloudUrl) {
                     text = `FILE:\t${message.cloudUrl}\n\nMESSAGE:\t${message.text}`;
+                }
+                else {
+                    text = message.text;
+                    hasAttachments = true;
+                }
                 break;
             default:
                 text = message.body || "__UNHANDLED__";
                 break;
         }
-        yield sendConversationMessage(text, message.from, message);
+        if (hasAttachments)
+            yield sendAttachmentMessage(text, message.from, message);
+        else
+            yield sendConversationMessage(text, message.from, message);
     }));
 });
 exports.setupChatwootOutgoingMessageHandler = setupChatwootOutgoingMessageHandler;

package/dist/cli/server.js

@@ -71,7 +71,10 @@ const setupAuthenticationLayer = (cliConfig) => {
             return next();
         }
         const apiKey = req.get('key') || req.get('api_key');
-        if (!apiKey || apiKey !== cliConfig.key) {
+        if (req.path.includes('chatwoot') && req.query['api_key'] && req.query['api_key'] == cliConfig.key) {
+            next();
+        }
+        else if (!apiKey || apiKey !== cliConfig.key) {
             res.status(401).json({ error: 'unauthorised' });
         }
         else {

package/dist/controllers/browser.d.ts

@@ -9,4 +9,4 @@ export declare function injectApi(page: Page): Promise<Page>;
 /**
  * @internal
  */
-export declare const kill: (p: Page, b?: Browser, exit?: boolean) => Promise<void>;
+export declare const kill: (p: Page, b?: Browser, exit?: boolean, pid?: number) => Promise<void>;

package/dist/controllers/browser.js

@@ -290,6 +290,8 @@ function initBrowser(sessionId, config = {}) {
             if (!_savedPath) {
                 const chromeLauncher = yield Promise.resolve().then(() => __importStar(require('chrome-launcher')));
                 config.executablePath = chromeLauncher.Launcher.getInstallations()[0];
+                if (!config.executablePath)
+                    delete config.executablePath;
                 yield storage.setItem('executablePath', config.executablePath);
             }
             else
@@ -324,6 +326,9 @@ function initBrowser(sessionId, config = {}) {
         }
         if (config === null || config === void 0 ? void 0 : config.corsFix)
             args.push('--disable-web-security');
+        if (config["userDataDir"] && !fs.existsSync(config["userDataDir"])) {
+            fs.mkdirSync(config["userDataDir"], { recursive: true });
+        }
         const browser = (config === null || config === void 0 ? void 0 : config.browserWSEndpoint) ? yield puppeteer.connect(Object.assign({}, config)) : yield puppeteer.launch(Object.assign(Object.assign({ headless: true, args }, config), { devtools: false }));
         //devtools
         if (config === null || config === void 0 ? void 0 : config.devtools) {
@@ -366,27 +371,27 @@ death_1.default(() => __awaiter(void 0, void 0, void 0, function* () {
 /**
  * @internal
  */
-const kill = (p, b, exit) => __awaiter(void 0, void 0, void 0, function* () {
+const kill = (p, b, exit, pid) => __awaiter(void 0, void 0, void 0, function* () {
     const killBrowser = (browser) => __awaiter(void 0, void 0, void 0, function* () {
         if (!browser)
             return;
-        const pid = (browser === null || browser === void 0 ? void 0 : browser.process()) ? browser === null || browser === void 0 ? void 0 : browser.process().pid : null;
+        pid = (browser === null || browser === void 0 ? void 0 : browser.process()) ? browser === null || browser === void 0 ? void 0 : browser.process().pid : null;
         if (!pid)
             return;
         if (!(p === null || p === void 0 ? void 0 : p.isClosed()))
             yield (p === null || p === void 0 ? void 0 : p.close());
         if (browser)
             yield (browser === null || browser === void 0 ? void 0 : browser.close().catch(() => { }));
-        if (pid)
-            tree_kill_1.default(pid, 'SIGKILL');
     });
     if (p) {
-        const browser = p === null || p === void 0 ? void 0 : p.browser();
+        const browser = (p === null || p === void 0 ? void 0 : p.browser) && typeof (p === null || p === void 0 ? void 0 : p.browser) === 'function' && (p === null || p === void 0 ? void 0 : p.browser());
         yield killBrowser(browser);
     }
     else if (b) {
         yield killBrowser(b);
     }
+    if (pid)
+        tree_kill_1.default(pid, 'SIGKILL');
     if (exit)
         process.exit();
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.27.1",
+  "version": "4.27.5",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -67,6 +67,7 @@
     "@types/cross-spawn": "^6.0.2",
     "@types/death": "^1.1.1",
     "@types/express": "^4.17.11",
+    "@types/form-data": "^2.5.0",
     "@types/fs-extra": "^9.0.11",
     "@types/line-reader": "0.0.34",
     "@types/localtunnel": "^2.0.1",
@@ -119,6 +120,7 @@
     "express": "^4.17.1",
     "express-robots-txt": "^1.0.0",
     "find-up": "^5.0.0",
+    "form-data": "^4.0.0",
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
     "hasha": "^5.2.0",