BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another round of fixes to screenshare hanging process and additional logging

Browse Source
This commit is contained in:
prlanzarin 2018-04-26 16:22:20 +00:00
parent ea73a4d37a
commit 0a68c5d9b2
3 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/bbb-webrtc-sfu/lib/base/BaseManager.js
View File

@ -89,12 +89,12 @@ module.exports = class BaseManager {
}
delete this._sessions[sessionId];
this._logAvailableSessions();
resolve();
return resolve();
}
}
catch (err) {
Logger.error(err);
resolve();
return resolve();
}
});
}

22
labs/bbb-webrtc-sfu/lib/mcs-core/lib/media/MCSApiStub.js
View File

@ -27,7 +27,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(answer);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] join ", err);
Promise.reject(err);
}
}
@ -38,7 +38,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(answer);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] leave ", err);
return Promise.reject(err);
}
}
@ -49,7 +49,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(answer);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] publishnsubscribe ", err);
return Promise.reject(err);
}
}
@ -60,7 +60,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(answer);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] publish ", err);
return Promise.reject(err);
}
}
@ -71,7 +71,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve();
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] unpublish ", err);
return Promise.reject(err);
}
}
@ -83,7 +83,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(answer);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] subscribe ", err);
return Promise.reject(err);
}
}
@ -94,7 +94,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve();
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] unsubscribe ", err);
return Promise.reject(err);
}
}
@ -105,7 +105,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(answer);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] startRecording ", err);
return Promise.reject(err);
}
}
@ -116,7 +116,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(answer);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] stopRecording ", err);
return Promise.reject(err);
}
}
@ -131,7 +131,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(eventTag);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] onEvent ", err);
return Promise.reject();
}
}
@ -142,7 +142,7 @@ module.exports = class MCSApiStub extends EventEmitter {
return Promise.resolve(ack);
}
catch (err) {
Logger.error(err);
Logger.error("[MCSApi] addIceCandidate ", err);
Promise.reject();
}
}

49
labs/bbb-webrtc-sfu/lib/screenshare/screenshare.js
View File

@ -149,18 +149,6 @@ module.exports = class Screenshare extends EventEmitter {
case "MediaFlowOutStateChange":
case "MediaFlowInStateChange":
Logger.info('[screenshare]', msEvent.type, '[' + msEvent.state? msEvent.state : 'UNKNOWN_STATE' + ']', 'for media session', event.id);
if (msEvent.state === 'FLOWING' && this._status != C.MEDIA_STARTED) {
Logger.info('[screenshare] webRTC started flowing id: ', event.id);
if (SHOULD_RECORD) {
this.startRecording();
}
this._status = C.MEDIA_STARTED;
}
if (msEvent.state === 'NOT_FLOWING') {
this._status = C.MEDIA_STOPPED;
}
break;
default: Logger.warn("[screenshare] Unrecognized event", event);
@ -309,24 +297,23 @@ module.exports = class Screenshare extends EventEmitter {
return new Promise(async (resolve, reject) => {
try {
Logger.info('[screnshare] Stopping and releasing endpoints for MCS user', this.userId);
await this._stopScreensharing();
this._status = C.MEDIA_STOPPED;
if (this._presenterEndpoint) {
await this._stopScreensharing();
Logger.info("[screenshare] Leaving mcs room");
await this.mcs.leave(this._meetingId, this.userId);
delete sharedScreens[this._presenterEndpoint];
this._candidatesQueue = null;
this._presenterEndpoint = null;
this._ffmpegEndpoint = null;
if (SHOULD_RECORD) {
this.sendStopShareEvent();
}
resolve();
Logger.info("[screenshare] Leaving mcs room");
await this.mcs.leave(this._meetingId, this.userId);
delete sharedScreens[this._presenterEndpoint];
this._candidatesQueue = null;
this._presenterEndpoint = null;
this._ffmpegEndpoint = null;
if (SHOULD_RECORD) {
this.sendStopShareEvent();
}
return resolve();
}
catch (err) {
Logger.error('[screenshare] MCS returned an error when trying to leave =>', err);
resolve();
return resolve();
}
});
}
@ -334,6 +321,7 @@ module.exports = class Screenshare extends EventEmitter {
_stopScreensharing() {
return new Promise((resolve, reject) => {
try {
Logger.info("[screenshare] Stopping screensharing with status", this._status);
let strm = Messaging.generateStopTranscoderRequestMessage(this._meetingId, this._meetingId);
this._BigBlueButtonGW.publish(strm, C.TO_BBB_TRANSCODE_SYSTEM_CHAN, function(error) {});
@ -356,6 +344,10 @@ module.exports = class Screenshare extends EventEmitter {
return resolve();
}
});
if (this._status != C.MEDIA_STARTED) {
return resolve();
}
}
catch (err) {
Logger.error(err);
@ -384,6 +376,13 @@ module.exports = class Screenshare extends EventEmitter {
});
this._BigBlueButtonGW.publish(strm, C.TO_BBB_TRANSCODE_SYSTEM_CHAN, function(error) {});
if (this._status != C.MEDIA_STARTED) {
Logger.info('[screenshare] webRTC started flowing for meeting', this._meetingId);
if (SHOULD_RECORD) {
this.startRecording();
}
this._status = C.MEDIA_STARTED;
}
}
};