fix: Alternative fix for is not loading #1322

wppconnect-team · Sep 26, 2023 · a60bbd3 · a60bbd3
1 parent caf9173
commit a60bbd3
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 20 deletions.
diff --git a/src/chat/events/registerAckMessageEvent.ts b/src/chat/events/registerAckMessageEvent.ts
@@ -25,7 +25,7 @@ import {
   SimpleAckData,
 } from '../../whatsapp/functions';
 
-webpack.onReady(registerAckMessageEvent);
+webpack.onFullReady(registerAckMessageEvent);
 
 function registerAckMessageEvent() {
   MsgStore.on('change:ack', (msg: MsgModel) => {

diff --git a/src/chat/events/registerLabelEvent.ts b/src/chat/events/registerLabelEvent.ts
@@ -26,7 +26,7 @@ import {
 } from '../../whatsapp/functions';
 import { get as getChat } from '../functions/';
 
-webpack.onReady(register);
+webpack.onFullReady(register);
 
 function register() {
   async function processLabelEvent(event: 'add' | 'remove', ...args: any) {

diff --git a/src/chat/events/registerPollEvent.ts b/src/chat/events/registerPollEvent.ts
@@ -20,7 +20,7 @@ import { wrapModuleFunction } from '../../whatsapp/exportModule';
 import { upsertVotes } from '../../whatsapp/functions';
 import { getMessageById } from '../functions';
 
-webpack.onReady(register);
+webpack.onFullReady(register);
 
 function register() {
   wrapModuleFunction(upsertVotes, async (func, ...args) => {

diff --git a/src/chat/events/registerReactionsEvent.ts b/src/chat/events/registerReactionsEvent.ts
@@ -21,7 +21,7 @@ import { MsgKey } from '../../whatsapp';
 import { wrapModuleFunction } from '../../whatsapp/exportModule';
 import { createOrUpdateReactions } from '../../whatsapp/functions';
 
-webpack.onReady(register);
+webpack.onFullReady(register);
 
 function register() {
   wrapModuleFunction(createOrUpdateReactions, (func, ...args) => {

diff --git a/src/chat/functions/prepareLinkPreview.ts b/src/chat/functions/prepareLinkPreview.ts
@@ -105,7 +105,7 @@ export async function prepareLinkPreview<T extends RawMessage>(
   return message;
 }
 
-webpack.onReady(() => {
+webpack.onFullReady(() => {
   wrapModuleFunction(getABPropConfigValue, (func, ...args) => {
     const [key] = args;
     switch (key) {

diff --git a/src/chat/functions/prepareMessageButtons.ts b/src/chat/functions/prepareMessageButtons.ts
@@ -196,7 +196,7 @@ export function prepareMessageButtons<T extends RawMessage>(
   return message;
 }
 
-webpack.onReady(() => {
+webpack.onFullReady(() => {
   wrapModuleFunction(createMsgProtobuf, (func, ...args) => {
     const [message] = args;
     const r = func(...args);

diff --git a/src/chat/functions/sendFileMessage.ts b/src/chat/functions/sendFileMessage.ts
@@ -386,7 +386,7 @@ function generateWhiteThumb(width: number, height: number, maxSize: number) {
   };
 }
 
-webpack.onReady(() => {
+webpack.onFullReady(() => {
   wrapModuleFunction(generateVideoThumbsAndDuration, async (func, ...args) => {
     const [data] = args;
 

diff --git a/src/chat/functions/sendListMessage.ts b/src/chat/functions/sendListMessage.ts
@@ -107,7 +107,7 @@ export async function sendListMessage(
   return await sendRawMessage(chatId, message, options);
 }
 
-webpack.onReady(() => {
+webpack.onFullReady(() => {
   wrapModuleFunction(typeAttributeFromProtobuf, (func, ...args) => {
     const [proto] = args;
     if (proto.listMessage) {

diff --git a/src/chat/functions/sendLocationMessage.ts b/src/chat/functions/sendLocationMessage.ts
@@ -152,7 +152,7 @@ export async function sendLocationMessage(
   return await sendRawMessage(chatId, rawMessage, options);
 }
 
-webpack.onReady(() => {
+webpack.onFullReady(() => {
   wrapModuleFunction(mediaTypeFromProtobuf, (func, ...args) => {
     const [proto] = args;
     if (proto.locationMessage) {

diff --git a/src/chat/patch.ts b/src/chat/patch.ts
@@ -22,7 +22,7 @@ import {
   typeAttributeFromProtobuf,
 } from '../whatsapp/functions';
 
-webpack.onReady(applyPatch, 1000);
+webpack.onFullReady(applyPatch, 1000);
 
 function applyPatch() {
   wrapModuleFunction(mediaTypeFromProtobuf, (func, ...args) => {

diff --git a/src/conn/functions/setLimit.ts b/src/conn/functions/setLimit.ts
@@ -22,7 +22,7 @@ import { getNumChatsPinned } from '../../whatsapp/functions';
 
 let unlimitedPin: undefined | boolean = undefined;
 
-webpack.onReady(() => {
+webpack.onFullReady(() => {
   wrapModuleFunction(getNumChatsPinned, (func, ...args) => {
     const getNumChatsPinnedOriginal = func(...args);
     return unlimitedPin ? 1 : getNumChatsPinnedOriginal;

diff --git a/src/group/events/registerParticipantsChangedEvent.ts b/src/group/events/registerParticipantsChangedEvent.ts
@@ -20,7 +20,7 @@ import { Wid } from '../../whatsapp';
 import { wrapModuleFunction } from '../../whatsapp/exportModule';
 import { updateDBForGroupAction } from '../../whatsapp/functions';
 
-webpack.onReady(register);
+webpack.onFullReady(register);
 
 function register() {
   const eventTypes = ['add', 'remove', 'demote', 'promote'];

diff --git a/src/status/patch.ts b/src/status/patch.ts
@@ -20,7 +20,7 @@ import { UserPrefs } from '../whatsapp';
 import { wrapModuleFunction } from '../whatsapp/exportModule';
 import { handleSingleMsg } from '../whatsapp/functions';
 
-webpack.onReady(applyPatch);
+webpack.onFullReady(applyPatch);
 
 function applyPatch() {
   wrapModuleFunction(handleSingleMsg, async (func, ...args) => {

diff --git a/src/webpack/index.ts b/src/webpack/index.ts
@@ -47,6 +47,12 @@ export function onReady(listener: () => void, delay = 0): void {
   });
 }
 
+export function onFullReady(listener: () => void, delay = 0): void {
+  internalEv.on('webpack.full_ready', () => {
+    setTimeout(listener, delay);
+  });
+}
+
 export type SearchModuleCondition = (module: any, moduleId: string) => boolean;
 
 export let webpackRequire: (<T = any>(moduleId: string) => T) & {
@@ -89,11 +95,7 @@ export function injectLoader(): void {
     debug('injected');
     await internalEv.emitAsync('webpack.injected').catch(() => null);
 
-    if ((window as any).wppForceMainLoad) {
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-    } else {
-      await internalEv.waitFor('conn.main_loaded');
-    }
+    await new Promise((resolve) => setTimeout(resolve, 500));
 
     const allRuntimes = new Array(10000)
       .fill(1)
@@ -110,7 +112,7 @@ export function injectLoader(): void {
 
     const mainRuntimes = allRuntimes.filter((v) => {
       const filename = webpackRequire.u(v);
-      return filename.includes('main');
+      return filename.includes('main') && !filename.includes('locales');
     });
 
     // Use sequential file load
@@ -126,7 +128,11 @@ export function injectLoader(): void {
     debug('ready to use');
     await internalEv.emitAsync('webpack.ready').catch(() => null);
 
-    await new Promise((resolve) => setTimeout(resolve, 5000));
+    if ((window as any).wppForceMainLoad) {
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+    } else {
+      await internalEv.waitFor('conn.main_ready');
+    }
 
     // Use sequential file load
     for (const v of allRuntimes) {