aspera-cli 4.18.1 → 4.20.0

data/lib/aspera/cli/plugins/ats.rb

@@ -5,6 +5,7 @@
 require 'aspera/cli/plugins/node'
 require 'aspera/api/ats'
 require 'aspera/api/aoc'
+require 'aspera/api/alee'
 require 'aspera/assert'
 
 module Aspera
@@ -24,13 +25,14 @@ module Aspera
           options.declare(:cloud, 'Cloud provider')
           options.declare(:region, 'Cloud region')
           options.parse_options!
+          Node.declare_options(options)
         end
 
         def server_by_cloud_region
           # TODO: provide list ?
           cloud = options.get_option(:cloud, mandatory: true).upcase
           region = options.get_option(:region, mandatory: true)
-          return @ats_api_pub.read("servers/#{cloud}/#{region}")[:data]
+          return @ats_api_pub.read("servers/#{cloud}/#{region}")
         end
 
         # require api key only if needed
@@ -84,29 +86,29 @@ module Aspera
               end
             end
             res = ats_api_pub_v1.create('access_keys', params)
-            return {type: :single_object, data: res[:data]}
+            return {type: :single_object, data: res}
             # TODO : action : modify, with "PUT"
           when :list
             params = options.get_option(:params) || {'offset' => 0, 'max_results' => 1000}
             res = ats_api_pub_v1.read('access_keys', params)
-            return {type: :object_list, data: res[:data]['data'], fields: ['name', 'id', 'created.at', 'modified.at']}
+            return {type: :object_list, data: res['data'], fields: ['name', 'id', 'created.at', 'modified.at']}
           when :show
             res = ats_api_pub_v1.read("access_keys/#{access_key_id}")
-            return {type: :single_object, data: res[:data]}
+            return {type: :single_object, data: res}
           when :modify
             params = value_create_modify(command: command)
             params['id'] = access_key_id
             ats_api_pub_v1.update("access_keys/#{access_key_id}", params)
             return Main.result_status('modified')
           when :entitlement
-            ak = ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
+            ak = ats_api_pub_v1.read("access_keys/#{access_key_id}")
             api_bss = Api::Alee.new(ak['license']['entitlement_id'], ak['license']['customer_id'])
-            return {type: :single_object, data: api_bss.read('entitlement')[:data]}
+            return {type: :single_object, data: api_bss.read('entitlement')}
           when :delete
             ats_api_pub_v1.delete("access_keys/#{access_key_id}")
             return Main.result_status("deleted #{access_key_id}")
           when :node
-            ak_data = ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
+            ak_data = ats_api_pub_v1.read("access_keys/#{access_key_id}")
             server_data = @ats_api_pub.all_servers.find {|i| i['id'].start_with?(ak_data['transfer_server_id'])}
             raise Cli::Error, 'no such server found' if server_data.nil?
             node_url = server_data['transfer_setup_url']
@@ -128,7 +130,7 @@ module Aspera
                 username: access_key_id,
                 password: config.lookup_secret(url: ats_url, username: access_key_id)
               })
-            return {type: :single_object, data: api_ak_auth.read('servers')[:data]}
+            return {type: :single_object, data: api_ak_auth.read('servers')}
           else Aspera.error_unexpected_value(command)
           end
         end
@@ -177,7 +179,7 @@ module Aspera
             instance = options.get_option(:instance)
             if instance.nil?
               # Take the first Aspera on Cloud transfer service instance ID if not provided by user
-              instance = ats_api_v2_auth_ibm.read('instances')[:data]['data'].first
+              instance = ats_api_v2_auth_ibm.read('instances')['data'].first
               formatter.display_status("using first instance: #{instance}")
             end
             rest_add_header = {'X-ATS-Service-Instance-Id' => instance}
@@ -185,18 +187,18 @@ module Aspera
           ats_ibm_api = ats_api_v2_auth_ibm(rest_add_header)
           case command
           when :instances
-            instances = ats_ibm_api.read('instances')[:data]
+            instances = ats_ibm_api.read('instances')
             Log.log.warn{"more instances remaining: #{instances['remaining']}"} unless instances['remaining'].to_i.eql?(0)
             return {type: :value_list, data: instances['data'], name: 'instance'}
           when :create
-            created_key = ats_ibm_api.create('api_keys', value_create_modify(command: command, default: {}))[:data]
+            created_key = ats_ibm_api.create('api_keys', value_create_modify(command: command, default: {}))
             return {type: :single_object, data: created_key}
           when :list # list known api keys in ATS (this require an api_key ...)
             res = ats_ibm_api.read('api_keys', {'offset' => 0, 'max_results' => 1000})
-            return {type: :value_list, data: res[:data]['data'], name: 'ats_id'}
+            return {type: :value_list, data: res['data'], name: 'ats_id'}
           when :show # show one of api_key in ATS
             res = ats_ibm_api.read("api_keys/#{concerned_id}")
-            return {type: :single_object, data: res[:data]}
+            return {type: :single_object, data: res}
           when :delete
             ats_ibm_api.delete("api_keys/#{concerned_id}")
             return Main.result_status("deleted #{concerned_id}")
@@ -222,7 +224,7 @@ module Aspera
           when :api_key # manage credential to access ATS API
             return execute_action_api_key
           when :aws_trust_policy
-            res = ats_api_pub_v1.read('aws/trustpolicy', {region: options.get_option(:region, mandatory: true)})[:data]
+            res = ats_api_pub_v1.read('aws/trustpolicy', {region: options.get_option(:region, mandatory: true)})
             return {type: :single_object, data: res}
           else Aspera.error_unexpected_value(command)
           end

data/lib/aspera/cli/plugins/config.rb

@@ -57,15 +57,14 @@ module Aspera
         APP_NAME_SDK = 'sdk'
         CONNECT_WEB_URL = 'https://d3gcli72yxqn2z.cloudfront.net/connect'
         CONNECT_VERSIONS = 'connectversions.js' # cspell: disable-line
-        TRANSFER_SDK_ARCHIVE_URL = 'https://ibm.biz/aspera_transfer_sdk'
         DEMO_SERVER = 'demo'
         DEMO_PRESET = 'demoserver' # cspell: disable-line
         EMAIL_TEST_TEMPLATE = <<~END_OF_TEMPLATE
           From: <%=from_name%> <<%=from_email%>>
           To: <<%=to%>>
-          Subject: #{GEM_NAME} email test
+          Subject: #{Info::GEM_NAME} email test
 
-          This email was sent to test #{PROGRAM_NAME}.
+          This email was sent to test #{Info::CMD_NAME}.
         END_OF_TEMPLATE
         # special extended values
         EXTEND_PRESET = :preset
@@ -86,7 +85,6 @@ module Aspera
           :CONF_PRESET_GLOBAL,
           :ASPERA_PLUGINS_FOLDERNAME,
           :ASPERA,
-          :TRANSFER_SDK_ARCHIVE_URL,
           :DEMO_SERVER,
           :DEMO_PRESET,
           :EMAIL_TEST_TEMPLATE,
@@ -126,8 +124,8 @@ module Aspera
           end
 
           # deep clone hash so that it does not get modified in case of display and secret hide
-          def protect_presets(val)
-            return JSON.parse(JSON.generate(val))
+          def deep_clone(val)
+            return Marshal.load(Marshal.dump(val))
           end
 
           # return product family folder (~/.aspera)
@@ -145,13 +143,9 @@ module Aspera
           end
         end
 
-        def initialize(gem:, name:, help:, version:, **env)
+        def initialize(**env)
           # we need to defer parsing of options until we have the config file, so we can use @extend with @preset
           super(**env)
-          @gem = gem
-          @name = name
-          @help = help
-          @version = version
           @use_plugin_defaults = true
           @config_presets = nil
           @config_checksum_on_disk = nil
@@ -177,9 +171,9 @@ module Aspera
             :home, 'Home folder for tool',
             handler: {o: self, m: :main_folder},
             types: String,
-            default: self.class.default_app_main_folder(app_name: @name))
+            default: self.class.default_app_main_folder(app_name: Info::CMD_NAME))
           options.parse_options!
-          Log.log.debug{"#{@name} folder: #{@main_folder}"}
+          Log.log.debug{"#{Info::CMD_NAME} folder: #{@main_folder}"}
           # data persistency manager, created by config plugin
           @persistency = PersistencyFolder.new(File.join(@main_folder, PERSISTENCY_FOLDER))
           # set folders for plugin lookup
@@ -218,7 +212,7 @@ module Aspera
           # Transfer SDK options
           options.declare(:ascp_path, 'Path to ascp', handler: {o: Ascp::Installation.instance, m: :ascp_path})
           options.declare(:use_product, 'Use ascp from specified product', handler: {o: self, m: :option_use_product})
-          options.declare(:sdk_url, 'URL to get SDK', default: TRANSFER_SDK_ARCHIVE_URL)
+          options.declare(:sdk_url, 'URL to get SDK', default: SpecialValues::DEF)
           options.declare(:sdk_folder, 'SDK folder path', handler: {o: Ascp::Installation.instance, m: :sdk_folder})
           options.declare(:progress_bar, 'Display progress bar', values: :bool, default: Environment.terminal?)
           # email options
@@ -234,7 +228,7 @@ module Aspera
           options.declare(:http_proxy, 'URL for HTTP proxy with optional credentials', types: String, handler: {o: self, m: :option_http_proxy})
           options.declare(:cache_tokens, 'Save and reuse OAuth tokens', values: :bool, handler: {o: self, m: :option_cache_tokens})
           options.declare(:fpac, 'Proxy auto configuration script')
-          options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac. Array: user,password', types: Array)
+          options.declare(:proxy_credentials, 'HTTP proxy credentials for fpac: user, password', types: Array)
           options.parse_options!
           @progress_bar = TransferProgress.new if options.get_option(:progress_bar)
           # Check SDK folder is set or not, for compatibility, we check in two places
@@ -248,7 +242,7 @@ module Aspera
             if !Dir.exist?(sdk_folder)
               Log.log.debug{"not exists: #{sdk_folder}"}
               # former location
-              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: @name), APP_NAME_SDK)
+              former_sdk_folder = File.join(self.class.default_app_main_folder(app_name: Info::CMD_NAME), APP_NAME_SDK)
               Log.log.debug{"checking: #{former_sdk_folder}"}
               sdk_folder = former_sdk_folder if Dir.exist?(former_sdk_folder)
             end
@@ -266,11 +260,16 @@ module Aspera
               @pac_exec.proxy_pass = proxy_user_pass[1]
             end
           end
-          Rest.set_parameters(
-            user_agent:  PROGRAM_NAME,
-            session_cb:  lambda{|http_session|update_http_session(http_session)},
-            progress_bar: @progress_bar)
+          RestParameters.instance.user_agent = Info::CMD_NAME
+          RestParameters.instance.progress_bar = @progress_bar
+          RestParameters.instance.session_cb = lambda{|http_session|update_http_session(http_session)}
+          @option_http_options.keys.select{|i|RestParameters.instance.respond_to?(i)}.each do |k|
+            method = "#{k}=".to_sym
+            RestParameters.instance.send(method, @option_http_options[k])
+            @option_http_options.delete(k)
+          end
           OAuth::Factory.instance.persist_mgr = persistency if @option_cache_tokens
+          OAuth::Web.additionnal_info = "#{Info::CMD_NAME} v#{Cli::VERSION}"
           Transfer::Parameters.file_list_folder = File.join(@main_folder, 'filelists')
           RestErrorAnalyzer.instance.log_file = File.join(@main_folder, 'rest_exceptions.log')
           # register aspera REST call error handlers
@@ -281,6 +280,8 @@ module Aspera
         attr_reader :option_ignore_cert_host_port, :progress_bar
 
         # add files, folders or default locations to the certificate store
+        # @param path_list [Array<String>] list of paths to add
+        # @return the list of paths
         def trusted_cert_locations=(path_list)
           path_list = [path_list] unless path_list.is_a?(Array)
           Aspera.assert_type(path_list, Array){'cert locations'}
@@ -296,10 +297,10 @@ module Aspera
             Log.log.debug{"Adding cert location: #{path}"}
             if path.eql?(SpecialValues::DEF)
               @certificate_store.set_default_paths
-              paths_to_add = [
-                OpenSSL::X509::DEFAULT_CERT_DIR,
-                OpenSSL::X509::DEFAULT_CERT_FILE
-              ].select{|f|File.exist?(f)}
+              paths_to_add = [OpenSSL::X509::DEFAULT_CERT_DIR]
+              # JRuby cert file seems not to be PEM
+              paths_to_add.push(OpenSSL::X509::DEFAULT_CERT_FILE) unless defined?(JRUBY_VERSION)
+              paths_to_add.select!{|f|File.exist?(f)}
             elsif File.file?(path)
               @certificate_store.add_file(path)
             elsif File.directory?(path)
@@ -392,19 +393,19 @@ module Aspera
         def check_gem_version
           latest_version =
             begin
-              Rest.new(base_url: 'https://rubygems.org/api/v1').read("versions/#{@gem}/latest.json")[:data]['version']
+              Rest.new(base_url: 'https://rubygems.org/api/v1').read("versions/#{Info::GEM_NAME}/latest.json")['version']
             rescue StandardError
               Log.log.warn('Could not retrieve latest gem version on rubygems.')
               '0'
             end
-          if Gem::Version.new(Environment.ruby_version) < Gem::Version.new(RUBY_FUTURE_MINIMUM_VERSION)
+          if Gem::Version.new(Environment.ruby_version) < Gem::Version.new(Info::RUBY_FUTURE_MINIMUM_VERSION)
             Log.log.warn do
-              "Note that a future version will require Ruby version #{RUBY_FUTURE_MINIMUM_VERSION} at minimum, " \
+              "Note that a future version will require Ruby version #{Info::RUBY_FUTURE_MINIMUM_VERSION} at minimum, " \
                 "you are using #{Environment.ruby_version}"
             end
           end
           return {
-            name:        @gem,
+            name:        Info::GEM_NAME,
             current:     Cli::VERSION,
             latest:      latest_version,
             need_update: Gem::Version.new(Cli::VERSION) < Gem::Version.new(latest_version)
@@ -520,7 +521,7 @@ module Aspera
             current = current[name]
             raise Cli::Error, "No such config preset: #{include_path}" if current.nil?
           end
-          current = self.class.protect_presets(current) unless current.is_a?(String)
+          current = self.class.deep_clone(current) unless current.is_a?(String)
           return ExtendedValue.instance.evaluate(current)
         end
 
@@ -578,7 +579,7 @@ module Aspera
             @config_checksum_on_disk = config_checksum
           end
           files_to_copy = []
-          Log.log.debug{Log.dump('Available_presets', @config_presets)}
+          Log.log.trace1{Log.dump('Available_presets', @config_presets)}
           Aspera.assert_type(@config_presets, Hash){'config file YAML'}
           # check there is at least the config section
           Aspera.assert(@config_presets.key?(CONF_PRESET_CONFIG)){"Cannot find key: #{CONF_PRESET_CONFIG}"}
@@ -590,7 +591,7 @@ module Aspera
           @config_presets[CONF_PRESET_DEFAULTS].delete(true) if @config_presets[CONF_PRESET_DEFAULTS].is_a?(Hash)
           # ^^^ Place new compatibility code before this line
           # set version to current
-          @config_presets[CONF_PRESET_CONFIG][CONF_PRESET_VERSION] = @version
+          @config_presets[CONF_PRESET_CONFIG][CONF_PRESET_VERSION] = Cli::VERSION
           unless files_to_copy.empty?
             Log.log.warn('Copying referenced files')
             files_to_copy.each do |file|
@@ -605,7 +606,7 @@ module Aspera
           Log.log.debug{"-> #{e.class.name} : #{e}"}
           if File.exist?(@option_config_file)
             # then there is a problem with that file.
-            new_name = "#{@option_config_file}.pre#{@version}.manual_conversion_needed"
+            new_name = "#{@option_config_file}.pre#{Cli::VERSION}.manual_conversion_needed"
             File.rename(@option_config_file, new_name)
             Log.log.warn{"Renamed config file to #{new_name}."}
             Log.log.warn('Manual Conversion is required. Next time, a new empty file will be created.')
@@ -699,8 +700,7 @@ module Aspera
             return execute_connect_action
           when :use
             ascp_path = options.get_next_argument('path to ascp')
-            ascp_version = Ascp::Installation.instance.get_ascp_version(ascp_path)
-            formatter.display_status("ascp version: #{ascp_version}")
+            formatter.display_status("ascp version: #{Ascp::Installation.instance.get_ascp_version(ascp_path)}")
             set_global_default(:ascp_path, ascp_path)
             return Main.result_nothing
           when :show
@@ -729,8 +729,8 @@ module Aspera
           when :install
             # reset to default location, if older default was used
             Ascp::Installation.instance.sdk_folder = self.class.default_app_main_folder(app_name: APP_NAME_SDK) if @sdk_default_location
-            v = Ascp::Installation.instance.install_sdk(options.get_option(:sdk_url, mandatory: true))
-            return Main.result_status("Installed version #{v}")
+            n, v = Ascp::Installation.instance.install_sdk(url: options.get_option(:sdk_url, mandatory: true))
+            return Main.result_status("Installed #{n} version #{v}")
           when :spec
             return {
               type:   :object_list,
@@ -766,9 +766,9 @@ module Aspera
             return {type: :value_list, data: @config_presets.keys, name: 'name'}
           when :overview
             # display process modifies the value (hide secrets): we do not want to save removed secrets
-            return {type: :config_over, data: self.class.protect_presets(@config_presets)}
+            return {type: :config_over, data: self.class.deep_clone(@config_presets)}
           when :show
-            return {type: :single_object, data: self.class.protect_presets(@config_presets[name])}
+            return {type: :single_object, data: self.class.deep_clone(@config_presets[name])}
           when :delete
             @config_presets.delete(name)
             return Main.result_status("Deleted: #{name}")
@@ -871,7 +871,9 @@ module Aspera
           check_update
           initdemo
           vault
-          throw].freeze
+          test
+          platform
+        ].freeze
 
         # Main action procedure for plugin
         def execute_action
@@ -885,7 +887,7 @@ module Aspera
           when :documentation
             section = options.get_next_argument('private key file path', mandatory: false)
             section = "##{section}" unless section.nil?
-            Environment.instance.open_uri("#{@help}#{section}")
+            Environment.instance.open_uri("#{Info::DOC_URL}#{section}")
             return Main.result_nothing
           when :genkey # generate new rsa key
             private_key_path = options.get_next_argument('private key file path')
@@ -967,7 +969,7 @@ module Aspera
             case options.get_next_command(%i[path version name])
             when :path then return Main.result_status(self.class.gem_src_root)
             when :version then return Main.result_status(Cli::VERSION)
-            when :name then return Main.result_status(@gem)
+            when :name then return Main.result_status(Info::GEM_NAME)
             end
           when :folder
             return Main.result_status(@main_folder)
@@ -1007,14 +1009,9 @@ module Aspera
             end
             return Main.result_status('Done')
           when :vault then execute_vault
-          when :throw
-            # :type [String]
-            options
-            exception_class_name = options.get_next_argument('exception class name', mandatory: true)
-            exception_text = options.get_next_argument('exception text', mandatory: true)
-            exception_class = Object.const_get(exception_class_name)
-            Aspera.assert(exception_class <= Exception){"#{exception_class} is not an exception: #{exception_class.class}"}
-            raise exception_class, exception_text
+          when :test then return execute_test
+          when :platform
+            return Main.result_status(Environment.architecture)
           else Aspera.error_unreachable_line
           end
         end
@@ -1107,7 +1104,7 @@ module Aspera
             test_args = "-P#{wiz_preset_name} #{test_args}"
           end
           # TODO: actually test the command
-          return Main.result_status("You can test with:\n#{@name} #{identification[:product]} #{test_args}")
+          return Main.result_status("You can test with:\n#{Info::CMD_NAME} #{identification[:product]} #{test_args}")
         end
 
         # @return [Hash] email server setting with defaults if not defined
@@ -1136,6 +1133,8 @@ module Aspera
         end
 
         # send email using ERB template
+        # @param email_template_default [String] default template, can be overriden by option
+        # @param values [Hash] values to be used in template, keys with default: to, from_name, from_email
         def send_email_template(email_template_default: nil, values: {})
           values[:to] ||= options.get_option(:notify_to, mandatory: true)
           notify_template = options.get_option(:notify_template, mandatory: email_template_default.nil?) || email_template_default
@@ -1197,7 +1196,7 @@ module Aspera
               Log.log.error do
                 "Default config name [#{default_config_name}] specified for plugin [#{plugin_name_sym}], but it does not exist in config file.\n" \
                   'Please fix the issue: either create preset with one parameter: ' \
-                  "(#{@name} config id #{default_config_name} init @json:'{}') or remove default (#{@name} config id default remove #{plugin_name_sym})."
+                  "(#{Info::CMD_NAME} config id #{default_config_name} init @json:'{}') or remove default (#{Info::CMD_NAME} config id default remove #{plugin_name_sym})."
               end
             end
             raise Cli::Error, "Config name [#{default_config_name}] must be a hash, check config file." if !@config_presets[default_config_name].is_a?(Hash)
@@ -1252,7 +1251,7 @@ module Aspera
           info = options.get_option(:vault) || {}
           info = info.symbolize_keys
           info[:type] ||= 'file'
-          info[:name] ||= (info[:type].eql?('file') ? DEFAULT_VAULT_FILENAME : PROGRAM_NAME)
+          info[:name] ||= (info[:type].eql?('file') ? DEFAULT_VAULT_FILENAME : Info::CMD_NAME)
           Aspera.assert(info.keys.sort == %i[name type]) {"vault info shall have exactly keys 'type' and 'name'"}
           Aspera.assert(info.values.all?(String)){'vault info shall have only string values'}
           info[:password] = options.get_option(:vault_password, mandatory: true)
@@ -1284,6 +1283,20 @@ module Aspera
           @vault
         end
 
+        def execute_test
+          case options.get_next_command(%i[throw web])
+          when :throw
+            # :type [String]
+            # options
+            exception_class_name = options.get_next_argument('exception class name', mandatory: true)
+            exception_text = options.get_next_argument('exception text', mandatory: true)
+            exception_class = Object.const_get(exception_class_name)
+            Aspera.assert(exception_class <= Exception){"#{exception_class} is not an exception: #{exception_class.class}"}
+            raise exception_class, exception_text
+          when :web
+          end
+        end
+
         # version of URL without trailing "/" and removing default port
         def canonical_url(url)
           url.sub(%r{/+$}, '').sub(%r{^(https://[^/]+):443$}, '\1')
@@ -1296,7 +1309,7 @@ module Aspera
           @config_presets.each_value do |v|
             next unless v.is_a?(Hash)
             conf_url = v['url'].is_a?(String) ? canonical_url(v['url']) : nil
-            return self.class.protect_presets(v) if conf_url.eql?(url) && v['username'].eql?(username)
+            return self.class.deep_clone(v) if conf_url.eql?(url) && v['username'].eql?(username)
           end
           nil
         end

data/lib/aspera/cli/plugins/console.rb

@@ -84,11 +84,11 @@ module Aspera
               command = options.get_next_command(%i[list submit])
               case command
               when :list
-                return {type: :object_list, data: api_console.read('smart_transfers')[:data]}
+                return {type: :object_list, data: api_console.read('smart_transfers')}
               when :submit
                 smart_id = options.get_next_argument('smart_id')
                 params = options.get_next_argument('transfer parameters')
-                return {type: :object_list, data: api_console.create("smart_transfers/#{smart_id}", params)[:data]}
+                return {type: :object_list, data: api_console.create("smart_transfers/#{smart_id}", params)}
               end
             when :current
               command = options.get_next_command([:list])
@@ -99,7 +99,7 @@ module Aspera
                   data:   api_console.read('transfers', {
                     'from' => options.get_option(:filter_from, mandatory: true),
                     'to'   => options.get_option(:filter_to, mandatory: true)
-                  })[:data],
+                  }),
                   fields: %w[id contact name status]}
               end
             end

data/lib/aspera/cli/plugins/faspex.rb

@@ -37,7 +37,8 @@ module Aspera
         # sub path in url for public link delivery
         PUB_LINK_EXTERNAL_MATCH = 'external_deliveries/'
         STANDARD_PATH = '/aspera/faspex'
-        private_constant(*%i[KEY_NODE KEY_PATH PACKAGE_MATCH_FIELD ATOM_MAILBOXES ATOM_PARAMS ATOM_EXT_PARAMS PUB_LINK_EXTERNAL_MATCH])
+        HEADER_FASPEX_VERSION = 'X-IBM-Aspera'
+        private_constant(*%i[KEY_NODE KEY_PATH PACKAGE_MATCH_FIELD ATOM_MAILBOXES ATOM_PARAMS ATOM_EXT_PARAMS PUB_LINK_EXTERNAL_MATCH HEADER_FASPEX_VERSION])
 
         class << self
           def detect(address_or_url)
@@ -58,7 +59,7 @@ module Aspera
               # 4.x
               next unless result[:http].body.start_with?('<?xml')
               res_s = XmlSimple.xml_in(result[:http].body, {'ForceArray' => false})
-              Log.log.debug{"version: #{result[:http]['X-IBM-Aspera']}"}
+              Log.log.debug{"version: #{result[:http][HEADER_FASPEX_VERSION]}"}
               version = res_s['XRD']['application']['version']
               # take redirect if any
               return {
@@ -95,7 +96,7 @@ module Aspera
             result = {
               base_url: "#{public_uri.scheme}://#{public_uri.host}#{port_add}#{base}",
               subpath:  subpath,
-              query:    Rest.decode_query(public_uri.query)
+              query:    Rest.query_to_h(public_uri.query)
             }
             Log.log.debug{Log.dump('link data', result)}
             return result
@@ -246,7 +247,7 @@ module Aspera
           delivery_info[:source_paths_list] = transfer.source_list.join("\r\n")
           api_public_link = Rest.new(base_url: link_data[:base_url])
           # Hum, as this does not always work (only user, but not dropbox), we get the javascript and need hack
-          # pkg_created=api_public_link.create(create_path,package_create_params)[:data]
+          # pkg_created=api_public_link.create(create_path,package_create_params)
           # so extract data from javascript
           package_creation_data = api_public_link.call(
             operation:   'POST',
@@ -307,17 +308,11 @@ module Aspera
                 first_source['paths'].push(*transfer.source_list)
                 source_id = instance_identifier(as_option: :remote_source) do |field, value|
                   Aspera.assert(field.eql?('name'), exception_class: Cli::BadArgument){'only name as selector, or give id'}
-                  source_list = api_v3.call(operation: 'GET', subpath: 'source_shares', headers: {'Accept' => 'application/json'})[:data]['items']
+                  source_list = api_v3.read('source_shares')['items']
                   self.class.get_source_id_by_name(value, source_list)
                 end
                 first_source['id'] = source_id.to_i unless source_id.nil?
-                pkg_created = api_v3.call(
-                  operation:   'POST',
-                  subpath:     'send',
-                  headers:     {'Accept' => 'application/json'},
-                  body:        package_create_params,
-                  body_type:   :json
-                )[:data]
+                pkg_created = api_v3.create('send', package_create_params)
                 if first_source.key?('id')
                   # no transfer spec if remote source: handled by faspex
                   return {data: [pkg_created['links']['status']], type: :value_list, name: 'link'}
@@ -437,7 +432,7 @@ module Aspera
             end
           when :source
             command_source = options.get_next_command(%i[list info node])
-            source_list = api_v3.call(operation: 'GET', subpath: 'source_shares', headers: {'Accept' => 'application/json'})[:data]['items']
+            source_list = api_v3.read('source_shares')['items']
             case command_source
             when :list
               return {type: :object_list, data: source_list}
@@ -479,13 +474,13 @@ module Aspera
               end
             end
           when :me
-            my_info = api_v3.call(operation: 'GET', subpath: 'me', headers: {'Accept' => 'application/json'})[:data]
+            my_info = api_v3.read('me')
             return {data: my_info, type: :single_object}
           when :dropbox
             command_pkg = options.get_next_command([:list])
             case command_pkg
             when :list
-              dropbox_list = api_v3.call(operation: 'GET', subpath: 'dropboxes', headers: {'Accept' => 'application/json'})[:data]
+              dropbox_list = api_v3.read('dropboxes')
               return {type: :object_list, data: dropbox_list['items'], fields: %w[name id description can_read can_write]}
             end
           when :v4
@@ -509,12 +504,7 @@ module Aspera
               return entity_action(api_v4, "#{pkg_box_type}/#{pkg_box_id}/packages")
             end
           when :address_book
-            result = api_v3.call(
-              operation: 'GET',
-              subpath:   'address-book',
-              headers:   {'Accept' => 'application/json'},
-              query:     {'format' => 'json', 'count' => 100_000}
-            )[:data]
+            result = api_v3.read('address-book', {'format' => 'json', 'count' => 100_000})
             formatter.display_status("users: #{result['itemsPerPage']}/#{result['totalResults']}, start:#{result['startIndex']}")
             users = result['entry']
             # add missing entries