app.js

@@ -76,7 +76,7 @@ const createWorker = async () => {
     });
     return worker;
   } catch (error) {
-    console.error(`[createWorker] | ERROR | error: ${error.message}`);
+    console.log(`ERROR | createWorker | ${error.message}`);
   }
 };
 
@@ -148,10 +148,11 @@ const closeCall = (callId) => {
       videoCalls[callId]?.receiverProducerTransport?.close();
       videoCalls[callId]?.router?.close();
       delete videoCalls[callId];
-      console.log(`[closeCall] | callId: ${callId}`);
+    } else {
+      console.log(`The call with id ${callId} has already been deleted`);
     }
   } catch (error) {
-    console.error(`[closeCall] | ERROR | callId: ${callId} | error: ${error.message}`);
+    console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
   }
 };
 
@@ -188,21 +189,22 @@ 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] Generate Router ID: ${videoCalls[callId].router.id}`);
+          console.log(`[createRoom] 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,
         };
       } else {
-        console.log(`[createRoom] missing callId: ${callId}`);
+        console.log(`[createRoom] missing callId ${callId}`);
       }
     } catch (error) {
-      console.error(`[createRoom] | ERROR | callId: ${callId} | error: ${error.message}`);
+      console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
     } finally {
       callback(callbackResponse);
     }
@@ -237,10 +239,8 @@ peers.on('connection', async (socket) => {
         }
       }
     } catch (error) {
-      console.error(
+      console.log(
-        `[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${
+        `ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`
-          error.message
-        }`
       );
       callback(error);
     }
@@ -261,7 +261,7 @@ peers.on('connection', async (socket) => {
         ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
         : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
     } catch (error) {
-      console.error(`[transport-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 
@@ -275,7 +275,7 @@ peers.on('connection', async (socket) => {
       const callId = socketDetails[socket.id];
       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
 
-      console.log(`[transport-produce] callId: ${callId} | kind: ${kind} | socket: ${socket.id}`);
+      console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
 
       if (kind === 'video') {
         if (!isInitiator(callId, socket.id)) {
@@ -284,7 +284,12 @@ 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);
             closeCall(callId);
           });
@@ -300,7 +305,12 @@ peers.on('connection', async (socket) => {
             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);
             closeCall(callId);
           });
@@ -317,7 +327,12 @@ 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);
             closeCall(callId);
           });
@@ -333,7 +348,12 @@ peers.on('connection', async (socket) => {
             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);
           });
@@ -352,9 +372,9 @@ peers.on('connection', async (socket) => {
 
       // callId - Id of the call
       // kind - producer type: audio/video
-      socketToEmit?.emit('new-producer', { callId, kind });
+      socketToEmit.emit('new-producer', { callId, kind });
     } catch (error) {
-      console.error(`[transport-produce] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 
@@ -374,7 +394,7 @@ peers.on('connection', async (socket) => {
         await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
       }
     } catch (error) {
-      console.error(`[transport-recv-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 
@@ -386,17 +406,66 @@ peers.on('connection', async (socket) => {
       - The consumer does consumerTransport.consume(params)
   */
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
-    const callId = socketDetails[socket.id];
+    try {
-    const socketId = socket.id;
+      const callId = socketDetails[socket.id];
+      console.log(
+        `[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`
+      );
 
-    console.log(`[consume] socket ${socketId} | callId: ${callId}`);
+      if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(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({
+            producerId: videoCalls[callId].receiverVideoProducer.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({
+            producerId: videoCalls[callId].initiatorVideoProducer.id,
+            rtpCapabilities,
+          });
 
-    callback({
+        canConsumeAudio =
-      videoParams: await consumeVideo({ callId, socketId, rtpCapabilities }),
+          !!videoCalls[callId].initiatorAudioProducer &&
-      audioParams: await consumeAudio({ callId, socketId, 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);
+        callback({ videoParams, audioParams: null });
+      } else if (canConsumeVideo && canConsumeAudio) {
+        const videoParams = await consumeVideo(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 data = { videoParams: null, audioParams };
+        callback(data);
+      } else {
+        console.log(`[consume] Can't consume | callId ${callId}`);
+        callback(null);
+      }
+    } catch (error) {
+      console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`);
+      callback({ params: { error } });
+    }
   });
 
   /*
@@ -407,129 +476,129 @@ peers.on('connection', async (socket) => {
   socket.on('consumer-resume', () => {
     try {
       const callId = socketDetails[socket.id];
-      const isInitiatorValue = isInitiator(callId, socket.id);
+      console.log(`[consumer-resume] callId ${callId}`);
-      console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
-
-      const consumerVideo = isInitiatorValue
-        ? videoCalls[callId].initiatorConsumerVideo
-        : videoCalls[callId].receiverConsumerVideo;
-
-      const consumerAudio = isInitiatorValue
-        ? videoCalls[callId].initiatorConsumerAudio
-        : videoCalls[callId].receiverConsumerAudio;
-
-      consumerVideo?.resume();
-      consumerAudio?.resume();
-    } catch (error) {
-      console.error(
-        `[consumer-resume] | ERROR | callId: ${socketDetails[socket.id]} | isInitiator: ${isInitiator} | error: ${
-          error.message
-        }`
-      );
-    }
-  });
-
-  socket.on('close-producer', ({ callId, kind }) => {
-    try {
       if (isInitiator(callId, socket.id)) {
-        console.log(`[close-producer] initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
+        videoCalls[callId]?.initiatorConsumerVideo?.resume();
-        videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
+        videoCalls[callId]?.initiatorConsumerAudio?.resume();
       } else {
-        console.log(`[close-producer] receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
+        videoCalls[callId]?.receiverConsumerVideo?.resume();
-        videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
+        videoCalls[callId]?.receiverConsumerAudio?.resume();
       }
     } catch (error) {
-      console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 });
 
-const canConsume = ({ callId, producerId, rtpCapabilities }) => {
+const consumeVideo = async (callId, socketId, rtpCapabilities) => {
-  return !!videoCalls[callId].router.canConsume({
+  if (isInitiator(callId, socketId)) {
-    producerId,
-    rtpCapabilities,
-  });
-};
-
-const consumeVideo = async ({ callId, socketId, rtpCapabilities }) => {
-  // Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-  if (isInitiator(callId, socketId) && videoCalls[callId].receiverVideoProducer) {
-    const producerId = videoCalls[callId].receiverVideoProducer.id;
-    if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
-
     videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
-      producerId,
+      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,
+      producerId: videoCalls[callId].receiverVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
     };
-  } else if (videoCalls[callId].initiatorVideoProducer) {
+  } else {
-    const producerId = videoCalls[callId].initiatorVideoProducer.id;
-    if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
-
     videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
-      producerId,
+      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,
+      producerId: videoCalls[callId].initiatorVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
     };
-  } else {
-    return null;
   }
 };
 
-const consumeAudio = async ({ callId, socketId, rtpCapabilities }) => {
+const consumeAudio = async (callId, socketId, rtpCapabilities) => {
-  try {
+  if (isInitiator(callId, socketId)) {
-    // Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+    videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
-    if (isInitiator(callId, socketId) && videoCalls[callId].receiverAudioProducer) {
+      producerId: videoCalls[callId].receiverAudioProducer.id,
-      const producerId = videoCalls[callId].receiverAudioProducer.id;
+      rtpCapabilities,
-      if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
+      paused: true,
+    });
 
-      videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
+    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-        producerId,
+    videoCalls[callId].initiatorConsumerAudio.on('transportclose', () => {
-        rtpCapabilities,
+      const callId = socketDetails[socket.id];
-        paused: true,
+      console.log('transport close from consumer', callId);
-      });
+      closeCall(callId);
+    });
 
-      return {
+    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
-        id: videoCalls[callId].initiatorConsumerAudio.id,
+    videoCalls[callId].initiatorConsumerAudio.on('producerclose', () => {
-        producerId,
+      const callId = socketDetails[socket.id];
-        kind: 'audio',
+      console.log('producer of consumer closed', callId);
-        rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
+      closeCall(callId);
-      };
+    });
-    } else if (videoCalls[callId].initiatorAudioProducer) {
-      const producerId = videoCalls[callId].initiatorAudioProducer.id;
-      if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
 
-      videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
+    return {
-        producerId,
+      id: videoCalls[callId].initiatorConsumerAudio.id,
-        rtpCapabilities,
+      producerId: videoCalls[callId].receiverAudioProducer.id,
-        paused: true,
+      kind: 'audio',
-      });
+      rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
+    };
+  } else {
+    videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
+      producerId: videoCalls[callId].initiatorAudioProducer.id,
+      rtpCapabilities,
+      paused: true,
+    });
 
-      return {
+    videoCalls[callId].receiverConsumerAudio.on('transportclose', () => {
-        id: videoCalls[callId].receiverConsumerAudio.id,
+      const callId = socketDetails[socket.id];
-        producerId,
+      console.log('transport close from consumer', callId);
-        kind: 'audio',
+      closeCall(callId);
-        rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
+    });
-      };
+
-    } else {
+    videoCalls[callId].receiverConsumerAudio.on('producerclose', () => {
-      return null;
+      const callId = socketDetails[socket.id];
-    }
+      console.log('producer of consumer closed', callId);
-  } catch (error) {
+      closeCall(callId);
-    console.error(`[consumeAudio] | ERROR | error: ${error}`);
+    });
+
+    return {
+      id: videoCalls[callId].receiverConsumerAudio.id,
+      producerId: videoCalls[callId].initiatorAudioProducer.id,
+      kind: 'audio',
+      rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
+    };
   }
 };
 
@@ -546,7 +615,7 @@ 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: [
@@ -583,15 +652,14 @@ 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.error(
+    console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
-      `[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`
-    );
     callback({ params: { error } });
   }
 };

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://video.safemobile.org/',
 }
 },{}],95:[function(require,module,exports){
 const io = require('socket.io-client')
@@ -20457,15 +20457,6 @@ setTimeout(() => {
       console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to 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()
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -20842,7 +20833,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
+      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -20855,6 +20846,10 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
+  consumerVideo.on('transportclose', () => {
+    console.log('transport closed so consumer closed')
+  })
+
   return consumerVideo.track
 }
 

public/config.js

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

public/index.js

@@ -99,15 +99,6 @@ setTimeout(() => {
       console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to 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()
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -484,7 +475,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
+      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -497,6 +488,10 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
+  consumerVideo.on('transportclose', () => {
+    console.log('transport closed so consumer closed')
+  })
+
   return consumerVideo.track
 }