@open-wa/wa-automate 4.30.4 → 4.30.8

package/dist/api/Client.js

@@ -3393,7 +3393,7 @@ class Client {
                                         const t = ((0, tools_1.now)() - whStart).toFixed(0);
                                         logging_1.log.info("Client Webhook", event, status, t);
                                     })
-                                        .catch(err => console.error(`WEBHOOK ERROR: `, url, err.message));
+                                        .catch(err => logging_1.log.error(`WEBHOOK ERROR: `, url, err.message));
                                 }));
                             }));
                         }), 10000);

package/dist/cli/index.js

@@ -34,7 +34,7 @@ const ready = (config) => __awaiter(void 0, void 0, void 0, function* () {
                 sessionId: config.sessionId,
                 namespace: "READY"
             }
-        }).catch(err => console.error(`WEBHOOK ERROR: ${config.readyWebhook} ${err.message}`));
+        }).catch(err => index_1.log.error(`WEBHOOK ERROR: ${config.readyWebhook} ${err.message}`));
 });
 function start() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -93,7 +93,7 @@ function start() {
                     }).then(({ status }) => {
                         const t = ((0, index_1.now)() - whStart).toFixed(0);
                         index_1.log.info("EV Webhook", namespace, status, t);
-                    }).catch(err => console.error(`WEBHOOK ERROR: ${cliConfig.ev} ${err.message}`));
+                    }).catch(err => index_1.log.error(`WEBHOOK ERROR: ${cliConfig.ev} ${err.message}`));
                 }));
         }
         //These things can be done before the client is created

package/dist/cli/server.js

@@ -232,7 +232,7 @@ const setupTwilioCompatibleWebhook = (cliConfig, client) => {
             return yield client.sendText(message.from, msg['#']);
         }
         catch (error) {
-            console.error("TWILIO-COMPAT WEBHOOK ERROR", url, error.message);
+            __1.log.error("TWILIO-COMPAT WEBHOOK ERROR", url, error.message);
         }
     }));
 };
@@ -365,8 +365,16 @@ const setupSocketServer = (cliConfig, client) => __awaiter(void 0, void 0, void
                         args = (0, parse_function_1.default)().parse(client[m]).args.map(argName => args[argName]);
                     else if (!args)
                         args = [];
-                    const data = yield client[m](...args);
-                    callbacks[0](data);
+                    try {
+                        const data = yield client[m](...args);
+                        callbacks[0](data);
+                    }
+                    catch (error) {
+                        callbacks[0]({ error: {
+                                message: error.message,
+                                stack: error.stack || ""
+                            } });
+                    }
                 }
             }
             return;

package/dist/controllers/browser.d.ts

@@ -7,8 +7,8 @@ export declare const deleteSessionData: (config: ConfigObject) => boolean;
 export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => string | boolean;
 export declare const addScript: (page: Page, js: string) => Promise<unknown>;
 export declare function injectPreApiScripts(page: Page, spinner?: Spin): Promise<Page>;
-export declare function injectWapi(page: Page, spinner?: Spin): Promise<Page>;
-export declare function injectApi(page: Page, spinner?: Spin): Promise<Page>;
+export declare function injectWapi(page: Page, spinner?: Spin, force?: boolean): Promise<Page>;
+export declare function injectApi(page: Page, spinner?: Spin, force?: boolean): Promise<Page>;
 /**
  * @internal
  */

package/dist/controllers/browser.js

@@ -45,7 +45,7 @@ const promise_1 = __importDefault(require("terminate/promise"));
 const logging_1 = require("../logging/logging");
 const tools_1 = require("../utils/tools");
 const auth_1 = require("./auth");
-let browser;
+let browser, wapiInjected = false, wapiAttempts = 1;
 exports.BROWSER_START_TS = 0;
 function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth) {
     var _a, _b, _c, _d, _e;
@@ -280,30 +280,29 @@ function injectPreApiScripts(page, spinner) {
     });
 }
 exports.injectPreApiScripts = injectPreApiScripts;
-function injectWapi(page, spinner) {
+function injectWapi(page, spinner, force = false) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (wapiInjected && !force)
+            return page;
+        const check = `window.WAPI && window.Store ? true : false`;
         const wapi = yield (0, tools_1.timePromise)(() => (0, exports.addScript)(page, 'wapi.js'));
         spinner === null || spinner === void 0 ? void 0 : spinner.info(`WAPI inject: ${wapi}ms`);
-        spinner === null || spinner === void 0 ? void 0 : spinner.info("Checking WAPI Injection");
-        const check = (c) => `window.${c} ? true : false`;
-        yield page.waitForFunction(check('WAPI'), { timeout: 0, polling: 500 });
-        return;
+        spinner === null || spinner === void 0 ? void 0 : spinner.info("Checking session integrity");
+        wapiAttempts++;
+        wapiInjected = !!(yield page.waitForFunction(check, { timeout: 3000, polling: 200 }).catch(e => false));
+        if (!wapiInjected) {
+            spinner === null || spinner === void 0 ? void 0 : spinner.info(`Session integrity check failed, trying again... ${wapiAttempts}`);
+            return yield injectWapi(page, spinner);
+        }
+        spinner === null || spinner === void 0 ? void 0 : spinner.info("Session integrity check passed");
+        return page;
     });
 }
 exports.injectWapi = injectWapi;
-function injectApi(page, spinner) {
+function injectApi(page, spinner, force = false) {
     return __awaiter(this, void 0, void 0, function* () {
         yield injectPreApiScripts(page, spinner);
-        yield injectWapi(page, spinner);
-        // const wapi = await timePromise(()=>addScript(page,'wapi.js'))
-        // spinner?.info(`WAPI inject: ${wapi}ms`)
-        // await addScript(page,'wapi.js')
-        // await addScript(page,'wapi.js')
-        // await addScript(page,'wapi.js')
-        // await addScript(page,'wapi.js')
-        // await addScript(page,'wapi.js')
-        // await addScript(page,'wapi.js')
-        // await addScript(page,'wapi.js')
+        yield injectWapi(page, spinner, force);
         const launch = yield (0, tools_1.timePromise)(() => (0, exports.addScript)(page, 'launch.js'));
         spinner === null || spinner === void 0 ? void 0 : spinner.info(`Launch inject: ${launch}ms`);
         return page;

package/dist/controllers/initializer.js

@@ -303,7 +303,7 @@ function create(config = {}) {
             }
             const pre = canInjectEarly ? 'Rei' : 'I';
             spinner.start(`${pre}njecting api`);
-            waPage = yield (0, browser_1.injectApi)(waPage, spinner);
+            waPage = yield (0, browser_1.injectApi)(waPage, spinner, true);
             spinner.succeed(`WAPI ${pre}njected`);
             if (canInjectEarly) {
                 //check if page is valid after 5 seconds
@@ -312,7 +312,7 @@ function create(config = {}) {
                     yield (0, exports.timeout)(5000);
             }
             //@ts-ignore
-            const VALID_SESSION = yield waPage.evaluate(() => window.Store && window.Store.Msg ? true : false);
+            const VALID_SESSION = yield waPage.waitForFunction(`window.Store && window.Store.Msg ? true : false`, { timeout: 9000, polling: 200 }).catch(e => false);
             if (VALID_SESSION) {
                 /**
                  * Session is valid, attempt to preload patches
@@ -426,6 +426,11 @@ function create(config = {}) {
         }
         catch (error) {
             spinner.emit(error.message);
+            logging_1.log.error(error.message);
+            if (error.stack) {
+                logging_1.log.error(error.stack);
+                console.error(error.stack);
+            }
             yield (0, browser_1.kill)(waPage);
             if (error.name === "ProtocolError" && ((_c = error.message) === null || _c === void 0 ? void 0 : _c.includes("Target closed"))) {
                 spinner.fail(error.message);

package/dist/utils/tools.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { ConfigObject, DataURL } from '../api/model';
 import { AxiosRequestConfig } from 'axios';
 import { SessionInfo } from '../api/model/sessionInfo';
@@ -27,7 +28,7 @@ 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 perf: () => DateConstructor | Performance;
+export declare const perf: () => DateConstructor | import("perf_hooks").Performance;
 export declare const now: () => number;
 export declare function timePromise(fn: () => Promise<any>): Promise<string>;
 export declare const processSendData: (data?: any) => void;

package/dist/utils/tools.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateGHIssueLink = exports.processSendData = exports.timePromise = exports.now = exports.perf = 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"));
 const child_process_1 = require("child_process");
+const perf_hooks_1 = require("perf_hooks");
 //@ts-ignore
 process.send = process.send || function () { };
 const timeout = ms => new Promise(resolve => setTimeout(resolve, ms, 'timeout'));
@@ -138,7 +139,7 @@ const processSend = (message) => {
     return;
 };
 exports.processSend = processSend;
-const perf = () => performance || Date;
+const perf = () => perf_hooks_1.performance || Date;
 exports.perf = perf;
 const now = () => (0, exports.perf)().now();
 exports.now = now;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.30.4",
+  "version": "4.30.8",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",
@@ -84,7 +84,6 @@
     "auto-changelog": "^2.0.0",
     "ava": "^3.13.0",
     "changelog-parser": "^2.8.0",
-    "typeconv": "^1.7.0",
     "command-line-args": "^5.1.1",
     "eslint": "^8.1.0",
     "husky": "^7.0.0",
@@ -96,9 +95,10 @@
     "prettier": "^2.0.1",
     "release-it": "^14.0.3",
     "shelljs": "^0.8.3",
+    "tiny-glob": "^0.2.9",
     "ts-node": "^10.0.0",
     "tsc-watch": "^4.0.0",
-    "tiny-glob": "^0.2.9",
+    "typeconv": "^1.7.0",
     "typedoc": "^0.21.6",
     "typedoc-plugin-pages": "^1.0.1",
     "typescript": "^4.2.4"