Compare commits

..

7 Commits

Author SHA1 Message Date
13829c5e6c Update build.sh 2022-11-18 11:42:01 +02:00
9047e6c47d Update log 2022-11-18 11:35:18 +02:00
77da298944 Update log 2022-11-18 11:03:12 +02:00
c25e34bc37 Update log 2022-11-18 10:57:19 +02:00
9a25f16924 Update log 2022-11-18 10:33:53 +02:00
473f94fcbb Update log 2022-11-18 10:28:21 +02:00
9245373625 Update log 2022-11-18 10:21:32 +02:00
6 changed files with 857 additions and 630 deletions

View File

2
app.js
View File

@ -154,7 +154,7 @@ peers.on('connection', async socket => {
try { try {
// We can continue with the room creation process only if we have a callId // We can continue with the room creation process only if we have a callId
if (callId) { if (callId) {
console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`); console.log(`[createRoom] --🟥-- socket.id ${socket.id} callId ${callId}`);
if (!videoCalls[callId]) { if (!videoCalls[callId]) {
console.log('[createRoom] callId', callId); console.log('[createRoom] callId', callId);
videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) } videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) }

View File

@ -15,6 +15,7 @@ fi
## 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 .env.example .env
cp -r {.env,app.js,package.json,server,public} dist/ cp -r {.env,app.js,package.json,server,public} dist/
#Add version control for pm2 #Add version control for pm2
@ -44,5 +45,4 @@ fi
## POST BUILD ## POST BUILD
cd - cd -
rm .env

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -12,11 +12,7 @@ let callId = parseInt(urlParams.get('callId')) || null;
const IS_PRODUCER = urlParams.get('producer') === 'true' ? true : false const IS_PRODUCER = urlParams.get('producer') === 'true' ? true : false
console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId', callId, ' | IS_PRODUCER', IS_PRODUCER) console.log('[URL] ASSET_ID', ASSET_ID, '| ACCOUNT_ID', ACCOUNT_ID, '| callId', callId, ' | IS_PRODUCER', IS_PRODUCER)
console.log('🟩 config', config) let socket
let socket, hub
setTimeout(() => {
hub = io(config.hubAddress) hub = io(config.hubAddress)
const connectToMediasoup = () => { const connectToMediasoup = () => {
@ -40,7 +36,7 @@ setTimeout(() => {
if (IS_PRODUCER === true) { if (IS_PRODUCER === true) {
hub.on('connect', async () => { hub.on('connect', async () => {
console.log(`[HUB]! ${config.hubAddress} | connected: ${hub.connected}`) console.log(`[HUB] ${config.hubAddress} | connected: ${hub.connected}`)
connectToMediasoup() connectToMediasoup()
hub.emit( hub.emit(
@ -88,15 +84,11 @@ setTimeout(() => {
connectToMediasoup() connectToMediasoup()
} }
}, 2000);
let device let device
let rtpCapabilities let rtpCapabilities
let producerTransport let producerTransport
let consumerTransport let consumerTransport
let producerVideo let producer
let producerAudio
let consumer let consumer
let originAssetId let originAssetId
// let originAssetName = 'Adi' // let originAssetName = 'Adi'
@ -104,18 +96,21 @@ let originAssetId
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions // https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
let videoParams = { let params = {
// mediasoup params // mediasoup params
encodings: [ encodings: [
{ {
rid: 'r0',
maxBitrate: 100000, maxBitrate: 100000,
scalabilityMode: 'S1T3', scalabilityMode: 'S1T3',
}, },
{ {
rid: 'r1',
maxBitrate: 300000, maxBitrate: 300000,
scalabilityMode: 'S1T3', scalabilityMode: 'S1T3',
}, },
{ {
rid: 'r2',
maxBitrate: 900000, maxBitrate: 900000,
scalabilityMode: 'S1T3', scalabilityMode: 'S1T3',
}, },
@ -126,51 +121,21 @@ let videoParams = {
} }
} }
let audioParams = {
// mediasoup params
encodings: [
{
maxBitrate: 100000,
scalabilityMode: 'S1T3',
},
{
maxBitrate: 300000,
scalabilityMode: 'S1T3',
},
{
maxBitrate: 900000,
scalabilityMode: 'S1T3',
},
],
codecOptions: {
opusStereo: true
}
}
const streamSuccess = (stream) => { const streamSuccess = (stream) => {
console.log('[streamSuccess]');
localVideo.srcObject = stream localVideo.srcObject = stream
console.log('stream', stream); const track = stream.getVideoTracks()[0]
const videoTrack = stream.getVideoTracks()[0] params = {
const audioTrack = stream.getAudioTrack()[0] track,
...params
videoParams = {
track: videoTrack,
...videoParams
} }
audioParams = {
track: audioTrack,
...audioParams
}
console.log('[streamSuccess] videoParams', videoParams, ' | audioParams', audioParams);
goConnect() goConnect()
} }
const getLocalStream = () => { const getLocalStream = () => {
console.log('[getLocalStream]'); console.log('[getLocalStream]');
navigator.mediaDevices.getUserMedia({ navigator.mediaDevices.getUserMedia({
audio: true, audio: false,
video: { video: {
width: { width: {
min: 640, min: 640,
@ -279,7 +244,7 @@ const createSendTransport = () => {
}) })
producerTransport.on('produce', async (parameters, callback, errback) => { producerTransport.on('produce', async (parameters, callback, errback) => {
console.log('[produce] parameters', parameters) console.log(parameters)
try { try {
// tell the server to create a Producer // tell the server to create a Producer
@ -305,21 +270,18 @@ const createSendTransport = () => {
} }
const connectSendTransport = async () => { const connectSendTransport = async () => {
console.log('[connectSendTransport] producerTransport', params);
// we now call produce() to instruct the producer transport // we now call produce() to instruct the producer transport
// to send media to the Router // to send media to the Router
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce // https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
// this action will trigger the 'connect' and 'produce' events above // this action will trigger the 'connect' and 'produce' events above
producerVideo = await producerTransport.produce(videoParams) producer = await producerTransport.produce(params)
producerVideo.on('trackended', () => { producer.on('trackended', () => {
console.log('track ended') console.log('track ended')
// close video track // close video track
}) })
producerVideo.on('transportclose', () => { producer.on('transportclose', () => {
console.log('transport ended') console.log('transport ended')
// close video track // close video track
}) })
@ -391,7 +353,7 @@ const resetCallSettings = () => {
localVideo.srcObject = null localVideo.srcObject = null
remoteVideo.srcObject = null remoteVideo.srcObject = null
consumer = null consumer = null
producerVideo = null producer = null
producerTransport = null producerTransport = null
consumerTransport = null consumerTransport = null
device = undefined device = undefined