fix: #155

AgoraIO-Extensions · Oct 27, 2023 · 9954449 · 9954449
1 parent ec3e53e
commit 9954449
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/packages/agora-rtc-react/src/hooks/useJoin.ts b/packages/agora-rtc-react/src/hooks/useJoin.ts
@@ -1,8 +1,10 @@
 import type { IAgoraRTCClient, IAgoraRTCError, UID } from "agora-rtc-sdk-ng";
-import { useState } from "react";
+import { useRef, useState } from "react";
 
 import { AgoraRTCReactError } from "../error";
 import { useRTCClient } from "../hooks/useRTCClient";
+import type { AsyncTaskRunner } from "../misc/utils";
+import { createAsyncTaskRunner, joinDisposers } from "../misc/utils";
 import type { FetchArgs } from "../types";
 
 import { useAsyncEffect, useIsUnmounted } from "./tools";
@@ -47,6 +49,7 @@ export function useJoin(
 ): { data: UID; isLoading: boolean; isConnected: boolean; error: AgoraRTCReactError | null } {
   const resolvedClient = useRTCClient(client);
   const isConnected = useIsConnected(client);
+  const runnerRef = useRef<AsyncTaskRunner | undefined>();
 
   const [isLoading, setIsLoading] = useState(false);
   const [joinResult, setJoinResult] = useState<UID>(0);
@@ -80,15 +83,26 @@ export function useJoin(
       if (!isUnmountRef.current) {
         setIsLoading(false);
       }
-      return () => {
-        for (const track of resolvedClient.localTracks) {
-          if (track.isPlaying) {
-            track.stop();
+
+      const runner = (runnerRef.current ||= createAsyncTaskRunner());
+
+      return joinDisposers([
+        () => {
+          runner.dispose();
+        },
+        () => {
+          runner.run(() => resolvedClient.unpublish(resolvedClient.localTracks));
+        },
+        () => {
+          for (const track of resolvedClient.localTracks) {
+            if (track.isPlaying) {
+              track.stop();
+            }
+            track.close();
           }
-          track.close();
-        }
-        return resolvedClient.leave();
-      };
+          runner.run(() => resolvedClient.leave());
+        },
+      ]);
     }
   }, [ready, client]);
   return {

diff --git a/packages/agora-rtc-react/src/hooks/usePublish.ts b/packages/agora-rtc-react/src/hooks/usePublish.ts
@@ -80,6 +80,11 @@ export function usePublish(
       const track = filterTracks[i];
       if (track) {
         if (canPublish(track)) {
+          await resolvedClient.unpublish(
+            pubTracks.current.filter(
+              pubTrack => pubTrack?.trackMediaType === track.trackMediaType,
+            ) as ILocalTrack[],
+          );
           try {
             if (!isUnmountRef.current) {
               setIsLoading(true);

diff --git a/packages/agora-rtc-react/src/hooks/useRemoteAudioTracks.ts b/packages/agora-rtc-react/src/hooks/useRemoteAudioTracks.ts
@@ -50,9 +50,6 @@ export function useRemoteAudioTracks(
   useAsyncEffect(async () => {
     if (!isUnmountRef.current) {
       setError(null);
-      if (!isConnected) {
-        setTracks([]);
-      }
     }
 
     if (!Array.isArray(users) || !isConnected) return;

diff --git a/packages/agora-rtc-react/src/hooks/useRemoteVideoTracks.ts b/packages/agora-rtc-react/src/hooks/useRemoteVideoTracks.ts
@@ -49,9 +49,6 @@ export function useRemoteVideoTracks(
   useAsyncEffect(async () => {
     if (!isUnmountRef.current) {
       setError(null);
-      if (!isConnected) {
-        setTracks([]);
-      }
     }
 
     if (!Array.isArray(users) || !isConnected) return;