Merge branch 'v2' of 何必https://github.com/ikechan8370/chatgpt-plugin into v2

apps/chat.js

@@ -7,8 +7,8 @@ import { uuid } from 'oicq/lib/common.js'
 import delay from 'delay'
 import { ChatGPTAPI } from 'chatgpt'
 import { ChatGPTClient, BingAIClient } from '@waylaidwanderer/chatgpt-api'
-import { getMessageById, makeForwardMsg, tryTimes, upsertMessage } from '../utils/common.js'
-import { ChatGPTPuppeteer, pTimeout } from '../utils/browser.js'
+import { getMessageById, makeForwardMsg, tryTimes, upsertMessage, pTimeout } from '../utils/common.js'
+import { ChatGPTPuppeteer } from '../utils/browser.js'
 import { KeyvFile } from 'keyv-file'
 import { OfficialChatGPTClient } from '../utils/message.js'
 // import puppeteer from '../utils/browser.js'
@@ -416,7 +416,7 @@ export class chatgpt extends plugin {
             return resolve(bingResponse)
           })
         response = await pTimeout(responseP, {
-          milliseconds: Config.defaultTimeoutMs,
+          milliseconds: Config.bingTimeoutMs,
           message: 'Bing timed out waiting for response'
         })
         if (response.details.adaptiveCards?.[0]?.body?.[0]?.text?.trim()) {

config/index.js

@@ -60,9 +60,11 @@ export const Config = {
   '2captchaToken': '',
   // http或socks5代理
   proxy: PROXY,
-  debug: false,
+  debug: true,
   // 各个地方的默认超时时间
-  defaultTimeoutMs: 1000 * 60 * 2,
+  defaultTimeoutMs: 120000,
+  // bing默认超时时间，bing太慢了有的时候
+  bingTimeoutMs: 360000,
   // 浏览器默认超时，浏览器可能需要更高的超时时间
   chromeTimeoutMS: 120000
 }

utils/browser.js

@@ -4,7 +4,8 @@ import StealthPlugin from 'puppeteer-extra-plugin-stealth'
 import { getOpenAIAuth } from './openai-auth.js'
 import delay from 'delay'
 import { v4 as uuidv4 } from 'uuid'
-
+import { pTimeout } from './common.js'
+console.log({ pTimeout })
 const chatUrl = 'https://chat.openai.com/chat'
 let puppeteer = {}
 
@@ -775,7 +776,7 @@ export async function browserPostEventStream (
           abortController.abort()
         }
       }
-
+      console.log({ pTimeout })
       return await pTimeout(responseP, {
         milliseconds: timeoutMs,
         message: 'ChatGPT timed out waiting for response'
@@ -816,7 +817,9 @@ export async function browserPostEventStream (
       conversationResponse
     }
   }
-
+  //  async function pTimeout (promise, option) {
+  //    return await pTimeout(promise, option)
+  //  }
   async function * streamAsyncIterable (stream) {
     const reader = stream.getReader()
     try {
@@ -999,15 +1002,89 @@ export async function browserPostEventStream (
     )
   }
 
-  /**
-     TODO: Remove AbortError and just throw DOMException when targeting Node 18.
-     */
-  function getDOMException (errorMessage) {
-    return globalThis.DOMException === undefined
-      ? new Error(errorMessage)
-      : new DOMException(errorMessage)
-  }
+  // @see https://github.com/sindresorhus/p-timeout
+  function pTimeout (
+    promise,
+    options
+  ) {
+    const {
+      milliseconds,
+      fallback,
+      message,
+      customTimers = { setTimeout, clearTimeout }
+    } = options
 
+    let timer
+
+    const cancelablePromise = new Promise((resolve, reject) => {
+      if (typeof milliseconds !== 'number' || Math.sign(milliseconds) !== 1) {
+        throw new TypeError(
+              `Expected \`milliseconds\` to be a positive number, got \`${milliseconds}\``
+        )
+      }
+
+      if (milliseconds === Number.POSITIVE_INFINITY) {
+        resolve(promise)
+        return
+      }
+
+      if (options.signal) {
+        const { signal } = options
+        if (signal.aborted) {
+          reject(getAbortedReason(signal))
+        }
+
+        signal.addEventListener('abort', () => {
+          reject(getAbortedReason(signal))
+        })
+      }
+
+      timer = customTimers.setTimeout.call(
+        undefined,
+        () => {
+          if (fallback) {
+            try {
+              resolve(fallback())
+            } catch (error) {
+              reject(error)
+            }
+
+            return
+          }
+
+          const errorMessage =
+                        typeof message === 'string'
+                          ? message
+                          : `Promise timed out after ${milliseconds} milliseconds`
+          const timeoutError =
+                        message instanceof Error ? message : new Error(errorMessage)
+
+          if (typeof promise.cancel === 'function') {
+            promise.cancel()
+          }
+
+          reject(timeoutError)
+        },
+        milliseconds
+      )
+      ;(async () => {
+        try {
+          resolve(await promise)
+        } catch (error) {
+          reject(error)
+        } finally {
+          customTimers.clearTimeout.call(undefined, timer)
+        }
+      })()
+    })
+
+    cancelablePromise.clear = () => {
+      customTimers.clearTimeout.call(undefined, timer)
+      timer = undefined
+    }
+
+    return cancelablePromise
+  }
   /**
      TODO: Remove below function and just 'reject(signal.reason)' when targeting Node 18.
      */
@@ -1019,88 +1096,12 @@ export async function browserPostEventStream (
 
     return reason instanceof Error ? reason : getDOMException(reason)
   }
-}
-
-// @see https://github.com/sindresorhus/p-timeout
-export function pTimeout (
-  promise,
-  options
-) {
-  const {
-    milliseconds,
-    fallback,
-    message,
-    customTimers = { setTimeout, clearTimeout }
-  } = options
-
-  let timer
-
-  const cancelablePromise = new Promise((resolve, reject) => {
-    if (typeof milliseconds !== 'number' || Math.sign(milliseconds) !== 1) {
-      throw new TypeError(
-                `Expected \`milliseconds\` to be a positive number, got \`${milliseconds}\``
-      )
-    }
-
-    if (milliseconds === Number.POSITIVE_INFINITY) {
-      resolve(promise)
-      return
-    }
-
-    if (options.signal) {
-      const { signal } = options
-      if (signal.aborted) {
-        reject(getAbortedReason(signal))
-      }
-
-      signal.addEventListener('abort', () => {
-        reject(getAbortedReason(signal))
-      })
-    }
-
-    timer = customTimers.setTimeout.call(
-      undefined,
-      () => {
-        if (fallback) {
-          try {
-            resolve(fallback())
-          } catch (error) {
-            reject(error)
-          }
-
-          return
-        }
-
-        const errorMessage =
-                        typeof message === 'string'
-                          ? message
-                          : `Promise timed out after ${milliseconds} milliseconds`
-        const timeoutError =
-                        message instanceof Error ? message : new Error(errorMessage)
-
-        if (typeof promise.cancel === 'function') {
-          promise.cancel()
-        }
-
-        reject(timeoutError)
-      },
-      milliseconds
-    )
-    ;(async () => {
-      try {
-        resolve(await promise)
-      } catch (error) {
-        reject(error)
-      } finally {
-        customTimers.clearTimeout.call(undefined, timer)
-      }
-    })()
-  })
-
-  cancelablePromise.clear = () => {
-    customTimers.clearTimeout.call(undefined, timer)
-    timer = undefined
+  /**
+     TODO: Remove AbortError and just throw DOMException when targeting Node 18.
+     */
+  function getDOMException (errorMessage) {
+    return globalThis.DOMException === undefined
+      ? new Error(errorMessage)
+      : new DOMException(errorMessage)
   }
-
-  return cancelablePromise
 }

utils/common.js

@@ -66,3 +66,106 @@ export async function makeForwardMsg (e, msg = [], dec = '') {
 
   return forwardMsg
 }
+
+// @see https://github.com/sindresorhus/p-timeout
+export async function pTimeout (
+  promise,
+  options
+) {
+  const {
+    milliseconds,
+    fallback,
+    message,
+    customTimers = { setTimeout, clearTimeout }
+  } = options
+
+  let timer
+
+  const cancelablePromise = new Promise((resolve, reject) => {
+    if (typeof milliseconds !== 'number' || Math.sign(milliseconds) !== 1) {
+      throw new TypeError(
+              `Expected \`milliseconds\` to be a positive number, got \`${milliseconds}\``
+      )
+    }
+
+    if (milliseconds === Number.POSITIVE_INFINITY) {
+      resolve(promise)
+      return
+    }
+
+    if (options.signal) {
+      const { signal } = options
+      if (signal.aborted) {
+        reject(getAbortedReason(signal))
+      }
+
+      signal.addEventListener('abort', () => {
+        reject(getAbortedReason(signal))
+      })
+    }
+
+    timer = customTimers.setTimeout.call(
+      undefined,
+      () => {
+        if (fallback) {
+          try {
+            resolve(fallback())
+          } catch (error) {
+            reject(error)
+          }
+
+          return
+        }
+
+        const errorMessage =
+                        typeof message === 'string'
+                          ? message
+                          : `Promise timed out after ${milliseconds} milliseconds`
+        const timeoutError =
+                        message instanceof Error ? message : new Error(errorMessage)
+
+        if (typeof promise.cancel === 'function') {
+          promise.cancel()
+        }
+
+        reject(timeoutError)
+      },
+      milliseconds
+    )
+    ;(async () => {
+      try {
+        resolve(await promise)
+      } catch (error) {
+        reject(error)
+      } finally {
+        customTimers.clearTimeout.call(undefined, timer)
+      }
+    })()
+  })
+
+  cancelablePromise.clear = () => {
+    customTimers.clearTimeout.call(undefined, timer)
+    timer = undefined
+  }
+
+  return cancelablePromise
+}
+/**
+     TODO: Remove below function and just 'reject(signal.reason)' when targeting Node 18.
+     */
+function getAbortedReason (signal) {
+  const reason =
+            signal.reason === undefined
+              ? getDOMException('This operation was aborted.')
+              : signal.reason
+
+  return reason instanceof Error ? reason : getDOMException(reason)
+}
+/**
+     TODO: Remove AbortError and just throw DOMException when targeting Node 18.
+     */
+function getDOMException (errorMessage) {
+  return globalThis.DOMException === undefined
+    ? new Error(errorMessage)
+    : new DOMException(errorMessage)
+}

utils/openai-auth.js

@@ -69,9 +69,9 @@ export async function getOpenAIAuth (opt) {
           }),
           page.click('#__next .btn-primary')
         ])
-        await delay(500)
+        await delay(1000)
       } while (page.url().endsWith('/auth/login'))
-
+      logger.mark('进入登录页面')
       await checkForChatGPTAtCapacity(page)
 
       let submitP