Skip to content

Commit c9cb613

Browse files
committed
fix the error caused by the unnecessary ArkoseToken for free accounts (#661)
1 parent 66a14bf commit c9cb613

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/services/apis/chatgpt-web.mjs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,21 +160,22 @@ export async function generateAnswersWithChatgptWebApi(port, question, session,
160160
)
161161

162162
const config = await getUserConfig()
163-
// eslint-disable-next-line no-unused-vars
163+
let arkoseError
164164
const [models, requirementsToken, arkoseToken, useWebsocket] = await Promise.all([
165-
getModels(accessToken).catch(cleanController), // don't throw error here
166-
getRequirementsToken(accessToken),
167-
getArkoseToken(config),
168-
isNeedWebsocket(accessToken).catch(cleanController), // don't throw error here
169-
]).catch((e) => {
170-
cleanController()
171-
throw e
172-
})
165+
getModels(accessToken).catch(() => undefined),
166+
getRequirementsToken(accessToken).catch(() => undefined),
167+
getArkoseToken(config).catch((e) => {
168+
arkoseError = e
169+
}),
170+
isNeedWebsocket(accessToken).catch(() => undefined),
171+
])
173172
console.debug('models', models)
174173
const selectedModel = Models[session.modelName].value
175174
const usedModel =
176175
models && models.includes(selectedModel) ? selectedModel : Models[chatgptWebModelKeys[0]].value
177176
console.debug('usedModel', usedModel)
177+
const needArkoseToken = !usedModel.includes(Models[chatgptWebModelKeys[0]].value)
178+
if (arkoseError && needArkoseToken) throw arkoseError
178179

179180
let cookie
180181
let oaiDeviceId

0 commit comments

Comments
 (0)