LH-265: Update client and server

app.js

@@ -90,28 +90,81 @@ 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',
+    kind      : 'audio',
-    mimeType: 'audio/opus',
+    mimeType  : 'audio/opus',
-    clockRate: 48000,
+    clockRate : 48000,
-    channels: 2,
+    channels  : 2
   },
   {
-    kind: 'video',
+    kind       : 'video',
-    mimeType: 'video/VP8',
+    mimeType   : 'video/VP8',
-    clockRate: 90000,
+    clockRate  : 90000,
-    parameters: {
+    parameters :
-      'x-google-start-bitrate': 1000,
+    {
+      '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
+    }
+  }
+//   {
+//     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].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();
@@ -230,29 +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] | socket.id', socket.id, '| callId', callId);
+      if (kind === 'video') {
-      videoCalls[callId].producer = await videoCalls[callId].producerTransport.produce({
+        videoCalls[callId].producerVideo = await videoCalls[callId].producerTransport.produce({
-        kind,
+          kind,
-        rtpParameters,
+          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}`);
     }
@@ -281,46 +359,86 @@ 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
-      if (videoCalls[callId].router.canConsume({
+      if (
-        producerId: videoCalls[callId].producer.id,
+        videoCalls[callId].router.canConsume({
-        rtpCapabilities
+          producerId: videoCalls[callId].producerVideo.id,
-      })) {
+          rtpCapabilities
+        }) &&
+        videoCalls[callId].router.canConsume({
+          producerId: videoCalls[callId].producerAudio.id,
+          rtpCapabilities
+        })
+      ) {
         console.log('[consume] Can consume', callId);
         // Transport can now consume and return a consumer
-        videoCalls[callId].consumer = await videoCalls[callId].consumerTransport.consume({
+        videoCalls[callId].consumerVideo = await videoCalls[callId].consumerTransport.consume({
-          producerId: videoCalls[callId].producer.id,
+          producerId: videoCalls[callId].producerVideo.id,
           rtpCapabilities,
           paused: true,
         });
 
         // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-        videoCalls[callId].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].consumer.on('producerclose', () => {
+        videoCalls[callId].consumerVideo.on('producerclose', () => {
           const callId = socketDetails[socket.id];
           console.log('producer of consumer closed', callId);
           closeCall(callId);
         });
 
+        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);
+        });
+
+        console.log('🟠 videoCalls[callId].consumerVideo', videoCalls[callId].consumerVideo);
+        console.log('🟠 videoCalls[callId].consumerAudio', videoCalls[callId].consumerAudio);
+
         // From the consumer extract the following params to send back to the Client
-        const params = {
+        const videoParams = {
-          id: videoCalls[callId].consumer.id,
+          id: videoCalls[callId].consumerVideo.id,
-          producerId: videoCalls[callId].producer.id,
+          producerId: videoCalls[callId].producerVideo.id,
-          kind: videoCalls[callId].consumer.kind,
+          kind: 'video',
-          rtpParameters: videoCalls[callId].consumer.rtpParameters,
+          rtpParameters: videoCalls[callId].consumerVideo.rtpParameters,
         };
 
+        const audioParams = {
+          id: videoCalls[callId].consumerAudio.id,
+          producerId: videoCalls[callId].producerAudio.id,
+          kind: 'audio',
+          rtpParameters: videoCalls[callId].consumerAudio.rtpParameters,
+        };
+
+        console.log('[consume] videoParams', videoParams);
+        console.log('[consume] audioParams', audioParams);
         // Send the parameters to the client
-        callback({ params });
+        callback({ videoParams, audioParams });
       } else {
         console.log(`[canConsume] Can't consume | callId ${callId}`);
         callback(null);
@@ -339,7 +457,7 @@ 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();
     } catch (error) {
       console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -393,6 +511,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/config.js

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

public/index.html

@@ -43,7 +43,7 @@
                     <tr>
                         <td>
                             <div id="sharedBtns">
-                                <video id="localVideo" autoplay class="video" ></video>
+                                <video id="localVideo" autoplay class="video" muted></video>
                             </div>
                         </td>
                         <td>

public/index.js

@@ -12,124 +12,167 @@ let callId = parseInt(urlParams.get('callId')) || null;
 const IS_PRODUCER = urlParams.get('producer') === 'true' ? true : false
 console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId', callId, ' | IS_PRODUCER', IS_PRODUCER)
 
-let socket 
+console.log('🟩 config', config)
-hub = io(config.hubAddress)
 
-const connectToMediasoup = () => {
+let socket, hub
 
-  socket = io(config.mediasoupAddress, {
+setTimeout(() => {
-    reconnection: true,
+  hub = io(config.hubAddress)
-    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 connectToMediasoup = () => {
-      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);
+    socket = io(config.mediasoupAddress, {
-        getLocalStream()
+      reconnection: true,
-      }
+      reconnectionDelay: 1000,
-
+      reconnectionDelayMax : 5000,
-      if (parsedData.type === 'notify-end') {
+      reconnectionAttempts: Infinity
-        console.log('[VIDEO] notify-end | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
-        resetCallSettings()
-      }
     })
-  })
+  
+    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()
+  }
+
+}, 1600);
 
-  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 device
 let rtpCapabilities
 let producerTransport
 let consumerTransport
-let producer
+let producerVideo
+let producerAudio
 let consumer
 let originAssetId
-// 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 params = {
+let videoParams = {
-  // mediasoup params
   encodings: [
-    {
+    { scaleResolutionDownBy: 4, maxBitrate: 500000 },
-      rid: 'r0',
+    { scaleResolutionDownBy: 2, maxBitrate: 1000000 },
-      maxBitrate: 100000,
+    { scaleResolutionDownBy: 1, maxBitrate: 5000000 },
-      scalabilityMode: 'S1T3',
+    { scalabilityMode: 'S3T3_KEY' }
-    },
-    {
-      rid: 'r1',
-      maxBitrate: 300000,
-      scalabilityMode: 'S1T3',
-    },
-    {
-      rid: 'r2',
-      maxBitrate: 900000,
-      scalabilityMode: 'S1T3',
-    },
   ],
-  // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerCodecOptions
   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
+  // }
 }
 
-const streamSuccess = (stream) => {
+let audioParams = {
-  console.log('[streamSuccess]');
+  codecOptions :
-  localVideo.srcObject = stream
+  {
-  const track = stream.getVideoTracks()[0]
+    opusStereo : true,
-  params = {
+    opusDtx    : true
-    track,
-    ...params
   }
+}
+
+
+const streamSuccess = (stream) => {
+  console.log('[streamSuccess] device', device);
+  localVideo.srcObject = stream
+  console.log('stream', stream);
+  const videoTrack = stream.getVideoTracks()[0]
+  const audioTrack = stream.getAudioTracks()[0]
+
+  videoParams = {
+    track: videoTrack,
+    // codec : device.rtpCapabilities.codecs.find((codec) => codec.mimeType.toLowerCase() === 'video/vp9'),
+    // codec : 'video/vp9',
+    ...videoParams
+  }
+
+  audioParams = {
+    track: audioTrack,
+    ...audioParams
+  }
+
+  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 = () => {
@@ -137,16 +180,24 @@ const getLocalStream = () => {
   navigator.mediaDevices.getUserMedia({
     audio: true,
     video: {
-      width: {
+      qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
-        min: 640,
+      vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
-        max: 1920,
+      hd   : { width: { ideal: 1280 }, height: { ideal: 720 } }
-      },
-      height: {
-        min: 400,
-        max: 1080,
-      }
     }
   })
+  // navigator.mediaDevices.getUserMedia({
+  //   audio: false,
+  //   video: {
+  //     width: {
+  //       min: 640,
+  //       max: 1920,
+  //     },
+  //     height: {
+  //       min: 400,
+  //       max: 1080,
+  //     }
+  //   }
+  // })
   .then(streamSuccess)
   .catch(error => {
     console.log(error.message)
@@ -167,7 +218,7 @@ const goCreateTransport = () => {
 // server side to send/recive media
 const createDevice = async () => {
   try {
-    console.log('[createDevice]');
+    console.log('[createDevice] 1 device', device);
     device = new mediasoupClient.Device()
 
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-load
@@ -178,7 +229,8 @@ const createDevice = async () => {
     })
 
     console.log('Device RTP Capabilities', device.rtpCapabilities)
-
+    console.log('[createDevice] 2 device', device);
+    
     // once the device loads, create transport
     goCreateTransport()
 
@@ -207,18 +259,20 @@ 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, 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(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
@@ -244,7 +298,7 @@ const createSendTransport = () => {
     })
 
     producerTransport.on('produce', async (parameters, callback, errback) => {
-      console.log(parameters)
+      console.log('[produce] parameters', parameters)
 
       try {
         // tell the server to create a Producer
@@ -270,21 +324,45 @@ const createSendTransport = () => {
 }
 
 const connectSendTransport = async () => {
+
+  console.log('[connectSendTransport] producerTransport');
+
   // 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
-  producer = await producerTransport.produce(params)
+  
-
+  console.log('videoParams', videoParams);
-  producer.on('trackended', () => {
+  producerVideo = await producerTransport.produce(videoParams)
+  console.log('producerVideo', producerVideo);
+  producerVideo.on('trackended', () => {
     console.log('track ended')
     // close video track
-  })
+  })  
 
-  producer.on('transportclose', () => {
+  producerVideo.on('transportclose', () => {
     console.log('transport ended')
     // close video track
-  })
+  })    
+  
+    console.log('audioParams', audioParams);
+    producerAudio = await producerTransport.produce(audioParams)
+    console.log('producerAudio', producerAudio);
+    producerAudio.on('trackended', () => {
+      console.log('track ended')
+      // close video track
+    })
+  
+    producerAudio.on('transportclose', () => {
+      console.log('transport ended')
+  
+      // close video track
+    })
+  
+
+
+
+
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -320,7 +398,7 @@ const createRecvTransport = async () => {
       return
     }
 
-    console.log(params)
+    console.log('[createRecvTransport] params', params)
 
     // creates a new WebRTC Transport to receive media
     // based on server's consumer transport params
@@ -353,7 +431,8 @@ const resetCallSettings = () => {
   localVideo.srcObject = null
   remoteVideo.srcObject = null
   consumer = null
-  producer = null
+  producerVideo = null
+  producerAudio = null
   producerTransport = null
   consumerTransport = null
   device = undefined