Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor changes

master
Iñaki Baz Castillo 2017-08-23 13:42:27 +02:00
parent b86b6e6957
commit 18f5ee9087
7 changed files with 10555 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/lib/Client.js
View File

@ -151,7 +151,6 @@ export default class Client extends events.EventEmitter
// Old API. // Old API.
else else
{ {
this._peerconnection.removeStream(stream);
this._peerconnection.addStream(stream); this._peerconnection.addStream(stream);
} }

176
app/lib/edge/RTCPeerConnection.js
View File

@ -624,14 +624,14 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
if (track.readyState === 'ended') { if (track.readyState === 'ended') {
logger.warn('ignoring ended MediaStreamTrack'); logger.warn('ignoring ended MediaStreamTrack');
continue; // eslint-disable-line no-continue continue;
} }
// Ignore if track is already present. // Ignore if track is already present.
if (this._localTrackInfos.has(track.id)) { if (this._localTrackInfos.has(track.id)) {
logger.warn('ignoring already handled MediaStreamTrack'); logger.warn('ignoring already handled MediaStreamTrack');
continue; // eslint-disable-line no-continue continue;
} }
const rtpSender = new RTCRtpSender(track, this._dtlsTransport); const rtpSender = new RTCRtpSender(track, this._dtlsTransport);
@ -643,6 +643,42 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
}); });
} }
// Check for local tracks removal.
for (const [ trackId, info ] of this._localTrackInfos) {
const track = info.rtpSender.track;
// Check if any of the local tracks has been stopped.
if (track.readyState === 'ended') {
logger.debug(
`_addStream() an already handled track was stopped, track.id:${track.id}`);
try {
info.rtpSender.stop();
} catch (error) {
logger.warn(`rtpSender.stop() failed:${error}`);
}
// Remove from the map.
this._localTrackInfos.delete(track.id);
// Also, if the stream was already handled, check whether tracks
// have been removed via stream.removeTrack() and, if so, stop
// their RtpSenders.
} else if (info.stream === stream && !stream.getTrackById(trackId)) {
logger.debug(
`_addStream() a track in this stream was removed, track.id:${trackId}`);
try {
info.rtpSender.stop();
} catch (error) {
logger.warn(`rtpSender.stop() failed:${error}`);
}
// Remove from the map.
this._localTrackInfos.delete(track.id);
}
}
// It may need to renegotiate. // It may need to renegotiate.
this._emitNegotiationNeeded(); this._emitNegotiationNeeded();
} }
@ -825,9 +861,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Add codecs. // Add codecs.
for (const codec of localCapabilities.codecs) { for (const codec of localCapabilities.codecs) {
if (codec.kind && codec.kind !== kind) { if (codec.kind && codec.kind !== kind)
continue; // eslint-disable-line no-continue continue;
}
payloads.push(codec.preferredPayloadType); payloads.push(codec.preferredPayloadType);
@ -896,13 +931,11 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
const track = rtpSender.track; const track = rtpSender.track;
// Ignore if ended. // Ignore if ended.
if (track.readyState === 'ended') { if (track.readyState === 'ended')
continue; // eslint-disable-line no-continue continue;
}
if (track.kind !== kind) { if (track.kind !== kind)
continue; // eslint-disable-line no-continue continue;
}
// Set a random provisional SSRC if not set. // Set a random provisional SSRC if not set.
if (!info.ssrc) { if (!info.ssrc) {
@ -977,9 +1010,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
mediaObject.ext = []; mediaObject.ext = [];
for (const extension of localCapabilities.headerExtensions) { for (const extension of localCapabilities.headerExtensions) {
if (extension.kind && extension.kind !== kind) { if (extension.kind && extension.kind !== kind)
continue; // eslint-disable-line no-continue continue;
}
mediaObject.ext.push({ mediaObject.ext.push({
value: extension.preferredId, value: extension.preferredId,
@ -1163,9 +1195,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Add codecs. // Add codecs.
for (const codec of localCapabilities.codecs) { for (const codec of localCapabilities.codecs) {
if (codec.kind && codec.kind !== kind) { if (codec.kind && codec.kind !== kind)
continue; // eslint-disable-line no-continue continue;
}
payloads.push(codec.preferredPayloadType); payloads.push(codec.preferredPayloadType);
@ -1234,13 +1265,11 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
const track = rtpSender.track; const track = rtpSender.track;
// Ignore if ended. // Ignore if ended.
if (track.readyState === 'ended') { if (track.readyState === 'ended')
continue; // eslint-disable-line no-continue continue;
}
if (track.kind !== kind) { if (track.kind !== kind)
continue; // eslint-disable-line no-continue continue;
}
// Set a random provisional SSRC if not set. // Set a random provisional SSRC if not set.
if (!info.ssrc) { if (!info.ssrc) {
@ -1315,9 +1344,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
mediaObject.ext = []; mediaObject.ext = [];
for (const extension of localCapabilities.headerExtensions) { for (const extension of localCapabilities.headerExtensions) {
if (extension.kind && extension.kind !== kind) { if (extension.kind && extension.kind !== kind)
continue; // eslint-disable-line no-continue continue;
}
mediaObject.ext.push({ mediaObject.ext.push({
value: extension.preferredId, value: extension.preferredId,
@ -1364,9 +1392,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
} }
for (const sdpCandidate of this._bufferedIceCandidates) { for (const sdpCandidate of this._bufferedIceCandidates) {
if (!sdpCandidate) { if (!sdpCandidate)
continue; // eslint-disable-line no-continue continue;
}
// Now we have set the MID values of the SDP O/A, so let's fill the // Now we have set the MID values of the SDP O/A, so let's fill the
// sdpMIndex of the candidate. // sdpMIndex of the candidate.
@ -1553,10 +1580,12 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
const codecs = []; const codecs = [];
let codecPayloadType; let codecPayloadType;
for (const codecCapability of localCapabilities.codecs) { for (const codecCapability of localCapabilities.codecs)
{
if (codecCapability.kind !== kind if (codecCapability.kind !== kind
|| codecCapability.name === 'rtx') { || codecCapability.name === 'rtx')
continue; // eslint-disable-line no-continue {
continue;
} }
codecPayloadType = codecCapability.preferredPayloadType; codecPayloadType = codecCapability.preferredPayloadType;
@ -1576,10 +1605,12 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
} }
if (rtxSsrc) { if (rtxSsrc) {
for (const codecCapability of localCapabilities.codecs) { for (const codecCapability of localCapabilities.codecs)
{
if (codecCapability.kind !== kind if (codecCapability.kind !== kind
|| codecCapability.name !== 'rtx') { || codecCapability.name !== 'rtx')
continue; // eslint-disable-line no-continue {
continue;
} }
codecs.push({ codecs.push({
@ -1611,10 +1642,10 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
parameters.encodings.push(encoding); parameters.encodings.push(encoding);
for (const extension of localCapabilities.headerExtensions) { for (const extension of localCapabilities.headerExtensions)
if (extension.kind !== kind) { {
continue; // eslint-disable-line no-continue if (extension.kind !== kind)
} continue;
parameters.headerExtensions.push({ parameters.headerExtensions.push({
encrypt: extension.preferredEncrypt, encrypt: extension.preferredEncrypt,
@ -1655,8 +1686,9 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
for (const codecCapability of localCapabilities.codecs) { for (const codecCapability of localCapabilities.codecs) {
if (codecCapability.kind !== kind if (codecCapability.kind !== kind
|| codecCapability.name === 'rtx') { || codecCapability.name === 'rtx')
continue; // eslint-disable-line no-continue {
continue;
} }
codecPayloadType = codecCapability.preferredPayloadType; codecPayloadType = codecCapability.preferredPayloadType;
@ -1678,8 +1710,9 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
if (rtxSsrc) { if (rtxSsrc) {
for (const codecCapability of localCapabilities.codecs) { for (const codecCapability of localCapabilities.codecs) {
if (codecCapability.kind !== kind if (codecCapability.kind !== kind
|| codecCapability.name !== 'rtx') { || codecCapability.name !== 'rtx')
continue; // eslint-disable-line no-continue {
continue;
} }
codecs.push({ codecs.push({
@ -1712,9 +1745,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
parameters.encodings.push(encoding); parameters.encodings.push(encoding);
for (const extension of localCapabilities.headerExtensions) { for (const extension of localCapabilities.headerExtensions) {
if (extension.kind !== kind) { if (extension.kind !== kind)
continue; // eslint-disable-line no-continue continue;
}
parameters.headerExtensions.push({ parameters.headerExtensions.push({
encrypt: extension.preferredEncrypt, encrypt: extension.preferredEncrypt,
@ -1856,9 +1888,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Check new tracks. // Check new tracks.
for (const [ ssrc, info ] of newRemoteTrackInfos) { for (const [ ssrc, info ] of newRemoteTrackInfos) {
// If already handled, ignore it. // If already handled, ignore it.
if (currentRemoteSsrcs.has(ssrc)) { if (currentRemoteSsrcs.has(ssrc))
continue; // eslint-disable-line no-continue continue;
}
logger.debug(`_receiveMedia() new remote track, ssrc:${ssrc}`); logger.debug(`_receiveMedia() new remote track, ssrc:${ssrc}`);
@ -1924,9 +1955,6 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Set custom property with the remote id. // Set custom property with the remote id.
track.jitsiRemoteId = trackRemoteId; track.jitsiRemoteId = trackRemoteId;
// TODO: TMP
logger.warn(`new remote track [stream.jitsiRemoteId:${stream.jitsiRemoteId}, track.jitsiRemoteId:${track.jitsiRemoteId}, track.id:${track.id}]`);
// Add the track to the stream. // Add the track to the stream.
stream.addTrack(track); stream.addTrack(track);
@ -1941,19 +1969,15 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Check track removal. // Check track removal.
for (const ssrc of currentRemoteSsrcs) { for (const ssrc of currentRemoteSsrcs) {
if (newRemoteTrackInfos.has(ssrc)) { if (newRemoteTrackInfos.has(ssrc))
continue; // eslint-disable-line no-continue continue;
}
logger.debug(`_receiveMedia() remote track removed, ssrc:${ssrc}`); logger.debug(`_receiveMedia() remote track removed, ssrc:${ssrc}`);
const info = this._remoteTrackInfos.get(ssrc); const info = this._remoteTrackInfos.get(ssrc);
const stream = info.stream; const stream = info.stream;
const track = info.track; const track = info.track;
const rtpReceiver = info.rtpReceiver; const rtpReceiver = info.rtpReceiver;
// TODO: TMP
logger.warn(`remote track removed [track.jitsiRemoteId:${track.jitsiRemoteId}, track.id:${track.id}]`);
try { try {
rtpReceiver.stop(); rtpReceiver.stop();
@ -1977,9 +2001,6 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Emit MediaStream 'removetrack' for removed tracks. // Emit MediaStream 'removetrack' for removed tracks.
for (const [ track, stream ] of removedRemoteTracks) { for (const [ track, stream ] of removedRemoteTracks) {
// TODO: TMP
logger.warn(`emit "removetrack" [stream.jitsiRemoteId:${stream.jitsiRemoteId}, track.jitsiRemoteId:${track.jitsiRemoteId}, track.id:${track.id}]`);
const event = new Event('removetrack'); const event = new Event('removetrack');
event.track = track; event.track = track;
@ -2002,12 +2023,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Emit RTCPeerConnection 'removestream' for removed remote streams. // Emit RTCPeerConnection 'removestream' for removed remote streams.
for (const [ streamRemoteId, stream ] of this._remoteStreams) { for (const [ streamRemoteId, stream ] of this._remoteStreams) {
// TODO: TMP if (stream.getTracks().length > 0)
logger.warn(`remote stream [streamRemoteId:${streamRemoteId}, jitsiRemoteId:${stream.jitsiRemoteId}, tracks:${stream.getTracks().length}]`); continue;
if (stream.getTracks().length > 0) {
continue; // eslint-disable-line no-continue
}
this._remoteStreams.delete(streamRemoteId); this._remoteStreams.delete(streamRemoteId);
this._emitRemoveStream(stream); this._emitRemoveStream(stream);
@ -2026,9 +2043,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Stop and remove the RTCRtpSender associated to each track. // Stop and remove the RTCRtpSender associated to each track.
for (const track of stream.getTracks()) { for (const track of stream.getTracks()) {
// Ignore if track not present. // Ignore if track not present.
if (!this._localTrackInfos.has(track.id)) { if (!this._localTrackInfos.has(track.id))
continue; // eslint-disable-line no-continue continue;
}
const rtpSender = this._localTrackInfos.get(track.id).rtpSender; const rtpSender = this._localTrackInfos.get(track.id).rtpSender;
@ -2054,12 +2070,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
for (const info of this._localTrackInfos.values()) { for (const info of this._localTrackInfos.values()) {
// Ignore if already sending. // Ignore if already sending.
if (info.sending) { if (info.sending)
continue; // eslint-disable-line no-continue continue;
}
// Update sending field.
info.sending = true;
const rtpSender = info.rtpSender; const rtpSender = info.rtpSender;
const ssrc = info.ssrc; const ssrc = info.ssrc;
@ -2075,9 +2087,12 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
logger.debug( logger.debug(
'calling rtpSender.send(), parameters:', parameters); 'calling rtpSender.send(), parameters:', parameters);
// Start rsending media. // Start sending media.
try { try {
rtpSender.send(parameters); rtpSender.send(parameters);
// Update sending field.
info.sending = true;
} catch (error) { } catch (error) {
logger.error(`rtpSender.send() failed:${error.message}`); logger.error(`rtpSender.send() failed:${error.message}`);
logger.error(error); logger.error(error);
@ -2418,9 +2433,8 @@ export default class ortcRTCPeerConnection extends yaeti.EventTarget {
// Add remote ICE candidates. // Add remote ICE candidates.
// NOTE: Remove candidates that Edge doesn't like. // NOTE: Remove candidates that Edge doesn't like.
for (const candidate of remoteIceCandidates) { for (const candidate of remoteIceCandidates) {
if (candidate.port === 0 || candidate.port === 9) { if (candidate.port === 0 || candidate.port === 9)
continue; // eslint-disable-line no-continue continue;
}
this._iceTransport.addRemoteCandidate(candidate); this._iceTransport.addRemoteCandidate(candidate);
} }

6143
app/package-lock.json generated 100644
View File

File diff suppressed because it is too large Load Diff

10
app/package.json
View File

@ -12,8 +12,8 @@
"classnames": "^2.2.5", "classnames": "^2.2.5",
"debug": "^2.6.8", "debug": "^2.6.8",
"domready": "^1.0.8", "domready": "^1.0.8",
"hark": "ibc/hark#main-with-raf", "hark": "github:ibc/hark#main-with-raf",
"material-ui": "^0.18.3", "material-ui": "^0.18.4",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"protoo-client": "^1.1.4", "protoo-client": "^1.1.4",
"random-number": "0.0.7", "random-number": "0.0.7",
@ -21,7 +21,7 @@
"react": "^15.6.1", "react": "^15.6.1",
"react-clipboard.js": "^1.1.2", "react-clipboard.js": "^1.1.2",
"react-dom": "^15.6.1", "react-dom": "^15.6.1",
"react-notification-system": "ibc/react-notification-system#master", "react-notification-system": "github:ibc/react-notification-system#master",
"react-tap-event-plugin": "^2.0.1", "react-tap-event-plugin": "^2.0.1",
"react-transition-group": "^1.2.0", "react-transition-group": "^1.2.0",
"sdp-transform": "^2.3.0", "sdp-transform": "^2.3.0",
@ -38,8 +38,8 @@
"browserify": "^14.4.0", "browserify": "^14.4.0",
"del": "^3.0.0", "del": "^3.0.0",
"envify": "^4.0.0", "envify": "^4.0.0",
"eslint": "^4.0.0", "eslint": "^4.1.1",
"eslint-plugin-import": "^2.3.0", "eslint-plugin-import": "^2.6.0",
"eslint-plugin-react": "^7.1.0", "eslint-plugin-react": "^7.1.0",
"gulp": "git://github.com/gulpjs/gulp.git#4.0", "gulp": "git://github.com/gulpjs/gulp.git#4.0",
"gulp-css-base64": "^1.3.4", "gulp-css-base64": "^1.3.4",

4
server/lib/Room.js
View File

@ -57,8 +57,8 @@ class Room extends EventEmitter
}); });
}); });
// TODO: FIX // TODO: FIX?
this._mediaRoom.on('____audiolevels', (entries) => this._mediaRoom.on('audiolevels', (entries) =>
{ {
logger.debug('room "audiolevels" event'); logger.debug('room "audiolevels" event');

4308
server/package-lock.json generated 100644
View File

File diff suppressed because it is too large Load Diff

3
server/server.js
View File

@ -243,7 +243,8 @@ function openTerminal()
closeCommandConsole(); closeCommandConsole();
closeTerminal(); closeTerminal();
terminal = repl.start({ terminal = repl.start(
{
prompt : 'terminal> ', prompt : 'terminal> ',
useColors : true, useColors : true,
useGlobal : true, useGlobal : true,