test: 测试

src/hooks/use-websocket.ts

@@ -45,7 +45,7 @@ import {
   WsStartRemoteDesk,
   WsUpdateJoinInfoType,
 } from '@/types/websocket';
-import { createNullVideo, handleUserMedia } from '@/utils';
+import { createNullVideo, createVideo, handleUserMedia } from '@/utils';
 import {
   WebSocketClass,
   prettierReceiveWsMsg,
@@ -434,7 +434,7 @@ export const useWebsocket = () => {
             return;
           }
           if (data.receiver === mySocketId.value) {
-            console.warn('是发给我的nativeWebRtcOffer');
+            console.warn('是发给我的nativeWebRtcOffer-pk-tencent_css_pk');
             const res = await fetchVerifyPkKey({
               liveRoomId: Number(roomId.value),
               key: route.query.pkKey,
@@ -478,7 +478,7 @@ export const useWebsocket = () => {
           }
         } else if (data.live_room.type === LiveRoomTypeEnum.wertc_live) {
           if (data.receiver === mySocketId.value) {
-            console.warn('是发给我的nativeWebRtcOffer');
+            console.warn('是发给我的nativeWebRtcOffer-wertc_live');
             if (networkStore.rtcMap.get(data.sender)) {
               return;
             }
@@ -504,7 +504,7 @@ export const useWebsocket = () => {
           }
         } else if (data.live_room.type === LiveRoomTypeEnum.wertc_meeting_one) {
           if (data.receiver === mySocketId.value) {
-            console.warn('是发给我的nativeWebRtcOffer');
+            console.warn('是发给我的nativeWebRtcOffer-wertc_meeting_one');
             await useTip({
               content: '是否加入会议？',
             });
@@ -512,7 +512,16 @@ export const useWebsocket = () => {
               video: true,
               audio: true,
             });
+            console.log('===66');
+            console.log(stream);
+            console.log(canvasVideoStream.value);
             userStream.value = stream;
+            const video = createVideo({
+              appendChild: true,
+              show: true,
+            });
+            video.srcObject = stream;
+            console.log('kkkk11');
             updateWebRtcMeetingOneConfig({
               roomId: roomId.value,
               userStream: userStream.value,

src/hooks/webrtc/meetingOne.ts

@@ -119,7 +119,7 @@ export const useWebRtcMeetingOne = () => {
           await rtc.setRemoteDescription(sdp);
           userStream.value?.getTracks().forEach((track) => {
             if (userStream.value) {
-              console.log('meetingOne的sendAnswer插入track');
+              console.log('meetingOne的sendAnswer插入track', track);
               rtc.peerConnection?.addTrack(track, userStream.value);
             }
           });

src/hooks/webrtc/meetingPk.ts

@@ -56,7 +56,7 @@ export const useWebRtcMeetingPk = () => {
       sender: string;
       receiver: string;
     }) => {
-      console.log('meetingOne的sendOffer', {
+      console.log('meetingPk的sendOffer', {
         sender,
         receiver,
       });
@@ -67,13 +67,13 @@ export const useWebRtcMeetingPk = () => {
         if (rtc) {
           anchorStream.value?.getTracks().forEach((track) => {
             if (anchorStream.value) {
-              console.log('meetingOne的sendOffer插入track', track.kind, track);
+              console.log('meetingPk的sendOffer插入track', track.kind, track);
               rtc.peerConnection?.addTrack(track, anchorStream.value);
             }
           });
           const offerSdp = await rtc.createOffer();
           if (!offerSdp) {
-            console.error('meetingOne的offerSdp为空');
+            console.error('meetingPk的offerSdp为空');
             return;
           }
           await rtc.setLocalDescription(offerSdp!);
@@ -92,7 +92,7 @@ export const useWebRtcMeetingPk = () => {
           console.error('rtc不存在');
         }
       } catch (error) {
-        console.error('meetingOne的sendOffer错误');
+        console.error('meetingPk的sendOffer错误');
       }
     },
     /**
@@ -107,7 +107,7 @@ export const useWebRtcMeetingPk = () => {
       sender: string;
       receiver: string;
     }) => {
-      console.log('meetingOne的sendAnswer', {
+      console.log('meetingPk的sendAnswer', {
         sender,
         receiver,
       });
@@ -119,13 +119,13 @@ export const useWebRtcMeetingPk = () => {
           await rtc.setRemoteDescription(sdp);
           userStream.value?.getTracks().forEach((track) => {
             if (userStream.value) {
-              console.log('meetingOne的sendAnswer插入track');
+              console.log('meetingPk的sendAnswer插入track');
               rtc.peerConnection?.addTrack(track, userStream.value);
             }
           });
           const answerSdp = await rtc.createAnswer();
           if (!answerSdp) {
-            console.error('meetingOne的answerSdp为空');
+            console.error('meetingPk的answerSdp为空');
             return;
           }
           await rtc.setLocalDescription(answerSdp);
@@ -143,7 +143,7 @@ export const useWebRtcMeetingPk = () => {
           console.error('rtc不存在');
         }
       } catch (error) {
-        console.error('meetingOne的sendAnswer错误');
+        console.error('meetingPk的sendAnswer错误');
       }
     },
   };

src/utils/network/webRTC.ts

@@ -513,6 +513,18 @@ export class WebRTCClass {
       }
     );
 
+    this.prettierLog({
+      msg: '开始监听pc的icecandidateerror事件',
+      type: 'warn',
+    });
+    this.peerConnection.addEventListener('icecandidateerror', (err) => {
+      this.prettierLog({
+        msg: 'pc收到icecandidateerror',
+        type: 'error',
+      });
+      console.log(err);
+    });
+
     this.prettierLog({
       msg: '开始监听pc的negotiationneeded事件',
       type: 'warn',

src/views/pull/index.vue

@@ -45,9 +45,9 @@
             </div>
             <div class="bottom">
               <span>{{ appStore.liveRoomInfo?.desc }}</span>
-              <span v-if="NODE_ENV === 'development'">
-                socketId:{{ mySocketId }}
-              </span>
+              <!-- <span v-if="NODE_ENV === 'development'"> -->
+              socketId:{{ mySocketId }}
+              <!-- </span> -->
               <span
                 class="area"
                 @click="

src/views/push/index.vue

@@ -84,9 +84,9 @@
               </n-input-group>
             </div>
             <div class="bottom">
-              <span v-if="NODE_ENV === 'development'">
-                {{ mySocketId }}
-              </span>
+              <!-- <span v-if="NODE_ENV === 'development'"> -->
+              {{ mySocketId }}
+              <!-- </span> -->
             </div>
           </div>
         </div>
@@ -573,14 +573,20 @@ watch(
     renderFrame();
   }
 );
-
+const lockMap = ref(new Set());
 watch(
   () => networkStore.rtcMap,
   (newVal) => {
     newVal.forEach((item) => {
-      if (appStore.allTrack.find((v) => v.mediaName === item.receiver)) {
-        return;
-      }
+      // if (appStore.allTrack.find((v) => v.mediaName === item.receiver)) {
+      //   return;
+      // }
+      // if (lockMap.value.has(item.localStream?.id)) {
+      //   return;
+      // }
+      // if (item.localStream?.id) {
+      //   lockMap.value.add(item.localStream?.id);
+      // }
       addMediaOk({
         id: getRandomEnglishString(6),
         openEye: true,