refactor: move processStreamChunk and processRemainingMetricsBuffer to lib

Author: Shishir435

src/background/handlers/handle-chat-stream.ts

@@ -1,37 +1,9 @@
-import { processStreamChunk } from "@/background/handlers/process-stream-chunk"
+import {
+  processRemainingMetricsBuffer,
+  processStreamChunk
+} from "@/background/lib/process-stream-chunk"
 import { safePostMessage } from "@/background/lib/utils"
-import type {
-  ChromePort,
-  OllamaChatResponse,
-  PortStatusFunction
-} from "@/types"
-
-const processRemainingBuffer = (
-  buffer: string,
-  fullText: string,
-  port: ChromePort
-): void => {
-  try {
-    const data: OllamaChatResponse = JSON.parse(buffer.trim())
-    if (data.done === true) {
-      console.log("Final completion from buffer")
-      safePostMessage(port, {
-        done: true,
-        content: fullText,
-        metrics: {
-          total_duration: data.total_duration,
-          load_duration: data.load_duration,
-          prompt_eval_count: data.prompt_eval_count,
-          prompt_eval_duration: data.prompt_eval_duration,
-          eval_count: data.eval_count,
-          eval_duration: data.eval_duration
-        }
-      })
-    }
-  } catch (parseError) {
-    console.warn("Failed to parse final buffer:", buffer, parseError)
-  }
-}
+import type { ChromePort, PortStatusFunction } from "@/types"
 
 export const handleChatStream = async (
   response: Response,
@@ -55,13 +27,12 @@ export const handleChatStream = async (
   let buffer = ""
   let hasReceivedData = false
 
-  // Add timeout for stuck connections - declare timeoutId in proper scope
   let timeoutId: NodeJS.Timeout | null = null
 
   try {
     timeoutId = setTimeout(() => {
       if (!hasReceivedData) {
-        console.warn("No data received within 10 seconds, aborting")
+        console.warn("No data received within 60 seconds, aborting")
         reader.cancel().catch(console.error)
         safePostMessage(port, {
           error: {
@@ -70,7 +41,7 @@ export const handleChatStream = async (
           }
         })
       }
-    }, 30000) // 30 second timeout
+    }, 60000)
 
     while (true) {
       const { value, done } = await reader.read()
@@ -79,21 +50,18 @@ export const handleChatStream = async (
         break
       }
 
-      // Mark that we've received data
       if (!hasReceivedData) {
         hasReceivedData = true
         if (timeoutId) clearTimeout(timeoutId)
         console.log("[Handle chat stream]First data chunk received")
       }
 
-      // Check if port is still connected before processing
       if (isPortClosed()) {
         reader.cancel().catch(console.error)
         if (timeoutId) clearTimeout(timeoutId)
         break
       }
 
-      // Process the streaming data
       const processResult = processStreamChunk(
         value,
         decoder,
@@ -110,9 +78,8 @@ export const handleChatStream = async (
       }
     }
 
-    // Process any remaining data in buffer
     if (buffer.trim() && !isPortClosed()) {
-      processRemainingBuffer(buffer, fullText, port)
+      processRemainingMetricsBuffer(buffer, fullText, port)
     }
   } catch (error) {
     console.error("Stream processing error:", error)

src/background/handlers/process-stream-chunk.ts renamed to src/background/lib/process-stream-chunk.ts

@@ -54,3 +54,30 @@ export const processStreamChunk = (
 
   return { buffer, fullText, isDone: false }
 }
+
+export const processRemainingMetricsBuffer = (
+  buffer: string,
+  fullText: string,
+  port: ChromePort
+): void => {
+  try {
+    const data: OllamaChatResponse = JSON.parse(buffer.trim())
+    if (data.done === true) {
+      console.log("Final completion from buffer")
+      safePostMessage(port, {
+        done: true,
+        content: fullText,
+        metrics: {
+          total_duration: data.total_duration,
+          load_duration: data.load_duration,
+          prompt_eval_count: data.prompt_eval_count,
+          prompt_eval_duration: data.prompt_eval_duration,
+          eval_count: data.eval_count,
+          eval_duration: data.eval_duration
+        }
+      })
+    }
+  } catch (parseError) {
+    console.warn("Failed to parse final buffer:", buffer, parseError)
+  }
+}