Compare commits
66 Commits
LINXD-2270
...
develop
Author | SHA1 | Date | |
---|---|---|---|
ce1fe3ca8d | |||
96b770d9c5 | |||
4b1f4fab70 | |||
ba7c2186af | |||
636e8a9fab | |||
5da2eb6927 | |||
97948a5d8c | |||
b94b1bff86 | |||
5c4f2bf13e | |||
df7f1987f6 | |||
7842953faf | |||
4591617b1e | |||
9b3f2f94c8 | |||
29a4cd7227 | |||
c80265fe25 | |||
abb1533c9b | |||
6e3ce9fbb3 | |||
4d8adf9eac | |||
bde02fe250 | |||
0ddb43b4b5 | |||
f02d6af726 | |||
7ee93d7963 | |||
98212a78cb | |||
33ea44ac02 | |||
6b822142d0 | |||
50e95b93a4 | |||
6eca0808c9 | |||
f728b23b7f | |||
33c0234fb0 | |||
f81d5b2dfa | |||
ae87b5bd71 | |||
09e82fb224 | |||
1da0170261 | |||
aca0a6eac0 | |||
23ca56c8c6 | |||
a2d0b6771b | |||
9382fd11fb | |||
fb99fd57f8 | |||
0f4342777a | |||
69c167e4e9 | |||
ad4c1f27e7 | |||
b2128c4754 | |||
af53dc1610 | |||
f48fe4f9aa | |||
6fd6ca9755 | |||
1b72941a32 | |||
c037240f47 | |||
9716bddd71 | |||
e6c08a2c1d | |||
1342e812e6 | |||
d8405eccc7 | |||
5bf31d452f | |||
c034610471 | |||
df5b3eab90 | |||
b0293230b6 | |||
391e8eb6f0 | |||
3139a625a2 | |||
48eee903a5 | |||
d5bc0cd1d3 | |||
1c353d7c88 | |||
9d43b7ec0c | |||
3e31ba21bd | |||
cdf02756d3 | |||
b2f9f5affa | |||
5b9bfeaa01 | |||
e3bef9b3e5 |
2
.dockerignore
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
node_modules
|
||||||
|
doc
|
26
Dockerfile
@ -1,11 +1,25 @@
|
|||||||
FROM ubuntu
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y build-essential pip net-tools iputils-ping iproute2 curl
|
apt-get install -y build-essential pip net-tools iputils-ping iproute2 curl
|
||||||
|
|
||||||
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
|
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
|
||||||
RUN apt-get install -y nodejs
|
RUN apt-get install -y nodejs
|
||||||
RUN npm install -g watchify
|
|
||||||
|
|
||||||
EXPOSE 3000
|
COPY . /app/
|
||||||
EXPOSE 2000-2020
|
|
||||||
EXPOSE 10000-10100
|
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
|
77
build.sh
@ -1,4 +1,40 @@
|
|||||||
#/!bin/bash
|
#/!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
|
## PREBUILD PROCESS
|
||||||
# check dist dir to be present and empty
|
# check dist dir to be present and empty
|
||||||
if [ ! -d "dist" ]; then
|
if [ ! -d "dist" ]; then
|
||||||
@ -9,38 +45,31 @@ else
|
|||||||
## CLEANUP
|
## CLEANUP
|
||||||
rm -fr dist/*
|
rm -fr dist/*
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -d "node_modules" ]; then
|
||||||
|
rm -fr node_modules
|
||||||
|
fi
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
#npm install
|
#npm install
|
||||||
|
|
||||||
## PROJECT NEEDS
|
## PROJECT NEEDS
|
||||||
echo "Building app... from $(git rev-parse --abbrev-ref HEAD)"
|
echo "Building app... from $(git rev-parse --abbrev-ref HEAD)"
|
||||||
#npm run-script build
|
#npm run-script build
|
||||||
cp -r {.env,app.js,package.json,server,public} dist/
|
cp -r {.env,app.js,package.json,server,public,doc,Dockerfile} dist/
|
||||||
|
#cp -r ./* dist/
|
||||||
|
|
||||||
#Add version control for pm2
|
# 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
|
||||||
cd dist
|
cd dist
|
||||||
#Add version control for pm2
|
addVersionPm2
|
||||||
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
|
## POST BUILD
|
||||||
|
|
||||||
cd -
|
cd -
|
||||||
|
BIN
doc/[video] Client - Mediasoup connect & produce@1.25x.png
Normal file
After Width: | Height: | Size: 1.2 MiB |
BIN
doc/[video] Client Android-iOS close Video call@1.25x.png
Normal file
After Width: | Height: | Size: 419 KiB |
BIN
doc/[video] Client-Client Workflow@1.25x.png
Normal file
After Width: | Height: | Size: 1.0 MiB |
BIN
doc/[video] Dispatcher closed@1.25x.png
Normal file
After Width: | Height: | Size: 606 KiB |
After Width: | Height: | Size: 349 KiB |
BIN
doc/[video] HUB - Dispatcher close call@1.25x.png
Normal file
After Width: | Height: | Size: 412 KiB |
BIN
doc/[video] HUB - Dispatcher dieconnect@1.25x.png
Normal file
After Width: | Height: | Size: 421 KiB |
BIN
doc/[video] Video Window closed@1.25x.png
Normal file
After Width: | Height: | Size: 567 KiB |
BIN
doc/[video] Waiting Call@1.25x.png
Normal file
After Width: | Height: | Size: 660 KiB |
Before Width: | Height: | Size: 571 KiB |
@ -20353,7 +20353,7 @@ module.exports = yeast;
|
|||||||
},{}],94:[function(require,module,exports){
|
},{}],94:[function(require,module,exports){
|
||||||
module.exports = {
|
module.exports = {
|
||||||
hubAddress: 'https://hub.dev.linx.safemobile.com/',
|
hubAddress: 'https://hub.dev.linx.safemobile.com/',
|
||||||
mediasoupAddress: 'https://testing.video.safemobile.org',
|
mediasoupAddress: 'https://testing.video.safemobile.org/',
|
||||||
}
|
}
|
||||||
},{}],95:[function(require,module,exports){
|
},{}],95:[function(require,module,exports){
|
||||||
const io = require('socket.io-client')
|
const io = require('socket.io-client')
|
||||||
@ -20449,10 +20449,23 @@ setTimeout(() => {
|
|||||||
console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
|
console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
|
||||||
if (!IS_PRODUCER && existsProducer && consumer === undefined) {
|
if (!IS_PRODUCER && existsProducer && consumer === undefined) {
|
||||||
goConnect()
|
goConnect()
|
||||||
// document.getElementById('btnRecvSendTransport').click();
|
|
||||||
}
|
}
|
||||||
if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
|
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) {
|
if (IS_PRODUCER === true) {
|
||||||
@ -20731,6 +20744,8 @@ const connectSendTransport = async () => {
|
|||||||
// Enable Close call button
|
// Enable Close call button
|
||||||
const closeCallBtn = document.getElementById('btnCloseCall');
|
const closeCallBtn = document.getElementById('btnCloseCall');
|
||||||
closeCallBtn.removeAttribute('disabled');
|
closeCallBtn.removeAttribute('disabled');
|
||||||
|
|
||||||
|
createRecvTransport();
|
||||||
}
|
}
|
||||||
|
|
||||||
const createRecvTransport = async () => {
|
const createRecvTransport = async () => {
|
||||||
@ -20770,7 +20785,8 @@ const createRecvTransport = async () => {
|
|||||||
errback(error)
|
errback(error)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
connectRecvTransport()
|
// We call it in new-rpoducer, we don't need it here anymore
|
||||||
|
// connectRecvTransport()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20826,7 +20842,7 @@ const connectRecvTransport = async () => {
|
|||||||
console.log('remoteVideo PLAY')
|
console.log('remoteVideo PLAY')
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
displayError(`remoteVideo PLAY ERROR | ${error.message}`)
|
console.error(`remoteVideo PLAY ERROR | ${error.message}`)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -20839,10 +20855,6 @@ const getVideoTrask = async (videoParams) => {
|
|||||||
rtpParameters: videoParams.rtpParameters
|
rtpParameters: videoParams.rtpParameters
|
||||||
})
|
})
|
||||||
|
|
||||||
consumerVideo.on('transportclose', () => {
|
|
||||||
console.log('transport closed so consumer closed')
|
|
||||||
})
|
|
||||||
|
|
||||||
return consumerVideo.track
|
return consumerVideo.track
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -20903,31 +20915,31 @@ const closeCall = () => {
|
|||||||
resetCallSettings()
|
resetCallSettings()
|
||||||
}
|
}
|
||||||
|
|
||||||
const consume = async () => {
|
// const consume = async (kind) => {
|
||||||
console.log('[consume]')
|
// console.log(`[consume] kind: ${kind}`)
|
||||||
console.log('createRecvTransport Consumer')
|
// console.log('createRecvTransport Consumer')
|
||||||
await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
|
// await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
|
||||||
if (params.error) {
|
// if (params.error) {
|
||||||
console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
|
// console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
consumerTransport = device.createRecvTransport(params)
|
// consumerTransport = device.createRecvTransport(params)
|
||||||
consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
|
// consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
|
||||||
try {
|
// try {
|
||||||
await socket.emit('transport-recv-connect', {
|
// await socket.emit('transport-recv-connect', {
|
||||||
dtlsParameters,
|
// dtlsParameters,
|
||||||
})
|
// })
|
||||||
callback()
|
// callback()
|
||||||
} catch (error) {
|
// } catch (error) {
|
||||||
errback(error)
|
// errback(error)
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
|
|
||||||
connectRecvTransport()
|
// connectRecvTransport()
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
|
|
||||||
btnLocalVideo.addEventListener('click', getLocalStream)
|
btnLocalVideo.addEventListener('click', getLocalStream)
|
||||||
btnRecvSendTransport.addEventListener('click', consume)
|
// btnRecvSendTransport.addEventListener('click', consume)
|
||||||
btnCloseCall.addEventListener('click', closeCall)
|
btnCloseCall.addEventListener('click', closeCall)
|
||||||
},{"./config":94,"mediasoup-client":66,"socket.io-client":82}]},{},[95]);
|
},{"./config":94,"mediasoup-client":66,"socket.io-client":82}]},{},[95]);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
hubAddress: 'https://hub.dev.linx.safemobile.com/',
|
hubAddress: 'https://hub.dev.linx.safemobile.com/',
|
||||||
mediasoupAddress: 'https://testing.video.safemobile.org',
|
mediasoupAddress: 'https://testing.video.safemobile.org/',
|
||||||
}
|
}
|
@ -75,7 +75,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<div id="sharedBtns">
|
<div id="sharedBtns">
|
||||||
<button id="btnRecvSendTransport">Consume</button>
|
<!-- <button id="btnRecvSendTransport">Consume</button> -->
|
||||||
<button id="remoteSoundControl">Unmute</button>
|
<button id="remoteSoundControl">Unmute</button>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
|
@ -91,10 +91,23 @@ setTimeout(() => {
|
|||||||
console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
|
console.log(`[MEDIA] ${config.mediasoupAddress} | connected: ${socket.connected} | existsProducer: ${existsProducer}`)
|
||||||
if (!IS_PRODUCER && existsProducer && consumer === undefined) {
|
if (!IS_PRODUCER && existsProducer && consumer === undefined) {
|
||||||
goConnect()
|
goConnect()
|
||||||
// document.getElementById('btnRecvSendTransport').click();
|
|
||||||
}
|
}
|
||||||
if (IS_PRODUCER && urlParams.get('testing') === 'true') { getLocalStream() }
|
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) {
|
if (IS_PRODUCER === true) {
|
||||||
@ -373,6 +386,8 @@ const connectSendTransport = async () => {
|
|||||||
// Enable Close call button
|
// Enable Close call button
|
||||||
const closeCallBtn = document.getElementById('btnCloseCall');
|
const closeCallBtn = document.getElementById('btnCloseCall');
|
||||||
closeCallBtn.removeAttribute('disabled');
|
closeCallBtn.removeAttribute('disabled');
|
||||||
|
|
||||||
|
createRecvTransport();
|
||||||
}
|
}
|
||||||
|
|
||||||
const createRecvTransport = async () => {
|
const createRecvTransport = async () => {
|
||||||
@ -412,7 +427,8 @@ const createRecvTransport = async () => {
|
|||||||
errback(error)
|
errback(error)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
connectRecvTransport()
|
// We call it in new-rpoducer, we don't need it here anymore
|
||||||
|
// connectRecvTransport()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -468,7 +484,7 @@ const connectRecvTransport = async () => {
|
|||||||
console.log('remoteVideo PLAY')
|
console.log('remoteVideo PLAY')
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
displayError(`remoteVideo PLAY ERROR | ${error.message}`)
|
console.error(`remoteVideo PLAY ERROR | ${error.message}`)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -481,10 +497,6 @@ const getVideoTrask = async (videoParams) => {
|
|||||||
rtpParameters: videoParams.rtpParameters
|
rtpParameters: videoParams.rtpParameters
|
||||||
})
|
})
|
||||||
|
|
||||||
consumerVideo.on('transportclose', () => {
|
|
||||||
console.log('transport closed so consumer closed')
|
|
||||||
})
|
|
||||||
|
|
||||||
return consumerVideo.track
|
return consumerVideo.track
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -545,30 +557,30 @@ const closeCall = () => {
|
|||||||
resetCallSettings()
|
resetCallSettings()
|
||||||
}
|
}
|
||||||
|
|
||||||
const consume = async () => {
|
// const consume = async (kind) => {
|
||||||
console.log('[consume]')
|
// console.log(`[consume] kind: ${kind}`)
|
||||||
console.log('createRecvTransport Consumer')
|
// console.log('createRecvTransport Consumer')
|
||||||
await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
|
// await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
|
||||||
if (params.error) {
|
// if (params.error) {
|
||||||
console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
|
// console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
consumerTransport = device.createRecvTransport(params)
|
// consumerTransport = device.createRecvTransport(params)
|
||||||
consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
|
// consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
|
||||||
try {
|
// try {
|
||||||
await socket.emit('transport-recv-connect', {
|
// await socket.emit('transport-recv-connect', {
|
||||||
dtlsParameters,
|
// dtlsParameters,
|
||||||
})
|
// })
|
||||||
callback()
|
// callback()
|
||||||
} catch (error) {
|
// } catch (error) {
|
||||||
errback(error)
|
// errback(error)
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
|
|
||||||
connectRecvTransport()
|
// connectRecvTransport()
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
|
|
||||||
btnLocalVideo.addEventListener('click', getLocalStream)
|
btnLocalVideo.addEventListener('click', getLocalStream)
|
||||||
btnRecvSendTransport.addEventListener('click', consume)
|
// btnRecvSendTransport.addEventListener('click', consume)
|
||||||
btnCloseCall.addEventListener('click', closeCall)
|
btnCloseCall.addEventListener('click', closeCall)
|