LH-265: Enable audio on video server

app.js

@@ -90,70 +90,21 @@ worker = createWorker();
 // https://mediasoup.org/documentation/v3/mediasoup/rtp-parameters-and-capabilities/#RtpCodecCapability
 // list of media codecs supported by mediasoup ...
 // https://github.com/versatica/mediasoup/blob/v3/src/supportedRtpCapabilities.ts
-const mediaCodecs = 			[
+const mediaCodecs = [
   {
-    kind      : 'audio',
-    mimeType  : 'audio/opus',
-    clockRate : 48000,
-    channels  : 2
+    kind: 'audio',
+    mimeType: 'audio/opus',
+    clockRate: 48000,
+    channels: 2,
   },
   {
-    kind       : 'video',
-    mimeType   : 'video/VP8',
-    clockRate  : 90000,
-    parameters :
-    {
-      'x-google-start-bitrate' : 1000
-    }
+    kind: 'video',
+    mimeType: 'video/VP8',
+    clockRate: 90000,
+    parameters: {
+      'x-google-start-bitrate': 1000,
+    },
   },
-  {
-    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) => {

public/config.js

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

public/index.html

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

public/index.js

@@ -12,166 +12,124 @@ 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)
 
-console.log('🟩 config', config)
+let socket 
+hub = io(config.hubAddress)
 
-let socket, hub
+const connectToMediasoup = () => {
 
-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()
-        // 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 {
+  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()
-  }
 
-}, 1600);
+    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 device
 let rtpCapabilities
 let producerTransport
 let consumerTransport
-let producerVideo
-let producerAudio
+let producer
 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 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
   }
-  // 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);
+  console.log('[streamSuccess]');
   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
+  const track = stream.getVideoTracks()[0]
+  params = {
+    track,
+    ...params
   }
-
-  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 = () => {
@@ -179,24 +137,16 @@ const getLocalStream = () => {
   navigator.mediaDevices.getUserMedia({
     audio: true,
     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,
+      }
     }
   })
-  // navigator.mediaDevices.getUserMedia({
-  //   audio: false,
-  //   video: {
-  //     width: {
-  //       min: 640,
-  //       max: 1920,
-  //     },
-  //     height: {
-  //       min: 400,
-  //       max: 1080,
-  //     }
-  //   }
-  // })
   .then(streamSuccess)
   .catch(error => {
     console.log(error.message)
@@ -217,7 +167,7 @@ const goCreateTransport = () => {
 // server side to send/recive media
 const createDevice = async () => {
   try {
-    console.log('[createDevice] 1 device', device);
+    console.log('[createDevice]');
     device = new mediasoupClient.Device()
 
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-load
@@ -228,8 +178,7 @@ const createDevice = async () => {
     })
 
     console.log('Device RTP Capabilities', device.rtpCapabilities)
-    console.log('[createDevice] 2 device', device);
-    
+
     // once the device loads, create transport
     goCreateTransport()
 
@@ -258,7 +207,6 @@ 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 }) => {
@@ -269,7 +217,7 @@ const createSendTransport = () => {
       return
     }
 
-    console.log('[createWebRtcTransport] params', params)
+    console.log(params)
 
     // creates a new WebRTC Transport to send media
     // based on the server's producer transport params
@@ -296,7 +244,7 @@ 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
@@ -322,33 +270,18 @@ 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
-  producerVideo = await producerTransport.produce(videoParams)
-  console.log('producerVideo', producerVideo);
-  producerVideo.on('trackended', () => {
+  producer = await producerTransport.produce(params)
+
+  producer.on('trackended', () => {
     console.log('track ended')
     // close video track
   })
 
-  producerVideo.on('transportclose', () => {
-    console.log('transport ended')
-    // close video track
-  })
-
-  producerAudio = await producerTransport.produce(audioParams)
-  console.log('producerAudio', producerAudio);
-  producerAudio.on('trackended', () => {
-    console.log('track ended')
-    // close video track
-  })
-
-  producerAudio.on('transportclose', () => {
+  producer.on('transportclose', () => {
     console.log('transport ended')
     // close video track
   })
@@ -387,7 +320,7 @@ const createRecvTransport = async () => {
       return
     }
 
-    console.log('[createRecvTransport] params', params)
+    console.log(params)
 
     // creates a new WebRTC Transport to receive media
     // based on server's consumer transport params
@@ -420,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