Added log

.dockerignore

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

Dockerfile

@@ -1,25 +1,11 @@
-FROM ubuntu:22.04
-
-WORKDIR /app
-
+FROM ubuntu
 RUN apt-get update && \
     apt-get install -y build-essential pip net-tools iputils-ping iproute2 curl
 
-RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
 RUN apt-get install -y nodejs
+RUN npm install -g watchify
 
-COPY . /app/
-
-RUN npm install
-
-EXPOSE 3000/tcp
-EXPOSE 2000-2200/udp
-
-CMD node app.js
-
-#docker build -t linx-video .
-# docker run -it -d --restart always -p 3000:3000/tcp -p 2000-2200:2000-2200/udp linx-video
-#Run under host network
-# docker run -it -d --network host --restart always -p 3000:3000/tcp -p 2000-2200:2000-2200/udp linx-video
-#https://docs.docker.com/config/containers/resource_constraints/
-#docker run -it -d --network host --cpus="0.25" --memory="512m" --restart always -p 3000:3000/tcp -p 2000-2200:2000-2200/udp linx-video
+EXPOSE 3000
+EXPOSE 2000-2020
+EXPOSE 10000-10100

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,31 +9,38 @@ 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/
+cp -r {.env,app.js,package.json,server,public} dist/
 
-# Generate Git log
-dateString=$(date +"%Y%m%d-%H%M%S")
-git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git-$dateString.log"
-
-# Get Git version control
-getGitVersion $1
-
-# Add version control for pm2
+#Add version control for pm2
 cd dist
-addVersionPm2
+#Add version control for pm2
+version=$(git describe)
+file_pkg="package.json"
+key="  \"version\": \""
+
+count=$(echo ${version%%-*} | grep -o "\." | wc -l)
+if (( $count > 1 )); then
+        version=${version%%-*}
+else
+        version="${version%%-*}.0"
+fi
+if [ -f "$file_pkg" ] && [ ! -z "$version" ]; then
+  version="  \"version\": \"$version\","
+  sed -i "s|^.*$key.*|${version//\//\\/}|g" $file_pkg
+  text=$(cat $file_pkg | grep -c "$version")
+  if [ $text -eq 0 ]; then
+          echo "Version couldn't be set"
+  else
+          echo "Version $version successfully applied to App"
+  fi
+fi
 
 ## POST BUILD
 
-cd -
+cd -

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) {
-    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
-    })
-  }
+  producerAudio = await producerTransport.produce(audioParams)
+  console.log('audioParams', audioParams);
+  console.log('producerAudio', producerAudio);
+
+  producerAudio.on('trackended', () => {
+    console.log('track ended')
+    // close audio track
+  })
+
+  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,91 +20762,34 @@ const connectRecvTransport = async () => {
   await socket.emit('consume', {
     rtpCapabilities: device.rtpCapabilities,
     callId
-  }, async ({videoParams, audioParams}) => {
-    console.log(`[consume] 🟩 videoParams`, videoParams)
-    console.log(`[consume] 🟩 audioParams`, audioParams)
-    console.log('[consume] 🟩 consumerTransport', consumerTransport)
+  }, 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
 
     let stream = new MediaStream()
-
-    // 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')
-
+    stream.addTrack(track)
+    // stream.removeTrack(track)
     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 = () => {
   console.log('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
-                                    id="localVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></video>
+                                <video id="localVideo" autoplay class="video" muted></video>
                             </div>
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <video
-                                    id="remoteVideo"
-                                    class="video"
-                                    autoplay
-                                    muted
-                                    playsinline
-                                ></video>
+                                <video id="remoteVideo" autoplay class="video" ></video>
                             </div>
                         </td>
                     </tr>
@@ -75,11 +60,34 @@
                         </td>
                         <td>
                             <div id="sharedBtns">
-                                <!-- <button id="btnRecvSendTransport">Consume</button> -->
-                                <button id="remoteSoundControl">Unmute</button>
+                                <button id="btnRecvSendTransport">Consume</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) {
-    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
-    })
-  }
+  producerAudio = await producerTransport.produce(audioParams)
+  console.log('audioParams', audioParams);
+  console.log('producerAudio', producerAudio);
+
+  producerAudio.on('trackended', () => {
+    console.log('track ended')
+    // close audio track
+  })
+
+  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,91 +404,34 @@ const connectRecvTransport = async () => {
   await socket.emit('consume', {
     rtpCapabilities: device.rtpCapabilities,
     callId
-  }, async ({videoParams, audioParams}) => {
-    console.log(`[consume] 🟩 videoParams`, videoParams)
-    console.log(`[consume] 🟩 audioParams`, audioParams)
-    console.log('[consume] 🟩 consumerTransport', consumerTransport)
+  }, 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
 
     let stream = new MediaStream()
-
-    // 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')
-
+    stream.addTrack(track)
+    // stream.removeTrack(track)
     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 = () => {
   console.log('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)