From daf2118ebbcbaec8221a9018e357fb5502de9e5e Mon Sep 17 00:00:00 2001
From: aegkmq <140575296+aegkmq@users.noreply.github.com>
Date: Tue, 1 Aug 2023 18:20:52 +0900
Subject: [PATCH] [fix] meaningless stream.cancel()

---
 src/ts/process/request.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index 8d7ec3a7..915c13ce 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -418,13 +418,16 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                     })
                 }
 
+                const close = () => {
+                    oobaboogaSocket.close()
+                }
                 const stream = new ReadableStream({
                     start(controller){
                         let readed = "";
                         oobaboogaSocket.onmessage = async (event) => {
                             const json = JSON.parse(event.data);
                             if (json.event === "stream_end") {
-                                oobaboogaSocket.close()
+                                close()
                                 controller.close()
                                 return
                             }
@@ -435,13 +438,12 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                         oobaboogaSocket.send(JSON.stringify(bodyTemplate));
                     },
                     cancel(){
-                        oobaboogaSocket.close()
+                        close()
                     }
                 })
-                const cancel = () => stream.cancel()
-                oobaboogaSocket.onerror = cancel
-                oobaboogaSocket.onclose = cancel
-                abortSignal.addEventListener("abort", cancel)
+                oobaboogaSocket.onerror = close
+                oobaboogaSocket.onclose = close
+                abortSignal.addEventListener("abort", close)
 
                 return {
                     type: 'streaming',