aspera-cli 4.27.2 → 4.27.4

data/lib/aspera/agent/base.rb

@@ -23,14 +23,19 @@ module Aspera
       end
 
       # Wait for all sessions to terminate and return a typed Transfer::Result.
+      # Notifies the end of transfer to the progress bar (agents do not).
       # @return [Transfer::Result::Success, Transfer::Result::Error]
       def wait_for_completion
+        success = false
         statuses = wait_for_transfers_completion
-        @progress&.reset
         Aspera.assert_type(statuses, Array)
         Aspera.assert(statuses.none? { |i| !i.eql?(:success) && !i.is_a?(StandardError) }) { "bad statuses content: #{statuses}" }
         errors = statuses.reject { |i| i.eql?(:success) }
-        return errors.empty? ? Transfer::Result.success : Transfer::Result.error(errors.first)
+        success = errors.empty?
+        return success ? Transfer::Result.success : Transfer::Result.error(errors.first)
+      ensure
+        # Also when the agent raises an exception
+        notify_progress(:end, info: success)
       end
 
       # Return the job_id of the last transfer submitted by this agent.

data/lib/aspera/agent/connect.rb

@@ -6,6 +6,8 @@ require 'aspera/products/other'
 require 'aspera/rest'
 require 'aspera/environment'
 require 'securerandom'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Agent
@@ -21,9 +23,9 @@ module Aspera
         # agent_params must contain 'app_id'; the Connect URL is auto-discovered.
         # @return [Hash] normalized status hash
         def transfer_status(transfer_id, agent_params)
-          connect_api = Rest.new(
+          connect_api = Rest::Client.new(
             base_url: "#{connect_api_url}/v5/connect",
-            headers:  {'Origin' => RestParameters.instance.user_agent}
+            headers:  {'Origin' => Rest::Parameters.instance.user_agent}
           )
           tr_info = connect_api.create("transfers/info/#{transfer_id}", {'aspera_connect_settings' => {'app_id' => agent_params['app_id']}})
           transfer = tr_info['transfer_info']
@@ -72,9 +74,9 @@ module Aspera
           # raise exception if connect not started and file does not exist
           connect_url = self.class.connect_api_url
           Log.log.debug { "found: #{connect_url}" }
-          @connect_api = Rest.new(
+          @connect_api = Rest::Client.new(
             base_url: "#{connect_url}/v5/connect", # could use v6 also now
-            headers: {'Origin' => RestParameters.instance.user_agent}
+            headers: {'Origin' => Rest::Parameters.instance.user_agent}
           )
           connect_info = @connect_api.read('info/version')
           Log.log.debug('Connect was reached') if method_index > 0
@@ -158,19 +160,15 @@ module Aspera
                 end
               when 'completed'
                 notify_progress(:session_end, session_id: @transfer_id)
-                notify_progress(:end)
                 break
               when 'failed'
                 notify_progress(:session_end, session_id: @transfer_id)
-                notify_progress(:end)
                 raise Transfer::Error, transfer['error_desc']
               when 'cancelled'
                 notify_progress(:session_end, session_id: @transfer_id)
-                notify_progress(:end)
                 raise Transfer::Error, 'Transfer cancelled by user'
               else
                 notify_progress(:session_end, session_id: @transfer_id)
-                notify_progress(:end)
                 raise Transfer::Error, "unknown status: #{transfer['status']}: #{transfer['error_desc']}"
               end
             end

data/lib/aspera/agent/desktop.rb

@@ -24,7 +24,7 @@ module Aspera
         # @return [Hash] normalized status hash
         def transfer_status(transfer_id, agent_params)
           app_id = agent_params['application_id']
-          client = Aspera::JsonRpc::Client.new(Aspera::Rest.new(base_url: desktop_api_url))
+          client = Aspera::JsonRpc::Client.new(Aspera::Rest::Client.new(base_url: desktop_api_url))
           raw = client.get_transfer(app_id: app_id, transfer_id: transfer_id)
           normalize_status(raw['status'], bytes: raw['bytes_written'].to_i, error: raw['error_desc'])
         end
@@ -70,7 +70,7 @@ module Aspera
         begin
           # curl 'http://127.0.0.1:33024/' -X POST -H 'content-type: application/json' --data-raw '{"jsonrpc":"2.0","params":[],"id":999999,"method":"rpc.discover"}'
           # https://playground.open-rpc.org/?schemaUrl=http://127.0.0.1:33024
-          @client_app_api = Aspera::JsonRpc::Client.new(Aspera::Rest.new(base_url: aspera_client_api_url))
+          @client_app_api = Aspera::JsonRpc::Client.new(Aspera::Rest::Client.new(base_url: aspera_client_api_url))
           client_info = @client_app_api.get_info
           Log.dump(:client_version, client_info)
           Log.log.debug('Client was reached') if method_index > 0
@@ -121,19 +121,15 @@ module Aspera
               end
             when 'completed'
               notify_progress(:session_end, session_id: @transfer_id)
-              notify_progress(:end)
               break
             when 'failed'
               notify_progress(:session_end, session_id: @transfer_id)
-              notify_progress(:end)
               raise Transfer::Error, transfer['error_desc']
             when 'cancelled'
               notify_progress(:session_end, session_id: @transfer_id)
-              notify_progress(:end)
               raise Transfer::Error, 'Transfer cancelled by user'
             else
               notify_progress(:session_end, session_id: @transfer_id)
-              notify_progress(:end)
               raise Transfer::Error, "unknown status: #{transfer['status']}: #{transfer['error_desc']}"
             end
             sleep(1)

data/lib/aspera/agent/direct.rb

@@ -14,6 +14,8 @@ require 'socket'
 require 'securerandom'
 require 'shellwords'
 require 'English'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Agent
@@ -105,8 +107,6 @@ module Aspera
         @sessions = []
         # mutex protects global data accessed by threads
         @mutex = Mutex.new
-        @pre_calc_sent = false
-        @pre_calc_last_size = nil
         # Check on all management messages if that file exists, and if so, read commands from it
         @command_file = File.join(config_dir || '.', "send_#{$PROCESS_ID}")
       end
@@ -162,6 +162,11 @@ module Aspera
           error:             nil,               # exception if failed
           io:                nil,               # management port server socket
           token_regenerator: token_regenerator, # regenerate bearer token with oauth
+          progress_id:       nil,               # session identifier for progress, one per `ascp` process, same on resume
+          size_sent:         false,             # `true` when total size was notified (PreTransferBytes)
+          last_size:         nil,               # last notified transferred size
+          skipped:           0,                 # size of whole files already at destination
+          last_skipped:      nil,               # last notified size not transferred (already at destination)
           # env vars and args for ascp (from transfer spec)
           exec_spec:         Transfer::Parameters.new(transfer_spec, **@tr_opts).ascp_args
         }
@@ -208,7 +213,6 @@ module Aspera
           session[:thread].join
           result.push(session[:error] || :success)
         end
-        notify_progress(:end)
         Log.log.debug('all transfers joined')
         # since all are finished and we return the result, clear statuses
         @sessions.clear
@@ -258,7 +262,7 @@ module Aspera
           @resume_policy.execute_with_resume do
             start_and_monitor_process(session: session, exec_spec: session[:exec_spec])
           end
-          Log.log.debug('transfer ok'.bg_green)
+          Log.log.debug('transfer ok'.bg(:green))
         rescue => e
           session[:error] = e
           raise if Log.log.debug? || !e.is_a?(Transfer::Error)
@@ -345,7 +349,7 @@ module Aspera
             # store session identifier
             session[:id] = event['SessionId'] if event['Type'].eql?('INIT')
             @management_cb&.call(event)
-            process_progress(event)
+            process_progress(session, event)
             next unless File.exist?(@command_file)
             begin
               commands = JSON.parse(File.read(@command_file))
@@ -371,7 +375,9 @@ module Aspera
               env['ASPERA_SCP_TOKEN'] = session[:token_regenerator].refreshed_transfer_token
             end
             raise Transfer::Error.new(last_event['Description'], code: last_event['Code'].to_i)
-          else Aspera.error_unexpected_value(last_event['Type'], :error) { 'last event type' }
+          else
+            # e.g. process was killed: like a lost connection (code 16), so that transfer is resumed
+            raise Transfer::Error.new("#{exec} ended without final status (last event: #{last_event['Type']})", code: 16)
           end
         rescue SystemCallError => e
           # Process.spawn failed, or socket error
@@ -416,39 +422,63 @@ module Aspera
       attr_reader :sessions
 
       # Notify progress to callback
-      # @param event [Hash] management port event
-      def process_progress(event)
-        session_id = event['SessionId']
+      # @param session [Hash] This session information, progress state is stored in it
+      # @param event   [Hash] management port event
+      def process_progress(session, event)
+        # Not the `ascp` session id: must be the same when session is resumed
+        progress_id = session[:progress_id] ||= SecureRandom.uuid
         case event['Type']
         when 'INIT'
-          @pre_calc_sent = false
-          @pre_calc_last_size = nil
-          notify_progress(:session_start, session_id: session_id)
+          session[:size_sent] = false
+          session[:last_size] = nil
+          session[:skipped] = 0
+          session[:last_skipped] = nil
+          notify_progress(:session_start, session_id: progress_id)
         when 'NOTIFICATION' # sent from remote
           if event.key?('PreTransferBytes')
-            @pre_calc_sent = true
-            notify_progress(:session_size, session_id: session_id, info: event['PreTransferBytes'])
+            session[:size_sent] = true
+            notify_progress(:session_size, session_id: progress_id, info: event['PreTransferBytes'])
           end
         when 'STATS' # during transfer
-          @pre_calc_last_size = event['TransferBytes'].to_i + event['StartByte'].to_i
-          notify_progress(:transfer, session_id: session_id, info: @pre_calc_last_size)
+          notify_transferred(session, event)
+        when 'STOP' # one file is completed
+          size = event['Size'].to_i
+          # Whole file already at destination (resume): not transferred, and not in `FileBytes`.
+          # Note: in multi-session, each session notifies all such files: progress bar limits progress to size of session.
+          session[:skipped] += size if size.positive? && event['StartByte'].to_i.eql?(size)
+          notify_transferred(session, event)
         when 'DONE', 'ERROR' # end of session
-          total_size = event['TransferBytes'].to_i + event['StartByte'].to_i
-          notify_progress(:session_size, session_id: session_id, info: total_size) if !@pre_calc_sent && !total_size.zero?
-          notify_progress(:transfer, session_id: session_id, info: total_size) if @pre_calc_last_size != total_size
-          notify_progress(:session_end, session_id: session_id)
+          notify_transferred(session, event)
+          total_size = session[:last_size] + session[:last_skipped]
+          notify_progress(:session_size, session_id: progress_id, info: total_size) if !session[:size_sent] && !total_size.zero?
+          notify_progress(:session_end, session_id: progress_id)
           # cspell:disable
         when 'SESSION'
         when 'ARGSTOP'
         when 'FILEERROR'
           Log.log.error { "#{event['Type']} #{event['Description']}" }
-        when 'STOP'
           # cspell:enable
-          # stop event when one file is completed
         else
           Log.log.debug { "Unknown event type for progress: #{event['Type']}" }
         end
       end
+
+      # Notify transferred size, and size not transferred because already at destination (resume), if changed
+      # @param session [Hash] This session information, progress state is stored in it
+      # @param event   [Hash] management port event, with `TransferBytes` and `FileBytes`
+      def notify_transferred(session, event)
+        transferred = event['TransferBytes'].to_i
+        # `FileBytes` also includes the part of files already at destination.
+        # Note: `StartByte` is not used: in multi-session, it is the offset of the part of file transferred by the session.
+        skipped = session[:skipped] + [event['FileBytes'].to_i - transferred, 0].max
+        if session[:last_skipped] != skipped
+          session[:last_skipped] = skipped
+          notify_progress(:skip, session_id: session[:progress_id], info: skipped)
+        end
+        return if session[:last_size].eql?(transferred)
+        session[:last_size] = transferred
+        notify_progress(:transfer, session_id: session[:progress_id], info: transferred)
+      end
     end
   end
 end

data/lib/aspera/agent/node.rb

@@ -24,7 +24,7 @@ module Aspera
           else
             rest_params[:auth] = {type: :basic, username: agent_params['username'], password: agent_params['password']}
           end
-          node_api = Rest.new(**rest_params)
+          node_api = Rest::Client.new(**rest_params)
           data = node_api.read("ops/transfers/#{transfer_id}") || {'status' => 'unknown'}
           normalize_status(data)
         end
@@ -38,6 +38,9 @@ module Aspera
             result['ended_at'] = Time.now.utc.iso8601
           when 'failed'
             result.merge!('status' => 'failed', 'ended_at' => Time.now.utc.iso8601, 'error' => data['error_desc'].to_s)
+          when 'canceled'
+            result['status'] = 'cancelled'
+            result['ended_at'] = Time.now.utc.iso8601
           else
             result['status'] = 'running'
           end
@@ -71,7 +74,7 @@ module Aspera
             password: password
           }
         end
-        @node_api = Rest.new(**rest_params)
+        @node_api = Rest::Client.new(**rest_params)
         # TODO: currently only supports one transfer. This is bad shortcut. but ok for CLI.
         @transfer_id = nil
       end
@@ -109,7 +112,7 @@ module Aspera
           # status is empty sometimes with status 200...
           transfer_data = node_api_.read("ops/transfers/#{@transfer_id}") || {'status' => 'unknown'} rescue {'status' => 'waiting(api error)'}
           case transfer_data['status']
-          when 'waiting', 'partially_completed', 'unknown', 'waiting(read error)', 'waiting(api error)'
+          when 'waiting', 'partially_completed', 'paused', 'unknown', 'waiting(read error)', 'waiting(api error)'
             notify_progress(:sessions_init, info: transfer_data['status'])
           when 'running'
             if !session_started
@@ -129,13 +132,11 @@ module Aspera
           when 'completed'
             notify_progress(:transfer, session_id: @transfer_id, info: bytes_expected) if bytes_expected
             notify_progress(:session_end, session_id: @transfer_id)
-            notify_progress(:end)
             break
-          when 'failed'
+          when 'failed', 'canceled'
             notify_progress(:session_end, session_id: @transfer_id)
-            notify_progress(:end)
             # Bug in HSTS ? transfer is marked failed, but there is no reason
-            break if transfer_data['error_code'].eql?(0) && transfer_data['error_desc'].empty?
+            break if transfer_data['status'].eql?('failed') && transfer_data['error_code'].eql?(0) && transfer_data['error_desc'].empty?
             raise Transfer::Error, "status: #{transfer_data['status']}. code: #{transfer_data['error_code']}. description: #{transfer_data['error_desc']}"
           else Aspera.error_unexpected_value(transfer_data['status']) { "transfer_data -> #{transfer_data}" }
           end
@@ -149,7 +150,7 @@ module Aspera
 
       # used internally to ensure node api is set before using.
       def node_api_
-        Aspera.assert(!@node_api.nil?, 'Before using this object, set the node_api attribute to a Aspera::Rest object')
+        Aspera.assert(!@node_api.nil?, 'Before using this object, set the node_api attribute to a Aspera::Rest::Client object')
         return @node_api
       end
     end

data/lib/aspera/agent/transferd.rb

@@ -140,6 +140,8 @@ module Aspera
 
       # Actual endpoint the daemon is listening on (resolved after connect, e.g. when port 0 was used)
       attr_reader :daemon_endpoint
+      # gRPC client of the daemon
+      attr_reader :transfer_client
 
       # :reek:UnusedParameters token_regenerator
       def start_transfer(transfer_spec, token_regenerator: nil)
@@ -181,11 +183,9 @@ module Aspera
           when :COMPLETED
             notify_progress(:transfer, session_id: @transfer_id, info: bytes_expected) if bytes_expected
             notify_progress(:session_end, session_id: @transfer_id)
-            notify_progress(:end)
             break
           when :FAILED, :CANCELED
             notify_progress(:session_end, session_id: @transfer_id)
-            notify_progress(:end)
             raise Transfer::Error, JSON.parse(response.message)['Description']
           when :QUEUED, :UNKNOWN_STATUS, :PAUSED, :ORPHANED
             notify_progress(:sessions_init, info: response.status.to_s.downcase)

data/lib/aspera/api/alee.rb

@@ -4,7 +4,7 @@ require 'aspera/api/aoc'
 module Aspera
   module Api
     # Aspera License Entitlement Engine API client
-    class Alee < Aspera::Rest
+    class Alee < Aspera::Rest::Client
       def initialize(entitlement_id, customer_id, api_domain: AoC::SAAS_DOMAIN_PROD, version: 'v1')
         super(
           base_url: "https://api.#{api_domain}/metering/#{version}",

data/lib/aspera/api/aoc.rb

@@ -7,16 +7,18 @@ require 'aspera/hash_ext'
 require 'aspera/data_repository'
 require 'aspera/transfer/spec'
 require 'aspera/api/node'
-require 'aspera/rest_list'
+require 'aspera/rest/list'
 require 'base64'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Api
     # information relative to Files or Packages App
 
     # Aspera on Cloud API client
-    class AoC < Rest
-      include RestList
+    class AoC < Rest::Client
+      include Rest::List
 
       module AppType
         FILES = 'files'
@@ -140,7 +142,7 @@ module Aspera
         # @param url [String] URL of AoC public link
         # @return [Hash{Symbol => String, Hash}] Information about public link, or nil if not a public link
         def link_info(url)
-          final_uri = Rest.new(base_url: url, redirect_max: MAX_AOC_URL_REDIRECT).call(operation: 'GET', ret: :resp).uri
+          final_uri = Rest::Client.new(base_url: url, redirect_max: MAX_AOC_URL_REDIRECT).call(operation: 'GET', ret: :resp).uri
           Log.dump(:final_uri, final_uri, level: :trace1)
           org_domain = split_org_domain(final_uri)
           if (m = final_uri.path.match(%r{/oauth2/([^/]+)/login$}))
@@ -202,8 +204,8 @@ module Aspera
           Aspera.assert(block_given?, 'block required for call_paging')
           # set default large page if user does not specify own parameters. AoC Caps to 1000 anyway
           query['per_page'] = 1000 unless query.key?('per_page')
-          max_items = query.delete(RestList::MAX_ITEMS)
-          max_pages = query.delete(RestList::MAX_PAGES)
+          max_items = query.delete(Rest::List::MAX_ITEMS)
+          max_pages = query.delete(Rest::List::MAX_PAGES)
           item_list = []
           total_count = nil
           current_page = query['page']
@@ -225,9 +227,9 @@ module Aspera
             break if !max_items.nil? && item_list.count >= max_items
             break if !max_pages.nil? && page_count >= max_pages
             break if total_count&.<=(item_list.count)
-            RestParameters.instance.spinner_cb.call("#{item_list.count} / #{total_count}") unless total_count.eql?(item_list.count.to_s)
+            Rest::Parameters.instance.spinner_cb.call("#{item_list.count} / #{total_count}") unless total_count.eql?(item_list.count.to_s)
           end
-          RestParameters.instance.spinner_cb.call(action: :success)
+          Rest::Parameters.instance.spinner_cb.call(action: :success)
           item_list = item_list[0..max_items - 1] if !max_items.nil? && item_list.count > max_items
           return {items: item_list, total: total_count}
         end
@@ -394,7 +396,7 @@ module Aspera
         @cache_user_info =
           begin
             read('self')
-          rescue Aspera::RestCallError => e
+          rescue Aspera::Rest::CallError => e
             raise if exception || e.message.include?('invalid_grant')
             Log.log.debug { "Ignoring error: (#{e.class}) #{e}" }
             {}
@@ -496,9 +498,9 @@ module Aspera
           }
         else
           # OAuth bearer token
-          node_params[:auth] = auth_params.clone
-          node_params[:auth][:params] ||= {}
-          node_params[:auth][:params][:scope] = Node.token_scope(node_info['access_key'], scope)
+          # copy nested params, so that auth params of this API are not modified
+          node_params[:auth] = auth_params.merge(params: auth_params[:params]&.dup || {})
+          node_params[:auth][:params][:scope] = Node::Scope.join(access_key: node_info['access_key'], scope: scope)
           node_params[:auth][:params][:owner_access] = true if scope.eql?(Node::Scope::ADMIN)
           # Special header required for bearer token only
           node_params[:headers] = {Node::HEADER_X_ASPERA_ACCESS_KEY => node_info['access_key']}

data/lib/aspera/api/ats.rb

@@ -6,7 +6,7 @@ require 'aspera/rest'
 module Aspera
   module Api
     # Aspera Transfer Service API client without authentication
-    class Ats < Aspera::Rest
+    class Ats < Aspera::Rest::Client
       SERVICE_BASE_URL = 'https://ats.aspera.io'
       # currently supported clouds
       # Note to Aspera: shall be an API call

data/lib/aspera/api/cos_node.rb

@@ -22,7 +22,7 @@ module Aspera
             Aspera.assert(service_credentials.key?(field)) { "service_credentials must have a field: #{field}" }
           end
           # read endpoints from service provided in service credentials
-          endpoints = Aspera::Rest.new(base_url: service_credentials['endpoints']).read('')
+          endpoints = Aspera::Rest::Client.new(base_url: service_credentials['endpoints']).read('')
           Log.dump(:endpoints, endpoints)
           endpoint = endpoints.dig('service-endpoints', 'regional', bucket_region, 'public', bucket_region)
           Aspera.assert(!endpoint.nil?) { "no such region: #{bucket_region}" }
@@ -40,7 +40,7 @@ module Aspera
         endpoint = "https://#{endpoint}" unless endpoint.start_with?('http')
         @auth_url = auth_url
         @api_key = api_key
-        s3_api = Aspera::Rest.new(
+        s3_api = Aspera::Rest::Client.new(
           base_url:       endpoint,
           not_auth_codes: %w[401 403], # error codes when not authorized
           headers:        {'ibm-service-instance-id' => instance_id},

data/lib/aspera/api/faspex.rb

@@ -3,7 +3,7 @@
 require 'aspera/assert'
 require 'aspera/rest'
 require 'aspera/oauth/base'
-require 'aspera/rest_list'
+require 'aspera/rest/list'
 require 'digest'
 
 module Aspera
@@ -15,6 +15,7 @@ module Aspera
     # @param context        [String] The `context` query parameter in public link
     # @param redirect_uri   [String] URI of web UI login
     # @param path_authorize [String] Path to provide passcode
+    # @param base_params    [Hash] Parameters for base class
     def initialize(
       context:,
       redirect_uri:,
@@ -48,18 +49,18 @@ module Aspera
       raise Error, info['action_message'] if info['action_message']
       Aspera.assert(info['code'], 'Missing code in answer')
       # Exchange code for token
-      return create_token_call(base_params.merge(
+      create_token_base(
         grant_type:   'authorization_code',
         code:         info['code'],
         redirect_uri: @redirect_uri
-      ))
+      )
     end
   end
   OAuth::Factory.instance.register_token_creator(FaspexPubLink)
   module Api
     # Aspera Faspex 5 API Client
-    class Faspex < Aspera::Rest
-      include RestList
+    class Faspex < Aspera::Rest::Client
+      include Rest::List
 
       # endpoint for authentication API
       PATH_AUTH = 'auth'
@@ -137,10 +138,12 @@ module Aspera
           SENT_MAILBOX_TYPES.include?(box) || box == 'ALL' ? :sent : :received
         end
       end
+      # @return [Hash, nil] public link context decoded from URL (keys: resource, type, id, passcode, package_id, email), or nil if not a public link
       attr_reader :pub_link_context
 
       # @param url            [String] Faspex URL, can be a public link
       # @param auth           [Symbol] Authentication method: :boot (token in header), :web (open browser), :jwt (client_id + private key), :public_link (context in URL)
+      # @param root           [String] Root path for API
       # @param password       [String, nil] For :boot auth, the token copied directly from browser in developer mode
       # @param client_id      [String, nil] For :web and :jwt auth, the client_id of web UI application
       # @param client_secret  [String, nil] For :web auth, the client_secret of web UI application (not needed for :jwt)
@@ -161,12 +164,13 @@ module Aspera
         passphrase: nil
       )
         auth = :public_link if self.class.public_link?(url)
+        # @type [Hash, nil]
         @pub_link_context = nil
         super(**
           case auth
           when :public_link
             # Get URL of final redirect of provided public link
-            final_url = Rest.new(base_url: url, redirect_max: 3).call(operation: 'GET', ret: :resp).uri.to_s
+            final_url = Rest::Client.new(base_url: url, redirect_max: 3).call(operation: 'GET', ret: :resp).uri.to_s
             Log.dump(:final_url, final_url, level: :trace1)
             # Get context from query
             encoded_context = Rest.query_to_h(URI.parse(final_url).query)['context']
@@ -178,7 +182,7 @@ module Aspera
             base_url = final_url.gsub(%r{/public/.*}, '').gsub(/\?.*/, '')
             # Get web UI client_id and redirect_uri
             # TODO: change this for something more reliable
-            config = JSON.parse(Rest.new(base_url: "#{base_url}/config.js", redirect_max: 3).call(operation: 'GET').sub(/^[^=]+=/, '').gsub(/([a-z_]+):/, '"\1":').delete("\n ").tr("'", '"')).symbolize_keys
+            config = JSON.parse(Rest::Client.new(base_url: "#{base_url}/config.js", redirect_max: 3).call(operation: 'GET').sub(/^[^=]+=/, '').gsub(/([a-z_]+):/, '"\1":').delete("\n ").tr("'", '"')).symbolize_keys
             Log.dump(:config_js, config)
             {
               base_url: "#{base_url}/#{root}",