@open-wa/wa-automate 4.28.0 → 4.28.4

package/dist/api/Client.d.ts

@@ -397,7 +397,7 @@ export declare class Client {
      * Shuts down the page and browser
      * @returns true
      */
-    kill(): Promise<boolean>;
+    kill(reason?: string): Promise<boolean>;
     /**
      * This is a convinient method to click the `Use Here` button in the WA web session.
      *

package/dist/api/Client.js

@@ -267,7 +267,7 @@ class Client {
                     if ((_b = this._createConfig) === null || _b === void 0 ? void 0 : _b.killClientOnLogout) {
                         console.log("Session logged out. Killing client");
                         logging_1.log.warn("Session logged out. Killing client");
-                        this.kill();
+                        this.kill("LOGGED_OUT");
                     }
                 });
             }
@@ -290,7 +290,7 @@ class Client {
             if (!this._refreshing) {
                 console.log("Browser page has closed. Killing client");
                 logging_1.log.warn("Browser page has closed. Killing client");
-                this.kill();
+                this.kill("PAGE_CLOSED");
                 if ((_a = this._createConfig) === null || _a === void 0 ? void 0 : _a.killProcessOnBrowserClose)
                     process.exit();
             }
@@ -1038,7 +1038,7 @@ class Client {
      * Shuts down the page and browser
      * @returns true
      */
-    kill() {
+    kill(reason = "MANUALLY_KILLED") {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             if (this._currentlyBeingKilled)
@@ -1046,6 +1046,9 @@ class Client {
             this._currentlyBeingKilled = true;
             console.log('Killing client. Shutting Down');
             logging_1.log.info('Killing client. Shutting Down');
+            (0, tools_1.processSendData)({
+                reason
+            });
             const browser = yield ((_a = this === null || this === void 0 ? void 0 : this._page) === null || _a === void 0 ? void 0 : _a.browser());
             const pid = (browser === null || browser === void 0 ? void 0 : browser.process()) ? (_b = browser === null || browser === void 0 ? void 0 : browser.process()) === null || _b === void 0 ? void 0 : _b.pid : null;
             try {

package/dist/cli/setup.js

@@ -273,7 +273,7 @@ const optionList = [{
     }
 ];
 exports.optionKeys = optionList.map(({ name }) => (0, tools_1.camelize)(name));
-exports.optionKeysWithDefalts = optionList.filter(o => o.hasOwnProperty('default')).map(({ name }) => (0, tools_1.camelize)(name));
+exports.optionKeysWithDefalts = [...optionList.filter(o => o.hasOwnProperty('default')).map(({ name }) => (0, tools_1.camelize)(name)), 'popup'];
 exports.PrimitiveConverter = {
     Number: 1,
     Boolean: true,

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
@@ -131,8 +130,8 @@ function smartQr(waPage, config, spinner) {
                     qrNum++;
                     (0, tools_1.processSend)('ready');
                     if (config.qrMax && qrNum >= config.qrMax) {
-                        spinner.info('QR Code limit reached, exiting');
-                        yield (0, browser_1.kill)(waPage, null, true);
+                        spinner.info('QR Code limit reached, exiting...');
+                        yield (0, browser_1.kill)(waPage, null, true, null, "QR_LIMIT_REACHED");
                     }
                     if (config.ezqr || config.inDocker) {
                         const host = 'https://qr.openwa.cloud/';
@@ -168,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.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, pid?: number) => Promise<void>;
+export declare const kill: (p: Page, b?: Browser, exit?: boolean, pid?: number, reason?: string) => Promise<void>;

package/dist/controllers/browser.js

@@ -43,6 +43,7 @@ const pico_s3_1 = require("pico-s3");
 const puppeteer = require('puppeteer-extra');
 const tree_kill_1 = __importDefault(require("tree-kill"));
 const logging_1 = require("../logging/logging");
+const tools_1 = require("../utils/tools");
 let browser;
 function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth) {
     var _a, _b, _c, _d, _e;
@@ -377,7 +378,11 @@ function getWAPage(browser) {
 /**
  * @internal
  */
-const kill = (p, b, exit, pid) => __awaiter(void 0, void 0, void 0, function* () {
+const kill = (p, b, exit, pid, reason = "LAUNCH_KILL") => __awaiter(void 0, void 0, void 0, function* () {
+    (0, tools_1.processSendData)({
+        reason
+    });
+    (0, tools_1.timeout)(3000);
     const killBrowser = (browser) => __awaiter(void 0, void 0, void 0, function* () {
         if (!browser)
             return;

package/dist/controllers/initializer.js

@@ -367,12 +367,12 @@ function create(config = {}) {
                 waPage.on('console', msg => {
                     if (config === null || config === void 0 ? void 0 : config.logConsole)
                         console.log(msg);
-                    logging_1.log.info('Page Console:', { msg });
+                    logging_1.log.info('Page Console:', msg.text());
                 });
                 waPage.on('error', error => {
                     if (config === null || config === void 0 ? void 0 : config.logConsoleErrors)
                         console.error(error);
-                    logging_1.log.error('Page Console:', { error });
+                    logging_1.log.error('Page Console Error:', error.text());
                 });
                 if (config === null || config === void 0 ? void 0 : config.restartOnCrash)
                     waPage.on('error', (error) => __awaiter(this, void 0, void 0, function* () {

package/dist/logging/logging.js

@@ -69,12 +69,22 @@ function truncate(str, n) {
     return str.length > n ? str.substr(0, n - 1) + '...[TRUNCATED]...' : str;
 }
 const formatRedact = winston.format(redact);
+const stringSaver = winston.format((info) => {
+    const copy = (0, full_1.klona)(info);
+    const splat = copy[Symbol.for("splat")];
+    if (splat) {
+        copy.message = `${copy.message} ${splat.filter((x) => typeof x !== 'object').join(' ')}`;
+        copy[Symbol.for("splat")] = splat.filter((x) => typeof x == 'object');
+        return copy;
+    }
+    return info;
+});
 /**
  * To prevent "Attempt to write logs with no transports" error
  */
 const placeholderTransport = new custom_transport_1.NoOpTransport();
 const makeLogger = () => winston.createLogger({
-    format: combine(timestamp(), winston.format.json(), formatRedact(), winston.format.splat(), winston.format.simple()),
+    format: combine(stringSaver(), timestamp(), winston.format.json(), formatRedact(), winston.format.splat(), winston.format.simple()),
     levels: winston.config.syslog.levels,
     transports: [placeholderTransport]
 });

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,3 +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) => 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.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
@@ -133,3 +137,11 @@ const processSend = (message) => {
     return;
 };
 exports.processSend = processSend;
+const processSendData = (data = {}) => {
+    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.0",
+  "version": "4.28.4",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",