Compare commits
44 Commits
develop
...
LH-276-new
Author | SHA1 | Date |
---|---|---|
Sergiu Toma | 2afdf8b0ca | |
Sergiu Toma | f99a4d9849 | |
Sergiu Toma | c47259225a | |
Sergiu Toma | 0fca614e8e | |
Sergiu Toma | 48ef4911b1 | |
Sergiu Toma | 7e3e40e5e1 | |
Sergiu Toma | bc07a055e0 | |
Sergiu Toma | a214f4384e | |
Sergiu Toma | 7ec9f4ebde | |
Sergiu Toma | c65dcf1729 | |
Sergiu Toma | 0230e668e4 | |
Sergiu Toma | 68db146643 | |
Sergiu Toma | 00604279b5 | |
Sergiu Toma | 764087d1f6 | |
Sergiu Toma | 1dcc9321ba | |
Sergiu Toma | 59f8d4d360 | |
Sergiu Toma | f21a5f28ab | |
Sergiu Toma | 76d93e97b1 | |
Sergiu Toma | 2098fbdd89 | |
Sergiu Toma | cb14061b94 | |
Sergiu Toma | 1060293980 | |
Sergiu Toma | 7f732785b9 | |
Sergiu Toma | 5dfbec1c0d | |
Sergiu Toma | d1086f9ec0 | |
Sergiu Toma | cf6725dec4 | |
Sergiu Toma | 512d0f8bed | |
Sergiu Toma | 4b9987efe8 | |
Sergiu Toma | 51cf3534a1 | |
Sergiu Toma | f206dfc5ae | |
Sergiu Toma | f5d45ce3a3 | |
Sergiu Toma | 9560d33870 | |
Sergiu Toma | 189c262b32 | |
Sergiu Toma | e53f4c353f | |
Sergiu Toma | d91fcfd584 | |
Sergiu Toma | 12ad433c9f | |
Sergiu Toma | 2c777f4746 | |
Sergiu Toma | 52222fc255 | |
Sergiu Toma | 7d5d471d7d | |
Sergiu Toma | bdda13e0d5 | |
Sergiu Toma | 1fb5df4cde | |
Sergiu Toma | ea1c8e7e80 | |
Sergiu Toma | 21b4b6d04f | |
Sergiu Toma | a1d172ee07 | |
Sergiu Toma | 0c917d6477 |
|
@ -1,2 +0,0 @@
|
|||
node_modules
|
||||
doc
|
26
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
|
68
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
|
||||
|
@ -58,17 +22,31 @@ 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/
|
||||
|
||||
# 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
|
||||
git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git--$dateString.log"
|
||||
#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
|
||||
|
||||
|
|
After Width: | Height: | Size: 614 KiB |
After Width: | Height: | Size: 994 KiB |
Before Width: | Height: | Size: 1.2 MiB |
Before Width: | Height: | Size: 419 KiB |
After Width: | Height: | Size: 354 KiB |
After Width: | Height: | Size: 794 KiB |
Before Width: | Height: | Size: 1.0 MiB |
After Width: | Height: | Size: 462 KiB |
Before Width: | Height: | Size: 606 KiB |
After Width: | Height: | Size: 252 KiB |
Before Width: | Height: | Size: 349 KiB |
After Width: | Height: | Size: 346 KiB |
Before Width: | Height: | Size: 412 KiB |
After Width: | Height: | Size: 407 KiB |
Before Width: | Height: | Size: 421 KiB |
After Width: | Height: | Size: 439 KiB |
Before Width: | Height: | Size: 567 KiB |
Before Width: | Height: | Size: 660 KiB |
After Width: | Height: | Size: 571 KiB |
|
@ -20855,6 +20855,40 @@ const getVideoTrask = async (videoParams) => {
|
|||
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
|
||||
}
|
||||
|
||||
|
@ -20870,6 +20904,14 @@ const getAudioTrask = async (audioParams) => {
|
|||
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({
|
||||
|
|
|
@ -497,6 +497,40 @@ const getVideoTrask = async (videoParams) => {
|
|||
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
|
||||
}
|
||||
|
||||
|
@ -512,6 +546,14 @@ const getAudioTrask = async (audioParams) => {
|
|||
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({
|
||||
|
|