Compare commits
No commits in common. "develop" and "develop-testing" have entirely different histories.
develop
...
develop-te
@ -1,2 +0,0 @@
|
|||||||
node_modules
|
|
||||||
doc
|
|
26
Dockerfile
@ -1,25 +1,11 @@
|
|||||||
FROM ubuntu:22.04
|
FROM ubuntu
|
||||||
|
|
||||||
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_18.x | bash -
|
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
|
||||||
RUN apt-get install -y nodejs
|
RUN apt-get install -y nodejs
|
||||||
|
RUN npm install -g watchify
|
||||||
|
|
||||||
COPY . /app/
|
EXPOSE 3000
|
||||||
|
EXPOSE 2000-2020
|
||||||
RUN npm install
|
EXPOSE 10000-10100
|
||||||
|
|
||||||
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
|
|
302
app.js
@ -37,7 +37,7 @@ let videoCalls = {};
|
|||||||
let socketDetails = {};
|
let socketDetails = {};
|
||||||
|
|
||||||
app.get('/', (_req, res) => {
|
app.get('/', (_req, res) => {
|
||||||
res.send('OK');
|
res.send('Hello from mediasoup app!');
|
||||||
});
|
});
|
||||||
|
|
||||||
app.use('/sfu', express.static(path.join(__dirname, 'public')));
|
app.use('/sfu', express.static(path.join(__dirname, 'public')));
|
||||||
@ -76,7 +76,7 @@ const createWorker = async () => {
|
|||||||
});
|
});
|
||||||
return worker;
|
return worker;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[createWorker] | ERROR | error: ${error.message}`);
|
console.log(`ERROR | createWorker | ${error.message}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -148,10 +148,11 @@ const closeCall = (callId) => {
|
|||||||
videoCalls[callId]?.receiverProducerTransport?.close();
|
videoCalls[callId]?.receiverProducerTransport?.close();
|
||||||
videoCalls[callId]?.router?.close();
|
videoCalls[callId]?.router?.close();
|
||||||
delete videoCalls[callId];
|
delete videoCalls[callId];
|
||||||
console.log(`[closeCall] | callId: ${callId}`);
|
} else {
|
||||||
|
console.log(`The call with id ${callId} has already been deleted`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[closeCall] | ERROR | callId: ${callId} | error: ${error.message}`);
|
console.log(`ERROR | closeCall | callid ${callId} | ${error.message}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -188,21 +189,22 @@ peers.on('connection', async (socket) => {
|
|||||||
console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
|
console.log(`[createRoom] socket.id ${socket.id} callId ${callId}`);
|
||||||
if (!videoCalls[callId]) {
|
if (!videoCalls[callId]) {
|
||||||
videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
|
videoCalls[callId] = { router: await worker.createRouter({ mediaCodecs }) };
|
||||||
console.log(`[createRoom] Generate Router ID: ${videoCalls[callId].router.id}`);
|
console.log(`[createRoom] Router ID: ${videoCalls[callId].router.id}`);
|
||||||
videoCalls[callId].receiverSocket = socket;
|
videoCalls[callId].receiverSocket = socket;
|
||||||
} else {
|
} else {
|
||||||
videoCalls[callId].initiatorSocket = socket;
|
videoCalls[callId].initiatorSocket = socket;
|
||||||
}
|
}
|
||||||
socketDetails[socket.id] = callId;
|
socketDetails[socket.id] = callId;
|
||||||
// rtpCapabilities is set for callback
|
// rtpCapabilities is set for callback
|
||||||
|
console.log('[getRtpCapabilities] callId', callId);
|
||||||
callbackResponse = {
|
callbackResponse = {
|
||||||
rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
|
rtpCapabilities: videoCalls[callId].router.rtpCapabilities,
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
console.log(`[createRoom] missing callId: ${callId}`);
|
console.log(`[createRoom] missing callId ${callId}`);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[createRoom] | ERROR | callId: ${callId} | error: ${error.message}`);
|
console.log(`ERROR | createRoom | callId ${callId} | ${error.message}`);
|
||||||
} finally {
|
} finally {
|
||||||
callback(callbackResponse);
|
callback(callbackResponse);
|
||||||
}
|
}
|
||||||
@ -237,10 +239,8 @@ peers.on('connection', async (socket) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(
|
console.log(
|
||||||
`[createWebRtcTransport] | ERROR | callId: ${socketDetails[socket.id]} | sender: ${sender} | error: ${
|
`ERROR | createWebRtcTransport | callId ${socketDetails[socket.id]} | sender ${sender} | ${error.message}`
|
||||||
error.message
|
|
||||||
}`
|
|
||||||
);
|
);
|
||||||
callback(error);
|
callback(error);
|
||||||
}
|
}
|
||||||
@ -261,7 +261,7 @@ peers.on('connection', async (socket) => {
|
|||||||
? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
|
? await videoCalls[callId].initiatorProducerTransport.connect({ dtlsParameters })
|
||||||
: await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
|
: await videoCalls[callId].receiverProducerTransport.connect({ dtlsParameters });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[transport-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
|
console.log(`ERROR | transport-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ peers.on('connection', async (socket) => {
|
|||||||
const callId = socketDetails[socket.id];
|
const callId = socketDetails[socket.id];
|
||||||
if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
|
if (typeof rtpParameters === 'string') rtpParameters = JSON.parse(rtpParameters);
|
||||||
|
|
||||||
console.log(`[transport-produce] callId: ${callId} | kind: ${kind} | socket: ${socket.id}`);
|
console.log(`[transport-produce] kind: ${kind} | socket: ${socket.id} | callId: ${callId}`);
|
||||||
|
|
||||||
if (kind === 'video') {
|
if (kind === 'video') {
|
||||||
if (!isInitiator(callId, socket.id)) {
|
if (!isInitiator(callId, socket.id)) {
|
||||||
@ -284,7 +284,12 @@ peers.on('connection', async (socket) => {
|
|||||||
rtpParameters,
|
rtpParameters,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`[transport-produce] receiverVideoProducer Producer ID: ${videoCalls[callId].receiverVideoProducer.id} | kind: ${videoCalls[callId].receiverVideoProducer.kind}`
|
||||||
|
);
|
||||||
|
|
||||||
videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
|
videoCalls[callId].receiverVideoProducer.on('transportclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
console.log('transport for this producer closed', callId);
|
console.log('transport for this producer closed', callId);
|
||||||
closeCall(callId);
|
closeCall(callId);
|
||||||
});
|
});
|
||||||
@ -300,7 +305,12 @@ peers.on('connection', async (socket) => {
|
|||||||
rtpParameters,
|
rtpParameters,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`[transport-produce] initiatorVideoProducer Producer ID: ${videoCalls[callId].initiatorVideoProducer.id} | kind: ${videoCalls[callId].initiatorVideoProducer.kind}`
|
||||||
|
);
|
||||||
|
|
||||||
videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
|
videoCalls[callId].initiatorVideoProducer.on('transportclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
console.log('transport for this producer closed', callId);
|
console.log('transport for this producer closed', callId);
|
||||||
closeCall(callId);
|
closeCall(callId);
|
||||||
});
|
});
|
||||||
@ -317,7 +327,12 @@ peers.on('connection', async (socket) => {
|
|||||||
rtpParameters,
|
rtpParameters,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`[transport-produce] receiverAudioProducer Producer ID: ${videoCalls[callId].receiverAudioProducer.id} | kind: ${videoCalls[callId].receiverAudioProducer.kind}`
|
||||||
|
);
|
||||||
|
|
||||||
videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
|
videoCalls[callId].receiverAudioProducer.on('transportclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
console.log('transport for this producer closed', callId);
|
console.log('transport for this producer closed', callId);
|
||||||
closeCall(callId);
|
closeCall(callId);
|
||||||
});
|
});
|
||||||
@ -333,7 +348,12 @@ peers.on('connection', async (socket) => {
|
|||||||
rtpParameters,
|
rtpParameters,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`[transport-produce] initiatorAudioProducer Producer ID: ${videoCalls[callId].initiatorAudioProducer.id} | kind: ${videoCalls[callId].initiatorAudioProducer.kind}`
|
||||||
|
);
|
||||||
|
|
||||||
videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
|
videoCalls[callId].initiatorAudioProducer.on('transportclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
console.log('transport for this producer closed', callId);
|
console.log('transport for this producer closed', callId);
|
||||||
closeCall(callId);
|
closeCall(callId);
|
||||||
});
|
});
|
||||||
@ -350,11 +370,9 @@ peers.on('connection', async (socket) => {
|
|||||||
? videoCalls[callId].receiverSocket
|
? videoCalls[callId].receiverSocket
|
||||||
: videoCalls[callId].initiatorSocket;
|
: videoCalls[callId].initiatorSocket;
|
||||||
|
|
||||||
// callId - Id of the call
|
socketToEmit.emit('new-producer', { callId, kind });
|
||||||
// kind - producer type: audio/video
|
|
||||||
socketToEmit?.emit('new-producer', { callId, kind });
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[transport-produce] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
|
console.log(`ERROR | transport-produce | callId ${socketDetails[socket.id]} | ${error.message}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -374,7 +392,7 @@ peers.on('connection', async (socket) => {
|
|||||||
await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
|
await videoCalls[callId].initiatorConsumerTransport.connect({ dtlsParameters });
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[transport-recv-connect] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
|
console.log(`ERROR | transport-recv-connect | callId ${socketDetails[socket.id]} | ${error.message}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -386,17 +404,66 @@ peers.on('connection', async (socket) => {
|
|||||||
- The consumer does consumerTransport.consume(params)
|
- The consumer does consumerTransport.consume(params)
|
||||||
*/
|
*/
|
||||||
socket.on('consume', async ({ rtpCapabilities }, callback) => {
|
socket.on('consume', async ({ rtpCapabilities }, callback) => {
|
||||||
const callId = socketDetails[socket.id];
|
try {
|
||||||
const socketId = socket.id;
|
const callId = socketDetails[socket.id];
|
||||||
|
console.log(
|
||||||
|
`[consume] socket ${socket.id} | callId ${callId} | rtpCapabilities: ${JSON.stringify(rtpCapabilities)}`
|
||||||
|
);
|
||||||
|
|
||||||
console.log(`[consume] socket ${socketId} | callId: ${callId}`);
|
if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
|
||||||
|
|
||||||
if (typeof rtpCapabilities === 'string') rtpCapabilities = JSON.parse(rtpCapabilities);
|
console.log('[consume] callId', callId);
|
||||||
|
let canConsumeVideo, canConsumeAudio;
|
||||||
|
if (isInitiator(callId, socket.id)) {
|
||||||
|
canConsumeVideo =
|
||||||
|
!!videoCalls[callId].receiverVideoProducer &&
|
||||||
|
!!videoCalls[callId].router.canConsume({
|
||||||
|
producerId: videoCalls[callId].receiverVideoProducer.id,
|
||||||
|
rtpCapabilities,
|
||||||
|
});
|
||||||
|
canConsumeAudio =
|
||||||
|
!!videoCalls[callId].receiverAudioProducer &&
|
||||||
|
!!videoCalls[callId].router.canConsume({
|
||||||
|
producerId: videoCalls[callId].receiverAudioProducer.id,
|
||||||
|
rtpCapabilities,
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
canConsumeVideo =
|
||||||
|
!!videoCalls[callId].initiatorVideoProducer &&
|
||||||
|
!!videoCalls[callId].router.canConsume({
|
||||||
|
producerId: videoCalls[callId].initiatorVideoProducer.id,
|
||||||
|
rtpCapabilities,
|
||||||
|
});
|
||||||
|
|
||||||
callback({
|
canConsumeAudio =
|
||||||
videoParams: await consumeVideo({ callId, socketId, rtpCapabilities }),
|
!!videoCalls[callId].initiatorAudioProducer &&
|
||||||
audioParams: await consumeAudio({ callId, socketId, rtpCapabilities }),
|
!!videoCalls[callId].router.canConsume({
|
||||||
});
|
producerId: videoCalls[callId].initiatorAudioProducer.id,
|
||||||
|
rtpCapabilities,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
console.log('[consume] canConsumeVideo', canConsumeVideo);
|
||||||
|
console.log('[consume] canConsumeAudio', canConsumeAudio);
|
||||||
|
|
||||||
|
if (canConsumeVideo && !canConsumeAudio) {
|
||||||
|
const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
|
||||||
|
callback({ videoParams, audioParams: null });
|
||||||
|
} else if (canConsumeVideo && canConsumeAudio) {
|
||||||
|
const videoParams = await consumeVideo(callId, socket.id, rtpCapabilities);
|
||||||
|
const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
|
||||||
|
callback({ videoParams, audioParams });
|
||||||
|
} else if (!canConsumeVideo && canConsumeAudio) {
|
||||||
|
const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities);
|
||||||
|
const data = { videoParams: null, audioParams };
|
||||||
|
callback(data);
|
||||||
|
} else {
|
||||||
|
console.log(`[consume] Can't consume | callId ${callId}`);
|
||||||
|
callback(null);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.log(`ERROR | consume | callId ${socketDetails[socket.id]} | ${error.message}`);
|
||||||
|
callback({ params: { error } });
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -407,129 +474,129 @@ peers.on('connection', async (socket) => {
|
|||||||
socket.on('consumer-resume', () => {
|
socket.on('consumer-resume', () => {
|
||||||
try {
|
try {
|
||||||
const callId = socketDetails[socket.id];
|
const callId = socketDetails[socket.id];
|
||||||
const isInitiatorValue = isInitiator(callId, socket.id);
|
console.log(`[consumer-resume] callId ${callId}`);
|
||||||
console.log(`[consumer-resume] callId: ${callId} | isInitiator: ${isInitiatorValue}`);
|
|
||||||
|
|
||||||
const consumerVideo = isInitiatorValue
|
|
||||||
? videoCalls[callId].initiatorConsumerVideo
|
|
||||||
: videoCalls[callId].receiverConsumerVideo;
|
|
||||||
|
|
||||||
const consumerAudio = isInitiatorValue
|
|
||||||
? videoCalls[callId].initiatorConsumerAudio
|
|
||||||
: videoCalls[callId].receiverConsumerAudio;
|
|
||||||
|
|
||||||
consumerVideo?.resume();
|
|
||||||
consumerAudio?.resume();
|
|
||||||
} catch (error) {
|
|
||||||
console.error(
|
|
||||||
`[consumer-resume] | ERROR | callId: ${socketDetails[socket.id]} | isInitiator: ${isInitiator} | error: ${
|
|
||||||
error.message
|
|
||||||
}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
socket.on('close-producer', ({ callId, kind }) => {
|
|
||||||
try {
|
|
||||||
if (isInitiator(callId, socket.id)) {
|
if (isInitiator(callId, socket.id)) {
|
||||||
console.log(`[close-producer] initiator --EMIT--> receiver | callId: ${callId} | kind: ${kind}`);
|
videoCalls[callId]?.initiatorConsumerVideo?.resume();
|
||||||
videoCalls[callId].receiverSocket.emit('close-producer', { callId, kind });
|
videoCalls[callId]?.initiatorConsumerAudio?.resume();
|
||||||
} else {
|
} else {
|
||||||
console.log(`[close-producer] receiver --EMIT--> initiator | callId: ${callId} | kind: ${kind}`);
|
videoCalls[callId]?.receiverConsumerVideo?.resume();
|
||||||
videoCalls[callId].initiatorSocket.emit('close-producer', { callId, kind });
|
videoCalls[callId]?.receiverConsumerAudio?.resume();
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(`[close-producer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`);
|
console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const canConsume = ({ callId, producerId, rtpCapabilities }) => {
|
const consumeVideo = async (callId, socketId, rtpCapabilities) => {
|
||||||
return !!videoCalls[callId].router.canConsume({
|
if (isInitiator(callId, socketId)) {
|
||||||
producerId,
|
|
||||||
rtpCapabilities,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const consumeVideo = async ({ callId, socketId, rtpCapabilities }) => {
|
|
||||||
// Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
|
|
||||||
if (isInitiator(callId, socketId) && videoCalls[callId].receiverVideoProducer) {
|
|
||||||
const producerId = videoCalls[callId].receiverVideoProducer.id;
|
|
||||||
if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
|
|
||||||
|
|
||||||
videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
|
videoCalls[callId].initiatorConsumerVideo = await videoCalls[callId].initiatorConsumerTransport.consume({
|
||||||
producerId,
|
producerId: videoCalls[callId].receiverVideoProducer.id,
|
||||||
rtpCapabilities,
|
rtpCapabilities,
|
||||||
paused: true,
|
paused: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
|
||||||
|
videoCalls[callId].initiatorConsumerVideo.on('transportclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
|
console.log('transport close from consumer', callId);
|
||||||
|
closeCall(callId);
|
||||||
|
});
|
||||||
|
|
||||||
|
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
|
||||||
|
videoCalls[callId].initiatorConsumerVideo.on('producerclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
|
console.log('producer of consumer closed', callId);
|
||||||
|
closeCall(callId);
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: videoCalls[callId].initiatorConsumerVideo.id,
|
id: videoCalls[callId].initiatorConsumerVideo.id,
|
||||||
producerId,
|
producerId: videoCalls[callId].receiverVideoProducer.id,
|
||||||
kind: 'video',
|
kind: 'video',
|
||||||
rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
|
rtpParameters: videoCalls[callId].initiatorConsumerVideo.rtpParameters,
|
||||||
};
|
};
|
||||||
} else if (videoCalls[callId].initiatorVideoProducer) {
|
} else {
|
||||||
const producerId = videoCalls[callId].initiatorVideoProducer.id;
|
|
||||||
if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
|
|
||||||
|
|
||||||
videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
|
videoCalls[callId].receiverConsumerVideo = await videoCalls[callId].receiverConsumerTransport.consume({
|
||||||
producerId,
|
producerId: videoCalls[callId].initiatorVideoProducer.id,
|
||||||
rtpCapabilities,
|
rtpCapabilities,
|
||||||
paused: true,
|
paused: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
videoCalls[callId].receiverConsumerVideo.on('transportclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
|
console.log('transport close from consumer', callId);
|
||||||
|
closeCall(callId);
|
||||||
|
});
|
||||||
|
|
||||||
|
videoCalls[callId].receiverConsumerVideo.on('producerclose', () => {
|
||||||
|
const callId = socketDetails[socket.id];
|
||||||
|
console.log('producer of consumer closed', callId);
|
||||||
|
closeCall(callId);
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
id: videoCalls[callId].receiverConsumerVideo.id,
|
id: videoCalls[callId].receiverConsumerVideo.id,
|
||||||
producerId,
|
producerId: videoCalls[callId].initiatorVideoProducer.id,
|
||||||
kind: 'video',
|
kind: 'video',
|
||||||
rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
|
rtpParameters: videoCalls[callId].receiverConsumerVideo.rtpParameters,
|
||||||
};
|
};
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const consumeAudio = async ({ callId, socketId, rtpCapabilities }) => {
|
const consumeAudio = async (callId, socketId, rtpCapabilities) => {
|
||||||
try {
|
if (isInitiator(callId, socketId)) {
|
||||||
// Handlers for consumer transport https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
|
videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
|
||||||
if (isInitiator(callId, socketId) && videoCalls[callId].receiverAudioProducer) {
|
producerId: videoCalls[callId].receiverAudioProducer.id,
|
||||||
const producerId = videoCalls[callId].receiverAudioProducer.id;
|
rtpCapabilities,
|
||||||
if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
|
paused: true,
|
||||||
|
});
|
||||||
|
|
||||||
videoCalls[callId].initiatorConsumerAudio = await videoCalls[callId].initiatorConsumerTransport.consume({
|
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-transportclose
|
||||||
producerId,
|
videoCalls[callId].initiatorConsumerAudio.on('transportclose', () => {
|
||||||
rtpCapabilities,
|
const callId = socketDetails[socket.id];
|
||||||
paused: true,
|
console.log('transport close from consumer', callId);
|
||||||
});
|
closeCall(callId);
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
// https://mediasoup.org/documentation/v3/mediasoup/api/#consumer-on-producerclose
|
||||||
id: videoCalls[callId].initiatorConsumerAudio.id,
|
videoCalls[callId].initiatorConsumerAudio.on('producerclose', () => {
|
||||||
producerId,
|
const callId = socketDetails[socket.id];
|
||||||
kind: 'audio',
|
console.log('producer of consumer closed', callId);
|
||||||
rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
|
closeCall(callId);
|
||||||
};
|
});
|
||||||
} else if (videoCalls[callId].initiatorAudioProducer) {
|
|
||||||
const producerId = videoCalls[callId].initiatorAudioProducer.id;
|
|
||||||
if (!canConsume({ callId, producerId, rtpCapabilities })) return null;
|
|
||||||
|
|
||||||
videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
|
return {
|
||||||
producerId,
|
id: videoCalls[callId].initiatorConsumerAudio.id,
|
||||||
rtpCapabilities,
|
producerId: videoCalls[callId].receiverAudioProducer.id,
|
||||||
paused: true,
|
kind: 'audio',
|
||||||
});
|
rtpParameters: videoCalls[callId].initiatorConsumerAudio.rtpParameters,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
videoCalls[callId].receiverConsumerAudio = await videoCalls[callId].receiverConsumerTransport.consume({
|
||||||
|
producerId: videoCalls[callId].initiatorAudioProducer.id,
|
||||||
|
rtpCapabilities,
|
||||||
|
paused: true,
|
||||||
|
});
|
||||||
|
|
||||||
return {
|
videoCalls[callId].receiverConsumerAudio.on('transportclose', () => {
|
||||||
id: videoCalls[callId].receiverConsumerAudio.id,
|
const callId = socketDetails[socket.id];
|
||||||
producerId,
|
console.log('transport close from consumer', callId);
|
||||||
kind: 'audio',
|
closeCall(callId);
|
||||||
rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
|
});
|
||||||
};
|
|
||||||
} else {
|
videoCalls[callId].receiverConsumerAudio.on('producerclose', () => {
|
||||||
return null;
|
const callId = socketDetails[socket.id];
|
||||||
}
|
console.log('producer of consumer closed', callId);
|
||||||
} catch (error) {
|
closeCall(callId);
|
||||||
console.error(`[consumeAudio] | ERROR | error: ${error}`);
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: videoCalls[callId].receiverConsumerAudio.id,
|
||||||
|
producerId: videoCalls[callId].initiatorAudioProducer.id,
|
||||||
|
kind: 'audio',
|
||||||
|
rtpParameters: videoCalls[callId].receiverConsumerAudio.rtpParameters,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -546,7 +613,7 @@ const isInitiator = (callId, socketId) => {
|
|||||||
*/
|
*/
|
||||||
const createWebRtcTransportLayer = async (callId, callback) => {
|
const createWebRtcTransportLayer = async (callId, callback) => {
|
||||||
try {
|
try {
|
||||||
console.log(`[createWebRtcTransportLayer] callId: ${callId}`);
|
console.log('[createWebRtcTransportLayer] callId', callId);
|
||||||
// https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
|
// https://mediasoup.org/documentation/v3/mediasoup/api/#WebRtcTransportOptions
|
||||||
const webRtcTransport_options = {
|
const webRtcTransport_options = {
|
||||||
listenIps: [
|
listenIps: [
|
||||||
@ -583,15 +650,14 @@ const createWebRtcTransportLayer = async (callId, callback) => {
|
|||||||
dtlsParameters: transport.dtlsParameters,
|
dtlsParameters: transport.dtlsParameters,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.log('[createWebRtcTransportLayer] callback params', params);
|
||||||
// Send back to the client the params
|
// Send back to the client the params
|
||||||
callback({ params });
|
callback({ params });
|
||||||
|
|
||||||
// Set transport to producerTransport or consumerTransport
|
// Set transport to producerTransport or consumerTransport
|
||||||
return transport;
|
return transport;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(
|
console.log(`ERROR | createWebRtcTransportLayer | callId ${socketDetails[socket.id]} | ${error.message}`);
|
||||||
`[createWebRtcTransportLayer] | ERROR | callId: ${socketDetails[socket.id]} | error: ${error.message}`
|
|
||||||
);
|
|
||||||
callback({ params: { error } });
|
callback({ params: { error } });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
68
build.sh
@ -1,40 +1,4 @@
|
|||||||
#/!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
|
||||||
@ -58,17 +22,31 @@ 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,doc,Dockerfile} dist/
|
cp -r {.env,app.js,package.json,server,public,doc,Dockerfile} dist/
|
||||||
#cp -r ./* dist/
|
#cp -r ./* dist/
|
||||||
|
|
||||||
# Generate Git log
|
|
||||||
dateString=$(date +"%Y%m%d-%H%M%S")
|
dateString=$(date +"%Y%m%d-%H%M%S")
|
||||||
git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git-$dateString.log"
|
git log --pretty=format:"%ad%x09%an%x09%s" --no-merges -20 > "dist/git--$dateString.log"
|
||||||
|
#Add version control for pm2
|
||||||
# Get Git version control
|
|
||||||
getGitVersion $1
|
|
||||||
|
|
||||||
# Add version control for pm2
|
|
||||||
cd dist
|
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
|
## POST BUILD
|
||||||
|
|
||||||
|
BIN
doc/[video] Call waiting.png
Normal file
After Width: | Height: | Size: 614 KiB |
BIN
doc/[video] Client - Mediasoup connect & produce.png
Normal file
After Width: | Height: | Size: 994 KiB |
Before Width: | Height: | Size: 1.2 MiB |
Before Width: | Height: | Size: 419 KiB |
BIN
doc/[video] Client Android-iOS closed.png
Normal file
After Width: | Height: | Size: 354 KiB |
BIN
doc/[video] Client-Client Workflow.png
Normal file
After Width: | Height: | Size: 794 KiB |
Before Width: | Height: | Size: 1.0 MiB |
BIN
doc/[video] Dispatcher closed.png
Normal file
After Width: | Height: | Size: 462 KiB |
Before Width: | Height: | Size: 606 KiB |
BIN
doc/[video] HUB - Dispatcher close call before accept_reject.png
Normal file
After Width: | Height: | Size: 252 KiB |
Before Width: | Height: | Size: 349 KiB |
BIN
doc/[video] HUB - Dispatcher close call.png
Normal file
After Width: | Height: | Size: 346 KiB |
Before Width: | Height: | Size: 412 KiB |
BIN
doc/[video] HUB - Dispatcher dieconnect.png
Normal file
After Width: | Height: | Size: 407 KiB |
Before Width: | Height: | Size: 421 KiB |
BIN
doc/[video] Video Window closed.png
Normal file
After Width: | Height: | Size: 439 KiB |
Before Width: | Height: | Size: 567 KiB |
Before Width: | Height: | Size: 660 KiB |
BIN
doc/[video] Workflow.png
Normal file
After Width: | Height: | Size: 571 KiB |
@ -20457,15 +20457,6 @@ setTimeout(() => {
|
|||||||
console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
|
console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
|
||||||
connectRecvTransport();
|
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) {
|
||||||
@ -20842,7 +20833,7 @@ const connectRecvTransport = async () => {
|
|||||||
console.log('remoteVideo PLAY')
|
console.log('remoteVideo PLAY')
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error(`remoteVideo PLAY ERROR | ${error.message}`)
|
displayError(`remoteVideo PLAY ERROR | ${error.message}`)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -20855,6 +20846,10 @@ 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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,15 +99,6 @@ setTimeout(() => {
|
|||||||
console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
|
console.log(`🟢 new-producer | callId: ${callId} | kind: ${kind} | Ready to consume`);
|
||||||
connectRecvTransport();
|
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) {
|
||||||
@ -484,7 +475,7 @@ const connectRecvTransport = async () => {
|
|||||||
console.log('remoteVideo PLAY')
|
console.log('remoteVideo PLAY')
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error(`remoteVideo PLAY ERROR | ${error.message}`)
|
displayError(`remoteVideo PLAY ERROR | ${error.message}`)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -497,6 +488,10 @@ 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
|
||||||
}
|
}
|
||||||
|
|
||||||
|