fix: ptimout not defined

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'

utils/browser.js

@@ -4,6 +4,7 @@ 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'
 
 const chatUrl = 'https://chat.openai.com/chat'
 let puppeteer = {}
@@ -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 {
@@ -1020,87 +1023,3 @@ 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
-  }
-
-  return cancelablePromise
-}

utils/common.js

@@ -66,3 +66,87 @@ export async function makeForwardMsg (e, msg = [], dec = '') {
 
   return forwardMsg
 }
+
+// @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
+  }
+
+  return cancelablePromise
+}