morgan/chatgpt-web
1
0
Fork 0
mirror of https://github.com/morgan9e/chatgpt-web synced 2026-04-13 16:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

attempt to fix websocket timeouts

Browse Source
This commit is contained in:
Webifi
2023-08-31 20:25:19 -05:00
parent 57f6423f13
commit b4780dc036
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/providers/petals/request.svelte
View File

@@ -214,7 +214,7 @@ export const chatRequest = async (
} }
}) })
const wsOpen = (ws && ws.readyState !== WebSocket.CLOSED) const wsOpen = (ws && ws.readyState === WebSocket.OPEN)
if (!chatSettings.holdSocket || wsOpen) { if (!chatSettings.holdSocket || wsOpen) {
const rgxp = new RegExp('(<s>|</s>|\\s|' + escapeRegex(stopSequence) + ')', 'g') const rgxp = new RegExp('(<s>|</s>|\\s|' + escapeRegex(stopSequence) + ')', 'g')
@@ -227,7 +227,7 @@ export const chatRequest = async (
} }
} }
if (!ws || ws.readyState === WebSocket.CLOSED) { if (!ws || ws.readyState !== WebSocket.OPEN) {
ws = await getNewWs() ws = await getNewWs()
} }
@@ -255,13 +255,14 @@ export const chatRequest = async (
chatResponse.setPromptTokenCount(countTokens(model, providerData.knownBuffer)) chatResponse.setPromptTokenCount(countTokens(model, providerData.knownBuffer))
ws.onmessage = event => { ws.onmessage = event => {
// Remove updating indicator // Remove updating indicator
chatRequest.updating = 1 // hide indicator, but still signal we're updating chatRequest.updating = chatRequest.updating && 1 // hide indicator, but still signal we're updating
chatRequest.updatingMessage = '' chatRequest.updatingMessage = ''
const response = JSON.parse(event.data) const response = JSON.parse(event.data)
if (!response.ok) { if (!response.ok) {
if (response.traceback.includes('Maximum length exceeded')) { if (response.traceback.includes('Maximum length exceeded')) {
return chatResponse.finish('length') return chatResponse.finish('length')
} }
if (!chatRequest.updating) return
const err = new Error('Error in response: ' + response.traceback) const err = new Error('Error in response: ' + response.traceback)
console.error(err) console.error(err)
chatResponse.updateFromError(err.message) chatResponse.updateFromError(err.message)