esi-sdk 1.2.0 → 2.0.0

data/lib/esi/client/universe.rb

@@ -20,7 +20,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_ancestries
       def get_universe_ancestries(headers: {}, params: {})
-        get("/universe/ancestries/", headers: headers, params: params)
+        get("/universe/ancestries/", headers: headers, params: params).json
       end
 
       # Get information on an asteroid belt.
@@ -41,7 +41,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_asteroid_belts_asteroid_belt_id
       def get_universe_asteroid_belt(asteroid_belt_id:, headers: {}, params: {})
-        get("/universe/asteroid_belts/#{asteroid_belt_id}/", headers: headers, params: params)
+        get("/universe/asteroid_belts/#{asteroid_belt_id}/", headers: headers, params: params).json
       end
       alias get_universe_asteroid_belts_asteroid_belt_id get_universe_asteroid_belt
 
@@ -61,7 +61,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_bloodlines
       def get_universe_bloodlines(headers: {}, params: {})
-        get("/universe/bloodlines/", headers: headers, params: params)
+        get("/universe/bloodlines/", headers: headers, params: params).json
       end
 
       # Get a list of item categories.
@@ -80,7 +80,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_categories
       def get_universe_categories(headers: {}, params: {})
-        get("/universe/categories/", headers: headers, params: params)
+        get("/universe/categories/", headers: headers, params: params).json
       end
 
       # Get information of an item category.
@@ -101,7 +101,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_categories_category_id
       def get_universe_categories_category(category_id:, headers: {}, params: {})
-        get("/universe/categories/#{category_id}/", headers: headers, params: params)
+        get("/universe/categories/#{category_id}/", headers: headers, params: params).json
       end
       alias get_universe_categories_category_id get_universe_categories_category
 
@@ -123,7 +123,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_constellations_constellation_id
       def get_universe_constellation(constellation_id:, headers: {}, params: {})
-        get("/universe/constellations/#{constellation_id}/", headers: headers, params: params)
+        get("/universe/constellations/#{constellation_id}/", headers: headers, params: params).json
       end
       alias get_universe_constellations_constellation_id get_universe_constellation
 
@@ -143,7 +143,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_constellations
       def get_universe_constellations(headers: {}, params: {})
-        get("/universe/constellations/", headers: headers, params: params)
+        get("/universe/constellations/", headers: headers, params: params).json
       end
 
       # Get a list of factions.
@@ -162,7 +162,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_factions
       def get_universe_factions(headers: {}, params: {})
-        get("/universe/factions/", headers: headers, params: params)
+        get("/universe/factions/", headers: headers, params: params).json
       end
 
       # Get information on a graphic.
@@ -184,7 +184,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_graphics_graphic_id
       def get_universe_graphic(graphic_id:, headers: {}, params: {})
-        get("/universe/graphics/#{graphic_id}/", headers: headers, params: params)
+        get("/universe/graphics/#{graphic_id}/", headers: headers, params: params).json
       end
       alias get_universe_graphics_graphic_id get_universe_graphic
 
@@ -204,7 +204,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_graphics
       def get_universe_graphics(headers: {}, params: {})
-        get("/universe/graphics/", headers: headers, params: params)
+        get("/universe/graphics/", headers: headers, params: params).json
       end
 
       # Get information on an item group.
@@ -226,7 +226,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_groups_group_id
       def get_universe_group(group_id:, headers: {}, params: {})
-        get("/universe/groups/#{group_id}/", headers: headers, params: params)
+        get("/universe/groups/#{group_id}/", headers: headers, params: params).json
       end
       alias get_universe_groups_group_id get_universe_group
 
@@ -246,7 +246,8 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_groups
       def get_universe_groups(headers: {}, params: {})
-        get("/universe/groups/", headers: headers, params: params)
+        responses = get("/universe/groups/", headers: headers, params: params)
+        responses.map(&:json).reduce([], :concat)
       end
 
       # Get information on a moon.
@@ -267,7 +268,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_moons_moon_id
       def get_universe_moon(moon_id:, headers: {}, params: {})
-        get("/universe/moons/#{moon_id}/", headers: headers, params: params)
+        get("/universe/moons/#{moon_id}/", headers: headers, params: params).json
       end
       alias get_universe_moons_moon_id get_universe_moon
 
@@ -289,7 +290,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_planets_planet_id
       def get_universe_planet(planet_id:, headers: {}, params: {})
-        get("/universe/planets/#{planet_id}/", headers: headers, params: params)
+        get("/universe/planets/#{planet_id}/", headers: headers, params: params).json
       end
       alias get_universe_planets_planet_id get_universe_planet
 
@@ -310,7 +311,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_races
       def get_universe_races(headers: {}, params: {})
-        get("/universe/races/", headers: headers, params: params)
+        get("/universe/races/", headers: headers, params: params).json
       end
 
       # Get information on a region.
@@ -331,7 +332,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_regions_region_id
       def get_universe_region(region_id:, headers: {}, params: {})
-        get("/universe/regions/#{region_id}/", headers: headers, params: params)
+        get("/universe/regions/#{region_id}/", headers: headers, params: params).json
       end
       alias get_universe_regions_region_id get_universe_region
 
@@ -351,7 +352,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_regions
       def get_universe_regions(headers: {}, params: {})
-        get("/universe/regions/", headers: headers, params: params)
+        get("/universe/regions/", headers: headers, params: params).json
       end
 
       # Get information on a star.
@@ -371,7 +372,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_stars_star_id
       def get_universe_star(star_id:, headers: {}, params: {})
-        get("/universe/stars/#{star_id}/", headers: headers, params: params)
+        get("/universe/stars/#{star_id}/", headers: headers, params: params).json
       end
       alias get_universe_stars_star_id get_universe_star
 
@@ -393,7 +394,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_stargates_stargate_id
       def get_universe_stargate(stargate_id:, headers: {}, params: {})
-        get("/universe/stargates/#{stargate_id}/", headers: headers, params: params)
+        get("/universe/stargates/#{stargate_id}/", headers: headers, params: params).json
       end
       alias get_universe_stargates_stargate_id get_universe_stargate
 
@@ -415,7 +416,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_stations_station_id
       def get_universe_station(station_id:, headers: {}, params: {})
-        get("/universe/stations/#{station_id}/", headers: headers, params: params)
+        get("/universe/stations/#{station_id}/", headers: headers, params: params).json
       end
       alias get_universe_stations_station_id get_universe_station
 
@@ -444,7 +445,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_structures_structure_id
       def get_universe_structure(structure_id:, headers: {}, params: {})
-        get("/universe/structures/#{structure_id}/", headers: headers, params: params)
+        get("/universe/structures/#{structure_id}/", headers: headers, params: params).json
       end
       alias get_universe_structures_structure_id get_universe_structure
 
@@ -469,7 +470,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_structures
       def get_universe_structures(filter: nil, headers: {}, params: {})
         params.merge!("filter" => filter)
-        get("/universe/structures/", headers: headers, params: params)
+        get("/universe/structures/", headers: headers, params: params).json
       end
 
       # Get information on a solar system.
@@ -490,7 +491,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_systems_system_id
       def get_universe_system(system_id:, headers: {}, params: {})
-        get("/universe/systems/#{system_id}/", headers: headers, params: params)
+        get("/universe/systems/#{system_id}/", headers: headers, params: params).json
       end
       alias get_universe_systems_system_id get_universe_system
 
@@ -512,7 +513,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_system_jumps
       def get_universe_system_jumps(headers: {}, params: {})
-        get("/universe/system_jumps/", headers: headers, params: params)
+        get("/universe/system_jumps/", headers: headers, params: params).json
       end
 
       # Get the number of ship, pod and NPC kills per solar system within the last hour ending at the timestamp of the Last-Modified header, excluding wormhole space. Only systems with kills will be listed.
@@ -532,7 +533,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_system_kills
       def get_universe_system_kills(headers: {}, params: {})
-        get("/universe/system_kills/", headers: headers, params: params)
+        get("/universe/system_kills/", headers: headers, params: params).json
       end
 
       # Get a list of solar systems.
@@ -552,7 +553,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_systems
       def get_universe_systems(headers: {}, params: {})
-        get("/universe/systems/", headers: headers, params: params)
+        get("/universe/systems/", headers: headers, params: params).json
       end
 
       # Get information on a type.
@@ -573,7 +574,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_types_type_id
       def get_universe_type(type_id:, headers: {}, params: {})
-        get("/universe/types/#{type_id}/", headers: headers, params: params)
+        get("/universe/types/#{type_id}/", headers: headers, params: params).json
       end
       alias get_universe_types_type_id get_universe_type
 
@@ -593,7 +594,8 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/get_universe_types
       def get_universe_types(headers: {}, params: {})
-        get("/universe/types/", headers: headers, params: params)
+        responses = get("/universe/types/", headers: headers, params: params)
+        responses.map(&:json).reduce([], :concat)
       end
 
       # Resolve a set of names to IDs in the following categories: agents, alliances, characters, constellations, corporations factions, inventory_types, regions, stations, and systems. Only exact matches will be returned. All names searched for are cached for 12 hours.
@@ -614,7 +616,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/post_universe_ids
       def post_universe_ids(names:, headers: {}, params: {})
-        post("/universe/ids/", headers: headers, params: params, payload: names)
+        post("/universe/ids/", headers: headers, params: params, payload: names).json
       end
 
       # Resolve a set of IDs to names and categories. Supported ID's for resolving are: Characters, Corporations, Alliances, Stations, Solar Systems, Constellations, Regions, Types, Factions.
@@ -635,7 +637,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Universe/post_universe_names
       def post_universe_names(ids:, headers: {}, params: {})
-        post("/universe/names/", headers: headers, params: params, payload: ids)
+        post("/universe/names/", headers: headers, params: params, payload: ids).json
       end
     end
   end

data/lib/esi/client/user_interface.rb

@@ -31,7 +31,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/User Interface/post_ui_autopilot_waypoint
       def post_ui_autopilot_waypoint(add_to_beginning:, clear_other_waypoints:, destination_id:, headers: {}, params: {})
         params.merge!("add_to_beginning" => add_to_beginning, "clear_other_waypoints" => clear_other_waypoints, "destination_id" => destination_id)
-        post("/ui/autopilot/waypoint/", headers: headers, params: params)
+        post("/ui/autopilot/waypoint/", headers: headers, params: params).json
       end
 
       # Open the contract window inside the client.
@@ -59,7 +59,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/User Interface/post_ui_openwindow_contract
       def post_ui_openwindow_contract(contract_id:, headers: {}, params: {})
         params.merge!("contract_id" => contract_id)
-        post("/ui/openwindow/contract/", headers: headers, params: params)
+        post("/ui/openwindow/contract/", headers: headers, params: params).json
       end
 
       # Open the information window for a character, corporation or alliance inside the client.
@@ -87,7 +87,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/User Interface/post_ui_openwindow_information
       def post_ui_openwindow_information(target_id:, headers: {}, params: {})
         params.merge!("target_id" => target_id)
-        post("/ui/openwindow/information/", headers: headers, params: params)
+        post("/ui/openwindow/information/", headers: headers, params: params).json
       end
 
       # Open the market details window for a specific typeID inside the client.
@@ -115,7 +115,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/User Interface/post_ui_openwindow_marketdetails
       def post_ui_openwindow_marketdetails(type_id:, headers: {}, params: {})
         params.merge!("type_id" => type_id)
-        post("/ui/openwindow/marketdetails/", headers: headers, params: params)
+        post("/ui/openwindow/marketdetails/", headers: headers, params: params).json
       end
 
       # Open the New Mail window, according to settings from the request if applicable.
@@ -143,7 +143,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/User Interface/post_ui_openwindow_newmail
       def post_ui_openwindow_newmail(new_mail:, headers: {}, params: {})
-        post("/ui/openwindow/newmail/", headers: headers, params: params, payload: new_mail)
+        post("/ui/openwindow/newmail/", headers: headers, params: params, payload: new_mail).json
       end
     end
   end

data/lib/esi/client/wallet.rb

@@ -29,7 +29,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Wallet/get_characters_character_id_wallet
       def get_character_wallet(character_id:, headers: {}, params: {})
-        get("/characters/#{character_id}/wallet/", headers: headers, params: params)
+        get("/characters/#{character_id}/wallet/", headers: headers, params: params).json
       end
       alias get_characters_character_id_wallet get_character_wallet
 
@@ -58,7 +58,8 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Wallet/get_characters_character_id_wallet_journal
       def get_character_wallet_journal(character_id:, headers: {}, params: {})
-        get("/characters/#{character_id}/wallet/journal/", headers: headers, params: params)
+        responses = get("/characters/#{character_id}/wallet/journal/", headers: headers, params: params)
+        responses.map(&:json).reduce([], :concat)
       end
       alias get_characters_character_id_wallet_journal get_character_wallet_journal
 
@@ -90,7 +91,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/Wallet/get_characters_character_id_wallet_transactions
       def get_character_wallet_transactions(character_id:, from_id: nil, headers: {}, params: {})
         params.merge!("from_id" => from_id)
-        get("/characters/#{character_id}/wallet/transactions/", headers: headers, params: params)
+        get("/characters/#{character_id}/wallet/transactions/", headers: headers, params: params).json
       end
       alias get_characters_character_id_wallet_transactions get_character_wallet_transactions
 
@@ -120,7 +121,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Wallet/get_corporations_corporation_id_wallets
       def get_corporation_wallets(corporation_id:, headers: {}, params: {})
-        get("/corporations/#{corporation_id}/wallets/", headers: headers, params: params)
+        get("/corporations/#{corporation_id}/wallets/", headers: headers, params: params).json
       end
       alias get_corporations_corporation_id_wallets get_corporation_wallets
 
@@ -150,7 +151,8 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Wallet/get_corporations_corporation_id_wallets_division_journal
       def get_corporation_wallets_division_journal(corporation_id:, division:, headers: {}, params: {})
-        get("/corporations/#{corporation_id}/wallets/#{division}/journal/", headers: headers, params: params)
+        responses = get("/corporations/#{corporation_id}/wallets/#{division}/journal/", headers: headers, params: params)
+        responses.map(&:json).reduce([], :concat)
       end
       alias get_corporations_corporation_id_wallets_division_journal get_corporation_wallets_division_journal
 
@@ -183,7 +185,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/Wallet/get_corporations_corporation_id_wallets_division_transactions
       def get_corporation_wallets_division_transactions(corporation_id:, division:, from_id: nil, headers: {}, params: {})
         params.merge!("from_id" => from_id)
-        get("/corporations/#{corporation_id}/wallets/#{division}/transactions/", headers: headers, params: params)
+        get("/corporations/#{corporation_id}/wallets/#{division}/transactions/", headers: headers, params: params).json
       end
       alias get_corporations_corporation_id_wallets_division_transactions get_corporation_wallets_division_transactions
     end

data/lib/esi/client/wars.rb

@@ -25,7 +25,7 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Wars/get_wars_war_id
       def get_war(war_id:, headers: {}, params: {})
-        get("/wars/#{war_id}/", headers: headers, params: params)
+        get("/wars/#{war_id}/", headers: headers, params: params).json
       end
       alias get_wars_war_id get_war
 
@@ -50,7 +50,8 @@ module ESI
       #
       # @see https://esi.evetech.net/ui/#/Wars/get_wars_war_id_killmails
       def get_war_killmails(war_id:, headers: {}, params: {})
-        get("/wars/#{war_id}/killmails/", headers: headers, params: params)
+        responses = get("/wars/#{war_id}/killmails/", headers: headers, params: params)
+        responses.map(&:json).reduce([], :concat)
       end
       alias get_wars_war_id_killmails get_war_killmails
 
@@ -75,7 +76,7 @@ module ESI
       # @see https://esi.evetech.net/ui/#/Wars/get_wars
       def get_wars(max_war_id: nil, headers: {}, params: {})
         params.merge!("max_war_id" => max_war_id)
-        get("/wars/", headers: headers, params: params)
+        get("/wars/", headers: headers, params: params).json
       end
     end
   end

data/lib/esi/client.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require "faraday"
-require "faraday-http-cache"
-require "faraday_middleware"
+require "httpx"
 require "timeout"
-require "typhoeus"
-require "typhoeus/adapters/faraday"
 
 require_relative "./errors"
 require_relative "./client/alliance"
@@ -93,7 +89,7 @@ module ESI
       520 => ESI::Errors::EveServerError
     }.freeze
 
-    attr_reader :base_url, :cache, :user_agent, :version
+    attr_reader :base_url, :cache, :instrumentation, :logger, :user_agent, :version
 
     # Returns a new {ESI::Client}.
     #
@@ -103,141 +99,115 @@ module ESI
     # @param user_agent [String] Value of the `User-Agent` header for HTTP calls
     # @param base_url [String] The base URL of the ESI API
     # @param version [String] The version of the ESI API
+    # @param logger [Object] The logger to use
     # @param cache [Hash] The cache configuration to use
-    # @param max_concurrency [Integer] Maximum concurrent requests for pagination
     # @option cache [Object] :store The cache store (e.g. `Rails.cache`)
     # @option cache [Object] :logger The logger (e.g. `Rails.logger`)
     # @option cache [Object] :instrumenter The instrumenter (e.g. `ActiveSupport::Notifications`)
-    def initialize(user_agent:, base_url: DEFAULT_BASE_URL, version: DEFAULT_VERSION, cache: {}, max_concurrency: 50)
+    # @param instrumentation [Hash] The instrumentation configuration to use
+    # @option instrumentation [String] :name The name to use for instrumentation
+    # @option instrumentation [Object] :instrumenter The instrumenter to use (e.g. `ActiveSupport::Notifications`)
+    def initialize(user_agent:, base_url: DEFAULT_BASE_URL, version: DEFAULT_VERSION, cache: {}, instrumentation: {}, logger: nil) # rubocop:disable Layout/LineLength, Metrics/ParameterLists
       @base_url = base_url
       @cache = cache
+      @instrumentation = instrumentation
       @user_agent = user_agent
       @version = version
-      @hydra = Typhoeus::Hydra.new(max_concurrency: max_concurrency)
+      @logger = logger
     end
 
     # Set the `Authorization` header for subsequent requests.
     #
     # @param token [String] The [EVE SSO JWT token](https://docs.esi.evetech.net/docs/sso/) to use
     def authorize(token)
-      url_encoded_connection.authorization :Bearer, token
-      json_encoded_connection.authorization :Bearer, token
+      session.authentication token
     end
 
-    private
-
-    ESI_RETRY_EXCEPTIONS = [Errno::ETIMEDOUT, Timeout::Error, Faraday::TimeoutError, Faraday::ConnectionFailed,
-                            Faraday::ParsingError, SocketError].freeze
-
-    attr_reader :hydra
-
     def delete(path, params: {}, headers: {})
-      response = make_delete_request(path, params: params, headers: headers)
-      raise_error(response) unless response.success?
-      response.body
+      params.delete_if { |_, v| v.nil? }
+      response = session.delete("/#{version}#{path}", params: params, headers: headers)
+      response.raise_for_status
+      response
+    rescue HTTPX::Error
+      raise_error(response)
     end
 
     def get(path, params: {}, headers: {})
-      response = make_get_request(path, params: params, headers: headers)
-      raise_error(response) unless response.success?
+      params.delete_if { |_, v| v.nil? }
+      response = session.get("/#{version}#{path}", params: params, headers: headers)
+      response.raise_for_status
 
-      response_headers = normalize_headers(response.headers)
-      return paginate(response, path, params, headers) if paginated?(response_headers)
+      return paginate(response, "/#{version}#{path}", params, headers) if paginated?(response)
 
-      response.body
+      response
+    rescue HTTPX::Error
+      raise_error(response)
     end
 
     def post(path, payload: {}, params: {}, headers: {})
-      response = make_post_request(path, payload: payload, params: params, headers: headers)
-      raise_error(response) unless response.success?
-      response.body
+      params.delete_if { |_, v| v.nil? }
+      response = session.post("/#{version}#{path}",
+                              params: params,
+                              headers: headers,
+                              json: payload)
+      response.raise_for_status
+      response
+    rescue HTTPX::Error
+      raise_error(response)
     end
 
     def put(path, payload: {}, params: {}, headers: {})
-      response = make_put_request(path, payload: payload, params: params, headers: headers)
-      raise_error(response) unless response.success?
-      response.body
-    end
-
-    def paginate(response, path, params, headers) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      all_items = response.body
-      response_headers = normalize_headers(response.headers)
-      page_count = response_headers["x-pages"].to_i - 1
-
-      responses = []
-      url_encoded_connection.in_parallel(hydra) do
-        page_count.times do |n|
-          page_number = n + 2
-          params = params.merge(page: page_number)
-          responses << make_get_request(path, params: params, headers: headers)
-        end
-      end
-      unless responses.all?(&:success?)
-        raise ESI::Errors::PaginationError.new("Error paginating request", response: response,
-                                                                           responses: responses)
-      end
-
-      all_items + responses.map(&:body).flatten
-    end
-
-    def make_delete_request(path, params: {}, headers: {})
       params.delete_if { |_, v| v.nil? }
-      url_encoded_connection.delete("/#{version}#{path}", params, headers)
+      response = session.put("/#{version}#{path}",
+                             params: params,
+                             headers: headers,
+                             json: payload)
+      response.raise_for_status
+      response
+    rescue HTTPX::Error
+      raise_error(response)
     end
 
-    def make_get_request(path, params: {}, headers: {})
-      params.delete_if { |_, v| v.nil? }
-      url_encoded_connection.get("/#{version}#{path}", params, headers)
-    end
+    private
 
-    def make_post_request(path, payload: {}, params: {}, headers: {})
-      params.delete_if { |_, v| v.nil? }
-      json_encoded_connection.post("/#{version}#{path}") do |req|
-        req.params = params
-        req.headers = req.headers.merge(headers)
-        req.body = payload.to_json
+    def paginate(response, path, params, headers) # rubocop:disable Metrics/MethodLength
+      response_headers = normalize_headers(response.headers)
+      page_count = response_headers["x-pages"].to_i
+
+      requests = (2..page_count).map do |n|
+        session.build_request(:get, path, params: params.merge(page: n), headers: headers)
       end
-    end
+      responses = requests.any? ? session.request(*requests) : []
+      responses.unshift(response)
 
-    def make_put_request(path, payload: {}, params: {}, headers: {})
-      params.delete_if { |_, v| v.nil? }
-      json_encoded_connection.put("/#{version}#{path}") do |req|
-        req.params = params
-        req.headers = req.headers.merge(headers)
-        req.body = payload.to_json
+      if responses.any?(&:error)
+        raise ESI::Errors::PaginationError.new("Error paginating request", responses: responses)
       end
+
+      responses
     end
 
-    def paginated?(headers)
-      headers["x-pages"] && headers["x-pages"].to_i > 1
+    def paginated?(response)
+      headers = normalize_headers(response.headers)
+      headers.key?("x-pages")
     end
 
     def normalize_headers(headers)
-      headers.transform_keys(&:downcase)
+      headers.to_h.transform_keys(&:downcase)
     end
 
     def raise_error(res)
-      raise (ERROR_MAPPING[res.status] || ESI::Errors::ClientError).new("(#{res.status}) #{res["error"]}",
+      raise (ERROR_MAPPING[res.status] || ESI::Errors::ClientError).new("(#{res.status}) #{res.json["error"]}",
                                                                         response: res)
     end
 
-    def url_encoded_connection
-      @url_encoded_connection ||= Faraday.new(base_url, headers: default_headers) do |f|
-        f.use :http_cache, **cache unless cache.empty?
-        f.request :retry, { exceptions: ESI_RETRY_EXCEPTIONS, max: 10, retry_statuses: [502, 503, 504] }
-        f.response :json
-        f.adapter :typhoeus
-      end
-    end
-
-    def json_encoded_connection
-      @json_encoded_connection ||= Faraday.new(base_url, headers: default_headers) do |f|
-        f.use :http_cache, **cache unless cache.empty?
-        f.request :json
-        f.request :retry, { exceptions: ESI_RETRY_EXCEPTIONS, max: 10, retry_statuses: [502, 503, 504] }
-        f.response :json
-        f.adapter :typhoeus
-      end
+    def session
+      @session ||= HTTPX.with(origin: base_url)
+                        .with_headers(default_headers)
+                        .plugin(:authentication)
+                        .plugin(:persistent)
+                        .plugin(:response_cache)
+                        .plugin(:retries)
     end
 
     def default_headers

data/lib/esi/errors.rb

@@ -9,7 +9,7 @@ module ESI
 
     # Base class for ESI client errors.
     class ClientError < Error
-      attr_reader :response
+      attr_reader :response, :responses
 
       def initialize(msg, response:)
         super(msg)
@@ -22,8 +22,8 @@ module ESI
     class PaginationError < ClientError
       attr_reader :responses
 
-      def initialize(msg, response:, responses:)
-        super(msg, response: response)
+      def initialize(msg, responses:)
+        super(msg, response: nil)
 
         @responses = responses
       end

data/lib/esi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ESI
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end