Merge pull request 'Update 'app.js'' (#33) from sergiu-patch-1 into develop

Reviewed-on: #33
Reviewed-by: bmamihai <mihai.bozieru@safemobile.com>

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+doc

Dockerfile

@@ -1,11 +1,25 @@
-FROM ubuntu
+FROM ubuntu:22.04
+
+WORKDIR /app
+
 RUN apt-get update && \
     apt-get install -y build-essential pip net-tools iputils-ping iproute2 curl
 
-RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
 RUN apt-get install -y nodejs
-RUN npm install -g watchify
 
-EXPOSE 3000
-EXPOSE 2000-2020
-EXPOSE 10000-10100
+COPY . /app/
+
+RUN npm install
+
+EXPOSE 3000/tcp
+EXPOSE 2000-2200/udp
+
+CMD node app.js
+
+#docker build -t linx-video .
+# docker run -it -d --restart always -p 3000:3000/tcp -p 2000-2200:2000-2200/udp linx-video
+#Run under host network
+# docker run -it -d --network host --restart always -p 3000:3000/tcp -p 2000-2200:2000-2200/udp linx-video
+#https://docs.docker.com/config/containers/resource_constraints/
+#docker run -it -d --network host --cpus="0.25" --memory="512m" --restart always -p 3000:3000/tcp -p 2000-2200:2000-2200/udp linx-video

app.js

@@ -37,7 +37,7 @@ let videoCalls = {};
 let socketDetails = {};
 
 app.get('/', (_req, res) => {
-  res.send('Hello from mediasoup app!');
+  res.send('OK');
 });
 
 app.use('/sfu', express.static(path.join(__dirname, 'public')));
@@ -237,7 +237,11 @@ peers.on('connection', async (socket) => {
         }
       }
     } catch (error) {
-      console.error(`[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${error.message}`);
+      console.error(
+        `[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${
+          error.message
+        }`
+      );
       callback(error);
     }
   });
@@ -382,66 +386,17 @@ peers.on('connection', async (socket) => {
       - The consumer does consumerTransport.consume(params)
   */
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
-    try {
     const callId = socketDetails[socket.id];
+    const socketId = socket.id;
+
+    console.log(`[consume] socket ${socketId} | callId: ${callId}`);
 
     if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
 
-      let canConsumeVideo, canConsumeAudio;
-      try {
-        if (isInitiator(callId, socket.id)) {
-          canConsumeVideo =
-            !!videoCalls[callId].receiverVideoProducer &&
-            !!videoCalls[callId].router.canConsume({
-              producerId: videoCalls[callId].receiverVideoProducer.id,
-              rtpCapabilities,
+    callback({
+      videoParams: await consumeVideo({ callId, socketId, rtpCapabilities }),
+      audioParams: await consumeAudio({ callId, socketId, rtpCapabilities }),
     });
-          canConsumeAudio =
-            !!videoCalls[callId].receiverAudioProducer &&
-            !!videoCalls[callId].router.canConsume({
-              producerId: videoCalls[callId].receiverAudioProducer.id,
-              rtpCapabilities,
-            });
-        } else {
-          canConsumeVideo =
-            !!videoCalls[callId].initiatorVideoProducer &&
-            !!videoCalls[callId].router.canConsume({
-              producerId: videoCalls[callId].initiatorVideoProducer.id,
-              rtpCapabilities,
-            });
-  
-          canConsumeAudio =
-            !!videoCalls[callId].initiatorAudioProducer &&
-            !!videoCalls[callId].router.canConsume({
-              producerId: videoCalls[callId].initiatorAudioProducer.id,
-              rtpCapabilities,
-            });
-        }
-      } catch (error) {
-        console.error(`[consume] | ERROR | callId: ${callId} | error: ${error.message}`);
-      }
-      
-      console.log(`[consume] socket ${socket.id} | callId: ${callId} | canConsumeVideo: ${canConsumeVideo} | canConsumeAudio: ${canConsumeAudio}`);
-
-      if (canConsumeVideo && !canConsumeAudio) {
-        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
-        callback({ videoParams, audioParams: null });
-      } else if (canConsumeVideo && canConsumeAudio) {
-        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
-        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
-        callback({ videoParams, audioParams });
-      } else if (!canConsumeVideo && canConsumeAudio) {
-        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
-        const data = { videoParams: null, audioParams };
-        callback(data);
-      } else {
-        console.log(`[consume] Can't consume | callId ${callId}`);
-        callback(null);
-      }
-    } catch (error) {
-      console.error(`[consume] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
-      callback({ params: { error } });
-    }
   });
 
   /*
@@ -454,15 +409,23 @@ peers.on('connection', async (socket) => {
       const callId = socketDetails[socket.id];
       const isInitiatorValue = isInitiator(callId, socket.id);
       console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
-       if (isInitiatorValue) {
-           videoCalls[callId].initiatorConsumerVideo && videoCalls[callId].initiatorConsumerVideo.resume();
-           videoCalls[callId].initiatorConsumerAudio && videoCalls[callId].initiatorConsumerAudio.resume();
-       } else {
-           videoCalls[callId].receiverConsumerVideo && videoCalls[callId].receiverConsumerVideo.resume();
-           videoCalls[callId].receiverConsumerAudio && videoCalls[callId].receiverConsumerAudio.resume();
-       }
+
+      const consumerVideo = isInitiatorValue
+        ? videoCalls[callId].initiatorConsumerVideo
+        : videoCalls[callId].receiverConsumerVideo;
+
+      const consumerAudio = isInitiatorValue
+        ? videoCalls[callId].initiatorConsumerAudio
+        : videoCalls[callId].receiverConsumerAudio;
+
+      consumerVideo?.resume();
+      consumerAudio?.resume();
     } catch (error) {
-       console.error(`[consumer-resume] | ERROR | callId: ${socketDetails[socket.id]} | isInitiator: ${isInitiator} | error: ${error.message}`);
+      console.error(
+        `[consumer-resume] | ERROR | callId: ${socketDetails[socket.id]} | isInitiator: ${isInitiator} | error: ${
+          error.message
+        }`
+      );
     }
   });
 
@@ -479,67 +442,94 @@ peers.on('connection', async (socket) => {
       console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
-  
 });
 
-const consumeVideo = async (callId, socketId, rtpCapabilities) => {
-  // Handlers for transports https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-  if (isInitiator(callId, socketId)) {
+const canConsume = ({ callId, producerId, rtpCapabilities }) => {
+  return !!videoCalls[callId].router.canConsume({
+    producerId,
+    rtpCapabilities,
+  });
+};
+
+const consumeVideo = async ({ callId, socketId, rtpCapabilities }) => {
+  // Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+  if (isInitiator(callId, socketId) && videoCalls[callId].receiverVideoProducer) {
+    const producerId = videoCalls[callId].receiverVideoProducer.id;
+    if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
+
     videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
-      producerId: videoCalls[callId].receiverVideoProducer.id,
+      producerId,
       rtpCapabilities,
       paused: true,
     });
 
     return {
       id: videoCalls[callId].initiatorConsumerVideo.id,
-      producerId: videoCalls[callId].receiverVideoProducer.id,
+      producerId,
       kind: 'video',
       rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
     };
-  } else {
+  } else if (videoCalls[callId].initiatorVideoProducer) {
+    const producerId = videoCalls[callId].initiatorVideoProducer.id;
+    if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
+
     videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
-      producerId: videoCalls[callId].initiatorVideoProducer.id,
+      producerId,
       rtpCapabilities,
       paused: true,
     });
 
     return {
       id: videoCalls[callId].receiverConsumerVideo.id,
-      producerId: videoCalls[callId].initiatorVideoProducer.id,
+      producerId,
       kind: 'video',
       rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
     };
+  } else {
+    return null;
   }
 };
 
-const consumeAudio = async (callId, socketId, rtpCapabilities) => {
-  if (isInitiator(callId, socketId)) {
+const consumeAudio = async ({ callId, socketId, rtpCapabilities }) => {
+  try {
+    // Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+    if (isInitiator(callId, socketId) && videoCalls[callId].receiverAudioProducer) {
+      const producerId = videoCalls[callId].receiverAudioProducer.id;
+      if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
+
       videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
-      producerId: videoCalls[callId].receiverAudioProducer.id,
+        producerId,
         rtpCapabilities,
         paused: true,
       });
 
       return {
         id: videoCalls[callId].initiatorConsumerAudio.id,
-      producerId: videoCalls[callId].receiverAudioProducer.id,
+        producerId,
         kind: 'audio',
         rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
       };
-  } else {
+    } else if (videoCalls[callId].initiatorAudioProducer) {
+      const producerId = videoCalls[callId].initiatorAudioProducer.id;
+      if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
+
       videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
-      producerId: videoCalls[callId].initiatorAudioProducer.id,
+        producerId,
         rtpCapabilities,
         paused: true,
       });
 
       return {
         id: videoCalls[callId].receiverConsumerAudio.id,
-      producerId: videoCalls[callId].initiatorAudioProducer.id,
+        producerId,
         kind: 'audio',
         rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
       };
+    } else {
+      return null;
+    }
+  } catch (error) {
+    console.error(`[consumeAudio] | ERROR | error: ${error}`);
   }
 };
 
@@ -599,7 +589,9 @@ const createWebRtcTransportLayer = async (callId, callback) => {
     // Set transport to producerTransport or consumerTransport
     return transport;
   } catch (error) {
-    console.error(`[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+    console.error(
+      `[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`
+    );
     callback({ params: { error } });
   }
 };

build.sh

@@ -1,4 +1,40 @@
 #/!bin/bash
+## FUNCTIONS
+function getGitVersion(){
+  version=$(git describe)
+  count=$(echo ${version%%-*} | grep -o "\." | wc -l)
+  if (( $count > 1 )); then
+    version=${version%%-*}
+  elif (( $count == 0 ));then
+    echo -e "Error: Git version \"${version%%-*}\" not respecting Safemobile standard.\n Must be like 4.xx or 4.xx.xx"
+    version="0.0.0"
+  else
+    if [[ "$1" == "dev" ]];then
+      cleanprefix=${version#*-} # remove everything before `-` including `-`
+      cleansuffix=${cleanprefix%-*} # remove everything after `-` including `-`
+      version="${version%%-*}.${cleansuffix}"
+    else
+      version="${version%%-*}.0" # one `%` remove everything after last `-`, two `%%` remove everything after all `-`
+    fi
+  fi
+}
+
+function addVersionPm2(){
+  file_pkg="package.json"
+  key="  \"version\": \""
+
+  if [ -f "$file_pkg" ] && [ ! -z "$version" ]; then
+    versionApp="  \"version\": \"$version\","
+    sed -i "s|^.*$key.*|${versionApp//\//\\/}|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
+}
+
 ## PREBUILD PROCESS
 # check dist dir to be present and empty
 if [ ! -d "dist" ]; then
@@ -22,31 +58,17 @@ 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/
+
+# Generate Git log
 dateString=$(date +"%Y%m%d-%H%M%S")
-git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git--$dateString.log"
+git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git-$dateString.log"
+
+# Get Git version control
+getGitVersion $1
+
 # 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
+addVersionPm2
 
 ## POST BUILD
 

public/bundle.js

@@ -20855,40 +20855,6 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
-  consumerVideo.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  consumerVideo.on('producerclose', () => {
-    console.log('===================1 consumerVideo producerclose');
-  });
-
-  consumerVideo.on("producerclose", () => {
-    console.log('====================2 consumerVideo producerclose');
-  })
-  consumerVideo.on("close", () => {
-    console.log('====================3 consumerVideo producerclose');
-  })
-  consumerVideo.on("close-producer", () => {
-    console.log('====================4 consumerVideo producerclose');
-  })
-
-
-
-  consumerVideo.observer.on('producerclose', () => {
-    console.log('===================11 consumerVideo producerclose');
-  });
-
-  consumerVideo.observer.on("producerclose", () => {
-    console.log('====================22 consumerVideo producerclose');
-  })
-  consumerVideo.observer.on("close", () => {
-    console.log('====================33 consumerVideo producerclose');
-  })
-  consumerVideo.observer.on("close-producer", () => {
-    console.log('====================44 consumerVideo producerclose');
-  })
-
   return consumerVideo.track
 }
 
@@ -20904,14 +20870,6 @@ const getAudioTrask = async (audioParams) => {
     console.log('transport closed so consumer closed')
   })
 
-  consumerAudio.on('producerclose', () => {
-    console.log('===================1 consumerAudio producerclose');
-  });
-
-  consumerAudio.on("producerclose", () => {
-    console.log('====================2 consumerAudio producerclose');
-  })
-
   const audioTrack = consumerAudio.track
 
   audioTrack.applyConstraints({

public/index.js

@@ -497,40 +497,6 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
-  consumerVideo.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  consumerVideo.on('producerclose', () => {
-    console.log('===================1 consumerVideo producerclose');
-  });
-
-  consumerVideo.on("producerclose", () => {
-    console.log('====================2 consumerVideo producerclose');
-  })
-  consumerVideo.on("close", () => {
-    console.log('====================3 consumerVideo producerclose');
-  })
-  consumerVideo.on("close-producer", () => {
-    console.log('====================4 consumerVideo producerclose');
-  })
-
-
-
-  consumerVideo.observer.on('producerclose', () => {
-    console.log('===================11 consumerVideo producerclose');
-  });
-
-  consumerVideo.observer.on("producerclose", () => {
-    console.log('====================22 consumerVideo producerclose');
-  })
-  consumerVideo.observer.on("close", () => {
-    console.log('====================33 consumerVideo producerclose');
-  })
-  consumerVideo.observer.on("close-producer", () => {
-    console.log('====================44 consumerVideo producerclose');
-  })
-
   return consumerVideo.track
 }
 
@@ -546,14 +512,6 @@ const getAudioTrask = async (audioParams) => {
     console.log('transport closed so consumer closed')
   })
 
-  consumerAudio.on('producerclose', () => {
-    console.log('===================1 consumerAudio producerclose');
-  });
-
-  consumerAudio.on("producerclose", () => {
-    console.log('====================2 consumerAudio producerclose');
-  })
-
   const audioTrack = consumerAudio.track
 
   audioTrack.applyConstraints({