Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/conn/events/registerMainReadyEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ loader.onInjected(register);

function register() {
const isReadyMode = (mode: StreamMode) =>
mode === StreamMode.MAIN ||
mode === StreamMode.QR ||
mode === StreamMode.SYNCING;
mode === StreamMode.MAIN || mode === StreamMode.QR;

const checkMode = (mode: StreamMode) => {
if (isReadyMode(mode)) {
Expand Down
19 changes: 16 additions & 3 deletions src/tools/browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -292,25 +292,38 @@ export async function getPage(options?: LaunchArguments[1]) {
await preparePage(page);

setTimeout(async () => {
console.log('⏳ Waiting for WhatsApp Web to load...');
await page.goto(URL, {
waitUntil: 'domcontentloaded',
timeout: 120000,
});

console.log(
'✅ WhatsApp Web loaded, waiting for main stream to be ready...'
);
await page
.waitForFunction(
() => (window as any).Debug?.VERSION,
{},
{ timeout: 120000 }
)
.catch(() => null);
.catch(() => {
console.warn(
'⚠️ Timeout waiting for Debug.VERSION, main stream might not be ready'
);
});

const version = await page
.evaluate(() => (window as any).Debug.VERSION)
.catch(() => null);
.catch(() => {
console.warn(
'⚠️ Failed to get Debug.VERSION, main stream might not be ready'
);
return 'unknown';
});

console.log('WhatsApp Version: ', version);
}, 1000);
}, 2000);

return { browser, page };
}
Loading