Safemobile/mediasoup
21
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refactor code to use initiator/receiver

Browse Source
This commit is contained in:
Sergiu Toma 2022-12-14 09:55:45 +02:00
parent 3ca555ef9e
commit 695964d342
1 changed files with 312 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

414
app.js
View File

@ -148,13 +148,13 @@ const mediaCodecs = [
const closeCall = (callId) => { const closeCall = (callId) => {
try { try {
if (callId && videoCalls[callId]) { if (callId && videoCalls[callId]) {
videoCalls[callId].producerVideo?.close(); videoCalls[callId].receiverVideoProducer?.close();
videoCalls[callId].producerAudio?.close(); videoCalls[callId].receiverAudioProducer?.close();
videoCalls[callId].consumerVideo?.close(); videoCalls[callId].initiatorConsumerVideo?.close();
videoCalls[callId].consumerAudio?.close(); videoCalls[callId].initiatorConsumerAudio?.close();
videoCalls[callId]?.consumerTransport?.close(); videoCalls[callId]?.initiatorConsumerTransport?.close();
videoCalls[callId]?.producerTransport?.close(); videoCalls[callId]?.receiverProducerTransport?.close();
videoCalls[callId]?.router?.close(); videoCalls[callId]?.router?.close();
delete videoCalls[callId]; delete videoCalls[callId];
} else { } else {
@ -234,19 +234,33 @@ peers.on('connection', async socket => {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log(`[createWebRtcTransport] sender ${sender} | callId ${callId}`); console.log(`[createWebRtcTransport] sender ${sender} | callId ${callId}`);
if (sender) { if (sender) {
if (!videoCalls[callId].producerTransport) { if(!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
videoCalls[callId].producerTransport = await createWebRtcTransportLayer(callId, callback); videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback);
} else if(!videoCalls[callId].initiatorProducerTransport && isInitiator(callId, socket.id)) {
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);
} }
// if (!videoCalls[callId].producerTransport) {
// videoCalls[callId].producerTransport = await createWebRtcTransportLayer(callId, callback);
// } else {
// console.log(`producerTransport has already been defined | callId ${callId}`);
// callback(null);
// }
} else if (!sender) { } else if (!sender) {
if (!videoCalls[callId].consumerTransport) { if(!videoCalls[callId].receiverConsumerTransport && !isInitiator(callId, socket.id)) {
videoCalls[callId].consumerTransport = await createWebRtcTransportLayer(callId, callback); videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
} else { } else if(!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
console.log(`consumerTransport has already been defined | callId ${callId}`); videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback);
callback(null);
} }
// if (!videoCalls[callId].consumerTransport) {
// videoCalls[callId].consumerTransport = await createWebRtcTransportLayer(callId, callback);
// } else {
// console.log(`consumerTransport has already been defined | callId ${callId}`);
// callback(null);
// }
} }
} catch (error) { } catch (error) {
console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`); console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`);
@ -264,7 +278,12 @@ peers.on('connection', async socket => {
if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters); if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
console.log(`[transport-connect] socket.id ${socket.id} | callId ${callId}`); console.log(`[transport-connect] socket.id ${socket.id} | callId ${callId}`);
await videoCalls[callId].producerTransport.connect({ dtlsParameters }); if (!isInitiator(callId, socket.id)) {
await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
} else {
await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters });
}
// await videoCalls[callId].producerTransport.connect({ dtlsParameters });
} catch (error) { } catch (error) {
console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`); console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
} }
@ -285,42 +304,93 @@ peers.on('connection', async socket => {
console.log('rtpParameters', rtpParameters); console.log('rtpParameters', rtpParameters);
if (kind === 'video') { if (kind === 'video') {
videoCalls[callId].producerVideo = await videoCalls[callId].producerTransport.produce({ if (!isInitiator()) {
kind, videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
rtpParameters, kind,
}); rtpParameters,
});
// videoCalls[callId].producerVideo = await videoCalls[callId].producerTransport.produce({
// kind,
// rtpParameters,
// });
console.log(`[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`);
console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producerVideo.id} | kind: ${videoCalls[callId].producerVideo.kind}`); videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
const callId = socketDetails[socket.id];
console.log('transport for this producer closed', callId)
closeCall(callId);
});
// videoCalls[callId].producerVideo.on('transportclose', () => {
// const callId = socketDetails[socket.id];
// console.log('transport for this producer closed', callId)
// closeCall(callId);
// });
videoCalls[callId].producerVideo.on('transportclose', () => { // Send back to the client the Producer's id
const callId = socketDetails[socket.id]; callback && callback({
console.log('transport for this producer closed', callId) id: videoCalls[callId].receiverVideoProducer.id
closeCall(callId); });
}); // // Send back to the client the Producer's id
// callback && callback({
// id: videoCalls[callId].producerVideo.id
// });
} else {
videoCalls[callId].initiatorVideoProducer = await videoCalls[callId].initiatorProducerTransport.produce({
kind,
rtpParameters,
});
// Send back to the client the Producer's id console.log(`[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`);
callback && callback({
id: videoCalls[callId].producerVideo.id videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
}); const callId = socketDetails[socket.id];
console.log('transport for this producer closed', callId)
closeCall(callId);
});
callback && callback({
id: videoCalls[callId].initiatorVideoProducer.id
});
}
} else if (kind === 'audio') { } else if (kind === 'audio') {
videoCalls[callId].producerAudio = await videoCalls[callId].producerTransport.produce({ if (!isInitiator()) {
kind, videoCalls[callId].receiverAudioProducer = await videoCalls[callId].receiverProducerTransport.produce({
rtpParameters, kind,
}); rtpParameters,
});
console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producerAudio.id} | kind: ${videoCalls[callId].producerAudio.kind}`); console.log(`[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`);
videoCalls[callId].producerAudio.on('transportclose', () => { videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log('transport for this producer closed', callId) console.log('transport for this producer closed', callId)
closeCall(callId); closeCall(callId);
}); });
// Send back to the client the Producer's id // Send back to the client the Producer's id
callback && callback({ callback && callback({
id: videoCalls[callId].producerAudio.id id: videoCalls[callId].receiverAudioProducer.id
}); });
} else {
videoCalls[callId].initiatorAudioProducer = await videoCalls[callId].initiatorProducerTransport.produce({
kind,
rtpParameters,
});
console.log(`[transport-produce] initiatorAudioProducer Producer ID: ${videoCalls[callId].initiatorAudioProducer.id} | kind: ${videoCalls[callId].initiatorAudioProducer.kind}`);
videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
const callId = socketDetails[socket.id];
console.log('transport for this producer closed', callId)
closeCall(callId);
});
// Send back to the client the Producer's id
callback && callback({
id: videoCalls[callId].initiatorAudioProducer.id
});
}
} }
} catch (error) { } catch (error) {
console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`); console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
@ -335,7 +405,12 @@ peers.on('connection', async socket => {
try { try {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log(`[transport-recv-connect] socket.id ${socket.id} | callId ${callId}`); console.log(`[transport-recv-connect] socket.id ${socket.id} | callId ${callId}`);
await videoCalls[callId].consumerTransport.connect({ dtlsParameters }); // await videoCalls[callId].consumerTransport.connect({ dtlsParameters });
if(!isInitiator(callId, socket.id)) {
await videoCalls[callId].receiverConsumerTransport.connect({ dtlsParameters });
} else if(isInitiator(callId, socket.id)) {
await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
}
} catch (error) { } catch (error) {
console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`); console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
} }
@ -354,30 +429,50 @@ peers.on('connection', async socket => {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log('[consume] callId', callId); console.log('[consume] callId', callId);
let canConsumeVideo, canConsumeAudio;
if (isInitiator(callId, socket.id)) {
canConsumeVideo = !!videoCalls[callId].receiverVideoProducer && !!videoCalls[callId].router.canConsume({
producerId: videoCalls[callId].receiverVideoProducer.id,
rtpCapabilities
});
// const canConsumeVideo = !!videoCalls[callId].producerVideo && !!videoCalls[callId].router.canConsume({
// producerId: videoCalls[callId].producerVideo.id,
// rtpCapabilities
// })
const canConsumeVideo = !!videoCalls[callId].producerVideo && !!videoCalls[callId].router.canConsume({ canConsumeAudio = !!videoCalls[callId].receiverAudioProducer && !!videoCalls[callId].router.canConsume({
producerId: videoCalls[callId].producerVideo.id, producerId: videoCalls[callId].receiverAudioProducer.id,
rtpCapabilities rtpCapabilities
}) });
// const canConsumeAudio = !!videoCalls[callId].producerAudio && !!videoCalls[callId].router.canConsume({
// producerId: videoCalls[callId].producerAudio.id,
// rtpCapabilities
// })
const canConsumeAudio = !!videoCalls[callId].producerAudio && !!videoCalls[callId].router.canConsume({ } else {
producerId: videoCalls[callId].producerAudio.id, canConsumeVideo = !!videoCalls[callId].initiatorVideoProducer && !!videoCalls[callId].router.canConsume({
rtpCapabilities producerId: videoCalls[callId].initiatorVideoProducer.id,
}) rtpCapabilities
});
canConsumeAudio = !!videoCalls[callId].initiatorAudioProducer && !!videoCalls[callId].router.canConsume({
producerId: videoCalls[callId].initiatorAudioProducer.id,
rtpCapabilities
});
}
console.log('[consume] canConsumeVideo', canConsumeVideo); console.log('[consume] canConsumeVideo', canConsumeVideo);
console.log('[consume] canConsumeAudio', canConsumeAudio); console.log('[consume] canConsumeAudio', canConsumeAudio);
if (canConsumeVideo && !canConsumeAudio) { if (canConsumeVideo && !canConsumeAudio) {
console.log('1'); const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities)
const videoParams = await consumeVideo(callId, rtpCapabilities)
console.log('videoParams', videoParams);
callback({ videoParams, audioParams: null }); callback({ videoParams, audioParams: null });
} else if (canConsumeVideo && canConsumeAudio) { } else if (canConsumeVideo && canConsumeAudio) {
console.log('2'); const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities)
const videoParams = await consumeVideo(callId, rtpCapabilities) const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities)
const audioParams = await consumeAudio(callId, rtpCapabilities)
callback({ videoParams, audioParams }); callback({ videoParams, audioParams });
} else if (!canConsumeVideo && canConsumeAudio) {
const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities)
callback({ videoParams: null, audioParams });
} else { } else {
console.log(`[consume] Can't consume | callId ${callId}`); console.log(`[consume] Can't consume | callId ${callId}`);
callback(null); callback(null);
@ -396,68 +491,177 @@ peers.on('connection', async socket => {
try { try {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log(`[consumer-resume] callId ${callId}`) console.log(`[consumer-resume] callId ${callId}`)
await videoCalls[callId].consumerVideo.resume();
await videoCalls[callId].consumerAudio.resume(); if (isInitiator(callId, socket.id)) {
await videoCalls[callId].initiatorConsumerVideo.resume();
await videoCalls[callId].initiatorConsumerAudio.resume();
} else {
await videoCalls[callId].receiverConsumerVideo.resume();
await videoCalls[callId].receiverConsumerAudio.resume();
}
// await videoCalls[callId].consumerVideo.resume();
// await videoCalls[callId].consumerAudio.resume();
} catch (error) { } catch (error) {
console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`); console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
} }
}); });
}); });
const consumeVideo = async (callId, rtpCapabilities) => { const consumeVideo = async (callId, socketId, rtpCapabilities) => {
videoCalls[callId].consumerVideo = await videoCalls[callId].consumerTransport.consume({
producerId: videoCalls[callId].producerVideo.id,
rtpCapabilities,
paused: true,
});
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose if(isInitiator(callId, socketId)) {
videoCalls[callId].consumerVideo.on('transportclose', () => { videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
const callId = socketDetails[socket.id]; producerId: videoCalls[callId].receiverVideoProducer.id,
console.log('transport close from consumer', callId); rtpCapabilities,
closeCall(callId); paused: true,
}); });
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose // videoCalls[callId].consumerVideo = await videoCalls[callId].consumerTransport.consume({
videoCalls[callId].consumerVideo.on('producerclose', () => { // producerId: videoCalls[callId].producerVideo.id,
const callId = socketDetails[socket.id]; // rtpCapabilities,
console.log('producer of consumer closed', callId); // paused: true,
closeCall(callId); // });
});
return { // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
id: videoCalls[callId].consumerVideo.id, videoCalls[callId].initiatorConsumerVideo.on('transportclose', () => {
producerId: videoCalls[callId].producerVideo.id, const callId = socketDetails[socket.id];
kind: 'video', console.log('transport close from consumer', callId);
rtpParameters: videoCalls[callId].consumerVideo.rtpParameters, closeCall(callId);
});
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
// videoCalls[callId].consumerVideo.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);
});
// // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
// videoCalls[callId].consumerVideo.on('producerclose', () => {
// const callId = socketDetails[socket.id];
// console.log('producer of consumer closed', callId);
// closeCall(callId);
// });
return {
id: videoCalls[callId].initiatorConsumerVideo.id,
producerId: videoCalls[callId].receiverVideoProducer.id,
kind: 'video',
rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
}
// return {
// id: videoCalls[callId].consumerVideo.id,
// producerId: videoCalls[callId].producerVideo.id,
// kind: 'video',
// rtpParameters: videoCalls[callId].consumerVideo.rtpParameters,
// }
} else {
videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
producerId: videoCalls[callId].initiatorVideoProducer.id,
rtpCapabilities,
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 {
id: videoCalls[callId].receiverConsumerVideo.id,
producerId: videoCalls[callId].initiatorVideoProducer.id,
kind: 'video',
rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
}
} }
} }
const consumeAudio = async (callId, rtpCapabilities) => { const consumeAudio = async (callId, socketId, rtpCapabilities) => {
videoCalls[callId].consumerAudio = await videoCalls[callId].consumerTransport.consume({ if(isInitiator(callId, socketId)) {
producerId: videoCalls[callId].producerAudio.id, videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
rtpCapabilities, producerId: videoCalls[callId].receiverAudioProducer.id,
paused: true, rtpCapabilities,
}); paused: true,
});
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose // videoCalls[callId].consumerAudio = await videoCalls[callId].consumerTransport.consume({
videoCalls[callId].consumerAudio.on('transportclose', () => { // producerId: videoCalls[callId].producerAudio.id,
const callId = socketDetails[socket.id]; // rtpCapabilities,
console.log('transport close from consumer', callId); // paused: true,
closeCall(callId); // });
});
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
videoCalls[callId].consumerAudio.on('producerclose', () => { videoCalls[callId].initiatorConsumerAudio.on('transportclose', () => {
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log('producer of consumer closed', callId); console.log('transport close from consumer', callId);
closeCall(callId); closeCall(callId);
}); });
return {
id: videoCalls[callId].consumerAudio.id, // // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
producerId: videoCalls[callId].producerAudio.id, // videoCalls[callId].consumerAudio.on('transportclose', () => {
kind: 'audio', // const callId = socketDetails[socket.id];
rtpParameters: videoCalls[callId].consumerAudio.rtpParameters, // 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);
});
// // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
// videoCalls[callId].consumerAudio.on('producerclose', () => {
// const callId = socketDetails[socket.id];
// console.log('producer of consumer closed', callId);
// closeCall(callId);
// });
return {
id: videoCalls[callId].initiatorConsumerAudio.id,
producerId: videoCalls[callId].receiverAudioProducer.id,
kind: 'audio',
rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
}
} else {
videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
producerId: videoCalls[callId].initiatorAudioProducer.id,
rtpCapabilities,
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 {
id: videoCalls[callId].receiverConsumerAudio.id,
producerId: videoCalls[callId].initiatorAudioProducer.id,
kind: 'audio',
rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
}
} }
} }