LH-276: Update producer close event handler

Reviewed-on: #29
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();
@@ -37,7 +37,7 @@ 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}`);
+    console.error(`[createWorker] | ERROR | error: ${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) => {
@@ -152,24 +148,23 @@ const closeCall = (callId) => {
       videoCalls[callId]?.receiverProducerTransport?.close();
       videoCalls[callId]?.router?.close();
       delete videoCalls[callId];
-    } else {
+      console.log(`[closeCall] | callId: ${callId}`);
-      console.log(`The call with id ${callId} has already been deleted`);
     }
   } catch (error) {
-    console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
+    console.error(`[closeCall] | ERROR | callId: ${callId} | error: ${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
@@ -193,22 +188,21 @@ peers.on('connection', async socket => {
         console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
         if (!videoCalls[callId]) {
           videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
-          console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
+          console.log(`[createRoom] Generate Router ID: ${videoCalls[callId].router.id}`);
           videoCalls[callId].receiverSocket = socket;
         } else {
           videoCalls[callId].initiatorSocket = socket;
         }
         socketDetails[socket.id] = callId;
         // rtpCapabilities is set for callback
-        console.log('[getRtpCapabilities] callId', callId);
         callbackResponse = {
-          rtpCapabilities :videoCalls[callId].router.rtpCapabilities
+          rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
         };
       } else {
-        console.log(`[createRoom] missing callId ${callId}`);
+        console.log(`[createRoom] missing callId: ${callId}`);
       }
     } catch (error) {
-      console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
+      console.error(`[createRoom] | ERROR | callId: ${callId} | error: ${error.message}`);
     } finally {
       callback(callbackResponse);
     }
@@ -227,23 +221,23 @@ 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.error(`[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${error.message}`);
       callback(error);
     }
   });
@@ -259,20 +253,11 @@ peers.on('connection', async socket => {
 
       console.log(`[transport-connect] socket ${socket.id} | callId ${callId}`);
 
-      if (!isInitiator(callId, socket.id)) {
+      isInitiator(callId, socket.id)
-        await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
+        ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
-        videoCalls[callId].initiatorSocket.emit('new-producer', {
+        : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
-          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}`);
+      console.error(`[transport-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
 
@@ -286,7 +271,7 @@ peers.on('connection', async socket => {
       const callId = socketDetails[socket.id];
       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
 
-      console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
+      console.log(`[transport-produce] callId: ${callId} | kind: ${kind} | socket: ${socket.id}`);
 
       if (kind === 'video') {
         if (!isInitiator(callId, socket.id)) {
@@ -295,35 +280,31 @@ peers.on('connection', async socket => {
             rtpParameters,
           });
 
-          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}`);
-
           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)) {
@@ -332,40 +313,44 @@ peers.on('connection', async socket => {
             rtpParameters,
           });
 
-          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}`);
-      
           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;
+
+      // callId - Id of the call
+      // kind - producer type: audio/video
+      socketToEmit?.emit('new-producer', { callId, kind });
     } catch (error) {
-      console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
+      console.error(`[transport-produce] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
 
@@ -379,15 +364,15 @@ peers.on('connection', async socket => {
       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}`);
+      console.error(`[transport-recv-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
-  })
+  });
 
   /*
     - The customer consumes after successfully connecting to consumerTransport
@@ -399,45 +384,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)}`);
 
       if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
 
-      console.log('[consume] callId', callId);
       let canConsumeVideo, canConsumeAudio;
-      if (isInitiator(callId, socket.id)) {
+      try {
-        canConsumeVideo = !!videoCalls[callId].receiverVideoProducer && !!videoCalls[callId].router.canConsume({
+        if (isInitiator(callId, socket.id)) {
-          producerId: videoCalls[callId].receiverVideoProducer.id,
+          canConsumeVideo =
-          rtpCapabilities
+            !!videoCalls[callId].receiverVideoProducer &&
-        });
+            !!videoCalls[callId].router.canConsume({
-        canConsumeAudio = !!videoCalls[callId].receiverAudioProducer && !!videoCalls[callId].router.canConsume({
+              producerId: videoCalls[callId].receiverVideoProducer.id,
-          producerId: videoCalls[callId].receiverAudioProducer.id,
+              rtpCapabilities,
-          rtpCapabilities
+            });
-        });
+          canConsumeAudio =
+            !!videoCalls[callId].receiverAudioProducer &&
+            !!videoCalls[callId].router.canConsume({
+              producerId: videoCalls[callId].receiverAudioProducer.id,
+              rtpCapabilities,
+            });
+        } else {
+          canConsumeVideo =
+            !!videoCalls[callId].initiatorVideoProducer &&
+            !!videoCalls[callId].router.canConsume({
+              producerId: videoCalls[callId].initiatorVideoProducer.id,
+              rtpCapabilities,
+            });
   
-      } else {
+          canConsumeAudio =
-        canConsumeVideo = !!videoCalls[callId].initiatorVideoProducer && !!videoCalls[callId].router.canConsume({
+            !!videoCalls[callId].initiatorAudioProducer &&
-          producerId: videoCalls[callId].initiatorVideoProducer.id,
+            !!videoCalls[callId].router.canConsume({
-          rtpCapabilities
+              producerId: videoCalls[callId].initiatorAudioProducer.id,
-        });
+              rtpCapabilities,
-
+            });
-        canConsumeAudio = !!videoCalls[callId].initiatorAudioProducer && !!videoCalls[callId].router.canConsume({
+        }
-          producerId: videoCalls[callId].initiatorAudioProducer.id,
+      } catch (error) {
-          rtpCapabilities
+        console.error(`[consume] | ERROR | callId: ${callId} | error: ${error.message}`);
-        });
       }
-      console.log('[consume] canConsumeVideo', canConsumeVideo);
+      
-      console.log('[consume] canConsumeAudio', canConsumeAudio);
+      console.log(`[consume] socket ${socket.id} | callId: ${callId} | canConsumeVideo: ${canConsumeVideo} | 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 {
@@ -445,7 +439,7 @@ peers.on('connection', async socket => {
         callback(null);
       }
     } catch (error) {
-      console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`)
+      console.error(`[consume] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
       callback({ params: { error } });
     }
   });
@@ -455,52 +449,54 @@ peers.on('connection', async socket => {
     - 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',() => {
+   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 {
-      const callId = socketDetails[socket.id];
-      console.log(`[consumer-resume] callId ${callId}`)
       if (isInitiator(callId, socket.id)) {
-        videoCalls[callId]?.initiatorConsumerVideo?.resume();
+        console.log(`[close-producer] initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId]?.initiatorConsumerAudio?.resume();
+        videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
       } else {
-        videoCalls[callId]?.receiverConsumerVideo?.resume();
+        console.log(`[close-producer] receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId]?.receiverConsumerAudio?.resume();
+        videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
       }
     } catch (error) {
-      console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
+      console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
+  
 });
 
 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({
       producerId: videoCalls[callId].receiverVideoProducer.id,
       rtpCapabilities,
       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 {
       id: videoCalls[callId].initiatorConsumerVideo.id,
       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,
@@ -508,55 +504,29 @@ const consumeVideo = async (callId, socketId, 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, socketId, rtpCapabilities) => {
-  if(isInitiator(callId, socketId)) {
+  if (isInitiator(callId, socketId)) {
     videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
       producerId: videoCalls[callId].receiverAudioProducer.id,
       rtpCapabilities,
       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 {
       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,
@@ -564,30 +534,18 @@ const consumeAudio = async (callId, socketId, 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,
-    }
+    };
   }
-}
+};
 
 const isInitiator = (callId, socketId) => {
-  return (videoCalls[callId]?.initiatorSocket?.id === socketId);
+  return videoCalls[callId]?.initiatorSocket?.id === socketId;
-}
+};
 
 /*
   - Called from at event 'createWebRtcTransport' and assigned to the consumer or producer transport
@@ -598,14 +556,14 @@ const isInitiator = (callId, socketId) => {
 */
 const createWebRtcTransportLayer = async (callId, callback) => {
   try {
-    console.log('[createWebRtcTransportLayer] callId', callId);
+    console.log(`[createWebRtcTransportLayer] callId: ${callId}`);
     // https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
     const webRtcTransport_options = {
       listenIps: [
         {
           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,
@@ -613,10 +571,10 @@ const createWebRtcTransportLayer = async (callId, callback) => {
     };
 
     // 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);
 
     // 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();
@@ -635,15 +593,13 @@ const createWebRtcTransportLayer = async (callId, callback) => {
       dtlsParameters: transport.dtlsParameters,
     };
 
-    console.log('[createWebRtcTransportLayer] callback params', params);
     // Send back to the client the params
     callback({ params });
 
     // Set transport to producerTransport or consumerTransport
     return transport;
-
   } catch (error) {
-    console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
+    console.error(`[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     callback({ params: { error } });
   }
-}
+};

build.sh

@@ -20,9 +20,10 @@ fi
 ## 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/
+#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

public/bundle.js

@@ -20353,7 +20353,7 @@ module.exports = yeast;
 },{}],94:[function(require,module,exports){
 module.exports = {
   hubAddress: 'https://hub.dev.linx.safemobile.com/',
-  mediasoupAddress: 'https://testing.video.safemobile.org',
+  mediasoupAddress: 'https://testing.video.safemobile.org/',
 }
 },{}],95:[function(require,module,exports){
 const io = require('socket.io-client')
@@ -20453,9 +20453,18 @@ setTimeout(() => {
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
 
-    socket.on('new-producer', ({ callId }) => {
+    socket.on('new-producer', ({ callId, kind }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
-      consume()
+      connectRecvTransport();
+    })
+
+    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()
     })
   }
   
@@ -20735,6 +20744,8 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
+
+  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -20774,7 +20785,8 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    connectRecvTransport()
+    // We call it in new-rpoducer, we don't need it here anymore
+    // connectRecvTransport()
   })
 }
 
@@ -20830,7 +20842,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
+      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -20847,6 +20859,36 @@ const getVideoTrask = async (videoParams) => {
     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
 }
 
@@ -20862,6 +20904,14 @@ const getAudioTrask = async (audioParams) => {
     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
 
   audioTrack.applyConstraints({
@@ -20907,31 +20957,31 @@ const closeCall = () => {
   resetCallSettings()
 }
 
-const consume = async () => {
+// const consume = async (kind) => {
-  console.log('[consume]')
+//   console.log(`[consume] kind: ${kind}`)
-  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)
-btnRecvSendTransport.addEventListener('click', consume)
+// btnRecvSendTransport.addEventListener('click', consume)
 btnCloseCall.addEventListener('click', closeCall)
 },{"./config":94,"mediasoup-client":66,"socket.io-client":82}]},{},[95]);

public/config.js

@@ -1,4 +1,4 @@
 module.exports = {
   hubAddress: 'https://hub.dev.linx.safemobile.com/',
-  mediasoupAddress: 'https://testing.video.safemobile.org',
+  mediasoupAddress: 'https://testing.video.safemobile.org/',
 }

public/index.html

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

public/index.js

@@ -95,9 +95,18 @@ setTimeout(() => {
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
 
-    socket.on('new-producer', ({ callId }) => {
+    socket.on('new-producer', ({ callId, kind }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
-      consume()
+      connectRecvTransport();
+    })
+
+    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()
     })
   }
   
@@ -377,6 +386,8 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
+
+  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -416,7 +427,8 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    connectRecvTransport()
+    // We call it in new-rpoducer, we don't need it here anymore
+    // connectRecvTransport()
   })
 }
 
@@ -472,7 +484,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
+      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -489,6 +501,36 @@ const getVideoTrask = async (videoParams) => {
     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
 }
 
@@ -504,6 +546,14 @@ const getAudioTrask = async (audioParams) => {
     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
 
   audioTrack.applyConstraints({
@@ -549,30 +599,30 @@ const closeCall = () => {
   resetCallSettings()
 }
 
-const consume = async () => {
+// const consume = async (kind) => {
-  console.log('[consume]')
+//   console.log(`[consume] kind: ${kind}`)
-  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)
-btnRecvSendTransport.addEventListener('click', consume)
+// btnRecvSendTransport.addEventListener('click', consume)
 btnCloseCall.addEventListener('click', closeCall)