test

Reviewed-on: #23
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>

app.js

@@ -28,8 +28,8 @@ let worker;
  *  initiatorConsumerVideo: Consumer,
  *  initiatorConsumerAudio: Consumer,
  *  initiatorConsumerTransport: Consumer Transport
- *  initiatorSockerId
+ *  initiatorSocket
- *  receiverSocketId
+ *  receiverSocket
  * }
  * 
  **/
@@ -192,12 +192,11 @@ peers.on('connection', async socket => {
       if (callId) {
         console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
         if (!videoCalls[callId]) {
-          console.log('[createRoom] callId', callId);
+          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
-          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) }
           console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
-          videoCalls[callId].receiverSocketId = socket.id
+          videoCalls[callId].receiverSocket = socket;
         } else {
-          videoCalls[callId].initiatorSockerId = socket.id
+          videoCalls[callId].initiatorSocket = socket;
         }
         socketDetails[socket.id] = callId;
         // rtpCapabilities is set for callback
@@ -259,11 +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 });
+        videoCalls[callId].initiatorSocket.emit('new-producer', {
+          callId
+        });
       } else {
         await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters });
+        videoCalls[callId].receiverSocket.emit('new-producer', {
+          callId
+        });
       }
+
     } catch (error) {
       console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -280,6 +287,7 @@ peers.on('connection', async socket => {
       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
       
       console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
+      
       if (kind === 'video') {
         if (!isInitiator(callId, socket.id)) {
           videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
@@ -369,6 +377,7 @@ peers.on('connection', async socket => {
     try {
       const callId = socketDetails[socket.id];
       console.log(`[transport-recv-connect] socket ${socket.id} | callId ${callId}`);
+      if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
       // await videoCalls[callId].consumerTransport.connect({ dtlsParameters });
       if(!isInitiator(callId, socket.id)) {
         await videoCalls[callId].receiverConsumerTransport.connect({ dtlsParameters });
@@ -392,6 +401,8 @@ peers.on('connection', async socket => {
       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);
+
       console.log('[consume] callId', callId);
       let canConsumeVideo, canConsumeAudio;
       if (isInitiator(callId, socket.id)) {
@@ -442,20 +453,18 @@ peers.on('connection', async socket => {
   /*
     - Event sent by the consumer after consuming to resume the pause
     - 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
   */
-  socket.on('consumer-resume', async () => {
+  socket.on('consumer-resume',() => {
     try {
       const callId = socketDetails[socket.id];
       console.log(`[consumer-resume] callId ${callId}`)
-
       if (isInitiator(callId, socket.id)) {
-        console.log(`[consumer-resume] isInitiator true`);
+        videoCalls[callId]?.initiatorConsumerVideo?.resume();
-        await videoCalls[callId].initiatorConsumerVideo.resume();
+        videoCalls[callId]?.initiatorConsumerAudio?.resume();
-        await videoCalls[callId].initiatorConsumerAudio.resume();
       } else {
-        console.log(`[consumer-resume] isInitiator false`);
+        videoCalls[callId]?.receiverConsumerVideo?.resume();
-        (videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerVideo.resume();
+        videoCalls[callId]?.receiverConsumerAudio?.resume();
-        (videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerAudio.resume();
       }
     } catch (error) {
       console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
@@ -577,7 +586,7 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
 }
 
 const isInitiator = (callId, socketId) => {
-  return (videoCalls[callId].initiatorSockerId === socketId);
+  return (videoCalls[callId]?.initiatorSocket?.id === socketId);
 }
 
 /*
@@ -605,7 +614,6 @@ const createWebRtcTransportLayer = async (callId, callback) => {
     
     // https://mediasoup.org/documentation/v3/mediasoup/api/#router-createWebRtcTransport
     let transport = await videoCalls[callId].router.createWebRtcTransport(webRtcTransport_options)
-    console.log(`callId: ${callId} | transport id: ${transport.id}`)
 
     // Handler for when DTLS(Datagram Transport Layer Security) changes
     transport.on('dtlsstatechange', dtlsState => {

build.sh

@@ -9,13 +9,19 @@ else
   ## CLEANUP
   rm -fr dist/*
 fi
+
+if [ -d "node_modules" ]; then
+  rm -fr node_modules
+fi
+
 # Install dependencies
 #npm install
 
 ## PROJECT NEEDS
 echo "Building app... from $(git rev-parse --abbrev-ref HEAD)"
 #npm run-script build
-cp -r {.env,app.js,package.json,server,public} dist/
+#cp -r {.env,app.js,package.json,server,public} dist/
+cp -r ./* dist/
 
 #Add version control for pm2
 cd dist

public/bundle.js

@@ -20449,10 +20449,14 @@ setTimeout(() => {
       console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
       if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
         goConnect()
-        // document.getElementById('btnRecvSendTransport').click();
       }
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
+
+    socket.on('new-producer', ({ callId }) => {
+      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      consume()
+    })
   }
   
   if (IS_PRODUCER === true) {

public/index.js

@@ -91,10 +91,14 @@ setTimeout(() => {
       console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
       if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
         goConnect()
-        // document.getElementById('btnRecvSendTransport').click();
       }
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
+
+    socket.on('new-producer', ({ callId }) => {
+      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      consume()
+    })
   }
   
   if (IS_PRODUCER === true) {