@open-wa/wa-automate 4.28.3 → 4.28.7

package/dist/api/Client.d.ts

@@ -799,6 +799,12 @@ export declare class Client {
      * @returns Boolean
      */
     isConnected(): Promise<boolean>;
+    /**
+     * Logs out from the session.
+     *
+     * Please be careful when using this as it can exit the whole process depending on your config
+     */
+    logout(): Promise<boolean>;
     /**
      * Retrieves Battery Level
      * @returns Number

package/dist/api/Client.js

@@ -427,9 +427,9 @@ class Client {
         return rest;
     }
     pup(pageFunction, ...args) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            const { safeMode, callTimeout, idChecking, logFile, logging } = this._createConfig;
+            const { safeMode, callTimeout, idCorrection, logging } = this._createConfig;
             let _t;
             if (safeMode) {
                 if (!this._page || this._page.isClosed())
@@ -438,19 +438,34 @@ class Client {
                 if (state !== model_1.STATE.CONNECTED)
                     throw new errors_1.CustomError(errors_1.ERROR_NAME.STATE_ERROR, `state: ${state}`);
             }
-            if (idChecking && args[0]) {
-                Object.entries(args[0]).map(([k, v]) => {
-                    if (["to", "chatId", "groupChatId", "groupId", "contactId"].includes(k) && typeof v == "string" && v) {
-                        args[0][k] = (v === null || v === void 0 ? void 0 : v.includes('-')) ?
-                            //it is a group chat, make sure it has a @g.us at the end
-                            `${v === null || v === void 0 ? void 0 : v.replace(/@(c|g).us/g, '')}@g.us` :
-                            //it is a normal chat, make sure it has a @c.us at the end
-                            `${v === null || v === void 0 ? void 0 : v.replace(/@(c|g).us/g, '')}@c.us`;
-                    }
-                });
+            if (idCorrection && args[0]) {
+                const fixId = (id) => {
+                    var _a;
+                    let isGroup = false;
+                    let scrubbedId = (_a = id === null || id === void 0 ? void 0 : id.match(/\d|-/g)) === null || _a === void 0 ? void 0 : _a.join('');
+                    scrubbedId = scrubbedId.match(/-/g) && scrubbedId.match(/-/g).length == 1 && scrubbedId.split('-')[1].length === 10 ? scrubbedId : scrubbedId.replace(/-/g, '');
+                    if (scrubbedId.includes('-') || scrubbedId.length === 18)
+                        isGroup = true;
+                    const fixed = isGroup ?
+                        `${scrubbedId === null || scrubbedId === void 0 ? void 0 : scrubbedId.replace(/@(c|g).us/g, '')}@g.us` :
+                        `${scrubbedId === null || scrubbedId === void 0 ? void 0 : scrubbedId.replace(/@(c|g).us/g, '')}@c.us`;
+                    logging_1.log.info('Fixed ID', { id, fixed });
+                    return fixed;
+                };
+                if (typeof args[0] === 'string' && args[0] && !(args[0].includes("@g.us") || args[0].includes("@c.us")) && ((_c = (_b = (((_a = pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString()) === null || _a === void 0 ? void 0 : _a.match(/[^(]*\(([^)]*)\)/)[1]) || "")) === null || _b === void 0 ? void 0 : _b.replace(/\s/g, '')) === null || _c === void 0 ? void 0 : _c.split(','))) {
+                    const p = ((pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString().match(/[^(]*\(([^)]*)\)/)[1]) || "").replace(/\s/g, '').split(',');
+                    if (["to", "chatId", "groupChatId", "groupId", "contactId"].includes(p[0]))
+                        args[0] = fixId(args[0]);
+                }
+                else if (typeof args[0] === 'object')
+                    Object.entries(args[0]).map(([k, v]) => {
+                        if (["to", "chatId", "groupChatId", "groupId", "contactId"].includes(k) && typeof v == "string" && v && !(v.includes("@g.us") || v.includes("@c.us"))) {
+                            args[0][k] = fixId(v);
+                        }
+                    });
             }
             if (logging) {
-                const wapis = (_b = (((_a = pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString()) === null || _a === void 0 ? void 0 : _a.match(/WAPI\.(\w*)\(/g)) || [])) === null || _b === void 0 ? void 0 : _b.map(s => s.replace(/WAPI|\.|\(/g, ''));
+                const wapis = (_e = (((_d = pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString()) === null || _d === void 0 ? void 0 : _d.match(/WAPI\.(\w*)\(/g)) || [])) === null || _e === void 0 ? void 0 : _e.map(s => s.replace(/WAPI|\.|\(/g, ''));
                 _t = Date.now();
                 logging_1.log.info(`Request ${_t}`, Object.assign({ _method: (wapis === null || wapis === void 0 ? void 0 : wapis.length) === 1 ? wapis[0] : wapis }, args[0]));
             }
@@ -1810,6 +1825,16 @@ class Client {
             return yield this.pup(() => WAPI.isConnected());
         });
     }
+    /**
+     * Logs out from the session.
+     *
+     * Please be careful when using this as it can exit the whole process depending on your config
+     */
+    logout() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.pup(() => WAPI.logout());
+        });
+    }
     /**
      * Retrieves Battery Level
      * @returns Number

package/dist/cli/integrations/chatwoot.js

@@ -84,7 +84,7 @@ const setupChatwootOutgoingMessageHandler = (cliConfig, client) => __awaiter(voi
     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\/\d*/g)[0].split('/').filter(Number);
+    const [accountId, inboxId] = u.match(/\/(app|(api\/v1))\/accounts\/\d*\/(inbox|inboxes)\/\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, _headers) => {

package/dist/controllers/auth.js

@@ -40,7 +40,6 @@ const tools_1 = require("../utils/tools");
 const browser_1 = require("./browser");
 const axios_1 = __importDefault(require("axios"));
 const logging_1 = require("../logging/logging");
-const timeout = ms => new Promise(resolve => setTimeout(resolve, ms, 'timeout'));
 /**
  * Validates if client is authenticated
  * @returns true if is authenticated, false otherwise
@@ -132,7 +131,6 @@ function smartQr(waPage, config, spinner) {
                     (0, tools_1.processSend)('ready');
                     if (config.qrMax && qrNum >= config.qrMax) {
                         spinner.info('QR Code limit reached, exiting...');
-                        yield timeout(3000);
                         yield (0, browser_1.kill)(waPage, null, true, null, "QR_LIMIT_REACHED");
                     }
                     if (config.ezqr || config.inDocker) {
@@ -169,7 +167,7 @@ function smartQr(waPage, config, spinner) {
         const _hasDefaultStateYet = yield waPage.evaluate("!!(window.Store &&  window.Store.State && window.Store.State.Socket)");
         if (!_hasDefaultStateYet) {
             //expecting issue, take a screenshot then wait a few seconds before continuing
-            yield timeout(2000);
+            yield (0, tools_1.timeout)(2000);
         }
         return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
             const funcName = '_smartQr';

package/dist/controllers/browser.js

@@ -380,9 +380,9 @@ function getWAPage(browser) {
  */
 const kill = (p, b, exit, pid, reason = "LAUNCH_KILL") => __awaiter(void 0, void 0, void 0, function* () {
     (0, tools_1.processSendData)({
-        type: "close",
         reason
     });
+    (0, tools_1.timeout)(3000);
     const killBrowser = (browser) => __awaiter(void 0, void 0, void 0, function* () {
         if (!browser)
             return;

package/dist/utils/tools.d.ts

@@ -1,5 +1,6 @@
 import { DataURL } from '../api/model';
 import { AxiosRequestConfig } from 'axios';
+export declare const timeout: (ms: any) => Promise<unknown>;
 /**
  *  Use this to generate a more likely valid user agent. It makes sure it has the WA part and replaces any windows or linux os info with mac.
  * @param useragent Your custom user agent
@@ -25,4 +26,4 @@ export declare const getDUrl: (url: string, optionsOverride?: AxiosRequestConfig
  */
 export declare const base64MimeType: (dUrl: DataURL) => string;
 export declare const processSend: (message: string) => void;
-export declare const processSendData: (data?: any) => boolean;
+export declare const processSendData: (data?: any) => void;

package/dist/utils/tools.js

@@ -23,8 +23,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processSendData = exports.processSend = exports.base64MimeType = exports.getDUrl = exports.isDataURL = exports.isBase64 = exports.camelize = exports.without = exports.getConfigFromProcessEnv = exports.smartUserAgent = void 0;
+exports.processSendData = exports.processSend = exports.base64MimeType = exports.getDUrl = exports.isDataURL = exports.isBase64 = exports.camelize = exports.without = exports.getConfigFromProcessEnv = exports.smartUserAgent = exports.timeout = void 0;
 const axios_1 = __importDefault(require("axios"));
+//@ts-ignore
+process.send = process.send || function () { };
+const timeout = ms => new Promise(resolve => setTimeout(resolve, ms, 'timeout'));
+exports.timeout = timeout;
 /**
  *  Use this to generate a more likely valid user agent. It makes sure it has the WA part and replaces any windows or linux os info with mac.
  * @param useragent Your custom user agent
@@ -134,9 +138,10 @@ const processSend = (message) => {
 };
 exports.processSend = processSend;
 const processSendData = (data = {}) => {
-    return process.send({
+    process.send({
         type: 'process:msg',
         data
     });
+    return;
 };
 exports.processSendData = processSendData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.28.3",
+  "version": "4.28.7",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",