aspera-cli 4.11.0 → 4.12.0

data/lib/aspera/fasp/agent_connect.rb

@@ -9,28 +9,28 @@ require 'tty-spinner'
 module Aspera
   module Fasp
     class AgentConnect < Aspera::Fasp::AgentBase
-      MAX_CONNECT_START_RETRY = 4
+      CONNECT_START_URIS = ['fasp://initialize', 'fasp://initialize', 'aspera-drive://initialize', 'https://test-connect.ibmaspera.com/']
       SLEEP_SEC_BETWEEN_RETRY = 3
-      private_constant :MAX_CONNECT_START_RETRY, :SLEEP_SEC_BETWEEN_RETRY
+      private_constant :CONNECT_START_URIS, :SLEEP_SEC_BETWEEN_RETRY
       def initialize(_options)
         super()
         @connect_settings = {
           'app_id' => SecureRandom.uuid
         }
         raise 'Using connect requires a graphical environment' if !OpenApplication.default_gui_mode.eql?(:graphical)
-        trynumber = 0
+        method_index = 0
         begin
           connect_url = Installation.instance.connect_uri
           Log.log.debug{"found: #{connect_url}"}
           @connect_api = Rest.new({base_url: "#{connect_url}/v5/connect", headers: {'Origin' => Rest.user_agent}}) # could use v6 also now
-          cinfo = @connect_api.read('info/version')[:data]
-          Log.log.info('Connect was reached') if trynumber > 0
-          Log.dump(:connect_version, cinfo)
+          connect_info = @connect_api.read('info/version')[:data]
+          Log.log.info('Connect was reached') if method_index > 0
+          Log.dump(:connect_version, connect_info)
         rescue StandardError => e # Errno::ECONNREFUSED
-          raise StandardError, "Unable to start connect #{trynumber} times" if trynumber >= MAX_CONNECT_START_RETRY
-          Log.log.warn{"Aspera Connect is not started (#{e}). Trying to start it ##{trynumber}..."}
-          trynumber += 1
-          start_url = trynumber <= 2 ? 'fasp://initialize' : 'https://test-connect.ibmaspera.com/'
+          start_url = CONNECT_START_URIS[method_index]
+          method_index += 1
+          raise StandardError, "Unable to start connect #{method_index} times" if start_url.nil?
+          Log.log.warn{"Aspera Connect is not started (#{e}). Trying to start it ##{method_index}..."}
           if !OpenApplication.uri_graphical(start_url)
             OpenApplication.uri_graphical('https://downloads.asperasoft.com/connect2/')
             raise StandardError, 'Connect is not installed'
@@ -40,17 +40,17 @@ module Aspera
         end
       end
 
-      def start_transfer(transfer_spec)
+      def start_transfer(transfer_spec, token_regenerator: nil)
         if transfer_spec['direction'] == 'send'
           Log.log.warn{"Connect requires upload selection using GUI, ignoring #{transfer_spec['paths']}".red}
           transfer_spec.delete('paths')
-          resdata = @connect_api.create('windows/select-open-file-dialog/', {
+          selection = @connect_api.create('windows/select-open-file-dialog/', {
             'aspera_connect_settings' => @connect_settings,
             'title'                   => 'Select Files',
             'suggestedName'           => '',
             'allowMultipleSelection'  => true,
             'allowedFileTypes'        => ''})[:data]
-          transfer_spec['paths'] = resdata['dataTransfer']['files'].map { |i| {'source' => i['name']}}
+          transfer_spec['paths'] = selection['dataTransfer']['files'].map { |i| {'source' => i['name']}}
         end
         @request_id = SecureRandom.uuid
         # if there is a token, we ask connect client to use well known ssh private keys
@@ -77,13 +77,13 @@ module Aspera
           loop do
             tr_info = @connect_api.create("transfers/info/#{@xfer_id}", connect_activity_args)[:data]
             if tr_info['transfer_info'].is_a?(Hash)
-              trdata = tr_info['transfer_info']
-              if trdata.nil?
+              transfer = tr_info['transfer_info']
+              if transfer.nil?
                 Log.log.warn('no session in Connect')
                 break
               end
               # TODO: get session id
-              case trdata['status']
+              case transfer['status']
               when 'completed'
                 notify_end(@connect_settings['app_id'])
                 break
@@ -92,22 +92,22 @@ module Aspera
                   spinner = TTY::Spinner.new('[:spinner] :title', format: :classic)
                   spinner.start
                 end
-                spinner.update(title: trdata['status'])
+                spinner.update(title: transfer['status'])
                 spinner.spin
               when 'running'
-                # puts "running: sessions:#{trdata['sessions'].length}, #{trdata['sessions'].map{|i| i['bytes_transferred']}.join(',')}"
-                if !started && (trdata['bytes_expected'] != 0)
+                # puts "running: sessions:#{transfer['sessions'].length}, #{transfer['sessions'].map{|i| i['bytes_transferred']}.join(',')}"
+                if !started && (transfer['bytes_expected'] != 0)
                   spinner&.success
-                  notify_begin(@connect_settings['app_id'], trdata['bytes_expected'])
+                  notify_begin(@connect_settings['app_id'], transfer['bytes_expected'])
                   started = true
                 else
-                  notify_progress(@connect_settings['app_id'], trdata['bytes_written'])
+                  notify_progress(@connect_settings['app_id'], transfer['bytes_written'])
                 end
               when 'failed'
                 spinner&.error
-                raise Fasp::Error, trdata['error_desc']
+                raise Fasp::Error, transfer['error_desc']
               else
-                raise Fasp::Error, "unknown status: #{trdata['status']}: #{trdata['error_desc']}"
+                raise Fasp::Error, "unknown status: #{transfer['status']}: #{transfer['error_desc']}"
               end
             end
             sleep(1)

data/lib/aspera/fasp/agent_direct.rb

@@ -24,6 +24,7 @@ module Aspera
         wss:               true, # true: if both SSH and wss in ts: prefer wss
         multi_incr_udp:    true,
         resume:            {},
+        ascp_args:         [],
         quiet:             true # by default no interactive progress bar
       }.freeze
       private_constant :DEFAULT_OPTIONS
@@ -31,7 +32,7 @@ module Aspera
       # start ascp transfer (non blocking), single or multi-session
       # job information added to @jobs
       # @param transfer_spec [Hash] aspera transfer specification
-      def start_transfer(transfer_spec)
+      def start_transfer(transfer_spec, token_regenerator: nil)
         the_job_id = SecureRandom.uuid
         # clone transfer spec because we modify it (first level keys)
         transfer_spec = transfer_spec.clone
@@ -52,7 +53,7 @@ module Aspera
         if transfer_spec.key?('token') &&
             !transfer_spec.key?('remote_password') &&
             !transfer_spec.key?('EX_ssh_key_paths')
-          # transfer_spec['remote_password'] = Installation.instance.bypass_pass # not used
+          # transfer_spec['remote_password'] = Installation.instance.bypass_pass # not used: no passphrase
           transfer_spec['EX_ssh_key_paths'] = Installation.instance.bypass_keys
         end
 
@@ -69,7 +70,7 @@ module Aspera
             Log.log.error{"multi_session(#{transfer_spec['multi_session']}) shall be integer >= 0"}
             multi_session_info = nil
           elsif multi_session_info[:count].eql?(0)
-            Log.log.debug('multi_session count is zero: no multisession')
+            Log.log.debug('multi_session count is zero: no multi session')
             multi_session_info = nil
           elsif @options[:multi_incr_udp] # multi_session_info[:count] > 0
             # if option not true: keep default udp port for all sessions
@@ -81,7 +82,7 @@ module Aspera
         end
 
         # compute known args
-        env_args = Parameters.ts_to_env_args(transfer_spec, wss: @options[:wss])
+        env_args = Parameters.ts_to_env_args(transfer_spec, wss: @options[:wss], ascp_args: @options[:ascp_args])
 
         # add fallback cert and key as arguments if needed
         if %w[1 force].include?(transfer_spec['http_fallback'])
@@ -99,11 +100,12 @@ module Aspera
 
         # generic session information
         session = {
-          thread:   nil,         # Thread object monitoring management port, not nil when pushed to :sessions
-          error:    nil,         # exception if failed
-          io:       nil,         # management port server socket
-          id:       nil,         # SessionId from INIT message in mgt port
-          env_args: env_args     # env vars and args to ascp (from transfer spec)
+          thread:            nil,               # Thread object monitoring management port, not nil when pushed to :sessions
+          error:             nil,               # exception if failed
+          io:                nil,               # management port server socket
+          id:                nil,               # SessionId from INIT message in mgt port
+          token_regenerator: token_regenerator, # regenerate bearer token with oauth
+          env_args:          env_args           # env vars and args to ascp (from transfer spec)
         }
 
         if multi_session_info.nil?
@@ -261,10 +263,10 @@ module Aspera
               Log.log.error{"code: #{last_status_event['Code']}"}
               if /bearer token/i.match?(last_status_event['Description'])
                 Log.log.error('need to regenerate token'.red)
-                if !@token_regenerator.nil?
+                if session[:token_regenerator].respond_to?(:refreshed_transfer_token)
                   # regenerate token here, expired, or error on it
                   # Note: in multi-session, each session will have a different one.
-                  env_args[:env]['ASPERA_SCP_TOKEN'] = @token_regenerator.call(true)
+                  env_args[:env]['ASPERA_SCP_TOKEN'] = session[:token_regenerator].refreshed_transfer_token
                 end
               end
               # cannot resolve address
@@ -327,8 +329,6 @@ module Aspera
         session[:io].puts(command)
       end
 
-      attr_writer :token_regenerator
-
       private
 
       # @param options : keys(symbol): see DEFAULT_OPTIONS
@@ -349,7 +349,6 @@ module Aspera
         end
         Log.log.debug{"local options= #{options}"}
         @resume_policy = ResumePolicy.new(@options[:resume].symbolize_keys)
-        @token_regenerator = nil
       end
 
       # transfer thread entry

data/lib/aspera/fasp/agent_httpgw.rb

@@ -18,9 +18,10 @@ module Aspera
       # message returned by HTTP GW in case of success
       MSG_END_UPLOAD = 'end upload'
       MSG_END_SLICE = 'end_slice_upload'
+      # options available in CLI (transfer_info)
       DEFAULT_OPTIONS = {
         url:                    nil,
-        upload_chunksize:       64_000,
+        upload_chunk_size:      64_000,
         upload_bar_refresh_sec: 0.5
       }.freeze
       DEFAULT_BASE_PATH = '/aspera/http-gwy'
@@ -142,21 +143,21 @@ module Aspera
           file_size = item['file_size']
           file_name = File.basename(item[item['destination'].nil? ? 'source' : 'destination'])
           # compute total number of slices
-          numslices = ((file_size - 1) / @options[:upload_chunksize]) + 1
+          slice_total = ((file_size - 1) / @options[:upload_chunk_size]) + 1
           File.open(source_paths[file_index]) do |file|
             # current slice index
-            slicenum = 0
+            slice_index = 0
             until file.eof?
-              data = file.read(@options[:upload_chunksize])
+              data = file.read(@options[:upload_chunk_size])
               slice_data = {
                 name:         file_name,
                 type:         file_mime_type,
                 size:         file_size,
-                slice:        slicenum,
-                total_slices: numslices,
+                slice:        slice_index,
+                total_slices: slice_total,
                 fileIndex:    file_index
               }
-              # Log.dump(:slice_data,slice_data) #if slicenum.eql?(0)
+              # Log.dump(:slice_data,slice_data) #if slice_index.eql?(0)
               # interrupt main thread if read thread failed
               raise shared_info[:read_exception] unless shared_info[:read_exception].nil?
               begin
@@ -164,22 +165,22 @@ module Aspera
                   slice_data[:data] = Base64.strict_encode64(data)
                   ws_snd_json(slice_upload: slice_data)
                 else
-                  ws_snd_json(slice_upload: slice_data) if slicenum.eql?(0)
+                  ws_snd_json(slice_upload: slice_data) if slice_index.eql?(0)
                   ws_send(data, type: :binary)
-                  Log.log.debug{"ws: sent buffer: #{file_index} / #{slicenum}"}
-                  ws_snd_json(slice_upload: slice_data) if slicenum.eql?(numslices - 1)
+                  Log.log.debug{"ws: sent buffer: #{file_index} / #{slice_index}"}
+                  ws_snd_json(slice_upload: slice_data) if slice_index.eql?(slice_total - 1)
                 end
               rescue Errno::EPIPE => e
                 raise shared_info[:read_exception] unless shared_info[:read_exception].nil?
                 raise e
               end
               sent_bytes += data.length
-              currenttime = Time.now
-              if last_progress_time.nil? || ((currenttime - last_progress_time) > @options[:upload_bar_refresh_sec])
+              current_time = Time.now
+              if last_progress_time.nil? || ((current_time - last_progress_time) > @options[:upload_bar_refresh_sec])
                 notify_progress(session_id, sent_bytes)
-                last_progress_time = currenttime
+                last_progress_time = current_time
               end
-              slicenum += 1
+              slice_index += 1
             end
           end
           file_index += 1
@@ -201,14 +202,14 @@ module Aspera
         # is normally provided by application, like package name
         if !transfer_spec.key?('download_name')
           # by default it is the name of first file
-          dname = File.basename(transfer_spec['paths'].first['source'])
+          download_name = File.basename(transfer_spec['paths'].first['source'])
           # we remove extension
-          dname = dname.gsub(/\.@gw_api.*$/, '')
+          download_name = download_name.gsub(/\.@gw_api.*$/, '')
           # ands add indication of number of files if there is more than one
           if transfer_spec['paths'].length > 1
-            dname += " #{transfer_spec['paths'].length} Files"
+            download_name += " #{transfer_spec['paths'].length} Files"
           end
-          transfer_spec['download_name'] = dname
+          transfer_spec['download_name'] = download_name
         end
         creation = @gw_api.create('v1/download', {'transfer_spec' => transfer_spec})[:data]
         transfer_uuid = creation['url'].split('/').last
@@ -227,7 +228,7 @@ module Aspera
       # start FASP transfer based on transfer spec (hash table)
       # note that it is asynchronous
       # HTTP download only supports file list
-      def start_transfer(transfer_spec)
+      def start_transfer(transfer_spec, token_regenerator: nil)
         raise 'GW URL must be set' if @gw_api.nil?
         raise 'paths: must be Array' unless transfer_spec['paths'].is_a?(Array)
         raise 'only token based transfer is supported in GW' unless transfer_spec['token'].is_a?(String)

data/lib/aspera/fasp/agent_node.rb

@@ -23,8 +23,8 @@ module Aspera
         rest_params = { base_url: options[:url]}
         if /^Bearer /.match?(options[:password])
           rest_params[:headers] = {
-            Aspera::Node::X_ASPERA_ACCESSKEY => options[:username],
-            'Authorization'                  => options[:password]
+            Aspera::Node::HEADER_X_ASPERA_ACCESS_KEY => options[:username],
+            'Authorization'                          => options[:password]
           }
           raise 'root_id is required for access key' if @root_id.nil?
         else
@@ -56,7 +56,7 @@ module Aspera
       end
 
       # generic method
-      def start_transfer(transfer_spec)
+      def start_transfer(transfer_spec, token_regenerator: nil)
         # add root id if access key
         if !@root_id.nil?
           case transfer_spec['direction']
@@ -79,7 +79,7 @@ module Aspera
         if transfer_spec['tags'].is_a?(Hash) && transfer_spec['tags']['aspera'].is_a?(Hash)
           transfer_spec['tags']['aspera']['xfer_retry'] ||= 150
         end
-        # Optimisation in case of sending to the same node (TODO: probably remove this, as /etc/hosts shall be used for that)
+        # Optimization in case of sending to the same node (TODO: probably remove this, as /etc/hosts shall be used for that)
         if !transfer_spec['wss_enabled'] && transfer_spec['remote_host'].eql?(URI.parse(node_api_.params[:base_url]).host)
           transfer_spec['remote_host'] = '127.0.0.1'
         end
@@ -96,8 +96,8 @@ module Aspera
         # lets emulate management events to display progress bar
         loop do
           # status is empty sometimes with status 200...
-          trdata = node_api_.read("ops/transfers/#{@transfer_id}")[:data] || {'status' => 'unknown'} rescue {'status' => 'waiting(read error)'}
-          case trdata['status']
+          transfer_data = node_api_.read("ops/transfers/#{@transfer_id}")[:data] || {'status' => 'unknown'} rescue {'status' => 'waiting(read error)'}
+          case transfer_data['status']
           when 'completed'
             notify_end(@transfer_id)
             break
@@ -106,21 +106,19 @@ module Aspera
               spinner = TTY::Spinner.new('[:spinner] :title', format: :classic)
               spinner.start
             end
-            spinner.update(title: trdata['status'])
+            spinner.update(title: transfer_data['status'])
             spinner.spin
-            # puts trdata
           when 'running'
-            # puts "running: sessions:#{trdata["sessions"].length}, #{trdata["sessions"].map{|i| i['bytes_transferred']}.join(',')}"
-            if !started && trdata['precalc'].is_a?(Hash) &&
-                trdata['precalc']['status'].eql?('ready')
-              notify_begin(@transfer_id, trdata['precalc']['bytes_expected'])
+            if !started && transfer_data['precalc'].is_a?(Hash) &&
+                transfer_data['precalc']['status'].eql?('ready')
+              notify_begin(@transfer_id, transfer_data['precalc']['bytes_expected'])
               started = true
             else
-              notify_progress(@transfer_id, trdata['bytes_transferred'])
+              notify_progress(@transfer_id, transfer_data['bytes_transferred'])
             end
           else
-            Log.log.warn{"trdata -> #{trdata}"}
-            raise Fasp::Error, "#{trdata['status']}: #{trdata['error_desc']}"
+            Log.log.warn{"transfer_data -> #{transfer_data}"}
+            raise Fasp::Error, "#{transfer_data['status']}: #{transfer_data['error_desc']}"
           end
           sleep(1)
         end

data/lib/aspera/fasp/agent_trsdk.rb

@@ -58,7 +58,7 @@ module Aspera
         end
       end
 
-      def start_transfer(transfer_spec)
+      def start_transfer(transfer_spec, token_regenerator: nil)
         # create a transfer request
         transfer_request = Transfersdk::TransferRequest.new(
           transferType: Transfersdk::TransferType::FILE_REGULAR, # transfer type (file/stream)

data/lib/aspera/fasp/installation.rb

@@ -128,7 +128,7 @@ module Aspera
       FILES = %i[ascp ascp4 ssh_bypass_key_dsa ssh_bypass_key_rsa aspera_license aspera_conf fallback_cert fallback_key].freeze
 
       # get path of one resource file of currently activated product
-      # keys and certs are generated locally... (they are well known values, arch. independant)
+      # keys and certs are generated locally... (they are well known values, arch. independent)
       def path(k)
         case k
         when :ascp, :ascp4
@@ -182,7 +182,7 @@ module Aspera
       # @return the file path of local connect where API's URI can be read
       def connect_uri
         connect = get_product_folders(PRODUCT_CONNECT)
-        folder = File.join(connect[:run_root], VARRUN_SUBFOLDER)
+        folder = File.join(connect[:run_root], VAR_RUN_SUBFOLDER)
         ['', 's'].each do |ext|
           uri_file = File.join(folder, "http#{ext}.uri")
           Log.log.debug{"checking connect port file: #{uri_file}"}
@@ -264,7 +264,7 @@ module Aspera
           end
         end
         File.unlink(sdk_zip_path) rescue nil # Windows may give error
-        # ensure license file are generated so that ascp invokation for version works
+        # ensure license file are generated so that ascp invocation for version works
         path(:aspera_license)
         path(:aspera_conf)
         ascp_path = File.join(sdk_folder, ascp_filename)
@@ -285,13 +285,13 @@ module Aspera
 
       BIN_SUBFOLDER = 'bin'
       ETC_SUBFOLDER = 'etc'
-      VARRUN_SUBFOLDER = File.join('var', 'run')
+      VAR_RUN_SUBFOLDER = File.join('var', 'run')
       # product information manifest: XML (part of aspera product)
       PRODUCT_INFO = 'product-info.mf'
       # policy for product selection
       FIRST_FOUND = 'FIRST'
 
-      private_constant :BIN_SUBFOLDER, :ETC_SUBFOLDER, :VARRUN_SUBFOLDER, :PRODUCT_INFO
+      private_constant :BIN_SUBFOLDER, :ETC_SUBFOLDER, :VAR_RUN_SUBFOLDER, :PRODUCT_INFO
 
       def initialize
         @path_to_ascp = nil

data/lib/aspera/fasp/listener.rb

@@ -2,7 +2,7 @@
 
 module Aspera
   module Fasp
-    # imlement this class to get transfer events
+    # implement this class to get transfer events
     class Listener # rubocop:disable Lint/EmptyClass
       # define one of the following methods:
       # event_text(text_data)

data/lib/aspera/fasp/parameters.rb

@@ -18,8 +18,9 @@ module Aspera
       SUPPORTED_AGENTS = %i[direct node connect].freeze
       # Short names of columns in manual
       SUPPORTED_AGENTS_SHORT = SUPPORTED_AGENTS.map{|a|a.to_s[0].to_sym}
+      FILE_LIST_OPTIONS = ['--file-list', '--file-pair-list'].freeze
 
-      private_constant :SUPPORTED_AGENTS
+      private_constant :SUPPORTED_AGENTS, :FILE_LIST_OPTIONS
 
       class << self
         # Temp folder for file lists, must contain only file lists
@@ -40,34 +41,34 @@ module Aspera
         # @return a table suitable to display in manual
         def man_table(to_text: true)
           result = []
-          description.each do |k, i|
-            param = {name: k, type: [i[:accepted_types]].flatten.join(','), description: i[:desc]}
+          description.each do |name, options|
+            param = {name: name, type: [options[:accepted_types]].flatten.join(','), description: options[:desc]}
             # add flags for supported agents in doc
             SUPPORTED_AGENTS.each do |a|
-              param[a.to_s[0].to_sym] = i[:tragents].nil? || i[:tragents].include?(a) ? 'Y' : ''
+              param[a.to_s[0].to_sym] = options[:agents].nil? || options[:agents].include?(a) ? 'Y' : ''
             end
             # only keep lines that are usable in supported agents
             next if SUPPORTED_AGENTS_SHORT.inject(true){|m, j|m && param[j].empty?}
             param[:cli] =
-              case i[:cltype]
-              when :envvar then 'env:' + i[:clvarname]
-              when :opt_without_arg then i[:clswitch]
+              case options[:cli][:type]
+              when :envvar then 'env:' + options[:cli][:variable]
+              when :opt_without_arg then options[:cli][:switch]
               when :opt_with_arg
-                values = if i.key?(:enum)
+                values = if options.key?(:enum)
                   ['enum']
-                elsif i[:accepted_types].is_a?(Array)
-                  i[:accepted_types]
-                elsif !i[:accepted_types].nil?
-                  [i[:accepted_types]]
+                elsif options[:accepted_types].is_a?(Array)
+                  options[:accepted_types]
+                elsif !options[:accepted_types].nil?
+                  [options[:accepted_types]]
                 else
                   raise "error: #{param}"
                 end.map{|n|"{#{n}}"}.join('|')
-                conv = i.key?(:clconvert) ? '(conversion)' : ''
-                "#{i[:clswitch]} #{conv}#{values}"
+                conv = options[:cli].key?(:convert) ? '(conversion)' : ''
+                "#{options[:cli][:switch]} #{conv}#{values}"
               else ''
               end
-            if i.key?(:enum)
-              param[:description] += "\nAllowed values: #{i[:enum].join(', ')}"
+            if options.key?(:enum)
+              param[:description] += "\nAllowed values: #{options[:enum].join(', ')}"
             end
             param[:description] = param[:description].gsub('&sol;', '/') if to_text
             result.push(param)
@@ -75,24 +76,27 @@ module Aspera
           return result
         end
 
-        # special encoding methods used in YAML (key: :clconvert)
-        def clconv_remove_hyphen(v); v.tr('-', ''); end
+        # special encoding methods used in YAML (key: :convert)
+        def convert_remove_hyphen(v); v.tr('-', ''); end
 
-        # special encoding methods used in YAML (key: :clconvert)
-        def clconv_json64(v); Base64.strict_encode64(JSON.generate(v)); end
+        # special encoding methods used in YAML (key: :convert)
+        def convert_json64(v); Base64.strict_encode64(JSON.generate(v)); end
 
-        # special encoding methods used in YAML (key: :clconvert)
-        def clconv_base64(v); Base64.strict_encode64(v); end
+        # special encoding methods used in YAML (key: :convert)
+        def convert_base64(v); Base64.strict_encode64(v); end
 
         # file list is provided directly with ascp arguments
-        def ts_has_ascp_file_list(ts)
-          (ts['EX_ascp_args'].is_a?(Array) && ['--file-list', '--file-pair-list'].any?{|i|ts['EX_ascp_args'].include?(i)}) ||
+        def ts_has_ascp_file_list(ts, ascp_args)
+          # it can also be option transfer_info
+          ascp_args = ascp_args['ascp_args'] if ascp_args.is_a?(Hash)
+          (ts['EX_ascp_args'].is_a?(Array) && ts['EX_ascp_args'].any?{|i|FILE_LIST_OPTIONS.include?(i)}) ||
+            (ascp_args.is_a?(Array) && ascp_args.any?{|i|FILE_LIST_OPTIONS.include?(i)}) ||
             ts.key?('EX_file_list') ||
             ts.key?('EX_file_pair_list')
         end
 
-        def ts_to_env_args(transfer_spec, options)
-          return Parameters.new(transfer_spec, options).ascp_args
+        def ts_to_env_args(transfer_spec, wss:, ascp_args:)
+          return Parameters.new(transfer_spec, wss: wss, ascp_args: ascp_args).ascp_args
         end
 
         # temp file list files are created here
@@ -107,29 +111,32 @@ module Aspera
         attr_reader :file_list_folder
       end # self
 
-      # @param options [Hash] key: :wss: bool
-      def initialize(job_spec, options)
+      # @param options [Hash] key: :wss: bool, :ascp_args: array of strings
+      def initialize(job_spec, wss:, ascp_args:)
         @job_spec = job_spec
-        @options = options
+        @opt_wss = wss
+        @opt_args = ascp_args
+        Log.log.debug{"agent options: #{@opt_wss} #{@opt_args}"}
+        raise 'ascp args must be an Array' unless @opt_args.is_a?(Array)
+        raise 'ascp args must be an Array of String' if @opt_args.any?{|i|!i.is_a?(String)}
         @builder = Aspera::CommandLineBuilder.new(@job_spec, self.class.description)
-        Log.log.debug{"agent options: #{@options}"}
       end
 
       def process_file_list
         # is the file list provided through EX_ parameters?
-        ascp_file_list_provided = self.class.ts_has_ascp_file_list(@job_spec)
+        ascp_file_list_provided = self.class.ts_has_ascp_file_list(@job_spec, @opt_args)
         # set if paths is mandatory in ts
         @builder.params_definition['paths'][:mandatory] = !@job_spec.key?('keepalive') && !ascp_file_list_provided
         # get paths in transfer spec (after setting if it is mandatory)
-        ts_paths_array = @builder.process_param('paths', :get_value)
+        ts_paths_array = @builder.read_param('paths')
         if ascp_file_list_provided && !ts_paths_array.nil?
           raise 'file list provided both in transfer spec and ascp file list. Remove one of them.'
         end
         # option 1: EX_file_list
-        file_list_file = @builder.process_param('EX_file_list', :get_value)
+        file_list_file = @builder.read_param('EX_file_list')
         if file_list_file.nil?
           # option 2: EX_file_pair_list
-          file_list_file = @builder.process_param('EX_file_pair_list', :get_value)
+          file_list_file = @builder.read_param('EX_file_pair_list')
           if !file_list_file.nil?
             option = '--file-pair-list'
           elsif !ts_paths_array.nil?
@@ -140,7 +147,7 @@ module Aspera
               @builder.add_command_line_options(ts_paths_array.map{|i|i['source']})
             else
               # safer option: generate a file list file if there is storage defined for it
-              # if there is destination in paths, then use filepairlist
+              # if there is destination in paths, then use file-pair-list
               # TODO: well, we test only the first one, but anyway it shall be consistent
               if ts_paths_array.first.key?('destination')
                 option = '--file-pair-list'
@@ -179,12 +186,12 @@ module Aspera
         @job_spec.delete('source_root') if @job_spec.key?('source_root') && @job_spec['source_root'].empty?
 
         # use web socket session initiation ?
-        if @builder.process_param('wss_enabled', :get_value) && (@options[:wss] || !@job_spec.key?('fasp_port'))
+        if @builder.read_param('wss_enabled') && (@opt_wss || !@job_spec.key?('fasp_port'))
           # by default use web socket session if available, unless removed by user
           @builder.add_command_line_options(['--ws-connect'])
           # TODO: option to give order ssh,ws (legacy http is implied bu ssh)
-          # quel bordel:
-          @job_spec['ssh_port'] = @builder.process_param('wss_port', :get_value)
+          # This will need to be cleaned up in aspera core
+          @job_spec['ssh_port'] = @builder.read_param('wss_port')
           @job_spec.delete('fasp_port')
           @job_spec.delete('EX_ssh_key_paths')
           @job_spec.delete('sshfp')
@@ -200,7 +207,7 @@ module Aspera
         @builder.process_params
 
         # symbol must be index of Installation.paths
-        if @builder.process_param('use_ascp4', :get_value)
+        if @builder.read_param('use_ascp4')
           env_args[:ascp_version] = :ascp4
         else
           env_args[:ascp_version] = :ascp
@@ -210,9 +217,10 @@ module Aspera
         # get list of files to transfer and build arg for ascp
         process_file_list
         # optional args, at the end to override previous ones (to allow override)
-        @builder.add_command_line_options(@builder.process_param('EX_ascp_args', :get_value))
+        @builder.add_command_line_options(@builder.read_param('EX_ascp_args'))
+        @builder.add_command_line_options(@opt_args)
         # process destination folder
-        destination_folder = @builder.process_param('destination_root', :get_value) || '/'
+        destination_folder = @builder.read_param('destination_root') || '/'
         # ascp4 does not support base64 encoding of destination
         destination_folder = Base64.strict_encode64(destination_folder) unless env_args[:ascp_version].eql?(:ascp4)
         # destination MUST be last command line argument to ascp