aspera-cli 4.4.0 → 4.7.0

data/lib/aspera/fasp/{local.rb → agent_direct.rb}

@@ -1,36 +1,31 @@
-#!/bin/echo this is a ruby class:
-#
-# FASP manager for Ruby
-# Aspera 2016
-# Laurent Martin
-#
-##############################################################################
-require 'aspera/fasp/manager'
+# frozen_string_literal: true
+require 'English'
+require 'aspera/fasp/agent_base'
 require 'aspera/fasp/error'
 require 'aspera/fasp/parameters'
 require 'aspera/fasp/installation'
 require 'aspera/fasp/resume_policy'
+require 'aspera/fasp/transfer_spec'
 require 'aspera/log'
 require 'socket'
 require 'timeout'
 require 'securerandom'
+require 'shellwords'
 
 module Aspera
   module Fasp
     # executes a local "ascp", connects mgt port, equivalent of "Fasp Manager"
-    class Local < Manager
+    class AgentDirect < AgentBase
       # options for initialize (same as values in option transfer_info)
       DEFAULT_OPTIONS = {
-        :spawn_timeout_sec => 3,
-        :spawn_delay_sec   => 2,
-        :wss               => false,
-        :multi_incr_udp    => true,
-        :resume            => {}
+        spawn_timeout_sec: 3,
+        spawn_delay_sec:   2,
+        wss:               false,
+        multi_incr_udp:    true,
+        resume:            {},
+        quiet:             true # by default no interactive progress bar
       }
-      DEFAULT_UDP_PORT=33001
       private_constant :DEFAULT_OPTIONS
-      # set to false to keep ascp progress bar display ("true" adds ascp's option -q)
-      attr_accessor :quiet
 
       # start ascp transfer (non blocking), single or multi-session
       # job information added to @jobs
@@ -44,10 +39,11 @@ module Aspera
         # clone transfer spec because we modify it (first level keys)
         transfer_spec=transfer_spec.clone
         # if there is aspera tags
-        if transfer_spec['tags'].is_a?(Hash) and transfer_spec['tags']['aspera'].is_a?(Hash)
+        if transfer_spec['tags'].is_a?(Hash) && transfer_spec['tags']['aspera'].is_a?(Hash)
           # TODO: what is this for ? only on local ascp ?
           # NOTE: important: transfer id must be unique: generate random id
           # using a non unique id results in discard of tags in AoC, and a package is never finalized
+          # all sessions in a multi-session transfer must have the same xfer_id (see admin manual)
           transfer_spec['tags']['aspera']['xfer_id']||=SecureRandom.uuid
           Log.log.debug("xfer id=#{transfer_spec['xfer_id']}")
           # TODO: useful ? node only ?
@@ -56,8 +52,8 @@ module Aspera
         Log.dump('ts',transfer_spec)
 
         # add bypass keys when authentication is token and no auth is provided
-        if transfer_spec.has_key?('token') and
-        !transfer_spec.has_key?('remote_password') and
+        if transfer_spec.has_key?('token') &&
+        !transfer_spec.has_key?('remote_password') &&
         !transfer_spec.has_key?('EX_ssh_key_paths')
           # transfer_spec['remote_password'] = Installation.instance.bypass_pass # not used
           transfer_spec['EX_ssh_key_paths'] = Installation.instance.bypass_keys
@@ -68,24 +64,22 @@ module Aspera
         multi_session_info=nil
         if transfer_spec.has_key?('multi_session')
           multi_session_info={
-            count: transfer_spec['multi_session'].to_i,
+            count: transfer_spec['multi_session'].to_i
           }
           # Managed by multi-session, so delete from transfer spec
           transfer_spec.delete('multi_session')
-          if multi_session_info[:count] < 0
+          if multi_session_info[:count].negative?
             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 multisession')
             multi_session_info = nil
-          else # multi_session_info[:count] > 0
+          elsif @options[:multi_incr_udp] # multi_session_info[:count] > 0
             # if option not true: keep default udp port for all sessions
-            if @options[:multi_incr_udp]
-              # override if specified, else use default value
-              multi_session_info[:udp_base]=transfer_spec.has_key?('fasp_port') ? transfer_spec['fasp_port'] : DEFAULT_UDP_PORT
-              # delete from original transfer spec, as we will increment values
-              transfer_spec.delete('fasp_port')
-            end
+            multi_session_info[:udp_base]=transfer_spec.has_key?('fasp_port') ? transfer_spec['fasp_port'] : TransferSpec::UDP_PORT
+            # delete from original transfer spec, as we will increment values
+            transfer_spec.delete('fasp_port')
+            # override if specified, else use default value
           end
         end
 
@@ -98,22 +92,22 @@ module Aspera
           env_args[:args].unshift('-I',Installation.instance.path(:fallback_cert))
         end
 
-        env_args[:args].unshift('-q') if @quiet
+        env_args[:args].unshift('-q') if @options[:quiet]
 
         # transfer job can be multi session
         xfer_job={
-          :id            => job_options[:job_id],
-          :sessions      => [] # all sessions as below
+          id:             job_options[:job_id],
+          sessions:       [] # all sessions as below
         }
 
         # 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)
-          :options  => job_options  # [Hash]
+          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)
+          options:   job_options  # [Hash]
         }
 
         if multi_session_info.nil?
@@ -132,7 +126,7 @@ module Aspera
             this_session[:env_args][:args]=this_session[:env_args][:args].clone()
             this_session[:env_args][:args].unshift("-C#{i}:#{multi_session_info[:count]}")
             # option: increment (default as per ascp manual) or not (cluster on other side ?)
-            this_session[:env_args][:args].unshift('-O',"#{multi_session_info[:udp_base]+i-1}") if @options[:multi_incr_udp]
+            this_session[:env_args][:args].unshift('-O',(multi_session_info[:udp_base]+i-1).to_s) if @options[:multi_incr_udp]
             this_session[:thread] = Thread.new(this_session) {|s|transfer_thread_entry(s)}
             xfer_job[:sessions].push(this_session)
           end
@@ -152,11 +146,11 @@ module Aspera
         Log.log.debug('wait_for_transfers_completion')
         # set to non-nil to exit loop
         result=[]
-        @jobs.each do |id,job|
+        @jobs.each do |_id,job|
           job[:sessions].each do |session|
             Log.log.debug("join #{session[:thread]}")
             session[:thread].join
-            result.push(session[:error] ? session[:error] : :success)
+            result.push(session[:error] || :success)
           end
         end
         Log.log.debug('all transfers joined')
@@ -190,7 +184,7 @@ module Aspera
             Fasp::Installation.instance.path(env_args[:ascp_version])
           end
           # (optional) check it exists
-          raise Fasp::Error.new("no such file: #{ascp_path}") unless File.exist?(ascp_path)
+          raise Fasp::Error, "no such file: #{ascp_path}" unless File.exist?(ascp_path)
           # open random local TCP port for listening for ascp management
           mgt_sock = TCPServer.new('127.0.0.1',0)
           # clone arguments as we eed to modify with mgt port
@@ -198,7 +192,7 @@ module Aspera
           # add management port
           ascp_arguments.unshift('-M', mgt_sock.addr[1].to_s)
           # start ascp in sub process
-          Log.log.debug("execute: #{env_args[:env].map{|k,v| "#{k}=\"#{v}\""}.join(' ')} \"#{ascp_path}\" \"#{ascp_arguments.join('" "')}\"")
+          Log.log.debug("execute: #{env_args[:env].map{|k,v| "#{k}=#{Shellwords.shellescape(v)}"}.join(' ')} #{Shellwords.shellescape(ascp_path)} #{ascp_arguments.map{|a|Shellwords.shellescape(a)}.join(' ')}")
           # start process
           ascp_pid = Process.spawn(env_args[:env],[ascp_path,ascp_path],*ascp_arguments)
           # in parent, wait for connection to socket max 3 seconds
@@ -226,21 +220,21 @@ module Aspera
             line = ascp_mgt_io.gets
             # nil when ascp process exits
             break if line.nil?
-            current_event_text=current_event_text+line
+            current_event_text+=line
             line.chomp!
             Log.log.debug("line=[#{line}]")
             case line
             when 'FASPMGR 2'
               # begin event
-              current_event_data = Hash.new
+              current_event_data = {}
               current_event_text = ''
             when /^([^:]+): (.*)$/
               # event field
-              current_event_data[$1] = $2
+              current_event_data[Regexp.last_match(1)] = Regexp.last_match(2)
             when ''
               # empty line is separator to end event information
               raise 'unexpected empty line' if current_event_data.nil?
-              current_event_data[Manager::LISTENER_SESSION_ID_B]=ascp_pid
+              current_event_data[AgentBase::LISTENER_SESSION_ID_B]=ascp_pid
               notify_listeners(current_event_text,current_event_data)
               case current_event_data['Type']
               when 'INIT'
@@ -262,9 +256,9 @@ module Aspera
               exception_raised=false
             when 'ERROR'
               Log.log.error("code: #{last_status_event['Code']}")
-              if last_status_event['Description']  =~ /bearer token/i
+              if last_status_event['Description'] =~ /bearer token/i
                 Log.log.error('need to regenerate token'.red)
-                if session[:options].is_a?(Hash) and session[:options].has_key?(:regenerate_token)
+                if session[:options].is_a?(Hash) && session[:options].has_key?(:regenerate_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']=session[:options][:regenerate_token].call(true)
@@ -280,27 +274,25 @@ module Aspera
           end
         rescue SystemCallError => e
           # Process.spawn
-          raise Fasp::Error.new(e.message)
-        rescue Timeout::Error => e
-          raise Fasp::Error.new('timeout waiting mgt port connect')
-        rescue Interrupt => e
-          raise Fasp::Error.new('transfer interrupted by user')
+          raise Fasp::Error, e.message
+        rescue Timeout::Error
+          raise Fasp::Error, 'timeout waiting mgt port connect'
+        rescue Interrupt
+          raise Fasp::Error, 'transfer interrupted by user'
         ensure
           # if ascp was successfully started
           unless ascp_pid.nil?
             # "wait" for process to avoid zombie
             Process.wait(ascp_pid)
-            status=$?
+            status=$CHILD_STATUS
             ascp_pid=nil
             session.delete(:io)
             if !status.success?
               message="ascp failed with code #{status.exitstatus}"
-              if exception_raised
-                # just debug, as main exception is already here
-                Log.log.debug(message)
-              else
-                raise Fasp::Error.new(message)
-              end
+              # raise error only if there was not already an exception
+              raise Fasp::Error, message unless exception_raised
+              # else just debug, as main exception is already here
+              Log.log.debug(message)
             end
           end
         end # begin-ensure
@@ -333,8 +325,6 @@ module Aspera
       # @param options : keys(symbol): see DEFAULT_OPTIONS
       def initialize(options=nil)
         super()
-        # by default no interactive progress bar
-        @quiet=true
         # all transfer jobs, key = SecureRandom.uuid, protected by mutex, condvar on change
         @jobs={}
         # mutex protects global data accessed by threads
@@ -344,11 +334,8 @@ module Aspera
         if !options.nil?
           raise "expecting Hash (or nil), but have #{options.class}" unless options.is_a?(Hash)
           options.each do |k,v|
-            if DEFAULT_OPTIONS.has_key?(k)
-              @options[k]=v
-            else
-              raise "Unknown local agent parameter: #{k}, expect one of #{DEFAULT_OPTIONS.keys.map{|i|i.to_s}.join(",")}"
-            end
+            raise "Unknown local agent parameter: #{k}, expect one of #{DEFAULT_OPTIONS.keys.map(&:to_s).join(',')}" unless DEFAULT_OPTIONS.has_key?(k)
+            @options[k]=v
           end
         end
         Log.log.debug("local options= #{options}")
@@ -367,13 +354,12 @@ module Aspera
             start_transfer_with_args_env(session[:env_args],session)
           end
           Log.log.debug('transfer ok'.bg_green)
-        rescue => e
+        rescue StandardError => e
           session[:error]=e
           Log.log.error("Transfer thread error: #{e.class}:\n#{e.message}:\n#{e.backtrace.join("\n")}".red) if Log.instance.level.eql?(:debug)
         end
         Log.log.debug("EXIT (#{Thread.current[:name]})")
       end
-
-    end # Local
+    end # AgentDirect
   end
 end

data/lib/aspera/fasp/{http_gw.rb → agent_httpgw.rb}

@@ -1,5 +1,6 @@
-#!/bin/echo this is a ruby class:
-require 'aspera/fasp/manager'
+# frozen_string_literal: true
+require 'aspera/fasp/agent_base'
+require 'aspera/fasp/transfer_spec'
 require 'aspera/log'
 require 'aspera/rest'
 require 'websocket-client-simple'
@@ -12,7 +13,7 @@ require 'json'
 module Aspera
   module Fasp
     # start a transfer using Aspera HTTP Gateway, using web socket session
-    class HttpGW < Manager
+    class AgentHttpgw < AgentBase
       # message returned by HTTP GW in case of success
       OK_MESSAGE='end upload'
       # refresh rate for progress
@@ -29,7 +30,7 @@ module Aspera
         # we need to keep track of actual file path because transfer spec is modified to be sent in web socket
         source_paths=[]
         # get source root or nil
-        source_root = (transfer_spec.has_key?('source_root') and !transfer_spec['source_root'].empty?) ? transfer_spec['source_root'] : nil
+        source_root = transfer_spec.has_key?('source_root') && !transfer_spec['source_root'].empty? ? transfer_spec['source_root'] : nil
         # source root is ignored by GW, used only here
         transfer_spec.delete('source_root')
         # compute total size of files to upload (for progress)
@@ -61,27 +62,23 @@ module Aspera
             received+=1
           else
             message.chomp!
-            if message[0].eql?('"') and message[-1].eql?('"')
-              error=JSON.parse(Base64.strict_decode64(message.chomp[1..-2]))['message']
-            else
-              error="expecting quotes in [#{message}]"
-            end
+            error=message.start_with?('"') && message.end_with?('"') ? JSON.parse(Base64.strict_decode64(message.chomp[1..-2]))['message'] : "expecting quotes in [#{message}]"
           end
         end
         ws.on :error do |e|
           error=e
         end
         ws.on :open do
-          Log.log.info("ws: open")
+          Log.log.info('ws: open')
         end
         ws.on :close do
-          Log.log.info("ws: close")
+          Log.log.info('ws: close')
         end
         # open web socket to end point
         ws.connect("#{@gw_api.params[:base_url]}/upload")
         # async wait ready
-        while !ws.open? and error.nil? do
-          Log.log.info("ws: wait")
+        while !ws.open? && error.nil?
+          Log.log.info('ws: wait')
           sleep(0.2)
         end
         # notify progress bar
@@ -101,11 +98,11 @@ module Aspera
           file_size=item['file_size']
           file_name=File.basename(item[item['destination'].nil? ? 'source' : 'destination'])
           # compute total number of slices
-          numslices=1+(file_size-1)/@upload_chunksize
+          numslices=1+((file_size-1)/@upload_chunksize)
           File.open(source_paths[file_index]) do |file|
             # current slice index
             slicenum=0
-            while !file.eof? do
+            while !file.eof?
               data=file.read(@upload_chunksize)
               slice_data={
                 name: file_name,
@@ -117,11 +114,11 @@ module Aspera
                 fileIndex: file_index
               }
               # log without data
-              Log.dump(:slide_data,slice_data.keys.inject({}){|m,i|m[i]=i.eql?(:data)?'base64 data':slice_data[i];m}) if slicenum.eql?(0)
+              Log.dump(:slide_data,slice_data.keys.each_with_object({}){|i,m|m[i]=i.eql?(:data)?'base64 data':slice_data[i];}) if slicenum.eql?(0)
               ws_send(ws,:slice_upload, slice_data)
               sent_bytes+=data.length
               currenttime=Time.now
-              if lastevent.nil? or (currenttime-lastevent)>UPLOAD_REFRESH_SEC
+              if lastevent.nil? || ((currenttime-lastevent)>UPLOAD_REFRESH_SEC)
                 notify_progress(session_id,sent_bytes)
                 lastevent=currenttime
               end
@@ -146,40 +143,40 @@ module Aspera
           dname=dname.gsub(/\.@gw_api.*$/,'')
           # ands add indication of number of files if there is more than one
           if transfer_spec['paths'].length > 1
-            dname=dname+" #{transfer_spec['paths'].length} Files"
+            dname+=" #{transfer_spec['paths'].length} Files"
           end
           transfer_spec['download_name']=dname
         end
         creation=@gw_api.create('download',{'transfer_spec'=>transfer_spec})[:data]
         transfer_uuid=creation['url'].split('/').last
-        if transfer_spec['zip_required'] or transfer_spec['paths'].length > 1
-          # it is a zip file if zip is required or there is more than 1 file
-          file_dest=transfer_spec['download_name']+'.zip'
-        else
-          # it is a plain file if we don't require zip and there is only one file
-          file_dest=File.basename(transfer_spec['paths'].first['source'])
+        file_dest=if transfer_spec['zip_required'] || transfer_spec['paths'].length > 1
+                    # it is a zip file if zip is required or there is more than 1 file
+                    transfer_spec['download_name']+'.zip'
+                  else
+                    # it is a plain file if we don't require zip and there is only one file
+                    File.basename(transfer_spec['paths'].first['source'])
         end
         file_dest=File.join(transfer_spec['destination_root'],file_dest)
-        @gw_api.call({:operation=>'GET',:subpath=>"download/#{transfer_uuid}",:save_to_file=>file_dest})
+        @gw_api.call({operation: 'GET',subpath: "download/#{transfer_uuid}",save_to_file: file_dest})
       end
 
       # 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,options={})
-        raise "GW URL must be set" unless !@gw_api.nil?
-        raise "option: must be hash (or nil)" unless options.is_a?(Hash)
-        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)
+        raise 'GW URL must be set' if @gw_api.nil?
+        raise 'option: must be hash (or nil)' unless options.is_a?(Hash)
+        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)
         Log.dump(:user_spec,transfer_spec)
         transfer_spec['authentication']||='token'
         case transfer_spec['direction']
-        when 'send'
+        when Fasp::TransferSpec::DIRECTION_SEND
           upload(transfer_spec)
-        when 'receive'
+        when Fasp::TransferSpec::DIRECTION_RECEIVE
           download(transfer_spec)
         else
-          raise "error"
+          raise "unexpected direction: [#{transfer_spec['direction']}]"
         end
       end # start_transfer
 
@@ -190,25 +187,22 @@ module Aspera
       end
 
       # terminates monitor thread
-      def shutdown
-      end
+      def shutdown; end
 
-      def url=(api_url)
-      end
+      def url=(api_url); end
 
       private
 
       def initialize(params)
-        raise "params must be Hash" unless params.is_a?(Hash)
+        raise 'params must be Hash' unless params.is_a?(Hash)
         params=params.symbolize_keys
-        raise "must have only one param: url" unless params.keys.eql?([:url])
+        raise 'must have only one param: url' unless params.keys.eql?([:url])
         super()
-        @gw_api=Rest.new({:base_url => params[:url]})
+        @gw_api=Rest.new({base_url: params[:url]})
         api_info = @gw_api.read('info')[:data]
-        Log.log.info("#{api_info}")
-        @upload_chunksize=128000 # TODO: configurable ?
+        Log.log.info(api_info.to_s)
+        @upload_chunksize=128_000 # TODO: configurable ?
       end
-
-    end # HttpGW
+    end # AgentHttpgw
   end
 end

data/lib/aspera/fasp/{node.rb → agent_node.rb}

@@ -1,4 +1,6 @@
-require 'aspera/fasp/manager'
+# frozen_string_literal: true
+require 'aspera/fasp/agent_base'
+require 'aspera/fasp/transfer_spec'
 require 'aspera/log'
 require 'tty-spinner'
 
@@ -6,13 +8,30 @@ module Aspera
   module Fasp
     # this singleton class is used by the CLI to provide a common interface to start a transfer
     # before using it, the use must set the `node_api` member.
-    class Node < Manager
+    class AgentNode < AgentBase
       # option include: root_id if the node is an access key
       attr_writer :options
-      def initialize(node_api,options={})
+      def initialize(options)
+        raise 'node specification must be Hash' unless options.is_a?(Hash)
+        [:url,:username,:password].each { |k| raise "missing parameter [#{k}] in node specification: #{options}" unless options.has_key?(k) }
         super()
-        @node_api=node_api
-        @options=options
+        # root id is required for access key
+        @root_id=options[:root_id]
+        rest_params={ base_url: options[:url]}
+        if options[:password].match(/^Bearer /)
+          rest_params[:headers]={
+            'X-Aspera-AccessKey'=>options[:username],
+            'Authorization'     =>options[:password]
+          }
+          raise 'root_id is required for access key' if @root_id.nil?
+        else
+          rest_params[:auth]={
+            type:     :basic,
+            username: options[:username],
+            password: options[:password]
+          }
+        end
+        @node_api=Rest.new(rest_params)
         # TODO: currently only supports one transfer. This is bad shortcut. but ok for CLI.
         @transfer_id=nil
       end
@@ -27,24 +46,24 @@ module Aspera
 
       # use this to set the node_api end point before using the class.
       def node_api=(new_value)
-        if !@node_api.nil? and !new_value.nil?
+        if !@node_api.nil? && !new_value.nil?
           Log.log.warn('overriding existing node api value')
         end
         @node_api=new_value
       end
 
       # generic method
-      def start_transfer(transfer_spec,options=nil)
+      def start_transfer(transfer_spec,_options=nil)
         # add root id if access key
-        if @options.has_key?(:root_id)
+        if !@root_id.nil?
           case transfer_spec['direction']
-          when 'send';transfer_spec['source_root_id']=@options[:root_id]
-          when 'receive';transfer_spec['destination_root_id']=@options[:root_id]
+          when Fasp::TransferSpec::DIRECTION_SEND then transfer_spec['source_root_id']=@root_id
+          when Fasp::TransferSpec::DIRECTION_RECEIVE then transfer_spec['destination_root_id']=@root_id
           else raise "unexpected direction in ts: #{transfer_spec['direction']}"
           end
         end
         # manage special additional parameter
-        if transfer_spec.has_key?('EX_ssh_key_paths') and transfer_spec['EX_ssh_key_paths'].is_a?(Array) and !transfer_spec['EX_ssh_key_paths'].empty?
+        if transfer_spec.has_key?('EX_ssh_key_paths') && transfer_spec['EX_ssh_key_paths'].is_a?(Array) && !transfer_spec['EX_ssh_key_paths'].empty?
           # not standard, so place standard field
           if transfer_spec.has_key?('ssh_private_key')
             Log.log.warn('Both ssh_private_key and EX_ssh_key_paths are present, using ssh_private_key')
@@ -54,7 +73,7 @@ module Aspera
             transfer_spec.delete('EX_ssh_key_paths')
           end
         end
-        if transfer_spec['tags'].is_a?(Hash) and transfer_spec['tags']['aspera'].is_a?(Hash)
+        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
@@ -74,14 +93,14 @@ 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)"}
+          trdata=node_api_.read("ops/transfers/#{@transfer_id}")[:data] || {'status'=>'unknown'} rescue {'status'=>'waiting(read error)'}
           case trdata['status']
           when 'completed'
             notify_end(@transfer_id)
             break
           when 'waiting','partially_completed','unknown','waiting(read error)'
             if spinner.nil?
-              spinner = TTY::Spinner.new("[:spinner] :title", format: :classic)
+              spinner = TTY::Spinner.new('[:spinner] :title', format: :classic)
               spinner.start
             end
             spinner.update(title: trdata['status'])
@@ -89,7 +108,7 @@ module Aspera
             #puts trdata
           when 'running'
             #puts "running: sessions:#{trdata["sessions"].length}, #{trdata["sessions"].map{|i| i['bytes_transferred']}.join(',')}"
-            if !started and trdata['precalc'].is_a?(Hash) and
+            if !started && trdata['precalc'].is_a?(Hash) &&
             trdata['precalc']['status'].eql?('ready')
               notify_begin(@transfer_id,trdata['precalc']['bytes_expected'])
               started=true
@@ -98,7 +117,7 @@ module Aspera
             end
           else
             Log.log.warn("trdata -> #{trdata}")
-            raise Fasp::Error.new("#{trdata['status']}: #{trdata['error_desc']}")
+            raise Fasp::Error, "#{trdata['status']}: #{trdata['error_desc']}"
           end
           sleep 1
         end