Fixed redirect when terminal closed

xianyuntang · Jan 13, 2025 · 83b7ce5 · 83b7ce5
1 parent 5296274
commit 83b7ce5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/components/pages/terminals-page/terminal-view/terminal-view.tsx b/src/components/pages/terminals-page/terminal-view/terminal-view.tsx
@@ -46,6 +46,9 @@ export const TerminalView = ({ terminal }: TerminalViewProps) => {
 
   const activeTerminal = useTerminalStore((state) => state.activeTerminal);
   const removeTerminal = useTerminalStore((state) => state.removeTerminal);
+  const setActiveTerminal = useTerminalStore(
+    (state) => state.setActiveTerminal
+  );
 
   const theme = useTheme();
   const resize = useDebounceCallback(() => fitAddon.current.fit(), 100);
@@ -192,7 +195,7 @@ export const TerminalView = ({ terminal }: TerminalViewProps) => {
 
   useEffect(() => {
     if (isError) {
-      setStatus(StatusType.ConnectionError)
+      setStatus(StatusType.ConnectionError);
     }
   }, [isError]);
 
@@ -205,6 +208,7 @@ export const TerminalView = ({ terminal }: TerminalViewProps) => {
 
   const handleTerminalClose = async () => {
     removeTerminal(terminal);
+    setActiveTerminal(null);
   };
 
   const handleAgentClose = async () => {
@@ -227,6 +231,7 @@ export const TerminalView = ({ terminal }: TerminalViewProps) => {
     } else {
       await futureService.stopFuture(terminal);
       removeTerminal(terminal);
+      setActiveTerminal(null);
     }
   };
 

diff --git a/src/core/invoker.ts b/src/core/invoker.ts
@@ -21,7 +21,20 @@ export const invoker = async <T>(
     const { data } = await invoke<{ data: T }>(command, args);
     return data;
   } catch (e) {
-    console.error(e);
-    throw new InvokerError(JSON.parse(e as string).error);
+    let errorMessage: string;
+    if (typeof e === "string") {
+      try {
+        const parsedError = JSON.parse(e);
+        errorMessage = parsedError.error || "Unknown error occurred.";
+      } catch {
+        errorMessage = e;
+      }
+    } else if (e instanceof Error) {
+      errorMessage = e.message;
+    } else {
+      errorMessage = "An unknown error occurred.";
+    }
+
+    throw new InvokerError(errorMessage);
   }
 };