Merge pull request 'LH-276: Add close-producer event handler; Update client' (#30) from LH-276-close-producer into develop

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

app.js

@@ -237,7 +237,11 @@ peers.on('connection', async (socket) => {
         }
       }
     } catch (error) {
-      console.error(`[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${error.message}`);
+      console.error(
+        `[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${
+          error.message
+        }`
+      );
       callback(error);
     }
   });
@@ -382,66 +386,17 @@ peers.on('connection', async (socket) => {
       - The consumer does consumerTransport.consume(params)
   */
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
-    try {
-      const callId = socketDetails[socket.id];
+    const callId = socketDetails[socket.id];
+    const socketId = socket.id;
 
-      if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
+    console.log(`[consume] socket ${socketId} | callId: ${callId}`);
 
-      let canConsumeVideo, canConsumeAudio;
-      try {
-        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,
-            });
+    if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
 
-          canConsumeAudio =
-            !!videoCalls[callId].initiatorAudioProducer &&
-            !!videoCalls[callId].router.canConsume({
-              producerId: videoCalls[callId].initiatorAudioProducer.id,
-              rtpCapabilities,
-            });
-        }
-      } catch (error) {
-        console.error(`[consume] | ERROR | callId: ${callId} | error: ${error.message}`);
-      }
-      
-      console.log(`[consume] socket ${socket.id} | callId: ${callId} | canConsumeVideo: ${canConsumeVideo} | 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.error(`[consume] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
-      callback({ params: { error } });
-    }
+    callback({
+      videoParams: await consumeVideo({ callId, socketId, rtpCapabilities }),
+      audioParams: await consumeAudio({ callId, socketId, rtpCapabilities }),
+    });
   });
 
   /*
@@ -449,24 +404,32 @@ 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', () => {
-     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('consumer-resume', () => {
+    try {
+      const callId = socketDetails[socket.id];
+      const isInitiatorValue = isInitiator(callId, socket.id);
+      console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
 
-  socket.on('close-producer', ({ callId, kind}) => {
+      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}`);
@@ -479,67 +442,94 @@ peers.on('connection', async (socket) => {
       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)) {
+const canConsume = ({ callId, producerId, rtpCapabilities }) => {
+  return !!videoCalls[callId].router.canConsume({
+    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: videoCalls[callId].receiverVideoProducer.id,
+      producerId,
       rtpCapabilities,
       paused: true,
     });
 
     return {
       id: videoCalls[callId].initiatorConsumerVideo.id,
-      producerId: videoCalls[callId].receiverVideoProducer.id,
+      producerId,
       kind: 'video',
       rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
     };
-  } else {
+  } else if (videoCalls[callId].initiatorVideoProducer) {
+    const producerId = videoCalls[callId].initiatorVideoProducer.id;
+    if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
+
     videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
-      producerId: videoCalls[callId].initiatorVideoProducer.id,
+      producerId,
       rtpCapabilities,
       paused: true,
     });
 
     return {
       id: videoCalls[callId].receiverConsumerVideo.id,
-      producerId: videoCalls[callId].initiatorVideoProducer.id,
+      producerId,
       kind: 'video',
       rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
     };
+  } else {
+    return null;
   }
 };
 
-const consumeAudio = async (callId, socketId, rtpCapabilities) => {
-  if (isInitiator(callId, socketId)) {
-    videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
-      producerId: videoCalls[callId].receiverAudioProducer.id,
-      rtpCapabilities,
-      paused: true,
-    });
+const consumeAudio = async ({ callId, socketId, rtpCapabilities }) => {
+  try {
+    // Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+    if (isInitiator(callId, socketId) && videoCalls[callId].receiverAudioProducer) {
+      const producerId = videoCalls[callId].receiverAudioProducer.id;
+      if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
 
-    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,
-      rtpCapabilities,
-      paused: true,
-    });
+      videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
+        producerId,
+        rtpCapabilities,
+        paused: true,
+      });
 
-    return {
-      id: videoCalls[callId].receiverConsumerAudio.id,
-      producerId: videoCalls[callId].initiatorAudioProducer.id,
-      kind: 'audio',
-      rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
-    };
+      return {
+        id: videoCalls[callId].initiatorConsumerAudio.id,
+        producerId,
+        kind: 'audio',
+        rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
+      };
+    } 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({
+        producerId,
+        rtpCapabilities,
+        paused: true,
+      });
+
+      return {
+        id: videoCalls[callId].receiverConsumerAudio.id,
+        producerId,
+        kind: 'audio',
+        rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
+      };
+    } else {
+      return null;
+    }
+  } catch (error) {
+    console.error(`[consumeAudio] | ERROR | error: ${error}`);
   }
 };
 
@@ -599,7 +589,9 @@ const createWebRtcTransportLayer = async (callId, callback) => {
     // Set transport to producerTransport or consumerTransport
     return transport;
   } catch (error) {
-    console.error(`[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+    console.error(
+      `[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`
+    );
     callback({ params: { error } });
   }
 };

public/bundle.js

@@ -20855,40 +20855,6 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
-  consumerVideo.on('transportclose', () => {
-    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
 }
 
@@ -20904,14 +20870,6 @@ 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({

public/index.js

@@ -497,40 +497,6 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
-  consumerVideo.on('transportclose', () => {
-    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
 }
 
@@ -546,14 +512,6 @@ 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({