LH-276: Update producer close event handler

Reviewed-on: #29
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>

.env

@@ -1,3 +1,7 @@
 PORT=3000
 IP=0.0.0.0 #	Listening IPv4 or IPv6.
-ANNOUNCED_IP=185.8.154.190 # 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=2000
+RTC_MAX_PORT=2020
+SERVER_CERT="./server/ssl/cert.pem"
+SERVER_KEY="./server/ssl/key.pem"

.gitignore

@@ -0,0 +1,2 @@
+/node_modules
+/dist

README.md

@@ -1,2 +1,41 @@
-Generate keys command:
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout key.pem -out cert.pem
+# Video server
+
+### Generating certificates
+
+##### To generate SSL certificates you must:
+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)
+
+
+### 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`)
+
+
+### 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
+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
+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)
+assetName = asset name of the unit on which you are doing the test
+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`

app.js

@@ -1,79 +1,87 @@
-import 'dotenv/config'
+require('dotenv').config();
 
+const express = require('express');
+const app = express();
+const Server = require('socket.io');
+const path = require('node:path');
+const fs = require('node:fs');
+let https;
+try {
+  https = require('node:https');
+} catch (err) {
+  console.log('https support is disabled!');
+}
+const mediasoup = require('mediasoup');
+
+let worker;
 /**
- * integrating mediasoup server with a node.js application
- */
-
-/* Please follow mediasoup installation requirements */
-/* https://mediasoup.org/documentation/v3/mediasoup/installation/ */
-import express from 'express'
-const app = express()
-
-import https from 'httpolyglot'
-import fs from 'fs'
-import path from 'path'
-const __dirname = path.resolve()
-
-import Server from 'socket.io'
-import mediasoup, { getSupportedRtpCapabilities } from 'mediasoup'
-
-let worker
-let router = {}
-let producerTransport
-let consumerTransport
-let producer
-let consumer
+ *
+ * videoCalls - Dictionary of Object(s)
+ * '<callId>': {
+ *  router: Router,
+ *  initiatorAudioProducer: Producer,
+ *  initiatorVideoProducer: Producer,
+ *  receiverVideoProducer: Producer,
+ *  receiverAudioProducer: Producer,
+ *  initiatorProducerTransport: Producer Transport,
+ *  receiverProducerTransport: Producer Transport,
+ *  initiatorConsumerVideo: Consumer,
+ *  initiatorConsumerAudio: Consumer,
+ *  initiatorConsumerTransport: Consumer Transport
+ *  initiatorSocket
+ *  receiverSocket
+ * }
+ *
+ **/
+let videoCalls = {};
+let socketDetails = {};
 
 app.get('/', (_req, res) => {
-  res.send('Hello from mediasoup app!')
-})
+  res.send('Hello from mediasoup app!');
+});
 
-app.use('/sfu', express.static(path.join(__dirname, 'public')))
+app.use('/sfu', express.static(path.join(__dirname, 'public')));
 
 // SSL cert for HTTPS access
 const options = {
-  key: fs.readFileSync('./server/ssl/key.pem', 'utf-8'),
-  cert: fs.readFileSync('./server/ssl/cert.pem', 'utf-8')
-}
+  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 httpsServer = https.createServer(options, app);
+
+const io = new Server(httpsServer, {
+  allowEIO3: true,
+  origins: ['*:*'],
+});
 
 httpsServer.listen(process.env.PORT, () => {
-  console.log('Listening on port:', process.env.PORT)
-})
+  console.log('Video server listening on port:', process.env.PORT);
+});
 
-const io = new Server(httpsServer)
-
-// socket.io namespace (could represent a room?)
-const peers = io.of('/mediasoup')
-
-/**
- * Worker
- * |-> Router(s)
- *     |-> Producer Transport(s)
- *         |-> Producer
- *     |-> Consumer Transport(s)
- *         |-> Consumer 
- **/
+const peers = io.of('/');
 
 const createWorker = async () => {
-  worker = await mediasoup.createWorker({
-    rtcMinPort: 2000,
-    rtcMaxPort: 2020,
-  })
-  console.log(`[createWorker] worker pid ${worker.pid}`)
+  try {
+    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 => {
-    // 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
-}
+    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}`);
+  }
+};
 
 // We create a Worker as soon as our application starts
-worker = createWorker()
+worker = createWorker();
 
 // This is an Array of RtpCapabilities
 // https://mediasoup.org/documentation/v3/mediasoup/rtp-parameters-and-capabilities/#RtpCodecCapability
@@ -93,183 +101,505 @@ const mediaCodecs = [
     parameters: {
       'x-google-start-bitrate': 1000,
     },
+    channels: 2,
   },
-]
+  {
+    kind: 'video',
+    mimeType: 'video/VP9',
+    clockRate: 90000,
+    parameters: {
+      'profile-id': 2,
+      'x-google-start-bitrate': 1000,
+    },
+  },
+  {
+    kind: 'video',
+    mimeType: 'video/h264',
+    clockRate: 90000,
+    parameters: {
+      'packetization-mode': 1,
+      'profile-level-id': '4d0032',
+      'level-asymmetry-allowed': 1,
+      'x-google-start-bitrate': 1000,
+    },
+  },
+  {
+    kind: 'video',
+    mimeType: 'video/h264',
+    clockRate: 90000,
+    parameters: {
+      'packetization-mode': 1,
+      'profile-level-id': '42e01f',
+      'level-asymmetry-allowed': 1,
+      'x-google-start-bitrate': 1000,
+    },
+  },
+];
 
-peers.on('connection', async socket => {
-  console.log('[connection] socketId:', socket.id)
+const closeCall = (callId) => {
+  try {
+    if (callId && videoCalls[callId]) {
+      videoCalls[callId].receiverVideoProducer?.close();
+      videoCalls[callId].receiverAudioProducer?.close();
+      videoCalls[callId].initiatorConsumerVideo?.close();
+      videoCalls[callId].initiatorConsumerAudio?.close();
+
+      videoCalls[callId]?.initiatorConsumerTransport?.close();
+      videoCalls[callId]?.receiverProducerTransport?.close();
+      videoCalls[callId]?.router?.close();
+      delete videoCalls[callId];
+      console.log(`[closeCall] | callId: ${callId}`);
+    }
+  } catch (error) {
+    console.error(`[closeCall] | ERROR | callId: ${callId} | error: ${error.message}`);
+  }
+};
+
+/*
+  - Handlers for WS events
+  - These are created only when we have a connection with a peer
+*/
+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,
-    existsProducer: producer ? true : false,
-  })
+  });
 
+  // It is triggered when the peer is disconnected
   socket.on('disconnect', () => {
-    // do some cleanup
-    console.log('peer disconnected')
-  })
+    const callId = socketDetails[socket.id];
+    console.log(`disconnect | socket ${socket.id} | callId ${callId}`);
+    delete socketDetails[socket.id];
+    closeCall(callId);
+  });
 
+  /*
+    - This event creates a room with the roomId and the callId sent
+    - It will return the rtpCapabilities of that room
+    - If the room already exists, it will not create it, but will only return rtpCapabilities
+  */
   socket.on('createRoom', async ({ callId }, callback) => {
-    if (router[callId] === undefined) {
-      // worker.createRouter(options)
-      // options = { mediaCodecs, appData }
-      // mediaCodecs -> defined above
-      // appData -> custom application data - we are not supplying any
-      // none of the two are required
-      router[callId] = await worker.createRouter({ mediaCodecs })
-      console.log(`[createRoom] Router ID: ${router[callId].id}`)
-    }
-    
-    getRtpCapabilities(callId, callback)
-  })
-
-  const getRtpCapabilities = (callId, callback) => {
-    const rtpCapabilities = router[callId].rtpCapabilities
-
-    callback({ rtpCapabilities })
-  }
-
-  // Client emits a request to create server side Transport
-  // We need to differentiate between the producer and consumer transports
-  socket.on('createWebRtcTransport', async ({ sender, callId }, callback) => {
-    console.log(`[createWebRtcTransport] Is this a sender request? ${sender} | callId ${callId}`)
-    // The client indicates if it is a producer or a consumer
-    // if sender is true, indicates a producer else a consumer
-    if (sender)
-      producerTransport = await createWebRtcTransportLayer(callId, callback)
-    else
-      consumerTransport = await createWebRtcTransportLayer(callId, callback)
-  })
-
-  // see client's socket.emit('transport-connect', ...)
-  socket.on('transport-connect', async ({ dtlsParameters }) => {
-    console.log('[transport-connect] DTLS PARAMS... ', { dtlsParameters })
-    await producerTransport.connect({ dtlsParameters })
-  })
-
-  // see client's socket.emit('transport-produce', ...)
-  socket.on('transport-produce', async ({ kind, rtpParameters, appData }, callback) => {
-    // call produce based on the prameters from the client
-    producer = await producerTransport.produce({
-      kind,
-      rtpParameters,
-    })
-
-    console.log(`[transport-produce] Producer ID: ${producer.id} | kind: ${producer.kind}`)
-
-    producer.on('transportclose', () => {
-      console.log('transport for this producer closed ')
-      producer.close()
-    })
-
-    // Send back to the client the Producer's id
-    callback({
-      id: producer.id
-    })
-  })
-
-  // see client's socket.emit('transport-recv-connect', ...)
-  socket.on('transport-recv-connect', async ({ dtlsParameters }) => {
-    console.log(`[transport-recv-connect] DTLS PARAMS: ${dtlsParameters}`)
-    await consumerTransport.connect({ dtlsParameters })
-  })
-
-  socket.on('consume', async ({ rtpCapabilities, callId }, callback) => {
+    let callbackResponse = null;
     try {
-      // check if the router can consume the specified producer
-      if (router[callId].canConsume({
-        producerId: producer.id,
-        rtpCapabilities
-      })) {
-        // transport can now consume and return a consumer
-        consumer = await consumerTransport.consume({
-          producerId: producer.id,
-          rtpCapabilities,
-          paused: true,
-        })
-
-        consumer.on('transportclose', () => {
-          console.log('transport close from consumer')
-        })
-
-        consumer.on('producerclose', () => {
-          console.log('producer of consumer closed')
-        })
-
-        // from the consumer extract the following params
-        // to send back to the Client
-        const params = {
-          id: consumer.id,
-          producerId: producer.id,
-          kind: consumer.kind,
-          rtpParameters: consumer.rtpParameters,
+      // We can continue with the room creation process only if we have a callId
+      if (callId) {
+        console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
+        if (!videoCalls[callId]) {
+          videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
+          console.log(`[createRoom] Generate Router ID: ${videoCalls[callId].router.id}`);
+          videoCalls[callId].receiverSocket = socket;
+        } else {
+          videoCalls[callId].initiatorSocket = socket;
         }
-
-        // send the parameters to the client
-        callback({ params })
+        socketDetails[socket.id] = callId;
+        // rtpCapabilities is set for callback
+        callbackResponse = {
+          rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
+        };
+      } else {
+        console.log(`[createRoom] missing callId: ${callId}`);
       }
     } catch (error) {
-      console.log(error.message)
-      callback({
-        params: {
-          error: error
-        }
-      })
+      console.error(`[createRoom] | ERROR | callId: ${callId} | error: ${error.message}`);
+    } finally {
+      callback(callbackResponse);
     }
-  })
+  });
 
-  socket.on('consumer-resume', async () => {
-    console.log(`[consumer-resume]`)
-    await consumer.resume()
-  })
-})
+  /*
+    - Client emits a request to create server side Transport
+    - Depending on the sender, a producer or consumer is created 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)
+      - If the client is a consumer(sender: false) then it will use parameters for device.createRecvTransport(params)
+  */
+  socket.on('createWebRtcTransport', async ({ sender }, callback) => {
+    try {
+      const callId = socketDetails[socket.id];
+      console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
+      if (sender) {
+        if (!videoCalls[callId].receiverProducerTransport && !isInitiator(callId, socket.id)) {
+          videoCalls[callId].receiverProducerTransport = 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)) {
+          videoCalls[callId].receiverConsumerTransport = await createWebRtcTransportLayer(callId, callback);
+        } else if (!videoCalls[callId].initiatorConsumerTransport && isInitiator(callId, socket.id)) {
+          videoCalls[callId].initiatorConsumerTransport = await createWebRtcTransportLayer(callId, callback);
+        }
+      }
+    } catch (error) {
+      console.error(`[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${error.message}`);
+      callback(error);
+    }
+  });
 
+  /*
+    - The client sends this event after successfully creating a createSendTransport(AS PRODUCER)
+    - The connection is made to the created transport
+  */
+  socket.on('transport-connect', async ({ dtlsParameters }) => {
+    try {
+      const callId = socketDetails[socket.id];
+      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 });
+    } catch (error) {
+      console.error(`[transport-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+    }
+  });
+
+  /*
+    - The event sent by the client (PRODUCER) after successfully connecting to receiverProducerTransport/initiatorProducerTransport
+    - For the router with the id callId, we make produce on receiverProducerTransport/initiatorProducerTransport
+    - Create the handler on producer at the 'transportclose' event
+    */
+  socket.on('transport-produce', async ({ kind, rtpParameters, appData }, callback) => {
+    try {
+      const callId = socketDetails[socket.id];
+      if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
+
+      console.log(`[transport-produce] callId: ${callId} | kind: ${kind} | socket: ${socket.id}`);
+
+      if (kind === 'video') {
+        if (!isInitiator(callId, socket.id)) {
+          videoCalls[callId].receiverVideoProducer = await videoCalls[callId].receiverProducerTransport.produce({
+            kind,
+            rtpParameters,
+          });
+
+          videoCalls[callId].receiverVideoProducer.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].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].receiverAudioProducer = await videoCalls[callId].receiverProducerTransport.produce({
+            kind,
+            rtpParameters,
+          });
+
+          videoCalls[callId].receiverAudioProducer.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].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}`);
+    }
+  });
+
+  /*
+    - The client sends this event after successfully creating a createRecvTransport(AS CONSUMER)
+    - The connection is made to the created consumerTransport
+  */
+  socket.on('transport-recv-connect', async ({ dtlsParameters }) => {
+    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 });
+      } 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}`);
+    }
+  });
+
+  /*
+    - The customer consumes after successfully connecting to consumerTransport
+    - The previous step was 'transport-recv-connect', and before that 'createWebRtcTransport'
+    - This event is only sent by the consumer
+    - The parameters that the consumer consumes are returned
+      - The consumer does consumerTransport.consume(params)
+  */
+  socket.on('consume', async ({ rtpCapabilities }, callback) => {
+    try {
+      const callId = socketDetails[socket.id];
+
+      if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
+
+      let canConsumeVideo, canConsumeAudio;
+      try {
+        if (isInitiator(callId, socket.id)) {
+          canConsumeVideo =
+            !!videoCalls[callId].receiverVideoProducer &&
+            !!videoCalls[callId].router.canConsume({
+              producerId: videoCalls[callId].receiverVideoProducer.id,
+              rtpCapabilities,
+            });
+          canConsumeAudio =
+            !!videoCalls[callId].receiverAudioProducer &&
+            !!videoCalls[callId].router.canConsume({
+              producerId: videoCalls[callId].receiverAudioProducer.id,
+              rtpCapabilities,
+            });
+        } 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,
+            });
+        }
+      } catch (error) {
+        console.error(`[consume] | ERROR | callId: ${callId} | error: ${error.message}`);
+      }
+      
+      console.log(`[consume] socket ${socket.id} | callId: ${callId} | canConsumeVideo: ${canConsumeVideo} | canConsumeAudio: ${canConsumeAudio}`);
+
+      if (canConsumeVideo && !canConsumeAudio) {
+        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
+        callback({ videoParams, audioParams: null });
+      } else if (canConsumeVideo && canConsumeAudio) {
+        const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
+        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
+        callback({ videoParams, audioParams });
+      } else if (!canConsumeVideo && canConsumeAudio) {
+        const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
+        const data = { videoParams: null, audioParams };
+        callback(data);
+      } else {
+        console.log(`[consume] Can't consume | callId ${callId}`);
+        callback(null);
+      }
+    } catch (error) {
+      console.error(`[consume] | ERROR | callId: ${socketDetails[socket.id]} | error: ${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', () => {
+     try {
+       const callId = socketDetails[socket.id];
+       const isInitiatorValue = isInitiator(callId, socket.id);
+       console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
+       if (isInitiatorValue) {
+           videoCalls[callId].initiatorConsumerVideo && videoCalls[callId].initiatorConsumerVideo.resume();
+           videoCalls[callId].initiatorConsumerAudio && videoCalls[callId].initiatorConsumerAudio.resume();
+       } else {
+           videoCalls[callId].receiverConsumerVideo && videoCalls[callId].receiverConsumerVideo.resume();
+           videoCalls[callId].receiverConsumerAudio && videoCalls[callId].receiverConsumerAudio.resume();
+       }
+     } catch (error) {
+       console.error(`[consumer-resume] | ERROR | callId: ${socketDetails[socket.id]} | isInitiator: ${isInitiator} | error: ${error.message}`);
+     }
+   });
+
+  socket.on('close-producer', ({ callId, kind}) => {
+    try {
+      if (isInitiator(callId, socket.id)) {
+        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 consumeVideo = async (callId, socketId, rtpCapabilities) => {
+  // Handlers for transports https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
+  if (isInitiator(callId, socketId)) {
+    videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
+      producerId: videoCalls[callId].receiverVideoProducer.id,
+      rtpCapabilities,
+      paused: true,
+    });
+
+    return {
+      id: videoCalls[callId].initiatorConsumerVideo.id,
+      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,
+      rtpCapabilities,
+      paused: true,
+    });
+
+    return {
+      id: videoCalls[callId].receiverConsumerVideo.id,
+      producerId: videoCalls[callId].initiatorVideoProducer.id,
+      kind: 'video',
+      rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
+    };
+  }
+};
+
+const consumeAudio = async (callId, socketId, rtpCapabilities) => {
+  if (isInitiator(callId, socketId)) {
+    videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
+      producerId: videoCalls[callId].receiverAudioProducer.id,
+      rtpCapabilities,
+      paused: true,
+    });
+
+    return {
+      id: videoCalls[callId].initiatorConsumerAudio.id,
+      producerId: videoCalls[callId].receiverAudioProducer.id,
+      kind: 'audio',
+      rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
+    };
+  } else {
+    videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
+      producerId: videoCalls[callId].initiatorAudioProducer.id,
+      rtpCapabilities,
+      paused: true,
+    });
+
+    return {
+      id: videoCalls[callId].receiverConsumerAudio.id,
+      producerId: videoCalls[callId].initiatorAudioProducer.id,
+      kind: 'audio',
+      rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
+    };
+  }
+};
+
+const isInitiator = (callId, socketId) => {
+  return videoCalls[callId]?.initiatorSocket?.id === socketId;
+};
+
+/*
+  - Called from at event 'createWebRtcTransport' and assigned to the consumer or producer transport
+  - 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)
+    - If the client is a consumer(sender: false) then it will use parameters for device.createRecvTransport(params)
+*/
 const createWebRtcTransportLayer = async (callId, callback) => {
   try {
+    console.log(`[createWebRtcTransportLayer] callId: ${callId}`);
     // https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
     const webRtcTransport_options = {
       listenIps: [
         {
           ip: process.env.IP, // Listening IPv4 or IPv6.
           announcedIp: process.env.ANNOUNCED_IP, // Announced IPv4 or IPv6 (useful when running mediasoup behind NAT with private IP).
-        }
+        },
       ],
       enableUdp: true,
       enableTcp: true,
       preferUdp: true,
-    }
-    
+    };
+
     // https://mediasoup.org/documentation/v3/mediasoup/api/#router-createWebRtcTransport
-    let transport = await router[callId].createWebRtcTransport(webRtcTransport_options)
-    console.log(`callId: ${callId} | transport id: ${transport.id}`)
+    let transport = await videoCalls[callId].router.createWebRtcTransport(webRtcTransport_options);
 
-    transport.on('dtlsstatechange', dtlsState => {
+    // Handler for when DTLS(Datagram Transport Layer Security) changes
+    transport.on('dtlsstatechange', (dtlsState) => {
+      console.log(`transport | dtlsstatechange | calldId ${callId} | dtlsState ${dtlsState}`);
       if (dtlsState === 'closed') {
-        transport.close()
+        transport.close();
       }
-    })
+    });
 
+    // Handler if the transport layer has closed (for various reasons)
     transport.on('close', () => {
-      console.log('transport closed')
-    })
+      console.log(`transport | closed | calldId ${callId}`);
+    });
 
-    // send back to the client the following prameters
-    callback({
-      // https://mediasoup.org/documentation/v3/mediasoup-client/api/#TransportOptions
-      params: {
-        id: transport.id,
-        iceParameters: transport.iceParameters,
-        iceCandidates: transport.iceCandidates,
-        dtlsParameters: transport.dtlsParameters,
-      }
-    })
+    const params = {
+      id: transport.id,
+      iceParameters: transport.iceParameters,
+      iceCandidates: transport.iceCandidates,
+      dtlsParameters: transport.dtlsParameters,
+    };
 
-    return transport
+    // Send back to the client the params
+    callback({ params });
 
+    // Set transport to producerTransport or consumerTransport
+    return transport;
   } catch (error) {
-    callback({
-      params: {
-        error: error
-      }
-    })
+    console.error(`[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
+    callback({ params: { error } });
   }
-}
+};

build.sh

@@ -0,0 +1,53 @@
+#/!bin/bash
+## PREBUILD PROCESS
+# check dist dir to be present and empty
+if [ ! -d "dist" ]; then
+  ## MAKE DIR
+  mkdir "dist"
+  echo "Directory dist created."
+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"
+#Add version control for pm2
+cd dist
+#Add version control for pm2
+version=$(git describe)
+file_pkg="package.json"
+key="  \"version\": \""
+
+count=$(echo ${version%%-*} | grep -o "\." | wc -l)
+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
+
+cd -

package.json

@@ -5,26 +5,28 @@
   "main": "app.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "nodemon app.js",
+    "start:dev": "nodemon app.js",
+    "start:prod": "pm2 start ./app.js -n video-server",
     "watch": "watchify public/index.js -o public/bundle.js -v"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "type": "module",
   "dependencies": {
+    "@types/express": "^4.17.13",
     "dotenv": "^16.0.1",
     "express": "^4.18.1",
-    "httpolyglot": "^0.1.2",
     "mediasoup": "^3.10.4",
     "mediasoup-client": "^3.6.54",
+    "parcel": "^2.7.0",
     "socket.io": "^2.0.3",
-    "socket.io-client": "^2.0.3",
-    "nodemon": "^2.0.19",
-    "watchify": "^4.0.0"
+    "socket.io-client": "^2.0.3"
   },
   "devDependencies": {
     "nodemon": "^2.0.19",
+    "pm2": "^5.2.0",
+    "ts-node": "^10.9.1",
+    "ts-node-dev": "^2.0.0",
     "watchify": "^4.0.0"
   }
 }

public/config.js

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

public/index.html

@@ -21,11 +21,22 @@
             display: flex;
             justify-content: center;
         }
+
+        #closeCallBtn {
+            padding: 5;
+            background-color: papayawhip;
+            display: flex;
+            justify-content: center;
+            width: 736px;
+        }
     </style>
   </head>
   <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>
@@ -35,12 +46,24 @@
                     <tr>
                         <td>
                             <div id="sharedBtns">
-                                <video id="localVideo" autoplay class="video" ></video>
+                                <video
+                                    id="localVideo"
+                                    class="video"
+                                    autoplay
+                                    muted
+                                    playsinline
+                                ></video>
                             </div>
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <video id="remoteVideo" autoplay class="video" ></video>
+                                <video
+                                    id="remoteVideo"
+                                    class="video"
+                                    autoplay
+                                    muted
+                                    playsinline
+                                ></video>
                             </div>
                         </td>
                     </tr>
@@ -52,39 +75,16 @@
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <button id="btnRecvSendTransport">Consume</button>
-                            </div>
-                        </td>
-                        <td class="remoteColumn">
-                            <div id="videoContainer"></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>
+                                <!-- <button id="btnRecvSendTransport">Consume</button> -->
+                                <button id="remoteSoundControl">Unmute</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">
+                <button id="btnCloseCall" disabled>Close Call</button>
+            </div>
         </div>
     </body>
   </body>

public/index.js

@@ -6,145 +6,214 @@ console.log('[CONFIG]', config);
 
 const ASSET_ID = parseInt(urlParams.get('assetId')) || null;
 const ACCOUNT_ID = parseInt(urlParams.get('accountId')) || null;
+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)
 
-let socket 
-hub = io(config.hubAddress)
+console.log('🟩 config', config)
 
-const connectToMediasoup = () => {
-
-  socket = io(config.mediasoupAddress)
-
-  socket.on('connection-success', ({ _socketId, existsProducer }) => {
-    console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
-    if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
-      goConnect()
-      // document.getElementById('btnRecvSendTransport').click();
+produceAudioSelector = document.getElementById('produceAudio');
+produceAudioSelector.addEventListener('change', e => {
+    if(e.target.checked) {
+      produceAudio = true
+      console.log('produce audio');
+    } else {
+      produceAudio = false
     }
-    if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
-  })
-}
-
-if (IS_PRODUCER === true) {
-  hub.on('connect', async () => {
-    console.log(`[HUB] ${config.hubAddress} | connected: ${hub.connected}`)
-    connectToMediasoup()
-
-    hub.emit(
-      'ars',
-      JSON.stringify({
-        ars: true,
-        asset_id: ASSET_ID,
-        account_id: ACCOUNT_ID,
-      })
-    );
-  
-    hub.on('video', (data) => {
-      const parsedData = JSON.parse(data);
-      console.log('video', parsedData)
-      originAssetId = parsedData.origin_asset_id;
-      originAssetName = parsedData.origin_asset_name;
-      originAssetTypeName = parsedData.origin_asset_type_name;
-      callId = parsedData.video_call_id;
-  
-      console.log('IS_PRODUCER', IS_PRODUCER, 'callId', callId);
-      
-      if (parsedData.type === 'notify-request' && IS_PRODUCER) {
-        getLocalStream()
-      }
-    })
-  })
-
-  hub.on('connect_error', (error) => {
-    console.log('connect_error', error);
-  });
-  
-  hub.on('connection', () => {
-    console.log('connection')
-  })
-  
-  hub.on('disconnect', () => {
-    console.log('disconnect')
-  })
-} else {
-  connectToMediasoup()
-}
+});
 
+let socket, hub
 let device
 let rtpCapabilities
 let producerTransport
 let consumerTransport
-let producer
+let producerVideo
+let producerAudio
 let consumer
 let originAssetId
-let originAssetName
-let originAssetTypeName
+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
-let params = {
-  // mediasoup params
+let videoParams = {
   encodings: [
-    {
-      rid: 'r0',
-      maxBitrate: 100000,
-      scalabilityMode: 'S1T3',
-    },
-    {
-      rid: 'r1',
-      maxBitrate: 300000,
-      scalabilityMode: 'S1T3',
-    },
-    {
-      rid: 'r2',
-      maxBitrate: 900000,
-      scalabilityMode: 'S1T3',
-    },
+    { scaleResolutionDownBy: 4, maxBitrate: 500000 },
+    { scaleResolutionDownBy: 2, maxBitrate: 1000000 },
+    { scaleResolutionDownBy: 1, maxBitrate: 5000000 },
+    { scalabilityMode: 'S3T3_KEY' }
   ],
-  // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerCodecOptions
   codecOptions: {
     videoGoogleStartBitrate: 1000
   }
 }
 
-const streamSuccess = (stream) => {
-  localVideo.srcObject = stream
-  const track = stream.getVideoTracks()[0]
-  params = {
-    track,
-    ...params
+let audioParams = {
+  codecOptions :
+  {
+    opusStereo : true,
+    opusDtx    : true
   }
+}
+
+setTimeout(() => {
+  hub = io(config.hubAddress)
+  
+  const connectToMediasoup = () => {
+  
+    socket = io(config.mediasoupAddress, {
+      reconnection: true,
+      reconnectionDelay: 1000,
+      reconnectionDelayMax : 5000,
+      reconnectionAttempts: Infinity
+    })
+  
+    socket.on('connection-success', ({ _socketId, existsProducer }) => {
+      console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
+      if (!IS_PRODUCER && existsProducer && consumer === undefined) { 
+        goConnect()
+      }
+      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) {
+    hub.on('connect', async () => {
+      console.log(`[HUB]! ${config.hubAddress} | connected: ${hub.connected}`)
+      connectToMediasoup()
+  
+      hub.emit(
+        'ars',
+        JSON.stringify({
+          ars: true,
+          asset_id: ASSET_ID,
+          account_id: ACCOUNT_ID,
+        })
+      )
+    
+      hub.on('video', (data) => {
+        const parsedData = JSON.parse(data);
+  
+        if (parsedData.type === 'notify-request') {
+        console.log('video', parsedData)
+        originAssetId = parsedData.origin_asset_id;
+        // originAssetName = parsedData.origin_asset_name;
+        // originAssetTypeName = parsedData.origin_asset_type_name;
+        callId = parsedData.video_call_id;
+    
+          console.log('[VIDEO] notify-request | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
+          getLocalStream()
+        }
+  
+        if (parsedData.type === 'notify-end') {
+          console.log('[VIDEO] notify-end | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
+          resetCallSettings()
+        }
+      })
+    })
+  
+    hub.on('connect_error', (error) => {
+      console.log('connect_error', error);
+    });
+    
+    hub.on('connection', () => {
+      console.log('connection')
+    })
+    
+    hub.on('disconnect', () => {
+      console.log('disconnect')
+    })
+  } else {
+    connectToMediasoup()
+  }
+
+}, 1600);
+
+const streamSuccess = (stream) => {
+  console.log('[streamSuccess] device', device);
+  localVideo.srcObject = stream
+  console.log('stream', stream);
+  const videoTrack = stream.getVideoTracks()[0]
+  const audioTrack = stream.getAudioTracks()[0]
+
+  videoParams = {
+    track: videoTrack,
+    ...videoParams
+  }
+
+  audioParams = {
+    track: audioTrack,
+    ...audioParams
+  }
+
+  console.log('[streamSuccess] videoParams', videoParams, ' | audioParams', audioParams);
   goConnect()
 }
 
 const getLocalStream = () => {
   console.log('[getLocalStream]');
   navigator.mediaDevices.getUserMedia({
-    audio: false,
+    audio: produceAudio ? true : false,
     video: {
-      width: {
-        min: 640,
-        max: 1920,
-      },
-      height: {
-        min: 400,
-        max: 1080,
-      }
+      qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
+      vga  : { width: { ideal: 640 }, height: { ideal: 480 } },
+      hd   : { width: { ideal: 1280 }, height: { ideal: 720 } }
     }
   })
   .then(streamSuccess)
   .catch(error => {
     console.log(error.message)
   })
+
+  navigator.permissions.query(
+    { name: 'microphone' }
+  ).then((permissionStatus) =>{
+    console.log('🟨 [PERMISSION] permissionStatus', permissionStatus); // granted, denied, prompt
+    // It will block the code from execution and display "Permission denied" if we don't have microphone permissions
+  })
+
 }
 
 const goConnect = () => {
+  console.log('[goConnect] device:', device);
   device === undefined ? getRtpCapabilities() : goCreateTransport()
 }
 
 const goCreateTransport = () => {
+  console.log('[goCreateTransport] IS_PRODUCER:', IS_PRODUCER);
   IS_PRODUCER ? createSendTransport() : createRecvTransport()
 }
 
@@ -162,7 +231,8 @@ const createDevice = async () => {
     })
 
     console.log('Device RTP Capabilities', device.rtpCapabilities)
-
+    console.log('[createDevice] device', device);
+    
     // once the device loads, create transport
     goCreateTransport()
 
@@ -174,6 +244,7 @@ const createDevice = async () => {
 }
 
 const getRtpCapabilities = () => {
+  console.log('[getRtpCapabilities]');
   // make a request to the server for Router RTP Capabilities
   // see server's socket.on('getRtpCapabilities', ...)
   // the server sends back data object which contains rtpCapabilities
@@ -190,18 +261,20 @@ const getRtpCapabilities = () => {
 }
 
 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, callId }, ({ params }) => {
+  socket.emit('createWebRtcTransport', { sender: true }, (value) => {
+
+    console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
+
+    const params = value.params;
     // The server sends back params needed 
     // to create Send Transport on the client side
     if (params.error) {
       console.log(params.error)
       return
     }
-
-    console.log(params)
-
     // creates a new WebRTC Transport to send media
     // based on the server's producer transport params
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#TransportOptions
@@ -227,10 +300,10 @@ const createSendTransport = () => {
     })
 
     producerTransport.on('produce', async (parameters, callback, errback) => {
-      console.log(parameters)
+      console.log('[produce] parameters', parameters)
 
       try {
-        // tell the server to create a Producer
+        // Tell the server to create a Producer
         // with the following parameters and produce
         // and expect back a server side producer id
         // see server's socket.on('transport-produce', ...)
@@ -253,32 +326,55 @@ const createSendTransport = () => {
 }
 
 const connectSendTransport = async () => {
-  // we now call produce() to instruct the producer transport
+
+  console.log('[connectSendTransport] producerTransport');
+
+  // We now call produce() to instruct the producer transport
   // to send media to the Router
   // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
   // this action will trigger the 'connect' and 'produce' events above
-  producer = await producerTransport.produce(params)
+  
+  // Produce video
+  let producerVideoHandler = await producerTransport.produce(videoParams)
+  console.log('videoParams', videoParams);
+  console.log('producerVideo', producerVideo);
 
-  producer.on('trackended', () => {
+  producerVideoHandler.on('trackended', () => {
     console.log('track ended')
-
     // close video track
-  })
+  })  
 
-  producer.on('transportclose', () => {
+  producerVideoHandler.on('transportclose', () => {
     console.log('transport ended')
     // close video track
-  })
+  })    
+  
+  // Produce audio
+  if (produceAudio) {
+    let producerAudioHandler = await producerTransport.produce(audioParams)
+    console.log('audioParams', audioParams);
+    console.log('producerAudio', producerAudio);
+  
+    producerAudioHandler.on('trackended', () => {
+      console.log('track ended')
+      // close audio track
+    })
+  
+    producerAudioHandler.on('transportclose', () => {
+      console.log('transport ended')
+      // close audio track
+    })
+  }
 
   const answer = {
     origin_asset_id: ASSET_ID,
     dest_asset_id: originAssetId || parseInt(urlParams.get('dest_asset_id')),
     type: 'notify-answer',
     origin_asset_priority: 1,
-    origin_asset_type_name: originAssetTypeName,
-    origin_asset_name: originAssetName,
+    origin_asset_type_name: ASSET_TYPE,
+    origin_asset_name: ASSET_NAME,
     video_call_id: callId,
-    answer: 'accepted', // answer: 'rejected'
+    answer: 'accepted', // answer: accepted/rejected
   };
   console.log('SEND answer', answer);
 
@@ -286,11 +382,17 @@ const connectSendTransport = async () => {
     'video',
     JSON.stringify(answer)
   );
+
+  // Enable Close call button
+  const closeCallBtn = document.getElementById('btnCloseCall');
+  closeCallBtn.removeAttribute('disabled');
+
+  createRecvTransport();
 }
 
 const createRecvTransport = async () => {
   console.log('createRecvTransport');
-  // see server's socket.on('consume', sender?, ...)
+  // See server's socket.on('consume', sender?, ...)
   // this is a call from Consumer, so sender = false
   await socket.emit('createWebRtcTransport', { sender: false, callId }, ({ params }) => {
     // The server sends back params needed 
@@ -300,15 +402,15 @@ const createRecvTransport = async () => {
       return
     }
 
-    console.log(params)
+    console.log('[createRecvTransport] params', params)
 
-    // creates a new WebRTC Transport to receive media
+    // Creates a new WebRTC Transport to receive media
     // based on server's consumer transport params
     // https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-createRecvTransport
     consumerTransport = device.createRecvTransport(params)
 
     // https://mediasoup.org/documentation/v3/communication-between-client-and-server/#producing-media
-    // this event is raised when a first call to transport.produce() is made
+    // This event is raised when a first call to transport.produce() is made
     // see connectRecvTransport() below
     consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
       try {
@@ -325,45 +427,202 @@ const createRecvTransport = async () => {
         errback(error)
       }
     })
-    connectRecvTransport()
+    // We call it in new-rpoducer, we don't need it here anymore
+    // connectRecvTransport()
   })
 }
 
+const resetCallSettings = () => {
+  localVideo.srcObject = null
+  remoteVideo.srcObject = null
+  consumer = null
+  producerVideo = null
+  producerAudio = null
+  producerTransport = null
+  consumerTransport = null
+  device = undefined
+}
+
 const connectRecvTransport = async () => {
   console.log('connectRecvTransport');
-  // for consumer, we need to tell the server first
+  // For consumer, we need to tell the server first
   // to create a consumer based on the rtpCapabilities and consume
   // if the router can consume, it will send back a set of params as below
   await socket.emit('consume', {
     rtpCapabilities: device.rtpCapabilities,
     callId
-  }, async ({ params }) => {
-    if (params.error) {
-      console.log('Cannot Consume')
-      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
+  }, async ({videoParams, audioParams}) => {
+    console.log(`[consume] 🟩 videoParams`, videoParams)
+    console.log(`[consume] 🟩 audioParams`, audioParams)
+    console.log('[consume] 🟩 consumerTransport', consumerTransport)
 
     let stream = new MediaStream()
-    stream.addTrack(track)
-    // stream.removeTrack(track)
-    remoteVideo.srcObject = stream
-    socket.emit('consumer-resume')
-    console.log('consumer', consumer);
 
+    // Maybe the unit does not produce video or audio, so we must only consume what is produced
+    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)
+
+    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
+  }) 
+
+  consumerVideo.on('transportclose', () => {
+    console.log('transport closed so consumer closed')
+  })
+
+  consumerVideo.on('producerclose', () => {
+    console.log('===================1 consumerVideo producerclose');
+  });
+
+  consumerVideo.on("producerclose", () => {
+    console.log('====================2 consumerVideo producerclose');
+  })
+  consumerVideo.on("close", () => {
+    console.log('====================3 consumerVideo producerclose');
+  })
+  consumerVideo.on("close-producer", () => {
+    console.log('====================4 consumerVideo producerclose');
+  })
+
+
+
+  consumerVideo.observer.on('producerclose', () => {
+    console.log('===================11 consumerVideo producerclose');
+  });
+
+  consumerVideo.observer.on("producerclose", () => {
+    console.log('====================22 consumerVideo producerclose');
+  })
+  consumerVideo.observer.on("close", () => {
+    console.log('====================33 consumerVideo producerclose');
+  })
+  consumerVideo.observer.on("close-producer", () => {
+    console.log('====================44 consumerVideo producerclose');
+  })
+
+  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')
+  })
+
+  consumerAudio.on('producerclose', () => {
+    console.log('===================1 consumerAudio producerclose');
+  });
+
+  consumerAudio.on("producerclose", () => {
+    console.log('====================2 consumerAudio producerclose');
+  })
+
+  const audioTrack = consumerAudio.track
+
+  audioTrack.applyConstraints({
+    audio: {
+      advanced: [
+        {
+          echoCancellation: {exact: true}
+        },
+        {
+          autoGainControl: {exact: true}
+        },
+        {
+          noiseSuppression: {exact: true}
+        }, 
+        {
+          highpassFilter: {exact: true}
+        }
+      ]
+    }
+  })
+
+  return audioTrack
+}
+
+const closeCall = () => {
+  console.log('closeCall');
+  
+  // Emit 'notify-end' to Hub so the consumer will know to close the video
+  const notifyEnd = {
+      origin_asset_id: ASSET_ID,
+      dest_asset_id: originAssetId || parseInt(urlParams.get('dest_asset_id')),
+      type: 'notify-end', 
+    video_call_id: callId
+  }
+  console.log('notifyEnd', notifyEnd)
+  hub.emit('video', JSON.stringify(notifyEnd))
+
+  // Disable Close call button
+  const closeCallBtn = document.getElementById('btnCloseCall')
+  closeCallBtn.setAttribute('disabled', '')
+
+  // Reset settings
+  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', goConnect)
+// btnRecvSendTransport.addEventListener('click', consume)
+btnCloseCall.addEventListener('click', closeCall)

server/ssl/cert.pem

@@ -1,24 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIUaoTnmT3ltr9S5ysxQIXoLOHM6IYwDQYJKoZIhvcNAQEL
-BQAwgZYxCzAJBgNVBAYTAlJPMQ0wCwYDVQQIDARBTEJBMRMwEQYDVQQHDApBTEJB
-IElVTElBMRMwEQYDVQQKDApTQUZFTU9CSUxFMRIwEAYDVQQLDAlBSVJXSVpBUkQx
-DzANBgNVBAMMBlNFUkdJVTEpMCcGCSqGSIb3DQEJARYac2VyZ2l1LnRvbWFAc2Fm
-ZW1vYmlsZS5jb20wHhcNMjIwNzIwMTgwNzMzWhcNMzIwNzE3MTgwNzMzWjCBljEL
-MAkGA1UEBhMCUk8xDTALBgNVBAgMBEFMQkExEzARBgNVBAcMCkFMQkEgSVVMSUEx
-EzARBgNVBAoMClNBRkVNT0JJTEUxEjAQBgNVBAsMCUFJUldJWkFSRDEPMA0GA1UE
-AwwGU0VSR0lVMSkwJwYJKoZIhvcNAQkBFhpzZXJnaXUudG9tYUBzYWZlbW9iaWxl
-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL+KCJzVjXipimVc
-wYOwemwSQRsF/4qkWliZJBdgs6foCd8lFG2JUqMrHPruhOJA3Ue/5Xw3HXi8s34X
-EDVxRqZEOC9KSZg15Z/9dtF83PrShR0TslqS+JIfcNHBDryYihzuMoQLLucqBVzF
-dj+RKRTtor8WesNILa4ivGnr55Tq26qAVAv6CV6tyGRpHSfAOCdjr9ViLHQsNvFd
-+NBcCIbABAWyXfzGLl4iEdcu7zZxTE2Q+MRURTPJNIcDLrr2QL7VF/7vbp7iuKUE
-sPi/iXyZtyMTkjgyQA/OSY1JXWVSWtIYTHumbx1xQ/jR3CCwTPxXL5aMuT6fq4eC
-7GZhodECAwEAAaNTMFEwHQYDVR0OBBYEFBWHLoyJtgWVDFIEguh3ZVcmgbGbMB8G
-A1UdIwQYMBaAFBWHLoyJtgWVDFIEguh3ZVcmgbGbMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBAAOzDIR4K2BKKoD/retoVNyFtHSKXs2FU1UIR2QP
-NJvS9GbkQW/jMYxehHJ9jxB7AVoq+ice8kyhipFYYOPRm9WEouF+BvFyQD1bhrD1
-b5kJMKOTcTuqqlRWgECrIZT/oumgujkAT6xulPu+jSbV3XyEp4rJq4E6lks1y8RG
-4hdllhfLtmE06hqBgtSVxHg4y0PgKkn0rU+2V7ZaPDc5IViGKbFo/lZI1iW3nD9Y
-UmATM2co6zImrpt/bfBByfwpdZevpEKzSilbQ06JcGEtUm90U1Qzi0YLSv40aUYD
-jSYmcpuMoI4vLSIFpPYRAIRbvEwmdwiwCd0CcPWAY98CzhQ=
+MIIEJTCCAw2gAwIBAgIURHg2am+RarQxIVY1f3CicUQgRowwDQYJKoZIhvcNAQEL
+BQAwgaExCzAJBgNVBAYTAlJPMRIwEAYDVQQIDAlCdWNoYXJlc3QxEjAQBgNVBAcM
+CUJ1Y2hhcmVzdDETMBEGA1UECgwKU2FmZW1vYmlsZTETMBEGA1UECwwKU2FmZW1v
+YmlsZTETMBEGA1UEAwwKU2FmZW1vYmlsZTErMCkGCSqGSIb3DQEJARYcbWloYWku
+Ym96aWVydUBzYWZlbW9iaWxlLmNvbTAeFw0yMjA4MDEyMjA0MjFaFw0zMjA3Mjky
+MjA0MjFaMIGhMQswCQYDVQQGEwJSTzESMBAGA1UECAwJQnVjaGFyZXN0MRIwEAYD
+VQQHDAlCdWNoYXJlc3QxEzARBgNVBAoMClNhZmVtb2JpbGUxEzARBgNVBAsMClNh
+ZmVtb2JpbGUxEzARBgNVBAMMClNhZmVtb2JpbGUxKzApBgkqhkiG9w0BCQEWHG1p
+aGFpLmJvemllcnVAc2FmZW1vYmlsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCSEk80aBAbmWtPBLcTjFLbvVmxuzDgzrjH7h2Hg/ly8lE/o2nZ
+1T2ESSuaQFsxw54ukqbj1ooQXF1DoIxSp+CiNzf/FTB6BaMkaG0ayE2Wnm2wkjKp
+POnAzZgTabJoB/qeUlr9i4xiAyBhiQDk5KjdWYHxeZnSznqfIOPzAdw7ZJVYvqvT
+GciHnoina5TzPUbpnLcR2LvHcLxuSuWQ6dTz/sfdZRx8lkbR3qltUazmJX+yxJJr
+kagq2V3cfpfLM8DOzPPEzuKHM6sK6ZgTqbc4ti+ul7Q1V+e0v2xNDtuYHkbaOuyd
+ucmaZ3R++0ryoWWan5OFWZIKjttKy/yq8MUrAgMBAAGjUzBRMB0GA1UdDgQWBBSM
+nlDraef71C/filHpA7dDpwmB7zAfBgNVHSMEGDAWgBSMnlDraef71C/filHpA7dD
+pwmB7zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBNySms9mXG
+PVOmFAm9YjMjRY+cUpa0Gm6saxp9VOyrAg2KzdwG6LNGgauNsIra1ytM40NASspN
+r+L49gUCmASUGOqeZCpJjkKAsGspQ4WQKKI6YW8h5dsSuud2qyQtm+w1RKDq+wih
+A+B82xWXcFFd52gp6nerib4Pf9ATooOmBMCHFZwC+74sKCv7fXDlzLGdCII8lmI4
+uq5eFrSS1NeT3iQCwGb9SHfyFkCliaEdpskqmWhonckN0tJVV118SvknV/h9oIsw
+uEMIib6YOBlrU+FInnpqpc8VuR4vv0Yro9XrvmurzLuN8k/lVVkr6NMzyNY9mbkF
+9p/Sxd5yIeam
 -----END CERTIFICATE-----

server/ssl/key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/igic1Y14qYpl
-XMGDsHpsEkEbBf+KpFpYmSQXYLOn6AnfJRRtiVKjKxz67oTiQN1Hv+V8Nx14vLN+
-FxA1cUamRDgvSkmYNeWf/XbRfNz60oUdE7JakviSH3DRwQ68mIoc7jKECy7nKgVc
-xXY/kSkU7aK/FnrDSC2uIrxp6+eU6tuqgFQL+glerchkaR0nwDgnY6/VYix0LDbx
-XfjQXAiGwAQFsl38xi5eIhHXLu82cUxNkPjEVEUzyTSHAy669kC+1Rf+726e4ril
-BLD4v4l8mbcjE5I4MkAPzkmNSV1lUlrSGEx7pm8dcUP40dwgsEz8Vy+WjLk+n6uH
-guxmYaHRAgMBAAECggEAC3GIRTJ/EsvyUE8D4sXK8qT+jcpEc7iRC0UPAnSNF0WG
-PXY+K7MuJECBqT5R4yCj99Lvt4WldZ60jJ59IexEH8/omW6zSexCbVYb4LU4kKW+
-PTf9imrIfhZxy55groTgj4ztqLTwVvBMRLgpce/OyAjQleEWcY9g50v8/MkS23M4
-HU+KdRBBB/StI+9uSHQf5XP6nok8dRKGPE0IvAlCM5H0iran6Er0+jMlIq7TwYzX
-940h4DVf9AaUiI8UTUkvp8odtRDYNrICPRnMsm2McmpEvlhHE34/L0gLiwdaz/PZ
-xK/LvexscmfYrWjDbdoXndKsuoWmi8w3/mjXlAKSFwKBgQDKBQtp/uCVKzFn9jaA
-3v6ElUKVW0UPAS9pvH9NSZ1Fw5ZxgOieWraZ5zUVhP7DOz7uSWdleB31cN1sLLD+
-WqhCD0T6XYtwWxYNTtLiB8Pvuufp432gYula9FctC6GF+q2o5OSa6VfIaT94TfXs
-eHB7V5txx3rFu7Y7G+rpSvgGCwKBgQDyuBSGXukAEgeh3qYPMv2iE4bdT9qwLVM3
-Iq0b2LvNmBlAniSe2QXJrLGY/E/71gViRd0up16sgthkq4y/Nc7EVa3ELVXrAenV
-Zv656ArPVr/hirUSPpe7p12whk3riKziy+swyffueIw2WlA6JssM2ghdZDZlknzr
-hlAPmsPtEwKBgGIoL1KSH8b61Kehzvuw3dPHvjFZxmUy+zmR9/yyjvMNxHRj4SLI
-Cr8ewwEwvKRZjgszqUR5J31RGJTt5hXAMM7gInDPsOenqkBPE1H12fMKSpKvESQz
-yxSBcjYV16aElYphpN3MEPX0hX1Ly/jY0DZt675N4U5gFXwE5Y/y+C3fAoGBAJYG
-3ID2F3V4r4kJc4F/ljDhewI/AsDVM1OoNnI49FSviCRd2+rn4GD5Qsl6ZAIZFzjY
-UFAvGiDtu832D8h8/PJ0tzTEhQ//HcdPo3HMESp5x58kuqmtUOKoIAwl5/IHiD2j
-qBt/K6YWkyxhhKd9JRMrjfIUKF9+PYLjgYcztZlLAoGAE4KgqwduWPiOOqI5BdId
-Rq/x6JOoIVlDMKxTS4MLCrdt7RZaEOJZOZ6KDTMcTyh6uqIYQiu9eENMtZjWfA0Q
-l0p3yZjLMHh5lTVhbJTsMfp1Etut9yVZPG+7P9+XevTac/t2CNAs+xrXES/b5M8Y
-Eq7JQiVhWZZ4CGNRcQb+y34=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCSEk80aBAbmWtP
+BLcTjFLbvVmxuzDgzrjH7h2Hg/ly8lE/o2nZ1T2ESSuaQFsxw54ukqbj1ooQXF1D
+oIxSp+CiNzf/FTB6BaMkaG0ayE2Wnm2wkjKpPOnAzZgTabJoB/qeUlr9i4xiAyBh
+iQDk5KjdWYHxeZnSznqfIOPzAdw7ZJVYvqvTGciHnoina5TzPUbpnLcR2LvHcLxu
+SuWQ6dTz/sfdZRx8lkbR3qltUazmJX+yxJJrkagq2V3cfpfLM8DOzPPEzuKHM6sK
+6ZgTqbc4ti+ul7Q1V+e0v2xNDtuYHkbaOuyducmaZ3R++0ryoWWan5OFWZIKjttK
+y/yq8MUrAgMBAAECggEAMRH1iaVrw9nGMsViuy5op2j0uMApq1vGt2NGiD/NjM/a
+e4ZqCMOZ5tatzyPPfug4O20Io4Fu4BAnRJCqkxnSXKwwI4D6yAMcyx5JiLXBWtfe
+AXMbkb7kx+BJNjxLsqb7ijQgXQyEHGjwd9OOeVZXZAStonE3O5ohl1N1QC1fzpN5
+qBFPaAiNhZgaxrB+pp/uRruZXzNGCwLdhpd2HuryJfxkaAD53mqpHwHJbM7wRQl4
+NJCbFR/lf4sqPO7zWJGyfU8fFVLuNspSW8AdLcsapOUSMhXTEU+vKbdWM+MYRNuk
+ltJVWG1nPkbyyGQoUNEh4rSFOX+3aiN435qkPw7wAQKBgQDEPFQJe+2DpS+M0zvq
+sZVVkEDxwGZfHnO0h57C4dsGPyLSX7A1r+EM8ooZhCgrXZFru3EDzFuO5isCIeml
+bBET5q2qGEozdb+wUfcHOBZZKR4imY0SYi3lyJdxBeNIOPhUkEpOg3uo2RRklpi6
+Fk4LYXReJ+t36yZyocTn3PfmxwKBgQC+juTHoJGZjqWtVMygUC8kP5G5GXxY9Yk1
+7j4Iv8ok1c5xWM6N4GBNG9rKKOD7WQX4dD9IOs35pZqGDaNE44q7na9UabRFR92M
+I+VAsi1Q2gQPyihW84ESXw6uH85pO5FfGO3fF/ppLXBCVYN85VT+1HFxG+Je2GXE
+50/3e4Q6fQKBgBl/zVu+IsrseBVQjYSdts37hLTlT2gkyNw4k0S3nIJfSeMUVA1l
+4VSRX6iZJ68a5X6eSL05nNwgxI3uYjIArOdtHjvwFBRDxLjgrbzeaOkFEslkMpSk
+9VnaivNA1JvZ60rxxPYW18bFDoVTnFzx8QpBi6GAhnR6tfBHXRLT/9KZAoGAStHI
+OiltgaFko73b6kYRfGYJTWgYTsV5bldwu/ax4+ye9hosX8Btj1kUerO6QnYdxgO+
+pRmRrie7mE7agD3nRusO4FHwmhMxhcjCRriu2kP/vENfu2Q4lYIFPZD3dpIQ7gnX
+u/SqOYnBvgndariQus2nDQYpx5unubwoxb8Vl/ECgYAV7nkyMjkakwbFyiAsUMz6
+QvSxWC+x5OBv79Nm02bgecdwJny/PULA/R/KHNI/WXHSkM2DdeoMv4XZPdI8TNRo
+bBD217yfRfOMIX2jIhZeTtTAIiOafBdIG0fUtM9nMPkgQGTvgM0FZPdfAtNY/nFu
+xvrhZIQLy0ujoDPPBE8+3Q==
 -----END PRIVATE KEY-----

tsconfig.json

@@ -0,0 +1,103 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig to read more about this file */
+
+    /* Projects */
+    // "incremental": true,                              /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
+    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
+    // "tsBuildInfoFile": "./.tsbuildinfo",              /* Specify the path to .tsbuildinfo incremental compilation file. */
+    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects. */
+    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
+    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
+
+    /* Language and Environment */
+    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
+    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
+    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
+    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
+    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
+    // "reactNamespace": "",                             /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
+    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
+    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
+    // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
+
+    /* Modules */
+    "module": "commonjs",                                /* Specify what module code is generated. */
+    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
+    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
+    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
+    // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
+    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
+    // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
+    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
+
+    /* JavaScript Support */
+    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
+    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
+    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
+
+    /* Emit */
+    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
+    // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
+    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
+    // "outDir": "./",                                   /* Specify an output folder for all emitted files. */
+    // "removeComments": true,                           /* Disable emitting comments. */
+    // "noEmit": true,                                   /* Disable emitting files from a compilation. */
+    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
+    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
+    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
+    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
+    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+    // "newLine": "crlf",                                /* Set the newline character for emitting files. */
+    // "stripInternal": true,                            /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
+    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like '__extends' in compiled output. */
+    // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
+    // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
+    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
+    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
+    /* Interop Constraints */
+    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
+    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
+    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
+
+    /* Type Checking */
+    "strict": true,                                      /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                            /* Enable error reporting for expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
+    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+    // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
+    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
+    // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
+    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
+    // "noUnusedLocals": true,                           /* Enable error reporting when local variables aren't read. */
+    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read. */
+    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
+    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
+    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
+    // "noUncheckedIndexedAccess": true,                 /* Add 'undefined' to a type when accessed using an index. */
+    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
+    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type. */
+    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
+    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
+
+    /* Completeness */
+    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
+    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+  }
+}