aspera-cli 4.21.1 → 4.22.0

data/lib/aspera/persistency_folder.rb

@@ -64,7 +64,7 @@ module Aspera
       garbage_files = current_files(persist_category)
       if !max_age_seconds.nil?
         current_time = Time.now
-        garbage_files.select! { |filepath| (current_time - File.stat(filepath).mtime).to_i > max_age_seconds}
+        garbage_files.select!{ |filepath| (current_time - File.stat(filepath).mtime).to_i > max_age_seconds}
       end
       garbage_files.each do |filepath|
         File.delete(filepath)
@@ -79,7 +79,7 @@ module Aspera
     end
 
     def current_items(persist_category)
-      current_files(persist_category).each_with_object({}) {|i, h| h[File.basename(i, FILE_SUFFIX)] = File.read(i)}
+      current_files(persist_category).each_with_object({}){ |i, h| h[File.basename(i, FILE_SUFFIX)] = File.read(i)}
     end
 
     private

data/lib/aspera/preview/generator.rb

@@ -4,7 +4,6 @@
 # spellchecker:ignore pauseframes libx264 trunc bufsize muxer apng libmp3lame maxrate posterize movflags faststart
 # spellchecker:ignore palettegen paletteuse pointsize bordercolor repage lanczos unoconv optipng reencode conv transframes
 
-require 'open3'
 require 'aspera/preview/options'
 require 'aspera/preview/utils'
 require 'aspera/preview/file_types'
@@ -24,17 +23,18 @@ module Aspera
       # one of CONVERSION_TYPES
       attr_reader :conversion_type
 
-      # @param src source file path
-      # @param dst destination file path
-      # @param api_mime_type optional mime type as provided by node api (or nil)
       # node API mime types are from: http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
-      # supported preview type is one of Preview::PREVIEW_FORMATS
       # the resulting preview file type is taken from destination file extension.
       # conversion methods are provided by private methods: convert_<conversion_type>_to_<preview_format>
       #   -> conversion_type is one of FileTypes::CONVERSION_TYPES
       #   -> preview_format is one of Generator::PREVIEW_FORMATS
       # the conversion video->mp4 is implemented in methods: convert_video_to_mp4_using_<video_conversion>
       #  -> conversion method is one of Generator::VIDEO_CONVERSION_METHODS
+      # @param src           [String]  source file path
+      # @param dst           [String]  destination file path
+      # @param options       [Options] All conversion options
+      # @param main_temp_dir [String]  Main temp folder, sub folder will be created for generation
+      # @param api_mime_type [String,nil] Optional mime type as provided by node api (or nil)
       def initialize(src, dst, options, main_temp_dir, api_mime_type)
         @source_file_path = src
         @destination_file_path = dst
@@ -54,7 +54,7 @@ module Aspera
         end
         @processing_method = @processing_method.to_sym
         Log.log.debug{"method: #{@processing_method}"}
-        Aspera.assert(respond_to?(@processing_method, true)){"no processing know for #{conversion_type} -> #{@preview_format_sym}"}
+        Aspera.assert(respond_to?(@processing_method, true)){"no processing known for #{conversion_type} -> #{@preview_format_sym}"}
       end
 
       # create preview as specified in constructor
@@ -215,7 +215,8 @@ module Aspera
 
       def convert_pdf_to_png(source_file_path=nil)
         source_file_path ||= @source_file_path
-        Utils.external_command(:convert, [
+        Utils.external_command(:magick, [
+          'convert',
           '-size', "x#{@options.thumb_img_size}",
           '-background', 'white',
           '-flatten',
@@ -224,7 +225,8 @@ module Aspera
       end
 
       def convert_image_to_png
-        Utils.external_command(:convert, [
+        Utils.external_command(:magick, [
+          'convert',
           '-auto-orient',
           '-thumbnail', "#{@options.thumb_img_size}x#{@options.thumb_img_size}>",
           '-quality', 95,
@@ -238,8 +240,9 @@ module Aspera
       # text to png
       def convert_plaintext_to_png
         # get 100 first lines of text file
-        first_lines = File.open(@source_file_path){|f|Array.new(100){f.readline rescue ''}.join}
-        Utils.external_command(:convert, [
+        first_lines = File.open(@source_file_path){ |f| Array.new(100){f.readline rescue ''}.join}
+        Utils.external_command(:magick, [
+          'convert',
           '-size', "#{@options.thumb_img_size}x#{@options.thumb_img_size}",
           'xc:white', # define canvas with background color (xc, or canvas) of preceding size
           '-font', @options.thumb_text_font,

data/lib/aspera/preview/options.rb

@@ -15,22 +15,22 @@ module Aspera
       # iw/ih : input width or height
       # -x : keep aspect ratio, having value a multiple of x
       DESCRIPTIONS = [
-        { name: :max_size,             default: 1 << 24,            description: 'maximum size (in bytes) of preview file' },
-        { name: :thumb_vid_scale,      default: "-1:'min(ih,100)'", description: 'png: video: size (ffmpeg scale argument)' },
-        { name: :thumb_vid_fraction,   default: 0.1,                description: 'png: video: time percent position of snapshot' },
-        { name: :thumb_img_size,       default: 800,                description: 'png: non-video: height (and width)' },
-        { name: :thumb_text_font,      default: 'Courier',          description: 'png: plaintext: font to render text with imagemagick convert (identify -list font)'},
-        { name: :video_conversion,     default: :reencode,          description: 'mp4: method for preview generation', values: VIDEO_CONVERSION_METHODS },
-        { name: :video_png_conv,       default: :fixed,             description: 'mp4: method for thumbnail generation', values: VIDEO_THUMBNAIL_METHODS },
-        { name: :video_scale,          default: "'min(iw,360)':-2", description: 'mp4: all: video scale (ffmpeg)' },
-        { name: :video_start_sec,      default: 10,                 description: 'mp4: all: start offset (seconds) of video preview' },
-        { name: :reencode_ffmpeg,      default: {},                 description: 'mp4: reencode: options to ffmpeg' },
-        { name: :blend_keyframes,      default: 30,                 description: 'mp4: blend: # key frames' },
-        { name: :blend_pauseframes,    default: 3,                  description: 'mp4: blend: # pause frames' },
-        { name: :blend_transframes,    default: 5,                  description: 'mp4: blend: # transition blend frames' },
-        { name: :blend_fps,            default: 15,                 description: 'mp4: blend: frame per second' },
-        { name: :clips_count,          default: 5,                  description: 'mp4: clips: number of clips' },
-        { name: :clips_length,         default: 5,                  description: 'mp4: clips: length in seconds of each clips' }
+        {name: :max_size,             default: 1 << 24,            description: 'maximum size (in bytes) of preview file'},
+        {name: :thumb_vid_scale,      default: "-1:'min(ih,100)'", description: 'png: video: size (ffmpeg scale argument)'},
+        {name: :thumb_vid_fraction,   default: 0.1,                description: 'png: video: time percent position of snapshot'},
+        {name: :thumb_img_size,       default: 800,                description: 'png: non-video: height (and width)'},
+        {name: :thumb_text_font,      default: 'Courier',          description: 'png: plaintext: font for text rendering: `magick identify -list font`'},
+        {name: :video_conversion,     default: :reencode,          description: 'mp4: method for preview generation', values: VIDEO_CONVERSION_METHODS},
+        {name: :video_png_conv,       default: :fixed,             description: 'mp4: method for thumbnail generation', values: VIDEO_THUMBNAIL_METHODS},
+        {name: :video_scale,          default: "'min(iw,360)':-2", description: 'mp4: all: video scale (ffmpeg scale argument)'},
+        {name: :video_start_sec,      default: 10,                 description: 'mp4: all: start offset (seconds) of video preview'},
+        {name: :reencode_ffmpeg,      default: {},                 description: 'mp4: reencode: options to ffmpeg'},
+        {name: :blend_keyframes,      default: 30,                 description: 'mp4: blend: # key frames'},
+        {name: :blend_pauseframes,    default: 3,                  description: 'mp4: blend: # pause frames'},
+        {name: :blend_transframes,    default: 5,                  description: 'mp4: blend: # transition blend frames'},
+        {name: :blend_fps,            default: 15,                 description: 'mp4: blend: frame per second'},
+        {name: :clips_count,          default: 5,                  description: 'mp4: clips: number of clips'},
+        {name: :clips_length,         default: 5,                  description: 'mp4: clips: length in seconds of each clips'}
       ].freeze
       # add accessors
       DESCRIPTIONS.each do |opt|

data/lib/aspera/preview/terminal.rb

@@ -44,13 +44,13 @@ module Aspera
           fit_term_ratio = [term_rows.to_f * font_ratio / image.rows.to_f, term_columns.to_f / image.columns.to_f].min
           height_ratio = double ? 2.0 : 1.0
           image = image.scale((image.columns * fit_term_ratio).to_i, (image.rows * fit_term_ratio * height_ratio / font_ratio).to_i)
-          # quantum depth is 8 or 16, see: `convert xc: -format "%q" info:`
+          # quantum depth is 8 or 16, see: `magick xc: -format "%q" info:`
           shift_for_8_bit = Magick::MAGICKCORE_QUANTUM_DEPTH - 8
           # get all pixel colors, adjusted for Rainbow
           pixel_colors = []
           image.each_pixel do |pixel, col, row|
             pixel_rgb = [pixel.red, pixel.green, pixel.blue]
-            pixel_rgb = pixel_rgb.map { |color| color >> shift_for_8_bit } unless shift_for_8_bit.eql?(0)
+            pixel_rgb = pixel_rgb.map{ |color| color >> shift_for_8_bit} unless shift_for_8_bit.eql?(0)
             # init 2-dim array
             pixel_colors[row] ||= []
             pixel_colors[row][col] = pixel_rgb
@@ -82,7 +82,7 @@ module Aspera
             size:                blob.length
             # width:               image.columns,
             # height:              image.rows
-          }.map { |k, v| "#{k}=#{v}" }.join(';')
+          }.map{ |k, v| "#{k}=#{v}"}.join(';')
           # \a is BEL, \e is ESC : https://github.com/ruby/ruby/blob/master/doc/syntax/literals.rdoc#label-Strings
           # escape sequence for iTerm2 image display
           return "\e]1337;File=#{arguments}:#{Base64.encode64(blob)}\a"
@@ -91,7 +91,7 @@ module Aspera
         # @return [Boolean] true if the terminal supports iTerm2 image display
         def iterm_supported?
           TERM_ENV_VARS.each do |env_var|
-            return true if ITERM_NAMES.any? { |term| ENV[env_var]&.include?(term) }
+            return true if ITERM_NAMES.any?{ |term| ENV[env_var]&.include?(term)}
           end
           false
         end

data/lib/aspera/preview/utils.rb

@@ -14,16 +14,20 @@ module Aspera
       # from bash manual: meta-character need to be escaped
       BASH_SPECIAL_CHARACTERS = "|&;()<> \t#\n"
       # external binaries used
-      EXTERNAL_TOOLS = %i[ffmpeg ffprobe convert composite optipng unoconv].freeze
+      EXTERNAL_TOOLS = %i[ffmpeg ffprobe magick optipng unoconv].freeze
       TEMP_FORMAT = 'img%04d.jpg'
+      FFMPEG_DEFAULT_PARAMS = [
+        '-y', # overwrite output without asking
+        '-loglevel', 'error' # show only errors and up
+      ].freeze
       private_constant :BASH_SPECIAL_CHARACTERS, :EXTERNAL_TOOLS, :TEMP_FORMAT
 
       class << self
         # returns string with single quotes suitable for bash if there is any bash meta-character
         def shell_quote(argument)
-          return argument unless argument.chars.any?{|c|BASH_SPECIAL_CHARACTERS.include?(c)}
+          return argument unless argument.chars.any?{ |c| BASH_SPECIAL_CHARACTERS.include?(c)}
           # surround with single quotes, and escape single quotes
-          return %Q{'#{argument.gsub("'"){|_s| %q{'"'"'}}}'}
+          return %Q{'#{argument.gsub("'"){ |_s| %q{'"'"'}}}'}
         end
 
         # check that external tools can be executed
@@ -32,7 +36,7 @@ module Aspera
           tools_to_check.delete(:unoconv) if skip_types.include?(:office)
           # Check for binaries
           tools_to_check.each do |command_sym|
-            external_command(command_sym, ['-h'])
+            external_command(command_sym, ['-h'], out: File::NULL)
           rescue Errno::ENOENT => e
             raise "missing #{command_sym} binary: #{e}"
           rescue
@@ -45,7 +49,7 @@ module Aspera
         # @return nil
         def external_command(command_sym, command_args)
           Aspera.assert_values(command_sym, EXTERNAL_TOOLS){'command'}
-          Environment.secure_execute(exec: command_sym.to_s, args: command_args.map(&:to_s))
+          Environment.secure_execute(exec: command_sym.to_s, args: command_args.map(&:to_s), out: File::NULL, err: File::NULL)
         end
 
         def external_capture(command_sym, command_args)
@@ -53,17 +57,11 @@ module Aspera
           return Environment.secure_capture(exec: command_sym.to_s, args: command_args.map(&:to_s))
         end
 
-        def ffmpeg(a)
-          Aspera.assert_type(a, Hash)
-          # input_file,input_args,output_file,output_args
-          a[:gl_p] ||= [
-            '-y', # overwrite output without asking
-            '-loglevel', 'error' # show only errors and up
-          ]
-          a[:in_p] ||= []
-          a[:out_p] ||= []
-          Aspera.assert(%i[gl_p in_f in_p out_f out_p].eql?(a.keys.sort)){"wrong params (#{a.keys.sort})"}
-          external_command(:ffmpeg, [a[:gl_p], a[:in_p], '-i', a[:in_f], a[:out_p], a[:out_f]].flatten)
+        def ffmpeg(gl_p: FFMPEG_DEFAULT_PARAMS, in_p: [], in_f:, out_p: [], out_f:)
+          Aspera.assert_type(gl_p, Array)
+          Aspera.assert_type(in_p, Array)
+          Aspera.assert_type(out_p, Array)
+          external_command(:ffmpeg, gl_p +  in_p + ['-i', in_f] + out_p + [out_f])
         end
 
         # @return Float in seconds
@@ -97,7 +95,7 @@ module Aspera
           1.upto(count) do |i|
             percent = i * 100 / (count + 1)
             filename = get_tmp_num_filepath(temp_folder, index1 + i)
-            external_command(:composite, ['-blend', percent, img2, img1, filename])
+            external_command(:magick, ['composite', '-blend', percent, img2, img1, filename])
           end
         end
 

data/lib/aspera/products/connect.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require 'aspera/environment'
+require 'singleton'
 
 module Aspera
   module Products
     class Connect
+      include Singleton
       APP_NAME = 'IBM Aspera Connect'
+
       class << self
         # standard folder locations
         def locations
@@ -40,9 +43,40 @@ module Aspera
             app_root: File.join(Dir.home, '.aspera', 'connect'),
             run_root: File.join(Dir.home, '.aspera', 'connect')
           }]
-          end.map { |i| i.merge({ expected: APP_NAME }) }
+          end.map{ |i| i.merge({expected: APP_NAME})}
+        end
+      end
+
+      def cdn_api
+        Rest.new(base_url: CDN_BASE_URL)
+      end
+
+      # retrieve structure from cloud (CDN) with all versions available
+      def versions
+        if @connect_versions.nil?
+          javascript = cdn_api.call(operation: 'GET', subpath: VERSION_INFO_FILE)
+          # get result on one line
+          connect_versions_javascript = javascript[:http].body.gsub(/\r?\n\s*/, '')
+          Log.log.debug{"javascript=[\n#{connect_versions_javascript}\n]"}
+          # get javascript object only
+          found = connect_versions_javascript.match(/^.*? = (.*);/)
+          raise Cli::Error, 'Problem when getting connect versions from internet' if found.nil?
+          all_data = JSON.parse(found[1])
+          @connect_versions = all_data['entries']
         end
+        return @connect_versions
       end
+
+      private
+
+      def initialize
+        @connect_versions = nil
+      end
+
+      VERSION_INFO_FILE = 'connectversions.js' # cspell: disable-line
+      CDN_BASE_URL = 'https://d3gcli72yxqn2z.cloudfront.net/connect'
+
+      private_constant :VERSION_INFO_FILE, :CDN_BASE_URL
     end
   end
 end

data/lib/aspera/products/{alpha.rb → desktop.rb}

@@ -4,8 +4,8 @@ require 'aspera/environment'
 
 module Aspera
   module Products
-    # Aspera Desktop Alpha Client
-    class Alpha
+    # Client Aspera for Desktop
+    class Desktop
       APP_NAME = 'IBM Aspera for Desktop'
       APP_IDENTIFIER = 'com.ibm.software.aspera.desktop'
       class << self
@@ -18,7 +18,7 @@ module Aspera
             sub_bin:  File.join('Contents', 'Resources', 'transferd', 'bin')
           }]
           else []
-          end.map { |i| i.merge({ expected: APP_NAME }) }
+          end.map{ |i| i.merge({expected: APP_NAME})}
         end
 
         def log_file

data/lib/aspera/products/transferd.rb

@@ -4,13 +4,18 @@ module Aspera
   module Products
     class Transferd
       APP_NAME = 'IBM Aspera Transfer Daemon'
+      V1_DAEMON_NAME = 'asperatransferd'
+      # from 1.1.5
+      V2_DAEMON_NAME = 'transferd'
+      # folders to extract from SDK archive
+      RUNTIME_FOLDERS = %w[bin lib sbin aspera].freeze
       class << self
         # standard folder locations
         def locations
           [{
             app_root: sdk_directory,
             sub_bin:  ''
-          }].map { |i| i.merge({ expected: APP_NAME }) }
+          }].map{ |i| i.merge({expected: APP_NAME})}
         end
 
         # location of SDK files
@@ -28,7 +33,9 @@ module Aspera
         end
 
         def transferd_path
-          return File.join(sdk_directory, Environment.exe_file('asperatransferd')) # cspell:disable-line
+          v1_path = File.join(sdk_directory, Environment.exe_file(V1_DAEMON_NAME))
+          return v1_path if File.exist?(v1_path)
+          return File.join(sdk_directory, Environment.exe_file(V2_DAEMON_NAME))
         end
 
         # Well, the port number is only in log file

data/lib/aspera/proxy_auto_config.rb

@@ -13,7 +13,7 @@ module URI
       def register_proxy_finder
         Aspera.assert(block_given?)
         # overload the method in URI : call user's provided block and fallback to original method
-        define_method(:find_proxy) {|env_vars=ENV| yield(to_s) || find_proxy_orig(env_vars)}
+        define_method(:find_proxy){ |env_vars=ENV| yield(to_s) || find_proxy_orig(env_vars)}
       end
     end
   end
@@ -70,7 +70,7 @@ END_OF_JAVASCRIPT
     end
 
     def register_uri_generic
-      URI::Generic.register_proxy_finder{|url_str|get_proxies(url_str).first}
+      URI::Generic.register_proxy_finder{ |url_str| get_proxies(url_str).first}
       # allow chaining
       return self
     end

data/lib/aspera/rest.rb

@@ -31,15 +31,18 @@ module Aspera
   class RestParameters
     include Singleton
 
-    attr_accessor :user_agent, :download_partial_suffix, :retry_on_error, :retry_sleep, :session_cb, :progress_bar
+    attr_accessor :user_agent, :download_partial_suffix, :retry_on_error, :retry_on_timeout, :retry_on_unavailable, :retry_max, :retry_sleep, :session_cb, :progress_bar
 
     private
 
     def initialize
       @user_agent = 'RubyAsperaRest'
       @download_partial_suffix = '.http_partial'
-      @retry_on_error = 0
-      @retry_sleep = nil
+      @retry_on_error = false
+      @retry_on_timeout = true
+      @retry_on_unavailable = true
+      @retry_max = 1
+      @retry_sleep = 4
       @session_cb = nil
       @progress_bar = nil
     end
@@ -57,12 +60,18 @@ module Aspera
     # error message when entity not found (TODO: use specific exception)
     ENTITY_NOT_FOUND = 'No such'
 
+    MIME_JSON = 'application/json'
+    MIME_WWW = 'application/x-www-form-urlencoded'
+    MIME_TEXT = 'text/plain'
+
     # Content-Type that are JSON
-    JSON_DECODE = ['application/json', 'application/vnd.api+json', 'application/x-javascript'].freeze
+    JSON_DECODE = [MIME_JSON, 'application/vnd.api+json', 'application/x-javascript'].freeze
+
+    UNAVAILABLE_CODES = ['503']
 
     class << self
       # @return [String] Basic auth token
-      def basic_token(user, pass); return "Basic #{Base64.strict_encode64("#{user}:#{pass}")}"; end
+      def basic_authorization(user, pass); return "Basic #{Base64.strict_encode64("#{user}:#{pass}")}"; end
 
       # Build a parameter list prefixed with "[]"
       # @param values [Array] list of values
@@ -98,7 +107,7 @@ module Aspera
             end
           end
         when Array
-          Aspera.assert(query.all?{|i| i.is_a?(Array) && i.length.eql?(2)}) {'Query must be array of arrays or 2 elements'}
+          Aspera.assert(query.all?{ |i| i.is_a?(Array) && i.length.eql?(2)}){'Query must be array of arrays or 2 elements'}
           query_array = query
         else
           raise "Query must be Hash or Array, not #{query.class}"
@@ -171,7 +180,7 @@ module Aspera
           one[1] = one[1].gsub(/\A"|"\z/, '')
           one
         end.to_h
-        { type: type.downcase, parameters: parameters }
+        {type: type.downcase, parameters: parameters}
       end
     end
 
@@ -189,6 +198,7 @@ module Aspera
 
     attr_reader :base_url
     attr_reader :auth_params
+    attr_reader :headers
 
     # @return creation parameters
     def params
@@ -238,7 +248,7 @@ module Aspera
       @http_session = nil
       @redirect_max = redirect_max
       Aspera.assert_type(@redirect_max, Integer)
-      @headers = headers
+      @headers = headers.clone
       Aspera.assert_type(@headers, Hash)
       @headers['User-Agent'] ||= RestParameters.instance.user_agent
       # OAuth object (created on demand)
@@ -249,7 +259,7 @@ module Aspera
     def oauth
       if @oauth.nil?
         Aspera.assert(@auth_params[:type].eql?(:oauth2)){'no OAuth defined'}
-        oauth_parameters = @auth_params.reject { |k, _v| k.eql?(:type) }
+        oauth_parameters = @auth_params.reject{ |k, _v| k.eql?(:type)}
         Log.log.debug{Log.dump('oauth parameters', oauth_parameters)}
         @oauth = OAuth::Factory.instance.create(**oauth_parameters)
       end
@@ -260,20 +270,20 @@ module Aspera
     # @param operation [String] HTTP operation (GET, POST, PUT, DELETE)
     # @param subpath [String] subpath of REST API
     # @param query [Hash] URL parameters
+    # @param content_type [String,nil] Type of body parameters (one of MIME_*) and serialization, else use headers
     # @param body [Hash, String] body parameters
-    # @param body_type [Symbol] type of body parameters (:json, :www, :text, nil)
+    # @param headers [Hash] additional headers (override Content-Type)
     # @param save_to_file (filepath)
     # @param return_error (bool)
-    # @param headers [Hash] additional headers
     def call(
       operation:,
       subpath: nil,
       query: nil,
+      content_type: nil,
       body: nil,
-      body_type: nil,
+      headers: nil,
       save_to_file: nil,
-      return_error: false,
-      headers: nil
+      return_error: false
     )
       subpath = subpath.to_s if subpath.is_a?(Symbol)
       subpath = '' if subpath.nil?
@@ -295,7 +305,7 @@ module Aspera
         Log.log.debug('using Basic auth')
         # done in build_req
       when :oauth2
-        headers['Authorization'] = oauth.token unless headers.key?('Authorization')
+        headers['Authorization'] = oauth.authorization unless headers.key?('Authorization')
       when :url
         query ||= {}
         @auth_params[:url_query].each do |key, value|
@@ -317,19 +327,18 @@ module Aspera
         rescue NameError
           raise "unsupported operation : #{operation}"
         end
-        case body_type
-        when :json
+        case content_type
+        when nil # ignore
+        when MIME_JSON
           req.body = JSON.generate(body) # , ascii_only: true
-          req['Content-Type'] = 'application/json'
-        when :www
+          req['Content-Type'] = MIME_JSON
+        when MIME_WWW
           req.body = URI.encode_www_form(body)
-          req['Content-Type'] = 'application/x-www-form-urlencoded'
-        when :text
+          req['Content-Type'] = MIME_WWW
+        when MIME_TEXT
           req.body = body
-          req['Content-Type'] = 'text/plain'
-        when nil
-        else
-          raise "unsupported body type : #{body_type}"
+          req['Content-Type'] = MIME_TEXT
+        else Aspera.error_unexpected_value(content_type){'body type'}
         end
         # set headers
         headers.each do |key, value|
@@ -338,10 +347,8 @@ module Aspera
         # :type = :basic
         req.basic_auth(@auth_params[:username], @auth_params[:password]) if @auth_params[:type].eql?(:basic)
         Log.log.trace1{Log.dump(:req_body, req.body)}
-        # we try the call, and will retry only if oauth, as we can, first with refresh, and then re-auth if refresh is bad
-        oauth_tries ||= 2
-        timeout_tries ||= 5
-        general_tries ||= 1 + RestParameters.instance.retry_on_error
+        # we try the call, and will retry on some error types
+        error_tries ||= 1 + RestParameters.instance.retry_max
         # initialize with number of initial retries allowed, nil gives zero
         tries_remain_redirect = @redirect_max if tries_remain_redirect.nil?
         Log.log.debug("send request (retries=#{tries_remain_redirect})")
@@ -350,7 +357,7 @@ module Aspera
         # make http request (pipelined)
         http_session.request(req) do |response|
           result[:http] = response
-          result_mime = self.class.parse_header(result[:http]['Content-Type'] || 'text/plain')[:type]
+          result_mime = self.class.parse_header(result[:http]['Content-Type'] || MIME_TEXT)[:type]
           # JSON data needs to be parsed, in case it contains an error code
           if !save_to_file.nil? &&
               result[:http].code.to_s.start_with?('2') &&
@@ -394,7 +401,7 @@ module Aspera
         when *JSON_DECODE
           result[:data] = JSON.parse(result[:http].body) rescue result[:http].body
           Log.log.debug{Log.dump('result_data', result[:data])}
-        else # when 'text/plain'
+        else # when MIME_TEXT
           result[:data] = result[:http].body
         end
         RestErrorAnalyzer.instance.raise_on_error(req, result)
@@ -402,25 +409,27 @@ module Aspera
       rescue RestCallError => e
         do_retry = false
         # AoC have some timeout , like Connect to platform.bss.asperasoft.com:443 ...
-        do_retry = true if e.response.body.include?('failed: connect timed out') && (timeout_tries -= 1).positive?
+        do_retry ||= true if e.response.body.include?('failed: connect timed out') && RestParameters.instance.retry_on_timeout
+        # AoC sometimes not available
+        do_retry ||= true if RestParameters.instance.retry_on_unavailable && UNAVAILABLE_CODES.include?(result[:http].code.to_s)
         # possibility to retry anything if it fails
-        do_retry = true if (general_tries -= 1).positive?
+        do_retry ||= true if RestParameters.instance.retry_on_error
         # not authorized: oauth token expired
         if @not_auth_codes.include?(result[:http].code.to_s) && @auth_params[:type].eql?(:oauth2)
           begin
             # try to use refresh token
-            req['Authorization'] = oauth.token(refresh: true)
+            req['Authorization'] = oauth.authorization(refresh: true)
           rescue RestCallError => e_tok
             e = e_tok
             Log.log.error('refresh failed'.bg_red)
             # regenerate a brand new token
-            req['Authorization'] = oauth.token(refresh: true)
+            req['Authorization'] = oauth.authorization(cache: false)
           end
           Log.log.debug{"using new token=#{headers['Authorization']}"}
-          do_retry = true if (oauth_tries -= 1).positive?
+          do_retry ||= true
         end
-        if do_retry
-          sleep(RestParameters.instance.retry_sleep) unless RestParameters.instance.retry_sleep.nil?
+        if do_retry && (error_tries -= 1).positive?
+          sleep(RestParameters.instance.retry_sleep) unless RestParameters.instance.retry_sleep.eql?(0)
           retry
         end
         # redirect ? (any code beginning with 3)
@@ -436,7 +445,7 @@ module Aspera
           end
           # forwards the request to the new location
           return self.class.new(base_url: new_url, redirect_max: tries_remain_redirect).call(
-            operation: operation, query: query, body: body, body_type: body_type,
+            operation: operation, query: query, body: body, content_type: content_type,
             save_to_file: save_to_file, return_error: return_error, headers: headers)
         end
         # raise exception if could not retry and not return error in result
@@ -452,23 +461,23 @@ module Aspera
     #
 
     def create(subpath, params)
-      return call(operation: 'POST', subpath: subpath, headers: {'Accept' => 'application/json'}, body: params, body_type: :json)[:data]
+      return call(operation: 'POST', subpath: subpath, headers: {'Accept' => MIME_JSON}, body: params, content_type: MIME_JSON)[:data]
     end
 
     def read(subpath, query=nil)
-      return call(operation: 'GET', subpath: subpath, headers: {'Accept' => 'application/json'}, query: query)[:data]
+      return call(operation: 'GET', subpath: subpath, headers: {'Accept' => MIME_JSON}, query: query)[:data]
     end
 
     def update(subpath, params)
-      return call(operation: 'PUT', subpath: subpath, headers: {'Accept' => 'application/json'}, body: params, body_type: :json)[:data]
+      return call(operation: 'PUT', subpath: subpath, headers: {'Accept' => MIME_JSON}, body: params, content_type: MIME_JSON)[:data]
     end
 
     def delete(subpath, params=nil)
-      return call(operation: 'DELETE', subpath: subpath, headers: {'Accept' => 'application/json'}, query: params)[:data]
+      return call(operation: 'DELETE', subpath: subpath, headers: {'Accept' => MIME_JSON}, query: params)[:data]
     end
 
     def cancel(subpath)
-      return call(operation: 'CANCEL', subpath: subpath, headers: {'Accept' => 'application/json'})[:data]
+      return call(operation: 'CANCEL', subpath: subpath, headers: {'Accept' => MIME_JSON})[:data]
     end
 
     # Query entity by general search (read with parameter `q`)
@@ -490,11 +499,11 @@ module Aspera
       else
         # multiple case insensitive partial matches, try case insensitive full match
         # (anyway AoC does not allow creation of 2 entities with same case insensitive name)
-        name_matches = matching_items.select{|i|i['name'].casecmp?(search_name)}
+        name_matches = matching_items.select{ |i| i['name'].casecmp?(search_name)}
         case name_matches.length
         when 1 then return name_matches.first
-        when 0 then raise %Q(#{subpath}: multiple case insensitive partial match for: "#{search_name}": #{matching_items.map{|i|i['name']}} but no case insensitive full match. Please be more specific or give exact name.) # rubocop:disable Layout/LineLength
-        else raise "Two entities cannot have the same case insensitive name: #{name_matches.map{|i|i['name']}}"
+        when 0 then raise %Q(#{subpath}: multiple case insensitive partial match for: "#{search_name}": #{matching_items.map{ |i| i['name']}} but no case insensitive full match. Please be more specific or give exact name.) # rubocop:disable Layout/LineLength
+        else raise "Two entities cannot have the same case insensitive name: #{name_matches.map{ |i| i['name']}}"
         end
       end
     end

data/lib/aspera/rest_errors_aspera.rb

@@ -35,7 +35,7 @@ module Aspera
           d_t_s.each do |res|
             r_err = res.dig(*%w[transfer_spec error]) || res['error']
             next unless r_err.is_a?(Hash)
-            RestErrorAnalyzer.add_error(call_context, type, "#{r_err['code']}: #{r_err['reason']}: #{r_err['user_message']}")
+            RestErrorAnalyzer.add_error(call_context, type, r_err.values.join(': '))
           end
         end
         RestErrorAnalyzer.instance.add_simple_handler(name: 'T9:IBM cloud IAM', path: ['errorMessage'])