aspera-cli 4.19.0 → 4.20.0

data/bin/asession

@@ -1,20 +1,24 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Laurent Martin/2017
-$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
+gem_lib_folder = File.join(File.dirname(File.dirname(File.realpath(__FILE__))), 'lib')
+Kernel.load(File.join(gem_lib_folder, 'aspera/coverage.rb'))
+$LOAD_PATH.unshift(gem_lib_folder)
 require 'aspera/agent/direct'
 require 'aspera/cli/extended_value'
 require 'aspera/ascp/installation'
 require 'aspera/log'
 require 'json'
 # extended transfer spec parameter (only used in asession)
-# Change log level
+PARAM_SPEC = 'spec'
+# log level
 PARAM_LOG_LEVEL = 'loglevel'
+# transfer agent options
+PARAM_AGENT = 'agent'
 # by default go to /tmp/username.filelist
 PARAM_TMP_FILE_LIST_FOLDER = 'file_list_folder'
+PARAM_SDK = 'sdk'
 # place transfer spec in that
-PARAM_SPEC = 'spec'
 SAMPLE_DEMO = '"remote_host":"demo.asperasoft.com","remote_user":"asperaweb","ssh_port":33001,"remote_password":"demoaspera"'
 SAMPLE_DEMO2 = '"direction":"receive","destination_root":"./test.dir"'
 def assert_usage(assertion, error_message)
@@ -23,28 +27,30 @@ def assert_usage(assertion, error_message)
   $stderr.puts('USAGE')
   $stderr.puts('    asession')
   $stderr.puts('    asession -h|--help')
-  $stderr.puts('    asession <session spec extended value>')
+  $stderr.puts('    asession [<session spec extended value>]')
   $stderr.puts('    ')
   $stderr.puts('    If no argument is provided, default will be used: @json:@stdin')
   $stderr.puts('    -h, --help display this message')
-  $stderr.puts('    <session spec extended value> a dictionary value (Hash)')
+  $stderr.puts('    <session spec extended value> a dictionary (Hash)')
   $stderr.puts('    The value can be either:')
   $stderr.puts("       the JSON description itself, e.g. @json:'{\"xx\":\"yy\",...}'")
   $stderr.puts('       @json:@stdin, if the JSON is provided from stdin')
   $stderr.puts('       @json:@file:<path>, if the JSON is provided from a file')
-  $stderr.puts("    Parameter #{PARAM_SPEC} is mandatory, it contains the transfer spec")
+  $stderr.puts('    The following keys are recognized in session spec:')
+  $stderr.puts("       #{PARAM_SPEC} : mandatory, contains the transfer spec")
+  $stderr.puts("       #{PARAM_LOG_LEVEL} : modify log level (to stderr)")
+  $stderr.puts("       #{PARAM_AGENT} : modify transfer agent parameters, e.g. ascp_args")
+  $stderr.puts("       #{PARAM_TMP_FILE_LIST_FOLDER} : location of temporary files")
+  $stderr.puts("       #{PARAM_SDK} : location of SDK (ascp)")
   $stderr.puts('    Asynchronous commands can be provided on STDIN, examples:')
   $stderr.puts('       {"type":"START","source":"/aspera-test-dir-tiny/200KB.2"}')
   $stderr.puts('       {"type":"START","source":"xx","destination":"yy"}')
   $stderr.puts('       {"type":"DONE"}')
-  $stderr.puts(%Q(Note: debug information can be placed on STDERR, using the "#{PARAM_LOG_LEVEL}" parameter in session spec (debug=0)))
   $stderr.puts('EXAMPLES')
   $stderr.puts(%Q(    asession @json:'{"#{PARAM_SPEC}":{#{SAMPLE_DEMO},#{SAMPLE_DEMO2},"paths":[{"source":"/aspera-test-dir-tiny/200KB.1"}]}}'))
   $stderr.puts(%Q(    echo '{"#{PARAM_SPEC}":{"remote_host":...}}'|asession @json:@stdin))
   Process.exit(0)
 end
-Aspera::Ascp::Installation.instance.sdk_folder = File.join(Dir.home, '.aspera', 'sdk')
-
 parameter_source_err_msg = ' (argument), did you specify: "@json:" ?'
 # by default assume JSON input on stdin if no argument
 if ARGV.empty?
@@ -62,23 +68,24 @@ rescue
   assert_usage(false, "Cannot parse argument: #{session_argument}")
 end
 # ensure right type
-assert_usage(session_spec.is_a?(Hash), "The value must be a hash table#{parameter_source_err_msg}")
-assert_usage(session_spec[PARAM_SPEC].is_a?(Hash), "the value must contain key #{PARAM_SPEC}")
+assert_usage(session_spec.is_a?(Hash), "The value must be a Hash#{parameter_source_err_msg}")
+assert_usage(session_spec[PARAM_SPEC].is_a?(Hash), "The value must contain key #{PARAM_SPEC} with Hash value")
 # additional debug capability
-if session_spec.key?(PARAM_LOG_LEVEL)
-  Aspera::Log.instance.level = session_spec[PARAM_LOG_LEVEL]
-end
+Aspera::Log.instance.level = session_spec[PARAM_LOG_LEVEL] if session_spec.key?(PARAM_LOG_LEVEL)
 # possibly override temp folder
 if session_spec.key?(PARAM_TMP_FILE_LIST_FOLDER)
   Aspera::Transfer::Parameters.file_list_folder = session_spec[PARAM_TMP_FILE_LIST_FOLDER]
 end
-session_spec['agent'] = {} unless session_spec.key?('agent')
-session_spec['agent']['quiet'] = true
-session_spec['agent']['management_cb'] = ->(event) do
+session_spec[PARAM_SDK] = File.join(Dir.home, '.aspera', 'sdk') unless session_spec.key?(PARAM_SDK)
+Aspera::Ascp::Installation.instance.sdk_folder = session_spec[PARAM_SDK]
+session_spec[PARAM_AGENT] = {} unless session_spec.key?(PARAM_AGENT)
+agent_params = session_spec[PARAM_AGENT]
+agent_params['quiet'] = true
+agent_params['management_cb'] = ->(event) do
   puts JSON.generate(Aspera::Ascp::Management.enhanced_event_format(event))
 end
 # get local agent (ascp), disable ascp output on stdout to not mix with JSON events
-client = Aspera::Agent::Direct.new(**session_spec['agent'].symbolize_keys)
+client = Aspera::Agent::Direct.new(**agent_params.symbolize_keys)
 # start transfer (asynchronous)
 job_id = client.start_transfer(session_spec[PARAM_SPEC])
 # async commands

data/examples/build_exec

@@ -1,85 +1,74 @@
 #!/bin/bash
-
+# Glibc for various OS: https://gist.github.com/wagenet/35adca1a032cec2999d47b6c40aa45b1
+# https://distrowatch.com/table.php?distribution=redhat
+# RHEL 8 : glibc 2.28
+# RHEL 9 : glibc 2.34
+# https://distrowatch.com/table.php?distribution=ubuntu
+# Ubuntu 18.10 cosmic : glibc 2.28
+# Ubuntu 21.10 impish : gblic 2.34
+# https://www.ibm.com/docs/en/ahts/4.4.x?topic=release-notes
+# ascp 4.4.5 : gblic 2.28
+# dwarfs requires boost >= 1.65
+# boost requires cmake >= 3.30
 set -e
 
-if test $# -ne 2; then
-    echo "Usage: $0 <CLI_TARGET_EXECUTABLE> <CLI_ENTRY_SCRIPT>" 1>&2
+if test $# -ne 5; then
+    echo "Usage: $0 <CLI_EXECUTABLE> <CLI_PATH> <GEM_NAME> <GEM_VERSION> <DIR_TMP>" 1>&2
     exit 1
 fi
 
-CLI_TARGET_EXECUTABLE=$1
-CLI_ENTRY_SCRIPT=$(realpath $2)
-CLI_EXEC_NAME=$(basename $CLI_TARGET_EXECUTABLE)
-CLI_ROOT=$(dirname $(dirname $CLI_ENTRY_SCRIPT))
+CLI_EXECUTABLE=$1
+CLI_PATH=$(realpath $2)
+GEM_NAME=$3
+GEM_VERSION=$4
+DIR_TMP=$(realpath $5)
 
-echo "Project folder: $CLI_ROOT"
-echo "Executable:     $CLI_TARGET_EXECUTABLE"
-echo "Exec Name:      $CLI_EXEC_NAME"
-echo "Entry:          $CLI_ENTRY_SCRIPT"
+echo "Building: $(basename $CLI_EXECUTABLE)"
 
-# tebako press --root=$(TB_WORK_DIR) --entry-point=ascli --output=$(TB_WORK_DIR)/$(CLI_TARGET_EXECUTABLE) --Ruby=3.2.4
+# tebako compilation
+tebako_env=$DIR_TMP/tebako-env
+# project files (gem)
+tebako_root=$DIR_TMP/tebako-root
+# only provide the name, not path
+tebako_entry=$(basename $CLI_PATH)
+tebako_output=$CLI_EXECUTABLE
 
-if true;then
-    tebako_command=tebako
-    tebako_args="--root=$CLI_ROOT --entry-point=ascli --output=$CLI_TARGET_EXECUTABLE --Ruby=3.3.3"
-    case $(uname -s) in
-        Darwin)
-            brew update
-            brew install gnu-sed bash pkg-config bison flex binutils libffi gdbm zlib \
-                ncurses double-conversion boost jemalloc  glog libevent libsodium lz4 xz \
-                libyaml openssl@3
-            # brew install m4
-            # boost fmt
-            #export PATH=$(dirname $(brew ls m4|grep '/m4$'|head -n 1)):$PATH
-            #export PATH=$(dirname $(brew ls binutils|grep '/ar$'|head -n 1)):$PATH
-            #tebako_bin=$CLI_ROOT/tmp/tbkbin
-            tebako_root=$CLI_ROOT/../tebako-tmp
-            #export PATH=$tebako_bin:$PATH
-            mkdir -p $tebako_root
-            #mkdir -p $tebako_bin
-            # need ar from apple
-            #rm -f $tebako_bin/ar
-            #ln -s /usr/bin/ar $tebako_bin
-            export PATH=$(echo $PATH|tr : \\n|grep -v /binutils/|tr \\n :)
-            #tebako setup --Ruby=3.3.4 --prefix=$tebako_root
-            tebako press --Ruby=3.3.4 --prefix=$tebako_root --root=$CLI_ROOT/examples/tebako --entry-point=ascli --output=$CLI_TARGET_EXECUTABLE
-            #tebako press --Ruby=3.3.4 --prefix=$tebako_root --root=$CLI_ROOT --entry-point=$CLI_ENTRY_SCRIPT --output=$CLI_TARGET_EXECUTABLE
-            exit 0
-            ;;
-        Linux)
-            work_dir=/mnt/w
-            tebako press --root=$work_dir --entry-point=ascli --output=$work_dir/ascli.exe --Ruby=3.3.3 
-            tebako_prefix="podman run -it --rm -v $PWD:$work_dir ghcr.io/tamatebako/tebako-ubuntu-20.04:0.8.6"
-            tebako_opts=--patchelf
-            ;;
-        *)
-            echo "This OS is not supported." >&2
-            exit 1
-            ;;
-    esac
-    command $tebako_command $tebako_args
-else
-    # https://github.com/you54f/ruby-packer
-    # https://github.com/YOU54F/ruby-packer/releases
-    set -e
-    FOLDER="$(dirname $0)/../tmp"
-    RUBYC="$FOLDER/rubyc"
-    if test ! -e "$RUBYC"; then
-        mkdir -p "$FOLDER"
-        case $(uname -sm|tr ' ' -) in
-            Darwin-arm64)
-                curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Darwin-arm64.tar.gz | tar -xz -C "$FOLDER"
-                mv "$FOLDER/rubyc-Darwin-arm64" "$RUBYC"
-                ;;
-            Linux-x86_64)
-                curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Linux-x86_64.tar.gz | tar -xz -C "$FOLDER"
-                mv "$FOLDER/rubyc-Linux-x86_64" "$RUBYC"
-                ;;
-            *)
-                echo "This architecture is not supported." >&2
-                exit 1
-                ;;
-        esac
-    fi
-    exec "$RUBYC" -o "$CLI_TARGET_EXECUTABLE" "$CLI_ENTRY_SCRIPT"
-fi
+container_tag=alpine-3.17
+#container_tag=ubuntu-20.04
+
+gem install tebako
+mkdir -p $tebako_env $tebako_root
+(cd $tebako_root && gem fetch $GEM_NAME:$GEM_VERSION)
+case $(uname -s) in
+Darwin)
+    brew update
+    # install tools
+    brew install bash binutils bison flex gnu-sed lz4 pkg-config xz
+    # install libs
+    brew install boost double-conversion fmt gdbm glog jemalloc libevent libffi libsodium libyaml ncurses openssl@3 zlib
+    # make sure tools are reachable
+    export PATH=/opt/homebrew/opt/flex/bin:/opt/homebrew/opt/bison/bin:$PATH
+    # remove binutils from path so that macos `ar` is used
+    export PATH=$(echo $PATH|tr : \\n|grep -v /binutils/|tr \\n :)
+    ;;
+Linux)
+    tebako_root=/mnt/w
+    tebako_prefix="podman run -it --rm -v $PWD:$tebako_root ghcr.io/tamatebako/tebako-${container_tag}:0.8.6"
+    tebako_opts=--patchelf
+    tebako_output=$tebako_root/$(basename $CLI_EXECUTABLE)
+    ;;
+LinuxLocal)
+    dnf module reset ruby
+    dnf module install ruby:3.3
+    dnf install -y cmake git bash sudo autoconf boost-devel flex bison make clang binutils-devel libevent-devel libacl-devel sed python3 pkgconfig curl lz4-devel openssl-devel zlib-devel xz zip unzip tar xz-devel elfutils-devel libffi-devel gdbm-devel ncurses-devel readline-devel ruby-devel gettext-devel brotli-devel clang libxslt-devel
+    echo TODO
+    exit 1
+    dnf install 
+    ;;
+*)
+    echo "This OS is not supported." >&2
+    exit 1
+    ;;
+esac
+set -x
+exec $tebako_prefix tebako press --root=$tebako_root --entry-point=$tebako_entry --output=$tebako_output --prefix=$tebako_env $tebako_opts

data/examples/build_exec_rubyc

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+if test $# -ne 5; then
+    echo "Usage: $0 <CLI_EXECUTABLE> <CLI_PATH> <GEM_NAME> <GEM_VERSION> <DIR_TMP>" 1>&2
+    exit 1
+fi
+
+CLI_EXECUTABLE=$1
+CLI_PATH=$(realpath $2)
+GEM_NAME=$3
+GEM_VERSION=$4
+DIR_TMP=$(realpath $5)
+
+echo "Building: $(basename $CLI_EXECUTABLE)"
+
+# https://github.com/you54f/ruby-packer
+# https://github.com/you54f/ruby-packer/releases
+set -e
+FOLDER="$(dirname $0)/../tmp"
+RUBYC="$FOLDER/rubyc"
+if test ! -e "$RUBYC"; then
+    mkdir -p "$FOLDER"
+    case $(uname -sm|tr ' ' -) in
+        Darwin-arm64)
+            curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Darwin-arm64.tar.gz | tar -xz -C "$FOLDER"
+            mv "$FOLDER/rubyc-Darwin-arm64" "$RUBYC"
+            ;;
+        Linux-x86_64)
+            curl -L https://github.com/YOU54F/ruby-packer/releases/download/rel-20230812/rubyc-Linux-x86_64.tar.gz | tar -xz -C "$FOLDER"
+            mv "$FOLDER/rubyc-Linux-x86_64" "$RUBYC"
+            ;;
+        *)
+            echo "This architecture is not supported." >&2
+            exit 1
+            ;;
+    esac
+fi
+exec "$RUBYC" -o "$CLI_EXECUTABLE" "$CLI_PATH"

data/examples/get_proto_file.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Retrieve `transfer.proto` from the web
+$LOAD_PATH.unshift(File.join(File.dirname(File.dirname(File.realpath(__FILE__))), 'lib'))
+require 'aspera/ascp/installation'
+Aspera::Ascp::Installation.instance.install_sdk(folder: ARGV.first, backup: false, with_exe: false) {|name| '/' if name.end_with?('transfer.proto')}

data/lib/aspera/agent/alpha.rb

@@ -82,29 +82,29 @@ module Aspera
             transfer = @client_app_api.get_transfer(app_id: @application_id, transfer_id: @xfer_id)
             case transfer['status']
             when 'initiating', 'queued'
-              notify_progress(session_id: nil, type: :pre_start, info: transfer['status'])
+              notify_progress(:pre_start, session_id: nil, info: transfer['status'])
             when 'running'
               if !started
-                notify_progress(session_id: @xfer_id, type: :session_start)
+                notify_progress(:session_start, session_id: @xfer_id)
                 started = true
               end
               if !pre_calc && (transfer['bytes_expected'] != 0)
-                notify_progress(type: :session_size, session_id: @xfer_id, info: transfer['bytes_expected'])
+                notify_progress(:session_size, session_id: @xfer_id, info: transfer['bytes_expected'])
                 pre_calc = true
               else
-                notify_progress(type: :transfer, session_id: @xfer_id, info: transfer['bytes_written'])
+                notify_progress(:transfer, session_id: @xfer_id, info: transfer['bytes_written'])
               end
             when 'completed'
-              notify_progress(type: :end, session_id: @xfer_id)
+              notify_progress(:end, session_id: @xfer_id)
               break
             when 'failed'
-              notify_progress(type: :end, session_id: @xfer_id)
+              notify_progress(:end, session_id: @xfer_id)
               raise Transfer::Error, transfer['error_desc']
             when 'cancelled'
-              notify_progress(type: :end, session_id: @xfer_id)
+              notify_progress(:end, session_id: @xfer_id)
               raise Transfer::Error, 'Transfer cancelled by user'
             else
-              notify_progress(type: :end, session_id: @xfer_id)
+              notify_progress(:end, session_id: @xfer_id)
               raise Transfer::Error, "unknown status: #{transfer['status']}: #{transfer['error_desc']}"
             end
             sleep(1)

data/lib/aspera/agent/base.rb

@@ -14,22 +14,6 @@ module Aspera
           Aspera::Agent.const_get(agent.to_s.capitalize).new(**options)
         end
 
-        # compute options from user provided and default options
-        def to_move_options(default:, options:)
-          result = options.symbolize_keys
-          available = default.map{|k, v|"#{k}(#{v})"}.join(', ')
-          result.each_key do |k|
-            Aspera.assert_values(k, default.keys){"transfer agent parameter: #{k}"}
-            # check it is the expected type: too limiting, as we can have an Integer or Float, or symbol and string
-            # raise "Invalid value for transfer agent parameter: #{k}, expect #{default[k].class.name}" unless default[k].nil? || v.is_a?(default[k].class)
-          end
-          default.each do |k, v|
-            raise "Missing required agent parameter: #{k}. Parameters: #{available}" if v.eql?(:required) && !result.key?(k)
-            result[k] = v unless result.key?(k)
-          end
-          return result
-        end
-
         # discover available agents
         def agent_list
           base_class = File.basename(__FILE__)
@@ -58,8 +42,8 @@ module Aspera
         @progress = progress
       end
 
-      def notify_progress(**parameters)
-        @progress&.event(**parameters)
+      def notify_progress(*pos_args, **kw_args)
+        @progress&.event(*pos_args, **kw_args)
       end
     end
   end

data/lib/aspera/agent/connect.rb

@@ -24,11 +24,12 @@ module Aspera
           Log.log.debug{"found: #{connect_url}"}
           @connect_api = Rest.new(
             base_url: "#{connect_url}/v5/connect", # could use v6 also now
-            headers: {'Origin' => Rest.user_agent})
-          connect_info = @connect_api.read('info/version')[:data]
+            headers: {'Origin' => RestParameters.instance.user_agent})
+          connect_info = @connect_api.read('info/version')
           Log.log.info('Connect was reached') if method_index > 0
           Log.log.debug{Log.dump(:connect_version, connect_info)}
         rescue StandardError => e # Errno::ECONNREFUSED
+          Log.log.debug{"Exception: #{e}"}
           start_url = CONNECT_START_URIS[method_index]
           method_index += 1
           raise StandardError, "Unable to start connect #{method_index} times" if start_url.nil?
@@ -51,7 +52,7 @@ module Aspera
             'title'                   => 'Select Files',
             'suggestedName'           => '',
             'allowMultipleSelection'  => true,
-            'allowedFileTypes'        => ''})[:data]
+            'allowedFileTypes'        => ''})
           transfer_spec['paths'] = selection['dataTransfer']['files'].map { |i| {'source' => i['name']}}
         end
         @request_id = SecureRandom.uuid
@@ -67,7 +68,7 @@ module Aspera
             'transfer_spec' => transfer_spec
           }]}
         # asynchronous anyway
-        res = @connect_api.create('transfers/start', connect_transfer_args)[:data]
+        res = @connect_api.create('transfers/start', connect_transfer_args)
         @xfer_id = res['transfer_specs'].first['transfer_spec']['tags'][Transfer::Spec::TAG_RESERVED]['xfer_id']
       end
 
@@ -78,7 +79,7 @@ module Aspera
         session_id = @xfer_id
         begin
           loop do
-            tr_info = @connect_api.create("transfers/info/#{@xfer_id}", connect_activity_args)[:data]
+            tr_info = @connect_api.create("transfers/info/#{@xfer_id}", connect_activity_args)
             Log.log.trace1{Log.dump(:tr_info, tr_info)}
             if tr_info['transfer_info'].is_a?(Hash)
               transfer = tr_info['transfer_info']
@@ -89,29 +90,29 @@ module Aspera
               # TODO: get session id
               case transfer['status']
               when 'initiating', 'queued'
-                notify_progress(session_id: nil, type: :pre_start, info: transfer['status'])
+                notify_progress(:pre_start, session_id: nil, info: transfer['status'])
               when 'running'
                 if !started
-                  notify_progress(session_id: session_id, type: :session_start)
+                  notify_progress(:session_start, session_id: session_id)
                   started = true
                 end
                 if !pre_calc && (transfer['bytes_expected'] != 0)
-                  notify_progress(type: :session_size, session_id: session_id, info: transfer['bytes_expected'])
+                  notify_progress(:session_size, session_id: session_id, info: transfer['bytes_expected'])
                   pre_calc = true
                 else
-                  notify_progress(type: :transfer, session_id: session_id, info: transfer['bytes_written'])
+                  notify_progress(:transfer, session_id: session_id, info: transfer['bytes_written'])
                 end
               when 'completed'
-                notify_progress(type: :end, session_id: session_id)
+                notify_progress(:end, session_id: session_id)
                 break
               when 'failed'
-                notify_progress(type: :end, session_id: session_id)
+                notify_progress(:end, session_id: session_id)
                 raise Transfer::Error, transfer['error_desc']
               when 'cancelled'
-                notify_progress(type: :end, session_id: session_id)
+                notify_progress(:end, session_id: session_id)
                 raise Transfer::Error, 'Transfer cancelled by user'
               else
-                notify_progress(type: :end, session_id: session_id)
+                notify_progress(:end, session_id: session_id)
                 raise Transfer::Error, "unknown status: #{transfer['status']}: #{transfer['error_desc']}"
               end
             end

data/lib/aspera/agent/direct.rb

@@ -151,7 +151,7 @@ module Aspera
         args:
       )
         Aspera.assert_type(session, Hash)
-        notify_progress(session_id: nil, type: :pre_start, info: 'starting')
+        notify_progress(:pre_start, session_id: nil, info: 'starting')
         begin
           command_pid = nil
           # we use Socket directly, instead of TCPServer, as it gives access to lower level options
@@ -169,7 +169,7 @@ module Aspera
           # get location of command executable (ascp, async)
           command_path = Ascp::Installation.instance.path(name)
           command_pid = Environment.secure_spawn(env: env, exec: command_path, args: command_arguments)
-          notify_progress(session_id: nil, type: :pre_start, info: "waiting for #{name} to start")
+          notify_progress(:pre_start, session_id: nil, info: "waiting for #{name} to start")
           mgt_server_socket.listen(1)
           # TODO: timeout does not work when Process.spawn is used... until process exits, then it works
           Log.log.debug{"before select, timeout: #{@spawn_timeout_sec}"}
@@ -197,24 +197,23 @@ module Aspera
             Log.log.error((event['Description']).to_s) if event['Type'].eql?('FILEERROR') # cspell:disable-line
           end
           Log.log.debug('management io closed')
-          last_event = processor.last_event
           # check that last status was received before process exit
-          if last_event.is_a?(Hash)
-            case last_event['Type']
-            when 'ERROR'
-              if /bearer token/i.match?(last_event['Description']) &&
-                  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.
-                Log.log.warn('Regenerating token for transfer')
-                env['ASPERA_SCP_TOKEN'] = session[:token_regenerator].refreshed_transfer_token
-              end
-              raise Transfer::Error.new(last_event['Description'], last_event['Code'].to_i)
-            when 'DONE'
-              nil
-            else
-              raise "unexpected last event type: #{last_event['Type']}"
+          last_event = processor.last_event
+          raise Transfer::Error, "internal: no management event (#{last_event.class})" unless last_event.is_a?(Hash)
+          case last_event['Type']
+          when 'ERROR'
+            if /bearer token/i.match?(last_event['Description']) &&
+                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.
+              Log.log.warn('Regenerating token for transfer')
+              env['ASPERA_SCP_TOKEN'] = session[:token_regenerator].refreshed_transfer_token
             end
+            raise Transfer::Error.new(last_event['Description'], last_event['Code'].to_i)
+          when 'DONE'
+            nil
+          else
+            raise Transfer::Error, "unexpected last event type: #{last_event['Type']}, #{last_event['Description']}"
           end
         rescue SystemCallError => e
           # Process.spawn failed, or socket error
@@ -253,24 +252,24 @@ module Aspera
         when 'INIT'
           @pre_calc_sent = false
           @pre_calc_last_size = nil
-          notify_progress(session_id: session_id, type: :session_start)
+          notify_progress(:session_start, session_id: session_id)
         when 'NOTIFICATION' # sent from remote
           if event.key?('PreTransferBytes')
             @pre_calc_sent = true
-            notify_progress(session_id: session_id, type: :session_size, info: event['PreTransferBytes'])
+            notify_progress(:session_size, session_id: session_id, info: event['PreTransferBytes'])
           end
         when 'STATS' # during transfer
           @pre_calc_last_size = event['TransferBytes'].to_i + event['StartByte'].to_i
-          notify_progress(session_id: session_id, type: :transfer, info: @pre_calc_last_size)
+          notify_progress(:transfer, session_id: session_id, info: @pre_calc_last_size)
         when 'DONE', 'ERROR' # end of session
           total_size = event['TransferBytes'].to_i + event['StartByte'].to_i
           if !@pre_calc_sent && !total_size.zero?
-            notify_progress(session_id: session_id, type: :session_size, info: total_size)
+            notify_progress(:session_size, session_id: session_id, info: total_size)
           end
           if @pre_calc_last_size != total_size
-            notify_progress(session_id: session_id, type: :transfer, info: total_size)
+            notify_progress(:transfer, session_id: session_id, info: total_size)
           end
-          notify_progress(session_id: session_id, type: :end)
+          notify_progress(:end, session_id: session_id)
           # cspell:disable
         when 'SESSION'
         when 'ARGSTOP'

data/lib/aspera/agent/httpgw.rb

@@ -23,8 +23,7 @@ module Aspera
           @gw_api.upload(transfer_spec)
         when Transfer::Spec::DIRECTION_RECEIVE
           @gw_api.download(transfer_spec)
-        else
-          raise "unexpected direction: [#{transfer_spec['direction']}]"
+        else Aspera.error_unexpected_value(transfer_spec['direction']){'direction'}
         end
       end
 
@@ -54,7 +53,7 @@ module Aspera
           api_version:       api_version,
           upload_chunk_size: upload_chunk_size,
           synchronous:       synchronous,
-          notify_cb:         ->(**event) { notify_progress(**event) }
+          notify_cb:         ->(*pa, **ka) { notify_progress(*pa, **ka) }
         )
       end
     end

data/lib/aspera/agent/node.rb

@@ -78,7 +78,7 @@ module Aspera
         if !transfer_spec['wss_enabled'] && transfer_spec['remote_host'].eql?(URI.parse(node_api_.base_url).host)
           transfer_spec['remote_host'] = '127.0.0.1'
         end
-        resp = node_api_.create('ops/transfers', transfer_spec)[:data]
+        resp = node_api_.create('ops/transfers', transfer_spec)
         @transfer_id = resp['id']
         Log.log.debug{"tr_id=#{@transfer_id}"}
         return @transfer_id
@@ -92,31 +92,31 @@ module Aspera
         # lets emulate management events to display progress bar
         loop do
           # status is empty sometimes with status 200...
-          transfer_data = node_api_.read("ops/transfers/#{@transfer_id}")[:data] || {'status' => 'unknown'} rescue {'status' => 'waiting(api error)'}
+          transfer_data = node_api_.read("ops/transfers/#{@transfer_id}") || {'status' => 'unknown'} rescue {'status' => 'waiting(api error)'}
           case transfer_data['status']
           when 'waiting', 'partially_completed', 'unknown', 'waiting(read error)'
-            notify_progress(session_id: nil, type: :pre_start, info: transfer_data['status'])
+            notify_progress(:pre_start, session_id: nil, info: transfer_data['status'])
           when 'running'
             if !session_started
-              notify_progress(session_id: @transfer_id, type: :session_start)
+              notify_progress(:session_start, session_id: @transfer_id)
               session_started = true
             end
             message = transfer_data['status']
             message = "#{message} (#{transfer_data['error_desc']})" if !transfer_data['error_desc']&.empty?
-            notify_progress(session_id: nil, type: :pre_start, info: message)
+            notify_progress(:pre_start, session_id: nil, info: message)
             if bytes_expected.nil? &&
                 transfer_data['precalc'].is_a?(Hash) &&
                 transfer_data['precalc']['status'].eql?('ready')
               bytes_expected = transfer_data['precalc']['bytes_expected']
-              notify_progress(type: :session_size, session_id: @transfer_id, info: bytes_expected)
+              notify_progress(:session_size, session_id: @transfer_id, info: bytes_expected)
             end
-            notify_progress(type: :transfer, session_id: @transfer_id, info: transfer_data['bytes_transferred'])
+            notify_progress(:transfer, session_id: @transfer_id, info: transfer_data['bytes_transferred'])
           when 'completed'
-            notify_progress(type: :transfer, session_id: @transfer_id, info: bytes_expected) if bytes_expected
-            notify_progress(type: :end, session_id: @transfer_id)
+            notify_progress(:transfer, session_id: @transfer_id, info: bytes_expected) if bytes_expected
+            notify_progress(:end, session_id: @transfer_id)
             break
           when 'failed'
-            notify_progress(type: :end, session_id: @transfer_id)
+            notify_progress(:end, session_id: @transfer_id)
             # Bug in HSTS ? transfer is marked failed, but there is no reason
             break if transfer_data['error_code'].eql?(0) && transfer_data['error_desc'].empty?
             raise Transfer::Error, "status: #{transfer_data['status']}. code: #{transfer_data['error_code']}. description: #{transfer_data['error_desc']}"