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
+COPY . /app/
-EXPOSE 2000-2020
+
-EXPOSE 10000-10100
+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

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/
-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)
+# Generate Git log
-if (( $count > 1 )); then
+dateString=$(date +"%Y%m%d-%H%M%S")
-        version=${version%%-*}
+git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git-$dateString.log"
-else
+
-        version="${version%%-*}.0"
+# Get Git version control
-fi
+getGitVersion $1
-if [ -f "$file_pkg" ] && [ ! -z "$version" ]; then
+
-  version="  \"version\": \"$version\","
+# Add version control for pm2
-  sed -i "s|^.*$key.*|${version//\//\\/}|g" $file_pkg
+cd dist
-  text=$(cat $file_pkg | grep -c "$version")
+addVersionPm2
-  if [ $text -eq 0 ]; then
-          echo "Version couldn't be set"
-  else
-          echo "Version $version successfully applied to App"
-  fi
-fi
 
 ## POST BUILD
 

public/bundle.js

@@ -20353,7 +20353,7 @@ module.exports = yeast;
 },{}],94:[function(require,module,exports){
 module.exports = {
   hubAddress: 'https://hub.dev.linx.safemobile.com/',
-  mediasoupAddress: 'https://testing.video.safemobile.org',
+  mediasoupAddress: 'https://testing.video.safemobile.org/',
 }
 },{}],95:[function(require,module,exports){
 const io = require('socket.io-client')
@@ -20453,9 +20453,18 @@ setTimeout(() => {
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
 
-    socket.on('new-producer', ({ callId }) => {
+    socket.on('new-producer', ({ callId, kind }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
-      consume()
+      connectRecvTransport();
+    })
+
+    socket.on('close-producer', ({ callId, kind }) => {
+      console.log(`🔴 close-producer | callId: ${callId} | kind: ${kind}`);
+      if (kind === 'video') {
+        consumerVideo.close()
+        remoteVideo.srcObject = null
+      }
+      else if (kind === 'audio') consumerAudio.close()
     })
   }
   
@@ -20735,6 +20744,8 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
+
+  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -20774,7 +20785,8 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    connectRecvTransport()
+    // We call it in new-rpoducer, we don't need it here anymore
+    // connectRecvTransport()
   })
 }
 
@@ -20830,7 +20842,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
+      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -20843,10 +20855,6 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
-  consumerVideo.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
   return consumerVideo.track
 }
 
@@ -20907,31 +20915,31 @@ const closeCall = () => {
   resetCallSettings()
 }
 
-const consume = async () => {
+// const consume = async (kind) => {
-  console.log('[consume]')
+//   console.log(`[consume] kind: ${kind}`)
-  console.log('createRecvTransport Consumer')
+//   console.log('createRecvTransport Consumer')
-  await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
+//   await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
-    if (params.error) {
+//     if (params.error) {
-      console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
+//       console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
-      return
+//       return
-    }
+//     }
-    consumerTransport = device.createRecvTransport(params)
+//     consumerTransport = device.createRecvTransport(params)
-    consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
+//     consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
-      try {
+//       try {
-        await socket.emit('transport-recv-connect', {
+//         await socket.emit('transport-recv-connect', {
-          dtlsParameters,
+//           dtlsParameters,
-        })
+//         })
-        callback()
+//         callback()
-      } catch (error) {
+//       } catch (error) {
-        errback(error)
+//         errback(error)
-      }
+//       }
-    })
+//     })
     
-    connectRecvTransport()
+//     connectRecvTransport()
-  })
+//   })
-}
+// }
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-btnRecvSendTransport.addEventListener('click', consume)
+// btnRecvSendTransport.addEventListener('click', consume)
 btnCloseCall.addEventListener('click', closeCall)
 },{"./config":94,"mediasoup-client":66,"socket.io-client":82}]},{},[95]);

public/config.js

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

public/index.html

@@ -75,7 +75,7 @@
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <button id="btnRecvSendTransport">Consume</button>
+                                <!-- <button id="btnRecvSendTransport">Consume</button> -->
                                 <button id="remoteSoundControl">Unmute</button>
                             </div>
                         </td>

public/index.js

@@ -95,9 +95,18 @@ setTimeout(() => {
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
 
-    socket.on('new-producer', ({ callId }) => {
+    socket.on('new-producer', ({ callId, kind }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
-      consume()
+      connectRecvTransport();
+    })
+
+    socket.on('close-producer', ({ callId, kind }) => {
+      console.log(`🔴 close-producer | callId: ${callId} | kind: ${kind}`);
+      if (kind === 'video') {
+        consumerVideo.close()
+        remoteVideo.srcObject = null
+      }
+      else if (kind === 'audio') consumerAudio.close()
     })
   }
   
@@ -377,6 +386,8 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
+
+  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -416,7 +427,8 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    connectRecvTransport()
+    // We call it in new-rpoducer, we don't need it here anymore
+    // connectRecvTransport()
   })
 }
 
@@ -472,7 +484,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
+      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -485,10 +497,6 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
-  consumerVideo.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
   return consumerVideo.track
 }
 
@@ -549,30 +557,30 @@ const closeCall = () => {
   resetCallSettings()
 }
 
-const consume = async () => {
+// const consume = async (kind) => {
-  console.log('[consume]')
+//   console.log(`[consume] kind: ${kind}`)
-  console.log('createRecvTransport Consumer')
+//   console.log('createRecvTransport Consumer')
-  await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
+//   await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
-    if (params.error) {
+//     if (params.error) {
-      console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
+//       console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
-      return
+//       return
-    }
+//     }
-    consumerTransport = device.createRecvTransport(params)
+//     consumerTransport = device.createRecvTransport(params)
-    consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
+//     consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
-      try {
+//       try {
-        await socket.emit('transport-recv-connect', {
+//         await socket.emit('transport-recv-connect', {
-          dtlsParameters,
+//           dtlsParameters,
-        })
+//         })
-        callback()
+//         callback()
-      } catch (error) {
+//       } catch (error) {
-        errback(error)
+//         errback(error)
-      }
+//       }
-    })
+//     })
     
-    connectRecvTransport()
+//     connectRecvTransport()
-  })
+//   })
-}
+// }
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-btnRecvSendTransport.addEventListener('click', consume)
+// btnRecvSendTransport.addEventListener('click', consume)
 btnCloseCall.addEventListener('click', closeCall)