test

.dockerignore

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

Dockerfile

@@ -1,25 +1,11 @@
-FROM ubuntu:22.04
-
-WORKDIR /app
-
+FROM ubuntu
 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_18.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
 RUN apt-get install -y nodejs
+RUN npm install -g watchify
 
-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
+EXPOSE 3000
+EXPOSE 2000-2020
+EXPOSE 10000-10100

app.js

@@ -1,4 +1,4 @@
-require('dotenv').config();
+require('dotenv').config()
 
 const express = require('express');
 const app = express();
@@ -15,7 +15,7 @@ const mediasoup = require('mediasoup');
 
 let worker;
 /**
- *
+ * 
  * videoCalls - Dictionary of Object(s)
  * '<callId>': {
  *  router: Router,
@@ -31,13 +31,13 @@ let worker;
  *  initiatorSocket
  *  receiverSocket
  * }
- *
+ * 
  **/
 let videoCalls = {};
 let socketDetails = {};
 
 app.get('/', (_req, res) => {
-  res.send('Hello from mediasoup app!');
+  res.send('Hello from mediasoup app!')
 });
 
 app.use('/sfu', express.static(path.join(__dirname, 'public')));
@@ -52,7 +52,7 @@ const httpsServer = https.createServer(options, app);
 
 const io = new Server(httpsServer, {
   allowEIO3: true,
-  origins: ['*:*'],
+  origins: ["*:*"]
 });
 
 httpsServer.listen(process.env.PORT, () => {
@@ -66,19 +66,19 @@ const createWorker = async () => {
     worker = await mediasoup.createWorker({
       rtcMinPort: parseInt(process.env.RTC_MIN_PORT),
       rtcMaxPort: parseInt(process.env.RTC_MAX_PORT),
-    });
+    })
     console.log(`[createWorker] worker pid ${worker.pid}`);
-
-    worker.on('died', (error) => {
+  
+    worker.on('died', error => {
       // This implies something serious happened, so kill the application
       console.error('mediasoup worker has died', error);
       setTimeout(() => process.exit(1), 2000); // exit in 2 seconds
-    });
+    })
     return worker;
   } catch (error) {
-    console.error(`[createWorker] | ERROR | error: ${error.message}`);
+    console.log(`ERROR | createWorker | ${error.message}`);
   }
-};
+}
 
 // We create a Worker as soon as our application starts
 worker = createWorker();
@@ -87,53 +87,57 @@ worker = createWorker();
 // https://mediasoup.org/documentation/v3/mediasoup/rtp-parameters-and-capabilities/#RtpCodecCapability
 // list of media codecs supported by mediasoup ...
 // https://github.com/versatica/mediasoup/blob/v3/src/supportedRtpCapabilities.ts
-const mediaCodecs = [
+const mediaCodecs = 			[
   {
-    kind: 'audio',
-    mimeType: 'audio/opus',
-    clockRate: 48000,
-    channels: 2,
+    kind      : 'audio',
+    mimeType  : 'audio/opus',
+    clockRate : 48000,
+    channels  : 2
   },
   {
-    kind: 'video',
-    mimeType: 'video/VP8',
-    clockRate: 90000,
-    parameters: {
-      'x-google-start-bitrate': 1000,
+    kind       : 'video',
+    mimeType   : 'video/VP8',
+    clockRate  : 90000,
+    parameters :
+    {
+      'x-google-start-bitrate' : 1000
     },
-    channels: 2,
+    channels  : 2
   },
   {
-    kind: 'video',
-    mimeType: 'video/VP9',
-    clockRate: 90000,
-    parameters: {
-      'profile-id': 2,
-      'x-google-start-bitrate': 1000,
-    },
+    kind       : 'video',
+    mimeType   : 'video/VP9',
+    clockRate  : 90000,
+    parameters :
+    {
+      'profile-id'             : 2,
+      'x-google-start-bitrate' : 1000
+    }
   },
   {
-    kind: 'video',
-    mimeType: 'video/h264',
-    clockRate: 90000,
-    parameters: {
-      'packetization-mode': 1,
-      'profile-level-id': '4d0032',
-      'level-asymmetry-allowed': 1,
-      'x-google-start-bitrate': 1000,
-    },
+    kind       : 'video',
+    mimeType   : 'video/h264',
+    clockRate  : 90000,
+    parameters :
+    {
+      'packetization-mode'      : 1,
+      'profile-level-id'        : '4d0032',
+      'level-asymmetry-allowed' : 1,
+      'x-google-start-bitrate'  : 1000
+    }
   },
   {
-    kind: 'video',
-    mimeType: 'video/h264',
-    clockRate: 90000,
-    parameters: {
-      'packetization-mode': 1,
-      'profile-level-id': '42e01f',
-      'level-asymmetry-allowed': 1,
-      'x-google-start-bitrate': 1000,
-    },
-  },
+    kind       : 'video',
+    mimeType   : 'video/h264',
+    clockRate  : 90000,
+    parameters :
+    {
+      'packetization-mode'      : 1,
+      'profile-level-id'        : '42e01f',
+      'level-asymmetry-allowed' : 1,
+      'x-google-start-bitrate'  : 1000
+    }
+  }
 ];
 
 const closeCall = (callId) => {
@@ -148,23 +152,24 @@ const closeCall = (callId) => {
       videoCalls[callId]?.receiverProducerTransport?.close();
       videoCalls[callId]?.router?.close();
       delete videoCalls[callId];
-      console.log(`[closeCall] | callId: ${callId}`);
+    } else {
+      console.log(`The call with id ${callId} has already been deleted`);
     }
   } catch (error) {
-    console.error(`[closeCall] | ERROR | callId: ${callId} | error: ${error.message}`);
+    console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
   }
-};
+}
 
 /*
   - Handlers for WS events
   - These are created only when we have a connection with a peer
 */
-peers.on('connection', async (socket) => {
+peers.on('connection', async socket => {
   console.log('[connection] socketId:', socket.id);
 
   // After making the connection successfully, we send the client a 'connection-success' event
   socket.emit('connection-success', {
-    socketId: socket.id,
+    socketId: socket.id
   });
 
   // It is triggered when the peer is disconnected
@@ -188,21 +193,22 @@ 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] Generate Router ID: ${videoCalls[callId].router.id}`);
+          console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
           videoCalls[callId].receiverSocket = socket;
         } else {
           videoCalls[callId].initiatorSocket = socket;
         }
         socketDetails[socket.id] = callId;
         // rtpCapabilities is set for callback
-        callbackResponse = {
-          rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
+        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.error(`[createRoom] | ERROR | callId: ${callId} | error: ${error.message}`);
+      console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
     } finally {
       callback(callbackResponse);
     }
@@ -221,27 +227,23 @@ peers.on('connection', async (socket) => {
       const callId = socketDetails[socket.id];
       console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
       if (sender) {
-        if (!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
+        if(!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
           videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if (!videoCalls[callId].initiatorProducerTransport && isInitiator(callId, socket.id)) {
+        } else if(!videoCalls[callId].initiatorProducerTransport && isInitiator(callId, socket.id)) {
           videoCalls[callId].initiatorProducerTransport = await createWebRtcTransportLayer(callId, callback);
         } else {
           console.log(`producerTransport has already been defined | callId ${callId}`);
           callback(null);
         }
       } else if (!sender) {
-        if (!videoCalls[callId].receiverConsumerTransport && !isInitiator(callId, socket.id)) {
+        if(!videoCalls[callId].receiverConsumerTransport && !isInitiator(callId, socket.id)) {
           videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if (!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
+        } else if(!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
           videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback);
         }
       }
     } catch (error) {
-      console.error(
-        `[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${
-          error.message
-        }`
-      );
+      console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`);
       callback(error);
     }
   });
@@ -257,11 +259,20 @@ peers.on('connection', async (socket) => {
 
       console.log(`[transport-connect] socket ${socket.id} | callId ${callId}`);
 
-      isInitiator(callId, socket.id)
-        ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
-        : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
+      if (!isInitiator(callId, socket.id)) {
+        await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
+        videoCalls[callId].initiatorSocket.emit('new-producer', {
+          callId
+        });
+      } else {
+        await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters });
+        videoCalls[callId].receiverSocket.emit('new-producer', {
+          callId
+        });
+      }
+
     } catch (error) {
-      console.error(`[transport-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 
@@ -274,9 +285,9 @@ peers.on('connection', async (socket) => {
     try {
       const callId = socketDetails[socket.id];
       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
-
-      console.log(`[transport-produce] callId: ${callId} | kind: ${kind} | socket: ${socket.id}`);
-
+      
+      console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
+      
       if (kind === 'video') {
         if (!isInitiator(callId, socket.id)) {
           videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
@@ -284,31 +295,35 @@ 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', () => {
-            console.log('transport for this producer closed', callId);
+            const callId = socketDetails[socket.id];
+            console.log('transport for this producer closed', callId)
             closeCall(callId);
           });
 
           // Send back to the client the Producer's id
-          callback &&
-            callback({
-              id: videoCalls[callId].receiverVideoProducer.id,
-            });
+          callback && callback({
+            id: videoCalls[callId].receiverVideoProducer.id
+          });
         } else {
           videoCalls[callId].initiatorVideoProducer = await videoCalls[callId].initiatorProducerTransport.produce({
             kind,
             rtpParameters,
           });
 
+          console.log(`[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`);
+
           videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
-            console.log('transport for this producer closed', callId);
+            const callId = socketDetails[socket.id];
+            console.log('transport for this producer closed', callId)
             closeCall(callId);
           });
 
-          callback &&
-            callback({
-              id: videoCalls[callId].initiatorVideoProducer.id,
-            });
+          callback && callback({
+            id: videoCalls[callId].initiatorVideoProducer.id
+          });
         }
       } else if (kind === 'audio') {
         if (!isInitiator(callId, socket.id)) {
@@ -317,44 +332,40 @@ 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', () => {
-            console.log('transport for this producer closed', callId);
+            const callId = socketDetails[socket.id];
+            console.log('transport for this producer closed', callId)
             closeCall(callId);
           });
 
           // Send back to the client the Producer's id
-          callback &&
-            callback({
-              id: videoCalls[callId].receiverAudioProducer.id,
-            });
+          callback && callback({
+            id: videoCalls[callId].receiverAudioProducer.id
+          });
         } else {
           videoCalls[callId].initiatorAudioProducer = await videoCalls[callId].initiatorProducerTransport.produce({
             kind,
             rtpParameters,
           });
 
+          console.log(`[transport-produce] initiatorAudioProducer Producer ID: ${videoCalls[callId].initiatorAudioProducer.id} | kind: ${videoCalls[callId].initiatorAudioProducer.kind}`);
+      
           videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
-            console.log('transport for this producer closed', callId);
+            const callId = socketDetails[socket.id];
+            console.log('transport for this producer closed', callId)
             closeCall(callId);
           });
 
           // Send back to the client the Producer's id
-          callback &&
-            callback({
-              id: videoCalls[callId].initiatorAudioProducer.id,
-            });
+          callback && callback({
+            id: videoCalls[callId].initiatorAudioProducer.id
+          });
         }
       }
-
-      const socketToEmit = isInitiator(callId, socket.id)
-        ? videoCalls[callId].receiverSocket
-        : videoCalls[callId].initiatorSocket;
-
-      // callId - Id of the call
-      // kind - producer type: audio/video
-      socketToEmit?.emit('new-producer', { callId, kind });
     } catch (error) {
-      console.error(`[transport-produce] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 
@@ -368,15 +379,15 @@ peers.on('connection', async (socket) => {
       console.log(`[transport-recv-connect] socket ${socket.id} | callId ${callId}`);
       if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
       // await videoCalls[callId].consumerTransport.connect({ dtlsParameters });
-      if (!isInitiator(callId, socket.id)) {
+      if(!isInitiator(callId, socket.id)) {
         await videoCalls[callId].receiverConsumerTransport.connect({ dtlsParameters });
-      } else if (isInitiator(callId, socket.id)) {
+      } else if(isInitiator(callId, socket.id)) {
         await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
       }
     } catch (error) {
-      console.error(`[transport-recv-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
-  });
+  })
 
   /*
     - The customer consumes after successfully connecting to consumerTransport
@@ -386,17 +397,57 @@ peers.on('connection', async (socket) => {
       - The consumer does consumerTransport.consume(params)
   */
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
-    const callId = socketDetails[socket.id];
-    const socketId = socket.id;
+    try {
+      const callId = socketDetails[socket.id];
+      console.log(`[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);
 
-    if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
+      console.log('[consume] callId', callId);
+      let canConsumeVideo, canConsumeAudio;
+      if (isInitiator(callId, socket.id)) {
+        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
+        });
 
-    callback({
-      videoParams: await consumeVideo({ callId, socketId, rtpCapabilities }),
-      audioParams: await consumeAudio({ callId, socketId, 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 } });
+    }
   });
 
   /*
@@ -404,138 +455,139 @@ peers.on('connection', async (socket) => {
     - When consuming on consumerTransport, it is initially done with paused: true, here we will resume
     - For the initiator we resume the initiatorConsumerAUDIO/VIDEO and for receiver the receiverConsumerAUDIO/VIDEO
   */
-  socket.on('consumer-resume', () => {
+  socket.on('consumer-resume',() => {
     try {
       const callId = socketDetails[socket.id];
-      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 {
+      console.log(`[consumer-resume] callId ${callId}`)
       if (isInitiator(callId, socket.id)) {
-        console.log(`[close-producer] initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
+        videoCalls[callId]?.initiatorConsumerVideo?.resume();
+        videoCalls[callId]?.initiatorConsumerAudio?.resume();
       } else {
-        console.log(`[close-producer] receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
+        videoCalls[callId]?.receiverConsumerVideo?.resume();
+        videoCalls[callId]?.receiverConsumerAudio?.resume();
       }
     } catch (error) {
-      console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+      console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
   });
 });
 
-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;
+const consumeVideo = async (callId, socketId, rtpCapabilities) => {
 
+  if(isInitiator(callId, socketId)) {
     videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
-      producerId,
+      producerId: videoCalls[callId].receiverVideoProducer.id,
       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,
+      producerId: videoCalls[callId].receiverVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
-    };
-  } else if (videoCalls[callId].initiatorVideoProducer) {
-    const producerId = videoCalls[callId].initiatorVideoProducer.id;
-    if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
-
+    }
+  } else {
     videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
-      producerId,
+      producerId: videoCalls[callId].initiatorVideoProducer.id,
       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,
+      producerId: videoCalls[callId].initiatorVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
-    };
-  } else {
-    return null;
-  }
-};
-
-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,
-        rtpCapabilities,
-        paused: true,
-      });
-
-      return {
-        id: videoCalls[callId].initiatorConsumerAudio.id,
-        producerId,
-        kind: 'audio',
-        rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
-      };
-    } 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,
-        rtpCapabilities,
-        paused: true,
-      });
-
-      return {
-        id: videoCalls[callId].receiverConsumerAudio.id,
-        producerId,
-        kind: 'audio',
-        rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
-      };
-    } else {
-      return null;
     }
-  } catch (error) {
-    console.error(`[consumeAudio] | ERROR | error: ${error}`);
   }
-};
+}
+
+const consumeAudio = async (callId, socketId, rtpCapabilities) => {
+  if(isInitiator(callId, socketId)) {
+    videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
+      producerId: videoCalls[callId].receiverAudioProducer.id,
+      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,
+      kind: 'audio',
+      rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
+    }
+  } else {
+    videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
+      producerId: videoCalls[callId].initiatorAudioProducer.id,
+      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,
+      kind: 'audio',
+      rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
+    }
+  }
+}
 
 const isInitiator = (callId, socketId) => {
-  return videoCalls[callId]?.initiatorSocket?.id === socketId;
-};
+  return (videoCalls[callId]?.initiatorSocket?.id === socketId);
+}
 
 /*
   - Called from at event 'createWebRtcTransport' and assigned to the consumer or producer transport
@@ -546,25 +598,25 @@ 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: [
         {
           ip: process.env.IP, // Listening IPv4 or IPv6.
           announcedIp: process.env.ANNOUNCED_IP, // Announced IPv4 or IPv6 (useful when running mediasoup behind NAT with private IP).
-        },
+        }
       ],
       enableUdp: true,
       enableTcp: true,
       preferUdp: true,
     };
-
+    
     // https://mediasoup.org/documentation/v3/mediasoup/api/#router-createWebRtcTransport
-    let transport = await videoCalls[callId].router.createWebRtcTransport(webRtcTransport_options);
+    let transport = await videoCalls[callId].router.createWebRtcTransport(webRtcTransport_options)
 
     // Handler for when DTLS(Datagram Transport Layer Security) changes
-    transport.on('dtlsstatechange', (dtlsState) => {
+    transport.on('dtlsstatechange', dtlsState => {
       console.log(`transport | dtlsstatechange | calldId ${callId} | dtlsState ${dtlsState}`);
       if (dtlsState === 'closed') {
         transport.close();
@@ -583,15 +635,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.error(
-      `[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`
-    );
+    console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
     callback({ params: { error } });
   }
-};
+}

build.sh

@@ -1,40 +1,4 @@
 #/!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
@@ -56,19 +20,32 @@ fi
 ## 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/
+#cp -r {.env,app.js,package.json,server,public} 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"
-
-# Get Git version control
-getGitVersion $1
-
-# Add version control for pm2
+#Add version control for pm2
 cd dist
-addVersionPm2
+#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
 

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,18 +20453,9 @@ setTimeout(() => {
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
 
-    socket.on('new-producer', ({ callId, kind }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to 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()
+    socket.on('new-producer', ({ callId }) => {
+      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      consume()
     })
   }
   
@@ -20744,8 +20735,6 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
-
-  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -20785,8 +20774,7 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    // We call it in new-rpoducer, we don't need it here anymore
-    // connectRecvTransport()
+    connectRecvTransport()
   })
 }
 
@@ -20842,7 +20830,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
+      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -20855,6 +20843,10 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
+  consumerVideo.on('transportclose', () => {
+    console.log('transport closed so consumer closed')
+  })
+
   return consumerVideo.track
 }
 
@@ -20915,31 +20907,31 @@ const closeCall = () => {
   resetCallSettings()
 }
 
-// const consume = async (kind) => {
-//   console.log(`[consume] kind: ${kind}`)
-//   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)
-//       }
-//     })
+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()
-//   })
-// }
+    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,18 +95,9 @@ setTimeout(() => {
       if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
     })
 
-    socket.on('new-producer', ({ callId, kind }) => {
-      console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to 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()
+    socket.on('new-producer', ({ callId }) => {
+      console.log(`🟢 new-producer | callId: ${callId} | Ready to consume`);
+      consume()
     })
   }
   
@@ -386,8 +377,6 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
-
-  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -427,8 +416,7 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    // We call it in new-rpoducer, we don't need it here anymore
-    // connectRecvTransport()
+    connectRecvTransport()
   })
 }
 
@@ -484,7 +472,7 @@ const connectRecvTransport = async () => {
       console.log('remoteVideo PLAY')
     })
     .catch((error) => {
-      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
+      displayError(`remoteVideo PLAY ERROR | ${error.message}`)
     })
   })
 }
@@ -497,6 +485,10 @@ const getVideoTrask = async (videoParams) => {
     rtpParameters: videoParams.rtpParameters
   }) 
 
+  consumerVideo.on('transportclose', () => {
+    console.log('transport closed so consumer closed')
+  })
+
   return consumerVideo.track
 }
 
@@ -557,30 +549,30 @@ const closeCall = () => {
   resetCallSettings()
 }
 
-// const consume = async (kind) => {
-//   console.log(`[consume] kind: ${kind}`)
-//   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)
-//       }
-//     })
+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()
-//   })
-// }
+    connectRecvTransport()
+  })
+}
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-// btnRecvSendTransport.addEventListener('click', consume)
+btnRecvSendTransport.addEventListener('click', consume)
 btnCloseCall.addEventListener('click', closeCall)