fix(rtc): 修复无法在语音会话中切换频道的bug

TRPGEngine · May 23, 2021 · 34db8ab · 34db8ab
1 parent 1658174
commit 34db8ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/rtc/RoomClient.ts b/src/rtc/RoomClient.ts
@@ -242,11 +242,6 @@ export class RoomClient {
 
     logger.debug('close()');
 
-    // Close protoo Peer
-    if (!_isNil(this._protoo)) {
-      this._protoo.close();
-    }
-
     await this.disableAll();
 
     {
@@ -266,6 +261,11 @@ export class RoomClient {
       this._recvTransport.close();
     }
 
+    // Close protoo Peer
+    if (!_isNil(this._protoo)) {
+      this._protoo.close();
+    }
+
     store.dispatch(stateActions.setRoomId(null));
     store.dispatch(stateActions.setRoomState('closed'));
   }
@@ -1375,9 +1375,7 @@ export class RoomClient {
 
     store.dispatch(stateActions.setAudioOnlyInProgress(true));
 
-    const devices = (await settingManager.getDevices()) || {
-      webcamEnabled: false,
-    };
+    const devices = await settingManager.getDevices();
 
     if (!this._webcamProducer && this._produce && devices.webcamEnabled) {
       this.enableWebcam();

diff --git a/src/rtc/RoomContext.tsx b/src/rtc/RoomContext.tsx
@@ -29,12 +29,12 @@ const initRoomClientStore = () => {
 export const RTCRoomClientContextProvider: React.FC = TMemo((props) => {
   const [client, setClient] = useState<RoomClient>();
 
-  const deleteClient = useCallback(() => {
+  const deleteClient = useCallback(async () => {
     if (!_isNil(client)) {
       trackEvent('rtc:leaveRoom', {
         roomId: client.roomId,
       });
-      client.close();
+      await client.close();
     }
 
     setClient(undefined);
@@ -46,7 +46,7 @@ export const RTCRoomClientContextProvider: React.FC = TMemo((props) => {
 
       if (!_isNil(client)) {
         // 关闭上一个连接
-        deleteClient();
+        await deleteClient();
       }
 
       trackEvent('rtc:joinRoom', {