test

.gitignore

@@ -1,2 +1 @@
 /node_modules
-/dist

README.md

@@ -22,20 +22,18 @@
 2. Run the `npm start:prod` command to start the server in production mode.
 (To connect to the terminal, use `pm2 log video-server`)
 
-
-### Web client
+---
 
 - The server will start by default on port 3000, and the ssl certificates will have to be configured
 - The web client can be accessed using the /sfu path
-ex: https://HOST/sfu/?assetId=1&&accountId=1&producer=true&dest_asset_id=75&assetName=Adi
+ex: http://localhost:3000/sfu/?assetId=1&&accountId=1&producer=true&assetName=Adi&assetType=linx
 assetId = asset id of the unit on which you are doing the test
 accountId = account id of the unit on which you are doing the test
 producer = it will always be true because you are the producer
 (it's possible to put false, but then you have to have another client with producer true)
 assetName = asset name of the unit on which you are doing the test
-dest_asset_id= the addressee with whom the call is made
-- To make a call using this client, you need a microphone and permission to use it
-- For any changes related to the client, the command `npm run watch' will have to be used to generate the bundle.js used by the web client
+assetType = asset type of the unit on which you are doing the test
 
 ### 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'),
-};
+  key: fs.readFileSync("./server/ssl/key.pem", 'utf-8'),
+  cert: fs.readFileSync("./server/ssl/cert.pem", '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);
@@ -64,21 +67,21 @@ const peers = io.of('/');
 const createWorker = async () => {
   try {
     worker = await mediasoup.createWorker({
-      rtcMinPort: parseInt(process.env.RTC_MIN_PORT),
-      rtcMaxPort: parseInt(process.env.RTC_MAX_PORT),
-    });
+      rtcMinPort: process.env.RTC_MIN_PORT,
+      rtcMaxPort: 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();
@@ -101,51 +104,16 @@ const mediaCodecs = [
     parameters: {
       'x-google-start-bitrate': 1000,
     },
-    channels: 2,
-  },
-  {
-    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': '42e01f',
-      'level-asymmetry-allowed': 1,
-      '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]?.initiatorConsumerTransport?.close();
-      videoCalls[callId]?.receiverProducerTransport?.close();
+      videoCalls[callId].producer?.close();
+      videoCalls[callId].consumer?.close();
+      videoCalls[callId]?.consumerTransport?.close();
+      videoCalls[callId]?.producerTransport?.close();
       videoCalls[callId]?.router?.close();
       delete videoCalls[callId];
     } else {
@@ -154,18 +122,28 @@ const closeCall = (callId) => {
   } catch (error) {
     console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
   }
-};
+}
+
+const getRtpCapabilities = (callId, callback) => {
+  try {
+    console.log('[getRtpCapabilities] callId', callId);
+    const rtpCapabilities = videoCalls[callId].router.rtpCapabilities;
+    callback({ rtpCapabilities });
+  } catch (error) {
+    console.log(`ERROR | getRtpCapabilities | 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
@@ -182,37 +160,27 @@ peers.on('connection', async (socket) => {
     - If the room already exists, it will not create it, but will only return rtpCapabilities
   */
   socket.on('createRoom', async ({ callId }, callback) => {
-    let callbackResponse = null;
     try {
-      // We can continue with the room creation process only if we have a callId
       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,
-        };
+        getRtpCapabilities(callId, callback);
       } else {
         console.log(`[createRoom] missing callId ${callId}`);
       }
     } catch (error) {
       console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
-    } finally {
-      callback(callbackResponse);
     }
   });
 
   /*
     - 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,28 +189,22 @@ 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 (!isInitiator(callId, socket.id)) {
-          videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if (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 (!isInitiator(callId, socket.id)) {
-          videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if (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}`);
         }
       }
     } catch (error) {
-      console.log(
-        `ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`
-      );
-      callback(error);
+      console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`);
     }
   });
 
@@ -255,123 +217,40 @@ 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}`);
-
-      if (kind === 'video') {
-        if (!isInitiator(callId, socket.id)) {
-          videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
-            kind,
-            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('[receiverVideoProducer] 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('[initiatorVideoProducer] transport for this producer closed', callId);
-            // closeCall(callId);
-          });
-
-          callback &&
-            callback({
-              id: videoCalls[callId].initiatorVideoProducer.id,
-            });
-        }
-      } else if (kind === 'audio') {
-        if (!isInitiator(callId, socket.id)) {
-          videoCalls[callId].receiverAudioProducer = await videoCalls[callId].receiverProducerTransport.produce({
-            kind,
-            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('[receiverAudioProducer] 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('[initiatorAudioProducer] transport for this producer closed', callId);
-            // closeCall(callId);
-          });
-
-          // Send back to the client the Producer's id
-          callback &&
-            callback({
-              id: videoCalls[callId].initiatorAudioProducer.id,
-            });
-        }
-      }
-
-      const socketToEmit = isInitiator(callId, socket.id)
-        ? videoCalls[callId].receiverSocket
-        : videoCalls[callId].initiatorSocket;
-      socketToEmit.emit('new-producer', { callId });
+      console.log('[transport-produce] | socket.id', socket.id, '| callId', callId);
+      videoCalls[callId].producer = await videoCalls[callId].producerTransport.produce({
+        kind,
+        rtpParameters,
+      });
+      console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producer.id} | kind: ${videoCalls[callId].producer.kind}`);
+  
+      videoCalls[callId].producer.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({
+      //   id: videoCalls[callId].producer.id
+      // });
     } catch (error) {
       console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -384,18 +263,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
@@ -407,204 +280,69 @@ peers.on('connection', async (socket) => {
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(
-        `[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`
-      );
-
-      if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
-
       console.log('[consume] callId', callId);
-      let canConsumeVideo, canConsumeAudio;
-      if (isInitiator(callId, socket.id)) {
-        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,
-          });
-      }
-      console.log('[consume] canConsumeVideo', canConsumeVideo);
-      console.log('[consume] canConsumeAudio', canConsumeAudio);
+      // Check if the router can consume the specified producer
+      if (videoCalls[callId].router.canConsume({
+        producerId: videoCalls[callId].producer.id,
+        rtpCapabilities
+      })) {
+        console.log('[consume] Can consume', callId);
+        // Transport can now consume and return a consumer
+        videoCalls[callId].consumer = await videoCalls[callId].consumerTransport.consume({
+          producerId: videoCalls[callId].producer.id,
+          rtpCapabilities,
+          paused: true,
+        });
 
-      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);
+        // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+        videoCalls[callId].consumer.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].consumer.on('producerclose', () => {
+          const callId = socketDetails[socket.id];
+          console.log('producer of consumer closed', callId);
+          closeCall(callId);
+        });
+
+        // From the consumer extract the following params to send back to the Client
+        const params = {
+          id: videoCalls[callId].consumer.id,
+          producerId: videoCalls[callId].producer.id,
+          kind: videoCalls[callId].consumer.kind,
+          rtpParameters: videoCalls[callId].consumer.rtpParameters,
+        };
+
+        // Send the parameters to the client
+        callback({ params });
       } else {
-        console.log(`[consume] Can't consume | callId ${callId}`);
-        callback(null);
+        console.log(`[canConsume] Can't consume | callId ${callId}`);
       }
     } 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].consumer.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,
-    });
-
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-    videoCalls[callId].initiatorConsumerVideo.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
-    videoCalls[callId].initiatorConsumerVideo.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
-    return {
-      id: videoCalls[callId].initiatorConsumerVideo.id,
-      producerId: videoCalls[callId].receiverVideoProducer.id,
-      kind: 'video',
-      rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
-    };
-  } else {
-    videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
-      producerId: videoCalls[callId].initiatorVideoProducer.id,
-      rtpCapabilities,
-      paused: true,
-    });
-
-    videoCalls[callId].receiverConsumerVideo.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    videoCalls[callId].receiverConsumerVideo.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
-    return {
-      id: videoCalls[callId].receiverConsumerVideo.id,
-      producerId: videoCalls[callId].initiatorVideoProducer.id,
-      kind: 'video',
-      rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
-    };
-  }
-};
-
-const consumeAudio = async (callId, socketId, rtpCapabilities) => {
-  if (isInitiator(callId, socketId)) {
-    videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
-      producerId: videoCalls[callId].receiverAudioProducer.id,
-      rtpCapabilities,
-      paused: true,
-    });
-
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-    videoCalls[callId].initiatorConsumerAudio.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
-    videoCalls[callId].initiatorConsumerAudio.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
-    return {
-      id: videoCalls[callId].initiatorConsumerAudio.id,
-      producerId: videoCalls[callId].receiverAudioProducer.id,
-      kind: 'audio',
-      rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
-    };
-  } else {
-    videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
-      producerId: videoCalls[callId].initiatorAudioProducer.id,
-      rtpCapabilities,
-      paused: true,
-    });
-
-    videoCalls[callId].receiverConsumerAudio.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    videoCalls[callId].receiverConsumerAudio.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
-    return {
-      id: videoCalls[callId].receiverConsumerAudio.id,
-      producerId: videoCalls[callId].initiatorAudioProducer.id,
-      kind: 'audio',
-      rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
-    };
-  }
-};
-
-const isInitiator = (callId, socketId) => {
-  return videoCalls[callId]?.initiatorSocket?.id === socketId;
-};
-
 /*
   - Called from at event 'createWebRtcTransport' and assigned to the consumer or producer transport
   - It will return parameters, these are required for the client to create the RecvTransport 
@@ -621,18 +359,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();
@@ -651,14 +390,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.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
     callback({ params: { error } });
   }
-};
+}

build.sh

@@ -1,53 +0,0 @@
-#/!bin/bash
-## PREBUILD PROCESS
-# check dist dir to be present and empty
-if [ ! -d "dist" ]; then
-  ## MAKE DIR
-  mkdir "dist"
-  echo "Directory dist created."
-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"
-#Add version control for pm2
-cd dist
-#Add version control for pm2
-version=$(git describe)
-file_pkg="package.json"
-key="  \"version\": \""
-
-count=$(echo ${version%%-*} | grep -o "\." | wc -l)
-if (( $count > 1 )); then
-        version=${version%%-*}
-else
-        version="${version%%-*}.0"
-fi
-if [ -f "$file_pkg" ] && [ ! -z "$version" ]; then
-  version="  \"version\": \"$version\","
-  sed -i "s|^.*$key.*|${version//\//\\/}|g" $file_pkg
-  text=$(cat $file_pkg | grep -c "$version")
-  if [ $text -eq 0 ]; then
-          echo "Version couldn't be set"
-  else
-          echo "Version $version successfully applied to App"
-  fi
-fi
-
-## POST BUILD
-
-cd -

public/config.js

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

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" ></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,192 +10,147 @@ 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)
+let socket 
+hub = io(config.hubAddress)
 
-produceAudioSelector = document.getElementById('produceAudio');
-produceAudioSelector.addEventListener('change', e => {
-    if(e.target.checked) {
-      produceAudio = true
-      console.log('produce audio');
-    } else {
-      produceAudio = false
+const connectToMediasoup = () => {
+
+  socket = io(config.mediasoupAddress, {
+    reconnection: true,
+    reconnectionDelay: 1000,
+    reconnectionDelayMax : 5000,
+    reconnectionAttempts: Infinity
+  })
+
+  socket.on('connection-success', ({ _socketId, existsProducer }) => {
+    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() }
+  })
+}
+
+if (IS_PRODUCER === true) {
+  hub.on('connect', async () => {
+    console.log(`[HUB] ${config.hubAddress} | connected: ${hub.connected}`)
+    connectToMediasoup()
+
+    hub.emit(
+      'ars',
+      JSON.stringify({
+        ars: true,
+        asset_id: ASSET_ID,
+        account_id: ACCOUNT_ID,
+      })
+    )
+  
+    hub.on('video', (data) => {
+      const parsedData = JSON.parse(data);
+
+      if (parsedData.type === 'notify-request') {
+      console.log('video', parsedData)
+      originAssetId = parsedData.origin_asset_id;
+      // originAssetName = parsedData.origin_asset_name;
+      // originAssetTypeName = parsedData.origin_asset_type_name;
+      callId = parsedData.video_call_id;
+  
+        console.log('[VIDEO] notify-request | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
+        getLocalStream()
+      }
+
+      if (parsedData.type === 'notify-end') {
+        console.log('[VIDEO] notify-end | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
+        resetCallSettings()
+      }
+    })
+  })
+
+  hub.on('connect_error', (error) => {
+    console.log('connect_error', error);
+  });
+  
+  hub.on('connection', () => {
+    console.log('connection')
+  })
+  
+  hub.on('disconnect', () => {
+    console.log('disconnect')
+  })
+} else {
+  connectToMediasoup()
+}
 
-let socket, hub
 let device
 let rtpCapabilities
 let producerTransport
 let consumerTransport
-let producerVideo
-let producerAudio
+let producer
 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';
-  }
-});
+// let originAssetName = 'Adi'
+// let originAssetTypeName = 'linx'
 
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
-let videoParams = {
+let params = {
+  // mediasoup params
   encodings: [
-    { scaleResolutionDownBy: 4, maxBitrate: 500000 },
-    { scaleResolutionDownBy: 2, maxBitrate: 1000000 },
-    { scaleResolutionDownBy: 1, maxBitrate: 5000000 },
-    { scalabilityMode: 'S3T3_KEY' }
+    {
+      rid: 'r0',
+      maxBitrate: 100000,
+      scalabilityMode: 'S1T3',
+    },
+    {
+      rid: 'r1',
+      maxBitrate: 300000,
+      scalabilityMode: 'S1T3',
+    },
+    {
+      rid: 'r2',
+      maxBitrate: 900000,
+      scalabilityMode: 'S1T3',
+    },
   ],
+  // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerCodecOptions
   codecOptions: {
     videoGoogleStartBitrate: 1000
   }
 }
 
-let audioParams = {
-  codecOptions :
-  {
-    opusStereo : true,
-    opusDtx    : true
-  }
-}
-
-setTimeout(() => {
-  hub = io(config.hubAddress)
-  
-  const connectToMediasoup = () => {
-  
-    socket = io(config.mediasoupAddress, {
-      reconnection: true,
-      reconnectionDelay: 1000,
-      reconnectionDelayMax : 5000,
-      reconnectionAttempts: Infinity
-    })
-  
-    socket.on('connection-success', ({ _socketId, existsProducer }) => {
-      console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
-      if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
-        goConnect()
-      }
-      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) {
-    hub.on('connect', async () => {
-      console.log(`[HUB]! ${config.hubAddress} | connected: ${hub.connected}`)
-      connectToMediasoup()
-  
-      hub.emit(
-        'ars',
-        JSON.stringify({
-          ars: true,
-          asset_id: ASSET_ID,
-          account_id: ACCOUNT_ID,
-        })
-      )
-    
-      hub.on('video', (data) => {
-        const parsedData = JSON.parse(data);
-  
-        if (parsedData.type === 'notify-request') {
-        console.log('video', parsedData)
-        originAssetId = parsedData.origin_asset_id;
-        // originAssetName = parsedData.origin_asset_name;
-        // originAssetTypeName = parsedData.origin_asset_type_name;
-        callId = parsedData.video_call_id;
-    
-          console.log('[VIDEO] notify-request | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
-          getLocalStream()
-        }
-  
-        if (parsedData.type === 'notify-end') {
-          console.log('[VIDEO] notify-end | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
-          resetCallSettings()
-        }
-      })
-    })
-  
-    hub.on('connect_error', (error) => {
-      console.log('connect_error', error);
-    });
-    
-    hub.on('connection', () => {
-      console.log('connection')
-    })
-    
-    hub.on('disconnect', () => {
-      console.log('disconnect')
-    })
-  } else {
-    connectToMediasoup()
-  }
-
-}, 1600);
-
 const streamSuccess = (stream) => {
-  console.log('[streamSuccess] device', device);
+  console.log('[streamSuccess]');
   localVideo.srcObject = stream
-  console.log('stream', stream);
-  const videoTrack = stream.getVideoTracks()[0]
-  const audioTrack = stream.getAudioTracks()[0]
-
-  videoParams = {
-    track: videoTrack,
-    ...videoParams
+  const track = stream.getVideoTracks()[0]
+  params = {
+    track,
+    ...params
   }
-
-  audioParams = {
-    track: audioTrack,
-    ...audioParams
-  }
-
-  console.log('[streamSuccess] videoParams', videoParams, ' | audioParams', audioParams);
   goConnect()
 }
 
 const getLocalStream = () => {
   console.log('[getLocalStream]');
   navigator.mediaDevices.getUserMedia({
-    audio: produceAudio ? true : false,
+    audio: false,
     video: {
-      qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
-      vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
-      hd   : { width: { ideal: 1280 }, height: { ideal: 720 } }
+      width: {
+        min: 640,
+        max: 1920,
+      },
+      height: {
+        min: 400,
+        max: 1080,
+      }
     }
   })
   .then(streamSuccess)
   .catch(error => {
     console.log(error.message)
   })
-
-  navigator.permissions.query(
-    { name: 'microphone' }
-  ).then((permissionStatus) =>{
-    console.log('🟨 [PERMISSION] permissionStatus', permissionStatus); // granted, denied, prompt
-    // It will block the code from execution and display "Permission denied" if we don't have microphone permissions
-  })
-
 }
 
 const goConnect = () => {
@@ -212,6 +167,7 @@ const goCreateTransport = () => {
 // server side to send/recive media
 const createDevice = async () => {
   try {
+    console.log('[createDevice]');
     device = new mediasoupClient.Device()
 
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-load
@@ -222,8 +178,7 @@ const createDevice = async () => {
     })
 
     console.log('Device RTP Capabilities', device.rtpCapabilities)
-    console.log('[createDevice] device', device);
-    
+
     // once the device loads, create transport
     goCreateTransport()
 
@@ -252,20 +207,18 @@ const getRtpCapabilities = () => {
 }
 
 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) => {
-
-    console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
-
-    const params = value.params;
+  socket.emit('createWebRtcTransport', { sender: true, callId }, ({ params }) => {
     // The server sends back params needed 
     // to create Send Transport on the client side
     if (params.error) {
       console.log(params.error)
       return
     }
+
+    console.log(params)
+
     // creates a new WebRTC Transport to send media
     // based on the server's producer transport params
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#TransportOptions
@@ -291,10 +244,10 @@ const createSendTransport = () => {
     })
 
     producerTransport.on('produce', async (parameters, callback, errback) => {
-      console.log('[produce] parameters', parameters)
+      console.log(parameters)
 
       try {
-        // Tell the server to create a Producer
+        // tell the server to create a Producer
         // with the following parameters and produce
         // and expect back a server side producer id
         // see server's socket.on('transport-produce', ...)
@@ -317,45 +270,21 @@ const createSendTransport = () => {
 }
 
 const connectSendTransport = async () => {
-
-  console.log('[connectSendTransport] producerTransport');
-
-  // We now call produce() to instruct the producer transport
+  // we now call produce() to instruct the producer transport
   // to send media to the Router
   // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
   // this action will trigger the 'connect' and 'produce' events above
-  
-  // Produce video
-  let producerVideoHandler = await producerTransport.produce(videoParams)
-  console.log('videoParams', videoParams);
-  console.log('producerVideo', producerVideo);
+  producer = await producerTransport.produce(params)
 
-  producerVideoHandler.on('trackended', () => {
+  producer.on('trackended', () => {
     console.log('track ended')
     // close video track
-  })  
+  })
 
-  producerVideoHandler.on('transportclose', () => {
+  producer.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
-    })
-  }
+  })
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -365,7 +294,7 @@ const connectSendTransport = async () => {
     origin_asset_type_name: ASSET_TYPE,
     origin_asset_name: ASSET_NAME,
     video_call_id: callId,
-    answer: 'accepted', // answer: accepted/rejected
+    answer: 'accepted', // answer: 'rejected'
   };
   console.log('SEND answer', answer);
 
@@ -381,7 +310,7 @@ const connectSendTransport = async () => {
 
 const createRecvTransport = async () => {
   console.log('createRecvTransport');
-  // See server's socket.on('consume', sender?, ...)
+  // see server's socket.on('consume', sender?, ...)
   // this is a call from Consumer, so sender = false
   await socket.emit('createWebRtcTransport', { sender: false, callId }, ({ params }) => {
     // The server sends back params needed 
@@ -391,15 +320,15 @@ const createRecvTransport = async () => {
       return
     }
 
-    console.log('[createRecvTransport] params', params)
+    console.log(params)
 
-    // Creates a new WebRTC Transport to receive media
+    // creates a new WebRTC Transport to receive media
     // based on server's consumer transport params
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-createRecvTransport
     consumerTransport = device.createRecvTransport(params)
 
     // https://mediasoup.org/documentation/v3/communication-between-client-and-server/#producing-media
-    // This event is raised when a first call to transport.produce() is made
+    // this event is raised when a first call to transport.produce() is made
     // see connectRecvTransport() below
     consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
       try {
@@ -424,8 +353,7 @@ const resetCallSettings = () => {
   localVideo.srcObject = null
   remoteVideo.srcObject = null
   consumer = null
-  producerVideo = null
-  producerAudio = null
+  producer = null
   producerTransport = null
   consumerTransport = null
   device = undefined
@@ -433,101 +361,40 @@ const resetCallSettings = () => {
 
 const connectRecvTransport = async () => {
   console.log('connectRecvTransport');
-  // For consumer, we need to tell the server first
+  // for consumer, we need to tell the server first
   // to create a consumer based on the rtpCapabilities and consume
   // if the router can consume, it will send back a set of params as below
   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 +416,6 @@ 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)