LH-265: Added audio on client and server
This commit is contained in:
@ -1,5 +1,4 @@
|
||||
module.exports = {
|
||||
hubAddress: 'https://hub.dev.linx.safemobile.com/',
|
||||
mediasoupAddress: 'https://video.safemobile.org/mediasoup',
|
||||
// mediasoupAddress: 'http://localhost:3000/mediasoup',
|
||||
mediasoupAddress: 'https://video.safemobile.org',
|
||||
}
|
@ -43,7 +43,7 @@
|
||||
<tr>
|
||||
<td>
|
||||
<div id="sharedBtns">
|
||||
<video id="localVideo" autoplay class="video" ></video>
|
||||
<video id="localVideo" autoplay class="video" muted></video>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
|
296
public/index.js
296
public/index.js
@ -12,145 +12,157 @@ let callId = parseInt(urlParams.get('callId')) || null;
|
||||
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)
|
||||
|
||||
let socket
|
||||
hub = io(config.hubAddress)
|
||||
|
||||
const connectToMediasoup = () => {
|
||||
|
||||
socket = io(config.mediasoupAddress, {
|
||||
reconnection: true,
|
||||
reconnectionDelay: 1000,
|
||||
reconnectionDelayMax : 5000,
|
||||
reconnectionAttempts: Infinity
|
||||
})
|
||||
|
||||
socket.on('connection-success', ({ _socketId, existsProducer }) => {
|
||||
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() }
|
||||
})
|
||||
}
|
||||
|
||||
if (IS_PRODUCER === true) {
|
||||
hub.on('connect', async () => {
|
||||
console.log(`[HUB] ${config.hubAddress} | connected: ${hub.connected}`)
|
||||
connectToMediasoup()
|
||||
|
||||
hub.emit(
|
||||
'ars',
|
||||
JSON.stringify({
|
||||
ars: true,
|
||||
asset_id: ASSET_ID,
|
||||
account_id: ACCOUNT_ID,
|
||||
})
|
||||
)
|
||||
|
||||
hub.on('video', (data) => {
|
||||
const parsedData = JSON.parse(data);
|
||||
|
||||
if (parsedData.type === 'notify-request') {
|
||||
console.log('video', parsedData)
|
||||
originAssetId = parsedData.origin_asset_id;
|
||||
// originAssetName = parsedData.origin_asset_name;
|
||||
// originAssetTypeName = parsedData.origin_asset_type_name;
|
||||
callId = parsedData.video_call_id;
|
||||
|
||||
console.log('[VIDEO] notify-request | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
|
||||
getLocalStream()
|
||||
}
|
||||
|
||||
if (parsedData.type === 'notify-end') {
|
||||
console.log('[VIDEO] notify-end | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
|
||||
resetCallSettings()
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
hub.on('connect_error', (error) => {
|
||||
console.log('connect_error', error);
|
||||
});
|
||||
|
||||
hub.on('connection', () => {
|
||||
console.log('connection')
|
||||
})
|
||||
|
||||
hub.on('disconnect', () => {
|
||||
console.log('disconnect')
|
||||
})
|
||||
} else {
|
||||
connectToMediasoup()
|
||||
}
|
||||
console.log('🟩 config', config)
|
||||
|
||||
let socket, hub
|
||||
let device
|
||||
let rtpCapabilities
|
||||
let producerTransport
|
||||
let consumerTransport
|
||||
let producer
|
||||
let producerVideo
|
||||
let producerAudio
|
||||
let consumer
|
||||
let originAssetId
|
||||
// let originAssetName = 'Adi'
|
||||
// let originAssetTypeName = 'linx'
|
||||
|
||||
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerOptions
|
||||
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
|
||||
let params = {
|
||||
// mediasoup params
|
||||
let videoParams = {
|
||||
encodings: [
|
||||
{
|
||||
rid: 'r0',
|
||||
maxBitrate: 100000,
|
||||
scalabilityMode: 'S1T3',
|
||||
},
|
||||
{
|
||||
rid: 'r1',
|
||||
maxBitrate: 300000,
|
||||
scalabilityMode: 'S1T3',
|
||||
},
|
||||
{
|
||||
rid: 'r2',
|
||||
maxBitrate: 900000,
|
||||
scalabilityMode: 'S1T3',
|
||||
},
|
||||
{ scaleResolutionDownBy: 4, maxBitrate: 500000 },
|
||||
{ scaleResolutionDownBy: 2, maxBitrate: 1000000 },
|
||||
{ scaleResolutionDownBy: 1, maxBitrate: 5000000 },
|
||||
{ scalabilityMode: 'S3T3_KEY' }
|
||||
],
|
||||
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#ProducerCodecOptions
|
||||
codecOptions: {
|
||||
videoGoogleStartBitrate: 1000
|
||||
}
|
||||
}
|
||||
|
||||
const streamSuccess = (stream) => {
|
||||
console.log('[streamSuccess]');
|
||||
localVideo.srcObject = stream
|
||||
const track = stream.getVideoTracks()[0]
|
||||
params = {
|
||||
track,
|
||||
...params
|
||||
let audioParams = {
|
||||
codecOptions :
|
||||
{
|
||||
opusStereo : true,
|
||||
opusDtx : true
|
||||
}
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
hub = io(config.hubAddress)
|
||||
|
||||
const connectToMediasoup = () => {
|
||||
|
||||
socket = io(config.mediasoupAddress, {
|
||||
reconnection: true,
|
||||
reconnectionDelay: 1000,
|
||||
reconnectionDelayMax : 5000,
|
||||
reconnectionAttempts: Infinity
|
||||
})
|
||||
|
||||
socket.on('connection-success', ({ _socketId, existsProducer }) => {
|
||||
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() }
|
||||
})
|
||||
}
|
||||
|
||||
if (IS_PRODUCER === true) {
|
||||
hub.on('connect', async () => {
|
||||
console.log(`[HUB]! ${config.hubAddress} | connected: ${hub.connected}`)
|
||||
connectToMediasoup()
|
||||
|
||||
hub.emit(
|
||||
'ars',
|
||||
JSON.stringify({
|
||||
ars: true,
|
||||
asset_id: ASSET_ID,
|
||||
account_id: ACCOUNT_ID,
|
||||
})
|
||||
)
|
||||
|
||||
hub.on('video', (data) => {
|
||||
const parsedData = JSON.parse(data);
|
||||
|
||||
if (parsedData.type === 'notify-request') {
|
||||
console.log('video', parsedData)
|
||||
originAssetId = parsedData.origin_asset_id;
|
||||
// originAssetName = parsedData.origin_asset_name;
|
||||
// originAssetTypeName = parsedData.origin_asset_type_name;
|
||||
callId = parsedData.video_call_id;
|
||||
|
||||
console.log('[VIDEO] notify-request | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
|
||||
getLocalStream()
|
||||
}
|
||||
|
||||
if (parsedData.type === 'notify-end') {
|
||||
console.log('[VIDEO] notify-end | IS_PRODUCER', IS_PRODUCER, 'callId', callId);
|
||||
resetCallSettings()
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
hub.on('connect_error', (error) => {
|
||||
console.log('connect_error', error);
|
||||
});
|
||||
|
||||
hub.on('connection', () => {
|
||||
console.log('connection')
|
||||
})
|
||||
|
||||
hub.on('disconnect', () => {
|
||||
console.log('disconnect')
|
||||
})
|
||||
} else {
|
||||
connectToMediasoup()
|
||||
}
|
||||
|
||||
}, 1600);
|
||||
|
||||
const streamSuccess = (stream) => {
|
||||
console.log('[streamSuccess] device', device);
|
||||
localVideo.srcObject = stream
|
||||
console.log('stream', stream);
|
||||
const videoTrack = stream.getVideoTracks()[0]
|
||||
const audioTrack = stream.getAudioTracks()[0]
|
||||
|
||||
videoParams = {
|
||||
track: videoTrack,
|
||||
...videoParams
|
||||
}
|
||||
|
||||
audioParams = {
|
||||
track: audioTrack,
|
||||
...audioParams
|
||||
}
|
||||
|
||||
console.log('[streamSuccess] videoParams', videoParams, ' | audioParams', audioParams);
|
||||
goConnect()
|
||||
}
|
||||
|
||||
const getLocalStream = () => {
|
||||
console.log('[getLocalStream]');
|
||||
navigator.mediaDevices.getUserMedia({
|
||||
audio: false,
|
||||
audio: true,
|
||||
video: {
|
||||
width: {
|
||||
min: 640,
|
||||
max: 1920,
|
||||
},
|
||||
height: {
|
||||
min: 400,
|
||||
max: 1080,
|
||||
}
|
||||
qvga : { width: { ideal: 320 }, height: { ideal: 240 } },
|
||||
vga : { width: { ideal: 640 }, height: { ideal: 480 } },
|
||||
hd : { width: { ideal: 1280 }, height: { ideal: 720 } }
|
||||
}
|
||||
})
|
||||
.then(streamSuccess)
|
||||
.catch(error => {
|
||||
console.log(error.message)
|
||||
})
|
||||
|
||||
navigator.permissions.query(
|
||||
{ name: 'microphone' }
|
||||
).then((permissionStatus) =>{
|
||||
console.log('🟨 [PERMISSION] permissionStatus', permissionStatus); // granted, denied, prompt
|
||||
// It will block the code from execution and display "Permission denied" if we don't have microphone permissions
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
const goConnect = () => {
|
||||
@ -167,7 +179,6 @@ const goCreateTransport = () => {
|
||||
// server side to send/recive media
|
||||
const createDevice = async () => {
|
||||
try {
|
||||
console.log('[createDevice]');
|
||||
device = new mediasoupClient.Device()
|
||||
|
||||
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-load
|
||||
@ -178,7 +189,8 @@ const createDevice = async () => {
|
||||
})
|
||||
|
||||
console.log('Device RTP Capabilities', device.rtpCapabilities)
|
||||
|
||||
console.log('[createDevice] device', device);
|
||||
|
||||
// once the device loads, create transport
|
||||
goCreateTransport()
|
||||
|
||||
@ -207,18 +219,20 @@ const getRtpCapabilities = () => {
|
||||
}
|
||||
|
||||
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, callId }, ({ params }) => {
|
||||
socket.emit('createWebRtcTransport', { sender: true, callId }, (value) => {
|
||||
|
||||
console.log(`[createWebRtcTransport] value: ${JSON.stringify(value)}`);
|
||||
|
||||
const params = value.params;
|
||||
// The server sends back params needed
|
||||
// to create Send Transport on the client side
|
||||
if (params.error) {
|
||||
console.log(params.error)
|
||||
return
|
||||
}
|
||||
|
||||
console.log(params)
|
||||
|
||||
// creates a new WebRTC Transport to send media
|
||||
// based on the server's producer transport params
|
||||
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#TransportOptions
|
||||
@ -244,10 +258,10 @@ const createSendTransport = () => {
|
||||
})
|
||||
|
||||
producerTransport.on('produce', async (parameters, callback, errback) => {
|
||||
console.log(parameters)
|
||||
console.log('[produce] parameters', parameters)
|
||||
|
||||
try {
|
||||
// tell the server to create a Producer
|
||||
// Tell the server to create a Producer
|
||||
// with the following parameters and produce
|
||||
// and expect back a server side producer id
|
||||
// see server's socket.on('transport-produce', ...)
|
||||
@ -270,20 +284,42 @@ const createSendTransport = () => {
|
||||
}
|
||||
|
||||
const connectSendTransport = async () => {
|
||||
// we now call produce() to instruct the producer transport
|
||||
|
||||
console.log('[connectSendTransport] producerTransport');
|
||||
|
||||
// We now call produce() to instruct the producer transport
|
||||
// to send media to the Router
|
||||
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#transport-produce
|
||||
// this action will trigger the 'connect' and 'produce' events above
|
||||
producer = await producerTransport.produce(params)
|
||||
|
||||
// Produce video
|
||||
producerVideo = await producerTransport.produce(videoParams)
|
||||
console.log('videoParams', videoParams);
|
||||
console.log('producerVideo', producerVideo);
|
||||
|
||||
producer.on('trackended', () => {
|
||||
producerVideo.on('trackended', () => {
|
||||
console.log('track ended')
|
||||
// close video track
|
||||
})
|
||||
})
|
||||
|
||||
producer.on('transportclose', () => {
|
||||
producerVideo.on('transportclose', () => {
|
||||
console.log('transport ended')
|
||||
// close video track
|
||||
})
|
||||
|
||||
// Produce audio
|
||||
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 = {
|
||||
@ -294,7 +330,7 @@ const connectSendTransport = async () => {
|
||||
origin_asset_type_name: ASSET_TYPE,
|
||||
origin_asset_name: ASSET_NAME,
|
||||
video_call_id: callId,
|
||||
answer: 'accepted', // answer: 'rejected'
|
||||
answer: 'accepted', // answer: accepted/rejected
|
||||
};
|
||||
console.log('SEND answer', answer);
|
||||
|
||||
@ -310,7 +346,7 @@ const connectSendTransport = async () => {
|
||||
|
||||
const createRecvTransport = async () => {
|
||||
console.log('createRecvTransport');
|
||||
// see server's socket.on('consume', sender?, ...)
|
||||
// See server's socket.on('consume', sender?, ...)
|
||||
// this is a call from Consumer, so sender = false
|
||||
await socket.emit('createWebRtcTransport', { sender: false, callId }, ({ params }) => {
|
||||
// The server sends back params needed
|
||||
@ -320,15 +356,15 @@ const createRecvTransport = async () => {
|
||||
return
|
||||
}
|
||||
|
||||
console.log(params)
|
||||
console.log('[createRecvTransport] params', params)
|
||||
|
||||
// creates a new WebRTC Transport to receive media
|
||||
// Creates a new WebRTC Transport to receive media
|
||||
// based on server's consumer transport params
|
||||
// https://mediasoup.org/documentation/v3/mediasoup-client/api/#device-createRecvTransport
|
||||
consumerTransport = device.createRecvTransport(params)
|
||||
|
||||
// https://mediasoup.org/documentation/v3/communication-between-client-and-server/#producing-media
|
||||
// this event is raised when a first call to transport.produce() is made
|
||||
// This event is raised when a first call to transport.produce() is made
|
||||
// see connectRecvTransport() below
|
||||
consumerTransport.on('connect', async ({ dtlsParameters }, callback, errback) => {
|
||||
try {
|
||||
@ -353,7 +389,8 @@ const resetCallSettings = () => {
|
||||
localVideo.srcObject = null
|
||||
remoteVideo.srcObject = null
|
||||
consumer = null
|
||||
producer = null
|
||||
producerVideo = null
|
||||
producerAudio = null
|
||||
producerTransport = null
|
||||
consumerTransport = null
|
||||
device = undefined
|
||||
@ -361,7 +398,7 @@ const resetCallSettings = () => {
|
||||
|
||||
const connectRecvTransport = async () => {
|
||||
console.log('connectRecvTransport');
|
||||
// for consumer, we need to tell the server first
|
||||
// For consumer, we need to tell the server first
|
||||
// to create a consumer based on the rtpCapabilities and consume
|
||||
// if the router can consume, it will send back a set of params as below
|
||||
await socket.emit('consume', {
|
||||
@ -373,7 +410,7 @@ const connectRecvTransport = async () => {
|
||||
return
|
||||
}
|
||||
|
||||
// then consume with the local consumer transport
|
||||
// Then consume with the local consumer transport
|
||||
// which creates a consumer
|
||||
consumer = await consumerTransport.consume({
|
||||
id: params.id,
|
||||
@ -416,6 +453,7 @@ const closeCall = () => {
|
||||
resetCallSettings()
|
||||
}
|
||||
|
||||
|
||||
btnLocalVideo.addEventListener('click', getLocalStream)
|
||||
btnRecvSendTransport.addEventListener('click', goConnect)
|
||||
btnCloseCall.addEventListener('click', closeCall)
|
Reference in New Issue
Block a user