mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add abortsignal to request

Browse Source
This commit is contained in:
kwaroran
2025-03-26 20:43:34 +09:00
parent 0d1260e7aa
commit 605489143d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ts/process/request.ts
View File

@@ -325,7 +325,7 @@ export async function requestChatData(arg:requestDataArgument, model:ModelModeEx
staticModel: fallBackModels[fallbackIndex] staticModel: fallBackModels[fallbackIndex]
}, model, abortSignal) }, model, abortSignal)
if(abortSignal.aborted){ if(abortSignal?.aborted){
return { return {
type: 'fail', type: 'fail',
result: 'Aborted' result: 'Aborted'
@@ -1765,11 +1765,11 @@ async function requestOobaLegacy(arg:RequestDataArgumentExtended):Promise<reques
oobaboogaSocket.onerror = () => resolve(1001) oobaboogaSocket.onerror = () => resolve(1001)
oobaboogaSocket.onclose = ({ code }) => resolve(code) oobaboogaSocket.onclose = ({ code }) => resolve(code)
}) })
if(abortSignal.aborted || statusCode !== 0) { if(abortSignal?.aborted || statusCode !== 0) {
oobaboogaSocket.close() oobaboogaSocket.close()
return ({ return ({
type: "fail", type: "fail",
result: abortSignal.reason || `WebSocket connection failed to '${streamUrl}' failed!`, result: abortSignal?.reason || `WebSocket connection failed to '${streamUrl}' failed!`,
}) })
} }
@@ -1798,7 +1798,7 @@ async function requestOobaLegacy(arg:RequestDataArgumentExtended):Promise<reques
}) })
oobaboogaSocket.onerror = close oobaboogaSocket.onerror = close
oobaboogaSocket.onclose = close oobaboogaSocket.onclose = close
abortSignal.addEventListener("abort", close) abortSignal?.addEventListener("abort", close)
return { return {
type: 'streaming', type: 'streaming',