From 4c8b806e4b0280c1732d37412188047f3ded03fe Mon Sep 17 00:00:00 2001 From: steveseguin Date: Thu, 4 Jan 2024 15:19:01 -0500 Subject: [PATCH] minor fixes for v24 --- check.html | 60 ++- debug.html | 107 +++++ examples/iframe.outbound-stats.html | 30 +- examples/sensors.html | 4 +- iframe.html | 4 +- index.html | 8 +- lib.js | 72 ++- main.js | 9 +- speedtest.html | 54 +-- teststreams.html | 717 ++++++++++++++++++++++++++++ webrtc.js | 2 +- whep.html | 2 +- 12 files changed, 955 insertions(+), 114 deletions(-) create mode 100644 debug.html create mode 100644 teststreams.html diff --git a/check.html b/check.html index a9ec8db..cbbc280 100644 --- a/check.html +++ b/check.html @@ -425,68 +425,66 @@ if ("stats" in e.data) { var out = ""; - for (var someValue in e.data.stats.inbound_stats) { - out += printValues(e.data.stats.inbound_stats[someValue]); - if (e.data.stats.inbound_stats[someValue] && e.data.stats.inbound_stats[someValue].info){ + + for (var someValue in e.data.stats.inbound) { + out += printValues(e.data.stats.inbound[someValue]); + if (e.data.stats.inbound[someValue] && e.data.stats.inbound[someValue].info){ if (!statsSent){ - statsSent = e.data.stats.inbound_stats[someValue]; + statsSent = e.data.stats.inbound[someValue]; } } } - for (var someValue in e.data.stats.outbound_stats) { - if (e.data.stats.outbound_stats[someValue].quality_limitation_reason){ - if (quality_reason != e.data.stats.outbound_stats[someValue].quality_limitation_reason) { - quality_reason = e.data.stats.outbound_stats[someValue].quality_limitation_reason; + for (var someValue in e.data.stats.outbound) { + if (e.data.stats.outbound[someValue].quality_limitation_reason){ + if (quality_reason != e.data.stats.outbound[someValue].quality_limitation_reason) { + quality_reason = e.data.stats.outbound[someValue].quality_limitation_reason; logData({"QLR": quality_reason}); } } - if (e.data.stats.outbound_stats[someValue].encoder){ - if (encoder != e.data.stats.outbound_stats[someValue].encoder) { - encoder = e.data.stats.outbound_stats[someValue].encoder; + if (e.data.stats.outbound[someValue].encoder){ + if (encoder != e.data.stats.outbound[someValue].encoder) { + encoder = e.data.stats.outbound[someValue].encoder; logData({"encoder":encoder}); } - } else if (e.data.stats.outbound_stats[someValue].video_codec){ - if (encoder != e.data.stats.outbound_stats[someValue].video_codec) { - encoder = e.data.stats.outbound_stats[someValue].video_codec; + } else if (e.data.stats.outbound[someValue].video_codec){ + if (encoder != e.data.stats.outbound[someValue].video_codec) { + encoder = e.data.stats.outbound[someValue].video_codec; logData({"encoder":encoder}); } } } - for (var key in e.data.stats.inbound_stats[streamID]){ - if (typeof e.data.stats.inbound_stats[streamID][key] == "object"){ - if ("Bitrate_in_kbps" in e.data.stats.inbound_stats[streamID][key]){ - var bitrate = e.data.stats.inbound_stats[streamID][key]["Bitrate_in_kbps"]; + for (var key in e.data.stats.inbound[streamID]){ + if (typeof e.data.stats.inbound[streamID][key] == "object"){ + if ("Bitrate_in_kbps" in e.data.stats.inbound[streamID][key]){ + var bitrate = e.data.stats.inbound[streamID][key]["Bitrate_in_kbps"]; updateData("bitrate", bitrate); } - - - - if ("Jitter_Buffer_ms" in e.data.stats.inbound_stats[streamID][key]){ - var buffer = e.data.stats.inbound_stats[streamID][key]["Jitter_Buffer_ms"]; + if ("Jitter_Buffer_ms" in e.data.stats.inbound[streamID][key]){ + var buffer = e.data.stats.inbound[streamID][key]["Jitter_Buffer_ms"]; updateData("buffer", buffer); - } else if ("Buffer_Delay_in_ms" in e.data.stats.inbound_stats[streamID][key]){ - var buffer = e.data.stats.inbound_stats[streamID][key]["Buffer_Delay_in_ms"]; + } else if ("Buffer_Delay_in_ms" in e.data.stats.inbound[streamID][key]){ + var buffer = e.data.stats.inbound[streamID][key]["Buffer_Delay_in_ms"]; updateData("buffer", buffer); - } else if ("Added_Buffer_Delay_ms" in e.data.stats.inbound_stats[streamID][key]){ + } else if ("Added_Buffer_Delay_ms" in e.data.stats.inbound[streamID][key]){ console.log("Added_Buffer_Delay_ms"); - var buffer = e.data.stats.inbound_stats[streamID][key]["Added_Buffer_Delay_ms"]; + var buffer = e.data.stats.inbound[streamID][key]["Added_Buffer_Delay_ms"]; updateData("buffer", buffer); } - if ("packetLoss_in_percentage" in e.data.stats.inbound_stats[streamID][key]){ - var packetloss = e.data.stats.inbound_stats[streamID][key]["packetLoss_in_percentage"]; + if ("packetLoss_in_percentage" in e.data.stats.inbound[streamID][key]){ + var packetloss = e.data.stats.inbound[streamID][key]["packetLoss_in_percentage"]; if (packetloss != undefined) { packetloss = packetloss.toFixed(2); updateData("packetloss", packetloss); } } - if ("Resolution" in e.data.stats.inbound_stats[streamID][key]){ - var resolution = e.data.stats.inbound_stats[streamID][key]["Resolution"]; + if ("Resolution" in e.data.stats.inbound[streamID][key]){ + var resolution = e.data.stats.inbound[streamID][key]["Resolution"]; if (previousResolution != resolution) { previousResolution = resolution; diff --git a/debug.html b/debug.html new file mode 100644 index 0000000..68af4f2 --- /dev/null +++ b/debug.html @@ -0,0 +1,107 @@ + + + + + + + \ No newline at end of file diff --git a/examples/iframe.outbound-stats.html b/examples/iframe.outbound-stats.html index 6d03ae3..655c8bc 100644 --- a/examples/iframe.outbound-stats.html +++ b/examples/iframe.outbound-stats.html @@ -127,7 +127,7 @@ if ("stats" in e.data) { var now = new Date(); //Used for "Added" column and to remove stale viewers - for (var viewer in e.data.stats.outbound_stats) { + for (var viewer in e.data.stats.outbound) { //Check to see if a row exists for this viewier, if not then its a new viewer and we should create a row if ($("#vdon_viewer_" + viewer).length == 0) { var h = now.getHours(); @@ -137,26 +137,26 @@ } //Insert/update stats //Initially objects can be available but without any attributes, check they exist and ignore till the basics are available - if (e.data.stats.outbound_stats[viewer] == undefined) continue; - if (e.data.stats.outbound_stats[viewer].info == undefined) continue; + if (e.data.stats.outbound[viewer] == undefined) continue; + if (e.data.stats.outbound[viewer].info == undefined) continue; //Checking these exist as not all attributes are available straight away when stats are created - if (e.data.stats.outbound_stats[viewer].info.label != undefined) { - $("#vdon_viewer_" + viewer).find('.vdon_viewer_label').text(e.data.stats.outbound_stats[viewer].info.label); + if (e.data.stats.outbound[viewer].info.label != undefined) { + $("#vdon_viewer_" + viewer).find('.vdon_viewer_label').text(e.data.stats.outbound[viewer].info.label); } - if (e.data.stats.outbound_stats[viewer].quality_Limitation_Reason != undefined) { - $("#vdon_viewer_" + viewer).find('.vdon_viewer_qlr').text(e.data.stats.outbound_stats[viewer].quality_Limitation_Reason); + if (e.data.stats.outbound[viewer].quality_Limitation_Reason != undefined) { + $("#vdon_viewer_" + viewer).find('.vdon_viewer_qlr').text(e.data.stats.outbound[viewer].quality_Limitation_Reason); } - if (e.data.stats.outbound_stats[viewer].resolution != undefined) { - $("#vdon_viewer_" + viewer).find('.vdon_viewer_resolution').text(e.data.stats.outbound_stats[viewer].resolution); + if (e.data.stats.outbound[viewer].resolution != undefined) { + $("#vdon_viewer_" + viewer).find('.vdon_viewer_resolution').text(e.data.stats.outbound[viewer].resolution); } - if (e.data.stats.outbound_stats[viewer].info.platform != undefined) { - $("#vdon_viewer_" + viewer).find('.vdon_viewer_platform').text(e.data.stats.outbound_stats[viewer].info.platform); + if (e.data.stats.outbound[viewer].info.platform != undefined) { + $("#vdon_viewer_" + viewer).find('.vdon_viewer_platform').text(e.data.stats.outbound[viewer].info.platform); } - if (e.data.stats.outbound_stats[viewer].encoder != undefined) { - $("#vdon_viewer_" + viewer).find('.vdon_viewer_encoder').text(e.data.stats.outbound_stats[viewer].encoder); + if (e.data.stats.outbound[viewer].encoder != undefined) { + $("#vdon_viewer_" + viewer).find('.vdon_viewer_encoder').text(e.data.stats.outbound[viewer].encoder); } - if (e.data.stats.outbound_stats[viewer].info.useragent != undefined) { - $("#vdon_viewer_" + viewer).find('.vdon_viewer_useragent').text(e.data.stats.outbound_stats[viewer].info.useragent); + if (e.data.stats.outbound[viewer].info.useragent != undefined) { + $("#vdon_viewer_" + viewer).find('.vdon_viewer_useragent').text(e.data.stats.outbound[viewer].info.useragent); } $("#vdon_viewer_" + viewer).data('last', now.getTime()); //Used below to remove old viewers } diff --git a/examples/sensors.html b/examples/sensors.html index 9265939..2344677 100644 --- a/examples/sensors.html +++ b/examples/sensors.html @@ -167,9 +167,9 @@ function loadIframe(url=false){ // this is pretty important if you want to avoi var out = "
total_inbound_connections:"+e.data.stats.total_inbound_connections; out += "
total_outbound_connections:"+e.data.stats.total_outbound_connections; - for (var streamID in e.data.stats.inbound_stats){ + for (var streamID in e.data.stats.inbound){ out += "

streamID: "+streamID+"
"; - out += printValues(e.data.stats.inbound_stats[streamID]); + out += printValues(e.data.stats.inbound[streamID]); } outputWindow.innerHTML = out; diff --git a/iframe.html b/iframe.html index d51f6ff..d88878f 100644 --- a/iframe.html +++ b/iframe.html @@ -126,9 +126,9 @@ var out = "
total_inbound_connections:"+e.data.stats.total_inbound_connections; out += "
total_outbound_connections:"+e.data.stats.total_outbound_connections; - for (var streamID in e.data.stats.inbound_stats){ + for (var streamID in e.data.stats.inbound){ out += "

streamID: "+streamID+"
"; - out += printValues(e.data.stats.inbound_stats[streamID]); + out += printValues(e.data.stats.inbound[streamID]); } logOutput(out) consolelog = false; diff --git a/index.html b/index.html index 8d02e61..ef1281d 100644 --- a/index.html +++ b/index.html @@ -92,7 +92,7 @@ - + - + \ No newline at end of file