Compare commits

..

4 Commits

4 changed files with 203 additions and 244 deletions

231
app.js
View File

@ -76,7 +76,7 @@ const createWorker = async () => {
}); });
return worker; return worker;
} catch (error) { } catch (error) {
console.error(`[createWorker] | ERROR | error: ${error.message}`); console.log(`ERROR | createWorker | ${error.message}`);
} }
}; };
@ -148,10 +148,11 @@ const closeCall = (callId) => {
videoCalls[callId]?.receiverProducerTransport?.close(); videoCalls[callId]?.receiverProducerTransport?.close();
videoCalls[callId]?.router?.close(); videoCalls[callId]?.router?.close();
delete videoCalls[callId]; delete videoCalls[callId];
console.log(`[closeCall] | callId: ${callId}`); } else {
console.log(`The call with id ${callId} has already been deleted`);
} }
} catch (error) { } catch (error) {
console.error(`[closeCall] | ERROR | callId: ${callId} | error: ${error.message}`); console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
} }
}; };
@ -188,21 +189,22 @@ peers.on('connection', async (socket) => {
console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`); console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
if (!videoCalls[callId]) { if (!videoCalls[callId]) {
videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) }; videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
console.log(`[createRoom] Generate Router ID: ${videoCalls[callId].router.id}`); console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
videoCalls[callId].receiverSocket = socket; videoCalls[callId].receiverSocket = socket;
} else { } else {
videoCalls[callId].initiatorSocket = socket; videoCalls[callId].initiatorSocket = socket;
} }
socketDetails[socket.id] = callId; socketDetails[socket.id] = callId;
// rtpCapabilities is set for callback // rtpCapabilities is set for callback
console.log('[getRtpCapabilities] callId', callId);
callbackResponse = { callbackResponse = {
rtpCapabilities: videoCalls[callId].router.rtpCapabilities, rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
}; };
} else { } else {
console.log(`[createRoom] missing callId: ${callId}`); console.log(`[createRoom] missing callId ${callId}`);
} }
} catch (error) { } catch (error) {
console.error(`[createRoom] | ERROR | callId: ${callId} | error: ${error.message}`); console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
} finally { } finally {
callback(callbackResponse); callback(callbackResponse);
} }
@ -221,23 +223,25 @@ peers.on('connection', async (socket) => {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`); console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
if (sender) { if (sender) {
if (!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) { if (!isInitiator(callId, socket.id)) {
videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback); videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback);
} else if (!videoCalls[callId].initiatorProducerTransport && isInitiator(callId, socket.id)) { } else if (isInitiator(callId, socket.id)) {
videoCalls[callId].initiatorProducerTransport = await createWebRtcTransportLayer(callId, callback); videoCalls[callId].initiatorProducerTransport = await createWebRtcTransportLayer(callId, callback);
} else { } else {
console.log(`producerTransport has already been defined | callId ${callId}`); console.log(`producerTransport has already been defined | callId ${callId}`);
callback(null); callback(null);
} }
} else if (!sender) { } else if (!sender) {
if (!videoCalls[callId].receiverConsumerTransport && !isInitiator(callId, socket.id)) { if (!isInitiator(callId, socket.id)) {
videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback); videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
} else if (!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) { } else if (isInitiator(callId, socket.id)) {
videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback); videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback);
} }
} }
} catch (error) { } catch (error) {
console.error(`[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${error.message}`); console.log(
`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`
);
callback(error); callback(error);
} }
}); });
@ -256,8 +260,9 @@ peers.on('connection', async (socket) => {
isInitiator(callId, socket.id) isInitiator(callId, socket.id)
? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters }) ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
: await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters }); : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
} catch (error) { } catch (error) {
console.error(`[transport-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`); console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
} }
}); });
@ -271,7 +276,7 @@ peers.on('connection', async (socket) => {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters); if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
console.log(`[transport-produce] callId: ${callId} | kind: ${kind} | socket: ${socket.id}`); console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
if (kind === 'video') { if (kind === 'video') {
if (!isInitiator(callId, socket.id)) { if (!isInitiator(callId, socket.id)) {
@ -280,9 +285,14 @@ peers.on('connection', async (socket) => {
rtpParameters, rtpParameters,
}); });
console.log(
`[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`
);
videoCalls[callId].receiverVideoProducer.on('transportclose', () => { videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
console.log('transport for this producer closed', callId); const callId = socketDetails[socket.id];
closeCall(callId); console.log('[receiverVideoProducer] transport for this producer closed', callId);
// closeCall(callId);
}); });
// Send back to the client the Producer's id // Send back to the client the Producer's id
@ -296,9 +306,14 @@ peers.on('connection', async (socket) => {
rtpParameters, rtpParameters,
}); });
console.log(
`[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`
);
videoCalls[callId].initiatorVideoProducer.on('transportclose', () => { videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
console.log('transport for this producer closed', callId); const callId = socketDetails[socket.id];
closeCall(callId); console.log('[initiatorVideoProducer] transport for this producer closed', callId);
// closeCall(callId);
}); });
callback && callback &&
@ -313,9 +328,14 @@ peers.on('connection', async (socket) => {
rtpParameters, rtpParameters,
}); });
console.log(
`[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`
);
videoCalls[callId].receiverAudioProducer.on('transportclose', () => { videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
console.log('transport for this producer closed', callId); const callId = socketDetails[socket.id];
closeCall(callId); console.log('[receiverAudioProducer] transport for this producer closed', callId);
// closeCall(callId);
}); });
// Send back to the client the Producer's id // Send back to the client the Producer's id
@ -329,9 +349,14 @@ peers.on('connection', async (socket) => {
rtpParameters, rtpParameters,
}); });
console.log(
`[transport-produce] initiatorAudioProducer Producer ID: ${videoCalls[callId].initiatorAudioProducer.id} | kind: ${videoCalls[callId].initiatorAudioProducer.kind}`
);
videoCalls[callId].initiatorAudioProducer.on('transportclose', () => { videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
console.log('transport for this producer closed', callId); const callId = socketDetails[socket.id];
closeCall(callId); console.log('[initiatorAudioProducer] transport for this producer closed', callId);
// closeCall(callId);
}); });
// Send back to the client the Producer's id // Send back to the client the Producer's id
@ -345,12 +370,10 @@ peers.on('connection', async (socket) => {
const socketToEmit = isInitiator(callId, socket.id) const socketToEmit = isInitiator(callId, socket.id)
? videoCalls[callId].receiverSocket ? videoCalls[callId].receiverSocket
: videoCalls[callId].initiatorSocket; : videoCalls[callId].initiatorSocket;
socketToEmit.emit('new-producer', { callId });
// callId - Id of the call
// kind - producer type: audio/video
socketToEmit?.emit('new-producer', { callId, kind });
} catch (error) { } catch (error) {
console.error(`[transport-produce] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`); console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
} }
}); });
@ -370,7 +393,7 @@ peers.on('connection', async (socket) => {
await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters }); await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
} }
} catch (error) { } catch (error) {
console.error(`[transport-recv-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`); console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
} }
}); });
@ -384,44 +407,44 @@ peers.on('connection', async (socket) => {
socket.on('consume', async ({ rtpCapabilities }, callback) => { socket.on('consume', async ({ rtpCapabilities }, callback) => {
try { try {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log(
`[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`
);
if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities); if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
console.log('[consume] callId', callId);
let canConsumeVideo, canConsumeAudio; let canConsumeVideo, canConsumeAudio;
try { if (isInitiator(callId, socket.id)) {
if (isInitiator(callId, socket.id)) { canConsumeVideo =
canConsumeVideo = !!videoCalls[callId].receiverVideoProducer &&
!!videoCalls[callId].receiverVideoProducer && !!videoCalls[callId].router.canConsume({
!!videoCalls[callId].router.canConsume({ producerId: videoCalls[callId].receiverVideoProducer.id,
producerId: videoCalls[callId].receiverVideoProducer.id, rtpCapabilities,
rtpCapabilities, });
}); canConsumeAudio =
canConsumeAudio = !!videoCalls[callId].receiverAudioProducer &&
!!videoCalls[callId].receiverAudioProducer && !!videoCalls[callId].router.canConsume({
!!videoCalls[callId].router.canConsume({ producerId: videoCalls[callId].receiverAudioProducer.id,
producerId: videoCalls[callId].receiverAudioProducer.id, rtpCapabilities,
rtpCapabilities, });
}); } else {
} else { canConsumeVideo =
canConsumeVideo = !!videoCalls[callId].initiatorVideoProducer &&
!!videoCalls[callId].initiatorVideoProducer && !!videoCalls[callId].router.canConsume({
!!videoCalls[callId].router.canConsume({ producerId: videoCalls[callId].initiatorVideoProducer.id,
producerId: videoCalls[callId].initiatorVideoProducer.id, rtpCapabilities,
rtpCapabilities, });
});
canConsumeAudio = canConsumeAudio =
!!videoCalls[callId].initiatorAudioProducer && !!videoCalls[callId].initiatorAudioProducer &&
!!videoCalls[callId].router.canConsume({ !!videoCalls[callId].router.canConsume({
producerId: videoCalls[callId].initiatorAudioProducer.id, producerId: videoCalls[callId].initiatorAudioProducer.id,
rtpCapabilities, rtpCapabilities,
}); });
}
} catch (error) {
console.error(`[consume] | ERROR | callId: ${callId} | error: ${error.message}`);
} }
console.log('[consume] canConsumeVideo', canConsumeVideo);
console.log(`[consume] socket ${socket.id} | callId: ${callId} | canConsumeVideo: ${canConsumeVideo} | canConsumeAudio: ${canConsumeAudio}`); console.log('[consume] canConsumeAudio', canConsumeAudio);
if (canConsumeVideo && !canConsumeAudio) { if (canConsumeVideo && !canConsumeAudio) {
const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities); const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
@ -439,7 +462,7 @@ peers.on('connection', async (socket) => {
callback(null); callback(null);
} }
} catch (error) { } catch (error) {
console.error(`[consume] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`); console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`);
callback({ params: { error } }); callback({ params: { error } });
} }
}); });
@ -449,41 +472,24 @@ peers.on('connection', async (socket) => {
- When consuming on consumerTransport, it is initially done with paused: true, here we will resume - When consuming on consumerTransport, it is initially done with paused: true, here we will resume
- For the initiator we resume the initiatorConsumerAUDIO/VIDEO and for receiver the receiverConsumerAUDIO/VIDEO - For the initiator we resume the initiatorConsumerAUDIO/VIDEO and for receiver the receiverConsumerAUDIO/VIDEO
*/ */
socket.on('consumer-resume', () => { socket.on('consumer-resume', () => {
try {
const callId = socketDetails[socket.id];
const isInitiatorValue = isInitiator(callId, socket.id);
console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
if (isInitiatorValue) {
videoCalls[callId].initiatorConsumerVideo && videoCalls[callId].initiatorConsumerVideo.resume();
videoCalls[callId].initiatorConsumerAudio && videoCalls[callId].initiatorConsumerAudio.resume();
} else {
videoCalls[callId].receiverConsumerVideo && videoCalls[callId].receiverConsumerVideo.resume();
videoCalls[callId].receiverConsumerAudio && videoCalls[callId].receiverConsumerAudio.resume();
}
} catch (error) {
console.error(`[consumer-resume] | ERROR | callId: ${socketDetails[socket.id]} | isInitiator: ${isInitiator} | error: ${error.message}`);
}
});
socket.on('close-producer', ({ callId, kind}) => {
try { try {
const callId = socketDetails[socket.id];
console.log(`[consumer-resume] callId ${callId}`);
if (isInitiator(callId, socket.id)) { if (isInitiator(callId, socket.id)) {
console.log(`[close-producer] initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`); videoCalls[callId]?.initiatorConsumerVideo?.resume();
videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind }); videoCalls[callId]?.initiatorConsumerAudio?.resume();
} else { } else {
console.log(`[close-producer] receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`); videoCalls[callId]?.receiverConsumerVideo?.resume();
videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind }); videoCalls[callId]?.receiverConsumerAudio?.resume();
} }
} catch (error) { } catch (error) {
console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`); console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
} }
}); });
}); });
const consumeVideo = async (callId, socketId, rtpCapabilities) => { const consumeVideo = async (callId, socketId, rtpCapabilities) => {
// Handlers for transports https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
if (isInitiator(callId, socketId)) { if (isInitiator(callId, socketId)) {
videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({ videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
producerId: videoCalls[callId].receiverVideoProducer.id, producerId: videoCalls[callId].receiverVideoProducer.id,
@ -491,6 +497,20 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
paused: true, paused: true,
}); });
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
videoCalls[callId].initiatorConsumerVideo.on('transportclose', () => {
const callId = socketDetails[socket.id];
console.log('transport close from consumer', callId);
closeCall(callId);
});
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
videoCalls[callId].initiatorConsumerVideo.on('producerclose', () => {
const callId = socketDetails[socket.id];
console.log('producer of consumer closed', callId);
closeCall(callId);
});
return { return {
id: videoCalls[callId].initiatorConsumerVideo.id, id: videoCalls[callId].initiatorConsumerVideo.id,
producerId: videoCalls[callId].receiverVideoProducer.id, producerId: videoCalls[callId].receiverVideoProducer.id,
@ -504,6 +524,18 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
paused: true, paused: true,
}); });
videoCalls[callId].receiverConsumerVideo.on('transportclose', () => {
const callId = socketDetails[socket.id];
console.log('transport close from consumer', callId);
closeCall(callId);
});
videoCalls[callId].receiverConsumerVideo.on('producerclose', () => {
const callId = socketDetails[socket.id];
console.log('producer of consumer closed', callId);
closeCall(callId);
});
return { return {
id: videoCalls[callId].receiverConsumerVideo.id, id: videoCalls[callId].receiverConsumerVideo.id,
producerId: videoCalls[callId].initiatorVideoProducer.id, producerId: videoCalls[callId].initiatorVideoProducer.id,
@ -521,6 +553,20 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
paused: true, paused: true,
}); });
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
videoCalls[callId].initiatorConsumerAudio.on('transportclose', () => {
const callId = socketDetails[socket.id];
console.log('transport close from consumer', callId);
closeCall(callId);
});
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
videoCalls[callId].initiatorConsumerAudio.on('producerclose', () => {
const callId = socketDetails[socket.id];
console.log('producer of consumer closed', callId);
closeCall(callId);
});
return { return {
id: videoCalls[callId].initiatorConsumerAudio.id, id: videoCalls[callId].initiatorConsumerAudio.id,
producerId: videoCalls[callId].receiverAudioProducer.id, producerId: videoCalls[callId].receiverAudioProducer.id,
@ -534,6 +580,18 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
paused: true, paused: true,
}); });
videoCalls[callId].receiverConsumerAudio.on('transportclose', () => {
const callId = socketDetails[socket.id];
console.log('transport close from consumer', callId);
closeCall(callId);
});
videoCalls[callId].receiverConsumerAudio.on('producerclose', () => {
const callId = socketDetails[socket.id];
console.log('producer of consumer closed', callId);
closeCall(callId);
});
return { return {
id: videoCalls[callId].receiverConsumerAudio.id, id: videoCalls[callId].receiverConsumerAudio.id,
producerId: videoCalls[callId].initiatorAudioProducer.id, producerId: videoCalls[callId].initiatorAudioProducer.id,
@ -556,7 +614,7 @@ const isInitiator = (callId, socketId) => {
*/ */
const createWebRtcTransportLayer = async (callId, callback) => { const createWebRtcTransportLayer = async (callId, callback) => {
try { try {
console.log(`[createWebRtcTransportLayer] callId: ${callId}`); console.log('[createWebRtcTransportLayer] callId', callId);
// https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions // https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
const webRtcTransport_options = { const webRtcTransport_options = {
listenIps: [ listenIps: [
@ -593,13 +651,14 @@ const createWebRtcTransportLayer = async (callId, callback) => {
dtlsParameters: transport.dtlsParameters, dtlsParameters: transport.dtlsParameters,
}; };
console.log('[createWebRtcTransportLayer] callback params', params);
// Send back to the client the params // Send back to the client the params
callback({ params }); callback({ params });
// Set transport to producerTransport or consumerTransport // Set transport to producerTransport or consumerTransport
return transport; return transport;
} catch (error) { } catch (error) {
console.error(`[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`); console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
callback({ params: { error } }); callback({ params: { error } });
} }
}; };

View File

@ -20453,18 +20453,9 @@ setTimeout(() => {
if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() } if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
}) })
socket.on('new-producer', ({ callId, kind }) => { socket.on('new-producer', ({ callId }) => {
console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`); console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
connectRecvTransport(); consume()
})
socket.on('close-producer', ({ callId, kind }) => {
console.log(`🔴 close-producer | callId: ${callId} | kind: ${kind}`);
if (kind === 'video') {
consumerVideo.close()
remoteVideo.srcObject = null
}
else if (kind === 'audio') consumerAudio.close()
}) })
} }
@ -20744,8 +20735,6 @@ const connectSendTransport = async () => {
// Enable Close call button // Enable Close call button
const closeCallBtn = document.getElementById('btnCloseCall'); const closeCallBtn = document.getElementById('btnCloseCall');
closeCallBtn.removeAttribute('disabled'); closeCallBtn.removeAttribute('disabled');
createRecvTransport();
} }
const createRecvTransport = async () => { const createRecvTransport = async () => {
@ -20785,8 +20774,7 @@ const createRecvTransport = async () => {
errback(error) errback(error)
} }
}) })
// We call it in new-rpoducer, we don't need it here anymore connectRecvTransport()
// connectRecvTransport()
}) })
} }
@ -20842,7 +20830,7 @@ const connectRecvTransport = async () => {
console.log('remoteVideo PLAY') console.log('remoteVideo PLAY')
}) })
.catch((error) => { .catch((error) => {
console.error(`remoteVideo PLAY ERROR | ${error.message}`) console.log(`remoteVideo PLAY ERROR | ${error.message}`)
}) })
}) })
} }
@ -20859,36 +20847,6 @@ const getVideoTrask = async (videoParams) => {
console.log('transport closed so consumer closed') console.log('transport closed so consumer closed')
}) })
consumerVideo.on('producerclose', () => {
console.log('===================1 consumerVideo producerclose');
});
consumerVideo.on("producerclose", () => {
console.log('====================2 consumerVideo producerclose');
})
consumerVideo.on("close", () => {
console.log('====================3 consumerVideo producerclose');
})
consumerVideo.on("close-producer", () => {
console.log('====================4 consumerVideo producerclose');
})
consumerVideo.observer.on('producerclose', () => {
console.log('===================11 consumerVideo producerclose');
});
consumerVideo.observer.on("producerclose", () => {
console.log('====================22 consumerVideo producerclose');
})
consumerVideo.observer.on("close", () => {
console.log('====================33 consumerVideo producerclose');
})
consumerVideo.observer.on("close-producer", () => {
console.log('====================44 consumerVideo producerclose');
})
return consumerVideo.track return consumerVideo.track
} }
@ -20904,14 +20862,6 @@ const getAudioTrask = async (audioParams) => {
console.log('transport closed so consumer closed') console.log('transport closed so consumer closed')
}) })
consumerAudio.on('producerclose', () => {
console.log('===================1 consumerAudio producerclose');
});
consumerAudio.on("producerclose", () => {
console.log('====================2 consumerAudio producerclose');
})
const audioTrack = consumerAudio.track const audioTrack = consumerAudio.track
audioTrack.applyConstraints({ audioTrack.applyConstraints({
@ -20957,31 +20907,31 @@ const closeCall = () => {
resetCallSettings() resetCallSettings()
} }
// const consume = async (kind) => { const consume = async () => {
// console.log(`[consume] kind: ${kind}`) console.log('[consume]')
// console.log('createRecvTransport Consumer') console.log('createRecvTransport Consumer')
// await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => { await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
// if (params.error) { if (params.error) {
// console.log('createRecvTransport | createWebRtcTransport | Error', params.error) console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
// return return
// } }
// consumerTransport = device.createRecvTransport(params) consumerTransport = device.createRecvTransport(params)
// consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => { consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
// try { try {
// await socket.emit('transport-recv-connect', { await socket.emit('transport-recv-connect', {
// dtlsParameters, dtlsParameters,
// }) })
// callback() callback()
// } catch (error) { } catch (error) {
// errback(error) errback(error)
// } }
// }) })
// connectRecvTransport() connectRecvTransport()
// }) })
// } }
btnLocalVideo.addEventListener('click', getLocalStream) btnLocalVideo.addEventListener('click', getLocalStream)
// btnRecvSendTransport.addEventListener('click', consume) btnRecvSendTransport.addEventListener('click', consume)
btnCloseCall.addEventListener('click', closeCall) btnCloseCall.addEventListener('click', closeCall)
},{"./config":94,"mediasoup-client":66,"socket.io-client":82}]},{},[95]); },{"./config":94,"mediasoup-client":66,"socket.io-client":82}]},{},[95]);

View File

@ -75,7 +75,7 @@
</td> </td>
<td> <td>
<div id="sharedBtns"> <div id="sharedBtns">
<!-- <button id="btnRecvSendTransport">Consume</button> --> <button id="btnRecvSendTransport">Consume</button>
<button id="remoteSoundControl">Unmute</button> <button id="remoteSoundControl">Unmute</button>
</div> </div>
</td> </td>

View File

@ -95,18 +95,9 @@ setTimeout(() => {
if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() } if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
}) })
socket.on('new-producer', ({ callId, kind }) => { socket.on('new-producer', ({ callId }) => {
console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`); console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
connectRecvTransport(); consume()
})
socket.on('close-producer', ({ callId, kind }) => {
console.log(`🔴 close-producer | callId: ${callId} | kind: ${kind}`);
if (kind === 'video') {
consumerVideo.close()
remoteVideo.srcObject = null
}
else if (kind === 'audio') consumerAudio.close()
}) })
} }
@ -386,8 +377,6 @@ const connectSendTransport = async () => {
// Enable Close call button // Enable Close call button
const closeCallBtn = document.getElementById('btnCloseCall'); const closeCallBtn = document.getElementById('btnCloseCall');
closeCallBtn.removeAttribute('disabled'); closeCallBtn.removeAttribute('disabled');
createRecvTransport();
} }
const createRecvTransport = async () => { const createRecvTransport = async () => {
@ -427,8 +416,7 @@ const createRecvTransport = async () => {
errback(error) errback(error)
} }
}) })
// We call it in new-rpoducer, we don't need it here anymore connectRecvTransport()
// connectRecvTransport()
}) })
} }
@ -484,7 +472,7 @@ const connectRecvTransport = async () => {
console.log('remoteVideo PLAY') console.log('remoteVideo PLAY')
}) })
.catch((error) => { .catch((error) => {
console.error(`remoteVideo PLAY ERROR | ${error.message}`) console.log(`remoteVideo PLAY ERROR | ${error.message}`)
}) })
}) })
} }
@ -501,36 +489,6 @@ const getVideoTrask = async (videoParams) => {
console.log('transport closed so consumer closed') console.log('transport closed so consumer closed')
}) })
consumerVideo.on('producerclose', () => {
console.log('===================1 consumerVideo producerclose');
});
consumerVideo.on("producerclose", () => {
console.log('====================2 consumerVideo producerclose');
})
consumerVideo.on("close", () => {
console.log('====================3 consumerVideo producerclose');
})
consumerVideo.on("close-producer", () => {
console.log('====================4 consumerVideo producerclose');
})
consumerVideo.observer.on('producerclose', () => {
console.log('===================11 consumerVideo producerclose');
});
consumerVideo.observer.on("producerclose", () => {
console.log('====================22 consumerVideo producerclose');
})
consumerVideo.observer.on("close", () => {
console.log('====================33 consumerVideo producerclose');
})
consumerVideo.observer.on("close-producer", () => {
console.log('====================44 consumerVideo producerclose');
})
return consumerVideo.track return consumerVideo.track
} }
@ -546,14 +504,6 @@ const getAudioTrask = async (audioParams) => {
console.log('transport closed so consumer closed') console.log('transport closed so consumer closed')
}) })
consumerAudio.on('producerclose', () => {
console.log('===================1 consumerAudio producerclose');
});
consumerAudio.on("producerclose", () => {
console.log('====================2 consumerAudio producerclose');
})
const audioTrack = consumerAudio.track const audioTrack = consumerAudio.track
audioTrack.applyConstraints({ audioTrack.applyConstraints({
@ -599,30 +549,30 @@ const closeCall = () => {
resetCallSettings() resetCallSettings()
} }
// const consume = async (kind) => { const consume = async () => {
// console.log(`[consume] kind: ${kind}`) console.log('[consume]')
// console.log('createRecvTransport Consumer') console.log('createRecvTransport Consumer')
// await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => { await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
// if (params.error) { if (params.error) {
// console.log('createRecvTransport | createWebRtcTransport | Error', params.error) console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
// return return
// } }
// consumerTransport = device.createRecvTransport(params) consumerTransport = device.createRecvTransport(params)
// consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => { consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
// try { try {
// await socket.emit('transport-recv-connect', { await socket.emit('transport-recv-connect', {
// dtlsParameters, dtlsParameters,
// }) })
// callback() callback()
// } catch (error) { } catch (error) {
// errback(error) errback(error)
// } }
// }) })
// connectRecvTransport() connectRecvTransport()
// }) })
// } }
btnLocalVideo.addEventListener('click', getLocalStream) btnLocalVideo.addEventListener('click', getLocalStream)
// btnRecvSendTransport.addEventListener('click', consume) btnRecvSendTransport.addEventListener('click', consume)
btnCloseCall.addEventListener('click', closeCall) btnCloseCall.addEventListener('click', closeCall)