fix: abort not being sent

Vali-98 · Dec 4, 2024 · 657947d · 657947d
1 parent 9de9c76
commit 657947d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/constants/API/APIBuilder.ts b/constants/API/APIBuilder.ts
@@ -92,12 +92,12 @@ const readableStreamResponse = async (
     const closeStream = () => {
         Logger.debug('Running close stream')
         Chats.useChat.getState().stopGenerating()
-        sse.abort()
     }
 
     useInference.getState().setAbort(async () => {
         Logger.debug('Running abort')
         closeStream()
+        sse.abort()
     })
 
     sse.setOnEvent((data) => {
@@ -107,10 +107,7 @@ const readableStreamResponse = async (
     })
 
     sse.setOnError(() => {
-        // if ('message' in event) {
         Logger.log('Generation Failed', true)
-        // Logger.log(`An error occured : ${event?.message ?? ''}`)
-
         closeStream()
     })
 

diff --git a/constants/SSEFetch.ts b/constants/SSEFetch.ts
@@ -30,6 +30,7 @@ export class SSEFetch {
         }).then(async (res) => {
             if (res.status !== 200 || !res.body) return this.onError()
             for await (const chunk of res.body) {
+                if (this.abortController.signal.aborted) break
                 const data = this.decoder.decode(chunk)
                 const output = parseSSE(data)
                 output.forEach((item) => this.onEvent(item))