Merge remote-tracking branch 'upstream/master'

src/invidious/yt_backend/connection_pool.cr

@@ -46,11 +46,30 @@ struct YoutubeConnectionPool
   end
 end
 
-class CompanionConnectionPool
-  property pool : DB::Pool(HTTP::Client)
-  property companion : URI
+# 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 CompanionWrapper
+  property client : HTTP::Client
+  property companion : Config::CompanionConfig
 
-  def initialize(companion, capacity = 5, timeout = 5.0)
+  def initialize(companion : Config::CompanionConfig)
+    @companion = companion
+    @client = make_client(companion.private_url, use_http_proxy: false)
+  end
+
+  def close
+    @client.close
+  end
+end
+
+class CompanionConnectionPool
+  property pool : DB::Pool(CompanionWrapper)
+  property companion : Config::CompanionConfig
+
+  def initialize(@companion, capacity = 5, timeout = 5.0)
     options = DB::Pool::Options.new(
       initial_pool_size: 0,
       max_pool_size: capacity,
@@ -58,26 +77,26 @@ class CompanionConnectionPool
       checkout_timeout: timeout
     )
 
-    @companion = companion.private_url
-
-    @pool = DB::Pool(HTTP::Client).new(options) do
-      next make_client(@companion, use_http_proxy: false)
+    @pool = DB::Pool(CompanionWrapper).new(options) do
+      make_client(@companion.private_url, use_http_proxy: false)
+      CompanionWrapper.new(companion: @companion)
     end
   end
 
   def client(&)
-    conn = pool.checkout
+    wrapper = pool.checkout
 
     begin
-      response = yield conn
+      response = yield wrapper
     rescue ex
-      conn.close
+      wrapper.close
 
-      conn = make_client(@companion, use_http_proxy: false)
+      make_client(@companion.private_url, use_http_proxy: false)
+      wrapper = CompanionWrapper.new(companion: @companion)
 
-      response = yield conn
+      response = yield wrapper
     ensure
-      pool.release(conn)
+      pool.release(wrapper)
     end
 
     response

src/invidious/yt_backend/youtube_api.cr

@@ -709,22 +709,20 @@ module YoutubeAPI
       else
         current_companion = env.get("current_companion").as(Int32)
       end
-      response = COMPANION_POOL[current_companion].client &.post(endpoint, headers: headers, body: data.to_json)
-      body = response.body
-      if (response.status_code != 200)
-        raise Exception.new(
-          "Error while communicating with Invidious companion: \
-          status code: #{response.status_code} and body: #{body.dump}"
-        )
+      response_body = Hash(String, JSON::Any).new
+
+      COMPANION_POOL[current_companion].client do |wrapper|
+        companion_base_url = wrapper.companion.private_url.path
+
+        wrapper.client.post("#{companion_base_url}#{endpoint}", headers: headers, body: data.to_json) do |response|
+          response_body = JSON.parse(response.body_io).as_h
+        end
       end
+
+      return response_body
     rescue ex
       raise InfoException.new("Error while communicating with Invidious companion: " + (ex.message || "no extra info found"))
     end
-
-    # Convert result to Hash
-    initial_data = JSON.parse(body).as_h
-
-    return initial_data
   end
 
   ####################################################################