@open-wa/wa-automate 4.30.10 → 4.31.0

package/dist/cli/setup.js

@@ -44,242 +44,17 @@ const events_1 = require("../controllers/events");
 const is_url_superb_1 = __importDefault(require("is-url-superb"));
 const path = __importStar(require("path"));
 const logging_1 = require("../logging/logging");
+const cli_options_1 = require("./cli-options");
 let checkUrl = url => typeof url === 'string' ? (0, is_url_superb_1.default)(url) : false;
 const configWithCases = (0, fs_extra_1.readJsonSync)(path.join(__dirname, '../../bin/config-schema.json'));
-const optionList = [{
-        name: 'no-api',
-        default: false,
-        alias: 'n',
-        type: Boolean,
-        description: "Don't expose the api. This may be useful if you just want to set the webhooks."
-    }, {
-        name: 'bot-press-url',
-        alias: 'b',
-        type: String,
-        typeLabel: '{blue {underline http://localhost:3000/api/v1/bots/cool-bot}}',
-        description: "The Botpress URL that ends with your bot id."
-    }, {
-        name: 'twilio-webhook',
-        alias: 't',
-        type: String,
-        typeLabel: '{blue {underline http://localhost:5555/incoming}}',
-        description: "Send twillio payloads to this URL. EASY API will also parse and processes twillio response message payloads."
-    }, {
-        name: 'chatwoot-url',
-        type: String,
-        typeLabel: '{blue {underline http://localhost:3000/api/v1/accounts/3/inboxes/1}}',
-        description: "The URL of the specific Chatwoot inbox you set up for this session"
-    }, {
-        name: 'chatwoot-api-access-token',
-        type: String,
-        typeLabel: '{blue {underline mEEwUGEEML2ZThMm252rLg1M}}',
-        description: "The access token of the specific Chatwoot inbox you set up for this session"
-    },
-    {
-        name: 'port',
-        alias: 'p',
-        default: 8002,
-        type: Number,
-        typeLabel: '{blue {underline 8080}}',
-        description: "Set the port for the api. Default to 8002."
-    },
-    {
-        name: 'api-host',
-        type: String,
-        typeLabel: '{yellow {underline localhost}}',
-        description: "The easy API may be sitting behind a reverse proxy. In this case set --api-host in order to make sure the api docs and api explorer are working properly. You will need to include the protocol as well."
-    },
-    {
-        name: 'host',
-        alias: 'h',
-        default: 'localhost',
-        type: String,
-        typeLabel: '{red {underline localhost}}',
-        description: "Set the hostname for the api documantation and statistics. Overrides --api-host. Default: localhost."
-    },
-    {
-        name: 'webhook',
-        alias: 'w',
-        type: String,
-        typeLabel: '{yellow {underline https://webhook.site/....}}',
-        description: "Webhook to use for the listeners."
-    },
-    {
-        name: 'ev',
-        alias: 'e',
-        type: String,
-        typeLabel: '{green {underline https://webhook.site/....}}',
-        description: "Send launch events to this URL."
-    },
-    {
-        name: 'ef',
-        type: String,
-        //@ts-ignore
-        default: ["qr", "STARTUP"],
-        isMultiple: true,
-        typeLabel: '{blueBright {underline qr,STARTUP}}',
-        description: "Filters which namespaces trigger the webhook set in -e/--ev."
-    },
-    {
-        name: 'allow-session-data-wh',
-        alias: 'x',
-        default: false,
-        type: Boolean,
-        description: "By default, if you set -e flag, the session data is not transferred to the webhook as it is extremely sensitive data. In order to bypass this security measure, use this flag."
-    },
-    {
-        name: 'key',
-        alias: 'k',
-        type: String,
-        typeLabel: '{redBright {underline apikey}}',
-        description: "Specify an api key to use as a check for all requests. If you add -k by itself, a key will be autogenerated for you."
-    },
-    {
-        name: 'config',
-        alias: 'c',
-        type: String,
-        typeLabel: '{yellowBright {underline ./config.json}}',
-        description: "The relative json file that contains the config. By default the system will look for config.json which will override any config variables set. Default: './config.json'."
-    },
-    {
-        name: 'session',
-        alias: 's',
-        type: String,
-        typeLabel: '{magentaBright {underline BASE64}}',
-        description: "A base64 string representing the session data."
-    },
-    {
-        name: 'keep-alive',
-        alias: 'a',
-        type: Boolean,
-        description: "If true, the system will force the session to refocus in this process. This will prevent you from opening a session elsewhere."
-    },
-    {
-        name: 'use-session-id-in-path',
-        alias: 'i',
-        type: Boolean,
-        description: "If true, all API paths will include the session id. default to false and the default session Id is 'session'."
-    },
-    {
-        name: 'generate-api-docs',
-        alias: 'd',
-        type: Boolean,
-        default: true,
-        description: "Generate postman collection and expose api docs to open in browser."
-    },
-    {
-        name: 'session-data-only',
-        alias: 'o',
-        type: Boolean,
-        description: "Kill the process when the session data is saved.",
-        default: false
-    },
-    {
-        name: 'skip-save-postman-collection',
-        type: Boolean,
-        description: "Don't save the postman collection.",
-        default: false
-    },
-    {
-        name: 'headful',
-        type: Boolean,
-        description: "Show the browser window on your machine.",
-        default: false
-    },
-    {
-        name: 'headful',
-        type: Boolean,
-        description: "Pre authenticate documentation site [High security risk]."
-    },
-    {
-        name: 'stats',
-        type: Boolean,
-        description: "Exposes API swagger-statistics.",
-        default: false
-    },
-    {
-        name: 'pre-auth-docs',
-        type: Boolean,
-        description: "Grab config options from the environment variables.",
-        default: false
-    },
-    {
-        name: 'no-kill-on-logout',
-        type: Boolean,
-        description: "Keeps the process alive when host account logs out of session. default is false",
-        default: false
-    },
-    {
-        name: 'debug',
-        type: Boolean,
-        description: "Print out the CLI flag values and the WA_* env vars. default is false",
-        default: false
-    },
-    {
-        name: 'cors',
-        type: Boolean,
-        description: "Enable all cors requests",
-        default: false
-    },
-    {
-        name: 'socket',
-        type: Boolean,
-        description: "Expose a socket.io middleware on the server.",
-        default: false
-    },
-    {
-        name: 'license-key',
-        alias: 'l',
-        type: String,
-        typeLabel: '{yellowBright {underline B2BJ4JFB-2UN2J3ND-2J5I.....}}',
-        description: "The license key you want to use for this server. License keys are used to unlock features. Learn more here https://github.com/open-wa/wa-automate-nodejs#license-key"
-    },
-    {
-        name: 'ready-webhook',
-        type: String,
-        typeLabel: '{yellow {underline https://webhook.site/....}}',
-        description: "Webhook that fires when the EASY API is completely ready"
-    },
-    {
-        name: 'on-call',
-        type: String,
-        typeLabel: '{yellow {underline "Please do not call this number"}}',
-        description: "A default message to send to any number that is trying to call the host account"
-    },
-    {
-        name: 'auto-reject',
-        type: Boolean,
-        description: "Automatically reject incoming phone and video calls to the host account."
-    },
-    {
-        name: 'emit-unread',
-        type: Boolean,
-        description: "Emit all unread messages via onMessage webhooks on launch.",
-        default: false
-    },
-    {
-        name: 'skip-url-check',
-        type: Boolean,
-        description: "Don't validate webhook URLs. Enables use of non-FQDNs."
-    },
-    {
-        name: 'tunnel',
-        type: Boolean,
-        description: "Expose a tunnel to your EASY API session - this is for testing and it is unsecured."
-    },
-    {
-        name: 'help',
-        description: 'Print this usage guide.'
-    }
-];
-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)), 'popup'];
+exports.optionKeys = cli_options_1.optionList.map(({ name }) => (0, tools_1.camelize)(name));
+exports.optionKeysWithDefalts = [...cli_options_1.optionList.filter(o => o.hasOwnProperty('default')).map(({ name }) => (0, tools_1.camelize)(name)), 'popup'];
 exports.PrimitiveConverter = {
     Number: 1,
     Boolean: true,
     String: "hello"
 };
-exports.cliOptionNames = optionList.reduce((acc, c) => {
+exports.cliOptionNames = cli_options_1.optionList.reduce((acc, c) => {
     if (!c.type)
         return acc;
     acc[(0, tools_1.camelize)(c.name)] = typeof exports.PrimitiveConverter[c.type.name];
@@ -299,7 +74,7 @@ const meowFlags = () => {
         };
     });
     const res = {};
-    optionList.map(option => {
+    cli_options_1.optionList.map(option => {
         var _a, _b;
         res[(0, tools_1.camelize)(option.name)] = Object.assign(Object.assign({}, option), { 
             //@ts-ignore
@@ -314,7 +89,7 @@ exports.helptext = (0, command_line_usage_1.default)([{
     },
     {
         header: '',
-        optionList
+        optionList: cli_options_1.optionList
     },
     {
         header: "Session config flags",
@@ -383,7 +158,7 @@ const cli = () => {
      * 3. CLI flags
      */
     const nonCliConfigs = Object.assign(Object.assign({}, (0, exports.envArgs)()), ((0, exports.configFile)(_cli.flags.config) || {}));
-    optionList.filter(option => option.default);
+    cli_options_1.optionList.filter(option => option.default);
     const cliConfig = Object.assign(Object.assign(Object.assign({ sessionId: "session" }, nonCliConfigs), _cli.flags), exports.optionKeysWithDefalts.reduce((p, c) => nonCliConfigs.hasOwnProperty(c) ? Object.assign(Object.assign({}, p), { [c]: nonCliConfigs[c] }) : p, {}));
     //firstly set up logger
     if (cliConfig === null || cliConfig === void 0 ? void 0 : cliConfig.logging) {

package/dist/controllers/auth.d.ts

@@ -3,13 +3,13 @@ import { Spin } from './events';
 import { ConfigObject } from '../api/model';
 import { Page } from 'puppeteer';
 /**
+ * isAuthenticated
  * Validates if client is authenticated
  * @returns true if is authenticated, false otherwise
  * @param waPage
  */
 export declare const isAuthenticated: (waPage: Page) => Promise<unknown>;
 export declare const needsToScan: (waPage: Page) => Observable<unknown>;
-export declare const isInsideChat: (waPage: Page) => Observable<boolean>;
 export declare const waitForRipeSession: (waPage: Page) => Promise<boolean>;
 export declare const sessionDataInvalid: (waPage: Page) => Promise<string>;
 export declare const phoneIsOutOfReach: (waPage: Page) => Promise<boolean>;
@@ -27,6 +27,10 @@ export declare class QRManager {
     grabAndEmit(qrData: any, waPage: Page, config: ConfigObject, spinner: Spin): Promise<void>;
     smartQr(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<boolean | void | string>;
     emitFirst(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<void>;
+    /**
+     * Wait 10 seconds for the qr element to show.
+     * If it doesn't show up within 10 seconds then assume the session is authed already or blocked therefore ignore and return promise
+     */
     waitFirstQr(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<void>;
 }
 export declare const qrManager: QRManager;

package/dist/controllers/auth.js

@@ -31,7 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.qrManager = exports.QRManager = exports.phoneIsOutOfReach = exports.sessionDataInvalid = exports.waitForRipeSession = exports.isInsideChat = exports.needsToScan = exports.isAuthenticated = void 0;
+exports.qrManager = exports.QRManager = exports.phoneIsOutOfReach = exports.sessionDataInvalid = exports.waitForRipeSession = exports.needsToScan = exports.isAuthenticated = void 0;
 const qrcode = __importStar(require("qrcode-terminal"));
 const rxjs_1 = require("rxjs");
 const events_1 = require("./events");
@@ -41,11 +41,12 @@ const browser_1 = require("./browser");
 const axios_1 = __importDefault(require("axios"));
 const logging_1 = require("../logging/logging");
 /**
+ * isAuthenticated
  * Validates if client is authenticated
  * @returns true if is authenticated, false otherwise
  * @param waPage
  */
-const isAuthenticated = (waPage) => (0, rxjs_1.race)((0, exports.needsToScan)(waPage), (0, exports.isInsideChat)(waPage), (0, exports.sessionDataInvalid)(waPage)).toPromise();
+const isAuthenticated = (waPage) => (0, rxjs_1.race)((0, exports.needsToScan)(waPage), isInsideChat(waPage), (0, exports.sessionDataInvalid)(waPage)).toPromise();
 exports.isAuthenticated = isAuthenticated;
 const needsToScan = (waPage) => {
     return (0, rxjs_1.from)(new Promise((resolve) => __awaiter(void 0, void 0, void 0, function* () {
@@ -72,7 +73,11 @@ const isInsideChat = (waPage) => {
         .waitForFunction("!!window.WA_AUTHENTICATED || (document.getElementsByClassName('app')[0] && document.getElementsByClassName('app')[0].attributes && !!document.getElementsByClassName('app')[0].attributes.tabindex) || (document.getElementsByClassName('two')[0] && document.getElementsByClassName('two')[0].attributes && !!document.getElementsByClassName('two')[0].attributes.tabindex)", { timeout: 0 })
         .then(() => true));
 };
-exports.isInsideChat = isInsideChat;
+const isTosBlocked = (waPage) => {
+    return (0, rxjs_1.from)(waPage
+        .waitForFunction(`document.getElementsByTagName("html")[0].classList[0] === 'no-js'`, { timeout: 0 })
+        .then(() => false));
+};
 const waitForRipeSession = (waPage) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         yield waPage.waitForFunction(`window.isRipeSession()`, { timeout: 0, polling: 'mutation' });
@@ -84,11 +89,17 @@ const waitForRipeSession = (waPage) => __awaiter(void 0, void 0, void 0, functio
 });
 exports.waitForRipeSession = waitForRipeSession;
 const sessionDataInvalid = (waPage) => __awaiter(void 0, void 0, void 0, function* () {
+    const check = `Object.keys(localStorage).includes("old-logout-cred")`;
     yield waPage
-        .waitForFunction('!window.getQrPng', { timeout: 0, polling: 'mutation' });
-    yield (0, browser_1.injectApi)(waPage);
-    yield waPage
-        .waitForFunction('!window.getQrPng', { timeout: 0, polling: 'mutation' });
+        .waitForFunction(check, { timeout: 0, polling: 'mutation' });
+    // await injectApi(waPage, null, true);
+    // await waPage
+    //   .waitForFunction(
+    //     '!window.getQrPng',
+    //     { timeout: 0, polling: 'mutation' }
+    //   )
+    // await timeout(1000000)
+    //NEED A DIFFERENT WAY TO DETERMINE IF THE SESSION WAS LOGGED OUT!!!!
     //if the code reaches here it means the browser was refreshed. Nuke the session data and restart `create`
     return 'NUKE';
 });
@@ -116,6 +127,7 @@ class QRManager {
         this.qrEvF(this.config);
     }
     qrEvF(config = this.config) {
+        return new events_1.EvEmitter(config.sessionId || 'session', 'qr');
         if (!this.qrEv)
             this.qrEv = new events_1.EvEmitter(config.sessionId || 'session', 'qr');
         return this.qrEv;
@@ -205,12 +217,13 @@ class QRManager {
                 const fn = (qrData) => __awaiter(this, void 0, void 0, function* () {
                     if (qrData.length > 200 && !(config === null || config === void 0 ? void 0 : config.multiDevice)) {
                         spinner.fail(`Multi-Device detected, please set multiDevice to true in your config or add the --multi-device flag`);
+                        spinner.emit(true, "MD_DETECT");
                         return resolve(md);
                     }
                     if (!gotResult && (qrData === 'QR_CODE_SUCCESS' || qrData === md)) {
                         gotResult = true;
                         spinner === null || spinner === void 0 ? void 0 : spinner.succeed(qrData === md ? "Multi device support for this project is EXPERIMENTAL. Some things may not work...." : "QR code scanned. Loading session...");
-                        return resolve(yield (0, exports.isInsideChat)(waPage).toPromise());
+                        return resolve(yield isInsideChat(waPage).toPromise());
                     }
                     if (!gotResult)
                         this.grabAndEmit(qrData, waPage, config, spinner);
@@ -238,13 +251,17 @@ class QRManager {
             yield this.grabAndEmit(firstQr, waPage, config, spinner);
         });
     }
+    /**
+     * Wait 10 seconds for the qr element to show.
+     * If it doesn't show up within 10 seconds then assume the session is authed already or blocked therefore ignore and return promise
+     */
     waitFirstQr(waPage, config, spinner) {
         return __awaiter(this, void 0, void 0, function* () {
             const fqr = yield waPage.waitForFunction(`!!(${this.qrCheck})`, {
                 polling: 500,
                 timeout: 10000
             })
-                .catch(e => false);
+                .catch(() => false);
             if (fqr)
                 yield this.emitFirst(waPage, config, spinner);
             return;

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;

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* () {
@@ -401,6 +401,8 @@ function create(config = {}) {
                     config.eventMode = true;
                 const client = new Client_1.Client(waPage, config, debugInfo);
                 const { me } = yield client.getMe();
+                const licIndex = process.argv.findIndex(arg => arg === "--license-key" || arg === "-l");
+                config.licenseKey = config.licenseKey || licIndex !== -1 && process.argv[licIndex + 1];
                 if ((config === null || config === void 0 ? void 0 : config.licenseKey) || me._serialized !== earlyWid) {
                     yield (0, patch_manager_1.getAndInjectLicense)(waPage, config, me, debugInfo, spinner, me._serialized !== earlyWid ? false : yield licensePromise);
                 }

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 };