@open-wa/wa-automate 4.41.0 → 4.42.1

package/dist/api/Client.d.ts

@@ -458,7 +458,7 @@ export declare class Client {
      *
      * [[Detecting Logouts]]
      */
-    forceRefocus(): Promise<void>;
+    forceRefocus(): Promise<boolean>;
     /**
      * Check if the "Phone not Cconnected" message is showing in the browser. If it is showing, then this will return `true`.
      *
@@ -469,6 +469,10 @@ export declare class Client {
      * Runs a health check to help you determine if/when is an appropiate time to restart/refresh the session.
      */
     healthCheck(): Promise<HealthCheck>;
+    /**
+     * Get the stats of the current process and the corresponding browser process.
+     */
+    getProcessStats(): Promise<any>;
     /**
      * A list of participants in the chat who have their live location on. If the chat does not exist, or the chat does not have any contacts actively sharing their live locations, it will return false. If it's a chat with a single contact, there will be only 1 value in the array if the contact has their livelocation on.
      * Please note. This should only be called once every 30 or so seconds. This forces the phone to grab the latest live location data for the number. This can be used in conjunction with onLiveLocation (this will trigger onLiveLocation).
@@ -566,8 +570,10 @@ export declare class Client {
      * @param to chat id: `xxxxx@c.us`
      * @param content text message
      * @param replyMessageId id of message to reply to
+     * @param hideTags Removes all tags within the message
+     * @param mentions You can optionally add an array of contact IDs to tag only specific people
      */
-    sendReplyWithMentions(to: ChatId, content: Content, replyMessageId: MessageId): Promise<boolean | MessageId>;
+    sendReplyWithMentions(to: ChatId, content: Content, replyMessageId: MessageId, hideTags?: boolean, mentions?: ContactId[]): Promise<boolean | MessageId>;
     /**
      * [REQUIRES AN INSIDERS LICENSE-KEY](https://gum.co/open-wa?tier=Insiders%20Program)
      *

package/dist/api/Client.js

@@ -68,6 +68,7 @@ const init_patch_1 = require("../controllers/init_patch");
 const preProcessors_1 = require("../structures/preProcessors");
 const tools_1 = require("../utils/tools");
 const logging_1 = require("../logging/logging");
+const pid_utils_1 = require("../utils/pid_utils");
 /** @ignore */
 const pkg = (0, fs_extra_1.readJsonSync)(path.join(__dirname, '../../package.json'));
 var namespace;
@@ -191,9 +192,11 @@ class Client {
                 const rb = (req === null || req === void 0 ? void 0 : req.body) || {};
                 let { args } = rb;
                 const m = (rb === null || rb === void 0 ? void 0 : rb.method) || this._createConfig.sessionId && this._createConfig.sessionId !== 'session' && req.path.includes(this._createConfig.sessionId) ? req.path.replace(`/${this._createConfig.sessionId}/`, '') : req.path.replace('/', '');
+                logging_1.log.info(`MDLWR - ${m} : ${JSON.stringify(rb || {})}`);
                 let methodRequiresArgs = false;
                 if (args && !Array.isArray(args)) {
                     const methodArgs = (0, parse_function_1.default)().parse(this[m]).args;
+                    logging_1.log.info(`methodArgs: ${methodArgs}`);
                     if ((methodArgs === null || methodArgs === void 0 ? void 0 : methodArgs.length) > 0)
                         methodRequiresArgs = true;
                     args = methodArgs.map(argName => args[argName]);
@@ -1223,7 +1226,8 @@ class Client {
         return __awaiter(this, void 0, void 0, function* () {
             const useHere = yield this._page.evaluate(() => WAPI.getUseHereString());
             yield this._page.waitForFunction(`[...document.querySelectorAll("div[role=button")].find(e=>{return e.innerHTML.toLowerCase().includes("${useHere.toLowerCase()}")})`, { timeout: 0 });
-            return yield this._page.evaluate(`[...document.querySelectorAll("div[role=button")].find(e=>{return e.innerHTML.toLowerCase().includes("${useHere.toLowerCase()}")}).click()`);
+            yield this._page.evaluate(`[...document.querySelectorAll("div[role=button")].find(e=>{return e.innerHTML.toLowerCase().includes("${useHere.toLowerCase()}")}).click()`);
+            return true;
         });
     }
     /**
@@ -1234,6 +1238,7 @@ class Client {
     isPhoneDisconnected() {
         return __awaiter(this, void 0, void 0, function* () {
             const phoneNotConnected = yield this._page.evaluate(() => WAPI.getLocaledString('active Internet connection'));
+            //@ts-ignore
             return yield this.pup(`!![...document.querySelectorAll("div")].find(e=>{return e.innerHTML.toLowerCase().includes("${phoneNotConnected.toLowerCase()}")})`);
         });
     }
@@ -1245,6 +1250,14 @@ class Client {
             return yield this._page.evaluate(() => WAPI.healthCheck());
         });
     }
+    /**
+     * Get the stats of the current process and the corresponding browser process.
+     */
+    getProcessStats() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield (0, pid_utils_1.pidTreeUsage)([process.pid, this._page.browser().process().pid]);
+        });
+    }
     /**
      * A list of participants in the chat who have their live location on. If the chat does not exist, or the chat does not have any contacts actively sharing their live locations, it will return false. If it's a chat with a single contact, there will be only 1 value in the array if the contact has their livelocation on.
      * Please note. This should only be called once every 30 or so seconds. This forces the phone to grab the latest live location data for the number. This can be used in conjunction with onLiveLocation (this will trigger onLiveLocation).
@@ -1441,15 +1454,17 @@ class Client {
      * @param to chat id: `xxxxx@c.us`
      * @param content text message
      * @param replyMessageId id of message to reply to
+     * @param hideTags Removes all tags within the message
+     * @param mentions You can optionally add an array of contact IDs to tag only specific people
      */
-    sendReplyWithMentions(to, content, replyMessageId) {
+    sendReplyWithMentions(to, content, replyMessageId, hideTags, mentions) {
         return __awaiter(this, void 0, void 0, function* () {
             //remove all @c.us from the content
             content = content.replace(/@c.us/, "");
-            return yield this.pup(({ to, content, replyMessageId }) => {
+            return yield this.pup(({ to, content, replyMessageId, hideTags, mentions }) => {
                 WAPI.sendSeen(to);
-                return WAPI.sendReplyWithMentions(to, content, replyMessageId);
-            }, { to, content, replyMessageId });
+                return WAPI.sendReplyWithMentions(to, content, replyMessageId, hideTags, mentions);
+            }, { to, content, replyMessageId, hideTags, mentions });
         });
     }
     /**

package/dist/controllers/browser.js

@@ -67,7 +67,8 @@ function initPage(sessionId, config, qrManager, customUserAgent, spinner, _page,
             spinner === null || spinner === void 0 ? void 0 : spinner.info(`Browser launched: ${((0, tools_1.now)() - startBrowser).toFixed(0)}ms`);
             waPage = yield getWAPage(browser);
         }
-        yield waPage._client().send('Network.setBypassServiceWorker', { bypass: true });
+        //@ts-ignore
+        yield (typeof waPage._client === 'function' && waPage._client() || waPage._client).send('Network.setBypassServiceWorker', { bypass: true });
         const postBrowserLaunchTs = (0, tools_1.now)();
         waPage.on("framenavigated", (frame) => __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/utils/pid_utils.d.ts

@@ -0,0 +1 @@
+export declare const pidTreeUsage: (pid: any) => Promise<any>;

package/dist/utils/pid_utils.js

@@ -0,0 +1,26 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pidTreeUsage = void 0;
+const pidtree_1 = __importDefault(require("pidtree"));
+const pidusage_1 = __importDefault(require("pidusage"));
+const pidTreeUsage = (pid) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!Array.isArray(pid)) {
+        pid = [pid];
+    }
+    const pids = (yield Promise.all(pid.map(pidtree_1.default))).flat();
+    const stats = yield (0, pidusage_1.default)(pids);
+    return stats;
+});
+exports.pidTreeUsage = pidTreeUsage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.41.0",
+  "version": "4.42.1",
   "licenseCheckUrl": "https://funcs.openwa.dev/license-check",
   "brokenMethodReportUrl": "https://funcs.openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -89,7 +89,6 @@
     "husky": "^7.0.0",
     "line-reader": "^0.4.0",
     "marked": "^4.0.10",
-    "ts-json-schema-generator": "^v1.1.0-next.5",
     "node-emoji": "^1.10.0",
     "onchange": "^7.0.2",
     "precise-commits": "^1.0.2",
@@ -97,6 +96,7 @@
     "release-it": "^14.0.3",
     "shelljs": "^0.8.3",
     "tiny-glob": "^0.2.9",
+    "ts-json-schema-generator": "^v1.1.0-next.5",
     "ts-node": "^10.0.0",
     "tsc-watch": "^4.0.0",
     "typeconv": "^1.7.0",
@@ -144,12 +144,14 @@
     "parse-url": "^5.0.2",
     "patch-package": "^6.2.2",
     "pico-s3": "^1.0.1",
+    "pidtree": "^0.6.0",
+    "pidusage": "^3.0.0",
     "postman-2-swagger": "^0.5.0",
-    "puppeteer": "^14.4.1",
+    "puppeteer": "15.0.0",
     "puppeteer-extra": "^3.2.3",
-    "puppeteer-extra-plugin-block-resources": "^2.3.0",
-    "puppeteer-extra-plugin-devtools": "^2.3.3",
-    "puppeteer-extra-plugin-stealth": "^2.9.0",
+    "puppeteer-extra-plugin-block-resources": "^2.4.0",
+    "puppeteer-extra-plugin-devtools": "^2.4.0",
+    "puppeteer-extra-plugin-stealth": "^2.10.1",
     "puppeteer-page-proxy": "^1.2.8",
     "qrcode-terminal": "^0.12.0",
     "qs": "^6.10.1",