LAPI-675: Comment code<DEBUG>

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

app.js

@@ -13,40 +13,40 @@ try {
 }
 const mediasoup = require('mediasoup');
 
-let worker
+let worker;
 /**
  * 
  * videoCalls - Dictionary of Object(s)
  * '<callId>': {
- *  router: Router,                                            router
+ *  router: Router,
  *  initiatorAudioProducer: Producer,
  *  initiatorVideoProducer: Producer,
- *  receiverVideoProducer: Producer,                           producerVideo
+ *  receiverVideoProducer: Producer,
- *  receiverAudioProducer: Producer,                           producerAudio
+ *  receiverAudioProducer: Producer,
  *  initiatorProducerTransport: Producer Transport,
- *  receiverProducerTransport: Producer Transport,             producerTransport
+ *  receiverProducerTransport: Producer Transport,
- *  initiatorConsumerVideo: Consumer,                          consumerVideo
+ *  initiatorConsumerVideo: Consumer,
- *  initiatorConsumerAudio: Consumer,                          consumerAudio
+ *  initiatorConsumerAudio: Consumer,
- *  initiatorConsumerTransport: Consumer Transport             consumerTransport
+ *  initiatorConsumerTransport: Consumer Transport
- *  initiatorSockerId
+ *  initiatorSocket
- *  receiverSocketId
+ *  receiverSocket
  * }
  * 
  **/
-let videoCalls = {}
+let videoCalls = {};
-let socketDetails = {}
+let socketDetails = {};
 
 app.get('/', (_req, res) => {
   res.send('Hello from mediasoup app!')
-})
+});
 
-app.use('/sfu', express.static(path.join(__dirname, 'public')))
+app.use('/sfu', express.static(path.join(__dirname, 'public')));
 
 // SSL cert for HTTPS access
 const options = {
   key: fs.readFileSync(process.env.SERVER_KEY, 'utf-8'),
   cert: fs.readFileSync(process.env.SERVER_CERT, 'utf-8'),
-}
+};
 
 const httpsServer = https.createServer(options, app);
 
@@ -193,11 +193,11 @@ peers.on('connection', async socket => {
         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
@@ -225,7 +225,6 @@ peers.on('connection', async socket => {
   */
   socket.on('createWebRtcTransport', async ({ sender }, callback) => {
     try {
-      console.log('🟥', socket.id, JSON.stringify(sender));
       const callId = socketDetails[socket.id];
       console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
       if (sender) {
@@ -281,6 +280,72 @@ peers.on('connection', async socket => {
       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
       
       console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      // 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');
+      //       initiatorSocket.emit('new-producer', {
+      //         callId
+      //       });
+
+      //     } else {
+      //       console.log('🟥 Emit to receiverSocket');
+      //       receiverSocket.emit('new-producer', {
+      //         callId
+      //       });
+      //     }
+      //   });
+      
+      // });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      
       if (kind === 'video') {
         if (!isInitiator(callId, socket.id)) {
           videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
@@ -370,6 +435,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 });
@@ -393,6 +459,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)) {
@@ -429,7 +497,6 @@ peers.on('connection', async socket => {
       } else if (!canConsumeVideo && canConsumeAudio) {
         const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities)
         const data = { videoParams: null, audioParams };
-        console.log('-----------======= data', data);
         callback(data);
       } else {
         console.log(`[consume] Can't consume | callId ${callId}`);
@@ -444,23 +511,19 @@ 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();
       }
-      // await videoCalls[callId].consumerVideo.resume();
-      // await videoCalls[callId].consumerAudio.resume();
     } catch (error) {
       console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -581,7 +644,7 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
 }
 
 const isInitiator = (callId, socketId) => {
-  return (videoCalls[callId].initiatorSockerId === socketId);
+  return (videoCalls[callId].initiatorSocket.id === socketId);
 }
 
 /*

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

@@ -20811,28 +20811,15 @@ const connectRecvTransport = async () => {
     if (audioParams) {
       console.log('❗ Have AUDIO stream to consume');
       let audioTrack = await getAudioTrask(audioParams)
-      console.log('audioTrack', audioTrack);
       stream.addTrack(audioTrack)
     } else {
       console.log('❗ Don\'t have AUDIO stream to consume');
     }
 
-    console.log('----------stream', stream);
-    console.log('stream.getAudioTracks()', stream.getAudioTracks());
     socket.emit('consumer-resume')
 
     remoteVideo.srcObject = stream
-    // remoteVideo.autoplay = true
+    remoteVideo.setAttribute('autoplay', true)
-    remoteVideo.controls = true;
-    remoteVideo.muted = true;
-    remoteVideo.loop = true;
-    remoteVideo.setAttribute('playsinline', '');
-    remoteVideo.src = stream;
-    remoteVideo.volume = 1.0;
-
-    //   window.localStream = stream; // A
-    //   window.localAudio.srcObject = stream; // B
-    //   window.localAudio.autoplay = true; // C
 
     remoteVideo.play()
     .then(() => {
@@ -20873,24 +20860,24 @@ const getAudioTrask = async (audioParams) => {
 
   const audioTrack = consumerAudio.track
 
-  // audioTrack.applyConstraints({
+  audioTrack.applyConstraints({
-  //   audio: {
+    audio: {
-  //     advanced: [
+      advanced: [
-  //       {
+        {
-  //         echoCancellation: {exact: true}
+          echoCancellation: {exact: true}
-  //       },
+        },
-  //       {
+        {
-  //         autoGainControl: {exact: true}
+          autoGainControl: {exact: true}
-  //       },
+        },
-  //       {
+        {
-  //         noiseSuppression: {exact: true}
+          noiseSuppression: {exact: true}
-  //       }, 
+        }, 
-  //       {
+        {
-  //         highpassFilter: {exact: true}
+          highpassFilter: {exact: true}
-  //       }
+        }
-  //     ]
+      ]
-  //   }
+    }
-  // })
+  })
 
   return audioTrack
 }

public/index.js

@@ -95,6 +95,10 @@ setTimeout(() => {
       }
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
+
+    // socket.on('new-producer', ({ callId }) => {
+    //   console.log(`🟥 new-producer | callId: ${callId}`);
+    // })
   }
   
   if (IS_PRODUCER === true) {
@@ -453,28 +457,15 @@ const connectRecvTransport = async () => {
     if (audioParams) {
       console.log('❗ Have AUDIO stream to consume');
       let audioTrack = await getAudioTrask(audioParams)
-      console.log('audioTrack', audioTrack);
       stream.addTrack(audioTrack)
     } else {
       console.log('❗ Don\'t have AUDIO stream to consume');
     }
 
-    console.log('----------stream', stream);
-    console.log('stream.getAudioTracks()', stream.getAudioTracks());
     socket.emit('consumer-resume')
 
     remoteVideo.srcObject = stream
-    // remoteVideo.autoplay = true
+    remoteVideo.setAttribute('autoplay', true)
-    remoteVideo.controls = true;
-    remoteVideo.muted = true;
-    remoteVideo.loop = true;
-    remoteVideo.setAttribute('playsinline', '');
-    remoteVideo.src = stream;
-    remoteVideo.volume = 1.0;
-
-    //   window.localStream = stream; // A
-    //   window.localAudio.srcObject = stream; // B
-    //   window.localAudio.autoplay = true; // C
 
     remoteVideo.play()
     .then(() => {
@@ -515,24 +506,24 @@ const getAudioTrask = async (audioParams) => {
 
   const audioTrack = consumerAudio.track
 
-  // audioTrack.applyConstraints({
+  audioTrack.applyConstraints({
-  //   audio: {
+    audio: {
-  //     advanced: [
+      advanced: [
-  //       {
+        {
-  //         echoCancellation: {exact: true}
+          echoCancellation: {exact: true}
-  //       },
+        },
-  //       {
+        {
-  //         autoGainControl: {exact: true}
+          autoGainControl: {exact: true}
-  //       },
+        },
-  //       {
+        {
-  //         noiseSuppression: {exact: true}
+          noiseSuppression: {exact: true}
-  //       }, 
+        }, 
-  //       {
+        {
-  //         highpassFilter: {exact: true}
+          highpassFilter: {exact: true}
-  //       }
+        }
-  //     ]
+      ]
-  //   }
+    }
-  // })
+  })
 
   return audioTrack
 }