From ae1d84ead545139f7c6d93cb08170fd181b6340b Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Sat, 6 Apr 2024 06:11:04 +0900
Subject: [PATCH] Update loadPages value in DefaultChatScreen.svelte and fix
 request

---
 src/lib/ChatScreens/DefaultChatScreen.svelte |  4 ++--
 src/ts/process/request.ts                    | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte
index 412b3070..86bca283 100644
--- a/src/lib/ChatScreens/DefaultChatScreen.svelte
+++ b/src/lib/ChatScreens/DefaultChatScreen.svelte
@@ -374,7 +374,7 @@
                 mergedCanvas.remove();
             }
             alertNormal(language.screenshotSaved)
-            loadPages = 30   
+            loadPages = 15   
         } catch (error) {
             console.error(error)
             alertError("Error while taking screenshot")
@@ -397,7 +397,7 @@
             //@ts-ignore  
             const scrolled = (e.target.scrollHeight - e.target.clientHeight + e.target.scrollTop)
             if(scrolled < 100 && $CurrentChat.message.length > loadPages){
-                loadPages += 30
+                loadPages += 15
             }
         }}>
             <div class="flex items-end mt-2 mb-2 w-full">
diff --git a/src/ts/process/request.ts b/src/ts/process/request.ts
index d964531a..fca77153 100644
--- a/src/ts/process/request.ts
+++ b/src/ts/process/request.ts
@@ -1820,14 +1820,21 @@ export async function requestChatDataMain(arg:requestDataArgument, model:'model'
                                     await sleep(1000)
                                     continue
                                 }
-                                const {done, value} = await reader.read()
-                                if(done){
-                                    if(rerequesting){
-                                        continue
+                                try {
+                                    if(reader.closed){
+                                        
                                     }
-                                    break
+                                    const {done, value} = await reader.read() 
+                                    if(done){
+                                        if(rerequesting){
+                                            continue
+                                        }
+                                        break
+                                    }
+                                    parser.feed(decoder.decode(value))                                   
+                                } catch (error) {
+                                    await sleep(1)
                                 }
-                                parser.feed(decoder.decode(value))
                             }
                             controller.close()
                         },