feat: fix capacity error

transitive-bullshit · Dec 15, 2022 · 0385b8d · 0385b8d
1 parent 61e9148
commit 0385b8d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 164 deletions.
diff --git a/package.json b/package.json
@@ -40,7 +40,6 @@
     "expiry-map": "^2.0.0",
     "p-timeout": "^6.0.0",
     "puppeteer-extra": "^3.3.4",
-    "puppeteer-extra-plugin-recaptcha": "^3.6.6",
     "puppeteer-extra-plugin-stealth": "^2.11.1",
     "remark": "^14.0.2",
     "strip-markdown": "^5.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.ts b/src/index.ts
@@ -3,5 +3,3 @@ export * from './chatgpt-conversation'
 export * from './types'
 export * from './utils'
 export * from './openai-auth'
-export * from './openai-auth-2captcha'
-
diff --git a/src/openai-auth-2captcha.ts b/src/openai-auth-2captcha.ts
diff --git a/src/openai-auth.ts b/src/openai-auth.ts
@@ -69,13 +69,8 @@ export async function getOpenAIAuth({
 
     await page.goto('https://chat.openai.com/auth/login')
 
-    await checkForChatGPTAtCapacity(page)
-
     // NOTE: this is where you may encounter a CAPTCHA
-    var capacityLimit = await page.$('[role="alert"]')
-    if (capacityLimit) {
-      throw `ChatGPT is at capacity right now`
-    }
+    await checkForChatGPTAtCapacity(page)
 
     await page.waitForSelector('#__next .btn-primary', { timeout: timeoutMs })
 
@@ -231,15 +226,15 @@ export const defaultChromeExecutablePath = (): string => {
 }
 
 async function checkForChatGPTAtCapacity(page: Page) {
-  let res: ElementHandle<Element> | null
+  let res: ElementHandle<Node>[]
 
   try {
-    res = await page.$('[role="alert"]')
+    res = await page.$x("//div[contains(., 'ChatGPT is at capacity')]")
   } catch (err) {
     // ignore errors likely due to navigation
   }
 
-  if (res) {
+  if (res?.length) {
     const error = new types.ChatGPTError(`ChatGPT is at capacity: ${res}`)
     error.statusCode = 503
     throw error