VeritableValor/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2026-08-17 05:20:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Invalidate companion client after stream failure

Browse Source
This commit is contained in:
sergiobuilds 2026-08-12 02:37:09 +09:00
parent d817ab1431
commit cbb27b0f34
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/invidious/routes/companion.cr
View File

@ -9,7 +9,7 @@ module Invidious::Routes::Companion
begin begin
COMPANION_POOL.client do |wrapper| COMPANION_POOL.client do |wrapper|
wrapper.client.get(url, env.request.headers) do |resp| wrapper.client.get(url, env.request.headers) do |resp|
return self.proxy_companion(env, resp) return self.proxy_companion(env, resp, wrapper)
end end
end end
rescue ex rescue ex
@ -29,7 +29,7 @@ module Invidious::Routes::Companion
begin begin
COMPANION_POOL.client do |wrapper| COMPANION_POOL.client do |wrapper|
wrapper.client.post(url, env.request.headers, env.request.body) do |resp| wrapper.client.post(url, env.request.headers, env.request.body) do |resp|
return self.proxy_companion(env, resp) return self.proxy_companion(env, resp, wrapper)
end end
end end
rescue ex rescue ex
@ -48,7 +48,7 @@ module Invidious::Routes::Companion
begin begin
COMPANION_POOL.client do |wrapper| COMPANION_POOL.client do |wrapper|
wrapper.client.options(url, env.request.headers) do |resp| wrapper.client.options(url, env.request.headers) do |resp|
return self.proxy_companion(env, resp) return self.proxy_companion(env, resp, wrapper)
end end
end end
rescue ex rescue ex
@ -58,7 +58,7 @@ module Invidious::Routes::Companion
end end
end end
private def self.proxy_companion(env, response) private def self.proxy_companion(env, response, wrapper)
env.response.status_code = response.status_code env.response.status_code = response.status_code
response.headers.each do |key, value| response.headers.each do |key, value|
env.response.headers[key] = value env.response.headers[key] = value
@ -68,6 +68,7 @@ module Invidious::Routes::Companion
return IO.copy response.body_io, env.response return IO.copy response.body_io, env.response
rescue ex rescue ex
LOGGER.warn("Companion response stream failed: #{ex.class}") LOGGER.warn("Companion response stream failed: #{ex.class}")
wrapper.close
env.response.close unless env.response.closed? env.response.close unless env.response.closed?
return return
end end