From 757982c61b900e85e153fe713f2e2c1622c249d4 Mon Sep 17 00:00:00 2001 From: Travis Fischer Date: Thu, 15 Dec 2022 19:00:09 -0600 Subject: [PATCH] fix: timeouts for browser --- legacy/src/chatgpt-api-browser.ts | 5 ++++- legacy/src/openai-auth.ts | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/legacy/src/chatgpt-api-browser.ts b/legacy/src/chatgpt-api-browser.ts index 9e2df389..6c2ef65e 100644 --- a/legacy/src/chatgpt-api-browser.ts +++ b/legacy/src/chatgpt-api-browser.ts @@ -262,7 +262,10 @@ export class ChatGPTAPIBrowser { const markdownMessages = htmlMessages.map((messageHtml) => { // parse markdown from message HTML - messageHtml = messageHtml.replace('Copy code', '') + messageHtml = messageHtml + .replaceAll('Copy code', '') + .replace(/Copy code\s*<\/button>/gim, '') + return html2md(messageHtml, { ignoreTags: [ 'button', diff --git a/legacy/src/openai-auth.ts b/legacy/src/openai-auth.ts index f2b9057b..95226723 100644 --- a/legacy/src/openai-auth.ts +++ b/legacy/src/openai-auth.ts @@ -71,7 +71,7 @@ export async function getOpenAIAuth({ } await page.goto('https://chat.openai.com/auth/login', { - waitUntil: 'networkidle0' + waitUntil: 'networkidle2' }) // NOTE: this is where you may encounter a CAPTCHA @@ -93,7 +93,8 @@ export async function getOpenAIAuth({ // click login button and wait for navigation to finish await Promise.all([ page.waitForNavigation({ - waitUntil: 'networkidle0' + waitUntil: 'networkidle2', + timeout: timeoutMs }), page.click('#__next .btn-primary') @@ -134,7 +135,8 @@ export async function getOpenAIAuth({ await Promise.all([ waitForConditionOrAtCapacity(page, () => page.waitForNavigation({ - waitUntil: 'networkidle0' + waitUntil: 'networkidle2', + timeout: timeoutMs }) ), submitP()