Compare commits

...

48 Commits

Author SHA1 Message Date
ce1fe3ca8d Merge pull request 'Update 'app.js'' (#33) from sergiu-patch-1 into develop
Reviewed-on: #33
Reviewed-by: bmamihai <mihai.bozieru@safemobile.com>
2023-06-07 12:51:12 +00:00
96b770d9c5 Update 'app.js' 2023-06-07 12:50:24 +00:00
4b1f4fab70 Merge pull request 'LH-284: Update duplex documentation workflow diagrams' (#32) from LH-284-update-and-centralize-diagrams-for-video-calls into develop
Reviewed-on: #32
Reviewed-by: Adriana <adriana.epure@safemobile.com>
2023-05-30 11:27:09 +00:00
ba7c2186af LH-284: Update duplex documentation workflow diagrams 2023-05-30 11:57:02 +03:00
636e8a9fab Merge pull request 'added build commit no' (#31) from build-commit-no into develop
Reviewed-on: #31
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
2023-04-10 23:36:34 +00:00
5da2eb6927 update build.sh after review 2023-04-05 01:57:58 +03:00
97948a5d8c added build commit no 2023-04-02 01:17:18 +03:00
b94b1bff86 Merge pull request 'docker' (#18) from docker into develop
Reviewed-on: #18
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
2023-02-26 22:11:02 +00:00
5c4f2bf13e Merge branch 'develop' into docker 2023-02-26 22:10:34 +00:00
df7f1987f6 Merge pull request 'LH-276: Add close-producer event handler; Update client' (#30) from LH-276-close-producer into develop
Reviewed-on: #30
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
2023-02-23 09:46:41 +00:00
7842953faf LH-276: Refactor consumer-resume 2023-02-22 18:57:57 +02:00
4591617b1e LH-276: Fix video consume when initiator is not set yet(at start) 2023-02-22 18:50:37 +02:00
9b3f2f94c8 LH-276: Fix audio when initiator is not set yet(at start) 2023-02-22 18:46:01 +02:00
29a4cd7227 LH-276: Format code 2023-02-22 18:40:39 +02:00
c80265fe25 LH-276: Format code 2023-02-22 18:36:50 +02:00
abb1533c9b LH-276: Format code 2023-02-22 18:32:41 +02:00
6e3ce9fbb3 LH-276: Format code 2023-02-22 18:30:28 +02:00
4d8adf9eac LH-276: Refactor consume(consumeAudio/consumeVideo); Format code 2023-02-22 18:21:53 +02:00
bde02fe250 LH-276: Add close-producer event handler; Update client 2023-02-21 02:41:48 +02:00
0ddb43b4b5 Merge pull request 'LINXD-2342-dispatcher-audio' (#29) from LINXD-2342-dispatcher-audio into develop
Reviewed-on: #29
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
2023-02-15 09:14:57 +00:00
f02d6af726 LINXD-2342: Added documentation for kind 2023-02-15 11:14:02 +02:00
7ee93d7963 LINXD-2342: Update video client 2023-02-15 10:06:39 +02:00
98212a78cb Update client to consume audio correctly 2023-02-11 21:32:53 +02:00
33ea44ac02 Update client to consume audio correctly 2023-02-11 21:30:21 +02:00
6b822142d0 Add the kind of producer on new-producer event 2023-02-11 21:13:57 +02:00
50e95b93a4 Update client 2023-02-08 19:37:32 +02:00
6eca0808c9 Merge pull request 'Update web client to work with dev' (#27) from update-web-client into develop
Reviewed-on: #27
Reviewed-by: bmamihai <mihai.bozieru@safemobile.com>
2023-01-23 20:37:27 +00:00
f728b23b7f Update web client to work with dev 2023-01-23 20:45:08 +02:00
33c0234fb0 Merge pull request 'LINXD-2303: Added client-to-client workflow; Added client-mediadoup workflow' (#26) from LINXD-2303-video-documentation-mobile-mobile into develop
Reviewed-on: #26
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
2023-01-19 14:44:24 +00:00
f81d5b2dfa LINXD-2303: Update diagrams Mediasoup connect & produce; Update diagram Client-Client workflow 2023-01-19 16:43:46 +02:00
ae87b5bd71 LINXD-2303: Added client-to-client workflow; Added client-mediadoup workflow 2023-01-19 16:31:16 +02:00
09e82fb224 Merge pull request 'Moved 'new-producer' in 'transport-produce' handler' (#25) from new-producer-in-transport-produce into develop
Reviewed-on: #25
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
2023-01-19 06:54:53 +00:00
1da0170261 Moved 'new-producer' in 'transport-produce' handler 2023-01-18 11:49:02 +02:00
aca0a6eac0 improved build to get also the git log to know what is on server 2023-01-17 16:00:52 +00:00
23ca56c8c6 rever build.sh 2023-01-17 15:51:55 +00:00
a2d0b6771b Merge pull request 'Add new-producer event; Update client to consume when receives new-producer event' (#24) from LAPI-675-generate-new-producer-in-mediasoup-and-client into develop
Reviewed-on: #24
Reviewed-by: Cristi Ene <cristi.ene@safemobile.com>
2023-01-16 15:40:06 +00:00
9382fd11fb LAPI-675: Remove commented code 2023-01-16 17:39:15 +02:00
fb99fd57f8 LAPI-675: Refactor transport-connect new-producer 2023-01-16 17:32:31 +02:00
0f4342777a LAPI-675: Update bundle 2023-01-13 20:12:59 +02:00
69c167e4e9 Add new-producer event; Update client to consume when receives new-producer event 2023-01-13 20:11:24 +02:00
48eee903a5 added command for limiting cpu/memory 2023-01-05 14:31:51 +02:00
d5bc0cd1d3 run under host network 2023-01-05 13:18:13 +02:00
1c353d7c88 Merge branch 'develop' into docker 2023-01-05 01:14:56 +02:00
3e31ba21bd replace individual copy with copy all 2022-12-15 13:20:22 +02:00
cdf02756d3 fix start 2022-12-14 01:32:17 +02:00
b2f9f5affa remove pm2 and watchify 2022-12-14 00:48:14 +02:00
5b9bfeaa01 improve docker 2022-12-10 03:21:59 +02:00
e3bef9b3e5 New dockerfile 2022-12-10 02:38:09 +02:00
25 changed files with 753 additions and 735 deletions

2
.dockerignore Normal file
View File

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

View File

@ -1,11 +1,25 @@
FROM ubuntu
FROM ubuntu:22.04
WORKDIR /app
RUN apt-get update && \
apt-get install -y build-essential pip net-tools iputils-ping iproute2 curl
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
RUN apt-get install -y nodejs
RUN npm install -g watchify
EXPOSE 3000
EXPOSE 2000-2020
EXPOSE 10000-10100
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

1239
app.js

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,40 @@
#/!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
@ -20,32 +56,19 @@ fi
## 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} dist/
cp -r ./* 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
#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
addVersionPm2
## POST BUILD

Binary file not shown.

Before

Width:  |  Height:  |  Size: 614 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 419 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 354 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 606 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 252 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 407 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 421 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 567 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 660 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 571 KiB

View File

@ -20353,7 +20353,7 @@ module.exports = yeast;
},{}],94:[function(require,module,exports){
module.exports = {
hubAddress: 'https://hub.dev.linx.safemobile.com/',
mediasoupAddress: 'https://testing.video.safemobile.org',
mediasoupAddress: 'https://testing.video.safemobile.org/',
}
},{}],95:[function(require,module,exports){
const io = require('socket.io-client')
@ -20449,10 +20449,23 @@ 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) {
@ -20731,6 +20744,8 @@ const connectSendTransport = async () => {
// Enable Close call button
const closeCallBtn = document.getElementById('btnCloseCall');
closeCallBtn.removeAttribute('disabled');
createRecvTransport();
}
const createRecvTransport = async () => {
@ -20770,7 +20785,8 @@ const createRecvTransport = async () => {
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')
})
.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
})
consumerVideo.on('transportclose', () => {
console.log('transport closed so consumer closed')
})
return consumerVideo.track
}
@ -20903,31 +20915,31 @@ const closeCall = () => {
resetCallSettings()
}
const consume = async () => {
console.log('[consume]')
console.log('createRecvTransport Consumer')
await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
if (params.error) {
console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
return
}
consumerTransport = device.createRecvTransport(params)
consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
try {
await socket.emit('transport-recv-connect', {
dtlsParameters,
})
callback()
} catch (error) {
errback(error)
}
})
// 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()
})
}
// connectRecvTransport()
// })
// }
btnLocalVideo.addEventListener('click', getLocalStream)
btnRecvSendTransport.addEventListener('click', consume)
// btnRecvSendTransport.addEventListener('click', consume)
btnCloseCall.addEventListener('click', closeCall)
},{"./config":94,"mediasoup-client":66,"socket.io-client":82}]},{},[95]);

View File

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

View File

@ -75,7 +75,7 @@
</td>
<td>
<div id="sharedBtns">
<button id="btnRecvSendTransport">Consume</button>
<!-- <button id="btnRecvSendTransport">Consume</button> -->
<button id="remoteSoundControl">Unmute</button>
</div>
</td>

View File

@ -91,10 +91,23 @@ 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) {
@ -373,6 +386,8 @@ const connectSendTransport = async () => {
// Enable Close call button
const closeCallBtn = document.getElementById('btnCloseCall');
closeCallBtn.removeAttribute('disabled');
createRecvTransport();
}
const createRecvTransport = async () => {
@ -412,7 +427,8 @@ const createRecvTransport = async () => {
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')
})
.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
})
consumerVideo.on('transportclose', () => {
console.log('transport closed so consumer closed')
})
return consumerVideo.track
}
@ -545,30 +557,30 @@ const closeCall = () => {
resetCallSettings()
}
const consume = async () => {
console.log('[consume]')
console.log('createRecvTransport Consumer')
await socket.emit('createWebRtcTransport', { sender: false, callId, dispatcher: true }, ({ params }) => {
if (params.error) {
console.log('createRecvTransport | createWebRtcTransport | Error', params.error)
return
}
consumerTransport = device.createRecvTransport(params)
consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
try {
await socket.emit('transport-recv-connect', {
dtlsParameters,
})
callback()
} catch (error) {
errback(error)
}
})
// 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()
})
}
// connectRecvTransport()
// })
// }
btnLocalVideo.addEventListener('click', getLocalStream)
btnRecvSendTransport.addEventListener('click', consume)
// btnRecvSendTransport.addEventListener('click', consume)
btnCloseCall.addEventListener('click', closeCall)