Add playback success rate to /api/v1/stats
(#4085)
* Add stats-based /videoplayback blockage status * Count when YouTube returns wrong video as failure * Cast playback stats hash type prior to return * Bump stats refresh timer to 10 minutes
This commit is contained in:
parent
db3c57d49f
commit
438467f69a
5 changed files with 54 additions and 1 deletions
|
@ -208,3 +208,20 @@ def proxy_file(response, env)
|
||||||
IO.copy response.body_io, env.response
|
IO.copy response.body_io, env.response
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Fetch the playback requests tracker from the statistics endpoint.
|
||||||
|
#
|
||||||
|
# Creates a new tracker when unavailable.
|
||||||
|
def get_playback_statistic
|
||||||
|
if (tracker = Invidious::Jobs::StatisticsRefreshJob::STATISTICS["playback"]) && tracker.as(Hash).empty?
|
||||||
|
tracker = {
|
||||||
|
"totalRequests" => 0_i64,
|
||||||
|
"successfulRequests" => 0_i64,
|
||||||
|
"ratio" => 0_f64,
|
||||||
|
}
|
||||||
|
|
||||||
|
Invidious::Jobs::StatisticsRefreshJob::STATISTICS["playback"] = tracker
|
||||||
|
end
|
||||||
|
|
||||||
|
return tracker.as(Hash(String, Int64 | Float64))
|
||||||
|
end
|
||||||
|
|
|
@ -18,6 +18,13 @@ class Invidious::Jobs::StatisticsRefreshJob < Invidious::Jobs::BaseJob
|
||||||
"updatedAt" => Time.utc.to_unix,
|
"updatedAt" => Time.utc.to_unix,
|
||||||
"lastChannelRefreshedAt" => 0_i64,
|
"lastChannelRefreshedAt" => 0_i64,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
#
|
||||||
|
# "totalRequests" => 0_i64,
|
||||||
|
# "successfulRequests" => 0_i64
|
||||||
|
# "ratio" => 0_i64
|
||||||
|
#
|
||||||
|
"playback" => {} of String => Int64 | Float64,
|
||||||
}
|
}
|
||||||
|
|
||||||
private getter db : DB::Database
|
private getter db : DB::Database
|
||||||
|
@ -30,7 +37,7 @@ class Invidious::Jobs::StatisticsRefreshJob < Invidious::Jobs::BaseJob
|
||||||
|
|
||||||
loop do
|
loop do
|
||||||
refresh_stats
|
refresh_stats
|
||||||
sleep 1.minute
|
sleep 10.minute
|
||||||
Fiber.yield
|
Fiber.yield
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -56,5 +63,8 @@ class Invidious::Jobs::StatisticsRefreshJob < Invidious::Jobs::BaseJob
|
||||||
"updatedAt" => Time.utc.to_unix,
|
"updatedAt" => Time.utc.to_unix,
|
||||||
"lastChannelRefreshedAt" => Invidious::Database::Statistics.channel_last_update.try &.to_unix || 0_i64,
|
"lastChannelRefreshedAt" => Invidious::Database::Statistics.channel_last_update.try &.to_unix || 0_i64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Reset playback requests tracker
|
||||||
|
STATISTICS["playback"] = {} of String => Int64 | Float64
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,6 +6,22 @@ module Invidious::Routes::API::V1::Misc
|
||||||
if !CONFIG.statistics_enabled
|
if !CONFIG.statistics_enabled
|
||||||
return {"software" => SOFTWARE}.to_json
|
return {"software" => SOFTWARE}.to_json
|
||||||
else
|
else
|
||||||
|
# Calculate playback success rate
|
||||||
|
if (tracker = Invidious::Jobs::StatisticsRefreshJob::STATISTICS["playback"]?)
|
||||||
|
tracker = tracker.as(Hash(String, Int64 | Float64))
|
||||||
|
|
||||||
|
if !tracker.empty?
|
||||||
|
total_requests = tracker["totalRequests"]
|
||||||
|
success_count = tracker["successfulRequests"]
|
||||||
|
|
||||||
|
if total_requests.zero?
|
||||||
|
tracker["ratio"] = 1_i64
|
||||||
|
else
|
||||||
|
tracker["ratio"] = (success_count / (total_requests)).round(2)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
return Invidious::Jobs::StatisticsRefreshJob::STATISTICS.to_json
|
return Invidious::Jobs::StatisticsRefreshJob::STATISTICS.to_json
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -80,9 +80,14 @@ module Invidious::Routes::VideoPlayback
|
||||||
# Remove the Range header added previously.
|
# Remove the Range header added previously.
|
||||||
headers.delete("Range") if range_header.nil?
|
headers.delete("Range") if range_header.nil?
|
||||||
|
|
||||||
|
playback_statistics = get_playback_statistic()
|
||||||
|
playback_statistics["totalRequests"] += 1
|
||||||
|
|
||||||
if response.status_code >= 400
|
if response.status_code >= 400
|
||||||
env.response.content_type = "text/plain"
|
env.response.content_type = "text/plain"
|
||||||
haltf env, response.status_code
|
haltf env, response.status_code
|
||||||
|
else
|
||||||
|
playback_statistics["successfulRequests"] += 1
|
||||||
end
|
end
|
||||||
|
|
||||||
if url.includes? "&file=seg.ts"
|
if url.includes? "&file=seg.ts"
|
||||||
|
|
|
@ -78,6 +78,11 @@ def extract_video_info(video_id : String, proxy_region : String? = nil)
|
||||||
# YouTube may return a different video player response than expected.
|
# YouTube may return a different video player response than expected.
|
||||||
# See: https://github.com/TeamNewPipe/NewPipe/issues/8713
|
# See: https://github.com/TeamNewPipe/NewPipe/issues/8713
|
||||||
# Line to be reverted if one day we solve the video not available issue.
|
# Line to be reverted if one day we solve the video not available issue.
|
||||||
|
|
||||||
|
# Although technically not a call to /videoplayback the fact that YouTube is returning the
|
||||||
|
# wrong video means that we should count it as a failure.
|
||||||
|
get_playback_statistic()["totalRequests"] += 1
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
|
"version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
|
||||||
"reason" => JSON::Any.new("Can't load the video on this Invidious instance. YouTube is currently trying to block Invidious instances. <a href=\"https://github.com/iv-org/invidious/issues/3822\">Click here for more info about the issue.</a>"),
|
"reason" => JSON::Any.new("Can't load the video on this Invidious instance. YouTube is currently trying to block Invidious instances. <a href=\"https://github.com/iv-org/invidious/issues/3822\">Click here for more info about the issue.</a>"),
|
||||||
|
|
Loading…
Reference in a new issue