.dockerignore

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

.env

@@ -1,11 +1,7 @@
 PORT=3000
 IP=0.0.0.0 #	Listening IPv4 or IPv6.
-ANNOUNCED_IP=192.168.1.199 #    Announced IPv4 or IPv6 (useful when running mediasoup behind NAT with private IP).
+ANNOUNCED_IP=185.8.154.190 # Announced IPv4 or IPv6 (useful when running mediasoup behind NAT with private IP).
-RTC_MIN_PORT=40000
+RTC_MIN_PORT=2000
-RTC_MAX_PORT=49999
+RTC_MAX_PORT=2020
 SERVER_CERT="./server/ssl/cert.pem"
 SERVER_KEY="./server/ssl/key.pem"
-ENABLE_UDP=true
-ENABLE_TCP=true
-PREFER_UDP=true
-PREFER_TCP=false

.gitignore

@@ -1,3 +1,2 @@
 /node_modules
 /dist
-.idea

Dockerfile

@@ -1,25 +1,11 @@
-FROM ubuntu:22.04
+FROM ubuntu
-
-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_20.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/
+EXPOSE 3000
-
+EXPOSE 2000-2020
-RUN npm install
+EXPOSE 10000-10100
-
-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

README.md

@@ -6,54 +6,36 @@
 1. Go to `/server/ssl`
 2. Execute `openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout key.pem -out cert.pem`
 
+
 ### Development
 
 ##### To start in development mode you must:
-
 1. Install the dependencies `npm install`.
+2. Run the `npm start:dev` command to start the server in dev mode.
+(Any change will trigger a refresh of the server)
 
-2. Go to the `linx-devops/scaling-tools/private-system-truste-cert` project and generate a new server certificate and key:
-
-        sh create_certificate_for_domain.sh 192.168.1.110 #local IP
-        # generates files
-        nginx-selfsigned.crt
-        device.key
-
-3. You need to update the Video Server in the provisioning to point to your private IP. ex: https://192.168.1.199:3000
-
-4. The generated files must be moved to server/ssl and renamed as follows:
-
-        cp device.key  {mediasoup_project}/server/ssl/key.pem
-        cp nginx-selfsigned.crt {mediosup_project}/server/ssl/cert.pem
-
-5. Go to https://dev.linx.safemobile.com/dispatcher/resources/help/LINXHelp.html#safemobile-certificate-import and import the certificate for your system type
-
-6. The ANNOUNCED IP in .env must be configured to use the same private IP used in generating the certificate.
-
-7. Run the `npm start:dev` command to start the server in dev mode.
-   (Any change will trigger a refresh of the server)
 
 ### Production
 
 ##### To start in production mode you must:
 1. Install the dependencies `npm install`.
 2. Run the `npm start:prod` command to start the server in production mode.
-   (To connect to the terminal, use `pm2 log video-server`)
+(To connect to the terminal, use `pm2 log video-server`)
 
 
 ### Web client
 
 - The server will start by default on port 3000, and the ssl certificates will have to be configured
 - The web client can be accessed using the /sfu path
-  ex: https://HOST/sfu/?assetId=1&&accountId=1&producer=true&dest_asset_id=75&assetName=Adi
+ex: https://HOST/sfu/?assetId=1&&accountId=1&producer=true&dest_asset_id=75&assetName=Adi
-  assetId = asset id of the unit on which you are doing the test
+assetId = asset id of the unit on which you are doing the test
-  accountId = account id of the unit on which you are doing the test
+accountId = account id of the unit on which you are doing the test
-  producer = it will always be true because you are the producer
+producer = it will always be true because you are the producer
-  (it's possible to put false, but then you have to have another client with producer true)
+(it's possible to put false, but then you have to have another client with producer true)
-  assetName = asset name of the unit on which you are doing the test
+assetName = asset name of the unit on which you are doing the test
-  dest_asset_id= the addressee with whom the call is made
+dest_asset_id= the addressee with whom the call is made
 - To make a call using this client, you need a microphone and permission to use it
 - For any changes related to the client, the command `npm run watch' will have to be used to generate the bundle.js used by the web client
 
 ### Demo project
-The demo project used initially and then modified for our needs `https://github.com/jamalag/mediasoup2`
+  The demo project used initially and then modified for our needs `https://github.com/jamalag/mediasoup2`

app.js

@@ -1,4 +1,4 @@
-require('dotenv').config();
+require('dotenv').config()
 
 const express = require('express');
 const app = express();
@@ -12,53 +12,51 @@ try {
   console.log('https support is disabled!');
 }
 const mediasoup = require('mediasoup');
-const isUdpEnabled = process.env.ENABLE_UDP === 'true';
-const isTcpEnabled = process.env.ENABLE_TCP === 'true';
-const isUdpPreferred = process.env.PREFER_UDP === 'true';
-const isTcpPreferred = process.env.PREFER_TCP === 'true';
-let currentConnectionType = isUdpPreferred ? 'udp' : 'tcp';
 
-let worker;
+let worker
 /**
+ * videoCalls
+ * |-> Router
+ * |-> Producer
+ * |-> Consumer 
+ * |-> Producer Transport
+ * |-> Consumer Transport
  * 
- * videoCalls - Dictionary of Object(s)
  * '<callId>': {
  *  router: Router,
- *  initiatorAudioProducer: Producer,
+ *  producer: Producer,
- *  initiatorVideoProducer: Producer,
+ *  producerTransport: Producer Transport,
- *  receiverVideoProducer: Producer,
+ *  consumer: Consumer,
- *  receiverAudioProducer: Producer,
+ *  consumerTransport: Consumer Transport
- *  initiatorProducerTransport: Producer Transport,
- *  receiverProducerTransport: Producer Transport,
- *  initiatorConsumerVideo: Consumer,
- *  initiatorConsumerAudio: Consumer,
- *  initiatorConsumerTransport: Consumer Transport
- *  initiatorSocket
- *  receiverSocket
  * }
  * 
  **/
-let videoCalls = {};
+let videoCalls = {}
-let socketDetails = {};
+let socketDetails = {}
 
 app.get('/', (_req, res) => {
-  res.send('OK');
+  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: ["*:*"],
+  // allowRequest: (req, next) => {
+  //   console.log('req', req);
+  //   next(null, true)
+  // }
 });
+// const io = new Server(server, { origins: '*:*', allowEIO3: true });
 
 httpsServer.listen(process.env.PORT, () => {
   console.log('Video server listening on port:', process.env.PORT);
@@ -71,19 +69,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();
@@ -94,82 +92,101 @@ worker = createWorker();
 // https://github.com/versatica/mediasoup/blob/v3/src/supportedRtpCapabilities.ts
 const mediaCodecs = 			[
   {
-    kind: 'audio',
+    kind      : 'audio',
-    mimeType: 'audio/opus',
+    mimeType  : 'audio/opus',
-    clockRate: 48000,
+    clockRate : 48000,
-    channels: 2,
+    channels  : 2
   },
   {
-    kind: 'video',
+    kind       : 'video',
-    mimeType: 'video/VP8',
+    mimeType   : 'video/VP8',
-    clockRate: 90000,
+    clockRate  : 90000,
-    parameters: {
+    parameters :
-      'x-google-start-bitrate': 1000,
+    {
+      'x-google-start-bitrate' : 1000
     },
-    channels: 2,
+    channels  : 2
   },
   {
-    kind: 'video',
+    kind       : 'video',
-    mimeType: 'video/VP9',
+    mimeType   : 'video/VP9',
-    clockRate: 90000,
+    clockRate  : 90000,
-    parameters: {
+    parameters :
-      'profile-id': 2,
+    {
-      'x-google-start-bitrate': 1000,
+      'profile-id'             : 2,
-    },
+      'x-google-start-bitrate' : 1000
+    }
   },
   {
-    kind: 'video',
+    kind       : 'video',
-    mimeType: 'video/h264',
+    mimeType   : 'video/h264',
-    clockRate: 90000,
+    clockRate  : 90000,
-    parameters: {
+    parameters :
-      'packetization-mode': 1,
+    {
-      'profile-level-id': '4d0032',
+      'packetization-mode'      : 1,
-      'level-asymmetry-allowed': 1,
+      'profile-level-id'        : '4d0032',
-      'x-google-start-bitrate': 1000,
+      'level-asymmetry-allowed' : 1,
-    },
+      'x-google-start-bitrate'  : 1000
+    }
   },
   {
-    kind: 'video',
+    kind       : 'video',
-    mimeType: 'video/h264',
+    mimeType   : 'video/h264',
-    clockRate: 90000,
+    clockRate  : 90000,
-    parameters: {
+    parameters :
-      'packetization-mode': 1,
+    {
-      'profile-level-id': '42e01f',
+      'packetization-mode'      : 1,
-      'level-asymmetry-allowed': 1,
+      'profile-level-id'        : '42e01f',
-      'x-google-start-bitrate': 1000,
+      'level-asymmetry-allowed' : 1,
-    },
+      'x-google-start-bitrate'  : 1000
-  },
+    }
+  }
+//   {
+//     kind: 'audio',
+//     mimeType: 'audio/opus',
+//     clockRate: 48000,
+//     channels: 2,
+//   },
+//   {
+//     kind: 'video',
+//     mimeType: 'video/VP8',
+//     clockRate: 90000,
+//     parameters: {
+//       'x-google-start-bitrate': 1000,
+//     },
+//   },
 ];
 
 const closeCall = (callId) => {
   try {
     if (callId && videoCalls[callId]) {
-      videoCalls[callId].receiverVideoProducer?.close();
+      videoCalls[callId].producerVideo?.close();
-      videoCalls[callId].receiverAudioProducer?.close();
+      videoCalls[callId].producerAudio?.close();
-      videoCalls[callId].initiatorConsumerVideo?.close();
+      videoCalls[callId].consumerVideo?.close();
-      videoCalls[callId].initiatorConsumerAudio?.close();
+      videoCalls[callId].consumerAudio?.close();
 
-      videoCalls[callId]?.initiatorConsumerTransport?.close();
+      videoCalls[callId]?.consumerTransport?.close();
-      videoCalls[callId]?.receiverProducerTransport?.close();
+      videoCalls[callId]?.producerTransport?.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
@@ -192,22 +209,22 @@ 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);
-          console.log(`[createRoom] Generate Router ID: ${videoCalls[callId].router.id}`);
+          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) }
-          videoCalls[callId].receiverSocket = socket;
+          console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
-        } 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,
+          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);
     }
@@ -215,7 +232,7 @@ peers.on('connection', async (socket) => {
 
   /*
     - Client emits a request to create server side Transport
-    - Depending on the sender, a producer or consumer is created is created on that router
+    - Depending on the sender, producerTransport or consumerTransport is created on that router
     - It will return parameters, these are required for the client to create the RecvTransport 
     from the client.
       - If the client is producer(sender: true) then it will use parameters for device.createSendTransport(params)
@@ -224,29 +241,24 @@ peers.on('connection', async (socket) => {
   socket.on('createWebRtcTransport', async ({ sender }, callback) => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
+      console.log(`[createWebRtcTransport] sender ${sender} | callId ${callId}`);
       if (sender) {
-        if (!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
+        if (!videoCalls[callId].producerTransport) {
-          videoCalls[callId].receiverProducerTransport = await createWebRtcTransportLayer(callId, callback);
+          videoCalls[callId].producerTransport = await createWebRtcTransportLayer(callId, callback);
-        } 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].consumerTransport) {
-          videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
+          videoCalls[callId].consumerTransport = await createWebRtcTransportLayer(callId, callback);
-        } else if (!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
+        } else {
-          videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback);
+          console.log(`consumerTransport has already been defined | callId ${callId}`);
+          callback(null);
         }
       }
     } catch (error) {
-      console.error(
+      console.log(`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`);
-        `[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${
-          error.message
-        }`
-      );
       callback(error);
     }
   });
@@ -260,19 +272,16 @@ peers.on('connection', async (socket) => {
       const callId = socketDetails[socket.id];
       if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
 
-      console.log(`[transport-connect] socket ${socket.id} | callId ${callId}`);
+      console.log(`[transport-connect] socket.id ${socket.id} | callId ${callId}`);
-
+      await videoCalls[callId].producerTransport.connect({ dtlsParameters });
-      isInitiator(callId, socket.id)
-        ? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
-        : await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
     } 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}`);
     }
   });
 
   /*
-    - The event sent by the client (PRODUCER) after successfully connecting to receiverProducerTransport/initiatorProducerTransport
+    - The event sent by the client (PRODUCER) after successfully connecting to producerTransport
-    - For the router with the id callId, we make produce on receiverProducerTransport/initiatorProducerTransport
+    - For the router with the id callId, we make produce on producerTransport
     - Create the handler on producer at the 'transportclose' event
     */
    socket.on('transport-produce', async ({ kind, rtpParameters, appData }, callback) => {
@@ -280,86 +289,50 @@ peers.on('connection', async (socket) => {
        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.id: ${socket.id} | callId: ${callId}`);
+       console.log('kind', kind);
+       console.log('rtpParameters', rtpParameters);
 
       if (kind === 'video') {
-        if (!isInitiator(callId, socket.id)) {
+        videoCalls[callId].producerVideo = await videoCalls[callId].producerTransport.produce({
-          videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
           kind,
           rtpParameters,
         });
       
-          videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
+
-            console.log('transport for this producer closed', callId);
+        console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producerVideo.id} | kind: ${videoCalls[callId].producerVideo.kind}`);
+    
+        videoCalls[callId].producerVideo.on('transportclose', () => {
+          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 && callback({
-            callback({
+          id: videoCalls[callId].producerVideo.id
-              id: videoCalls[callId].receiverVideoProducer.id,
         });
-        } else {
-          videoCalls[callId].initiatorVideoProducer = await videoCalls[callId].initiatorProducerTransport.produce({
-            kind,
-            rtpParameters,
-          });
-
-          videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
-            console.log('transport for this producer closed', callId);
-            closeCall(callId);
-          });
-
-          callback &&
-            callback({
-              id: videoCalls[callId].initiatorVideoProducer.id,
-            });
-        }
       } else if (kind === 'audio') {
-        if (!isInitiator(callId, socket.id)) {
+        videoCalls[callId].producerAudio = await videoCalls[callId].producerTransport.produce({
-          videoCalls[callId].receiverAudioProducer = await videoCalls[callId].receiverProducerTransport.produce({
           kind,
           rtpParameters,
         });
 
-          videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
+        console.log(`[transport-produce] Producer ID: ${videoCalls[callId].producerAudio.id} | kind: ${videoCalls[callId].producerAudio.kind}`);
-            console.log('transport for this producer closed', callId);
+    
+        videoCalls[callId].producerAudio.on('transportclose', () => {
+          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 && callback({
-            callback({
+          id: videoCalls[callId].producerAudio.id
-              id: videoCalls[callId].receiverAudioProducer.id,
-            });
-        } else {
-          videoCalls[callId].initiatorAudioProducer = await videoCalls[callId].initiatorProducerTransport.produce({
-            kind,
-            rtpParameters,
-          });
-
-          videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
-            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,
         });
       }
-      }
-
-      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}`);
     }
   });
 
@@ -370,18 +343,12 @@ peers.on('connection', async (socket) => {
   socket.on('transport-recv-connect', async ({ dtlsParameters }) => {
     try {
       const callId = socketDetails[socket.id];
-      console.log(`[transport-recv-connect] socket ${socket.id} | callId ${callId}`);
+      console.log(`[transport-recv-connect] socket.id ${socket.id} | callId ${callId}`);
-      if (typeof dtlsParameters === 'string') dtlsParameters = JSON.parse(dtlsParameters);
+      await videoCalls[callId].consumerTransport.connect({ dtlsParameters });
-      // await videoCalls[callId].consumerTransport.connect({ dtlsParameters });
-      if (!isInitiator(callId, socket.id)) {
-        await videoCalls[callId].receiverConsumerTransport.connect({ dtlsParameters });
-      } 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
@@ -391,163 +358,115 @@ peers.on('connection', async (socket) => {
       - The consumer does consumerTransport.consume(params)
   */
   socket.on('consume', async ({ rtpCapabilities }, callback) => {
+    try {
+      console.log(`[consume] rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`);
+
       const callId = socketDetails[socket.id];
-    const socketId = socket.id;
+      console.log('[consume] callId', callId);
 
-    console.log(`[consume] socket ${socketId} | callId: ${callId}`);
+      const canConsumeVideo = !!videoCalls[callId].producerVideo && !!videoCalls[callId].router.canConsume({
+        producerId: videoCalls[callId].producerVideo.id,
+        rtpCapabilities
+      })
 
-    if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
+      const canConsumeAudio = !!videoCalls[callId].producerAudio && !!videoCalls[callId].router.canConsume({
+        producerId: videoCalls[callId].producerAudio.id,
+        rtpCapabilities
+      })
 
-    callback({
+      console.log('[consume] canConsumeVideo', canConsumeVideo);
-      videoParams: await consumeVideo({ callId, socketId, rtpCapabilities }),
+      console.log('[consume] canConsumeAudio', canConsumeAudio);
-      audioParams: await consumeAudio({ callId, socketId, rtpCapabilities }),
+
-    });
+      if (canConsumeVideo && !canConsumeAudio) {
+        console.log('1');
+        const videoParams = await consumeVideo(callId, rtpCapabilities)
+        console.log('videoParams', videoParams);
+        callback({ videoParams, audioParams: null });
+      } else if (canConsumeVideo && canConsumeAudio) {
+        console.log('2');
+        const videoParams = await consumeVideo(callId, rtpCapabilities)
+        const audioParams = await consumeAudio(callId, rtpCapabilities)
+        callback({ videoParams, audioParams });
+      } 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 } });
+    }
   });
 
   /*
     - 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];
-      const isInitiatorValue = isInitiator(callId, socket.id);
+      console.log(`[consumer-resume] callId ${callId}`)
-      console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
+      await videoCalls[callId].consumerVideo.resume();
-
+      await videoCalls[callId].consumerAudio.resume();
-      const consumerVideo = isInitiatorValue
-        ? videoCalls[callId].initiatorConsumerVideo
-        : videoCalls[callId].receiverConsumerVideo;
-
-      const consumerAudio = isInitiatorValue
-        ? videoCalls[callId].initiatorConsumerAudio
-        : videoCalls[callId].receiverConsumerAudio;
-
-      consumerVideo?.resume();
-      consumerAudio?.resume();
     } catch (error) {
-      console.error(
+      console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
-        `[consumer-resume] | ERROR | callId: ${socketDetails[socket.id]} | isInitiator: ${isInitiator} | error: ${
-          error.message
-        }`
-      );
-    }
-  });
-
-  socket.on('close-producer', ({ callId, kind }) => {
-    try {
-      if (isInitiator(callId, socket.id)) {
-        console.log(`[close-producer] initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
-      } else {
-        console.log(`[close-producer] receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
-        videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
-      }
-    } catch (error) {
-      console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
     }
   });
 });
 
-const canConsume = ({ callId, producerId, rtpCapabilities }) => {
+const consumeVideo = async (callId, rtpCapabilities) => {
-  return !!videoCalls[callId].router.canConsume({
+  videoCalls[callId].consumerVideo = await videoCalls[callId].consumerTransport.consume({
-    producerId,
+    producerId: videoCalls[callId].producerVideo.id,
-    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,
     rtpCapabilities,
     paused: true,
   });
 
+  // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+  videoCalls[callId].consumerVideo.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].consumerVideo.on('producerclose', () => {
+    const callId = socketDetails[socket.id];
+    console.log('producer of consumer closed', callId);
+    closeCall(callId);
+  });
+
   return {
-      id: videoCalls[callId].initiatorConsumerVideo.id,
+    id: videoCalls[callId].consumerVideo.id,
-      producerId,
+    producerId: videoCalls[callId].producerVideo.id,
     kind: 'video',
-      rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
+    rtpParameters: videoCalls[callId].consumerVideo.rtpParameters,
-    };
-  } 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,
-      rtpCapabilities,
-      paused: true,
-    });
-
-    return {
-      id: videoCalls[callId].receiverConsumerVideo.id,
-      producerId,
-      kind: 'video',
-      rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
-    };
-  } else {
-    return null;
   }
-};
+}
 
-const consumeAudio = async ({ callId, socketId, rtpCapabilities }) => {
+const consumeAudio = async (callId, rtpCapabilities) => {
-  try {
+  videoCalls[callId].consumerAudio = await videoCalls[callId].consumerTransport.consume({
-    // Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+    producerId: videoCalls[callId].producerAudio.id,
-    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,
   });
 
+  // https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+  videoCalls[callId].consumerAudio.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].consumerAudio.on('producerclose', () => {
+    const callId = socketDetails[socket.id];
+    console.log('producer of consumer closed', callId);
+    closeCall(callId);
+  });
   return {
-        id: videoCalls[callId].initiatorConsumerAudio.id,
+    id: videoCalls[callId].consumerAudio.id,
-        producerId,
+    producerId: videoCalls[callId].producerAudio.id,
     kind: 'audio',
-        rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
+    rtpParameters: videoCalls[callId].consumerAudio.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 isInitiator = (callId, socketId) => {
-  return videoCalls[callId]?.initiatorSocket?.id === socketId;
-};
-
-const emitToParticipants = (callId, event, message) => {
-  try {
-    videoCalls[callId].receiverSocket.emit(event, message);
-    videoCalls[callId].initiatorSocket.emit(event, message);
-  } catch (error) {
-    console.error(`[emitToParticipants] | ERROR | callId: ${callId} | error: ${error.message}`);
   }
 }
 
@@ -560,45 +479,26 @@ const emitToParticipants = (callId, event, message) => {
 */
 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: isUdpEnabled,
+      enableUdp: true,
-      enableTcp: isTcpEnabled,
+      enableTcp: true,
-      preferUdp: isUdpPreferred,
+      preferUdp: true,
-      preferTcp: isTcpPreferred,
-      iceConsentTimeout: 3
     };
     
     // 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}`)
-    // `iceselectedtuplechange`: Fires when ICE switches transport (e.g., UDP → TCP).
-    transport.on('iceselectedtuplechange', (selectedTuple) => {
-      const { protocol } = selectedTuple;
-      if (currentConnectionType !== protocol) {
-        console.warn(`⚠️ ${currentConnectionType.toUpperCase()} blocked! Switching to ${protocol.toUpperCase()} for callId: ${callId}`);
-        currentConnectionType = protocol;
-      }
-    });
-
-    // `icestatechange`: Fires when ICE connection state changes (e.g., new, connected, failed).
-    transport.on('icestatechange', (iceState) => {
-      console.log(`[ICE STATE CHANGE] callId: ${callId} | State: ${iceState}`);
-      if (iceState === 'failed' || iceState === 'disconnected') {
-        console.warn(`⚠️ ICE failure detected for callId: ${callId}! Possible UDP blockage.`);
-        emitToParticipants(callId, 'connection-failed', { callId });
-      }
-    });
 
     // 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();
@@ -617,15 +517,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(
+    console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
-      `[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${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
@@ -45,30 +9,37 @@ 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,tsconfig.json,.dockerignore} dist/
+cp -r {.env,app.js,package.json,server,public} dist/
-#cp -r ./* dist/
 
-# Generate Git log
+#Add version control for pm2
-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
 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
 

package.json

@@ -16,7 +16,7 @@
     "@types/express": "^4.17.13",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
-    "mediasoup": "^3.15.5",
+    "mediasoup": "^3.10.4",
     "mediasoup-client": "^3.6.54",
     "parcel": "^2.7.0",
     "socket.io": "^2.0.3",

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://video.safemobile.org',
 }
 },{}],95:[function(require,module,exports){
 const io = require('socket.io-client')
@@ -20368,24 +20368,10 @@ const ASSET_NAME = urlParams.get('assetName') || null;
 const ASSET_TYPE = urlParams.get('assetType') || null;
 let callId = parseInt(urlParams.get('callId')) || null;
 const IS_PRODUCER = urlParams.get('producer') === 'true' ? true : false
-let remoteVideo = document.getElementById('remoteVideo')
-remoteVideo.defaultMuted = true
-let produceAudio = false
-
 console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId', callId, ' | IS_PRODUCER', IS_PRODUCER)
 
 console.log('🟩 config', config)
 
-produceAudioSelector = document.getElementById('produceAudio');
-produceAudioSelector.addEventListener('change', e => {
-    if(e.target.checked) {
-      produceAudio = true
-      console.log('produce audio');
-    } else {
-      produceAudio = false
-    }
-});
-
 let socket, hub
 let device
 let rtpCapabilities
@@ -20395,21 +20381,6 @@ let producerVideo
 let producerAudio
 let consumer
 let originAssetId
-let consumerVideo // local consumer video(consumer not transport)
-let consumerAudio // local consumer audio(consumer not transport)
-
-const remoteSoundControl = document.getElementById('remoteSoundControl');
-
-remoteSoundControl.addEventListener('click', function handleClick() {
-  console.log('remoteSoundControl.textContent', remoteSoundControl.textContent);
-  if (remoteSoundControl.textContent === 'Unmute') {
-    remoteVideo.muted = false
-    remoteSoundControl.textContent = 'Mute';
-  } else {
-    remoteVideo.muted = true
-    remoteSoundControl.textContent = 'Unmute';
-  }
-});
 
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
@@ -20449,23 +20420,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();
-    })
-
-    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()
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -20544,7 +20502,7 @@ const streamSuccess = (stream) => {
 const getLocalStream = () => {
   console.log('[getLocalStream]');
   navigator.mediaDevices.getUserMedia({
-    audio: produceAudio ? true : false,
+    audio: true,
     video: {
       qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
       vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
@@ -20622,7 +20580,7 @@ const createSendTransport = () => {
   console.log('[createSendTransport');
   // see server's socket.on('createWebRtcTransport', sender?, ...)
   // this is a call from Producer, so sender = true
-  socket.emit('createWebRtcTransport', { sender: true }, (value) => {
+  socket.emit('createWebRtcTransport', { sender: true, callId }, (value) => {
 
     console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
 
@@ -20693,36 +20651,34 @@ const connectSendTransport = async () => {
   // this action will trigger the 'connect' and 'produce' events above
   
   // Produce video
-  let producerVideoHandler = await producerTransport.produce(videoParams)
+  producerVideo = await producerTransport.produce(videoParams)
   console.log('videoParams', videoParams);
   console.log('producerVideo', producerVideo);
 
-  producerVideoHandler.on('trackended', () => {
+  producerVideo.on('trackended', () => {
     console.log('track ended')
     // close video track
   })  
 
-  producerVideoHandler.on('transportclose', () => {
+  producerVideo.on('transportclose', () => {
     console.log('transport ended')
     // close video track
   })    
   
   // Produce audio
-  if (produceAudio) {
+  producerAudio = await producerTransport.produce(audioParams)
-    let producerAudioHandler = await producerTransport.produce(audioParams)
   console.log('audioParams', audioParams);
   console.log('producerAudio', producerAudio);
 
-    producerAudioHandler.on('trackended', () => {
+  producerAudio.on('trackended', () => {
     console.log('track ended')
     // close audio track
   })
 
-    producerAudioHandler.on('transportclose', () => {
+  producerAudio.on('transportclose', () => {
     console.log('transport ended')
     // close audio track
   })
-  }
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -20744,8 +20700,6 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
-
-  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -20785,8 +20739,7 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    // We call it in new-rpoducer, we don't need it here anymore
+    connectRecvTransport()
-    // connectRecvTransport()
   })
 }
 
@@ -20809,89 +20762,32 @@ const connectRecvTransport = async () => {
   await socket.emit('consume', {
     rtpCapabilities: device.rtpCapabilities,
     callId
-  }, async ({videoParams, audioParams}) => {
+  }, async ({ params }) => {
-    console.log(`[consume] 🟩 videoParams`, videoParams)
+    if (params.error) {
-    console.log(`[consume] 🟩 audioParams`, audioParams)
+      console.log('Cannot Consume')
-    console.log('[consume] 🟩 consumerTransport', consumerTransport)
+      return
+    }
+
+    // Then consume with the local consumer transport
+    // which creates a consumer
+    consumer = await consumerTransport.consume({
+      id: params.id,
+      producerId: params.producerId,
+      kind: params.kind,
+      rtpParameters: params.rtpParameters
+    })
+
+    // destructure and retrieve the video track from the producer
+    const { track } = consumer
 
     let stream = new MediaStream()
-
+    stream.addTrack(track)
-    // Maybe the unit does not produce video or audio, so we must only consume what is produced
+    // stream.removeTrack(track)
-    if (videoParams) {
-      console.log('❗ Have VIDEO stream to consume');
-      stream.addTrack(await getVideoTrask(videoParams))
-    } else {
-      console.log('❗ Don\'t have VIDEO stream to consume');
-    }
-    
-    if (audioParams) {
-      console.log('❗ Have AUDIO stream to consume');
-      let audioTrack = await getAudioTrask(audioParams)
-      stream.addTrack(audioTrack)
-    } else {
-      console.log('❗ Don\'t have AUDIO stream to consume');
-    }
-
-    socket.emit('consumer-resume')
-
     remoteVideo.srcObject = stream
-    remoteVideo.setAttribute('autoplay', true)
+    socket.emit('consumer-resume')
+    console.log('consumer', consumer);
 
-    remoteVideo.play()
-    .then(() => {
-      console.log('remoteVideo PLAY')
   })
-    .catch((error) => {
-      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
-    })
-  })
-}
-
-const getVideoTrask = async (videoParams) => {
-  consumerVideo = await consumerTransport.consume({
-    id: videoParams.id,
-    producerId: videoParams.producerId,
-    kind: videoParams.kind,
-    rtpParameters: videoParams.rtpParameters
-  }) 
-
-  return consumerVideo.track
-}
-
-const getAudioTrask = async (audioParams) => {
-  consumerAudio = await consumerTransport.consume({
-    id: audioParams.id,
-    producerId: audioParams.producerId,
-    kind: audioParams.kind,
-    rtpParameters: audioParams.rtpParameters
-  })
-
-  consumerAudio.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  const audioTrack = consumerAudio.track
-
-  audioTrack.applyConstraints({
-    audio: {
-      advanced: [
-        {
-          echoCancellation: {exact: true}
-        },
-        {
-          autoGainControl: {exact: true}
-        },
-        {
-          noiseSuppression: {exact: true}
-        }, 
-        {
-          highpassFilter: {exact: true}
-        }
-      ]
-    }
-  })
-
-  return audioTrack
 }
 
 const closeCall = () => {
@@ -20915,31 +20811,8 @@ 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)
-//       }
-//     })
-    
-//     connectRecvTransport()
-//   })
-// }
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-// btnRecvSendTransport.addEventListener('click', consume)
+btnRecvSendTransport.addEventListener('click', goConnect)
 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://video.safemobile.org',
 }

public/index.html

@@ -34,9 +34,6 @@
   <body>
     <body>
         <div id="video">
-            <legend>Client options:</legend>
-            <input type="checkbox" id="produceAudio" name="produceAudio">
-            <label for="produceAudio">Produce audio</label><br>
             <table>
                 <thead>
                     <th>Local Video</th>
@@ -46,24 +43,12 @@
                     <tr>
                         <td>
                             <div id="sharedBtns">
-                                <video
+                                <video id="localVideo" autoplay class="video" muted></video>
-                                    id="localVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></video>
                             </div>
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <video
+                                <video id="remoteVideo" autoplay class="video" ></video>
-                                    id="remoteVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></video>
                             </div>
                         </td>
                     </tr>
@@ -75,11 +60,34 @@
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <!-- <button id="btnRecvSendTransport">Consume</button> -->
+                                <button id="btnRecvSendTransport">Consume</button>
-                                <button id="remoteSoundControl">Unmute</button>
                             </div>
                         </td>
                     </tr>
+                    <!-- <tr>
+                        <td colspan="2">
+                            <div id="sharedBtns">
+                                <button id="btnRtpCapabilities">2. Get Rtp Capabilities</button>
+                                <br />
+                                <button id="btnDevice">3. Create Device</button>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div id="sharedBtns">
+                                <button id="btnCreateSendTransport">4. Create Send Transport</button>
+                                <br />
+                                <button id="btnConnectSendTransport">5. Connect Send Transport & Produce</button></td>
+                            </div>
+                        <td>
+                            <div id="sharedBtns">
+                                <button id="btnRecvSendTransport">6. Create Recv Transport</button>
+                                <br />
+                                <button id="btnConnectRecvTransport">7. Connect Recv Transport & Consume</button>
+                            </div>
+                        </td>
+                    </tr> -->
                 </tbody>
             </table>
             <div id="closeCallBtn">

public/index.js

@@ -10,24 +10,10 @@ const ASSET_NAME = urlParams.get('assetName') || null;
 const ASSET_TYPE = urlParams.get('assetType') || null;
 let callId = parseInt(urlParams.get('callId')) || null;
 const IS_PRODUCER = urlParams.get('producer') === 'true' ? true : false
-let remoteVideo = document.getElementById('remoteVideo')
-remoteVideo.defaultMuted = true
-let produceAudio = false
-
 console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId', callId, ' | IS_PRODUCER', IS_PRODUCER)
 
 console.log('🟩 config', config)
 
-produceAudioSelector = document.getElementById('produceAudio');
-produceAudioSelector.addEventListener('change', e => {
-    if(e.target.checked) {
-      produceAudio = true
-      console.log('produce audio');
-    } else {
-      produceAudio = false
-    }
-});
-
 let socket, hub
 let device
 let rtpCapabilities
@@ -37,21 +23,6 @@ let producerVideo
 let producerAudio
 let consumer
 let originAssetId
-let consumerVideo // local consumer video(consumer not transport)
-let consumerAudio // local consumer audio(consumer not transport)
-
-const remoteSoundControl = document.getElementById('remoteSoundControl');
-
-remoteSoundControl.addEventListener('click', function handleClick() {
-  console.log('remoteSoundControl.textContent', remoteSoundControl.textContent);
-  if (remoteSoundControl.textContent === 'Unmute') {
-    remoteVideo.muted = false
-    remoteSoundControl.textContent = 'Mute';
-  } else {
-    remoteVideo.muted = true
-    remoteSoundControl.textContent = 'Unmute';
-  }
-});
 
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
 // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
@@ -91,23 +62,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();
-    })
-
-    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()
-    })
   }
   
   if (IS_PRODUCER === true) {
@@ -186,7 +144,7 @@ const streamSuccess = (stream) => {
 const getLocalStream = () => {
   console.log('[getLocalStream]');
   navigator.mediaDevices.getUserMedia({
-    audio: produceAudio ? true : false,
+    audio: true,
     video: {
       qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
       vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
@@ -264,7 +222,7 @@ const createSendTransport = () => {
   console.log('[createSendTransport');
   // see server's socket.on('createWebRtcTransport', sender?, ...)
   // this is a call from Producer, so sender = true
-  socket.emit('createWebRtcTransport', { sender: true }, (value) => {
+  socket.emit('createWebRtcTransport', { sender: true, callId }, (value) => {
 
     console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
 
@@ -335,36 +293,34 @@ const connectSendTransport = async () => {
   // this action will trigger the 'connect' and 'produce' events above
   
   // Produce video
-  let producerVideoHandler = await producerTransport.produce(videoParams)
+  producerVideo = await producerTransport.produce(videoParams)
   console.log('videoParams', videoParams);
   console.log('producerVideo', producerVideo);
 
-  producerVideoHandler.on('trackended', () => {
+  producerVideo.on('trackended', () => {
     console.log('track ended')
     // close video track
   })  
 
-  producerVideoHandler.on('transportclose', () => {
+  producerVideo.on('transportclose', () => {
     console.log('transport ended')
     // close video track
   })    
   
   // Produce audio
-  if (produceAudio) {
+  producerAudio = await producerTransport.produce(audioParams)
-    let producerAudioHandler = await producerTransport.produce(audioParams)
   console.log('audioParams', audioParams);
   console.log('producerAudio', producerAudio);
 
-    producerAudioHandler.on('trackended', () => {
+  producerAudio.on('trackended', () => {
     console.log('track ended')
     // close audio track
   })
 
-    producerAudioHandler.on('transportclose', () => {
+  producerAudio.on('transportclose', () => {
     console.log('transport ended')
     // close audio track
   })
-  }
 
   const answer = {
     origin_asset_id: ASSET_ID,
@@ -386,8 +342,6 @@ const connectSendTransport = async () => {
   // Enable Close call button
   const closeCallBtn = document.getElementById('btnCloseCall');
   closeCallBtn.removeAttribute('disabled');
-
-  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
@@ -427,8 +381,7 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    // We call it in new-rpoducer, we don't need it here anymore
+    connectRecvTransport()
-    // connectRecvTransport()
   })
 }
 
@@ -451,89 +404,32 @@ const connectRecvTransport = async () => {
   await socket.emit('consume', {
     rtpCapabilities: device.rtpCapabilities,
     callId
-  }, async ({videoParams, audioParams}) => {
+  }, async ({ params }) => {
-    console.log(`[consume] 🟩 videoParams`, videoParams)
+    if (params.error) {
-    console.log(`[consume] 🟩 audioParams`, audioParams)
+      console.log('Cannot Consume')
-    console.log('[consume] 🟩 consumerTransport', consumerTransport)
+      return
+    }
+
+    // Then consume with the local consumer transport
+    // which creates a consumer
+    consumer = await consumerTransport.consume({
+      id: params.id,
+      producerId: params.producerId,
+      kind: params.kind,
+      rtpParameters: params.rtpParameters
+    })
+
+    // destructure and retrieve the video track from the producer
+    const { track } = consumer
 
     let stream = new MediaStream()
-
+    stream.addTrack(track)
-    // Maybe the unit does not produce video or audio, so we must only consume what is produced
+    // stream.removeTrack(track)
-    if (videoParams) {
-      console.log('❗ Have VIDEO stream to consume');
-      stream.addTrack(await getVideoTrask(videoParams))
-    } else {
-      console.log('❗ Don\'t have VIDEO stream to consume');
-    }
-    
-    if (audioParams) {
-      console.log('❗ Have AUDIO stream to consume');
-      let audioTrack = await getAudioTrask(audioParams)
-      stream.addTrack(audioTrack)
-    } else {
-      console.log('❗ Don\'t have AUDIO stream to consume');
-    }
-
-    socket.emit('consumer-resume')
-
     remoteVideo.srcObject = stream
-    remoteVideo.setAttribute('autoplay', true)
+    socket.emit('consumer-resume')
+    console.log('consumer', consumer);
 
-    remoteVideo.play()
-    .then(() => {
-      console.log('remoteVideo PLAY')
   })
-    .catch((error) => {
-      console.error(`remoteVideo PLAY ERROR | ${error.message}`)
-    })
-  })
-}
-
-const getVideoTrask = async (videoParams) => {
-  consumerVideo = await consumerTransport.consume({
-    id: videoParams.id,
-    producerId: videoParams.producerId,
-    kind: videoParams.kind,
-    rtpParameters: videoParams.rtpParameters
-  }) 
-
-  return consumerVideo.track
-}
-
-const getAudioTrask = async (audioParams) => {
-  consumerAudio = await consumerTransport.consume({
-    id: audioParams.id,
-    producerId: audioParams.producerId,
-    kind: audioParams.kind,
-    rtpParameters: audioParams.rtpParameters
-  })
-
-  consumerAudio.on('transportclose', () => {
-    console.log('transport closed so consumer closed')
-  })
-
-  const audioTrack = consumerAudio.track
-
-  audioTrack.applyConstraints({
-    audio: {
-      advanced: [
-        {
-          echoCancellation: {exact: true}
-        },
-        {
-          autoGainControl: {exact: true}
-        },
-        {
-          noiseSuppression: {exact: true}
-        }, 
-        {
-          highpassFilter: {exact: true}
-        }
-      ]
-    }
-  })
-
-  return audioTrack
 }
 
 const closeCall = () => {
@@ -557,30 +453,7 @@ 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)
-//       }
-//     })
-    
-//     connectRecvTransport()
-//   })
-// }
 
 btnLocalVideo.addEventListener('click', getLocalStream)
-// btnRecvSendTransport.addEventListener('click', consume)
+btnRecvSendTransport.addEventListener('click', goConnect)
 btnCloseCall.addEventListener('click', closeCall)

server/ssl/cert-old.pem

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIUfpwrZVz3ogv3YeXbtL5wqIGEXGMwDQYJKoZIhvcNAQEL
-BQAwZzELMAkGA1UEBhMCUk8xDTALBgNVBAgMBEFsYmExDTALBgNVBAcMBEFsYmEx
-DDAKBgNVBAoMA0FBQTEQMA4GA1UEAwwHQUFBIENPTTEaMBgGCSqGSIb3DQEJARYL
-YXNkQGFzZC5jb20wHhcNMjUwMjE4MTAwMDM5WhcNMzUwMjE2MTAwMDM5WjBnMQsw
-CQYDVQQGEwJSTzENMAsGA1UECAwEQWxiYTENMAsGA1UEBwwEQWxiYTEMMAoGA1UE
-CgwDQUFBMRAwDgYDVQQDDAdBQUEgQ09NMRowGAYJKoZIhvcNAQkBFgthc2RAYXNk
-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7itjfKeuH5+f7c
-43gAI+ppmxiwvzqhHLmkmlQrVbSC+P93yGekHIuXpbM3sqGRnvSJL3c9SIEdtVVj
-yfJCs6KIsujxtiGn3hgQD01B6LqzFjSKnfYSGz8XDsjFW8cnpD1yRi3J7DhUjleM
-bhQ0ileu9joS2OOhf84mtOkXJyY8q9xJH4ypimogcR98eM6ewnrb5Vhjo8YDaix2
-6rceNmO/g4biknhXnBGc58/MnyAHtwzZxsu/k1IYtZuBYMPcAo7CQEX4XxXqQpaF
-zaaoEUYB8KzVDlsr+i5SJzLtrHkyiuJijHq6YyOFkTwUULuJ7Wz0YL1redDCZV4i
-EIVzBAcCAwEAAaNTMFEwHQYDVR0OBBYEFErSYY3J7ukx2KaRcHmazbMlKNBlMB8G
-A1UdIwQYMBaAFErSYY3J7ukx2KaRcHmazbMlKNBlMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAC3TQY6jMGeHIEDEYS7sUbNZxe+azdDlx0DdwgLK
-t+Zo2O40F55nVTZOUfypjCnLJnZitekptl5P6CPGrp2VX4/C0Ok4swwr+xamsjWt
-9RR9yG0IpVfnCEziT4dpBPhNf/6ilgdpnkJUWY3LO3BJhM4Js7rfP4D9NgEYHeSR
-YDN3TuEbi//bp43bhDh8EBQtDx9lPGOSUiKd3I7KfRttsxvLG2wBz3M5HXRc++6p
-pHE+64YfkwV5xZDvU2M/EqePLp7DdQ9g+vQ68FxI6jMCegBoz+ueyE9RhZOk/cUh
-uIXwIdFowjkUXgNncuGrR1gWf1mJVCHOsdnGZf3VSykGdWg=
------END CERTIFICATE-----

server/ssl/cert.pem

@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIID9TCCAt2gAwIBAgIJAJZHglUuIBjtMA0GCSqGSIb3DQEBCwUAMIGZMQswCQYD
+MIIEJTCCAw2gAwIBAgIURHg2am+RarQxIVY1f3CicUQgRowwDQYJKoZIhvcNAQEL
-VQQGEwJVUzERMA8GA1UECAwISWxsaW5vaXMxGDAWBgNVBAcMD1JvbGxpbmcgTWVh
+BQAwgaExCzAJBgNVBAYTAlJPMRIwEAYDVQQIDAlCdWNoYXJlc3QxEjAQBgNVBAcM
-ZGl3czEYMBYGA1UECgwPU2FmZW1vYmlsZSBMTEMuMQ0wCwYDVQQLDARMSU5YMQ0w
+CUJ1Y2hhcmVzdDETMBEGA1UECgwKU2FmZW1vYmlsZTETMBEGA1UECwwKU2FmZW1v
-CwYDVQQDDARMSU5YMSUwIwYJKoZIhvcNAQkBFhZzdXBwb3J0QHNhZmVtb2JpbGUu
+YmlsZTETMBEGA1UEAwwKU2FmZW1vYmlsZTErMCkGCSqGSIb3DQEJARYcbWloYWku
-Y29tMB4XDTI1MDIyNDEwMTAzNFoXDTM1MDIyMjEwMTAzNFowXjELMAkGA1UEBhMC
+Ym96aWVydUBzYWZlbW9iaWxlLmNvbTAeFw0yMjA4MDEyMjA0MjFaFw0zMjA3Mjky
-VVMxETAPBgNVBAgMCElsbGlub2lzMRgwFgYDVQQHDA9Sb2xsaW5nIE1lYWRpd3Mx
+MjA0MjFaMIGhMQswCQYDVQQGEwJSTzESMBAGA1UECAwJQnVjaGFyZXN0MRIwEAYD
-EzARBgNVBAoMClNhZmVtb2JpbGUxDTALBgNVBAMMBExJTlgwggEiMA0GCSqGSIb3
+VQQHDAlCdWNoYXJlc3QxEzARBgNVBAoMClNhZmVtb2JpbGUxEzARBgNVBAsMClNh
-DQEBAQUAA4IBDwAwggEKAoIBAQDEd8LMvdkD4CyZkwVYh4V/RIBMH8d9jK1Yvozd
+ZmVtb2JpbGUxEzARBgNVBAMMClNhZmVtb2JpbGUxKzApBgkqhkiG9w0BCQEWHG1p
-0kPSGrC+ZXemmF7qHAD5g8RDkg1odkVuZa+jj0KlKHKtReF0p9OB/J6fNavlD7mM
+aGFpLmJvemllcnVAc2FmZW1vYmlsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-UiAtEpEgoKx3VlhrYEtIoFk+EJWaN1WObhYNfPtEw8Ncfww1cyDNmOnsifkLg+yh
+DwAwggEKAoIBAQCSEk80aBAbmWtPBLcTjFLbvVmxuzDgzrjH7h2Hg/ly8lE/o2nZ
-+aNxXzrR3toRF7pxFehrTpMRxx4LiIN2z4vHCdelvu9yJspzRAWd5QSQ6eGr3OPY
+1T2ESSuaQFsxw54ukqbj1ooQXF1DoIxSp+CiNzf/FTB6BaMkaG0ayE2Wnm2wkjKp
-yn+9v4XfN0YgnWSbH8aJ24bysIB3vOtsULjOfNJivNcx+/gQ9yP4AFhycperiDcu
+POnAzZgTabJoB/qeUlr9i4xiAyBhiQDk5KjdWYHxeZnSznqfIOPzAdw7ZJVYvqvT
-GGTiw+fwk1y6e04XulQ65mgxGTXNHlnM2ZvDyOwDZqL89Uf3AgMBAAGjejB4MB8G
+GciHnoina5TzPUbpnLcR2LvHcLxuSuWQ6dTz/sfdZRx8lkbR3qltUazmJX+yxJJr
-A1UdIwQYMBaAFGQaM9lRXGKKghjag6SPD+uHK3K5MAkGA1UdEwQCMAAwCwYDVR0P
+kagq2V3cfpfLM8DOzPPEzuKHM6sK6ZgTqbc4ti+ul7Q1V+e0v2xNDtuYHkbaOuyd
-BAQDAgTwMB4GA1UdEQQXMBWHBMCoAceCDTE5Mi4xNjguMS4xOTkwHQYDVR0OBBYE
+ucmaZ3R++0ryoWWan5OFWZIKjttKy/yq8MUrAgMBAAGjUzBRMB0GA1UdDgQWBBSM
-FHNfBgu/Ixj2j6yDTiDluw6/i3cEMA0GCSqGSIb3DQEBCwUAA4IBAQAojT+cdzfU
+nlDraef71C/filHpA7dDpwmB7zAfBgNVHSMEGDAWgBSMnlDraef71C/filHpA7dD
-sVq/ODttG8wS23Du20W2iNdvlAwkgni0UgxTJQ12odtIH9WZAVS46G++t2so87Ki
+pwmB7zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBNySms9mXG
-gp6OK25AWtsQ7oLFK2P6VpaVGH6FwRSODFTly7Wv+7US7NmB/DO215+rG7q7C7Ag
+PVOmFAm9YjMjRY+cUpa0Gm6saxp9VOyrAg2KzdwG6LNGgauNsIra1ytM40NASspN
-J6zrsQgLPR6M6rZRrOs9Hd12oX6zRgEaYnbIc/Z1DVPRmCDiQISE5M8LihIO4sOW
+r+L49gUCmASUGOqeZCpJjkKAsGspQ4WQKKI6YW8h5dsSuud2qyQtm+w1RKDq+wih
-gmDacLhM9lbuMvbHEkCNnOuAzdWRmvR06CyBXmu/9iusyWYvgwI6bHFAZRYCOTmB
+A+B82xWXcFFd52gp6nerib4Pf9ATooOmBMCHFZwC+74sKCv7fXDlzLGdCII8lmI4
-+poHSGAlTmivcbNhHyZjS63NafRU7sSuc0JDzWQAdkA1AclSokfC8dJC6fnKBujY
+uq5eFrSS1NeT3iQCwGb9SHfyFkCliaEdpskqmWhonckN0tJVV118SvknV/h9oIsw
-o2WFKJMFrFS3
+uEMIib6YOBlrU+FInnpqpc8VuR4vv0Yro9XrvmurzLuN8k/lVVkr6NMzyNY9mbkF
+9p/Sxd5yIeam
 -----END CERTIFICATE-----

server/ssl/key-old.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+4rY3ynrh+fn+
-3ON4ACPqaZsYsL86oRy5pJpUK1W0gvj/d8hnpByLl6WzN7KhkZ70iS93PUiBHbVV
-Y8nyQrOiiLLo8bYhp94YEA9NQei6sxY0ip32Ehs/Fw7IxVvHJ6Q9ckYtyew4VI5X
-jG4UNIpXrvY6EtjjoX/OJrTpFycmPKvcSR+MqYpqIHEffHjOnsJ62+VYY6PGA2os
-duq3HjZjv4OG4pJ4V5wRnOfPzJ8gB7cM2cbLv5NSGLWbgWDD3AKOwkBF+F8V6kKW
-hc2mqBFGAfCs1Q5bK/ouUicy7ax5MoriYox6umMjhZE8FFC7ie1s9GC9a3nQwmVe
-IhCFcwQHAgMBAAECggEAMJWSjGuwUCDoZNqC2PGsMoczjxq5aWpFXejL0P2AoGOv
-jZJGwz5Nd6ge6BkWkbH3M8VQ+/fwotBVbYjrBwq8HvPNGaYf1bwctqIryt2qJw7a
-6X+Yid986NdtD2PQIsXvsyYJP7FDuuimnBjlkaX3yi6BhDF026co2OcYJ7WZZM0e
-nc6JR7wGFZM3Dw3ybFvGrK4k7/Iq2N6wqedzCOvDbLXUC16UtmRVIOuiuNm+THrl
-BiD37AKwB/LZRcdSQ1HeiWlK42Zc+IikHPJhl0PACcJNFNB3u2rdP8maSu5aMLku
-yHnKCz6w9C1vDKrI/iszW2QCky+mGBD9WKK2u6hxFQKBgQDtcfL8hMKj6Ki/dsqR
-McGPs1rLgZFAH9axubUth0uLdsEQDZtkoJIzXt8RLS3exuHMKt+Ln6YAOEhKm8Cl
-OqIg0E/8SNi7QryU9yfqFqcE2QBZL0QVtvYZeUuiHIOrpc0bmTdNvp8i7zWw/oz6
-ymeJ6vpEWKDpOvUnfm79XJbh+wKBgQDNzVjUNfo5s6QNnZlJvwI3J2mAsfLMVQxp
-++P41f+dUCoAsEPujxASthdDxRND9oIfsTodA+VkrlLhs1JyTe4PlPcfSl7D5QSV
-ayXVHF9iLbGM8fWMf6zBTebdaw9GqY3KTOHBH+X+JOHPP9dI6a4l7Ok8tFE9ia8M
-G8Ce7djUZQKBgDSfGDaWRXyFx0AHV4Ut/bOXD/whzsrjQ3VHrrtUTI2v18FzAoke
-fMgdslngJVZFxSy2I6yRyPwrfPnr4pm7kMqs380NZ9q4Q4rP62yZcJJGdSlOrEwT
-rB6hHv3iS9vydq4zGmqEYEghs0hyYVQDH0cVaDlVWvPVORdzka1co6OZAoGBAJHl
-TV/DlExrqZVtcEnzeyKWchimDjYE5PQNeiPhsYBYYC50xvPLv91D8WI9x9aaXs0Q
-2t3O8URawK74bS5TSL0LIdWw51WAeatjdkKKBqSXOBNvRGAB8vpmu4+kYgP6F2ae
-8jvy3R06EErYO0qZPrfsJ7y9KAq0HMA8vGTuwJRxAoGBAMfWJLseheDXKUXndnR9
-ovNA+spTTFECtoLwhWxwgoL3GYVqSA96RfnmdKHY4d5isQ1g/JN05Uo6bL7HKJCG
-BwS9WCsa6fHhbJR31fP16UQNNknNSwTtUoeJavwarQ7MB5CT9Fz5HsaC4NGaQkve
-86Barwb6tt4iu4Y8a2bcG/sE
------END PRIVATE KEY-----

server/ssl/key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+NJCbFR/lf4sqPO7zWJGyfU8fFVLuNspSW8AdLcsapOUSMhXTEU+vKbdWM+MYRNuk
-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
+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
-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
+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
-/jt0x6v3R/0c14kRXsd09RtcqvRL09jI2eZl+uAINAqtKXsGsSCQXwkiO/MQ0Klc
+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
-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
+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
-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
+7j4Iv8ok1c5xWM6N4GBNG9rKKOD7WQX4dD9IOs35pZqGDaNE44q7na9UabRFR92M
-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
+I+VAsi1Q2gQPyihW84ESXw6uH85pO5FfGO3fF/ppLXBCVYN85VT+1HFxG+Je2GXE
-bLEva8jWqQKBgBtpU/6C52H5bbQlqaVKsCOzvox7NFAOldGsU/Q4YKdcZW5foCOO
+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
-YW9jho5ua+UQdibVlytKpmwTk7Zb8VyKJA9hZII/1394f7vnrrozr2L0Pmqwm2+B
+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
-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
+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
-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
+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
-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
+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
-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
+u/SqOYnBvgndariQus2nDQYpx5unubwoxb8Vl/ECgYAV7nkyMjkakwbFyiAsUMz6
-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
+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
-bDdr3OCLeOMqwWAZervH+rx3gvWqq7cdfMLlmyLwljZEloGjd1gnA4ekNnYwS+c9
+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
-P4Hmmp4712UC4HkhQLSJ6HU=
+xvrhZIQLy0ujoDPPBE8+3Q==
 -----END PRIVATE KEY-----