LH-265: Update client

README.md

@@ -39,3 +39,4 @@ dest_asset_id= the addressee with whom the call is made
 
 ### Demo project
   The demo project used initially and then modified for our needs `https://github.com/jamalag/mediasoup2`
+

app.js

@@ -1,4 +1,4 @@
-require('dotenv').config();
+require('dotenv').config()
 
 const express = require('express');
 const app = express();
@@ -13,47 +13,50 @@ try {
 }
 const mediasoup = require('mediasoup');
 
-let worker;
+let worker
 /**
- *
- * videoCalls - Dictionary of Object(s)
+ * videoCalls
+ * |-> Router
+ * |-> Producer
+ * |-> Consumer 
+ * |-> Producer Transport
+ * |-> Consumer Transport
+ * 
  * '<callId>': {
  *  router: Router,
- *  initiatorAudioProducer: Producer,
- *  initiatorVideoProducer: Producer,
- *  receiverVideoProducer: Producer,
- *  receiverAudioProducer: Producer,
- *  initiatorProducerTransport: Producer Transport,
- *  receiverProducerTransport: Producer Transport,
- *  initiatorConsumerVideo: Consumer,
- *  initiatorConsumerAudio: Consumer,
- *  initiatorConsumerTransport: Consumer Transport
- *  initiatorSocket
- *  receiverSocket
+ *  producer: Producer,
+ *  producerTransport: Producer Transport,
+ *  consumer: Consumer,
+ *  consumerTransport: Consumer Transport
  * }
- *
+ * 
  **/
-let videoCalls = {};
-let socketDetails = {};
+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')));
+app.use('/sfu', express.static(path.join(__dirname, 'public')))
 
 // SSL cert for HTTPS access
 const options = {
   key: fs.readFileSync(process.env.SERVER_KEY, 'utf-8'),
   cert: fs.readFileSync(process.env.SERVER_CERT, 'utf-8'),
-};
+}
 
 const httpsServer = https.createServer(options, app);
 
 const io = new Server(httpsServer, {
   allowEIO3: true,
-  origins: ['*:*'],
+  origins: ["*:*"],
+  // allowRequest: (req, next) => {
+  //   console.log('req', req);
+  //   next(null, true)
+  // }
 });
+// const io = new Server(server, { origins: '*:*', allowEIO3: true });
 
 httpsServer.listen(process.env.PORT, () => {
   console.log('Video server listening on port:', process.env.PORT);
@@ -66,19 +69,19 @@ const createWorker = async () => {
     worker = await mediasoup.createWorker({
       rtcMinPort: parseInt(process.env.RTC_MIN_PORT),
       rtcMaxPort: parseInt(process.env.RTC_MAX_PORT),
-    });
+    })
     console.log(`[createWorker] worker pid ${worker.pid}`);
-
-    worker.on('died', (error) => {
+  
+    worker.on('died', error => {
       // This implies something serious happened, so kill the application
       console.error('mediasoup worker has died', error);
       setTimeout(() => process.exit(1), 2000); // exit in 2 seconds
-    });
+    })
     return worker;
   } catch (error) {
     console.log(`ERROR | createWorker | ${error.message}`);
   }
-};
+}
 
 // We create a Worker as soon as our application starts
 worker = createWorker();
@@ -87,65 +90,83 @@ 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',
-    mimeType: 'audio/opus',
-    clockRate: 48000,
-    channels: 2,
+    kind      : 'audio',
+    mimeType  : 'audio/opus',
+    clockRate : 48000,
+    channels  : 2
   },
   {
-    kind: 'video',
-    mimeType: 'video/VP8',
-    clockRate: 90000,
-    parameters: {
-      'x-google-start-bitrate': 1000,
+    kind       : 'video',
+    mimeType   : 'video/VP8',
+    clockRate  : 90000,
+    parameters :
+    {
+      'x-google-start-bitrate' : 1000
     },
-    channels: 2,
+    channels  : 2
   },
   {
-    kind: 'video',
-    mimeType: 'video/VP9',
-    clockRate: 90000,
-    parameters: {
-      'profile-id': 2,
-      'x-google-start-bitrate': 1000,
-    },
+    kind       : 'video',
+    mimeType   : 'video/VP9',
+    clockRate  : 90000,
+    parameters :
+    {
+      'profile-id'             : 2,
+      'x-google-start-bitrate' : 1000
+    }
   },
   {
-    kind: 'video',
-    mimeType: 'video/h264',
-    clockRate: 90000,
-    parameters: {
-      'packetization-mode': 1,
-      'profile-level-id': '4d0032',
-      'level-asymmetry-allowed': 1,
-      'x-google-start-bitrate': 1000,
-    },
+    kind       : 'video',
+    mimeType   : 'video/h264',
+    clockRate  : 90000,
+    parameters :
+    {
+      'packetization-mode'      : 1,
+      'profile-level-id'        : '4d0032',
+      'level-asymmetry-allowed' : 1,
+      'x-google-start-bitrate'  : 1000
+    }
   },
   {
-    kind: 'video',
-    mimeType: 'video/h264',
-    clockRate: 90000,
-    parameters: {
-      'packetization-mode': 1,
-      'profile-level-id': '42e01f',
-      'level-asymmetry-allowed': 1,
-      'x-google-start-bitrate': 1000,
-    },
-  },
+    kind       : 'video',
+    mimeType   : 'video/h264',
+    clockRate  : 90000,
+    parameters :
+    {
+      'packetization-mode'      : 1,
+      'profile-level-id'        : '42e01f',
+      'level-asymmetry-allowed' : 1,
+      'x-google-start-bitrate'  : 1000
+    }
+  }
+//   {
+//     kind: 'audio',
+//     mimeType: 'audio/opus',
+//     clockRate: 48000,
+//     channels: 2,
+//   },
+//   {
+//     kind: 'video',
+//     mimeType: 'video/VP8',
+//     clockRate: 90000,
+//     parameters: {
+//       'x-google-start-bitrate': 1000,
+//     },
+//   },
 ];
 
 const closeCall = (callId) => {
   try {
     if (callId && videoCalls[callId]) {
-      videoCalls[callId].receiverVideoProducer?.close();
-      videoCalls[callId].receiverAudioProducer?.close();
-      videoCalls[callId].initiatorConsumerVideo?.close();
-      videoCalls[callId].initiatorConsumerAudio?.close();
+      videoCalls[callId].producerVideo?.close();
+      videoCalls[callId].producerAudio?.close();
+      videoCalls[callId].consumerVideo?.close();
+      videoCalls[callId].consumerAudio?.close();
 
-      videoCalls[callId]?.initiatorConsumerTransport?.close();
-      videoCalls[callId]?.receiverProducerTransport?.close();
+      videoCalls[callId]?.consumerTransport?.close();
+      videoCalls[callId]?.producerTransport?.close();
       videoCalls[callId]?.router?.close();
       delete videoCalls[callId];
     } else {
@@ -154,18 +175,18 @@ const closeCall = (callId) => {
   } catch (error) {
     console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
   }
-};
+}
 
 /*
   - Handlers for WS events
   - These are created only when we have a connection with a peer
 */
-peers.on('connection', async (socket) => {
+peers.on('connection', async socket => {
   console.log('[connection] socketId:', socket.id);
 
   // After making the connection successfully, we send the client a 'connection-success' event
   socket.emit('connection-success', {
-    socketId: socket.id,
+    socketId: socket.id
   });
 
   // It is triggered when the peer is disconnected
@@ -188,17 +209,16 @@ peers.on('connection', async (socket) => {
       if (callId) {
         console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
         if (!videoCalls[callId]) {
-          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
+          console.log('[createRoom] callId', callId);
+          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) }
           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,
+        callbackResponse = { 
+          rtpCapabilities :videoCalls[callId].router.rtpCapabilities
         };
       } else {
         console.log(`[createRoom] missing callId ${callId}`);
@@ -212,7 +232,7 @@ peers.on('connection', async (socket) => {
 
   /*
     - Client emits a request to create server side Transport
-    - Depending on the sender, a producer or consumer is created is created on that router
+    - Depending on the sender, producerTransport or consumerTransport is created on that router
     - It will return parameters, these are required for the client to create the RecvTransport 
     from the client.
       - If the client is producer(sender: true) then it will use parameters for device.createSendTransport(params)
@@ -221,27 +241,24 @@ peers.on('connection', async (socket) => {
   socket.on('createWebRtcTransport', async ({ sender }, callback) => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
+      console.log(`[createWebRtcTransport] sender ${sender} | callId ${callId}`);
       if (sender) {
-        if (!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
-          videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if (!videoCalls[callId].initiatorProducerTransport && isInitiator(callId, socket.id)) {
-          videoCalls[callId].initiatorProducerTransport = await createWebRtcTransportLayer(callId, callback);
+        if (!videoCalls[callId].producerTransport) {
+          videoCalls[callId].producerTransport = 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)) {
-          videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if (!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
-          videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback);
+        if (!videoCalls[callId].consumerTransport) {
+          videoCalls[callId].consumerTransport = await createWebRtcTransportLayer(callId, callback);
+        } else {
+          console.log(`consumerTransport has already been defined | callId ${callId}`);
+          callback(null);
         }
       }
     } catch (error) {
-      console.log(
-        `ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`
-      );
+      console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`);
       callback(error);
     }
   });
@@ -255,123 +272,65 @@ peers.on('connection', async (socket) => {
       const callId = socketDetails[socket.id];
       if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
 
-      console.log(`[transport-connect] socket ${socket.id} | callId ${callId}`);
-
-      isInitiator(callId, socket.id)
-        ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
-        : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
-
+      console.log(`[transport-connect] socket.id ${socket.id} | callId ${callId}`);
+      await videoCalls[callId].producerTransport.connect({ dtlsParameters });
     } catch (error) {
       console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 
   /*
-    - The event sent by the client (PRODUCER) after successfully connecting to receiverProducerTransport/initiatorProducerTransport
-    - For the router with the id callId, we make produce on receiverProducerTransport/initiatorProducerTransport
+    - The event sent by the client (PRODUCER) after successfully connecting to producerTransport
+    - For the router with the id callId, we make produce on producerTransport
     - Create the handler on producer at the 'transportclose' event
     */
-  socket.on('transport-produce', async ({ kind, rtpParameters, appData }, callback) => {
-    try {
-      const callId = socketDetails[socket.id];
-      if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
-
-      console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
+   socket.on('transport-produce', async ({ kind, rtpParameters, appData }, callback) => {
+     try {
+       const callId = socketDetails[socket.id];
+       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
+       
+       console.log(`[transport-produce] kind: ${kind} | socket.id: ${socket.id} | callId: ${callId}`);
+       console.log('kind', kind);
+       console.log('rtpParameters', rtpParameters);
 
       if (kind === 'video') {
-        if (!isInitiator(callId, socket.id)) {
-          videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
-            kind,
-            rtpParameters,
-          });
+        videoCalls[callId].producerVideo = await videoCalls[callId].producerTransport.produce({
+          kind,
+          rtpParameters,
+        });
+      
 
-          console.log(
-            `[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`
-          );
+        console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producerVideo.id} | kind: ${videoCalls[callId].producerVideo.kind}`);
+    
+        videoCalls[callId].producerVideo.on('transportclose', () => {
+          const callId = socketDetails[socket.id];
+          console.log('transport for this producer closed', callId)
+          closeCall(callId);
+        });
 
-          videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
-            console.log('transport for this producer closed', callId);
-            closeCall(callId);
-          });
-
-          // Send back to the client the Producer's id
-          callback &&
-            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);
-            closeCall(callId);
-          });
-
-          callback &&
-            callback({
-              id: videoCalls[callId].initiatorVideoProducer.id,
-            });
-        }
+        // Send back to the client the Producer's id
+        callback && callback({
+          id: videoCalls[callId].producerVideo.id
+        });
       } else if (kind === 'audio') {
-        if (!isInitiator(callId, socket.id)) {
-          videoCalls[callId].receiverAudioProducer = await videoCalls[callId].receiverProducerTransport.produce({
-            kind,
-            rtpParameters,
-          });
+        videoCalls[callId].producerAudio = await videoCalls[callId].producerTransport.produce({
+          kind,
+          rtpParameters,
+        });
 
-          console.log(
-            `[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`
-          );
+        console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producerAudio.id} | kind: ${videoCalls[callId].producerAudio.kind}`);
+    
+        videoCalls[callId].producerAudio.on('transportclose', () => {
+          const callId = socketDetails[socket.id];
+          console.log('transport for this producer closed', callId)
+          closeCall(callId);
+        });
 
-          videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
-            console.log('transport for this producer closed', callId);
-            closeCall(callId);
-          });
-
-          // Send back to the client the Producer's id
-          callback &&
-            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);
-            closeCall(callId);
-          });
-
-          // Send back to the client the Producer's id
-          callback &&
-            callback({
-              id: videoCalls[callId].initiatorAudioProducer.id,
-            });
-        }
+        // Send back to the client the Producer's id
+        callback && callback({
+          id: videoCalls[callId].producerAudio.id
+        });
       }
-
-      const socketToEmit = isInitiator(callId, socket.id)
-        ? videoCalls[callId].receiverSocket
-        : videoCalls[callId].initiatorSocket;
-      socketToEmit.emit('new-producer', { callId });
-
     } catch (error) {
       console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -384,18 +343,12 @@ peers.on('connection', async (socket) => {
   socket.on('transport-recv-connect', async ({ dtlsParameters }) => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[transport-recv-connect] socket ${socket.id} | callId ${callId}`);
-      if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
-      // await videoCalls[callId].consumerTransport.connect({ dtlsParameters });
-      if (!isInitiator(callId, socket.id)) {
-        await videoCalls[callId].receiverConsumerTransport.connect({ dtlsParameters });
-      } else if (isInitiator(callId, socket.id)) {
-        await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
-      }
+      console.log(`[transport-recv-connect] socket.id ${socket.id} | callId ${callId}`);
+      await videoCalls[callId].consumerTransport.connect({ dtlsParameters });
     } catch (error) {
       console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
-  });
+  })
 
   /*
     - The customer consumes after successfully connecting to consumerTransport
@@ -406,204 +359,116 @@ peers.on('connection', async (socket) => {
   */
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
     try {
+      console.log(`[consume] rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`);
+
       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)) {
-        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,
-          });
 
-        canConsumeAudio =
-          !!videoCalls[callId].initiatorAudioProducer &&
-          !!videoCalls[callId].router.canConsume({
-            producerId: videoCalls[callId].initiatorAudioProducer.id,
-            rtpCapabilities,
-          });
-      }
+      const canConsumeVideo = !!videoCalls[callId].producerVideo && !!videoCalls[callId].router.canConsume({
+        producerId: videoCalls[callId].producerVideo.id,
+        rtpCapabilities
+      })
+
+      const canConsumeAudio = !!videoCalls[callId].producerAudio && !!videoCalls[callId].router.canConsume({
+        producerId: videoCalls[callId].producerAudio.id,
+        rtpCapabilities
+      })
+
       console.log('[consume] canConsumeVideo', canConsumeVideo);
       console.log('[consume] canConsumeAudio', canConsumeAudio);
 
       if (canConsumeVideo && !canConsumeAudio) {
-        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
+        console.log('1');
+        const videoParams = await consumeVideo(callId, rtpCapabilities)
+        console.log('videoParams', videoParams);
         callback({ videoParams, audioParams: null });
       } else if (canConsumeVideo && canConsumeAudio) {
-        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
-        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
+        console.log('2');
+        const videoParams = await consumeVideo(callId, rtpCapabilities)
+        const audioParams = await consumeAudio(callId, 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}`);
+      console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`)
       callback({ params: { error } });
     }
   });
 
   /*
     - Event sent by the consumer after consuming to resume the pause
-    - When consuming on consumerTransport, it is initially done with paused: true, here we will resume
-    - For the initiator we resume the initiatorConsumerAUDIO/VIDEO and for receiver the receiverConsumerAUDIO/VIDEO
+    - When consuming on consumerTransport, it is initially done with paused: true, here we will resume 
   */
-  socket.on('consumer-resume', () => {
+  socket.on('consumer-resume', async () => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[consumer-resume] callId ${callId}`);
-      if (isInitiator(callId, socket.id)) {
-        videoCalls[callId]?.initiatorConsumerVideo?.resume();
-        videoCalls[callId]?.initiatorConsumerAudio?.resume();
-      } else {
-        videoCalls[callId]?.receiverConsumerVideo?.resume();
-        videoCalls[callId]?.receiverConsumerAudio?.resume();
-      }
+      console.log(`[consumer-resume] callId ${callId}`)
+      await videoCalls[callId].consumerVideo.resume();
+      await videoCalls[callId].consumerAudio.resume();
     } catch (error) {
       console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 });
 
-const consumeVideo = async (callId, socketId, rtpCapabilities) => {
-  if (isInitiator(callId, socketId)) {
-    videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
-      producerId: videoCalls[callId].receiverVideoProducer.id,
-      rtpCapabilities,
-      paused: true,
-    });
+const consumeVideo = async (callId, rtpCapabilities) => {
+  videoCalls[callId].consumerVideo = await videoCalls[callId].consumerTransport.consume({
+    producerId: videoCalls[callId].producerVideo.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-transportclose
+  videoCalls[callId].consumerVideo.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);
-    });
+  // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
+  videoCalls[callId].consumerVideo.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,
-      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,
-    };
+  return {
+    id: videoCalls[callId].consumerVideo.id,
+    producerId: videoCalls[callId].producerVideo.id,
+    kind: 'video',
+    rtpParameters: videoCalls[callId].consumerVideo.rtpParameters,
   }
-};
+}
 
-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, rtpCapabilities) => {
+  videoCalls[callId].consumerAudio = await videoCalls[callId].consumerTransport.consume({
+    producerId: videoCalls[callId].producerAudio.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-transportclose
+  videoCalls[callId].consumerAudio.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,
-      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,
-    };
+  // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
+  videoCalls[callId].consumerAudio.on('producerclose', () => {
+    const callId = socketDetails[socket.id];
+    console.log('producer of consumer closed', callId);
+    closeCall(callId);
+  });
+  return {
+    id: videoCalls[callId].consumerAudio.id,
+    producerId: videoCalls[callId].producerAudio.id,
+    kind: 'audio',
+    rtpParameters: videoCalls[callId].consumerAudio.rtpParameters,
   }
-};
-
-const isInitiator = (callId, socketId) => {
-  return videoCalls[callId]?.initiatorSocket?.id === socketId;
-};
+}
 
 /*
   - Called from at event 'createWebRtcTransport' and assigned to the consumer or producer transport
@@ -621,18 +486,19 @@ const createWebRtcTransportLayer = async (callId, callback) => {
         {
           ip: process.env.IP, // Listening IPv4 or IPv6.
           announcedIp: process.env.ANNOUNCED_IP, // Announced IPv4 or IPv6 (useful when running mediasoup behind NAT with private IP).
-        },
+        }
       ],
       enableUdp: true,
       enableTcp: true,
       preferUdp: true,
     };
-
+    
     // https://mediasoup.org/documentation/v3/mediasoup/api/#router-createWebRtcTransport
-    let transport = await videoCalls[callId].router.createWebRtcTransport(webRtcTransport_options);
+    let transport = await videoCalls[callId].router.createWebRtcTransport(webRtcTransport_options)
+    console.log(`callId: ${callId} | transport id: ${transport.id}`)
 
     // Handler for when DTLS(Datagram Transport Layer Security) changes
-    transport.on('dtlsstatechange', (dtlsState) => {
+    transport.on('dtlsstatechange', dtlsState => {
       console.log(`transport | dtlsstatechange | calldId ${callId} | dtlsState ${dtlsState}`);
       if (dtlsState === 'closed') {
         transport.close();
@@ -657,8 +523,9 @@ const createWebRtcTransportLayer = async (callId, callback) => {
 
     // Set transport to producerTransport or consumerTransport
     return transport;
+
   } catch (error) {
     console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
     callback({ params: { error } });
   }
-};
+}

build.sh

@@ -9,21 +9,14 @@ else
   ## CLEANUP
   rm -fr dist/*
 fi
-
-if [ -d "node_modules" ]; then
-  rm -fr node_modules
-fi
-
 # Install dependencies
 #npm install
 
 ## PROJECT NEEDS
 echo "Building app... from $(git rev-parse --abbrev-ref HEAD)"
 #npm run-script build
-cp -r {.env,app.js,package.json,server,public,doc,Dockerfile} dist/
-#cp -r ./* dist/
-dateString=$(date +"%Y%m%d-%H%M%S")
-git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git--$dateString.log"
+cp -r {.env,app.js,package.json,server,public} dist/
+
 #Add version control for pm2
 cd dist
 #Add version control for pm2
@@ -51,3 +44,5 @@ fi
 ## POST BUILD
 
 cd -
+
+

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')
@@ -20368,24 +20368,10 @@ const ASSET_NAME = urlParams.get('assetName') || null;
 const ASSET_TYPE = urlParams.get('assetType') || null;
 let callId = parseInt(urlParams.get('callId')) || null;
 const IS_PRODUCER = urlParams.get('producer') === 'true' ? true : false
-let remoteVideo = document.getElementById('remoteVideo')
-remoteVideo.defaultMuted = true
-let produceAudio = false
-
 console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId', callId, ' | IS_PRODUCER', IS_PRODUCER)
 
 console.log('🟩 config', config)
 
-produceAudioSelector = document.getElementById('produceAudio');
-produceAudioSelector.addEventListener('change', e => {
-    if(e.target.checked) {
-      produceAudio = true
-      console.log('produce audio');
-    } else {
-      produceAudio = false
-    }
-});
-
 let socket, hub
 let device
 let rtpCapabilities
@@ -20395,21 +20381,6 @@ let producerVideo
 let producerAudio
 let consumer
 let originAssetId
-let consumerVideo // local consumer video(consumer not transport)
-let consumerAudio // local consumer audio(consumer not transport)
-
-const remoteSoundControl = document.getElementById('remoteSoundControl');
-
-remoteSoundControl.addEventListener('click', function handleClick() {
-  console.log('remoteSoundControl.textContent', remoteSoundControl.textContent);
-  if (remoteSoundControl.textContent === 'Unmute') {
-    remoteVideo.muted = false
-    remoteSoundControl.textContent = 'Mute';
-  } else {
-    remoteVideo.muted = true
-    remoteSoundControl.textContent = 'Unmute';
-  }
-});
 
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
@@ -20449,14 +20420,10 @@ setTimeout(() => {
       console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
       if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
         goConnect()
+        // document.getElementById('btnRecvSendTransport').click();
       }
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
-
-    socket.on('new-producer', ({ callId }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
-      consume()
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -20535,7 +20502,7 @@ const streamSuccess = (stream) => {
 const getLocalStream = () => {
   console.log('[getLocalStream]');
   navigator.mediaDevices.getUserMedia({
-    audio: produceAudio ? true : false,
+    audio: true,
     video: {
       qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
       vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
@@ -20613,7 +20580,7 @@ const createSendTransport = () => {
   console.log('[createSendTransport');
   // see server's socket.on('createWebRtcTransport', sender?, ...)
   // this is a call from Producer, so sender = true
-  socket.emit('createWebRtcTransport', { sender: true }, (value) => {
+  socket.emit('createWebRtcTransport', { sender: true, callId }, (value) => {
 
     console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
 
@@ -20684,36 +20651,34 @@ const connectSendTransport = async () => {
   // this action will trigger the 'connect' and 'produce' events above
   
   // Produce video
-  let producerVideoHandler = await producerTransport.produce(videoParams)
+  producerVideo = await producerTransport.produce(videoParams)
   console.log('videoParams', videoParams);
   console.log('producerVideo', producerVideo);
 
-  producerVideoHandler.on('trackended', () => {
+  producerVideo.on('trackended', () => {
     console.log('track ended')
     // close video track
   })  
 
-  producerVideoHandler.on('transportclose', () => {
+  producerVideo.on('transportclose', () => {
     console.log('transport ended')
     // close video track
   })    
   
   // Produce audio
-  if (produceAudio) {
-    let producerAudioHandler = await producerTransport.produce(audioParams)
-    console.log('audioParams', audioParams);
-    console.log('producerAudio', producerAudio);
-  
-    producerAudioHandler.on('trackended', () => {
-      console.log('track ended')
-      // close audio track
-    })
-  
-    producerAudioHandler.on('transportclose', () => {
-      console.log('transport ended')
-      // close audio track
-    })
-  }
+  producerAudio = await producerTransport.produce(audioParams)
+  console.log('audioParams', audioParams);
+  console.log('producerAudio', producerAudio);
+
+  producerAudio.on('trackended', () => {
+    console.log('track ended')
+    // close audio track
+  })
+
+  producerAudio.on('transportclose', () => {
+    console.log('transport ended')
+    // close audio track
+  })
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -20797,95 +20762,34 @@ const connectRecvTransport = async () => {
   await socket.emit('consume', {
     rtpCapabilities: device.rtpCapabilities,
     callId
-  }, async ({videoParams, audioParams}) => {
-    console.log(`[consume] 🟩 videoParams`, videoParams)
-    console.log(`[consume] 🟩 audioParams`, audioParams)
-    console.log('[consume] 🟩 consumerTransport', consumerTransport)
+  }, async ({ params }) => {
+    if (params.error) {
+      console.log('Cannot Consume')
+      return
+    }
+
+    // Then consume with the local consumer transport
+    // which creates a consumer
+    consumer = await consumerTransport.consume({
+      id: params.id,
+      producerId: params.producerId,
+      kind: params.kind,
+      rtpParameters: params.rtpParameters
+    })
+
+    // destructure and retrieve the video track from the producer
+    const { track } = consumer
 
     let stream = new MediaStream()
-
-    // Maybe the unit does not produce video or audio, so we must only consume what is produced
-    if (videoParams) {
-      console.log('❗ Have VIDEO stream to consume');
-      stream.addTrack(await getVideoTrask(videoParams))
-    } else {
-      console.log('❗ Don\'t have VIDEO stream to consume');
-    }
-    
-    if (audioParams) {
-      console.log('❗ Have AUDIO stream to consume');
-      let audioTrack = await getAudioTrask(audioParams)
-      stream.addTrack(audioTrack)
-    } else {
-      console.log('❗ Don\'t have AUDIO stream to consume');
-    }
-
-    socket.emit('consumer-resume')
-
+    stream.addTrack(track)
+    // stream.removeTrack(track)
     remoteVideo.srcObject = stream
-    remoteVideo.setAttribute('autoplay', true)
+    socket.emit('consumer-resume')
+    console.log('consumer', consumer);
 
-    remoteVideo.play()
-    .then(() => {
-      console.log('remoteVideo PLAY')
-    })
-    .catch((error) => {
-      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
-    })
   })
 }
 
-const getVideoTrask = async (videoParams) => {
-  consumerVideo = await consumerTransport.consume({
-    id: videoParams.id,
-    producerId: videoParams.producerId,
-    kind: videoParams.kind,
-    rtpParameters: videoParams.rtpParameters
-  }) 
-
-  consumerVideo.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  return consumerVideo.track
-}
-
-const getAudioTrask = async (audioParams) => {
-  consumerAudio = await consumerTransport.consume({
-    id: audioParams.id,
-    producerId: audioParams.producerId,
-    kind: audioParams.kind,
-    rtpParameters: audioParams.rtpParameters
-  })
-
-  consumerAudio.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  const audioTrack = consumerAudio.track
-
-  audioTrack.applyConstraints({
-    audio: {
-      advanced: [
-        {
-          echoCancellation: {exact: true}
-        },
-        {
-          autoGainControl: {exact: true}
-        },
-        {
-          noiseSuppression: {exact: true}
-        }, 
-        {
-          highpassFilter: {exact: true}
-        }
-      ]
-    }
-  })
-
-  return audioTrack
-}
-
 const closeCall = () => {
   console.log('closeCall');
   
@@ -20907,31 +20811,8 @@ 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)
-      }
-    })
-    
-    connectRecvTransport()
-  })
-}
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-btnRecvSendTransport.addEventListener('click', consume)
+btnRecvSendTransport.addEventListener('click', goConnect)
 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://video.safemobile.org',
 }

public/index.html

@@ -34,9 +34,6 @@
   <body>
     <body>
         <div id="video">
-            <legend>Client options:</legend>
-            <input type="checkbox" id="produceAudio" name="produceAudio">
-            <label for="produceAudio">Produce audio</label><br>
             <table>
                 <thead>
                     <th>Local Video</th>
@@ -46,24 +43,12 @@
                     <tr>
                         <td>
                             <div id="sharedBtns">
-                                <video
-                                    id="localVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></video>
+                                <video id="localVideo" autoplay class="video" muted></video>
                             </div>
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <video
-                                    id="remoteVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></video>
+                                <video id="remoteVideo" autoplay class="video" ></video>
                             </div>
                         </td>
                     </tr>
@@ -76,10 +61,33 @@
                         <td>
                             <div id="sharedBtns">
                                 <button id="btnRecvSendTransport">Consume</button>
-                                <button id="remoteSoundControl">Unmute</button>
                             </div>
                         </td>
                     </tr>
+                    <!-- <tr>
+                        <td colspan="2">
+                            <div id="sharedBtns">
+                                <button id="btnRtpCapabilities">2. Get Rtp Capabilities</button>
+                                <br />
+                                <button id="btnDevice">3. Create Device</button>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div id="sharedBtns">
+                                <button id="btnCreateSendTransport">4. Create Send Transport</button>
+                                <br />
+                                <button id="btnConnectSendTransport">5. Connect Send Transport & Produce</button></td>
+                            </div>
+                        <td>
+                            <div id="sharedBtns">
+                                <button id="btnRecvSendTransport">6. Create Recv Transport</button>
+                                <br />
+                                <button id="btnConnectRecvTransport">7. Connect Recv Transport & Consume</button>
+                            </div>
+                        </td>
+                    </tr> -->
                 </tbody>
             </table>
             <div id="closeCallBtn">

public/index.js

@@ -10,24 +10,10 @@ const ASSET_NAME = urlParams.get('assetName') || null;
 const ASSET_TYPE = urlParams.get('assetType') || null;
 let callId = parseInt(urlParams.get('callId')) || null;
 const IS_PRODUCER = urlParams.get('producer') === 'true' ? true : false
-let remoteVideo = document.getElementById('remoteVideo')
-remoteVideo.defaultMuted = true
-let produceAudio = false
-
 console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId', callId, ' | IS_PRODUCER', IS_PRODUCER)
 
 console.log('🟩 config', config)
 
-produceAudioSelector = document.getElementById('produceAudio');
-produceAudioSelector.addEventListener('change', e => {
-    if(e.target.checked) {
-      produceAudio = true
-      console.log('produce audio');
-    } else {
-      produceAudio = false
-    }
-});
-
 let socket, hub
 let device
 let rtpCapabilities
@@ -37,21 +23,6 @@ let producerVideo
 let producerAudio
 let consumer
 let originAssetId
-let consumerVideo // local consumer video(consumer not transport)
-let consumerAudio // local consumer audio(consumer not transport)
-
-const remoteSoundControl = document.getElementById('remoteSoundControl');
-
-remoteSoundControl.addEventListener('click', function handleClick() {
-  console.log('remoteSoundControl.textContent', remoteSoundControl.textContent);
-  if (remoteSoundControl.textContent === 'Unmute') {
-    remoteVideo.muted = false
-    remoteSoundControl.textContent = 'Mute';
-  } else {
-    remoteVideo.muted = true
-    remoteSoundControl.textContent = 'Unmute';
-  }
-});
 
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
@@ -91,14 +62,10 @@ setTimeout(() => {
       console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
       if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
         goConnect()
+        // document.getElementById('btnRecvSendTransport').click();
       }
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
-
-    socket.on('new-producer', ({ callId }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
-      consume()
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -177,7 +144,7 @@ const streamSuccess = (stream) => {
 const getLocalStream = () => {
   console.log('[getLocalStream]');
   navigator.mediaDevices.getUserMedia({
-    audio: produceAudio ? true : false,
+    audio: true,
     video: {
       qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
       vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
@@ -255,7 +222,7 @@ const createSendTransport = () => {
   console.log('[createSendTransport');
   // see server's socket.on('createWebRtcTransport', sender?, ...)
   // this is a call from Producer, so sender = true
-  socket.emit('createWebRtcTransport', { sender: true }, (value) => {
+  socket.emit('createWebRtcTransport', { sender: true, callId }, (value) => {
 
     console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
 
@@ -326,36 +293,34 @@ const connectSendTransport = async () => {
   // this action will trigger the 'connect' and 'produce' events above
   
   // Produce video
-  let producerVideoHandler = await producerTransport.produce(videoParams)
+  producerVideo = await producerTransport.produce(videoParams)
   console.log('videoParams', videoParams);
   console.log('producerVideo', producerVideo);
 
-  producerVideoHandler.on('trackended', () => {
+  producerVideo.on('trackended', () => {
     console.log('track ended')
     // close video track
   })  
 
-  producerVideoHandler.on('transportclose', () => {
+  producerVideo.on('transportclose', () => {
     console.log('transport ended')
     // close video track
   })    
   
   // Produce audio
-  if (produceAudio) {
-    let producerAudioHandler = await producerTransport.produce(audioParams)
-    console.log('audioParams', audioParams);
-    console.log('producerAudio', producerAudio);
-  
-    producerAudioHandler.on('trackended', () => {
-      console.log('track ended')
-      // close audio track
-    })
-  
-    producerAudioHandler.on('transportclose', () => {
-      console.log('transport ended')
-      // close audio track
-    })
-  }
+  producerAudio = await producerTransport.produce(audioParams)
+  console.log('audioParams', audioParams);
+  console.log('producerAudio', producerAudio);
+
+  producerAudio.on('trackended', () => {
+    console.log('track ended')
+    // close audio track
+  })
+
+  producerAudio.on('transportclose', () => {
+    console.log('transport ended')
+    // close audio track
+  })
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -439,95 +404,34 @@ const connectRecvTransport = async () => {
   await socket.emit('consume', {
     rtpCapabilities: device.rtpCapabilities,
     callId
-  }, async ({videoParams, audioParams}) => {
-    console.log(`[consume] 🟩 videoParams`, videoParams)
-    console.log(`[consume] 🟩 audioParams`, audioParams)
-    console.log('[consume] 🟩 consumerTransport', consumerTransport)
+  }, async ({ params }) => {
+    if (params.error) {
+      console.log('Cannot Consume')
+      return
+    }
+
+    // Then consume with the local consumer transport
+    // which creates a consumer
+    consumer = await consumerTransport.consume({
+      id: params.id,
+      producerId: params.producerId,
+      kind: params.kind,
+      rtpParameters: params.rtpParameters
+    })
+
+    // destructure and retrieve the video track from the producer
+    const { track } = consumer
 
     let stream = new MediaStream()
-
-    // Maybe the unit does not produce video or audio, so we must only consume what is produced
-    if (videoParams) {
-      console.log('❗ Have VIDEO stream to consume');
-      stream.addTrack(await getVideoTrask(videoParams))
-    } else {
-      console.log('❗ Don\'t have VIDEO stream to consume');
-    }
-    
-    if (audioParams) {
-      console.log('❗ Have AUDIO stream to consume');
-      let audioTrack = await getAudioTrask(audioParams)
-      stream.addTrack(audioTrack)
-    } else {
-      console.log('❗ Don\'t have AUDIO stream to consume');
-    }
-
-    socket.emit('consumer-resume')
-
+    stream.addTrack(track)
+    // stream.removeTrack(track)
     remoteVideo.srcObject = stream
-    remoteVideo.setAttribute('autoplay', true)
+    socket.emit('consumer-resume')
+    console.log('consumer', consumer);
 
-    remoteVideo.play()
-    .then(() => {
-      console.log('remoteVideo PLAY')
-    })
-    .catch((error) => {
-      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
-    })
   })
 }
 
-const getVideoTrask = async (videoParams) => {
-  consumerVideo = await consumerTransport.consume({
-    id: videoParams.id,
-    producerId: videoParams.producerId,
-    kind: videoParams.kind,
-    rtpParameters: videoParams.rtpParameters
-  }) 
-
-  consumerVideo.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  return consumerVideo.track
-}
-
-const getAudioTrask = async (audioParams) => {
-  consumerAudio = await consumerTransport.consume({
-    id: audioParams.id,
-    producerId: audioParams.producerId,
-    kind: audioParams.kind,
-    rtpParameters: audioParams.rtpParameters
-  })
-
-  consumerAudio.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  const audioTrack = consumerAudio.track
-
-  audioTrack.applyConstraints({
-    audio: {
-      advanced: [
-        {
-          echoCancellation: {exact: true}
-        },
-        {
-          autoGainControl: {exact: true}
-        },
-        {
-          noiseSuppression: {exact: true}
-        }, 
-        {
-          highpassFilter: {exact: true}
-        }
-      ]
-    }
-  })
-
-  return audioTrack
-}
-
 const closeCall = () => {
   console.log('closeCall');
   
@@ -549,30 +453,7 @@ 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)
-      }
-    })
-    
-    connectRecvTransport()
-  })
-}
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-btnRecvSendTransport.addEventListener('click', consume)
+btnRecvSendTransport.addEventListener('click', goConnect)
 btnCloseCall.addEventListener('click', closeCall)