trying the whole queue idea...didn't work so what
This commit is contained in:
@@ -19,7 +19,7 @@
|
|||||||
* listen for any calls to me, as well as any answers back to me
|
* listen for any calls to me, as well as any answers back to me
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import React, { useEffect, useContext, useState, useRef, useMemo } from 'react';
|
import React, { useEffect, useContext, useState, useRef, useMemo, useCallback } from 'react';
|
||||||
import Peer from 'simple-peer';
|
import Peer from 'simple-peer';
|
||||||
import useRealTimeRooms from './RealTimeRoomProvider';
|
import useRealTimeRooms from './RealTimeRoomProvider';
|
||||||
import useAuth from './AuthProvider';
|
import useAuth from './AuthProvider';
|
||||||
@@ -32,7 +32,6 @@ import {
|
|||||||
ServerResponseChannels,
|
ServerResponseChannels,
|
||||||
} from '@nirvana/core/sockets/channels';
|
} from '@nirvana/core/sockets/channels';
|
||||||
import toast from 'react-hot-toast';
|
import toast from 'react-hot-toast';
|
||||||
import { usePrevious } from 'react-use';
|
|
||||||
|
|
||||||
type PeerMap = {
|
type PeerMap = {
|
||||||
[userId: string]: Peer;
|
[userId: string]: Peer;
|
||||||
@@ -106,6 +105,8 @@ export function StreamProvider({ children }: { children: React.ReactChild }) {
|
|||||||
// and set signal if we have already gotten it and remove from the signals if used
|
// and set signal if we have already gotten it and remove from the signals if used
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (Object.keys(incomingSignals).length > 0) {
|
if (Object.keys(incomingSignals).length > 0) {
|
||||||
|
console.log('going to clear queue of incoming signals');
|
||||||
|
|
||||||
Object.entries(peerMap).map(([userId, peer]) => {
|
Object.entries(peerMap).map(([userId, peer]) => {
|
||||||
if (incomingSignals[userId]) {
|
if (incomingSignals[userId]) {
|
||||||
peer.signal(incomingSignals[userId]);
|
peer.signal(incomingSignals[userId]);
|
||||||
@@ -130,16 +131,25 @@ export function StreamProvider({ children }: { children: React.ReactChild }) {
|
|||||||
return () => {
|
return () => {
|
||||||
$ws.removeListener(ServerResponseChannels.RTC_RECEIVING_SIGNAL);
|
$ws.removeListener(ServerResponseChannels.RTC_RECEIVING_SIGNAL);
|
||||||
};
|
};
|
||||||
}, [$ws]);
|
}, [$ws, updateIncomingSignals]);
|
||||||
|
|
||||||
console.log(`peer map: `, peerMap);
|
console.log(`peer map: `, peerMap);
|
||||||
|
|
||||||
|
const handleAddPeer = useCallback(
|
||||||
|
(userId: string, peerObj: Peer) => {
|
||||||
|
updatePeerMap((draft) => {
|
||||||
|
draft[userId] = peerObj;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[updatePeerMap],
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<StreamProviderContext.Provider value={{ peerMap }}>
|
<StreamProviderContext.Provider value={{ peerMap }}>
|
||||||
<div className="flex flex-row">
|
<div className="flex flex-row">
|
||||||
<video height={400} width={400} autoPlay muted ref={localStreamRef} />
|
<video height={400} width={400} autoPlay muted ref={localStreamRef} />
|
||||||
|
|
||||||
<MemoStreamsConnector updatePeerMap={updatePeerMap} membersToCall={distinctPeerUserIds} />
|
<MemoStreamsConnector handleAddPeer={handleAddPeer} membersToCall={distinctPeerUserIds} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{children}
|
{children}
|
||||||
@@ -155,10 +165,10 @@ const MemoStreamsConnector = React.memo(StreamsConnector);
|
|||||||
|
|
||||||
function StreamsConnector({
|
function StreamsConnector({
|
||||||
membersToCall,
|
membersToCall,
|
||||||
updatePeerMap,
|
handleAddPeer,
|
||||||
}: {
|
}: {
|
||||||
membersToCall: string[];
|
membersToCall: string[];
|
||||||
updatePeerMap: Updater<PeerMap>;
|
handleAddPeer: (userId: string, peerObj: Peer) => void;
|
||||||
}) {
|
}) {
|
||||||
console.log('rendering this piece of shit');
|
console.log('rendering this piece of shit');
|
||||||
console.log(membersToCall);
|
console.log(membersToCall);
|
||||||
@@ -166,7 +176,7 @@ function StreamsConnector({
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{membersToCall.map((userId) => (
|
{membersToCall.map((userId) => (
|
||||||
<StreamConnector key={userId} peerUserId={userId} updatePeerMap={updatePeerMap} />
|
<StreamConnector key={userId} peerUserId={userId} handleAddPeer={handleAddPeer} />
|
||||||
))}
|
))}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -174,10 +184,10 @@ function StreamsConnector({
|
|||||||
|
|
||||||
function StreamConnector({
|
function StreamConnector({
|
||||||
peerUserId,
|
peerUserId,
|
||||||
updatePeerMap,
|
handleAddPeer,
|
||||||
}: {
|
}: {
|
||||||
peerUserId: string;
|
peerUserId: string;
|
||||||
updatePeerMap: Updater<PeerMap>;
|
handleAddPeer: (userId: string, peerObj: Peer) => void;
|
||||||
}) {
|
}) {
|
||||||
const { $ws } = useSockets();
|
const { $ws } = useSockets();
|
||||||
|
|
||||||
@@ -203,9 +213,7 @@ function StreamConnector({
|
|||||||
});
|
});
|
||||||
|
|
||||||
// sending back the connection to the parent for everyone
|
// sending back the connection to the parent for everyone
|
||||||
updatePeerMap((draft) => {
|
handleAddPeer(peerUserId, localPeerConnection);
|
||||||
draft[peerUserId] = localPeerConnection;
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
() => {
|
() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user