Invidious is an alternative front-end to YouTube
chore: add the suggestions
Emilien42b955d713c5
diff --git a/src/invidious/routes/before_all.cr b/src/invidious/routes/before_all.crindex b5269668..63b935ec 100644--- a/src/invidious/routes/before_all.cr+++ b/src/invidious/routes/before_all.cr@@ -63,6 +63,7 @@ module Invidious::Routes::BeforeAll"/videoplayback","/latest_version","/download",+ "/companion/",}.any? { |r| env.request.resource.starts_with? r }if env.request.cookies.has_key? "SID"diff --git a/src/invidious/routes/companion.cr b/src/invidious/routes/companion.crindex 23b62e9d..cd7ed422 100644--- a/src/invidious/routes/companion.cr+++ b/src/invidious/routes/companion.cr@@ -28,10 +28,6 @@ module Invidious::Routes::Companionenv.response.headers[key] = valueend- if response.status_code >= 300- return env.response.headers.delete("Transfer-Encoding")- end-- return proxy_file(response, env)+ return IO.copy response.body_io, env.responseendenddiff --git a/src/invidious/yt_backend/connection_pool.cr b/src/invidious/yt_backend/connection_pool.crindex 97ce7c40..45455a8a 100644--- a/src/invidious/yt_backend/connection_pool.cr+++ b/src/invidious/yt_backend/connection_pool.cr@@ -46,13 +46,18 @@ struct YoutubeConnectionPoolendend-class CompanionWrapper+# Packages a `HTTP::Client` to an Invidious companion instance alongside the configuration for that instance.+#+# This is used as the resource for the `CompanionPool` as to allow the ability to+# proxy the requests to Invidious companion from Invidious directly.+# Instead of setting up routes in a reverse proxy.+struct CompanionWrapperproperty client : HTTP::Clientproperty companion : Config::CompanionConfigdef initialize(companion : Config::CompanionConfig)@companion = companion- @client = HTTP::Client.new(companion.private_url)+ @client = make_client(companion.private_url, use_http_proxy: false)enddef close@@ -73,7 +78,7 @@ struct CompanionConnectionPool@pool = DB::Pool(CompanionWrapper).new(options) docompanion = CONFIG.invidious_companion.sample- client = make_client(companion.private_url, use_http_proxy: false)+ make_client(companion.private_url, use_http_proxy: false)CompanionWrapper.new(companion: companion)endend@@ -84,10 +89,10 @@ struct CompanionConnectionPoolbeginresponse = yield wrapperrescue ex- wrapper.client.close+ wrapper.closecompanion = CONFIG.invidious_companion.sample- client = make_client(companion.private_url, use_http_proxy: false)+ make_client(companion.private_url, use_http_proxy: false)wrapper = CompanionWrapper.new(companion: companion)response = yield wrapperdiff --git a/src/invidious/yt_backend/youtube_api.cr b/src/invidious/yt_backend/youtube_api.crindex f87e3091..4b39acd7 100644--- a/src/invidious/yt_backend/youtube_api.cr+++ b/src/invidious/yt_backend/youtube_api.cr@@ -701,25 +701,17 @@ module YoutubeAPI# Send the POST requestbegin- response_body = ""+ response_body = Hash(String, JSON::Any).newCOMPANION_POOL.client do |wrapper|companion_base_url = wrapper.companion.private_url.path- puts "Using companion: #{wrapper.companion.private_url}"- response = wrapper.client.post(companion_base_url + endpoint, headers: headers, body: data.to_json)- response_body = response.body-- if response.status_code != 200- raise Exception.new(- "Error while communicating with Invidious companion: " \- "status code: #{response.status_code} and body: #{response_body.dump}"- )+ wrapper.client.post("#{companion_base_url}#{endpoint}", headers: headers, body: data.to_json) do | response |+ response_body = JSON.parse(response.body_io).as_hendend- # Convert result to Hash- return JSON.parse(response_body).as_h+ return response_bodyrescue exraise InfoException.new("Error while communicating with Invidious companion: " + (ex.message || "no extra info found"))end