diff --git a/app.js b/app.js index baa8d29..649a7b5 100644 --- a/app.js +++ b/app.js @@ -258,35 +258,19 @@ peers.on('connection', async socket => { if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters); console.log(`[transport-connect] socket ${socket.id} | callId ${callId}`); + if (!isInitiator(callId, socket.id)) { await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters }); - // if (!isInitiator(callId, socket.id)) { - console.log('🟥 Emit to initiatorSocket'); - videoCalls[callId].initiatorSocket.emit('new-producer', { - callId - }); - - // } else { - // console.log('🟥 Emit to receiverSocket'); - // videoCalls[callId].receiverSocket.emit('new-producer', { - // callId - // }); - // } + videoCalls[callId].initiatorSocket.emit('new-producer', { + callId + }); } else { await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters }); - // if (!isInitiator(callId, socket.id)) { - // console.log('🟥 Emit to initiatorSocket'); - // videoCalls[callId].initiatorSocket.emit('new-producer', { - // callId - // }); - - // } else { - console.log('🟥 Emit to receiverSocket'); - videoCalls[callId].receiverSocket.emit('new-producer', { - callId - }); - // } + videoCalls[callId].receiverSocket.emit('new-producer', { + callId + }); } + } catch (error) { console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`); } @@ -303,86 +287,6 @@ peers.on('connection', async socket => { if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters); console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`); - - - - - - - - - - - - // try { - // const router = videoCalls[callId].router; - - // router.observer.on("newtransport", (transport) => { - // transport.observer.on("newproducer", (producer) => { - - // console.log( - // "new producer created [worker.pid:%d, router.id:%s, transport.id:%s, producer.id:%s]", - // worker.pid, router.id, transport.id, producer.id - // ); - - // // if (!isInitiator(callId, socket.id)) { - // // console.log('🟥 Emit to initiatorSocket'); - // // videoCalls[callId].initiatorSocket.emit('new-producer', { - // // callId - // // }); - - // // } else { - // // console.log('🟥 Emit to receiverSocket'); - // // videoCalls[callId].receiverSocket.emit('new-producer', { - // // callId - // // }); - // // } - - // console.log('$$$$ isInitiator(callId, socket.id)', isInitiator(callId, socket.id)); - // console.log('socket.id', socket.id); - // console.log('videoCalls', videoCalls); - // videoCalls[callId].receiverSocket.emit('new-producer', { - // callId - // }); - - // // videoCalls[callId].initiatorSocket.emit('new-producer', { - // // callId - // // }); - // // videoCalls[callId].receiverSocket.emit('new-producer', { - // // callId - // // }); - // // socket.emit('new-producer', { - // // callId - // // }); - - // }); - - // }); - - // } catch (error) { - // console.log('&&&&&&&&&&&&&&&&', error.message); - // } - - - - - - - - - - - - - - - - - - - - - if (kind === 'video') { if (!isInitiator(callId, socket.id)) { diff --git a/public/bundle.js b/public/bundle.js index 6c09d27..1a52fde 100644 --- a/public/bundle.js +++ b/public/bundle.js @@ -20455,6 +20455,7 @@ setTimeout(() => { socket.on('new-producer', ({ callId }) => { console.log(`🟥 new-producer | callId: ${callId}`); + consume() }) } diff --git a/public/index.js b/public/index.js index 12fdebd..8a4442d 100644 --- a/public/index.js +++ b/public/index.js @@ -97,6 +97,7 @@ setTimeout(() => { socket.on('new-producer', ({ callId }) => { console.log(`🟥 new-producer | callId: ${callId}`); + consume() }) }