🚑 attempt to fix #3218

Author: smashah

src/controllers/initializer.ts

@@ -208,7 +208,7 @@ export async function create(config: AdvancedConfig | ConfigObject = {}): Promis
       */
      const invariantAviodanceTs = now();
     await Promise.race([
-    (waPage as Page).waitForFunction(`(()=>{return require && require("__debug").modulesMap["WAWebLoadMainBundleFileDefinitions"] ? true : false})()`, {timeout: 10000}).catch(()=>{}), //modules are loaded
+    (waPage as Page).waitForFunction(`(()=>{return require && require("__debug").modulesMap["WAWebCollections"] ? true : false})()`, {timeout: 10000}).catch(()=>{}), //modules are loaded
     (waPage as Page).waitForFunction(`[...document.getElementsByTagName('div')].filter(x=>x.dataset && x.dataset.testid)[0]?.dataset?.testid === 'qrcode'`, {timeout: 10000}).catch(()=>{}), //qr code is loaded
     (waPage as Page).waitForFunction(`document.getElementsByTagName('circle').length===1`, {timeout: 10000}).catch(()=>{}) //qr spinner is present
     ])
@@ -315,7 +315,10 @@ export async function create(config: AdvancedConfig | ConfigObject = {}): Promis
     if (canInjectEarly) {
       //check if page is valid after 5 seconds
       spinner.start('Checking if session is valid');
-      if(config?.safeMode) await timeout(5000);
+      if(config?.safeMode) {
+        await timeout(5000);
+        await injectApi(waPage, spinner, true)
+      }
     }
     //@ts-ignore
     const VALID_SESSION = await waPage.waitForFunction(`window.Store && window.Store.Msg ? true : false`,{ timeout: 9000, polling: 200 }).catch(async e=>{

src/controllers/patch_manager.ts

@@ -144,7 +144,7 @@ export async function getLicense(config: ConfigObject, me: {
 
 export async function earlyInjectionCheck(page: Page): Promise<(page: Page) => boolean> {
   //@ts-ignore
-  await page.waitForFunction(`require("__debug").modulesMap["WAWebLoadMainBundleFileDefinitions"] ? true : false`, { timeout: 10, polling: 500 }).catch(()=>{})
+  await page.waitForFunction(`require("__debug").modulesMap["WAWebCollections"] ? true : false`, { timeout: 10, polling: 500 }).catch(()=>{})
   //@ts-ignore
   // return await page.evaluate(() => { if (window.webpackChunkwhatsapp_web_client) { window.webpackChunkbuild = window.webpackChunkwhatsapp_web_client; } else { (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 window.webpackChunkbuild !== "undefined"); });
   return true;

src/lib/launch.js

@@ -46,14 +46,7 @@ if (!window.Store || !window.Store.Msg) {
                 let neededModule = require(needObj.module)
                 needObj.foundedModule = neededModule;
             });
-            window.Store = {...Object.values(require("__debug").modulesMap["WAWebLoadMainBundleFileDefinitions"]?.exports || {}).map(x=>{
-                const module = x();
-                const collectionName = module.modelClass?.prototype?.proxyName
-                if(!collectionName) return false;
-                const capName = collectionName.charAt(0).toUpperCase() + collectionName.slice(1);
-                return [capName, module]
-            }).filter(x=>x).reduce((acc,curr) => {return {...acc,[curr[0]]: curr[1]}}, {}),
-            ...(window.Store || {})}
+            window.Store = {...{...require("WAWebCollections")},...(window.Store || {})}
             neededObjects.forEach((needObj) => {
                 if (needObj.foundedModule) {
                     window.Store[needObj.id] = needObj.resolver ? needObj.resolver(needObj.foundedModule) : needObj.foundedModule;