diff --git a/web/app/assets/javascripts/react-components/SessionStatsHover.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionStatsHover.js.jsx.coffee index e6dcebbed..9e97c6e0f 100644 --- a/web/app/assets/javascripts/react-components/SessionStatsHover.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionStatsHover.js.jsx.coffee @@ -48,10 +48,15 @@ StatsInfo = { warn: (user, stats) -> "You have enough bandwidth to send you a degraded, but sufficient, video stream.", poor: (user, stats) -> "You have not enough bandwidth to send you a decent quality video stream.", }, - ars_vs_p2p: { - good: (user, stats) -> "Your network path is also the lowest latency path available", - warn: (user, stats) -> "Your network path is not the lowest latency path available", - poor: (user, stats) -> "Your network path is not the lowest latency path available", + tx_ars_vs_p2p: { + good: (user, stats) -> "Your send network path is also the lowest latency path available", + warn: (user, stats) -> "Your send network path is not the lowest latency path available", + poor: (user, stats) -> "Your send network path is not the lowest latency path available", + }, + rx_ars_vs_p2p: { + good: (user, stats) -> "Your receive network path is also the lowest latency path available", + warn: (user, stats) -> "Your receive network path is not the lowest latency path available", + poor: (user, stats) -> "Your receive network path is not the lowest latency path available", }, ping: { good: (user, stats) -> "The internet connection between you and #{user.name} has very low latency.", @@ -209,8 +214,10 @@ StatsInfo = { networkStats.push(@stat(network, 'network', 'Video Bw Rx', 'video_rtpbw_rx', Math.round(network.video_rtpbw_rx) + ' k')) if network.video_rtpbw_tx? networkStats.push(@stat(network, 'network', 'Video Bw Tx', 'video_rtpbw_tx', Math.round(network.video_rtpbw_tx) + ' k')) - if network.ars_vs_p2p? - networkStats.push(@stat(network, 'network', 'Net Path', 'ars_vs_p2p', network.ars_vs_p2p)) + if network.rx_ars_vs_p2p? + networkStats.push(@stat(network, 'network', 'RX Net Path', 'rx_ars_vs_p2p', network.rx_ars_vs_p2p)) + if network.tx_ars_vs_p2p? + networkStats.push(@stat(network, 'network', 'TX Net Path', 'tx_ars_vs_p2p', network.tx_ars_vs_p2p)) networkTag = `
diff --git a/web/app/assets/javascripts/react-components/stores/SessionStatsStore.js.coffee b/web/app/assets/javascripts/react-components/stores/SessionStatsStore.js.coffee index 9dbcd8542..7c3e0d4c6 100644 --- a/web/app/assets/javascripts/react-components/stores/SessionStatsStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/SessionStatsStore.js.coffee @@ -113,18 +113,33 @@ AggregateThresholds = SessionStatThresholds.aggregate aggregate.one_way = network.ping / 2 aggregate.jq = network.audiojq_median * 2.5 - if network.using_ars_path == 0 - network.ars_vs_p2p = 'P2P' + # ARS TX/RX Determination + #console.log("NETWORK", network) + if network.ars_path_used == 0 + network.rx_ars_vs_p2p = 'P2P' if network.preferred_path == 'p2p' - network.ars_vs_p2p_level = 'good' + network.rx_ars_vs_p2p_level = 'good' else - network.ars_vs_p2p_level = 'warn' + network.rx_ars_vs_p2p_level = 'warn' else - network.ars_vs_p2p = 'ARS' + network.rx_ars_vs_p2p = 'ARS' if network.preferred_path == 'p2p' - network.ars_vs_p2p_level = 'warn' + network.rx_ars_vs_p2p_level = 'warn' else - network.ars_vs_p2p_level = 'good' + network.rx_ars_vs_p2p_level = 'good' + + if network.ars_con_active == 0 + network.tx_ars_vs_p2p = 'P2P' + if network.preferred_path == 'p2p' + network.tx_ars_vs_p2p_level = 'good' + else + network.tx_ars_vs_p2p_level = 'warn' + else + network.tx_ars_vs_p2p = 'ARS' + if network.preferred_path == 'p2p' + network.tx_ars_vs_p2p_level = 'warn' + else + network.tx_ars_vs_p2p_level = 'good' else total_latency = null diff --git a/web/app/assets/stylesheets/client/react-components/SessionTrack.scss b/web/app/assets/stylesheets/client/react-components/SessionTrack.scss index 19ad759a0..b0d2d8682 100644 --- a/web/app/assets/stylesheets/client/react-components/SessionTrack.scss +++ b/web/app/assets/stylesheets/client/react-components/SessionTrack.scss @@ -422,7 +422,7 @@ &.SessionStatsHover { width:385px; - height:645px; + height:665px; @include border_box_sizing; h3 {