aspera-cli 4.25.3 → 4.25.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d01aecb4590218d1028c4d4653c255394294cca477508cd802cf53b72acee927
-  data.tar.gz: 0ecb307d12fcc0daaa6d465928533d5fc95ac3f66218cc5b6c552d7e044aa822
+  metadata.gz: 34cb77d2badea1e3650f2aed72fb3a91c419e6457a08acd62808c9a6d9ab0e74
+  data.tar.gz: 31e1e1a28d99afebd6b6a3f7b9e848bf18256d47fdc7108368a6e964eef03b04
 SHA512:
-  metadata.gz: 01ba11f7c24c0f9f869770c9035edd0e2d7d06b77fb71ca00a16cf59829e6abaf758fe5c9a0e131019e6a11e09a58b1c1e9fb4cc9a7818bcda63fdf3ef8e8969
-  data.tar.gz: a70ffa0f67294841bb18a53720c656c2eea4d904cf0c14db259203cf75aa05090a2c64b040807d1d5bfd7eb7288969feb1756adc97415bc3b142cf3b55d2d48d
+  metadata.gz: e15bfb65919b8b8a6112120eca273dac962ff6d6b29d890df1e9293f4321e557bdd68697c394cb6ef738a3d5bcc3a75a2f7f177494b66542c2e970c4da99e9d0
+  data.tar.gz: 1d3570c590e7bfbda3ce5fc49396637471f48ff6fccce7235ae31adcc23c1e1ccc4a978d6bdbe9a4c1c06f06e02ed5336043267891c0b56a995b4d0199ab0d92

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 <!-- markdownlint-configure-file { "no-duplicate-heading": { "siblings_only": true } } -->
 
+## 4.25.4
+
+Released: 2026-03-04
+
+### New Features
+
+* **general**: If `@:` is used, then marker `END` optionally marks the end of collected arguments.
+* `format`: `display` defaults to `info` only if `format` is set to `table`, else defaults to `data`.
+* `node`: Parameter `accept_v4` of option `node_api` (boolean, defaults to `true`) allows using gen4 browsing with `Accept-Version: 4.0` for best performance when there are thousands of files.
+
+### Issues Fixed
+
+* `faspex5`: Listing content, or receiving a package requires API parameter: `recipient_user_id` or `recipient_workgroup_id`, else error `Not authorized` is returned.
+
+### Breaking Changes
+
+* `node`: Options `node_cache` and `default_ports` are replaced with option: `node_api` (`Hash`) with boolean parameters (keys): `cache` and `standard_ports` with default value `true`.
+
 ## 4.25.3
 
 Released: 2026-02-18

data/CONTRIBUTING.md

@@ -2,22 +2,23 @@
 
 ## Reporting Issues and Vulnerabilities
 
-If you encounter a problem or a security vulnerability, please report it on [GitHub Issues](https://github.com/IBM/aspera-cli/issues).
+If you encounter a bug or a security vulnerability, please report it via [GitHub Issues](https://github.com/IBM/aspera-cli/issues).
 
-Before submitting a new issue:
+Before submitting a new report:
 
-- Search existing issues to see if your problem has already been reported or resolved.
+- **Search existing issues** to determine if the problem has already been documented or resolved.
 
-To help us assist you efficiently, include the following in your report:
+To help us diagnose and resolve the issue efficiently, please include the following in your report:
 
-- The version of `ascli` you are using:
+- The `ascli` version you are using:
 
   ```bash
-  ascli version
+  ascli -v
   ```
 
-- Confirmation that you are using the latest version (update it if needed).
-- Your Ruby version information:
+- **Update confirmation**: Verify that you are running the latest version.
+
+- **Your Ruby environment details**:
 
   ```bash
   ruby -v
@@ -29,7 +30,7 @@ We welcome contributions to improve the `aspera-cli` project!
 
 ### Getting Started
 
-Clone the repository and navigate to the project's root directory:
+Clone the repository to initialize the development environment:
 
 ```bash
 git clone https://github.com/IBM/aspera-cli.git
@@ -38,55 +39,55 @@ bundle install
 bundle exec rake -T
 ```
 
-For testing instructions, refer to [Running Tests](#running-tests).
+For detailed testing instructions, please refer to [Running Tests](#running-tests).
 
 ### How to Contribute
 
-To submit a contribution:
+To submit a contribution, follow these steps:
 
 1. **Fork** the repository on GitHub.
 
-1. **Create a feature branch** for your changes.
+1. **Create a feature branch** specifically for your changes.
 
 1. **Implement** your feature or bug fix.
 
 1. **Write tests** to ensure your changes are robust and prevent regressions.
 
-1. Run `rubocop` to ensure your code follows the Ruby style guide.
+1. **Run** `rubocop` to ensure your code adheres to the Ruby style guide.
 
-1. Update `CHANGELOG.md` with a summary of your changes.
+1. **Update** `CHANGELOG.md` with a concise summary of your changes.
 
-1. Submit a **pull request** with a clear description of your contribution.
+1. **Submit a pull request** with a detailed description of your work.
 
 > [!TIP]
-> Make sure your pull request is focused and includes only relevant changes.
+> Keep pull requests focused; include only changes relevant to the specific feature or fix.
 
 ## Architecture
 
-The overall architecture of `aspera-cli` is modular and extensible.
+The `aspera-cli` architecture is designed to be modular and extensible.
 
 ![Architecture](docs/architecture.png)
 
 ### Structure Highlights
 
-- Entry Point:
+- **Entry Point**:
 
-  `lib/aspera/cli/main.rb`, CLI startup logic.
+  `lib/aspera/cli/main.rb` contains the core CLI startup logic.
 
-- Plugins:
+- **Plugins**:
 
-  Located in `lib/aspera/cli/plugins`; plugins extend CLI functionality and encapsulate specific features.
+  Located in `lib/aspera/cli/plugins`, these extend CLI functionality and encapsulate specific features.
 
-- Transfer Agents:
+- **Transfer Agents**:
 
-  Found in `lib/aspera/agent`, these handle data transfer operations.
+  Located in `lib/aspera/agent`, these components manage data transfer operations.
 
-Class diagrams are provided in <docs/uml.png>
+Detailed class diagrams are available in <docs/uml.png>
 
 ## Ruby Environment
 
-`aspera-cli` is written in Ruby.
-You can install Ruby using any method you prefer (e.g., `rbenv`, `rvm`, system package manager).
+`aspera-cli` is built with Ruby.
+You can manage your Ruby installation using your preferred tool (e.g., `rbenv`, `rvm`, or a system package manager).
 
 To start with a clean state and remove all installed gems:
 
@@ -95,35 +96,34 @@ bundle exec rake tools:clean_gems
 ```
 
 > [!TIP]
-> This is especially useful before testing across different Ruby versions or preparing for a release.
+> This is particularly useful when testing across different Ruby versions or preparing for a new release.
 
 ## Toolchain
 
-The build system uses Ruby's `rake`.
+The build system is powered by Ruby's `rake`.
 
-### Environment
+### Environment Configuration
 
-A few macros and environment variables control certain aspects of the build:
+The following environment variables and macros control specific build behaviors:
 
-| Environment variable        | Description                                         |
-|-----------------------------|-----------------------------------------------------|
-| `ASPERA_CLI_TEST_CONF_URL`  | URL for configuration file with secrets for tests.  |
-| `ASPERA_CLI_DOC_CHECK_LINKS`| Check links still exist during doc generation.      |
-| `LOG_LEVEL`                 | Change log level in `rake` tasks.                   |
-| `LOG_SECRETS`               | Change log secrets in `rake` tasks.                   |
-| `ENABLE_COVERAGE`           | Enable test coverage analysis when set.             |
-| `SIGNING_KEY`               | Path to the signing key used to build the gem file. |
-| `SIGNING_KEY_PEM`           | PEM of signing key.                                 |
+| Environment variable        | Contents   | Description                                                  |
+|-----------------------------|------------| -------------------------------------------------------------|
+| `ASPERA_CLI_TEST_CONF_URL`  | URL        | URL for the configuration file containing secrets for tests. |
+| `ASPERA_CLI_DOC_CHECK_LINKS`| yes/no     | Validates that links exist during documentation generation.  |
+| `LOG_SECRETS`               | yes/no     | Toggles the logging of secrets in `rake` tasks.              |
+| `LOG_LEVEL`                 | debug, ... | Sets the logging verbosity for `rake` tasks.                 |
+| `ENABLE_COVERAGE`           | set/unset  | Enables test coverage analysis when defined.                 |
+| `SIGNING_KEY`               | File path  | Path to the signing key used for building the gem file.      |
+| `SIGNING_KEY_PEM`           | PEM Value  | The PEM content of the signing key.                          |
 
-These can be set either as environment variables or directly on the `rake` command line.
+These values can be set as standard environment variables or passed directly to the `rake` command.
 
-Setting `SIGNING_KEY_PEM` creates file `$HOME/.gem/signing_key.pem` and sets `SIGNING_KEY` to that path.
+Setting `SIGNING_KEY_PEM` automatically generates a file at `$HOME/.gem/signing_key.pem` and sets the `SIGNING_KEY` variable accordingly.
 
 > [!NOTE]
-> Environment variables `ASPERA_CLI_*` are typically set in the user’s shell profile for development.
-> Others are intended for use on the command line.
+> `ASPERA_CLI_*` variables are typically defined in your shell profile for development, while others are intended for ad-hoc command-line use.
 
-To use the CLI directly from the development environment, add this to your shell profile (adapt the real path):
+To run the CLI directly from your source directory, add the following to your shell profile (adjust the path as necessary):
 
 ```bash
 dev_ascli=$HOME/github/aspera-cli
@@ -135,26 +135,27 @@ export RUBYLIB=$dev_ascli/lib:$RUBYLIB
 
 Documentation is generated with `pandoc` and `LaTeX`.
 
-The IBM `Plex` font is used; for installation instructions, see [IBM Plex](https://www.ibm.com/plex/).
+The project utilizes the **IBM Plex font**.
+Installation instructions can be found at [IBM Plex](https://www.ibm.com/plex/).
 
-On macOS, to install `lualatex` and all packages:
+On macOS, install `lualatex` and required packages via Homebrew:
 
 ```bash
 brew install texlive
 ```
 
-If `lualatex` is installed using another method, ensure that the following packages are installed:
+If using an alternative installation method, ensure the following packages are present:
 
 ```bash
 tlmgr update --self
 tlmgr install fvextra selnolig lualatex-math
 ```
 
-To check URLs during documentation generation, set the environment variable: `ASPERA_CLI_DOC_CHECK_LINKS=1`.
+- To validate URLs during generation: `ASPERA_CLI_DOC_CHECK_LINKS=1`.
 
-To debug documentation generation, set the environment variable: `ASPERA_CLI_DOC_DEBUG=debug`.
+- To debug the generation process: `ASPERA_CLI_DOC_DEBUG=debug`.
 
-To generate documentation:
+- To build the documentation:
 
 ```bash
 rake doc:build
@@ -162,18 +163,18 @@ rake doc:build
 
 ## Test Environment
 
-Refer to <tests/README.md>.
+Detailed testing information can be found in <tests/README.md>.
 
 ## Build
 
-The unsigned gem is built with:
+To build an unsigned gem:
 
 ```bash
 bundle install
 bundle exec rake unsigned
 ```
 
-If you don't want to install optional gems:
+To exclude optional gems from the installation:
 
 ```bash
 bundle config set without optional
@@ -181,35 +182,34 @@ bundle config set without optional
 
 ### Signed gem
 
-A private key is required to generate a signed gem.
-Its path must be set using environment variable `SIGNING_KEY`.
-The gem is signed with the public certificate found in `certs` and the private key specified by `SIGNING_KEY` (kept secret by the maintainer).
+Generating a signed gem requires a **private key**, specified via the `SIGNING_KEY` environment variable.
+The gem is signed using the public certificate in `certs` and the **private key**.
 
 ```bash
 bundle exec rake SIGNING_KEY=/path/to/vault/gem-private_key.pem
 ```
 
-Refer to <certs/README.md>.
+For more details, see <certs/README.md>.
 
-### gRPC stubs for transfer SDK
+### gRPC stubs for Transfer SDK
 
-Update with:
+To update the stubs:
 
 ```bash
 bundle exec rake tools:grpc
 ```
 
-It downloads the latest `proto` file and then compiles it into ruby sources included in the repo.
+This task downloads the latest `.proto` files and compiles them into the Ruby source files included in the repository.
 
 ## Container image build
 
-See [Container build](./container/README.md).
+Refer to the [Container build guide](./container/README.md).
 
 ## Single executable build
 
-See [Executable build](build/binary/README.md).
+Refer to the [Executable build guide](build/binary/README.md).
 
-To list operations:
+To list related `rake` tasks:
 
 ```bash
 bundle exec rake -T ^binary:
@@ -219,25 +219,26 @@ bundle exec rake -T ^binary:
 
 ### Branching Strategy
 
-This project uses a single `main` branch for development.
-During the development cycle, the version in `lib/aspera/cli/version.rb` uses a `.pre` suffix (e.g., `x.y.z.pre`) to indicate a pre-release state.
+This project maintains a single `main` branch.
+During development, the version in `lib/aspera/cli/version.rb` includes a `.pre` suffix (e.g., `x.y.z.pre`).
+
+Contributions are handled as follows:
 
-Feature development and bug fixes can be done either:
+- **Direct commits** to `main`: Permitted for minor changes.
 
-- Directly on `main` for small changes
-- Via feature branches with pull requests for larger changes
+- **Feature branches**: Required for significant changes via pull requests.
 
-### Checklist Before a New Release
+### Pre-Release Checklist
 
-When preparing for a new release, do the following:
+Before a new release, ensure the following:
 
-- Run the test suite:
+- **Pass all tests**:
 
 ```bash
 bundle exec rake test:run
 ```
 
-- Verify that the container builds successfully (using the local gem file):
+- **Verify container builds** (using the local gem):
 
 ```bash
 bundle exec rake container:build'[local]'
@@ -246,60 +247,61 @@ bundle exec rake container:test
 
 ### Automated Release Process
 
-Releases are triggered via the GitHub Actions UI using the **Release** workflow (`.github/workflows/release.yml`).
+Releases are managed through the GitHub Actions UI via the **New Release on GitHub** workflow (`.github/workflows/release.yml`).
+
+1. Navigate to **Actions** > **New Release on GitHub**
+2. Select **Run workflow**
+3. (Optionally) Specify:
+   - **Release version**: Defaults to the current `version.rb` value (minus the `.pre` suffix).
 
-To create a release:
+     e.g. current `a.b.c.pre` &rarr; `a.b.c`.
+   - **Next development version**: Defaults to an incremented minor version with the `.pre` suffix.
 
-1. Navigate to **Actions** > **Release** in the GitHub repository
-2. Click **Run workflow**
-3. Optionally specify:
-   - **Release version**: The version to release. If left empty, uses the current version from `version.rb` without the `.pre` suffix.
-   - **Next development version**: The next version to prepare for. If left empty, auto-increments the minor version. The `.pre` suffix is added automatically.
+     e.g. release `a.b.c` &rarr; `a.(b+1).0.pre`.
 4. Click **Run workflow**
 
-The workflow automatically:
+The automated workflow performs the following:
 
-1. Updates `version.rb` with the release version
-2. Rebuilds documentation (PDF manual, Markdown README)
+1. Updates `version.rb` to the release version
+2. Rebuilds all documentation (PDF and Markdown)
 3. Commits the changes
 4. Creates and pushes the release tag
 5. Triggers the `deploy` workflow to publish to [rubygems.org](https://rubygems.org/gems/aspera-cli)
-6. Updates `version.rb` to the next development version with `.pre` suffix
-7. Commits and pushes the version bump in main branch.
+6. Increments `version.rb` to the next development version.
+7. Commits and pushes the version bump to `main`.
 
 ### Manual Release Process (Alternative)
 
-If needed, releases can still be done manually.
-Basically, follow the same procedure as in the GitHub action:
+If necessary, you can mirror the automated process manually:
 
 - Update the version in `lib/aspera/cli/version.rb` (remove `.pre` suffix)
 
-- Build the PDF manual in `pkg`:
+- Build the PDF manual:
 
 ```shell
 bundle exec rake doc:build
 ```
 
-- Build the signed `.gem` in `pkg`:
+- Build the signed gem:
 
 ```shell
 bundle exec rake SIGNING_KEY=/path/to/vault/gem-private_key.pem
 ```
 
-- Create the release version tag and push it to GitHub:
+- Tag the release and push to GitHub:
 
 ```shell
 bundle exec rake release_tag
 ```
 
-This will trigger the action `.github/workflows/deploy.yml`, which builds the gem file and pushes it to RubyGems.
+This triggers the `.github/workflows/deploy.yml` action to publish to RubyGems.
 
-- After release, update `version.rb` to the next development version with `.pre` suffix
+- Update `version.rb` to the next `.pre` development version.
 
 ## Future Improvements
 
-- Replace custom REST and OAuth classes with standard Ruby gems ?
-  - <https://github.com/rest-client/rest-client>
-  - <https://github.com/oauth-xx/oauth2>
-- Use the `thor` gem <http://whatisthor.com/> (or other standard Ruby CLI manager)
-- Look at <https://github.com/phusion/traveling-ruby>
+- Evaluate replacing custom REST and OAuth implementations with standard gems:
+  - [rest-client](https://github.com/rest-client/rest-client)
+  - [oauth2](https://github.com/oauth-xx/oauth2)
+- Integrate `thor` <http://whatisthor.com/> or another standard Ruby CLI framework.
+- Explore [Traveling Ruby](https://github.com/phusion/traveling-ruby) for distribution.

data/lib/aspera/api/aoc.rb

@@ -145,11 +145,10 @@ module Aspera
         # Call `block` with same query using paging and response information.
         # Block must return a 2 element `Array` with data and http response
         # @param query    [Hash] Additionnal query parameters
-        # @param progress [nil, Object] Uses methods: `long_operation_running` and `long_operation_terminated`
         # @return [Hash] Items and total number of items
         # @option return [Array<Hash>] :items The list of items
         # @option return [Integer] :total The total number of items
-        def call_paging(query: {}, progress: nil)
+        def call_paging(query: {})
           Aspera.assert_type(query, Hash){'query'}
           Aspera.assert(block_given?)
           # set default large page if user does not specify own parameters. AoC Caps to 1000 anyway
@@ -177,9 +176,9 @@ module Aspera
             break if !max_items.nil? && item_list.count >= max_items
             break if !max_pages.nil? && page_count >= max_pages
             break if total_count&.<=(item_list.count)
-            progress&.long_operation_running("#{item_list.count} / #{total_count}") unless total_count.eql?(item_list.count.to_s)
+            RestParameters.instance.spinner_cb.call("#{item_list.count} / #{total_count}") unless total_count.eql?(item_list.count.to_s)
           end
-          progress&.long_operation_terminated
+          RestParameters.instance.spinner_cb.call(action: :success)
           item_list = item_list[0..max_items - 1] if !max_items.nil? && item_list.count > max_items
           return {items: item_list, total: total_count}
         end
@@ -232,8 +231,7 @@ module Aspera
         username: nil,
         password: nil,
         workspace: nil,
-        secret_finder: nil,
-        progress_disp: nil
+        secret_finder: nil
       )
         # Test here because link may set url
         Aspera.assert(url, 'Missing mandatory option: url', type: ParameterError)
@@ -244,7 +242,6 @@ module Aspera
         # key: access key
         # value: associated secret
         @secret_finder = secret_finder
-        @progress_disp = progress_disp
         @workspace_name = workspace
         @cache_user_info = nil
         @cache_url_token_info = nil
@@ -309,7 +306,7 @@ module Aspera
       # @param query [nil, Hash] Additional query
       # @return [Hash] {items: , total: }
       def read_with_paging(subpath, query = nil)
-        return self.class.call_paging(query: query, progress: @progress_disp) do |paged_query|
+        return self.class.call_paging(query: query) do |paged_query|
           read(subpath, query: paged_query, ret: :both)
         end
       end

data/lib/aspera/api/cos_node.rb

@@ -10,6 +10,7 @@ module Aspera
     class CosNode < Node
       IBM_CLOUD_TOKEN_URL = 'https://iam.cloud.ibm.com/identity'
       TOKEN_FIELD = 'delegated_refresh_token'
+      FASP_INFO_KEYS = %w[ATSEndpoint AccessKey].freeze
       class << self
         def parameters_from_svc_credentials(service_credentials, bucket_region)
           # check necessary contents
@@ -60,6 +61,9 @@ module Aspera
         ).body
         ats_info = XmlSimple.xml_in(xml_result_text, {'ForceArray' => false})
         Log.dump(:ats_info, ats_info)
+        Aspera.assert_hash_all(ats_info, String, nil){'ats_info'}
+        Aspera.assert((FASP_INFO_KEYS - ats_info.keys).empty?){'ats_info missing required keys'}
+        Aspera.assert_hash_all(ats_info['AccessKey'], String, String){'ats_info'}
         @storage_credentials = {
           'type'  => 'token',
           'token' => {TOKEN_FIELD => nil}

data/lib/aspera/api/faspex.rb

@@ -91,7 +91,7 @@ module Aspera
       JOB_RUNNING = %w[queued working].freeze
       PATH_STANDARD_ROOT = '/aspera/faspex'
       PATH_API_DETECT = "#{PATH_API_V5}/#{PATH_HEALTH}"
-      HEADER_ITERATION_TOKEN = 'X-Aspera-Next-Iteration-Token'
+      HEADER_X_NEXT_ITER_TOKEN = 'X-Aspera-Next-Iteration-Token'
       HEADER_FASPEX_VERSION = 'X-IBM-Aspera'
       EMAIL_NOTIF_LIST = %w[
         welcome_email
@@ -136,6 +136,15 @@ module Aspera
       end
       attr_reader :pub_link_context
 
+      # @param url             Faspex URL, can be a public link
+      # @param auth            Authentication method: :boot (token in header), :web (open browser), :jwt (client_id + private key), :public_link (context in URL)
+      # @param password        For :boot auth, the token copied directly from browser in developer mode
+      # @param client_id       For :web and :jwt auth, the client_id of web UI application
+      # @param client_secret   For :web auth, the client_secret of web UI application (not needed for :jwt)
+      # @param redirect_uri    For :web auth, the redirect_uri of web UI application (must be the same as in application configuration)
+      # @param username        For :jwt auth, the username of the user to impersonate
+      # @param private_key     For :jwt auth, the private key to sign JWT token
+      # @param passphrase      For :jwt auth, the passphrase of the private key
       def initialize(
         url:,
         auth:,

data/lib/aspera/api/node.rb

@@ -6,16 +6,16 @@ require 'aspera/oauth'
 require 'aspera/log'
 require 'aspera/assert'
 require 'aspera/environment'
-require 'zlib'
 require 'base64'
 require 'openssl'
 require 'pathname'
+require 'zlib'
 require 'net/ssh/buffer'
 
 module Aspera
   module Api
     # Provides additional functions using node API with gen4 extensions (access keys)
-    class Node < Aspera::Rest
+    class Node < Rest
       # Format of node scope : node.<access key>:<scope>
       module Scope
         # Node sub-scopes
@@ -42,9 +42,10 @@ module Aspera
       ACCESS_LEVELS = %w[delete list mkdir preview read rename write].freeze
       # Special HTTP Headers
       HEADER_X_ASPERA_ACCESS_KEY = 'X-Aspera-AccessKey'
-      HEADER_X_TOTAL_COUNT = 'X-Total-Count'
       HEADER_X_CACHE_CONTROL = 'X-Aspera-Cache-Control'
+      HEADER_X_TOTAL_COUNT = 'X-Total-Count'
       HEADER_X_NEXT_ITER_TOKEN = 'X-Aspera-Next-Iteration-Token'
+      HEADER_ACCEPT_VERSION = 'Accept-Version'
       # / in cloud
       PATH_SEPARATOR = '/'
 
@@ -52,22 +53,36 @@ module Aspera
       OAuth::Factory.instance.register_decoder(lambda{ |token| Node.decode_bearer_token(token)})
 
       # Class instance variable, access with accessors on class
-      @use_standard_ports = true
-      @use_node_cache = true
-
-      class << self
+      @api_options = {
         # Set to false to read transfer parameters from download_setup
-        attr_accessor :use_standard_ports
+        standard_ports: true,
         # Set to false to bypass cache in redis
-        attr_accessor :use_node_cache
+        cache:          true,
+        accept_v4:      true
+      }
+      OPTIONS = @api_options.keys.freeze
+
+      class << self
+        attr_reader :api_options
         attr_reader :use_dynamic_key
 
-        # Adds cache control header, as globally specified to read request
-        # Use like this: read(...,**cache_control)
-        def cache_control
-          headers = {'Accept' => Mime::JSON}
-          headers[HEADER_X_CACHE_CONTROL] = 'no-cache' unless use_node_cache
-          {headers: headers}
+        def api_options=(h)
+          Aspera.assert_type(h, Hash)
+          h.each do |k, v|
+            Aspera.assert(@api_options.key?(k.to_sym)){"unknown api option: #{k} (#{OPTIONS.join(', ')})"}
+            Aspera.assert_type(v, TrueClass, FalseClass){"api options value for #{k} should be boolean"}
+            @api_options[k.to_sym] = v
+          end
+        end
+
+        # Adds cache control header for node API /files/:id
+        # as globally specified to read request
+        # Use like this: read(..., headers: add_cache_control)
+        # @param headers [Hash] optional initial headers to add to
+        # @return [Hash] headers with cache control header added if needed
+        def add_cache_control(headers = {})
+          headers[HEADER_X_CACHE_CONTROL] = 'no-cache' unless api_options[:cache]
+          headers
         end
 
         # Set private key to be used
@@ -180,8 +195,8 @@ module Aspera
             Aspera.assert(!access_key.nil?)
           end
           return {
-            Node::HEADER_X_ASPERA_ACCESS_KEY => access_key,
-            'Authorization'                  => bearer_auth
+            HEADER_X_ASPERA_ACCESS_KEY => access_key,
+            'Authorization'            => bearer_auth
           }
         end
       end
@@ -248,6 +263,50 @@ module Aspera
         return false
       end
 
+      # Read folder content, with pagination management for gen4, not recursive
+      # if `Accept-Version: 4.0` is not specified:
+      #     if `page` and `per_page` are not specified, then all entries are returned.
+      #     if either `page` or `per_page` is specified, then both are required, else 400
+      # if `Accept-Version: 4.0` is specified:
+      #     those queries are not available: page (not mentioned), sort, min_size, max_size, min_modified_time, max_modified_time, target_id, target_node_id, files_prefetch_count, page, name_iglob : either ignored or result in API error 400.
+      #     query include is accepted, but seems to do nothing as access_levels and recursive_counts are already included in results.
+      #     query `iteration_token` is accepted and allows to get paginated results, with `X-Aspera-Next-Iteration-Token` header in response to get next page token. `X-Aspera-Total-Count` header gives total count of entries.
+      def read_folder_content(file_id, query = nil, exception: true, path: nil)
+        folder_items = []
+        begin
+          query ||= {}
+          headers = self.class.add_cache_control
+          use_v4 = self.class.api_options[:accept_v4]
+          return read("files/#{file_id}/files", query, headers: headers) unless use_v4 || query.key?('page') || query.key?('per_page')
+          if use_v4
+            headers[HEADER_ACCEPT_VERSION] = '4.0'
+            query['per_page'] = 1000 unless query.key?('per_page')
+          elsif query.key?('per_page') && !query.key?('page')
+            query['page'] = 0
+          end
+          loop do
+            RestParameters.instance.spinner_cb.call(folder_items.count)
+            data, http = read("files/#{file_id}/files", query, headers: headers, ret: :both)
+            folder_items.concat(data)
+            if use_v4
+              iteration_token = http[HEADER_X_NEXT_ITER_TOKEN]
+              break if iteration_token.nil? || iteration_token.empty?
+              query['iteration_token'] = iteration_token
+            else
+              break if data['item_count'].eql?(0)
+              query['offset'] += data['item_count']
+            end
+          end
+        rescue StandardError => e
+          raise e if exception
+          Log.log.warn{"#{path}: #{e.class} #{e.message}"}
+          Log.log.debug{(['Backtrace:'] + e.backtrace).join("\n")}
+        ensure
+          RestParameters.instance.spinner_cb.call(folder_items.count, action: :success)
+        end
+        folder_items
+      end
+
       # Recursively browse in a folder (with non-recursive method)
       # Entries of folders are processed if the processing method returns true
       # Links are processed on the respective node
@@ -267,14 +326,7 @@ module Aspera
           current_item = folders_to_explore.shift
           Log.log.debug{"Exploring #{current_item[:path]}".bg_green}
           # Get folder content
-          folder_contents =
-            begin
-              # TODO: use header
-              read("files/#{current_item[:id]}/files", query, **self.class.cache_control)
-            rescue StandardError => e
-              Log.log.warn{"#{current_item[:path]}: #{e.class} #{e.message}"}
-              []
-            end
+          folder_contents = read_folder_content(current_item[:id], query, exception: false, path: current_item[:path])
           Log.dump(:folder_contents, folder_contents)
           folder_contents.each do |entry|
             if entry.key?('error')
@@ -309,7 +361,7 @@ module Aspera
       # @param path [String] file or folder path (end with "/" is like setting process_last_link)
       # @param process_last_link [Boolean] if true, follow the last link
       # @return [Hash] Result data
-      # @option return [Aspera::Rest] :api     REST client instance
+      # @option return [Rest] :api     REST client instance
       # @option return [String]       :file_id File identifier
       def resolve_api_fid(top_file_id, path, process_last_link = false)
         Aspera.assert_type(top_file_id, String)
@@ -445,7 +497,7 @@ module Aspera
         # Add application specific tags (AoC)
         @app_info[:api].add_ts_tags(transfer_spec: transfer_spec, app_info: @app_info) unless @app_info.nil?
         # Add remote host info
-        if self.class.use_standard_ports
+        if self.class.api_options[:standard_ports]
           # Get default TCP/UDP ports and transfer user
           transfer_spec.merge!(Transfer::Spec::AK_TSPEC_BASE)
           # By default: same address as node API

data/lib/aspera/cli/formatter.rb

@@ -128,20 +128,34 @@ module Aspera
         @spinner = nil
       end
 
-      # call this after REST calls if several api calls are expected
-      def long_operation_running(title = '')
+      def long_operation(title = nil, action: :spin)
         return unless Environment.terminal?
-        if @spinner.nil?
+        return if %i[error data].include?(@options[:display])
+
+        # Handle the "delayed start" state
+        return @spinner = :starting if action == :spin && @spinner.nil?
+
+        # Cleanup if we try to stop a spinner that never actually started
+        @spinner = nil if action != :spin && @spinner == :starting
+        return if @spinner.nil?
+
+        # Initialize the real TTY object if it's currently just the :starting symbol
+        if @spinner == :starting
           @spinner = TTY::Spinner.new('[:spinner] :title', format: :classic)
+          @spinner.update(title: '')
           @spinner.start
         end
-        @spinner.update(title: title)
-        @spinner.spin
-      end
 
-      def long_operation_terminated
-        @spinner&.stop
-        @spinner = nil
+        @spinner.update(title: title) if title
+
+        case action
+        when :spin
+          @spinner.spin
+        when :success, :fail
+          action == :success ? @spinner.success : @spinner.error
+          @spinner.stop
+          @spinner = nil
+        end
       end
 
       def declare_options(options)
@@ -150,9 +164,9 @@ module Aspera
         else
           {}
         end
+        options.declare(:display, 'Output only some information', allowed: DISPLAY_LEVELS, handler: {o: self, m: :option_handler}, default: :data)
         options.declare(:format, 'Output format', allowed: DISPLAY_FORMATS, handler: {o: self, m: :option_handler}, default: :table)
         options.declare(:output, 'Destination for results', handler: {o: self, m: :option_handler})
-        options.declare(:display, 'Output only some information', allowed: DISPLAY_LEVELS, handler: {o: self, m: :option_handler}, default: :info)
         options.declare(
           :fields, "Comma separated list of: fields, or #{SpecialValues::ALL}, or #{SpecialValues::DEF}", handler: {o: self, m: :option_handler},
           allowed: [String, Array, Regexp, Proc],
@@ -178,6 +192,8 @@ module Aspera
           @options[option_symbol] = value
           # special handling of some options
           case option_symbol
+          when :format
+            @options[:display] = value.eql?(:table) ? :info : :data
           when :output
             $stdout = if value.eql?('-')
               STDOUT # rubocop:disable Style/GlobalStdStream
@@ -197,7 +213,7 @@ module Aspera
         nil
       end
 
-      # main output method
+      # Main output method
       # data: for requested data, not displayed if level==error
       # info: additional info, displayed if level==info
       # error: always displayed on stderr

data/lib/aspera/cli/manager.rb

@@ -330,7 +330,7 @@ module Aspera
 
       # @param descr       [String] description for help
       # @param mandatory   [Boolean] if true, raise error if option not set
-      # @param multiple    [Boolean] if true, return remaining arguments (Array)
+      # @param multiple    [Boolean] if true, return remaining arguments (Array) unil END
       # @param accept_list [Array, NilClass] list of allowed values (Symbol)
       # @param validation  [Class, Array, NilClass] Accepted value type(s) or list of Symbols
       # @param aliases     [Hash] map of aliases: key = alias, value = real value
@@ -345,10 +345,19 @@ module Aspera
         descr = "#{descr} (#{validation.join(', ')})" unless validation.nil? || validation.eql?(Allowed::TYPES_STRING)
         result =
           if !@unprocessed_cmd_line_arguments.empty?
-            how_many = multiple ? @unprocessed_cmd_line_arguments.length : 1
-            values = @unprocessed_cmd_line_arguments.shift(how_many)
+            if multiple
+              index = @unprocessed_cmd_line_arguments.index(SpecialValues::EOA)
+              if index.nil?
+                values = @unprocessed_cmd_line_arguments.shift(@unprocessed_cmd_line_arguments.length)
+              else
+                values = @unprocessed_cmd_line_arguments.shift(index)
+                @unprocessed_cmd_line_arguments.shift # remove EOA
+              end
+            else
+              values = [@unprocessed_cmd_line_arguments.shift]
+            end
             values = values.map{ |v| ExtendedValue.instance.evaluate(v, context: "argument: #{descr}", allowed: validation)}
-            # if expecting list and only one arg of type array : it is the list
+            # If expecting list and only one arg of type array : it is the list
             values = values.first if multiple && values.length.eql?(1) && values.first.is_a?(Array)
             if accept_list
               allowed_values = [].concat(accept_list)

data/lib/aspera/cli/plugins/aoc.rb

@@ -233,8 +233,7 @@ module Aspera
             defaults:      {workspace: nil},
             scope:         @scope,
             subpath:       aoc_base_path,
-            secret_finder: config,
-            progress_disp: formatter
+            secret_finder: config
           ))
         end
 
@@ -256,7 +255,10 @@ module Aspera
         # @param hash   [Hash,nil] Optional base `Hash` (modified)
         # @param string [Boolean] `true` to set key as `String`, else as `Symbol`
         # @param name   [Boolean] Include name
-        # @return [Hash] with key `workspace_[id,name]` (symbol or string) only if defined
+        # @return [Hash{Symbol, String => String}] the modified hash containing:
+        #   * `workspace_id` [String] the unique identifier.
+        #   * `workspace_name` [String] (optional) the name, included if +name+ is true.
+        # @note The key type (String or Symbol) depends on the +string+ parameter.
         def workspace_id_hash(hash = nil, string: false, name: false)
           info = aoc_api.workspace
           hash = {} if hash.nil?

data/lib/aspera/cli/plugins/base.rb

@@ -300,9 +300,9 @@ module Aspera
             remain_pages -= 1 unless remain_pages.nil?
             break if remain_pages == 0
             offset += page_result[items_key].length
-            formatter.long_operation_running
+            RestParameters.instance.spinner_cb.call("#{result.length} / #{total_count || '?'}")
           end
-          formatter.long_operation_terminated
+          RestParameters.instance.spinner_cb.call(action: :success)
           return result, total_count
         end
 

data/lib/aspera/cli/plugins/config.rb

@@ -191,7 +191,8 @@ module Aspera
         def setup_rest_and_transfer_runtime
           RestParameters.instance.user_agent = Info::CMD_NAME
           RestParameters.instance.progress_bar = @progress_bar
-          RestParameters.instance.session_cb = lambda{ |http_session| update_http_session(http_session)}
+          RestParameters.instance.session_cb = ->(http_session){update_http_session(http_session)}
+          RestParameters.instance.spinner_cb = ->(title = nil, action: :spin){formatter.long_operation(title, action: action)}
           # Check http options that are global
           keys_to_delete = []
           @option_http_options.each do |k, v|

data/lib/aspera/cli/plugins/faspex5.rb

@@ -164,10 +164,10 @@ module Aspera
           loop do
             result = @api_v5.read("jobs/#{job_id}", {type: :formatted})
             break unless Api::Faspex::JOB_RUNNING.include?(result['status'])
-            formatter.long_operation_running(result['status'])
+            RestParameters.instance.spinner_cb.call(result['status'])
             sleep(0.5)
           end
-          formatter.long_operation_terminated
+          RestParameters.instance.spinner_cb.call(action: :success)
           return result
         end
 
@@ -192,6 +192,16 @@ module Aspera
           return list.select(&filter), total
         end
 
+        # Build query to get package recipients based on package info in case of shared inbox or workgroup recipient
+        # @param package_id [String] the package id to get info from
+        def recipient_query(package_id)
+          package_info = @api_v5.read("packages/#{package_id}")
+          base_query = {}
+          base_query['recipient_workgroup_id'] = package_info['recipients'].first['id'] if WORKGROUP_TYPES.include?(package_info['recipients'].first['recipient_type'])
+          base_query['recipient_user_id'] = package_info['recipients'].first['id'] if package_info['recipients'].first['recipient_type'].eql?('user')
+          base_query
+        end
+
         def package_receive(package_ids)
           # prepare persistency if needed
           skip_ids_persistency = nil
@@ -241,7 +251,7 @@ module Aspera
             type:          Api::Faspex.box_type(box),
             transfer_type: Api::Faspex::TRANSFER_CONNECT
           }
-          download_params[:recipient_workgroup_id] = lookup_entity_by_field(api: @api_v5, entity: options.get_option(:group_type), value: box)['id'] if !Api::Faspex::API_LIST_MAILBOX_TYPES.include?(box) && box != SpecialValues::ALL
+          # download_params[:recipient_workgroup_id] = lookup_entity_by_field(api: @api_v5, entity: options.get_option(:group_type), value: box)['id'] if !Api::Faspex::API_LIST_MAILBOX_TYPES.include?(box) && box != SpecialValues::ALL
           packages.each do |package|
             pkg_id = package['id']
             formatter.display_status("Receiving package #{pkg_id}")
@@ -249,7 +259,7 @@ module Aspera
             transfer_spec = @api_v5.call(
               operation:    'POST',
               subpath:      "packages/#{pkg_id}/transfer_spec/download",
-              query:        download_params,
+              query:        download_params.merge(recipient_query(pkg_id)),
               content_type: Mime::JSON,
               body:         param_file_list,
               headers:      {'Accept' => Mime::JSON}
@@ -319,9 +329,9 @@ module Aspera
 
         # Browse a folder
         # @param browse_endpoint [String] the endpoint to browse
-        def browse_folder(browse_endpoint)
+        def browse_folder(browse_endpoint, base_query = {})
           folders_to_process = [options.get_next_argument('folder path', default: '/')]
-          query = query_read_delete(default: {})
+          query = base_query.merge(query_read_delete(default: {}))
           filters = query.delete('filters'){{}}
           Aspera.assert_type(filters, Hash)
           filters['basenames'] ||= []
@@ -357,7 +367,7 @@ module Aspera
               end
               folders_to_process.concat(data['items'].select{ |i| i['type'].eql?('directory')}.map{ |i| i['path']}) if recursive
               if use_paging
-                iteration_token = http[Api::Faspex::HEADER_ITERATION_TOKEN]
+                iteration_token = http[Api::Faspex::HEADER_X_NEXT_ITER_TOKEN]
                 break if iteration_token.nil? || iteration_token.empty?
                 query['iteration_token'] = iteration_token
               else
@@ -365,12 +375,11 @@ module Aspera
                 break if data['item_count'].eql?(0)
                 query['offset'] += data['item_count']
               end
-              formatter.long_operation_running(all_items.count)
+              RestParameters.instance.spinner_cb.call(all_items.count)
             end
             query.delete('iteration_token')
           end
-          formatter.long_operation_terminated
-
+          RestParameters.instance.spinner_cb.call(action: :success)
           return Main.result_object_list(all_items, total: total_count)
         end
 
@@ -384,7 +393,7 @@ module Aspera
           when :show
             return Main.result_single_object(@api_v5.read("packages/#{package_id}"))
           when :browse
-            return browse_folder("packages/#{package_id}/files/#{Api::Faspex.box_type(options.get_option(:box))}")
+            return browse_folder("packages/#{package_id}/files/#{Api::Faspex.box_type(options.get_option(:box))}", recipient_query(package_id))
           when :status
             status_list = options.get_next_argument('list of states, or nothing', mandatory: false, validation: Array)
             status = wait_package_status(package_id, status_list: status_list)
@@ -447,6 +456,8 @@ module Aspera
             res_id_query = {'all': true}
           when :nodes
             available_commands += %i[shared_folders browse]
+          when :jobs
+            exec_args[:display_fields] = %w[id job_name job_type status]
           end
           res_command = options.get_next_command(available_commands)
           return Main.result_value_list(Api::Faspex::EMAIL_NOTIF_LIST, name: 'email_id') if res_command.eql?(:list) && res_sym.eql?(:email_notifications)
@@ -719,7 +730,8 @@ module Aspera
         end
         SHARED_INBOX_MEMBER_LEVELS = %i[submit_only standard shared_inbox_admin].freeze
         ACCOUNT_TYPES = %w{local_user saml_user self_registered_user external_user}.freeze
-        CONTACT_TYPES = %w{workgroup shared_inbox distribution_list user external_user}.freeze
+        WORKGROUP_TYPES = %w{workgroup shared_inbox}.freeze
+        CONTACT_TYPES = (WORKGROUP_TYPES + %w{distribution_list user external_user}).freeze
         private_constant :SHARED_INBOX_MEMBER_LEVELS, :ACCOUNT_TYPES, :CONTACT_TYPES
       end
     end

data/lib/aspera/cli/plugins/node.rb

@@ -93,12 +93,9 @@ module Aspera
             options.declare(:validator, 'Identifier of validator (optional for central)')
             options.declare(:asperabrowserurl, 'URL for simple aspera web ui', default: 'https://asperabrowser.mybluemix.net')
             options.declare(
-              :default_ports, 'Gen4: Use standard FASP ports (true) or get from node API (false)', allowed: Allowed::TYPES_BOOLEAN, default: true,
-              handler: {o: Api::Node, m: :use_standard_ports}
-            )
-            options.declare(
-              :node_cache, 'Gen4: Set to no to force actual file system read', allowed: Allowed::TYPES_BOOLEAN,
-              handler: {o: Api::Node, m: :use_node_cache}
+              :node_api, 'Gen4: standard_ports: Use standard FASP ports (true) or get from node API (false). cache: Set to false to force actual file system read',
+              allowed: Hash,
+              handler: {o: Api::Node, m: :api_options}
             )
             options.declare(:root_id, 'Gen4: File id of top folder when using access key (override AK root id)')
             options.declare(:dynamic_key, 'Private key PEM to use for dynamic key auth', handler: {o: Api::Node, m: :use_dynamic_key})
@@ -242,14 +239,14 @@ module Aspera
               break if all_items.count >= total_count
               offset += items.count
               query['skip'] = offset
-              formatter.long_operation_running(all_items.count)
+              RestParameters.instance.spinner_cb.call(all_items.count)
             end
             query.delete('skip')
           end
           @prefixer&.remove_in_object_list!(all_items)
           return Main.result_object_list(all_items)
         ensure
-          formatter.long_operation_terminated
+          RestParameters.instance.spinner_cb.call(action: :success)
         end
 
         # Create async transfer spec request from direction and folders
@@ -388,7 +385,7 @@ module Aspera
           when :transport
             return Main.result_single_object(@api_node.transport_params)
           when :spec
-            return Main.result_single_object(@api_node.base_spec)
+            return Main.result_single_object(@api_node.base_spec, fields: Formatter.all_but(Transfer::Spec::SPECIFIC))
           end
           Aspera.error_unreachable_line
         end
@@ -523,7 +520,7 @@ module Aspera
             return Main.result_text(result[:password])
           when :browse
             apifid = apifid_from_next_arg(top_file_id)
-            file_info = apifid[:api].read("files/#{apifid[:file_id]}", **Api::Node.cache_control)
+            file_info = apifid[:api].read("files/#{apifid[:file_id]}", headers: Api::Node.add_cache_control)
             unless file_info['type'].eql?('folder')
               # a single file
               return Main.result_object_list([file_info], fields: GEN4_LS_FIELDS)

data/lib/aspera/cli/special_values.rb

@@ -8,6 +8,7 @@ module Aspera
       INIT = 'INIT'
       ALL = 'ALL'
       DEF = 'DEF'
+      EOA = 'END'
     end
   end
 end

data/lib/aspera/cli/version.rb

@@ -4,6 +4,6 @@ module Aspera
   module Cli
     # For beta add extension : .beta1
     # For dev version add extension : .pre
-    VERSION = '4.25.3'
+    VERSION = '4.25.4'
   end
 end

data/lib/aspera/cli/wizard.rb

@@ -62,7 +62,7 @@ module Aspera
           detection_info = nil
           begin
             Log.log.debug{"detecting #{plugin_name_sym} at #{app_url}"}
-            formatter.long_operation_running("#{plugin_name_sym}\r")
+            RestParameters.instance.spinner_cb.call(plugin_name_sym.to_s)
             detection_info = plugin_klass.detect(app_url)
           rescue OpenSSL::SSL::SSLError => e
             Log.log.warn(e.message)
@@ -78,6 +78,7 @@ module Aspera
           # If there is a redirect, then the detector can override the url.
           found_apps.push({product: plugin_name_sym, name: app_name, url: app_url, version: 'unknown'}.merge(detection_info))
         end
+        RestParameters.instance.spinner_cb.call(action: :success)
         raise "No known application found at #{app_url}" if found_apps.empty?
         Aspera.assert(found_apps.all?{ |a| a.keys.all?(Symbol)})
         return found_apps

data/lib/aspera/rest.rb

@@ -33,7 +33,7 @@ module Aspera
   class RestParameters
     include Singleton
 
-    attr_accessor :user_agent, :download_partial_suffix, :retry_on_error, :retry_on_timeout, :retry_on_unavailable, :retry_max, :retry_sleep, :session_cb, :progress_bar
+    attr_accessor :user_agent, :download_partial_suffix, :retry_on_error, :retry_on_timeout, :retry_on_unavailable, :retry_max, :retry_sleep, :session_cb, :progress_bar, :spinner_cb
 
     private
 
@@ -47,6 +47,7 @@ module Aspera
       @retry_sleep = 4
       @session_cb = nil
       @progress_bar = nil
+      @spinner_cb = nil
     end
   end
 
@@ -88,8 +89,9 @@ module Aspera
         query
       end
 
-      # Build URI from URL and parameters and check it is http or https
-      # Check iof php style is specified
+      # Build URI from URL and parameters and check it is `http` or `https`.
+      # Check if php style is specified.
+      # `nil` values in query result in key without value, e.g. `?a`, while empty string values result in `?a=`.
       # @param url   [String]            The URL without query.
       # @param query [Hash,Array,String] The query.
       def build_uri(url, query)
@@ -105,18 +107,19 @@ module Aspera
             URI.encode_www_form(h_to_query_array(query))
           when Array
             Aspera.assert(query.all?{ |i| i.is_a?(Array) && i.length.eql?(2)}){'Query must be array of arrays of 2 elements'}
-            URI.encode_www_form(query)
+            URI.encode_www_form(query) # remove nil values
           else Aspera.error_unexpected_value(query.class){'query type'}
           end.gsub('%5B%5D=', '[]=')
         # [] is allowed in url parameters
         uri
       end
 
+      # Support array for query parameter, there is no standard.
+      # Either p=1&p=2 (default)
+      # or p[]=1&p[]=2 (if `:x_array_php_style` is set to true in query)
       # @param query [Hash] HTTP query as hash
       def h_to_query_array(query)
         Aspera.assert_type(query, Hash)
-        # Support array for query parameter, there is no standard.
-        # Either p[]=1&p[]=2, or p=1&p=2
         suffix = query.delete(:x_array_php_style) ? '[]' : nil
         query.each_with_object([]) do |(k, v), query_array|
           case v
@@ -412,7 +415,7 @@ module Aspera
         http_session.request(req) do |response|
           result_http = response
           result_mime = self.class.parse_header(result_http['Content-Type'] || Mime::TEXT)[:type]
-          Log.log.debug{"response: code=#{result_http.code}, mime=#{result_mime}, mime2= #{response['Content-Type']}"}
+          Log.log.debug{"response: code=#{result_http.code}, mime=#{result_mime}, content-type=#{response['Content-Type']}"}
           # JSON data needs to be parsed, in case it contains an error code
           if !save_to_file.nil? &&
               result_http.code.to_s.start_with?('2') &&
@@ -453,12 +456,10 @@ module Aspera
         # TODO : related to mime type encoding ?
         # result_http.body.force_encoding('UTF-8') if result_http.body.is_a?(String)
         # Log.log.debug{"result: body=#{result_http.body}"}
-        if Mime.json?(result_mime)
-          result_data = JSON.parse(result_http.body) rescue result_http.body
-          Log.dump(:result_data, result_data)
-        else # Mime::TEXT
-          result_data = result_http.body
-        end
+        result_data = result_http.body
+        Log.dump(:result_data_raw, result_data, level: :trace1)
+        result_data = JSON.parse(result_data) if Mime.json?(result_mime) && !result_data.nil? && !result_data.empty?
+        Log.dump(:result_data, result_data)
         RestErrorAnalyzer.instance.raise_on_error(req, result_data, result_http)
         unless file_saved || save_to_file.nil?
           FileUtils.mkdir_p(File.dirname(save_to_file))
@@ -536,27 +537,39 @@ module Aspera
 
     # Create: `POST`
     def create(subpath, params, **kwargs)
-      return call(operation: 'POST', subpath: subpath, headers: {'Accept' => Mime::JSON}, body: params, content_type: Mime::JSON, **kwargs)
+      kwargs[:headers] ||= {}
+      kwargs[:headers]['Accept'] = Mime::JSON unless kwargs[:headers].key?('Accept')
+      kwargs[:content_type] = Mime::JSON unless kwargs.key?(:content_type)
+      return call(operation: 'POST', subpath: subpath, body: params, **kwargs)
     end
 
     # Read: `GET`
     def read(subpath, query = nil, **kwargs)
-      return call(operation: 'GET', subpath: subpath, headers: {'Accept' => Mime::JSON}, query: query, **kwargs)
+      kwargs[:headers] ||= {}
+      kwargs[:headers]['Accept'] = Mime::JSON unless kwargs[:headers].key?('Accept')
+      return call(operation: 'GET', subpath: subpath, query: query, **kwargs)
     end
 
     # Update: `PUT`
     def update(subpath, params, **kwargs)
-      return call(operation: 'PUT', subpath: subpath, headers: {'Accept' => Mime::JSON}, body: params, content_type: Mime::JSON, **kwargs)
+      kwargs[:headers] ||= {}
+      kwargs[:headers]['Accept'] = Mime::JSON unless kwargs[:headers].key?('Accept')
+      kwargs[:content_type] = Mime::JSON unless kwargs.key?(:content_type)
+      return call(operation: 'PUT', subpath: subpath, body: params, **kwargs)
     end
 
     # Delete: `DELETE`
     def delete(subpath, params = nil, **kwargs)
-      return call(operation: 'DELETE', subpath: subpath, headers: {'Accept' => Mime::JSON}, query: params, **kwargs)
+      kwargs[:headers] ||= {}
+      kwargs[:headers]['Accept'] = Mime::JSON unless kwargs[:headers].key?('Accept')
+      return call(operation: 'DELETE', subpath: subpath, query: params, **kwargs)
     end
 
     # Cancel: `CANCEL`
     def cancel(subpath, **kwargs)
-      return call(operation: 'CANCEL', subpath: subpath, headers: {'Accept' => Mime::JSON}, **kwargs)
+      kwargs[:headers] ||= {}
+      kwargs[:headers]['Accept'] = Mime::JSON unless kwargs[:headers].key?('Accept')
+      return call(operation: 'CANCEL', subpath: subpath, **kwargs)
     end
 
     # Query entity by general search (read with parameter `q`)

data/lib/aspera/transfer/spec.rb

@@ -25,6 +25,7 @@ module Aspera
       TRANSPORT_FIELDS = (%w[remote_host] + AK_TSPEC_BASE.keys + WSS_FIELDS).freeze
       # reserved tag for Aspera
       TAG_RESERVED = 'aspera'
+      SPECIFIC = %w{token paths direction source_root destination_root}.freeze
       class << self
         # wrong def in transferd
         POLICY_FIX = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspera-cli
 version: !ruby/object:Gem::Version
-  version: 4.25.3
+  version: 4.25.4
 platform: ruby
 authors:
 - Laurent Martin