aspera-cli 4.14.0 → 4.15.0

data/lib/aspera/sync.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
-# cspell:words logdir
+# cspell:words logdir bidi watchd cooloff asyncadmin
 
 require 'aspera/command_line_builder'
 require 'aspera/fasp/installation'
+require 'aspera/log'
 require 'json'
 require 'base64'
+require 'open3'
+require 'English'
 
 module Aspera
   # builds command line arg for async
-  class Sync
-    # default is push
+  module Sync
+    # sync direction, default is push
     DIRECTIONS = %i[push pull bidi].freeze
-    DIRECTION_TO_REQUEST_TYPE = {
-      push: :sync_upload,
-      pull: :sync_download,
-      bidi: :sync
-    }.freeze
     PARAMS_VX_INSTANCE =
       {
         'alt_logdir'          => { cli: { type: :opt_with_arg}, accepted_types: :string},
@@ -82,132 +80,140 @@ module Aspera
     }.freeze
 
     ASYNC_EXECUTABLE = 'async'
+    ASYNC_ADMIN_EXECUTABLE = 'asyncadmin'
 
-    private_constant :PARAMS_VX_INSTANCE, :PARAMS_VX_SESSION, :PARAMS_VX_KEYS, :ASYNC_EXECUTABLE, :TS_TO_PARAMS_V2
-
-    attr_reader :env_args
+    private_constant :PARAMS_VX_INSTANCE, :PARAMS_VX_SESSION, :PARAMS_VX_KEYS, :TS_TO_PARAMS_V2, :ASYNC_EXECUTABLE, :ASYNC_ADMIN_EXECUTABLE
+
+    class << self
+      # Set remote_dir in sync parameters based on transfer spec
+      # @param params [Hash] sync parameters, old or new format
+      # @param remote_dir_key [String] key to update in above hash
+      # @param transfer_spec [Hash] transfer spec
+      def update_remote_dir(sync_params, remote_dir_key, transfer_spec)
+        if transfer_spec.dig(*%w[tags aspera node file_id])
+          # in AoC, use gen4
+          sync_params[remote_dir_key] = '/'
+        elsif transfer_spec['cookie']&.start_with?('aspera.shares2')
+          # TODO : something more generic, independent of Shares
+          # in Shares, the actual folder on remote end is not always the same as the name of the share
+          actual_remote = transfer_spec['paths']&.first&.[]('source')
+          sync_params[remote_dir_key] = actual_remote if actual_remote
+        end
+        nil
+      end
 
-    # @param sync_params [Hash] sync parameters, old or new format
-    # @param node_sync [Object|nil]
-    def initialize(sync_params, node_sync)
-      raise StandardError, 'parameter must be Hash' unless sync_params.is_a?(Hash)
-      raise 'node_sync misses method transfer_spec' unless node_sync.nil? || node_sync.respond_to?(:transfer_spec)
-      @env_args = {
-        args: [],
-        env:  {}
-      }
-      if sync_params.key?('local')
-        # async native JSON format (v2)
-        raise StandardError, 'remote must be Hash' unless sync_params['remote'].is_a?(Hash)
-        unless node_sync.nil?
-          transfer_spec = node_sync.transfer_spec(sync_params['direction'], sync_params['local']['path'], sync_params['remote']['path'])
-          # async native JSON format
-          raise StandardError, 'local must be Hash' unless sync_params['local'].is_a?(Hash)
-          TS_TO_PARAMS_V2.each do |ts_param, sy_path|
-            next unless transfer_spec.key?(ts_param)
-            sy_dig = sy_path.split('.')
-            param = sy_dig.pop
-            hash = sy_dig.empty? ? sync_params : sync_params[sy_dig.first]
-            hash = sync_params[sy_dig.first] = {} if hash.nil?
-            hash[param] = transfer_spec[ts_param]
+      # @param sync_params [Hash] sync parameters, old or new format
+      # @param block [nil, Proc] block to generate transfer spec, takes: direction (one of DIRECTIONS), local_dir, remote_dir
+      def start(sync_params, &block)
+        raise 'Internal Error: sync_params parameter must be Hash' unless sync_params.is_a?(Hash)
+        env_args = {
+          args: [],
+          env:  {}
+        }
+        if sync_params.key?('local')
+          # async native JSON format (v2)
+          raise StandardError, 'remote must be Hash' unless sync_params['remote'].is_a?(Hash)
+          if block
+            transfer_spec = yield((sync_params['direction'] || 'push').to_sym, sync_params['local']['path'], sync_params['remote']['path'])
+            # async native JSON format
+            raise StandardError, 'sync parameter "local" must be Hash' unless sync_params['local'].is_a?(Hash)
+            TS_TO_PARAMS_V2.each do |ts_param, sy_path|
+              next unless transfer_spec.key?(ts_param)
+              sy_dig = sy_path.split('.')
+              param = sy_dig.pop
+              hash = sy_dig.empty? ? sync_params : sync_params[sy_dig.first]
+              hash = sync_params[sy_dig.first] = {} if hash.nil?
+              hash[param] = transfer_spec[ts_param]
+            end
+            sync_params['remote']['connect_mode'] ||= sync_params['remote'].key?('ws_port') ? 'ws' : 'ssh'
+            sync_params['remote']['private_key_paths'] ||= Fasp::Installation.instance.aspera_token_ssh_key_paths if transfer_spec.key?('token')
+            update_remote_dir(sync_params['remote'], 'path', transfer_spec)
           end
-          # 'remote.path',
-          sync_params['remote']['connect_mode'] ||= sync_params['remote'].key?('ws_port') ? 'ws' : 'ssh'
-          sync_params['remote']['private_key_paths'] ||= Fasp::Installation.instance.bypass_keys if transfer_spec.key?('token')
-          sync_params['remote']['path'] ||= '/' if transfer_spec.dig(*%w[tags aspera node file_id])
-        end
-        @env_args[:args] = ["--conf64=#{Base64.strict_encode64(JSON.generate(sync_params))}"]
-      elsif sync_params.key?('sessions')
-        # ascli JSON format (v1)
-        unless node_sync.nil?
-          sync_params['sessions'].each do |session|
-            transfer_spec = node_sync.transfer_spec(session['direction'], session['local_dir'], session['remote_dir'])
-            PARAMS_VX_SESSION.each do |async_param, behavior|
-              if behavior.key?(:ts)
-                tspec_param = behavior[:ts].is_a?(TrueClass) ? async_param : behavior[:ts].to_s
-                session[async_param] ||= transfer_spec[tspec_param] if transfer_spec.key?(tspec_param)
+          env_args[:args] = ["--conf64=#{Base64.strict_encode64(JSON.generate(sync_params))}"]
+        elsif sync_params.key?('sessions')
+          # ascli JSON format (v1)
+          if block
+            sync_params['sessions'].each do |session|
+              transfer_spec = yield((session['direction'] || 'push').to_sym, session['local_dir'], session['remote_dir'])
+              PARAMS_VX_SESSION.each do |async_param, behavior|
+                if behavior.key?(:ts)
+                  tspec_param = behavior[:ts].is_a?(TrueClass) ? async_param : behavior[:ts].to_s
+                  session[async_param] ||= transfer_spec[tspec_param] if transfer_spec.key?(tspec_param)
+                end
               end
+              session['private_key_paths'] = Fasp::Installation.instance.aspera_token_ssh_key_paths if transfer_spec.key?('token')
+              update_remote_dir(session, 'remote_dir', transfer_spec)
             end
-            session['private_key_paths'] = Fasp::Installation.instance.bypass_keys if transfer_spec.key?('token')
-            session['remote_dir'] = '/' if transfer_spec.dig(*%w[tags aspera node file_id])
           end
-        end
-        raise StandardError, "Only 'sessions', and optionally 'instance' keys are allowed" unless
-          sync_params.keys.push('instance').uniq.sort.eql?(PARAMS_VX_KEYS)
-        raise StandardError, 'sessions key must be Array' unless sync_params['sessions'].is_a?(Array)
-        raise StandardError, 'sessions key requires at least one Hash' unless sync_params['sessions'].first.is_a?(Hash)
+          raise StandardError, "Only 'sessions', and optionally 'instance' keys are allowed" unless
+            sync_params.keys.push('instance').uniq.sort.eql?(PARAMS_VX_KEYS)
+          raise StandardError, 'sessions key must be Array' unless sync_params['sessions'].is_a?(Array)
+          raise StandardError, 'sessions key requires at least one Hash' unless sync_params['sessions'].first.is_a?(Hash)
+
+          if sync_params.key?('instance')
+            raise StandardError, 'instance key must be Hash' unless sync_params['instance'].is_a?(Hash)
+            instance_builder = Aspera::CommandLineBuilder.new(sync_params['instance'], PARAMS_VX_INSTANCE)
+            instance_builder.process_params
+            instance_builder.add_env_args(env_args)
+          end
 
-        if sync_params.key?('instance')
-          raise StandardError, 'instance key must be Hash' unless sync_params['instance'].is_a?(Hash)
-          instance_builder = Aspera::CommandLineBuilder.new(sync_params['instance'], PARAMS_VX_INSTANCE)
-          instance_builder.process_params
-          instance_builder.add_env_args(@env_args[:env], @env_args[:args])
+          sync_params['sessions'].each do |session_params|
+            raise StandardError, 'sessions must contain hashes' unless session_params.is_a?(Hash)
+            raise StandardError, 'session must contain at least name' unless session_params.key?('name')
+            session_builder = Aspera::CommandLineBuilder.new(session_params, PARAMS_VX_SESSION)
+            session_builder.process_params
+            session_builder.add_env_args(env_args)
+          end
+        else
+          raise 'At least one of `local` or `sessions` must be present in async parameters'
         end
-
-        sync_params['sessions'].each do |session_params|
-          raise StandardError, 'sessions must contain hashes' unless session_params.is_a?(Hash)
-          raise StandardError, 'session must contain at least name' unless session_params.key?('name')
-          session_builder = Aspera::CommandLineBuilder.new(session_params, PARAMS_VX_SESSION)
-          session_builder.process_params
-          session_builder.add_env_args(@env_args[:env], @env_args[:args])
+        Log.log.debug{Log.dump(:sync_params, sync_params)}
+
+        Log.log.debug{"execute: #{env_args[:env].map{|k, v| "#{k}=\"#{v}\""}.join(' ')} \"#{ASYNC_EXECUTABLE}\" \"#{env_args[:args].join('" "')}\""}
+        res = system(env_args[:env], [ASYNC_EXECUTABLE, ASYNC_EXECUTABLE], *env_args[:args])
+        Log.log.debug{"result=#{res}"}
+        case res
+        when true then return nil
+        when false then raise "failed: #{$CHILD_STATUS}"
+        when nil then raise "not started: #{$CHILD_STATUS}"
+        else raise 'internal error: unspecified case'
         end
-      else
-        raise 'At least one of `local` or `sessions` must be present in async parameters'
       end
-      Log.dump(:sync, sync_params)
-    end
 
-    def start
-      Log.log.debug{"execute: #{@env_args[:env].map{|k, v| "#{k}=\"#{v}\""}.join(' ')} \"#{ASYNC_EXECUTABLE}\" \"#{@env_args[:args].join('" "')}\""}
-      res = system(@env_args[:env], [ASYNC_EXECUTABLE, ASYNC_EXECUTABLE], *@env_args[:args])
-      Log.log.debug{"result=#{res}"}
-      case res
-      when true then return nil
-      when false then raise "failed: #{$CHILD_STATUS}"
-      when nil then raise "not started: #{$CHILD_STATUS}"
-      else raise 'internal error: unspecified case'
-      end
-    end
-  end # end Sync
-
-  class SyncAdmin
-    ASYNC_ADMIN_EXECUTABLE = 'asyncadmin'
-    private_constant :ASYNC_ADMIN_EXECUTABLE
-    def initialize(sync_params, session_name)
-      @cmdline = [ASYNC_ADMIN_EXECUTABLE, '--quiet']
-      if sync_params.key?('local')
-        raise 'Missing session name' if sync_params['name'].nil?
-        raise 'Session not found' unless session_name.nil? || session_name.eql?(sync_params['name'])
-        @cmdline.push("--name=#{sync_params['name']}")
-        if sync_params.key?('local_db_dir')
-          @cmdline.push("--local-db-dir=#{sync_params['local_db_dir']}")
-        elsif sync_params.dig('local', 'path')
-          @cmdline.push("--local-dir=#{sync_params.dig('local', 'path')}")
-        else
-          raise 'Missing either local_db_dir or local.path'
-        end
-      elsif sync_params.key?('sessions')
-        session = session_name.nil? ? sync_params['sessions'].first : sync_params['sessions'].find{|s|s['name'].eql?(session_name)}
-        raise 'Session not found' if session.nil?
-        raise 'Missing session name' if session['name'].nil?
-        @cmdline.push("--name=#{session['name']}")
-        if session.key?('local_db_dir')
-          @cmdline.push("--local-db-dir=#{session['local_db_dir']}")
-        elsif session.key?('local_dir')
-          @cmdline.push("--local-dir=#{session['local_dir']}")
+      def admin_status(sync_params, session_name)
+        command_line = [ASYNC_ADMIN_EXECUTABLE, '--quiet']
+        if sync_params.key?('local')
+          raise 'Missing session name' if sync_params['name'].nil?
+          raise 'Session not found' unless session_name.nil? || session_name.eql?(sync_params['name'])
+          command_line.push("--name=#{sync_params['name']}")
+          if sync_params.key?('local_db_dir')
+            command_line.push("--local-db-dir=#{sync_params['local_db_dir']}")
+          elsif sync_params.dig('local', 'path')
+            command_line.push("--local-dir=#{sync_params.dig('local', 'path')}")
+          else
+            raise 'Missing either local_db_dir or local.path'
+          end
+        elsif sync_params.key?('sessions')
+          session = session_name.nil? ? sync_params['sessions'].first : sync_params['sessions'].find{|s|s['name'].eql?(session_name)}
+          raise "Session #{session_name} not found in #{sync_params['sessions'].map{|s|s['name']}.join(',')}" if session.nil?
+          raise 'Missing session name' if session['name'].nil?
+          command_line.push("--name=#{session['name']}")
+          if session.key?('local_db_dir')
+            command_line.push("--local-db-dir=#{session['local_db_dir']}")
+          elsif session.key?('local_dir')
+            command_line.push("--local-dir=#{session['local_dir']}")
+          else
+            raise 'Missing either local_db_dir or local_dir'
+          end
         else
-          raise 'Missing either local_db_dir or local_dir'
+          raise 'At least one of `local` or `sessions` must be present in async parameters'
         end
-      else
-        raise 'At least one of `local` or `sessions` must be present in async parameters'
+        Log.log.debug{"execute: #{command_line.join(' ')}"}
+        stdout, stderr, status = Open3.capture3(*command_line)
+        Log.log.debug{"status=#{status}, stderr=#{stderr}"}
+        raise "Sync failed: #{status.exitstatus} : #{stderr}" unless status.success?
+        return stdout.split("\n").each_with_object({}){|l, m|i = l.split(':', 2); m[i.first.lstrip] = i.last.lstrip} # rubocop:disable Style/Semicolon
       end
     end
-
-    def status
-      stdout, stderr, status = Open3.capture3(*@cmdline)
-      Log.log.debug{"status=#{status}, stderr=#{stderr}"}
-      raise "Sync failed: #{status.exitstatus} : #{stderr}" unless status.success?
-      return stdout.split("\n").each_with_object({}){|l, m|i = l.split(/:  */); m[i.first.lstrip] = i.last.lstrip} # rubocop:disable Style/Semicolon
-    end
-  end
-end
+  end # end Sync
+end # end Aspera

data/lib/aspera/temp_file_manager.rb

@@ -14,14 +14,21 @@ module Aspera
     FILE_LIST_AGE_MAX_SEC = SEC_IN_DAY * 5
     private_constant :SEC_IN_DAY, :FILE_LIST_AGE_MAX_SEC
     include Singleton
+    attr_accessor :cleanup_on_exit
+
     def initialize
       @created_files = []
+      @cleanup_on_exit = true
+    end
+
+    def delete_file(filepath)
+      File.delete(filepath) if @cleanup_on_exit
     end
 
     # call this on process exit
     def cleanup
       @created_files.each do |filepath|
-        File.delete(filepath) if File.file?(filepath)
+        delete_file(filepath) if File.file?(filepath)
       end
       @created_files = []
     end
@@ -29,7 +36,7 @@ module Aspera
     # ensure that provided folder exists, or create it, generate a unique filename
     # @return path to that unique file
     def new_file_path_in_folder(temp_folder, add_base = '')
-      FileUtils.mkdir_p(temp_folder) unless Dir.exist?(temp_folder)
+      FileUtils.mkdir_p(temp_folder)
       new_file = File.join(temp_folder, add_base + SecureRandom.uuid)
       @created_files.push(new_file)
       new_file
@@ -54,7 +61,7 @@ module Aspera
         # check age of file, delete too old
         if File.file?(file_path) && (age_sec > FILE_LIST_AGE_MAX_SEC)
           Log.log.debug{"garbage collecting #{name}"}
-          File.delete(file_path)
+          delete_file(file_path)
         end
       end
     end

data/lib/aspera/web_auth.rb

@@ -6,20 +6,22 @@ require 'stringio'
 module Aspera
   # servlet called on callback: it records the callback request
   class WebAuthServlet < WEBrick::HTTPServlet::AbstractServlet
-    def initialize(server, application) # additional args get here
+    # @param server [WEBrick::HTTPServer]
+    # @param web_auth [WebAuth]
+    def initialize(server, web_auth)
       Log.log.debug('WebAuthServlet initialize')
       super(server)
-      @app = application
+      @web_auth = web_auth
     end
 
     def service(request, response)
       Log.log.debug{"received request from browser #{request.request_method} #{request.path}"}
       raise WEBrick::HTTPStatus::MethodNotAllowed, "unexpected method: #{request.request_method}" unless request.request_method.eql?('GET')
-      raise WEBrick::HTTPStatus::NotFound, "unexpected path: #{request.path}" unless request.path.eql?(@app.expected_path)
+      raise WEBrick::HTTPStatus::NotFound, "unexpected path: #{request.path}" unless request.path.eql?(@web_auth.expected_path)
       # acquire lock and signal change
-      @app.mutex.synchronize do
-        @app.query = request.query
-        @app.cond.signal
+      @web_auth.mutex.synchronize do
+        @web_auth.query = request.query
+        @web_auth.cond.signal
       end
       response.status = 200
       response.content_type = 'text/html'
@@ -42,7 +44,8 @@ module Aspera
       @cond = ConditionVariable.new
       @expected_path = uri.path.empty? ? '/' : uri.path
       @query = nil
-      mount(@expected_path, WebAuthServlet, self) # additional args provided to constructor
+      # last argument (self) is provided to constructor of servlet
+      mount(@expected_path, WebAuthServlet, self)
       Thread.new { start }
     end
 

data/lib/aspera/web_server_simple.rb

@@ -8,12 +8,17 @@ require 'openssl'
 module Aspera
   class WebServerSimple < WEBrick::HTTPServer
     CERT_PARAMETERS = %i[key cert chain].freeze
+    GENERIC_ISSUER = '/C=FR/O=Test/OU=Test/CN=Test'
+    ONE_YEAR_SECONDS = 365 * 24 * 60 * 60
+
+    private_constant :CERT_PARAMETERS, :GENERIC_ISSUER, :ONE_YEAR_SECONDS
+
     class << self
       # generates and adds self signed cert to provided webrick options
-      def fill_self_signed_cert(cert, key)
-        cert.subject = cert.issuer = OpenSSL::X509::Name.parse('/C=FR/O=Test/OU=Test/CN=Test')
+      def fill_self_signed_cert(cert, key, digest = 'SHA256')
+        cert.subject = cert.issuer = OpenSSL::X509::Name.parse(GENERIC_ISSUER)
         cert.not_before = Time.now
-        cert.not_after = Time.now + 365 * 24 * 60 * 60
+        cert.not_after = Time.now + ONE_YEAR_SECONDS
         cert.public_key = key.public_key
         cert.serial = 0x0
         cert.version = 2
@@ -26,7 +31,7 @@ module Aspera
           # ef.create_extension('keyUsage', 'cRLSign,keyCertSign', true),
         ]
         cert.add_extension(ef.create_extension('authorityKeyIdentifier', 'keyid:always,issuer:always'))
-        cert.sign(key, OpenSSL::Digest.new('SHA256'))
+        cert.sign(key, OpenSSL::Digest.new(digest))
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspera-cli
 version: !ruby/object:Gem::Version
-  version: 4.14.0
+  version: 4.15.0
 platform: ruby
 authors:
 - Laurent Martin
@@ -37,24 +37,24 @@ cert_chain:
   eTf9kxhVM40wGQOECVNA8UsEEZHD48eF+csUYZtAJOF5oxTI8UyV9T/o6CgO0c9/
   Gzz+Qm5ULOUcPiJLjSpaiTrkiIVYiDGnqNSr6R1Hb1c=
   -----END CERTIFICATE-----
-date: 2023-09-22 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: blankslate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -68,19 +68,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: net-smtp
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +221,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -369,13 +383,11 @@ files:
 - lib/aspera/ascmd.rb
 - lib/aspera/ats_api.rb
 - lib/aspera/cli/basic_auth_plugin.rb
+- lib/aspera/cli/error.rb
 - lib/aspera/cli/extended_value.rb
 - lib/aspera/cli/formatter.rb
+- lib/aspera/cli/hints.rb
 - lib/aspera/cli/info.rb
-- lib/aspera/cli/listener/line_dump.rb
-- lib/aspera/cli/listener/logger.rb
-- lib/aspera/cli/listener/progress.rb
-- lib/aspera/cli/listener/progress_multi.rb
 - lib/aspera/cli/main.rb
 - lib/aspera/cli/manager.rb
 - lib/aspera/cli/plugin.rb
@@ -393,8 +405,9 @@ files:
 - lib/aspera/cli/plugins/preview.rb
 - lib/aspera/cli/plugins/server.rb
 - lib/aspera/cli/plugins/shares.rb
-- lib/aspera/cli/plugins/sync.rb
+- lib/aspera/cli/sync_actions.rb
 - lib/aspera/cli/transfer_agent.rb
+- lib/aspera/cli/transfer_progress.rb
 - lib/aspera/cli/version.rb
 - lib/aspera/colors.rb
 - lib/aspera/command_line_builder.rb
@@ -407,6 +420,7 @@ files:
 - lib/aspera/data/6
 - lib/aspera/data_repository.rb
 - lib/aspera/environment.rb
+- lib/aspera/fasp/agent_aspera.rb
 - lib/aspera/fasp/agent_base.rb
 - lib/aspera/fasp/agent_connect.rb
 - lib/aspera/fasp/agent_direct.rb
@@ -415,10 +429,12 @@ files:
 - lib/aspera/fasp/agent_trsdk.rb
 - lib/aspera/fasp/error.rb
 - lib/aspera/fasp/error_info.rb
+- lib/aspera/fasp/faux_file.rb
 - lib/aspera/fasp/installation.rb
-- lib/aspera/fasp/listener.rb
+- lib/aspera/fasp/management.rb
 - lib/aspera/fasp/parameters.rb
 - lib/aspera/fasp/parameters.yaml
+- lib/aspera/fasp/products.rb
 - lib/aspera/fasp/resume_policy.rb
 - lib/aspera/fasp/transfer_spec.rb
 - lib/aspera/fasp/uri.rb
@@ -426,8 +442,10 @@ files:
 - lib/aspera/faspex_postproc.rb
 - lib/aspera/hash_ext.rb
 - lib/aspera/id_generator.rb
+- lib/aspera/json_rpc.rb
 - lib/aspera/keychain/encrypted_hash.rb
 - lib/aspera/keychain/macos_security.rb
+- lib/aspera/line_logger.rb
 - lib/aspera/log.rb
 - lib/aspera/nagios.rb
 - lib/aspera/node.rb

data/lib/aspera/cli/listener/line_dump.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'aspera/fasp/listener'
-require 'json'
-
-module Aspera
-  module Cli
-    module Listener
-      # listener for FASP transfers (debug)
-      # FASP event listener display management events as JSON
-      class LineDump < Aspera::Fasp::Listener
-        def event_enhanced(data)
-          $stdout.puts(JSON.generate(data))
-          $stdout.flush
-        end
-      end
-    end
-  end
-end

data/lib/aspera/cli/listener/logger.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require 'aspera/fasp/listener'
-require 'aspera/log'
-
-module Aspera
-  module Cli
-    module Listener
-      # listener for FASP transfers (debug)
-      class Logger < Aspera::Fasp::Listener
-        def event_struct(data)
-          Log.log.debug(data.to_s)
-          Log.log.error((data['Description']).to_s) if data['Type'].eql?('FILEERROR')
-        end
-
-        def event_enhanced(data)
-          Log.log.debug(JSON.generate(data))
-        end
-      end
-    end
-  end
-end

data/lib/aspera/cli/listener/progress.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require 'aspera/fasp/listener'
-require 'aspera/environment'
-require 'ruby-progressbar'
-
-module Aspera
-  module Cli
-    module Listener
-      # a listener to FASP event that displays a progress bar
-      class Progress < Aspera::Fasp::Listener
-        def initialize
-          super
-          @progress = nil
-          @cumulative = 0
-        end
-
-        def event_struct(data)
-          case data['Type']
-          when 'NOTIFICATION'
-            if data.key?('PreTransferBytes')
-              @progress = ProgressBar.create(
-                format:      '%a %B %p%% %r Mbps %e',
-                rate_scale:  lambda{|rate|rate / Environment::BYTES_PER_MEBIBIT},
-                title:       'progress',
-                total:       data['PreTransferBytes'].to_i)
-            end
-          when 'STOP'
-            # stop event when one file is completed
-            @cumulative += data['Size'].to_i
-          when 'STATS'
-            if @progress.nil?
-              puts '.'
-            else
-              @progress.progress = data.key?('Bytescont') ? @cumulative + data['Bytescont'].to_i : data['TransferBytes'].to_i
-            end
-          when 'DONE'
-            if @progress.nil?
-              # terminate progress by going to next line
-              puts "\n"
-            else
-              @progress.progress = @progress.total
-              @progress = nil
-            end
-          end
-        end
-      end
-    end
-  end
-end