Update

app.js

@@ -1,4 +1,4 @@
-require('dotenv').config();
+require('dotenv').config()
 
 const express = require('express');
 const app = express();
@@ -13,46 +13,46 @@ try {
 }
 const mediasoup = require('mediasoup');
 
-let worker;
+let worker
 /**
  * 
  * videoCalls - Dictionary of Object(s)
  * '<callId>': {
- *  router: Router,
+ *  router: Router,                                            router
  *  initiatorAudioProducer: Producer,
  *  initiatorVideoProducer: Producer,
- *  receiverVideoProducer: Producer,
- *  receiverAudioProducer: Producer,
+ *  receiverVideoProducer: Producer,                           producerVideo
+ *  receiverAudioProducer: Producer,                           producerAudio
  *  initiatorProducerTransport: Producer Transport,
- *  receiverProducerTransport: Producer Transport,
- *  initiatorConsumerVideo: Consumer,
- *  initiatorConsumerAudio: Consumer,
- *  initiatorConsumerTransport: Consumer Transport
- *  initiatorSocket
- *  receiverSocket
+ *  receiverProducerTransport: Producer Transport,             producerTransport
+ *  initiatorConsumerVideo: Consumer,                          consumerVideo
+ *  initiatorConsumerAudio: Consumer,                          consumerAudio
+ *  initiatorConsumerTransport: Consumer Transport             consumerTransport
+ *  initiatorSockerId
+ *  receiverSocketId
  * }
  * 
  **/
-let videoCalls = {};
-let socketDetails = {};
+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')));
+app.use('/sfu', express.static(path.join(__dirname, 'public')))
 
 // SSL cert for HTTPS access
 const options = {
   key: fs.readFileSync(process.env.SERVER_KEY, 'utf-8'),
   cert: fs.readFileSync(process.env.SERVER_CERT, 'utf-8'),
-};
+}
 
 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.log(`ERROR | createWorker | ${error.message}`);
   }
-};
+}
 
 // We create a Worker as soon as our application starts
 worker = createWorker();
@@ -92,48 +92,52 @@ const mediaCodecs = [
     kind      : 'audio',
     mimeType  : 'audio/opus',
     clockRate : 48000,
-    channels: 2,
+    channels  : 2
   },
   {
     kind       : 'video',
     mimeType   : 'video/VP8',
     clockRate  : 90000,
-    parameters: {
-      'x-google-start-bitrate': 1000,
+    parameters :
+    {
+      'x-google-start-bitrate' : 1000
     },
-    channels: 2,
+    channels  : 2
   },
   {
     kind       : 'video',
     mimeType   : 'video/VP9',
     clockRate  : 90000,
-    parameters: {
+    parameters :
+    {
       'profile-id'             : 2,
-      'x-google-start-bitrate': 1000,
-    },
+      'x-google-start-bitrate' : 1000
+    }
   },
   {
     kind       : 'video',
     mimeType   : 'video/h264',
     clockRate  : 90000,
-    parameters: {
+    parameters :
+    {
       'packetization-mode'      : 1,
       'profile-level-id'        : '4d0032',
       'level-asymmetry-allowed' : 1,
-      'x-google-start-bitrate': 1000,
-    },
+      'x-google-start-bitrate'  : 1000
+    }
   },
   {
     kind       : 'video',
     mimeType   : 'video/h264',
     clockRate  : 90000,
-    parameters: {
+    parameters :
+    {
       'packetization-mode'      : 1,
       'profile-level-id'        : '42e01f',
       'level-asymmetry-allowed' : 1,
-      'x-google-start-bitrate': 1000,
-    },
-  },
+      'x-google-start-bitrate'  : 1000
+    }
+  }
 ];
 
 const closeCall = (callId) => {
@@ -154,18 +158,18 @@ const closeCall = (callId) => {
   } catch (error) {
     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,17 +192,18 @@ peers.on('connection', async (socket) => {
       if (callId) {
         console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
         if (!videoCalls[callId]) {
-          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
+          console.log('[createRoom] callId', callId);
+          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) }
           console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
-          videoCalls[callId].receiverSocket = socket;
+          videoCalls[callId].receiverSocketId = socket.id
         } else {
-          videoCalls[callId].initiatorSocket = socket;
+          videoCalls[callId].initiatorSockerId = socket.id
         }
         socketDetails[socket.id] = callId;
         // rtpCapabilities is set for callback
         console.log('[getRtpCapabilities] callId', callId);
         callbackResponse = { 
-          rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
+          rtpCapabilities :videoCalls[callId].router.rtpCapabilities
         };
       } else {
         console.log(`[createRoom] missing callId ${callId}`);
@@ -220,6 +225,7 @@ peers.on('connection', async (socket) => {
   */
   socket.on('createWebRtcTransport', async ({ sender }, callback) => {
     try {
+      console.log('🟥', socket.id, JSON.stringify(sender));
       const callId = socketDetails[socket.id];
       console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
       if (sender) {
@@ -239,9 +245,7 @@ peers.on('connection', async (socket) => {
         }
       }
     } catch (error) {
-      console.log(
-        `ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`
-      );
+      console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`);
       callback(error);
     }
   });
@@ -256,10 +260,11 @@ peers.on('connection', async (socket) => {
       if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
 
       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 });
+      } else {
+        await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters });
+      }
     } catch (error) {
       console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -276,7 +281,6 @@ peers.on('connection', async (socket) => {
       if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
       
       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,20 +288,17 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`
-          );
+          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);
+            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({
@@ -305,19 +306,16 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`
-          );
+          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);
+            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') {
@@ -327,20 +325,17 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`
-          );
+          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);
+            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({
@@ -348,29 +343,20 @@ peers.on('connection', async (socket) => {
             rtpParameters,
           });
 
-          console.log(
-            `[transport-produce] initiatorAudioProducer Producer ID: ${videoCalls[callId].initiatorAudioProducer.id} | kind: ${videoCalls[callId].initiatorAudioProducer.kind}`
-          );
+          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);
+            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;
-
-      socketToEmit.emit('new-producer', { callId, kind });
     } catch (error) {
       console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -384,7 +370,6 @@ peers.on('connection', async (socket) => {
     try {
       const callId = socketDetails[socket.id];
       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)) {
         await videoCalls[callId].receiverConsumerTransport.connect({ dtlsParameters });
@@ -394,7 +379,7 @@ peers.on('connection', async (socket) => {
     } catch (error) {
       console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
-  });
+  })
 
   /*
     - The customer consumes after successfully connecting to consumerTransport
@@ -406,62 +391,52 @@ peers.on('connection', async (socket) => {
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(
-        `[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`
-      );
-
-      if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
+      console.log(`[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`);
 
       console.log('[consume] callId', callId);
       let canConsumeVideo, canConsumeAudio;
       if (isInitiator(callId, socket.id)) {
-        canConsumeVideo =
-          !!videoCalls[callId].receiverVideoProducer &&
-          !!videoCalls[callId].router.canConsume({
+        canConsumeVideo = !!videoCalls[callId].receiverVideoProducer && !!videoCalls[callId].router.canConsume({
           producerId: videoCalls[callId].receiverVideoProducer.id,
-            rtpCapabilities,
+          rtpCapabilities
         });
-        canConsumeAudio =
-          !!videoCalls[callId].receiverAudioProducer &&
-          !!videoCalls[callId].router.canConsume({
+        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,
+          rtpCapabilities
         });
 
-        canConsumeAudio =
-          !!videoCalls[callId].initiatorAudioProducer &&
-          !!videoCalls[callId].router.canConsume({
+      } 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,
+          rtpCapabilities
         });
       }
       console.log('[consume] canConsumeVideo', canConsumeVideo);
       console.log('[consume] canConsumeAudio', canConsumeAudio);
 
       if (canConsumeVideo && !canConsumeAudio) {
-        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
+        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);
+        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 audioParams = await consumeAudio(callId, socket.id, rtpCapabilities)
         const data = { videoParams: null, audioParams };
+        console.log('-----------======= data', data);
         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}`);
+      console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`)
       callback({ params: { error } });
     }
   });
@@ -469,19 +444,23 @@ peers.on('connection', async (socket) => {
   /*
     - Event sent by the consumer after consuming to resume the pause
     - 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', async () => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[consumer-resume] callId ${callId}`);
+      console.log(`[consumer-resume] callId ${callId}`)
+
       if (isInitiator(callId, socket.id)) {
-        videoCalls[callId]?.initiatorConsumerVideo?.resume();
-        videoCalls[callId]?.initiatorConsumerAudio?.resume();
+        console.log(`[consumer-resume] isInitiator true`);
+        await videoCalls[callId].initiatorConsumerVideo.resume();
+        await videoCalls[callId].initiatorConsumerAudio.resume();
       } else {
-        videoCalls[callId]?.receiverConsumerVideo?.resume();
-        videoCalls[callId]?.receiverConsumerAudio?.resume();
+        console.log(`[consumer-resume] isInitiator false`);
+        (videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerVideo.resume();
+        (videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerAudio.resume();
       }
+      // await videoCalls[callId].consumerVideo.resume();
+      // await videoCalls[callId].consumerAudio.resume();
     } catch (error) {
       console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
     }
@@ -489,6 +468,7 @@ peers.on('connection', async (socket) => {
 });
 
 const consumeVideo = async (callId, socketId, rtpCapabilities) => {
+
   if(isInitiator(callId, socketId)) {
     videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
       producerId: videoCalls[callId].receiverVideoProducer.id,
@@ -515,7 +495,7 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
       producerId: videoCalls[callId].receiverVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
-    };
+    }
   } else {
     videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
       producerId: videoCalls[callId].initiatorVideoProducer.id,
@@ -540,9 +520,9 @@ const consumeVideo = async (callId, socketId, rtpCapabilities) => {
       producerId: videoCalls[callId].initiatorVideoProducer.id,
       kind: 'video',
       rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
-    };
     }
-};
+  }
+}
 
 const consumeAudio = async (callId, socketId, rtpCapabilities) => {
   if(isInitiator(callId, socketId)) {
@@ -571,7 +551,7 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
       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,
@@ -596,13 +576,13 @@ const consumeAudio = async (callId, socketId, rtpCapabilities) => {
       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].initiatorSockerId === socketId);
+}
 
 /*
   - Called from at event 'createWebRtcTransport' and assigned to the consumer or producer transport
@@ -620,7 +600,7 @@ const createWebRtcTransportLayer = async (callId, callback) => {
         {
           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,
@@ -628,10 +608,11 @@ const createWebRtcTransportLayer = async (callId, callback) => {
     };
     
     // 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)
+    console.log(`callId: ${callId} | transport id: ${transport.id}`)
 
     // 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();
@@ -656,8 +637,9 @@ const createWebRtcTransportLayer = async (callId, callback) => {
 
     // Set transport to producerTransport or consumerTransport
     return transport;
+
   } catch (error) {
     console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
     callback({ params: { error } });
   }
-};
+}

build.sh

@@ -9,21 +9,14 @@ else
   ## CLEANUP
   rm -fr dist/*
 fi
-
-if [ -d "node_modules" ]; then
-  rm -fr node_modules
-fi
-
 # Install dependencies
 #npm install
 
 ## PROJECT NEEDS
 echo "Building app... from $(git rev-parse --abbrev-ref HEAD)"
 #npm run-script build
-cp -r {.env,app.js,package.json,server,public,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"
+cp -r {.env,app.js,package.json,server,public} dist/
+
 #Add version control for pm2
 cd dist
 #Add version control for pm2

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')
@@ -20449,14 +20449,10 @@ setTimeout(() => {
       console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
       if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
         goConnect()
+        // document.getElementById('btnRecvSendTransport').click();
       }
       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();
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -20735,8 +20731,6 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
-
-  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -20776,8 +20770,7 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    // We call it in new-rpoducer, we don't need it here anymore
-    // connectRecvTransport()
+    connectRecvTransport()
   })
 }
 
@@ -20818,15 +20811,28 @@ const connectRecvTransport = async () => {
     if (audioParams) {
       console.log('❗ Have AUDIO stream to consume');
       let audioTrack = await getAudioTrask(audioParams)
+      console.log('audioTrack', audioTrack);
       stream.addTrack(audioTrack)
     } else {
       console.log('❗ Don\'t have AUDIO stream to consume');
     }
 
+    console.log('----------stream', stream);
+    console.log('stream.getAudioTracks()', stream.getAudioTracks());
     socket.emit('consumer-resume')
 
     remoteVideo.srcObject = stream
-    remoteVideo.setAttribute('autoplay', true)
+    // remoteVideo.autoplay = true
+    remoteVideo.controls = true;
+    remoteVideo.muted = true;
+    remoteVideo.loop = true;
+    remoteVideo.setAttribute('playsinline', '');
+    remoteVideo.src = stream;
+    remoteVideo.volume = 1.0;
+
+    //   window.localStream = stream; // A
+    //   window.localAudio.srcObject = stream; // B
+    //   window.localAudio.autoplay = true; // C
 
     remoteVideo.play()
     .then(() => {
@@ -20867,24 +20873,24 @@ const getAudioTrask = async (audioParams) => {
 
   const audioTrack = consumerAudio.track
 
-  audioTrack.applyConstraints({
-    audio: {
-      advanced: [
-        {
-          echoCancellation: {exact: true}
-        },
-        {
-          autoGainControl: {exact: true}
-        },
-        {
-          noiseSuppression: {exact: true}
-        }, 
-        {
-          highpassFilter: {exact: true}
-        }
-      ]
-    }
-  })
+  // audioTrack.applyConstraints({
+  //   audio: {
+  //     advanced: [
+  //       {
+  //         echoCancellation: {exact: true}
+  //       },
+  //       {
+  //         autoGainControl: {exact: true}
+  //       },
+  //       {
+  //         noiseSuppression: {exact: true}
+  //       }, 
+  //       {
+  //         highpassFilter: {exact: true}
+  //       }
+  //     ]
+  //   }
+  // })
 
   return audioTrack
 }
@@ -20910,31 +20916,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

@@ -91,14 +91,10 @@ setTimeout(() => {
       console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
       if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
         goConnect()
+        // document.getElementById('btnRecvSendTransport').click();
       }
       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();
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -377,8 +373,6 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
-
-  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -418,8 +412,7 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    // We call it in new-rpoducer, we don't need it here anymore
-    // connectRecvTransport()
+    connectRecvTransport()
   })
 }
 
@@ -460,15 +453,28 @@ const connectRecvTransport = async () => {
     if (audioParams) {
       console.log('❗ Have AUDIO stream to consume');
       let audioTrack = await getAudioTrask(audioParams)
+      console.log('audioTrack', audioTrack);
       stream.addTrack(audioTrack)
     } else {
       console.log('❗ Don\'t have AUDIO stream to consume');
     }
 
+    console.log('----------stream', stream);
+    console.log('stream.getAudioTracks()', stream.getAudioTracks());
     socket.emit('consumer-resume')
 
     remoteVideo.srcObject = stream
-    remoteVideo.setAttribute('autoplay', true)
+    // remoteVideo.autoplay = true
+    remoteVideo.controls = true;
+    remoteVideo.muted = true;
+    remoteVideo.loop = true;
+    remoteVideo.setAttribute('playsinline', '');
+    remoteVideo.src = stream;
+    remoteVideo.volume = 1.0;
+
+    //   window.localStream = stream; // A
+    //   window.localAudio.srcObject = stream; // B
+    //   window.localAudio.autoplay = true; // C
 
     remoteVideo.play()
     .then(() => {
@@ -509,24 +515,24 @@ const getAudioTrask = async (audioParams) => {
 
   const audioTrack = consumerAudio.track
 
-  audioTrack.applyConstraints({
-    audio: {
-      advanced: [
-        {
-          echoCancellation: {exact: true}
-        },
-        {
-          autoGainControl: {exact: true}
-        },
-        {
-          noiseSuppression: {exact: true}
-        }, 
-        {
-          highpassFilter: {exact: true}
-        }
-      ]
-    }
-  })
+  // audioTrack.applyConstraints({
+  //   audio: {
+  //     advanced: [
+  //       {
+  //         echoCancellation: {exact: true}
+  //       },
+  //       {
+  //         autoGainControl: {exact: true}
+  //       },
+  //       {
+  //         noiseSuppression: {exact: true}
+  //       }, 
+  //       {
+  //         highpassFilter: {exact: true}
+  //       }
+  //     ]
+  //   }
+  // })
 
   return audioTrack
 }
@@ -552,30 +558,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)