From d685b7800c8ffd170b878e08086ed48ec0384e5a Mon Sep 17 00:00:00 2001 From: Travis Fischer Date: Fri, 16 Dec 2022 17:12:28 -0600 Subject: [PATCH] fix: minor cleanups of executablePath --- src/chatgpt-api-browser.ts | 10 ++++------ src/openai-auth.ts | 6 ++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/chatgpt-api-browser.ts b/src/chatgpt-api-browser.ts index 10261e2..aac232d 100644 --- a/src/chatgpt-api-browser.ts +++ b/src/chatgpt-api-browser.ts @@ -3,11 +3,7 @@ import type { Browser, HTTPRequest, HTTPResponse, Page } from 'puppeteer' import { v4 as uuidv4 } from 'uuid' import * as types from './types' -import { - defaultChromeExecutablePath, - getBrowser, - getOpenAIAuth -} from './openai-auth' +import { getBrowser, getOpenAIAuth } from './openai-auth' import { browserPostEventStream, isRelevantRequest, @@ -63,7 +59,7 @@ export class ChatGPTAPIBrowser { isGoogleLogin = false, minimize = true, captchaToken, - browserPath = defaultChromeExecutablePath() + browserPath } = opts this._email = email @@ -95,6 +91,8 @@ export class ChatGPTAPIBrowser { this._page.on('request', this._onRequest.bind(this)) this._page.on('response', this._onResponse.bind(this)) + maximizePage(this._page) + // bypass cloudflare and login await getOpenAIAuth({ email: this._email, diff --git a/src/openai-auth.ts b/src/openai-auth.ts index 66abf9e..51ec6f8 100644 --- a/src/openai-auth.ts +++ b/src/openai-auth.ts @@ -46,7 +46,8 @@ export async function getOpenAIAuth({ page, timeoutMs = 2 * 60 * 1000, isGoogleLogin = false, - captchaToken = process.env.CAPTCHA_TOKEN + captchaToken = process.env.CAPTCHA_TOKEN, + executablePath }: { email?: string password?: string @@ -55,13 +56,14 @@ export async function getOpenAIAuth({ timeoutMs?: number isGoogleLogin?: boolean captchaToken?: string + executablePath?: string }): Promise { const origBrowser = browser const origPage = page try { if (!browser) { - browser = await getBrowser({ captchaToken }) + browser = await getBrowser({ captchaToken, executablePath }) } const userAgent = await browser.userAgent()