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

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')));
@@ -76,7 +76,7 @@ const createWorker = async () => {
     });
     return worker;
   } catch (error) {
-    console.log(`ERROR | createWorker | ${error.message}`);
+    console.error(`[createWorker] | ERROR | error: ${error.message}`);
   }
 };
 
@@ -148,11 +148,10 @@ const closeCall = (callId) => {
       videoCalls[callId]?.receiverProducerTransport?.close();
       videoCalls[callId]?.router?.close();
       delete videoCalls[callId];
-    } else {
+      console.log(`[closeCall] | callId: ${callId}`);
-      console.log(`The call with id ${callId} has already been deleted`);
     }
   } catch (error) {
-    console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
+    console.error(`[closeCall] | ERROR | callId: ${callId} | error: ${error.message}`);
   }
 };
 
@@ -189,22 +188,21 @@ peers.on('connection', async (socket) => {
         console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
         if (!videoCalls[callId]) {
           videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
-          console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
+          console.log(`[createRoom] Generate Router ID: ${videoCalls[callId].router.id}`);
           videoCalls[callId].receiverSocket = socket;
         } else {
           videoCalls[callId].initiatorSocket = socket;
         }
         socketDetails[socket.id] = callId;
         // rtpCapabilities is set for callback
-        console.log('[getRtpCapabilities] callId', callId);
         callbackResponse = {
           rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
         };
       } else {
-        console.log(`[createRoom] missing callId ${callId}`);
+        console.log(`[createRoom] missing callId: ${callId}`);
       }
     } catch (error) {
-      console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
+      console.error(`[createRoom] | ERROR | callId: ${callId} | error: ${error.message}`);
     } finally {
       callback(callbackResponse);
     }
@@ -239,8 +237,10 @@ peers.on('connection', async (socket) => {
         }
       }
     } catch (error) {
-      console.log(
+      console.error(
-        `ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`
+        `[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${
+          error.message
+        }`
       );
       callback(error);
     }
@@ -260,9 +260,8 @@ peers.on('connection', async (socket) => {
       isInitiator(callId, socket.id)
         ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
         : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
-
     } catch (error) {
-      console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
+      console.error(`[transport-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
 
@@ -276,7 +275,7 @@ peers.on('connection', async (socket) => {
       const callId = socketDetails[socket.id];
       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
 
-      console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
+      console.log(`[transport-produce] callId: ${callId} | kind: ${kind} | socket: ${socket.id}`);
 
       if (kind === 'video') {
         if (!isInitiator(callId, socket.id)) {
@@ -285,12 +284,7 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`
-          );
-
           videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
@@ -306,12 +300,7 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`
-          );
-
           videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
@@ -328,12 +317,7 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`
-          );
-
           videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
@@ -349,12 +333,7 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] initiatorAudioProducer Producer ID: ${videoCalls[callId].initiatorAudioProducer.id} | kind: ${videoCalls[callId].initiatorAudioProducer.kind}`
-          );
-
           videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
-            const callId = socketDetails[socket.id];
             console.log('transport for this producer closed', callId);
             closeCall(callId);
           });
@@ -370,10 +349,12 @@ peers.on('connection', async (socket) => {
       const socketToEmit = isInitiator(callId, socket.id)
         ? videoCalls[callId].receiverSocket
         : videoCalls[callId].initiatorSocket;
-      socketToEmit.emit('new-producer', { callId });
 
+      // callId - Id of the call
+      // kind - producer type: audio/video
+      socketToEmit?.emit('new-producer', { callId, kind });
     } catch (error) {
-      console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
+      console.error(`[transport-produce] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
 
@@ -393,7 +374,7 @@ peers.on('connection', async (socket) => {
         await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
       }
     } catch (error) {
-      console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
+      console.error(`[transport-recv-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
 
@@ -405,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];
-      console.log(
+    const socketId = socket.id;
-        `[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`
+
-      );
+    console.log(`[consume] socket ${socketId} | callId: ${callId}`);
 
     if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
 
-      console.log('[consume] callId', callId);
+    callback({
-      let canConsumeVideo, canConsumeAudio;
+      videoParams: await consumeVideo({ callId, socketId, rtpCapabilities }),
-      if (isInitiator(callId, socket.id)) {
+      audioParams: await consumeAudio({ callId, socketId, rtpCapabilities }),
-        canConsumeVideo =
-          !!videoCalls[callId].receiverVideoProducer &&
-          !!videoCalls[callId].router.canConsume({
-            producerId: videoCalls[callId].receiverVideoProducer.id,
-            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,
-          });
-      }
-      console.log('[consume] canConsumeVideo', canConsumeVideo);
-      console.log('[consume] 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.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`);
-      callback({ params: { error } });
-    }
   });
 
   /*
@@ -475,129 +407,129 @@ peers.on('connection', async (socket) => {
   socket.on('consumer-resume', () => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[consumer-resume] callId ${callId}`);
+      const isInitiatorValue = isInitiator(callId, socket.id);
+      console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
+
+      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
+        }`
+      );
+    }
+  });
+
+  socket.on('close-producer', ({ callId, kind }) => {
+    try {
       if (isInitiator(callId, socket.id)) {
-        videoCalls[callId]?.initiatorConsumerVideo?.resume();
+        console.log(`[close-producer] initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId]?.initiatorConsumerAudio?.resume();
+        videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
       } else {
-        videoCalls[callId]?.receiverConsumerVideo?.resume();
+        console.log(`[close-producer] receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId]?.receiverConsumerAudio?.resume();
+        videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
       }
     } catch (error) {
-      console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
+      console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
 });
 
-const consumeVideo = async (callId, socketId, rtpCapabilities) => {
+const canConsume = ({ callId, producerId, rtpCapabilities }) => {
-  if (isInitiator(callId, socketId)) {
+  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,
     });
 
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-    videoCalls[callId].initiatorConsumerVideo.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
-    videoCalls[callId].initiatorConsumerVideo.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
     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,
     });
 
-    videoCalls[callId].receiverConsumerVideo.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    videoCalls[callId].receiverConsumerVideo.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
     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) => {
+const consumeAudio = async ({ callId, socketId, rtpCapabilities }) => {
-  if (isInitiator(callId, socketId)) {
+  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,
       });
 
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
-    videoCalls[callId].initiatorConsumerAudio.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
-    videoCalls[callId].initiatorConsumerAudio.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
       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,
       });
 
-    videoCalls[callId].receiverConsumerAudio.on('transportclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('transport close from consumer', callId);
-      closeCall(callId);
-    });
-
-    videoCalls[callId].receiverConsumerAudio.on('producerclose', () => {
-      const callId = socketDetails[socket.id];
-      console.log('producer of consumer closed', callId);
-      closeCall(callId);
-    });
-
       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}`);
   }
 };
 
@@ -614,7 +546,7 @@ const isInitiator = (callId, socketId) => {
 */
 const createWebRtcTransportLayer = async (callId, callback) => {
   try {
-    console.log('[createWebRtcTransportLayer] callId', callId);
+    console.log(`[createWebRtcTransportLayer] callId: ${callId}`);
     // https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
     const webRtcTransport_options = {
       listenIps: [
@@ -651,14 +583,15 @@ const createWebRtcTransportLayer = async (callId, callback) => {
       dtlsParameters: transport.dtlsParameters,
     };
 
-    console.log('[createWebRtcTransportLayer] callback params', params);
     // Send back to the client the params
     callback({ params });
 
     // Set transport to producerTransport or consumerTransport
     return transport;
   } catch (error) {
-    console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${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/
-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)