talksik/nirvana-v3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nice state which would be per peer connection or call

Browse Source
This commit is contained in:
talksik
2022-06-19 09:21:13 -05:00
parent ebf09d1b64
commit 0aeb34e407
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/desktop/src/providers/ConversationProvider.tsx
+9 -4
View File
@@ -481,18 +481,18 @@ function Room({
if (draft[conversation._id.toString()]) { if (draft[conversation._id.toString()]) {
draft[conversation._id.toString()].room = { draft[conversation._id.toString()].room = {
...(draft[conversation._id.toString()].room ?? {}), ...(draft[conversation._id.toString()].room ?? {}),
otherUserId: { peer: localPeerConnection }, otherUserId: { peer: localPeerConnection, isConnecting: true },
}; };
} }
draft[conversation._id.toString()].isConnectingToRoom = true;
}); });
}); });
localPeerConnection.on('stream', (remoteStream: MediaStream) => { localPeerConnection.on('stream', (remoteStream: MediaStream) => {
// globally updating conversation so that other views can render what they want // globally updating conversation so that other views can render what they want
toast.success('got stream from remote, going to add to our ');
setConversationMap((draft) => { setConversationMap((draft) => {
if (draft[conversation._id.toString()].room[otherUserId]) { if (draft[conversation._id.toString()].room[otherUserId]) {
toast.success('got stream from remote, going to add to our ');
draft[conversation._id.toString()].room[otherUserId].stream = remoteStream; draft[conversation._id.toString()].room[otherUserId].stream = remoteStream;
remoteStream.getTracks().forEach((track) => { remoteStream.getTracks().forEach((track) => {
// TODO: add particular track to right place // TODO: add particular track to right place
@@ -503,6 +503,11 @@ function Room({
localPeerConnection.on('connect', () => { localPeerConnection.on('connect', () => {
toast.success('successfully connected to another peer'); toast.success('successfully connected to another peer');
setConversationMap((draft) => {
if (draft[conversation._id.toString()].room[otherUserId]) {
draft[conversation._id.toString()].room[otherUserId].isConnecting = false;
}
});
}); });
localPeerConnection.on('track', (track, stream) => { localPeerConnection.on('track', (track, stream) => {
@@ -515,7 +520,7 @@ function Room({
// the person will be removed from the tuned in list, but the connections here are decoupled from that flow // the person will be removed from the tuned in list, but the connections here are decoupled from that flow
// we want to manage the room within the master conversation and remove it for ourselves // we want to manage the room within the master conversation and remove it for ourselves
// TODO: update the map to remove the user and remove // TODO: update the map to remove the user and all contribution contens
toast.error('peer connection was closed'); toast.error('peer connection was closed');
}); });
packages/desktop/src/util/types.ts
+3 -1
View File
@@ -19,9 +19,11 @@ export type MasterConversation = Conversation & {
audioTrack?: MediaStreamTrack; audioTrack?: MediaStreamTrack;
videoTrack?: MediaStreamTrack; videoTrack?: MediaStreamTrack;
screenTrack?: MediaStreamTrack; screenTrack?: MediaStreamTrack;
// calling happening whether it is a newbie or master
isConnecting?: boolean;
}; };
}; };
isConnectingToRoom?: boolean;
// all of audio clips, links, media, etc. // all of audio clips, links, media, etc.
content?: ContentBlock[]; content?: ContentBlock[];