LINXD-2180: Added recordings

.env

@@ -1,7 +1,3 @@
 PORT=3000
 IP=0.0.0.0 #	Listening IPv4 or IPv6.
 ANNOUNCED_IP=185.8.154.190 # Announced IPv4 or IPv6 (useful when running mediasoup behind NAT with private IP).
-RTC_MIN_PORT=2000
-RTC_MAX_PORT=2020
-SERVER_CERT="./server/ssl/cert.pem"
-SERVER_KEY="./server/ssl/key.pem"

.gitignore

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

README.md

@@ -1,11 +1,5 @@
 # Video server
 
-### Generating certificates
-
-##### To generate SSL certificates you must:
-1. Go to `/server/ssl`
-2. Execute `openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout key.pem -out cert.pem`
-
 
 ### Development
 
@@ -22,20 +16,14 @@
 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
+assetType = asset type of the unit on which you are doing the test
-- 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`

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 -

package.json

@@ -5,17 +5,20 @@
   "main": "app.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "nodemon app.js",
+    "start:dev": "nodemon app.ts",
     "start:prod": "pm2 start ./app.js -n video-server",
     "watch": "watchify public/index.js -o public/bundle.js -v"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
+  "type": "module",
   "dependencies": {
     "@types/express": "^4.17.13",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
+    "ffmpeg-static": "^5.0.2",
+    "httpolyglot": "^0.1.2",
     "mediasoup": "^3.10.4",
     "mediasoup-client": "^3.6.54",
     "parcel": "^2.7.0",

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
+                                <video id="localVideo" autoplay class="video" ></video>
-                                    id="localVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></video>
                             </div>
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <video
+                                <video id="remoteVideo" autoplay class="video" ></video>
-                                    id="remoteVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></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,72 +10,9 @@ 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 
-
-produceAudioSelector = document.getElementById('produceAudio');
-produceAudioSelector.addEventListener('change', e => {
-    if(e.target.checked) {
-      produceAudio = true
-      console.log('produce audio');
-    } else {
-      produceAudio = false
-    }
-});
-
-let socket, hub
-let device
-let rtpCapabilities
-let producerTransport
-let consumerTransport
-let producerVideo
-let producerAudio
-let consumer
-let originAssetId
-let consumerVideo // local consumer video(consumer not transport)
-let consumerAudio // local consumer audio(consumer not transport)
-
-const remoteSoundControl = document.getElementById('remoteSoundControl');
-
-remoteSoundControl.addEventListener('click', function handleClick() {
-  console.log('remoteSoundControl.textContent', remoteSoundControl.textContent);
-  if (remoteSoundControl.textContent === 'Unmute') {
-    remoteVideo.muted = false
-    remoteSoundControl.textContent = 'Mute';
-  } else {
-    remoteVideo.muted = true
-    remoteSoundControl.textContent = 'Unmute';
-  }
-});
-
-// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
-// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
-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)
 
 const connectToMediasoup = () => {
@@ -91,19 +28,15 @@ setTimeout(() => {
     console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
     if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
       goConnect()
+      // document.getElementById('btnRecvSendTransport').click();
     }
     if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
   })
-
-    socket.on('new-producer', ({ callId }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
-      consume()
-    })
 }
 
 if (IS_PRODUCER === true) {
   hub.on('connect', async () => {
-      console.log(`[HUB]! ${config.hubAddress} | connected: ${hub.connected}`)
+    console.log(`[HUB] ${config.hubAddress} | connected: ${hub.connected}`)
     connectToMediasoup()
 
     hub.emit(
@@ -151,51 +84,73 @@ setTimeout(() => {
   connectToMediasoup()
 }
 
-}, 1600);
+let device
+let rtpCapabilities
+let producerTransport
+let consumerTransport
+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 params = {
+  // mediasoup params
+  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) => {
-  console.log('[streamSuccess] device', device);
+  console.log('[streamSuccess]');
   localVideo.srcObject = stream
-  console.log('stream', stream);
+  const track = stream.getVideoTracks()[0]
-  const videoTrack = stream.getVideoTracks()[0]
+  params = {
-  const audioTrack = stream.getAudioTracks()[0]
+    track,
-
+    ...params
-  videoParams = {
-    track: videoTrack,
-    ...videoParams
   }
-
-  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 } },
+      width: {
-      vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
+        min: 640,
-      hd   : { width: { ideal: 1280 }, height: { ideal: 720 } }
+        max: 1920,
+      },
+      height: {
+        min: 400,
+        max: 1080,
+      }
     }
   })
   .then(streamSuccess)
   .catch(error => {
-    console.log(error.message)
+    console.log('getLocalStream', error)
   })
-
-  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,7 +178,6 @@ 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) => {
+  socket.emit('createWebRtcTransport', { sender: true, callId }, ({ params }) => {
-
-    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
@@ -291,17 +244,17 @@ const createSendTransport = () => {
     })
 
     producerTransport.on('produce', async (parameters, callback, errback) => {
-      console.log('[produce] parameters', parameters)
+      console.log('produce', 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', ...)
         await socket.emit('transport-produce', {
           kind: parameters.kind,
           rtpParameters: parameters.rtpParameters,
-          appData: parameters.appData,
+          callId: callId
         }, ({ id }) => {
           // Tell the transport that parameters were transmitted and provide it with the
           // server side producer's id.
@@ -317,46 +270,22 @@ const createSendTransport = () => {
 }
 
 const connectSendTransport = async () => {
-
+  // we now call produce() to instruct the producer transport
-  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)
 
-  // Produce video
+  producer.on('trackended', () => {
-  let producerVideoHandler = await producerTransport.produce(videoParams)
-  console.log('videoParams', videoParams);
-  console.log('producerVideo', producerVideo);
-
-  producerVideoHandler.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,
     dest_asset_id: originAssetId || parseInt(urlParams.get('dest_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
+  producer = null
-  producerAudio = null
   producerTransport = null
   consumerTransport = null
   device = undefined
@@ -433,99 +361,38 @@ 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}) => {
+  }, async ({ params }) => {
-    console.log(`[consume] 🟩 videoParams`, videoParams)
+    if (params.error) {
-    console.log(`[consume] 🟩 audioParams`, audioParams)
+      console.log('Cannot Consume')
-    console.log('[consume] 🟩 consumerTransport', consumerTransport)
+      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()
-
+    stream.addTrack(track)
-    // Maybe the unit does not produce video or audio, so we must only consume what is produced
+    // stream.removeTrack(track)
-    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')
-
     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 = () => {
@@ -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)