hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Embed: don't trigger more errors when the stream has died

Browse source
This commit is contained in:
Cat 2021-09-13 14:27:25 +02:00 • committed by Thulinma
parent be7e44727f
commit 7a0b425fc4
4 changed files with 46 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
embed/player.js
View file

@ -72,6 +72,7 @@ function MistVideo(streamName,options) {
start: function(callback,delay){
var i = setTimeout(function(){
delete MistVideo.timers.list[i];
if (MistVideo.destroyed) return;
callback();
},delay);
this.list[i] = new Date(new Date().getTime() + delay);
@ -1017,7 +1018,9 @@ function MistVideo(streamName,options) {
}
},
report: function(d){
MistVideo.socket.send(JSON.stringify(d));
if (MistVideo.socket.readyState == 1) {
MistVideo.socket.send(JSON.stringify(d));
}
},
reportStats: function(){
var d = {};
@ -1093,22 +1096,22 @@ function MistVideo(streamName,options) {
});
Object.defineProperty(d,"videoHeight",{
get: function(){
return MistVideo.video.videoHeight;
return MistVideo.video ? MistVideo.video.videoHeight : null;
}
});
Object.defineProperty(d,"videoWidth",{
get: function(){
return MistVideo.video.videoWidth;
return MistVideo.video ? MistVideo.video.videoWidth : null;
}
});
Object.defineProperty(d,"playerHeight",{
get: function(){
return MistVideo.video.clientHeight;
return MistVideo.video ? MistVideo.video.clientHeight : null;
}
});
Object.defineProperty(d,"playerWidth",{
get: function(){
return MistVideo.video.clientWidth;
return MistVideo.video ? MistVideo.video.clientWidth : null;
}
});
@ -1354,6 +1357,7 @@ function MistVideo(streamName,options) {
}
if (this.socket) {
if (this.reporting) {
this.reporting.reportStats();
this.reporting.report({unload:reason ? reason : null});
}
this.socket.destroy();