[Web] fix abort in structured mode

Cerlancism · Sep 28, 2024 · 209cc67 · 209cc67
1 parent 8149cee
commit 209cc67
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 82 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@nextui-org/react": "2.2.10",
-    "chatgpt-subtitle-translator": "github:Cerlancism/chatgpt-subtitle-translator#137e1cc02b70a85e694f45713078402b8bccc15c",
+    "chatgpt-subtitle-translator": "github:Cerlancism/chatgpt-subtitle-translator#8149ceebb24d216b21c52ce44927b80287528692",
     "next": "14.2.13",
     "react": "^18",
     "react-dom": "^18"

diff --git a/web/src/components/TranslatorApplication.jsx b/web/src/components/TranslatorApplication.jsx
@@ -76,8 +76,7 @@ export function TranslatorApplication() {
     setBaseUrlWithModerator(value)
   }
 
-  function setBaseUrlWithModerator(value)
-  {
+  function setBaseUrlWithModerator(value) {
     if (!baseUrlValue && value && useModerator) {
       setUseModerator(false)
     }
@@ -116,6 +115,9 @@ export function TranslatorApplication() {
       },
       onStreamEnd: () => {
         currentStream = ""
+        if (translatorRef.current?.aborted) {
+          return
+        }
         setStreamOutput("")
       },
       moderationService: {
@@ -137,10 +139,10 @@ export function TranslatorApplication() {
     }
 
     try {
+      setStreamOutput("")
       for await (const output of translatorRef.current.translateLines(inputs)) {
         if (!translatorRunningRef.current) {
           console.error("[User Interface]", "Aborted")
-          setStreamOutput("")
           break
         }
         currentOutputs.push(output.finalTransform)