Merge pull request 'LINXD-2303: Added client-to-client workflow; Added client-mediadoup workflow' (#26) from LINXD-2303-video-documentation-mobile-mobile into develop

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

app.js

@@ -1,4 +1,4 @@
-require('dotenv').config()
+require('dotenv').config();
 
 const express = require('express');
 const app = express();
@@ -15,7 +15,7 @@ const mediasoup = require('mediasoup');
 
 let worker;
 /**
- * 
+ *
  * videoCalls - Dictionary of Object(s)
  * '<callId>': {
  *  router: Router,
@@ -28,16 +28,16 @@ let worker;
  *  initiatorConsumerVideo: Consumer,
  *  initiatorConsumerAudio: Consumer,
  *  initiatorConsumerTransport: Consumer Transport
- *  initiatorSockerId
+ *  initiatorSocket
- *  receiverSocketId
+ *  receiverSocket
  * }
- * 
+ *
  **/
 let videoCalls = {};
 let socketDetails = {};
 
 app.get('/', (_req, res) => {
-  res.send('Hello from mediasoup app!')
+  res.send('Hello from mediasoup app!');
 });
 
 app.use('/sfu', express.static(path.join(__dirname, 'public')));
@@ -52,7 +52,7 @@ const httpsServer = https.createServer(options, app);
 
 const io = new Server(httpsServer, {
   allowEIO3: true,
-  origins: ["*:*"]
+  origins: ['*:*'],
 });
 
 httpsServer.listen(process.env.PORT, () => {
@@ -66,19 +66,19 @@ const createWorker = async () => {
     worker = await mediasoup.createWorker({
       rtcMinPort: parseInt(process.env.RTC_MIN_PORT),
       rtcMaxPort: parseInt(process.env.RTC_MAX_PORT),
-    })
+    });
     console.log(`[createWorker] worker pid ${worker.pid}`);
-  
+
-    worker.on('died', error => {
+    worker.on('died', (error) => {
       // This implies something serious happened, so kill the application
       console.error('mediasoup worker has died', error);
       setTimeout(() => process.exit(1), 2000); // exit in 2 seconds
-    })
+    });
     return worker;
   } catch (error) {
     console.log(`ERROR | createWorker | ${error.message}`);
   }
-}
+};
 
 // We create a Worker as soon as our application starts
 worker = createWorker();
@@ -87,57 +87,53 @@ worker = createWorker();
 // https://mediasoup.org/documentation/v3/mediasoup/rtp-parameters-and-capabilities/#RtpCodecCapability
 // list of media codecs supported by mediasoup ...
 // https://github.com/versatica/mediasoup/blob/v3/src/supportedRtpCapabilities.ts
-const mediaCodecs = 			[
+const mediaCodecs = [
   {
-    kind      : 'audio',
+    kind: 'audio',
-    mimeType  : 'audio/opus',
+    mimeType: 'audio/opus',
-    clockRate : 48000,
+    clockRate: 48000,
-    channels  : 2
+    channels: 2,
   },
   {
-    kind       : 'video',
+    kind: 'video',
-    mimeType   : 'video/VP8',
+    mimeType: 'video/VP8',
-    clockRate  : 90000,
+    clockRate: 90000,
-    parameters :
+    parameters: {
-    {
+      'x-google-start-bitrate': 1000,
-      'x-google-start-bitrate' : 1000
     },
-    channels  : 2
+    channels: 2,
   },
   {
-    kind       : 'video',
+    kind: 'video',
-    mimeType   : 'video/VP9',
+    mimeType: 'video/VP9',
-    clockRate  : 90000,
+    clockRate: 90000,
-    parameters :
+    parameters: {
-    {
+      'profile-id': 2,
-      'profile-id'             : 2,
+      'x-google-start-bitrate': 1000,
-      'x-google-start-bitrate' : 1000
+    },
-    }
   },
   {
-    kind       : 'video',
+    kind: 'video',
-    mimeType   : 'video/h264',
+    mimeType: 'video/h264',
-    clockRate  : 90000,
+    clockRate: 90000,
-    parameters :
+    parameters: {
-    {
+      'packetization-mode': 1,
-      'packetization-mode'      : 1,
+      'profile-level-id': '4d0032',
-      'profile-level-id'        : '4d0032',
+      'level-asymmetry-allowed': 1,
-      'level-asymmetry-allowed' : 1,
+      'x-google-start-bitrate': 1000,
-      'x-google-start-bitrate'  : 1000
+    },
-    }
   },
   {
-    kind       : 'video',
+    kind: 'video',
-    mimeType   : 'video/h264',
+    mimeType: 'video/h264',
-    clockRate  : 90000,
+    clockRate: 90000,
-    parameters :
+    parameters: {
-    {
+      'packetization-mode': 1,
-      'packetization-mode'      : 1,
+      'profile-level-id': '42e01f',
-      'profile-level-id'        : '42e01f',
+      'level-asymmetry-allowed': 1,
-      'level-asymmetry-allowed' : 1,
+      'x-google-start-bitrate': 1000,
-      'x-google-start-bitrate'  : 1000
+    },
-    }
+  },
-  }
 ];
 
 const closeCall = (callId) => {
@@ -158,18 +154,18 @@ const closeCall = (callId) => {
   } catch (error) {
     console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
   }
-}
+};
 
 /*
   - Handlers for WS events
   - These are created only when we have a connection with a peer
 */
-peers.on('connection', async socket => {
+peers.on('connection', async (socket) => {
   console.log('[connection] socketId:', socket.id);
 
   // After making the connection successfully, we send the client a 'connection-success' event
   socket.emit('connection-success', {
-    socketId: socket.id
+    socketId: socket.id,
   });
 
   // It is triggered when the peer is disconnected
@@ -192,18 +188,17 @@ 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
         console.log('[getRtpCapabilities] callId', callId);
-        callbackResponse = { 
+        callbackResponse = {
-          rtpCapabilities :videoCalls[callId].router.rtpCapabilities
+          rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
         };
       } else {
         console.log(`[createRoom] missing callId ${callId}`);
@@ -228,23 +223,25 @@ peers.on('connection', async socket => {
       const callId = socketDetails[socket.id];
       console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
       if (sender) {
-        if(!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
+        if (!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
           videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if(!videoCalls[callId].initiatorProducerTransport && isInitiator(callId, socket.id)) {
+        } else if (!videoCalls[callId].initiatorProducerTransport && isInitiator(callId, socket.id)) {
           videoCalls[callId].initiatorProducerTransport = await createWebRtcTransportLayer(callId, callback);
         } else {
           console.log(`producerTransport has already been defined | callId ${callId}`);
           callback(null);
         }
       } else if (!sender) {
-        if(!videoCalls[callId].receiverConsumerTransport && !isInitiator(callId, socket.id)) {
+        if (!videoCalls[callId].receiverConsumerTransport && !isInitiator(callId, socket.id)) {
           videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if(!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
+        } else if (!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
           videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback);
         }
       }
     } 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}`
+      );
       callback(error);
     }
   });
@@ -259,11 +256,11 @@ 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 });
+      isInitiator(callId, socket.id)
-      } else {
+        ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
-        await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters });
+        : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
-      }
+
     } catch (error) {
       console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -278,8 +275,9 @@ peers.on('connection', async socket => {
     try {
       const callId = socketDetails[socket.id];
       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({
@@ -287,35 +285,41 @@ peers.on('connection', async socket => {
             rtpParameters,
           });
 
-          console.log(`[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`);
+          console.log(
+            `[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`
+          );
 
           videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
             const callId = socketDetails[socket.id];
-            console.log('transport for this producer closed', callId)
+            console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
           // Send back to the client the Producer's id
-          callback && callback({
+          callback &&
-            id: videoCalls[callId].receiverVideoProducer.id
+            callback({
-          });
+              id: videoCalls[callId].receiverVideoProducer.id,
+            });
         } else {
           videoCalls[callId].initiatorVideoProducer = await videoCalls[callId].initiatorProducerTransport.produce({
             kind,
             rtpParameters,
           });
 
-          console.log(`[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`);
+          console.log(
+            `[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`
+          );
 
           videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
             const callId = socketDetails[socket.id];
-            console.log('transport for this producer closed', callId)
+            console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
-          callback && callback({
+          callback &&
-            id: videoCalls[callId].initiatorVideoProducer.id
+            callback({
-          });
+              id: videoCalls[callId].initiatorVideoProducer.id,
+            });
         }
       } else if (kind === 'audio') {
         if (!isInitiator(callId, socket.id)) {
@@ -324,38 +328,50 @@ peers.on('connection', async socket => {
             rtpParameters,
           });
 
-          console.log(`[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`);
+          console.log(
-      
+            `[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`
+          );
+
           videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
             const callId = socketDetails[socket.id];
-            console.log('transport for this producer closed', callId)
+            console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
           // Send back to the client the Producer's id
-          callback && callback({
+          callback &&
-            id: videoCalls[callId].receiverAudioProducer.id
+            callback({
-          });
+              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}`);
+          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)
+            console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
           // Send back to the client the Producer's id
-          callback && callback({
+          callback &&
-            id: videoCalls[callId].initiatorAudioProducer.id
+            callback({
-          });
+              id: videoCalls[callId].initiatorAudioProducer.id,
+            });
         }
       }
+
+      const socketToEmit = isInitiator(callId, socket.id)
+        ? videoCalls[callId].receiverSocket
+        : videoCalls[callId].initiatorSocket;
+      socketToEmit.emit('new-producer', { callId });
+
     } catch (error) {
       console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -369,16 +385,17 @@ 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)) {
+      if (!isInitiator(callId, socket.id)) {
         await videoCalls[callId].receiverConsumerTransport.connect({ dtlsParameters });
-      } else if(isInitiator(callId, socket.id)) {
+      } else if (isInitiator(callId, socket.id)) {
         await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
       }
     } catch (error) {
       console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
-  })
+  });
 
   /*
     - The customer consumes after successfully connecting to consumerTransport
@@ -390,43 +407,54 @@ peers.on('connection', async socket => {
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`);
+      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)) {
-        canConsumeVideo = !!videoCalls[callId].receiverVideoProducer && !!videoCalls[callId].router.canConsume({
+        canConsumeVideo =
-          producerId: videoCalls[callId].receiverVideoProducer.id,
+          !!videoCalls[callId].receiverVideoProducer &&
-          rtpCapabilities
+          !!videoCalls[callId].router.canConsume({
-        });
+            producerId: videoCalls[callId].receiverVideoProducer.id,
-        canConsumeAudio = !!videoCalls[callId].receiverAudioProducer && !!videoCalls[callId].router.canConsume({
+            rtpCapabilities,
-          producerId: videoCalls[callId].receiverAudioProducer.id,
+          });
-          rtpCapabilities
+        canConsumeAudio =
-        });
+          !!videoCalls[callId].receiverAudioProducer &&
-
+          !!videoCalls[callId].router.canConsume({
+            producerId: videoCalls[callId].receiverAudioProducer.id,
+            rtpCapabilities,
+          });
       } else {
-        canConsumeVideo = !!videoCalls[callId].initiatorVideoProducer && !!videoCalls[callId].router.canConsume({
+        canConsumeVideo =
-          producerId: videoCalls[callId].initiatorVideoProducer.id,
+          !!videoCalls[callId].initiatorVideoProducer &&
-          rtpCapabilities
+          !!videoCalls[callId].router.canConsume({
-        });
+            producerId: videoCalls[callId].initiatorVideoProducer.id,
+            rtpCapabilities,
+          });
 
-        canConsumeAudio = !!videoCalls[callId].initiatorAudioProducer && !!videoCalls[callId].router.canConsume({
+        canConsumeAudio =
-          producerId: videoCalls[callId].initiatorAudioProducer.id,
+          !!videoCalls[callId].initiatorAudioProducer &&
-          rtpCapabilities
+          !!videoCalls[callId].router.canConsume({
-        });
+            producerId: videoCalls[callId].initiatorAudioProducer.id,
+            rtpCapabilities,
+          });
       }
       console.log('[consume] canConsumeVideo', canConsumeVideo);
       console.log('[consume] canConsumeAudio', canConsumeAudio);
 
       if (canConsumeVideo && !canConsumeAudio) {
-        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities)
+        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
         callback({ videoParams, audioParams: null });
       } else if (canConsumeVideo && canConsumeAudio) {
-        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities)
+        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
-        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities)
+        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
         callback({ videoParams, audioParams });
       } else if (!canConsumeVideo && canConsumeAudio) {
-        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities)
+        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
         const data = { videoParams: null, audioParams };
         callback(data);
       } else {
@@ -434,28 +462,26 @@ peers.on('connection', async socket => {
         callback(null);
       }
     } catch (error) {
-      console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`)
+      console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`);
       callback({ params: { error } });
     }
   });
 
   /*
     - 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 
+    - 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}`)
+      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}`);
@@ -464,8 +490,7 @@ peers.on('connection', async socket => {
 });
 
 const consumeVideo = async (callId, socketId, rtpCapabilities) => {
-
+  if (isInitiator(callId, socketId)) {
-  if(isInitiator(callId, socketId)) {
     videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
       producerId: videoCalls[callId].receiverVideoProducer.id,
       rtpCapabilities,
@@ -491,7 +516,7 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
       producerId: videoCalls[callId].receiverVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
-    }
+    };
   } else {
     videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
       producerId: videoCalls[callId].initiatorVideoProducer.id,
@@ -516,12 +541,12 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
       producerId: videoCalls[callId].initiatorVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
-    }
+    };
   }
-}
+};
 
 const consumeAudio = async (callId, socketId, rtpCapabilities) => {
-  if(isInitiator(callId, socketId)) {
+  if (isInitiator(callId, socketId)) {
     videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
       producerId: videoCalls[callId].receiverAudioProducer.id,
       rtpCapabilities,
@@ -547,7 +572,7 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
       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,
@@ -572,13 +597,13 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
       producerId: videoCalls[callId].initiatorAudioProducer.id,
       kind: 'audio',
       rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
-    }
+    };
   }
-}
+};
 
 const isInitiator = (callId, socketId) => {
-  return (videoCalls[callId].initiatorSockerId === socketId);
+  return videoCalls[callId]?.initiatorSocket?.id === socketId;
-}
+};
 
 /*
   - Called from at event 'createWebRtcTransport' and assigned to the consumer or producer transport
@@ -596,19 +621,18 @@ const createWebRtcTransportLayer = async (callId, callback) => {
         {
           ip: process.env.IP, // Listening IPv4 or IPv6.
           announcedIp: process.env.ANNOUNCED_IP, // Announced IPv4 or IPv6 (useful when running mediasoup behind NAT with private IP).
-        }
+        },
       ],
       enableUdp: true,
       enableTcp: true,
       preferUdp: true,
     };
-    
+
     // https://mediasoup.org/documentation/v3/mediasoup/api/#router-createWebRtcTransport
-    let transport = await videoCalls[callId].router.createWebRtcTransport(webRtcTransport_options)
+    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 => {
+    transport.on('dtlsstatechange', (dtlsState) => {
       console.log(`transport | dtlsstatechange | calldId ${callId} | dtlsState ${dtlsState}`);
       if (dtlsState === 'closed') {
         transport.close();
@@ -633,9 +657,8 @@ const createWebRtcTransportLayer = async (callId, callback) => {
 
     // Set transport to producerTransport or consumerTransport
     return transport;
-
   } catch (error) {
     console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
     callback({ params: { error } });
   }
-}
+};

build.sh

@@ -9,14 +9,21 @@ 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,doc,Dockerfile} dist/
-
+#cp -r ./* dist/
+dateString=$(date +"%Y%m%d-%H%M%S")
+git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git--$dateString.log"
 #Add version control for pm2
 cd dist
 #Add version control for pm2
@@ -43,4 +50,4 @@ fi
 
 ## POST BUILD
 
-cd -
+cd -

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) {