update

TabbyML · May 28, 2024 · 9041761 · 9041761
1 parent 6ff5ede
commit 9041761
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
@@ -39,19 +39,21 @@ export interface ChatMessage {
   relevantContext?: Array<Context>
 }
 
-export function createClient(target: HTMLIFrameElement, api: ClientApi): ServerApi {
+export function createClient(target: HTMLIFrameElement, api: ClientApi, signal?: AbortSignal): ServerApi {
   return createThreadFromIframe(target, {
     expose: {
       navigate: api.navigate,
     },
+    signal
   })
 }
 
-export function createServer(api: ServerApi): ClientApi {
+export function createServer(api: ServerApi, signal?: AbortSignal): ClientApi {
   return createThreadFromInsideIframe({
     expose: {
       init: api.init,
       sendMessage: api.sendMessage,
     },
+    signal
   })
 }
diff --git a/clients/tabby-chat-panel/src/react.ts b/clients/tabby-chat-panel/src/react.ts
@@ -6,12 +6,14 @@ import { createClient, createServer } from './index'
 
 function useClient(iframeRef: RefObject<HTMLIFrameElement>, api: ClientApi) {
   const [client, setClient] = useState<ServerApi | null>(null)
-  let isCreated = false
+  let abortController: AbortController
 
   useEffect(() => {
-    if (iframeRef.current && !isCreated) {
-      isCreated = true
-      setClient(createClient(iframeRef.current, api))
+    if (iframeRef.current) {
+      console.log('client abortController', abortController)
+      abortController?.abort()
+      setClient(createClient(iframeRef.current, api, abortController?.signal))
+      abortController = new AbortController()
     }
   }, [iframeRef.current])
 
@@ -20,13 +22,15 @@ function useClient(iframeRef: RefObject<HTMLIFrameElement>, api: ClientApi) {
 
 function useServer(api: ServerApi) {
   const [server, setServer] = useState<ClientApi | null>(null)
-  let isCreated = false
+  let abortController: AbortController
 
   useEffect(() => {
     const isInIframe = window.self !== window.top
-    if (isInIframe && !isCreated) {
-      isCreated = true
-      setServer(createServer(api))
+    if (isInIframe) {
+      console.log('server abortController', abortController)
+      abortController?.abort()
+      setServer(createServer(api, abortController?.signal))
+      abortController = new AbortController()
     }
   }, [])