LH-276: Update client js bundle

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

app.js

@@ -260,7 +260,6 @@ peers.on('connection', async (socket) => {
       isInitiator(callId, socket.id)
         ? 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}`);
     }
@@ -290,11 +289,15 @@ peers.on('connection', async (socket) => {
           );
 
           videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
+          videoCalls[callId].receiverVideoProducer.observer.on("close", () => {
+            console.log(`[close-producer] receiverVideoProducer receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
+            videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
+          })
+
           // Send back to the client the Producer's id
           callback &&
             callback({
@@ -311,11 +314,15 @@ peers.on('connection', async (socket) => {
           );
 
           videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
+          videoCalls[callId].initiatorVideoProducer.observer.on("close", () => {
+            console.log(`[close-producer] initiatorVideoProducer initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
+            videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
+          })
+
           callback &&
             callback({
               id: videoCalls[callId].initiatorVideoProducer.id,
@@ -333,11 +340,15 @@ peers.on('connection', async (socket) => {
           );
 
           videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
+          videoCalls[callId].receiverAudioProducer.observer.on("close", () => {
+            console.log(`[close-producer] receiverAudioProducer receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
+            videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
+          })
+
           // Send back to the client the Producer's id
           callback &&
             callback({
@@ -354,11 +365,15 @@ peers.on('connection', async (socket) => {
           );
 
           videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
 
+          videoCalls[callId].initiatorAudioProducer.observer.on("close", () => {
+            console.log(`[close-producer] initiatorAudioProducer initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
+            videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
+          })
+
           // Send back to the client the Producer's id
           callback &&
             callback({
@@ -370,8 +385,10 @@ peers.on('connection', async (socket) => {
       const socketToEmit = isInitiator(callId, socket.id)
         ? videoCalls[callId].receiverSocket
         : videoCalls[callId].initiatorSocket;
-      socketToEmit.emit('new-producer', { callId });
 
+      // 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}`);
     }
@@ -475,7 +492,7 @@ peers.on('connection', async (socket) => {
   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)) {
         videoCalls[callId]?.initiatorConsumerVideo?.resume();
         videoCalls[callId]?.initiatorConsumerAudio?.resume();
@@ -487,6 +504,25 @@ peers.on('connection', async (socket) => {
       console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
+
+  socket.on('close-producer', ({ callId, kind}) => {
+    try {
+      const callId = socketDetails[socket.id];
+      console.log(`[close-producer] callId: ${callId} | kind: kind`);
+      if (isInitiator(callId, socket.id)) {
+        console.log(`[close-producer] initiator`);
+        if (kind === 'video') videoCalls[callId].initiatorVideoProducer.close()
+        else if (kind === 'audio') videoCalls[callId].initiatorAudioProducer.close()
+      } else {
+        console.log(`[close-producer] receiver`);
+        if (kind === 'video') videoCalls[callId].receiverVideoProducer.close()
+        else if (kind === 'audio') videoCalls[callId].receiverAudioProducer.close()
+      }
+    } catch (error) {
+      console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
+    }
+  });
+  
 });
 
 const consumeVideo = async (callId, socketId, rtpCapabilities) => {
@@ -499,18 +535,10 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
 
     // 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,
@@ -530,12 +558,6 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
       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,

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://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 }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
-      consume()
+    socket.on('new-producer', ({ callId, kind }) => {
+      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()
     })
   }
   
@@ -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()
   })
 }
 
@@ -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 () => {
-  console.log('[consume]')
-  console.log('createRecvTransport Consumer')
-  await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
-    if (params.error) {
-      console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
-      return
-    }
-    consumerTransport = device.createRecvTransport(params)
-    consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
-      try {
-        await socket.emit('transport-recv-connect', {
-          dtlsParameters,
-        })
-        callback()
-      } catch (error) {
-        errback(error)
-      }
-    })
+// const consume = async (kind) => {
+//   console.log(`[consume] kind: ${kind}`)
+//   console.log('createRecvTransport Consumer')
+//   await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
+//     if (params.error) {
+//       console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
+//       return
+//     }
+//     consumerTransport = device.createRecvTransport(params)
+//     consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
+//       try {
+//         await socket.emit('transport-recv-connect', {
+//           dtlsParameters,
+//         })
+//         callback()
+//       } catch (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://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 }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
-      consume()
+    socket.on('new-producer', ({ callId, kind }) => {
+      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()
     })
   }
   
@@ -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()
   })
 }
 
@@ -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 () => {
-  console.log('[consume]')
-  console.log('createRecvTransport Consumer')
-  await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
-    if (params.error) {
-      console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
-      return
-    }
-    consumerTransport = device.createRecvTransport(params)
-    consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
-      try {
-        await socket.emit('transport-recv-connect', {
-          dtlsParameters,
-        })
-        callback()
-      } catch (error) {
-        errback(error)
-      }
-    })
+// const consume = async (kind) => {
+//   console.log(`[consume] kind: ${kind}`)
+//   console.log('createRecvTransport Consumer')
+//   await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
+//     if (params.error) {
+//       console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
+//       return
+//     }
+//     consumerTransport = device.createRecvTransport(params)
+//     consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
+//       try {
+//         await socket.emit('transport-recv-connect', {
+//           dtlsParameters,
+//         })
+//         callback()
+//       } catch (error) {
+//         errback(error)
+//       }
+//     })
     
-    connectRecvTransport()
-  })
-}
+//     connectRecvTransport()
+//   })
+// }
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-btnRecvSendTransport.addEventListener('click', consume)
+// btnRecvSendTransport.addEventListener('click', consume)
 btnCloseCall.addEventListener('click', closeCall)