@open-wa/wa-automate 4.30.12 → 4.31.2

package/dist/controllers/browser.js

@@ -45,12 +45,15 @@ 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, wapiInjected = false, wapiAttempts = 1;
+const script_preloader_1 = require("./script_preloader");
+const patch_manager_1 = require("./patch_manager");
+let browser, wapiInjected = false, dumbCache = undefined, wapiAttempts = 1;
 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* () {
         const setupPromises = [];
+        script_preloader_1.scriptLoader.loadScripts();
         if ((config === null || config === void 0 ? void 0 : config.resizable) === undefined || !(config === null || config === void 0 ? void 0 : config.resizable) == false)
             config.defaultViewport = null;
         if (config === null || config === void 0 ? void 0 : config.useStealth) {
@@ -65,7 +68,28 @@ function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth)
             spinner === null || spinner === void 0 ? void 0 : spinner.info(`Browser launched: ${((0, tools_1.now)() - startBrowser).toFixed(0)}ms`);
             waPage = yield getWAPage(browser);
         }
+        //@ts-ignore
+        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 {
+                const frameNavPromises = [];
+                const content = yield frame.content();
+                const webpPackKey = (((content.match(/self.(?:.*)=self.*\|\|\[\]/g) || [])[0] || "").match(/self.*\w?=/g) || [""])[0].replace("=", "").replace("self.", "") || false;
+                logging_1.log.info(`FRAME NAV, ${frame.url()}, ${webpPackKey}`);
+                if (webpPackKey) {
+                    frameNavPromises.push(injectApi(waPage, spinner, true));
+                    frameNavPromises.push(auth_1.qrManager.waitFirstQr(waPage, config, spinner));
+                }
+                if (frame.url().includes('post_logout=1')) {
+                    console.log("Session most likely logged out");
+                }
+                yield Promise.all(frameNavPromises);
+            }
+            catch (error) {
+                logging_1.log.error('framenaverr', error);
+            }
+        }));
         spinner === null || spinner === void 0 ? void 0 : spinner.info('Setting Up Page');
         if (config === null || config === void 0 ? void 0 : config.proxyServerCredentials) {
             yield waPage.authenticate(config.proxyServerCredentials);
@@ -105,10 +129,29 @@ function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth)
         if (proxyAddr) {
             proxy = (yield Promise.resolve().then(() => __importStar(require('puppeteer-page-proxy')))).default;
         }
-        if (interceptAuthentication || proxyAddr || blockCrashLogs) {
+        if (interceptAuthentication || proxyAddr || blockCrashLogs || true) {
             yield waPage.setRequestInterception(true);
+            waPage.on('response', (response) => __awaiter(this, void 0, void 0, function* () {
+                if (response.request().url() == "https://web.whatsapp.com/") {
+                    const t = yield response.text();
+                    if (t.includes(`class="no-js"`) && t.includes(`self.`) && !dumbCache) {
+                        //this is a valid response, save it for later
+                        dumbCache = t;
+                        logging_1.log.info("saving valid page to dumb cache");
+                    }
+                }
+            }));
             const authCompleteEv = new events_1.EvEmitter(sessionId, 'AUTH');
             waPage.on('request', (request) => __awaiter(this, void 0, void 0, function* () {
+                //local refresh cache:
+                if (request.url() === "https://web.whatsapp.com/" && dumbCache) {
+                    //if the dumbCache isn't set and this response includes 
+                    logging_1.log.info("reviving page from dumb cache");
+                    return yield request.respond({
+                        status: 200,
+                        body: dumbCache
+                    });
+                }
                 if (interceptAuthentication &&
                     request.url().includes('_priority_components') &&
                     !quickAuthed) {
@@ -184,7 +227,6 @@ function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth)
             //try twice 
             const WEB_START_TS = new Date().getTime();
             const webRes = yield waPage.goto(puppeteer_config_1.puppeteerConfig.WAUrl);
-            Promise.all([injectApi(waPage, spinner), auth_1.qrManager.waitFirstQr(waPage, config, spinner)]);
             const WEB_END_TS = new Date().getTime();
             if (webRes == null) {
                 spinner === null || spinner === void 0 ? void 0 : spinner.info(`Page loaded but something may have gone wrong: ${WEB_END_TS - WEB_START_TS}ms`);
@@ -262,12 +304,15 @@ const getSessionDataFilePath = (sessionId, config) => {
     return false;
 };
 exports.getSessionDataFilePath = getSessionDataFilePath;
-const addScript = (page, js) => page.addScriptTag({
-    path: require.resolve(path.join(__dirname, '../lib', js))
-});
+const addScript = (page, js) => __awaiter(void 0, void 0, void 0, function* () { return page.evaluate(yield script_preloader_1.scriptLoader.getScript(js)); });
 exports.addScript = addScript;
+// (page: Page, js : string) : Promise<unknown> => page.addScriptTag({
+//   path: require.resolve(path.join(__dirname, '../lib', js))
+// })
 function injectPreApiScripts(page, spinner) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (yield page.evaluate("!['jsSHA','axios', 'QRCode', 'Base64', 'objectHash'].find(x=>!window[x])"))
+            return;
         const t1 = yield (0, tools_1.timePromise)(() => Promise.all([
             'axios.min.js',
             'jsSha.min.js',
@@ -282,17 +327,33 @@ function injectPreApiScripts(page, spinner) {
 exports.injectPreApiScripts = injectPreApiScripts;
 function injectWapi(page, spinner, force = false) {
     return __awaiter(this, void 0, void 0, function* () {
+        const bruteInjectionAttempts = 1;
+        yield (0, patch_manager_1.earlyInjectionCheck)(page);
+        const check = `window.WAPI && window.Store ? true : false`;
+        const initCheck = yield page.evaluate(check);
+        if (initCheck)
+            return;
+        logging_1.log.info(`WAPI CHECK: ${initCheck}`);
+        if (!check)
+            force = true;
         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`);
+        const multiScriptInjectPromiseArr = Array(bruteInjectionAttempts).fill("wapi.js").map((_s) => (0, exports.addScript)(page, _s));
+        try {
+            const wapi = yield (0, tools_1.timePromise)(() => Promise.all(multiScriptInjectPromiseArr));
+            spinner === null || spinner === void 0 ? void 0 : spinner.info(`WAPI inject: ${wapi}ms`);
+        }
+        catch (error) {
+            logging_1.log.error("injectWapi ~ error", error.message);
+            //one of the injection attempts failed.
+            return yield injectWapi(page, spinner, force);
+        }
         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));
+        wapiInjected = !!(yield page.waitForFunction(check, { timeout: 3000, polling: 50 }).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);
+            return yield injectWapi(page, spinner, true);
         }
         spinner === null || spinner === void 0 ? void 0 : spinner.info("Session integrity check passed");
         return page;
@@ -301,10 +362,11 @@ function injectWapi(page, spinner, force = false) {
 exports.injectWapi = injectWapi;
 function injectApi(page, spinner, force = false) {
     return __awaiter(this, void 0, void 0, function* () {
+        spinner === null || spinner === void 0 ? void 0 : spinner.info("Injecting scripts");
         yield injectPreApiScripts(page, spinner);
         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`);
+        spinner === null || spinner === void 0 ? void 0 : spinner.succeed(`Launch inject: ${launch}ms`);
         return page;
     });
 }

package/dist/controllers/initializer.js

@@ -363,7 +363,7 @@ function create(config = {}) {
                 waPage.on('error', error => {
                     if (config === null || config === void 0 ? void 0 : config.logConsoleErrors)
                         console.error(error);
-                    logging_1.log.error('Page Console Error:', error.text());
+                    logging_1.log.error('Page Console Error:', error.message || (error === null || error === void 0 ? void 0 : 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/controllers/patch_manager.js

@@ -164,6 +164,8 @@ function getLicense(config, me, debugInfo, spinner) {
 exports.getLicense = getLicense;
 function earlyInjectionCheck(page) {
     return __awaiter(this, void 0, void 0, function* () {
+        //@ts-ignore
+        yield page.waitForFunction(() => Object.entries(window).filter(([, o]) => o && o.push && (o.push != [].push))[0] ? true : false, { timeout: 10, polling: 500 }).catch(() => { });
         //@ts-ignore
         return yield page.evaluate(() => { if (window.webpackChunkwhatsapp_web_client) {
             window.webpackChunkbuild = window.webpackChunkwhatsapp_web_client;
@@ -172,7 +174,7 @@ function earlyInjectionCheck(page) {
             (function () { const f = Object.entries(window).filter(([, o]) => o && o.push && (o.push != [].push)); if (f[0]) {
                 window.webpackChunkbuild = window[f[0][0]];
             } })();
-        } return (typeof webpackChunkbuild !== "undefined"); });
+        } return (typeof window.webpackChunkbuild !== "undefined"); });
     });
 }
 exports.earlyInjectionCheck = earlyInjectionCheck;

package/dist/controllers/script_preloader.d.ts

@@ -0,0 +1,17 @@
+export declare class ScriptLoader {
+    scripts: string[];
+    contentRegistry: {
+        [key: string]: string;
+    };
+    constructor();
+    loadScripts(): Promise<{
+        [key: string]: string;
+    }>;
+    getScript(scriptName: string): Promise<string>;
+    flush(): void;
+    getScripts(): {
+        [key: string]: string;
+    };
+}
+declare const scriptLoader: ScriptLoader;
+export { scriptLoader };

package/dist/controllers/script_preloader.js

@@ -0,0 +1,83 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scriptLoader = exports.ScriptLoader = void 0;
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+const logging_1 = require("../logging/logging");
+const read = (_path) => new Promise((resolve, reject) => {
+    fs.readFile(require.resolve(path.join(__dirname, '../lib', _path)), 'utf8', (err, file) => {
+        if (err)
+            reject(err);
+        resolve(file);
+    });
+});
+class ScriptLoader {
+    constructor() {
+        this.scripts = [
+            // stage 1
+            'axios.min.js',
+            'jsSha.min.js',
+            'qr.min.js',
+            'base64.js',
+            'hash.js',
+            //stage 2
+            'wapi.js',
+            //stage 3,
+            'launch.js'
+        ];
+        this.contentRegistry = {};
+        this.contentRegistry = {};
+    }
+    loadScripts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield Promise.all(this.scripts.map(this.getScript.bind(this)));
+            return this.contentRegistry;
+        });
+    }
+    getScript(scriptName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.contentRegistry[scriptName]) {
+                this.contentRegistry[scriptName] = yield read(scriptName);
+                logging_1.log.info("SCRIPT READY: " + scriptName);
+            }
+            return this.contentRegistry[scriptName];
+        });
+    }
+    flush() {
+        this.contentRegistry = {};
+    }
+    getScripts() {
+        return this.contentRegistry;
+    }
+}
+exports.ScriptLoader = ScriptLoader;
+const scriptLoader = new ScriptLoader();
+exports.scriptLoader = scriptLoader;