MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 13:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 修复了另一个可能导致not sign in得问题

Browse source
This commit is contained in:
葛胤池 2022-12-20 20:22:33 +08:00
parent 872a191022
commit e2baa4dfc1
1 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

39
utils/browser.js
View file

@ -130,6 +130,7 @@ export class ChatGPTPuppeteer extends Puppeteer {
// if (this.inited) { // if (this.inited) {
// return true // return true
// } // }
logger.info('init chatgpt browser')
try { try {
// this.browser = await getBrowser({ // this.browser = await getBrowser({
// captchaToken: this._captchaToken, // captchaToken: this._captchaToken,
@ -146,23 +147,32 @@ export class ChatGPTPuppeteer extends Puppeteer {
if (preCookies) { if (preCookies) {
await this._page.setCookie(...JSON.parse(preCookies)) await this._page.setCookie(...JSON.parse(preCookies))
} }
// const url = this._page.url().replace(/\/$/, '')
await this._page.goto(chatUrl, { await this._page.goto(chatUrl, {
waitUntil: 'networkidle2' waitUntil: 'networkidle2'
}) })
let timeout = 30000
try { try {
while ((await this._page.title()).toLowerCase().indexOf('moment') > -1) { while (timeout > 0 && (await this._page.title()).toLowerCase().indexOf('moment') > -1) {
// if meet captcha // if meet captcha
// await this._page.solveRecaptchas() if (Config['2captchaToken']) {
await this._page.solveRecaptchas()
}
await delay(300) await delay(300)
timeout = timeout - 300
} }
} catch (e) { } catch (e) {
// navigation后获取title会报错，报错说明已经在navigation了正合我意。 // navigation后获取title会报错，报错说明已经在navigation了正合我意。
} }
if (timeout < 0) {
logger.error('wait for cloudflare navigation timeout. 可能遇见验证码')
throw new Error('wait for cloudflare navigation timeout. 可能遇见验证码')
}
try { try {
await this._page.waitForNavigation({ timeout: 3000 }) await this._page.waitForNavigation({ timeout: 3000 })
} catch (e) { } catch (e) {}
logger.error(e)
}
if (!await this.getIsAuthenticated()) { if (!await this.getIsAuthenticated()) {
await redis.del('CHATGPT:RAW_COOKIES') await redis.del('CHATGPT:RAW_COOKIES')
logger.info('需要登录，准备进行自动化登录') logger.info('需要登录，准备进行自动化登录')
@ -173,7 +183,7 @@ export class ChatGPTPuppeteer extends Puppeteer {
page: this._page, page: this._page,
isGoogleLogin: this._isGoogleLogin isGoogleLogin: this._isGoogleLogin
}) })
logger.info('登陆完成') logger.info('登录完成')
} else { } else {
logger.info('无需登录') logger.info('无需登录')
} }
@ -304,7 +314,6 @@ export class ChatGPTPuppeteer extends Puppeteer {
await this.handle403Error() await this.handle403Error()
} else { } else {
const session = body const session = body
if (session?.accessToken) { if (session?.accessToken) {
this._accessToken = session.accessToken this._accessToken = session.accessToken
} }
@ -431,9 +440,21 @@ export class ChatGPTPuppeteer extends Puppeteer {
`chatgpt error re-authenticating ${this._email}`, `chatgpt error re-authenticating ${this._email}`,
err.toString() err.toString()
) )
throw err
} }
let timeout = 10000
if (!isAuthenticated || !this._accessToken) { if (isAuthenticated) {
while (!this._accessToken) {
// wait for async response hook result
await delay(300)
timeout = timeout - 300
if (timeout < 0) {
const error = new Error('Not signed in')
error.statusCode = 401
throw error
}
}
} else if (!this._accessToken) {
const error = new Error('Not signed in') const error = new Error('Not signed in')
error.statusCode = 401 error.statusCode = 401
throw error throw error