LH-265: Enable audio on video server

Reviewed-on: #14

.gitignore

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

app.js

@@ -67,8 +67,8 @@ const peers = io.of('/');
 const createWorker = async () => {
   try {
     worker = await mediasoup.createWorker({
-      rtcMinPort: process.env.RTC_MIN_PORT,
+      rtcMinPort: parseInt(process.env.RTC_MIN_PORT),
-      rtcMaxPort: process.env.RTC_MAX_PORT,
+      rtcMaxPort: parseInt(process.env.RTC_MAX_PORT),
     })
     console.log(`[createWorker] worker pid ${worker.pid}`);
   
@@ -109,7 +109,7 @@ const mediaCodecs = [
 
 const closeCall = (callId) => {
   try {
-    if (videoCalls[callId]) {
+    if (callId && videoCalls[callId]) {
       videoCalls[callId].producer?.close();
       videoCalls[callId].consumer?.close();
       videoCalls[callId]?.consumerTransport?.close();
@@ -124,16 +124,6 @@ const closeCall = (callId) => {
   }
 }
 
-const getRtpCapabilities = (callId, callback) => {
-  try {
-    console.log('[getRtpCapabilities] callId', callId);
-    const rtpCapabilities = videoCalls[callId].router.rtpCapabilities;
-    callback({ rtpCapabilities });
-  } catch (error) {
-    console.log(`ERROR | getRtpCapabilities | callId ${callId} | ${error.message}`);
-  }
-}
-
 /*
   - Handlers for WS events
   - These are created only when we have a connection with a peer
@@ -160,7 +150,9 @@ peers.on('connection', async socket => {
     - If the room already exists, it will not create it, but will only return rtpCapabilities
   */
   socket.on('createRoom', async ({ callId }, callback) => {
+    let callbackResponse = null;
     try {
+      // We can continue with the room creation process only if we have a callId
       if (callId) {
         console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
         if (!videoCalls[callId]) {
@@ -169,12 +161,19 @@ peers.on('connection', async socket => {
           console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
         }
         socketDetails[socket.id] = callId;
-        getRtpCapabilities(callId, callback);
+
+        // rtpCapabilities is set for callback
+        console.log('[getRtpCapabilities] callId', callId);
+        callbackResponse = { 
+          rtpCapabilities :videoCalls[callId].router.rtpCapabilities
+        };
       } else {
         console.log(`[createRoom] missing callId ${callId}`);
       }
     } catch (error) {
       console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
+    } finally {
+      callback(callbackResponse);
     }
   });
 
@@ -195,16 +194,19 @@ peers.on('connection', async socket => {
           videoCalls[callId].producerTransport = await createWebRtcTransportLayer(callId, callback);
         } else {
           console.log(`producerTransport has already been defined | callId ${callId}`);
+          callback(null);
         }
       } else if (!sender) {
         if (!videoCalls[callId].consumerTransport) {
           videoCalls[callId].consumerTransport = await createWebRtcTransportLayer(callId, callback);
         } else {
           console.log(`consumerTransport has already been defined | callId ${callId}`);
+          callback(null);
         }
       }
     } catch (error) {
       console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`);
+      callback(error);
     }
   });
 
@@ -248,9 +250,9 @@ peers.on('connection', async socket => {
       });
 
       // Send back to the client the Producer's id
-      // callback({
+      callback && callback({
-      //   id: videoCalls[callId].producer.id
+        id: videoCalls[callId].producer.id
-      // });
+      });
     } catch (error) {
       console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -299,14 +301,14 @@ peers.on('connection', async socket => {
         videoCalls[callId].consumer.on('transportclose', () => {
           const callId = socketDetails[socket.id];
           console.log('transport close from consumer', callId);
-          closeCall();
+          closeCall(callId);
         });
 
         // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
         videoCalls[callId].consumer.on('producerclose', () => {
           const callId = socketDetails[socket.id];
           console.log('producer of consumer closed', callId);
-          closeCall();
+          closeCall(callId);
         });
 
         // From the consumer extract the following params to send back to the Client
@@ -321,6 +323,7 @@ peers.on('connection', async socket => {
         callback({ params });
       } else {
         console.log(`[canConsume] Can't consume | callId ${callId}`);
+        callback(null);
       }
     } catch (error) {
       console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`)

build.sh

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

public/index.js

@@ -135,7 +135,7 @@ const streamSuccess = (stream) => {
 const getLocalStream = () => {
   console.log('[getLocalStream]');
   navigator.mediaDevices.getUserMedia({
-    audio: false,
+    audio: true,
     video: {
       width: {
         min: 640,