@open-wa/wa-automate 4.28.4 → 4.28.8

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

@@ -115,6 +115,8 @@ function smartQr(waPage, config, spinner) {
             return true;
         let hash = 'START';
         const grabAndEmit = (qrData) => __awaiter(this, void 0, void 0, function* () {
+            if (!qrNum && browser_1.BROWSER_START_TS)
+                spinner.info(`First QR: ${Date.now() - browser_1.BROWSER_START_TS} ms`);
             if (qrData) {
                 if (!config.qrLogSkip)
                     qrcode.generate(qrData, { small: true });

package/dist/controllers/browser.d.ts

@@ -1,6 +1,7 @@
 import { Browser, Page } from 'puppeteer';
 import { Spin } from './events';
 import { ConfigObject } from '../api/model';
+export declare let BROWSER_START_TS: number;
 export declare function initPage(sessionId?: string, config?: ConfigObject, customUserAgent?: string, spinner?: Spin, _page?: Page, skipAuth?: boolean): Promise<Page>;
 export declare const deleteSessionData: (config: ConfigObject) => boolean;
 export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => string | boolean;

package/dist/controllers/browser.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.kill = exports.injectApi = exports.addScript = exports.getSessionDataFilePath = exports.deleteSessionData = exports.initPage = void 0;
+exports.kill = exports.injectApi = exports.addScript = exports.getSessionDataFilePath = exports.deleteSessionData = exports.initPage = exports.BROWSER_START_TS = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const death_1 = __importDefault(require("death"));
@@ -45,6 +45,7 @@ const tree_kill_1 = __importDefault(require("tree-kill"));
 const logging_1 = require("../logging/logging");
 const tools_1 = require("../utils/tools");
 let browser;
+exports.BROWSER_START_TS = 0;
 function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
@@ -58,7 +59,7 @@ function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth)
         let waPage = _page;
         if (!waPage) {
             spinner === null || spinner === void 0 ? void 0 : spinner.info('Launching Browser');
-            browser = yield initBrowser(sessionId, config);
+            browser = yield initBrowser(sessionId, config, spinner);
             waPage = yield getWAPage(browser);
         }
         spinner === null || spinner === void 0 ? void 0 : spinner.info('Setting Up Page');
@@ -281,7 +282,7 @@ function injectApi(page) {
     });
 }
 exports.injectApi = injectApi;
-function initBrowser(sessionId, config = {}) {
+function initBrowser(sessionId, config = {}, spinner) {
     var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         if (config === null || config === void 0 ? void 0 : config.raspi) {
@@ -327,13 +328,17 @@ function initBrowser(sessionId, config = {}) {
         if (config === null || config === void 0 ? void 0 : config.multiDevice) {
             args = args.filter(x => x != '--incognito');
             config["userDataDir"] = config["userDataDir"] || `${(config === null || config === void 0 ? void 0 : config.inDocker) ? '/sessions' : (config === null || config === void 0 ? void 0 : config.sessionDataPath) || '.'}/_IGNORE_${(config === null || config === void 0 ? void 0 : config.sessionId) || 'session'}`;
+            spinner === null || spinner === void 0 ? void 0 : spinner.info('MD Enabled, turning off incognito mode.');
+            spinner === null || spinner === void 0 ? void 0 : spinner.info(`Data dir: ${config["userDataDir"]}`);
         }
         if (config === null || config === void 0 ? void 0 : config.corsFix)
             args.push('--disable-web-security');
         if (config["userDataDir"] && !fs.existsSync(config["userDataDir"])) {
+            spinner === null || spinner === void 0 ? void 0 : spinner.info(`Data dir doesnt exist, creating...: ${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 }));
+        exports.BROWSER_START_TS = Date.now();
         //devtools
         if (config === null || config === void 0 ? void 0 : config.devtools) {
             const _dt = yield Promise.resolve().then(() => __importStar(require('puppeteer-extra-plugin-devtools')));
@@ -352,11 +357,10 @@ function initBrowser(sessionId, config = {}) {
                 // const tunnel = await devtools.createTunnel(browser);
                 const tunnel = config.devtools == 'local' ? devtools.getLocalDevToolsUrl(browser) : (yield devtools.createTunnel(browser)).url;
                 const l = `\ndevtools URL: ${typeof config.devtools == 'object' ? Object.assign(Object.assign({}, config.devtools), { tunnel }) : tunnel}`;
-                console.log(l);
-                logging_1.log.info(l);
+                spinner.info(l);
             }
             catch (error) {
-                console.error("initBrowser -> error", error);
+                spinner.fail(error);
                 logging_1.log.error("initBrowser -> error", error);
             }
         }

package/dist/controllers/initializer.js

@@ -171,7 +171,7 @@ function create(config = {}) {
                 config.multiDevice = true;
             }
             if ((config === null || config === void 0 ? void 0 : config.multiDevice) && (config === null || config === void 0 ? void 0 : config.chromiumArgs))
-                spinner.info(`Using custom chromium args with multi device will cause issues! Please remove themm`);
+                spinner.info(`Using custom chromium args with multi device will cause issues! Please remove them: ${config === null || config === void 0 ? void 0 : config.chromiumArgs}`);
             if ((config === null || config === void 0 ? void 0 : config.multiDevice) && !(config === null || config === void 0 ? void 0 : config.useChrome))
                 spinner.info(`It is recommended to set useChrome: true or use the --use-chrome flag if you are experiencing issues with Multi device support`);
             waPage = yield (0, browser_1.initPage)(sessionId, config, customUserAgent, spinner);

package/package.json

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