LH-265: Update client

README.md

@@ -22,17 +22,20 @@
 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: http://localhost:3000/sfu/?assetId=1&&accountId=1&producer=true&assetName=Adi&assetType=linx
+ex: https://HOST/sfu/?assetId=1&&accountId=1&producer=true&dest_asset_id=75&assetName=Adi
 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
-assetType = asset type 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
 
 ### Demo project
   The demo project used initially and then modified for our needs `https://github.com/jamalag/mediasoup2`

app.js

@@ -104,7 +104,8 @@ const mediaCodecs = 			[
     parameters :
     {
       'x-google-start-bitrate' : 1000
-    }
+    },
+    channels  : 2
   },
   {
     kind       : 'video',
@@ -159,8 +160,11 @@ const mediaCodecs = 			[
 const closeCall = (callId) => {
   try {
     if (callId && videoCalls[callId]) {
-      videoCalls[callId].producer?.close();
+      videoCalls[callId].producerVideo?.close();
-      videoCalls[callId].consumer?.close();
+      videoCalls[callId].producerAudio?.close();
+      videoCalls[callId].consumerVideo?.close();
+      videoCalls[callId].consumerAudio?.close();
+
       videoCalls[callId]?.consumerTransport?.close();
       videoCalls[callId]?.producerTransport?.close();
       videoCalls[callId]?.router?.close();
@@ -279,31 +283,54 @@ peers.on('connection', async socket => {
     - 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) => {
+   socket.on('transport-produce', async ({ kind, rtpParameters, appData }, callback) => {
-    try {
+     try {
-      const callId = socketDetails[socket.id];
+       const callId = socketDetails[socket.id];
-      if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
+       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);
 
-      console.log(`[transport-produce] kind: ${kind} | socket.id: ${socket.id} | callId: ${callId}`);
+      if (kind === 'video') {
-      console.log('kind', kind);
+        videoCalls[callId].producerVideo = await videoCalls[callId].producerTransport.produce({
-      console.log('rtpParameters', rtpParameters);
+          kind,
-      videoCalls[callId].producer = await videoCalls[callId].producerTransport.produce({
+          rtpParameters,
-        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
+        console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producerVideo.id} | kind: ${videoCalls[callId].producerVideo.kind}`);
-      callback && callback({
+    
-        id: videoCalls[callId].producer.id
+        videoCalls[callId].producerVideo.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].producerVideo.id
+        });
+      } else if (kind === 'audio') {
+        videoCalls[callId].producerAudio = await videoCalls[callId].producerTransport.produce({
+          kind,
+          rtpParameters,
+        });
+
+        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);
+        });
+
+        // Send back to the client the Producer's id
+        callback && callback({
+          id: videoCalls[callId].producerAudio.id
+        });
+      }
     } catch (error) {
       console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -332,48 +359,36 @@ 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] callId', callId);
 
-      // Check if the router can consume the specified producer
+      const canConsumeVideo = !!videoCalls[callId].producerVideo && !!videoCalls[callId].router.canConsume({
-      if (videoCalls[callId].router.canConsume({
+        producerId: videoCalls[callId].producerVideo.id,
-        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,
-        });
 
-        // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+      const canConsumeAudio = !!videoCalls[callId].producerAudio && !!videoCalls[callId].router.canConsume({
-        videoCalls[callId].consumer.on('transportclose', () => {
+        producerId: videoCalls[callId].producerAudio.id,
-          const callId = socketDetails[socket.id];
+        rtpCapabilities
-          console.log('transport close from consumer', callId);
+      })
-          closeCall(callId);
-        });
 
-        // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
+      console.log('[consume] canConsumeVideo', canConsumeVideo);
-        videoCalls[callId].consumer.on('producerclose', () => {
+      console.log('[consume] canConsumeAudio', canConsumeAudio);
-          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
+      if (canConsumeVideo && !canConsumeAudio) {
-        const params = {
+        console.log('1');
-          id: videoCalls[callId].consumer.id,
+        const videoParams = await consumeVideo(callId, rtpCapabilities)
-          producerId: videoCalls[callId].producer.id,
+        console.log('videoParams', videoParams);
-          kind: videoCalls[callId].consumer.kind,
+        callback({ videoParams, audioParams: null });
-          rtpParameters: videoCalls[callId].consumer.rtpParameters,
+      } else if (canConsumeVideo && canConsumeAudio) {
-        };
+        console.log('2');
-
+        const videoParams = await consumeVideo(callId, rtpCapabilities)
-        // Send the parameters to the client
+        const audioParams = await consumeAudio(callId, rtpCapabilities)
-        callback({ params });
+        callback({ videoParams, audioParams });
       } else {
-        console.log(`[canConsume] Can't consume | callId ${callId}`);
+        console.log(`[consume] Can't consume | callId ${callId}`);
         callback(null);
       }
     } catch (error) {
@@ -390,13 +405,71 @@ peers.on('connection', async socket => {
     try {
       const callId = socketDetails[socket.id];
       console.log(`[consumer-resume] callId ${callId}`)
-      await videoCalls[callId].consumer.resume();
+      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, 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].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].consumerVideo.on('producerclose', () => {
+    const callId = socketDetails[socket.id];
+    console.log('producer of consumer closed', callId);
+    closeCall(callId);
+  });
+
+  return {
+    id: videoCalls[callId].consumerVideo.id,
+    producerId: videoCalls[callId].producerVideo.id,
+    kind: 'video',
+    rtpParameters: videoCalls[callId].consumerVideo.rtpParameters,
+  }
+}
+
+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].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].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,
+  }
+}
+
 /*
   - 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 
@@ -444,6 +517,7 @@ const createWebRtcTransportLayer = async (callId, callback) => {
       dtlsParameters: transport.dtlsParameters,
     };
 
+    console.log('[createWebRtcTransportLayer] callback params', params);
     // Send back to the client the params
     callback({ params });
 

public/bundle.js

@@ -20373,6 +20373,36 @@ console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId',
 console.log('🟩 config', config)
 
 let socket, hub
+let device
+let rtpCapabilities
+let producerTransport
+let consumerTransport
+let producerVideo
+let producerAudio
+let consumer
+let originAssetId
+
+// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
+// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
+let videoParams = {
+  encodings: [
+    { scaleResolutionDownBy: 4, maxBitrate: 500000 },
+    { scaleResolutionDownBy: 2, maxBitrate: 1000000 },
+    { scaleResolutionDownBy: 1, maxBitrate: 5000000 },
+    { scalabilityMode: 'S3T3_KEY' }
+  ],
+  codecOptions: {
+    videoGoogleStartBitrate: 1000
+  }
+}
+
+let audioParams = {
+  codecOptions :
+  {
+    opusStereo : true,
+    opusDtx    : true
+  }
+}
 
 setTimeout(() => {
   hub = io(config.hubAddress)
@@ -20448,59 +20478,6 @@ setTimeout(() => {
 
 }, 1600);
 
-
-let device
-let rtpCapabilities
-let producerTransport
-let consumerTransport
-let producerVideo
-let producerAudio
-let consumer
-let originAssetId
-
-// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
-// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
-let videoParams = {
-  encodings: [
-    { scaleResolutionDownBy: 4, maxBitrate: 500000 },
-    { scaleResolutionDownBy: 2, maxBitrate: 1000000 },
-    { scaleResolutionDownBy: 1, maxBitrate: 5000000 },
-    { scalabilityMode: 'S3T3_KEY' }
-  ],
-  codecOptions: {
-    videoGoogleStartBitrate: 1000
-  }
-  // encodings: [
-  //   {
-  //     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
-  }
-}
-
 const streamSuccess = (stream) => {
   console.log('[streamSuccess] device', device);
   localVideo.srcObject = stream
@@ -20510,8 +20487,6 @@ const streamSuccess = (stream) => {
 
   videoParams = {
     track: videoTrack,
-    // codec : device.rtpCapabilities.codecs.find((codec) => codec.mimeType.toLowerCase() === 'video/vp9'),
-    // codec : 'video/vp9',
     ...videoParams
   }
 
@@ -20522,14 +20497,6 @@ const streamSuccess = (stream) => {
 
   console.log('[streamSuccess] videoParams', videoParams, ' | audioParams', audioParams);
   goConnect()
-  // console.log('[streamSuccess]');
-  // localVideo.srcObject = stream
-  // const track = stream.getVideoTracks()[0]
-  // videoParams = {
-  //   track,
-  //   ...videoParams
-  // }
-  // goConnect()
 }
 
 const getLocalStream = () => {
@@ -20542,23 +20509,18 @@ const getLocalStream = () => {
       hd   : { width: { ideal: 1280 }, height: { ideal: 720 } }
     }
   })
-  // navigator.mediaDevices.getUserMedia({
-  //   audio: false,
-  //   video: {
-  //     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 = () => {
@@ -20575,7 +20537,6 @@ const goCreateTransport = () => {
 // server side to send/recive media
 const createDevice = async () => {
   try {
-    console.log('[createDevice] 1 device', device);
     device = new mediasoupClient.Device()
 
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-load
@@ -20586,7 +20547,7 @@ const createDevice = async () => {
     })
 
     console.log('Device RTP Capabilities', device.rtpCapabilities)
-    console.log('[createDevice] 2 device', device);
+    console.log('[createDevice] device', device);
     
     // once the device loads, create transport
     goCreateTransport()
@@ -20619,16 +20580,17 @@ 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, callId }, ({ params }) => {
+  socket.emit('createWebRtcTransport', { sender: true, callId }, (value) => {
+
+    console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
+
+    const params = value.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('[createWebRtcTransport] params', 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
@@ -20657,7 +20619,7 @@ const createSendTransport = () => {
       console.log('[produce] parameters', 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', ...)
@@ -20683,40 +20645,40 @@ 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
   producerVideo = await producerTransport.produce(videoParams)
+  console.log('videoParams', videoParams);
   console.log('producerVideo', producerVideo);
+
   producerVideo.on('trackended', () => {
     console.log('track ended')
     // close video track
-  })
+  })  
 
   producerVideo.on('transportclose', () => {
     console.log('transport ended')
     // close video track
+  })    
+  
+  // Produce audio
+  producerAudio = await producerTransport.produce(audioParams)
+  console.log('audioParams', audioParams);
+  console.log('producerAudio', producerAudio);
+
+  producerAudio.on('trackended', () => {
+    console.log('track ended')
+    // close audio track
   })
 
-  // producerAudio = await producerTransport.produce(audioParams)
+  producerAudio.on('transportclose', () => {
-  // console.log('producerAudio', producerAudio);
+    console.log('transport ended')
-  // producerAudio.on('trackended', () => {
+    // close audio track
-  //   console.log('track ended')
+  })
-  //   // close video track
-  // })
-
-  // producerAudio.on('transportclose', () => {
-  //   console.log('transport ended')
-  //   // close video track
-  // })
-
-
-
-
-
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -20726,7 +20688,7 @@ const connectSendTransport = async () => {
     origin_asset_type_name: ASSET_TYPE,
     origin_asset_name: ASSET_NAME,
     video_call_id: callId,
-    answer: 'accepted', // answer: 'rejected'
+    answer: 'accepted', // answer: accepted/rejected
   };
   console.log('SEND answer', answer);
 
@@ -20742,7 +20704,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 
@@ -20754,13 +20716,13 @@ const createRecvTransport = async () => {
 
     console.log('[createRecvTransport] params', 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 {
@@ -20794,7 +20756,7 @@ 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', {
@@ -20806,7 +20768,7 @@ const connectRecvTransport = async () => {
       return
     }
 
-    // then consume with the local consumer transport
+    // Then consume with the local consumer transport
     // which creates a consumer
     consumer = await consumerTransport.consume({
       id: params.id,
@@ -20849,6 +20811,7 @@ const closeCall = () => {
   resetCallSettings()
 }
 
+
 btnLocalVideo.addEventListener('click', getLocalStream)
 btnRecvSendTransport.addEventListener('click', goConnect)
 btnCloseCall.addEventListener('click', closeCall)

public/index.js

@@ -15,6 +15,36 @@ console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId',
 console.log('🟩 config', config)
 
 let socket, hub
+let device
+let rtpCapabilities
+let producerTransport
+let consumerTransport
+let producerVideo
+let producerAudio
+let consumer
+let originAssetId
+
+// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
+// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
+let videoParams = {
+  encodings: [
+    { scaleResolutionDownBy: 4, maxBitrate: 500000 },
+    { scaleResolutionDownBy: 2, maxBitrate: 1000000 },
+    { scaleResolutionDownBy: 1, maxBitrate: 5000000 },
+    { scalabilityMode: 'S3T3_KEY' }
+  ],
+  codecOptions: {
+    videoGoogleStartBitrate: 1000
+  }
+}
+
+let audioParams = {
+  codecOptions :
+  {
+    opusStereo : true,
+    opusDtx    : true
+  }
+}
 
 setTimeout(() => {
   hub = io(config.hubAddress)
@@ -90,59 +120,6 @@ setTimeout(() => {
 
 }, 1600);
 
-
-let device
-let rtpCapabilities
-let producerTransport
-let consumerTransport
-let producerVideo
-let producerAudio
-let consumer
-let originAssetId
-
-// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
-// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
-let videoParams = {
-  encodings: [
-    { scaleResolutionDownBy: 4, maxBitrate: 500000 },
-    { scaleResolutionDownBy: 2, maxBitrate: 1000000 },
-    { scaleResolutionDownBy: 1, maxBitrate: 5000000 },
-    { scalabilityMode: 'S3T3_KEY' }
-  ],
-  codecOptions: {
-    videoGoogleStartBitrate: 1000
-  }
-  // encodings: [
-  //   {
-  //     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
-  }
-}
-
 const streamSuccess = (stream) => {
   console.log('[streamSuccess] device', device);
   localVideo.srcObject = stream
@@ -152,8 +129,6 @@ const streamSuccess = (stream) => {
 
   videoParams = {
     track: videoTrack,
-    // codec : device.rtpCapabilities.codecs.find((codec) => codec.mimeType.toLowerCase() === 'video/vp9'),
-    // codec : 'video/vp9',
     ...videoParams
   }
 
@@ -164,14 +139,6 @@ const streamSuccess = (stream) => {
 
   console.log('[streamSuccess] videoParams', videoParams, ' | audioParams', audioParams);
   goConnect()
-  // console.log('[streamSuccess]');
-  // localVideo.srcObject = stream
-  // const track = stream.getVideoTracks()[0]
-  // videoParams = {
-  //   track,
-  //   ...videoParams
-  // }
-  // goConnect()
 }
 
 const getLocalStream = () => {
@@ -184,23 +151,18 @@ const getLocalStream = () => {
       hd   : { width: { ideal: 1280 }, height: { ideal: 720 } }
     }
   })
-  // navigator.mediaDevices.getUserMedia({
-  //   audio: false,
-  //   video: {
-  //     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 = () => {
@@ -217,7 +179,6 @@ const goCreateTransport = () => {
 // server side to send/recive media
 const createDevice = async () => {
   try {
-    console.log('[createDevice] 1 device', device);
     device = new mediasoupClient.Device()
 
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-load
@@ -228,7 +189,7 @@ const createDevice = async () => {
     })
 
     console.log('Device RTP Capabilities', device.rtpCapabilities)
-    console.log('[createDevice] 2 device', device);
+    console.log('[createDevice] device', device);
     
     // once the device loads, create transport
     goCreateTransport()
@@ -261,16 +222,17 @@ 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, callId }, ({ params }) => {
+  socket.emit('createWebRtcTransport', { sender: true, callId }, (value) => {
+
+    console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
+
+    const params = value.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('[createWebRtcTransport] params', 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
@@ -299,7 +261,7 @@ const createSendTransport = () => {
       console.log('[produce] parameters', 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', ...)
@@ -325,40 +287,40 @@ 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
   producerVideo = await producerTransport.produce(videoParams)
+  console.log('videoParams', videoParams);
   console.log('producerVideo', producerVideo);
+
   producerVideo.on('trackended', () => {
     console.log('track ended')
     // close video track
-  })
+  })  
 
   producerVideo.on('transportclose', () => {
     console.log('transport ended')
     // close video track
+  })    
+  
+  // Produce audio
+  producerAudio = await producerTransport.produce(audioParams)
+  console.log('audioParams', audioParams);
+  console.log('producerAudio', producerAudio);
+
+  producerAudio.on('trackended', () => {
+    console.log('track ended')
+    // close audio track
   })
 
-  // producerAudio = await producerTransport.produce(audioParams)
+  producerAudio.on('transportclose', () => {
-  // console.log('producerAudio', producerAudio);
+    console.log('transport ended')
-  // producerAudio.on('trackended', () => {
+    // close audio track
-  //   console.log('track ended')
+  })
-  //   // close video track
-  // })
-
-  // producerAudio.on('transportclose', () => {
-  //   console.log('transport ended')
-  //   // close video track
-  // })
-
-
-
-
-
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -368,7 +330,7 @@ const connectSendTransport = async () => {
     origin_asset_type_name: ASSET_TYPE,
     origin_asset_name: ASSET_NAME,
     video_call_id: callId,
-    answer: 'accepted', // answer: 'rejected'
+    answer: 'accepted', // answer: accepted/rejected
   };
   console.log('SEND answer', answer);
 
@@ -384,7 +346,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 
@@ -396,13 +358,13 @@ const createRecvTransport = async () => {
 
     console.log('[createRecvTransport] params', 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 {
@@ -436,7 +398,7 @@ 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', {
@@ -448,7 +410,7 @@ const connectRecvTransport = async () => {
       return
     }
 
-    // then consume with the local consumer transport
+    // Then consume with the local consumer transport
     // which creates a consumer
     consumer = await consumerTransport.consume({
       id: params.id,
@@ -491,6 +453,7 @@ const closeCall = () => {
   resetCallSettings()
 }
 
+
 btnLocalVideo.addEventListener('click', getLocalStream)
 btnRecvSendTransport.addEventListener('click', goConnect)
 btnCloseCall.addEventListener('click', closeCall)