@open-wa/wa-automate 4.30.6 → 4.30.7

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/package.json

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