From 1a82c105b423beff4be15bbb50212c7f6502a3c2 Mon Sep 17 00:00:00 2001 From: talksik Date: Sat, 14 May 2022 12:43:55 -0500 Subject: [PATCH] debugging stream stuff --- .../desktop/src/providers/StreamProvider.tsx | 19 ++++++++++++------- .../protected/terminal/panels/MainPanel.tsx | 19 +++++++++++++------ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/packages/desktop/src/providers/StreamProvider.tsx b/packages/desktop/src/providers/StreamProvider.tsx index 7c151c5..8e5e4d9 100644 --- a/packages/desktop/src/providers/StreamProvider.tsx +++ b/packages/desktop/src/providers/StreamProvider.tsx @@ -141,6 +141,7 @@ export function StreamProvider({ children }: { children: React.ReactChild }) { }); localPeerConnection.on('signal', (signal) => { + console.log('going to call someone'); $ws.emit( ServerRequestChannels.RTC_CALL_REQUEST, new RtcCallRequest(userIdToCall, signal), @@ -150,7 +151,7 @@ export function StreamProvider({ children }: { children: React.ReactChild }) { draft[userIdToCall] = localPeerConnection; }); }); - }, [user, roomsMap, $ws, updatePeerMap]); //TODO: make this not run on EVERY update to roomsMap? only tuned in lists? so the separate map for that? + }, [user, roomsMap, $ws, updatePeerMap, userLocalStream]); //TODO: make this not run on EVERY update to roomsMap? only tuned in lists? so the separate map for that? const prevStream = usePrevious(userLocalStream); @@ -165,12 +166,16 @@ export function StreamProvider({ children }: { children: React.ReactChild }) { }, [localStreamRef]); useEffect(() => { - if (prevStream) { - Object.values(peerMap).forEach((currentPeer) => { - currentPeer.removeStream(prevStream); - currentPeer.addStream(userLocalStream); - }); - } + // if (userLocalStream) { + // Object.values(peerMap).forEach((currentPeer) => { + // try { + // currentPeer.addStream(userLocalStream); + // } catch (error) { + // toast.error('problem adding stream'); + // console.error(error); + // } + // }); + // } }, [userLocalStream, peerMap, prevStream]); console.log(peerMap); diff --git a/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx b/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx index 5000d37..6a3c226 100644 --- a/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx +++ b/packages/desktop/src/tree/protected/terminal/panels/MainPanel.tsx @@ -298,19 +298,21 @@ function LineDetails() { function LineStreams({ broadcasters }: { broadcasters: string[] }) { const { peerMap } = useStreams(); + console.log(peerMap); return (
{broadcasters.map((userId) => { const currentPeer = peerMap[userId]; - return ; + return currentPeer && ; })} + this is the list of current streams we are going to show
); } function Stream({ peer }: { peer: Peer }) { - const streamRef = useRef(null); + const streamRef = useRef(null); useEffect(() => { peer.on('stream', (remotePeerStream: MediaStream) => { @@ -318,13 +320,18 @@ function Stream({ peer }: { peer: Peer }) { 'stream coming in from remote peer...BUT, only going to show once they broadcast', ); - const audio = new Audio(); - audio.autoplay = true; - audio.srcObject = remotePeerStream; + // const audio = new Audio(); + // audio.autoplay = true; + // audio.srcObject = remotePeerStream; if (streamRef?.current) streamRef.current.srcObject = remotePeerStream; }); }, []); - return <>this is a stream component of one remote peer; + return ( + <> + this is a stream component of one remote peer +