smartdust-client 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aecd7f3f68308d02daca89b7dde9ac29af0f591b9b6958156f88ad8b3220e392
-  data.tar.gz: 12ec2efbf1d1c92858e751991b7199d4c3eab74ea2fcca89cd89146f255a8456
+  metadata.gz: 816ea829cc813bc39511bf89151d1b059ba7acbe79ce3067f8a94fde987d363b
+  data.tar.gz: c564c0444b14986ca503408eea5d7b2686618ef3ddef7f3d509db0873f09d475
 SHA512:
-  metadata.gz: c9135de81485161d76a5d7f245a363eac06f37aafa64c7df012579a41d69b3000b76fe13b86629210de374e10015f636d453221e2dece03f29873320dbb3a839
-  data.tar.gz: 41aa90c194c5c10f9cde3a85ee694556ccd77a74d952e2458ef8e1f4260ca41fdd35fdb2e7cb94b98017df6dc24636d405033e0f6510830632de39cf8dfc71a3
+  metadata.gz: c5b2abe3b36c04ec06a32eedc3fdb14b7952851e4e2b9ee693a312c2c78e2881c1bc588b9b51ed8554738d2ce0b27cbdb03db3274d34cd682d0a4ea8b0c9ab38
+  data.tar.gz: e8801265e92c781f29b7c50f0083dbdec4543e2063e9db7f279b0a612fe5572a7c653e6bd602f3a161ef725429cd53693089101e73b1ce2ecab602fcb1cc5c24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smartdust-client (1.0.0)
+    smartdust-client (1.3.0)
       ADB (~> 0.5)
       dante (~> 0.2.0)
       dry-configurable (~> 0.1.4)
@@ -16,8 +16,9 @@ GEM
       childprocess (>= 0.3.5)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    childprocess (4.1.0)
-    concurrent-ruby (1.2.2)
+    childprocess (5.1.0)
+      logger (~> 1.5)
+    concurrent-ruby (1.3.5)
     crack (0.4.5)
       rexml
     dante (0.2.0)
@@ -29,9 +30,12 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
     facets (3.1.0)
-    gli (2.21.0)
+    gli (2.22.2)
+      ostruct
     hashdiff (1.0.1)
     json (2.6.3)
+    logger (1.6.6)
+    ostruct (0.6.1)
     public_suffix (5.0.1)
     rack (1.6.13)
     rack-protection (1.5.5)

data/README.md

@@ -4,6 +4,8 @@
 
 # Smartdust CLI client
 ![smartdust-logo-text-2021.png](smartdust-logo-text-2021.png)
+Documentation: https://docs.smartdust.me/docs/cli-client.
+
 Automation client for connecting to Smartdust Lab devices via adb from a terminal.
 Designed with the following scenario in mind:
 
@@ -11,7 +13,7 @@ Designed with the following scenario in mind:
 2. Do something with the device via adb (Instrumentation Test, adb install, etc)
 3. Disconnect from device
 
-Due to it being a console tool, it's very easy to use  it for test automation in a CI\CD pipeline, for example in Jenkins.
+Due to it being a console tool, it's very easy to use it for test automation in a CI\CD pipeline, for example in Jenkins.
 
 Allows for filtering by any device description parameter
 as well as listing all available values of a given parameter
@@ -21,48 +23,61 @@ e.g. all unique names of devices in the lab instance.
 ## Prequisities
 
 - Ruby along with RubyGems installed - versions higher than 3.0.2 are not guaranteed to work
-- This repository cloned
+- Android dependencies: 
+  - adb (Android Debug Bridge)
+- iOS dependencies:
+  - idevice_id (libimobiledevice)
+  - usbfluxd (https://github.com/corellium/usbfluxd/tree/master) (this needs to be patched to connect to multiple devices from the same Lab instance)
 
 ## Installation
-- Enter the directory where the repository is cloned
-- adding "sudo" before the following commands might be needed:
-- ```gem build smartdust-client.gemspec```
-- ```gem install smartdust-client-1.0.0.gem``` (or different version, see output of the previous command)
+### From RubyGems
+- Install as a Ruby Gem:
+```gem install smartdust-client```
 
-- Run it by simply entering ```smartdust-client``` 
+### From sources
+- Open your terminal
+- "cd" into the directory where the repository is cloned
+- Run the following commands: (adding "sudo" might be needed)
+- ```gem build smartdust-client.gemspec```
+- ```gem install smartdust-client-1.2.0.gem``` (or different version, see output of the previous command)
 
 ## Usage
 
 ```
 NAME
-    stf-client - Smartphone Test Lab client
+    smartdust-client - Smartdust Lab client (version 1.2.0)
 
 SYNOPSIS
-    stf-client [global options] command [command options] [arguments...]
+    smartdust-client [global options] command [command options] [arguments...]
 
 GLOBAL OPTIONS
     --help             - Show this message
-    -t, --token=arg    - Authorization token, can also be set by environment variable STF_TOKEN (default: none)
-    -u, --url=arg      - URL to STF, can also be set by environment variable STF_URL (default: none)
+    --log=arg          - Log file (default: none)
+    --pid=arg          - PID file (default: none)
+    -t, --token=arg    - Authorization token, can also be set by environment variable SD_TOKEN (default: none)
+    -u, --url=arg      - URL to Smartdust Lab, can also be set by environment variable SD_URL (default: none)
     -v, --[no-]verbose - Be verbose
 
 COMMANDS
-    clean      - Frees all devices that are assigned to current user in STF. Doesn't modify local adb
-    connect    - Search for a device available in STF and attach it to local adb server
-    disconnect - Disconnect device(s) from local adb server and remove device(s) from user devices in STF
+    clean      - Frees all devices that are assigned to current user in Smartdust Lab. Doesn't modify local adb
+    connect    - Search for a device available in Smartdust Lab and attach it to local adb server
+    disconnect - Disconnect device(s) from local adb server and remove device(s) from user devices in Smartdust Lab
     help       - Shows a list of commands or help for one command
     keys       - Show available keys for filtering
+    trustme    - Add adb public key into Smartdust Lab
     values     - Show known values for the filtering key
-    
-ENVIRONMENT VARIABLES
-    STF_TOKEN - Authorization token 
-    STF_URL   - URL to STF 
 ```
 - Authorization token can be obtained from the Smartdust Lab web interface in Settings -> Keys
 - When connecting with this tool for the first time, have the Smartdust Lab web interface open
 to accept adding a new ADB key. This is necessary for every new machine that hasn't connected 
 yet to Remote Debug on a given Lab instance.
 
+## Development
+- Install Ruby 3.0.2
+- Install Ruby Bundler: ```gem install bundler -v 1.17.3```
+- Run ```bundle install``` in the project directory (might require adjusting directory permissions or sudo)
+- Run the program with ```bundle exec ruby lib/stf.rb```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/di.rb

@@ -12,7 +12,6 @@ require 'stf/interactor/get_values_interactor'
 require 'stf/interactor/add_adb_public_key'
 require 'stf/interactor/connect_ios_interactor'
 require 'stf/validate/uri_validator'
-require 'stf/model/device_enhancer'
 
 class DI
   class << self
@@ -23,7 +22,7 @@ class DI
 
       # one time object
       c.register(:dante_runner,
-                 -> {Dante::Runner.new('stf-client')})
+                 -> {Dante::Runner.new('smartdust-client')})
 
       # one time object because dante is one time
       c.register(:demonizer,
@@ -72,13 +71,13 @@ class DI
                  -> {Stf::AddAdbPublicKeyInteractor.new},
                  memoize: true)
 
-      c.register(:device_enhancer,
-                 -> {Stf::DeviceEnhancer.new},
-                 memoize: true)
-
       c.register(:connect_ios,
-                -> {Stf::ConnectIosInteractor.new("sd_remoteios", "idevice_id")},
+                -> {Stf::ConnectIosInteractor.new},
                 memoize: true)
+
+      c.register(:android_util,
+                 -> {Stf::AndroidUtil.new},
+                 memoize: true)
     end
 
     def [](what)

data/lib/stf/client.rb

@@ -55,7 +55,7 @@ module Stf
     end
 
     def destroy_tunnel(ip, port)
-      response = execute "/api/v1/tunnel", Net::HTTP::Delete, {ipAddress: ip, port: port}.to_json
+      response = execute "/api/v1/tunnel/{ip}/{port}", Net::HTTP::Delete, {ipAddress: ip, port: port}.to_json
       return response.success
     end
 

data/lib/stf/interactor/android_util.rb

@@ -0,0 +1,45 @@
+require 'ADB'
+module Stf
+  class AndroidUtil
+    include ADB
+
+    def get_present_adb_devices_ids
+      adb_out = `adb devices`
+      adb_out = adb_out.split("\n")
+      adb_out.shift
+      adb_out = adb_out.select { |line| line.include? 'device' }
+      adb_out.map! { |line| line.split("\t").first }
+    end
+
+    def map_adb_urls_to_serial
+      adb_urls = get_present_adb_devices_ids
+      urls_to_serials = Hash.new
+      adb_urls.each do |adb_url|
+        serial = `adb -s #{adb_url} shell getprop ro.serialno`
+        serial = serial.strip
+        urls_to_serials[adb_url] = serial
+      end
+      urls_to_serials
+    end
+
+    def map_serials_to_adb_urls
+      adb_urls = get_present_adb_devices_ids
+      serials_to_urls = Hash.new
+      adb_urls.each do |adb_url|
+        serial = `adb -s #{adb_url} shell getprop ro.serialno`
+        serial = serial.strip
+        serials_to_urls[serial] = adb_url
+      end
+      serials_to_urls
+    end
+
+    def cleanup_adb_devices
+      to_disconnect = devices - get_present_adb_devices_ids
+      to_disconnect.each do |id|
+        execute_adb_with 30, "disconnect #{id}"
+      end
+    end
+
+  end
+
+end

data/lib/stf/interactor/connect_ios_interactor.rb

@@ -1,49 +1,73 @@
+require 'rexml/document'
+require 'open3'
+require 'mkmf'
+
+require 'stf/log/log'
+
 module Stf
     class ConnectIosInteractor
+        include Log
 
-        @@connected_ios_urls = Array.new
-
-        def initialize(sd_remote_ios_path, ideviceid_path)
-            @sd_remote_ios = sd_remote_ios_path
-            @ideviceid = ideviceid_path
-        end
+        @active = false
 
-        def connect(url, serial)
-            if connected_ios_devices().include? serial
-                @@connected_ios_urls.append(url)
-            else
-                `sudo rm -rf /tmp/usbfluxd`
-                `sudo systemctl restart usbmuxd`
-                disconnect()
-                connected_before = connected_ios_devices().count
-                fork do
-                    `sudo #{@sd_remote_ios} -c #{url} &`
-                end
-                sleep 2
-                if connected_ios_devices().count > connected_before
-                    @@connected_ios_urls.append(url)
-                else
-                    raise "Cannot connect to iOS device"
+        def initialize
+            if find_executable('usbfluxctl') != nil
+                stdout, stderr, status = Open3.capture3("usbfluxctl list xml")
+                unless stderr.include? "Failed"
+                    @active = true
                 end
             end
+            unless @active
+                logger.info "iOS dependencies not available. Install 'usbfluxd' distributed by SmartDust. Make sure to start 'usbfluxd -n' with root permissions before connecting to iOS devices. Also ensure that 'usbfluxctl' is in your $PATH."
+            end
         end
 
-        def disconnect()
-            `sudo pkill -f #{@sd_remote_ios}`
-            @@connected_ios_urls = Array.new
+
+        def connect(url)
+            raise "iOS connecting is not active" unless @active
+            Open3.capture3("usbfluxctl add #{url}")
+            sleep(1)
+            logger.info ios_serials_to_urls.to_s
+            unless ios_serials_to_urls.values.include? url
+                raise "Cannot connect to iOS device"
+            end
         end
 
-        def connected_ios_urls()
-            return @@connected_ios_urls
+        def disconnect(url)
+            raise "iOS connecting is not active" unless @active
+            Open3.capture3("usbfluxctl del #{url}")
         end
 
-        def connected_ios_devices()
-            ideviceid_output = `#{@ideviceid} -l`.split("\n")
-            if ((ideviceid_output.select {|line| line.include? " "}).size > 0) or ideviceid_output.empty?
-                return Array.new
-            else
-                return ideviceid_output
+        def ios_serials_to_urls
+            return {} unless @active
+            stdout, stderr, status = Open3.capture3("usbfluxctl list xml")
+            result = {}
+
+            doc = REXML::Document.new(stdout)
+            instances = doc.elements['plist/dict/dict']
+
+            if instances.nil?
+                return {}
+            end
+
+            instances.elements.each('dict') do |instance|
+                host = instance.elements["string[preceding-sibling::key[text()='Host']]"]
+                port = instance.elements["integer[preceding-sibling::key[text()='Port']]"]
+                if host.nil? || port.nil?
+                    next
+                end
+                url = "#{host.text}:#{port.text}"
+
+                devices = instance.elements['array']
+                if devices
+                    devices.elements.each do |device|
+                        serial = device.text
+                        result[serial] = url
+                    end
+                end
             end
+
+            result
         end
 
     end

data/lib/stf/interactor/start_debug_session_interactor.rb

@@ -5,6 +5,7 @@ require 'stf/client'
 require 'stf/log/log'
 require 'stf/model/device_list'
 require 'stf/interactor/connect_ios_interactor'
+require 'stf/interactor/android_util'
 
 module Stf
   class StartDebugSessionInteractor
@@ -46,8 +47,8 @@ module Stf
         return false
       end
 
-      connected_count = count_connected_devices(filter)
-      logger.info "Lower quantity achieved, already connected #{connected_count}"
+      connected_count = count_connected_devices(filter, force_filter)
+      logger.info "Number of connected devices: #{connected_count}"
 
       return true if nodaemon_flag
 
@@ -82,7 +83,7 @@ module Stf
       one_time_mode = !daemon_mode
 
       while true do
-        cleanup_disconnected_devices(filter, force_filter, healthcheck)
+        DI[:stop_all_debug_sessions_interactor].disconnect_unwanted_devices(filter, force_filter, healthcheck)
 
         if one_time_mode && Time.now > finish_time
           raise "Connect loop timeout reached"
@@ -96,7 +97,7 @@ module Stf
         if all_flag
           to_connect = stf_devices.size
         else
-          connected = (devices + DI[:connect_ios].connected_ios_urls()) & all_devices.as_connect_url_list
+          connected = (DI[:android_util].get_present_adb_devices_ids + DI[:connect_ios].ios_serials_to_urls.keys)
           to_connect = wanted - connected.size
         end
 
@@ -116,43 +117,13 @@ module Stf
       end
     end
 
-    def count_connected_devices(filter)
+    def count_connected_devices(filter, force_filter)
       stf_devices = DeviceList.new(DI[:stf].get_user_devices)
-      stf_devices = stf_devices.by_filter(filter) if filter
-      connected = (devices + DI[:connect_ios].connected_ios_urls()) & stf_devices.as_connect_url_list
-      connected.size
+      stf_devices = stf_devices.by_filter(filter) if filter && force_filter
+      connected = (DI[:android_util].map_serials_to_adb_urls.keys + DI[:connect_ios].ios_serials_to_urls.keys)
+      connected_filtered = stf_devices.asArray.map {|d| d.serial} & connected
+      connected_filtered.size
     end
 
-    def cleanup_disconnected_devices(filter, force_filter, healthcheck)
-      to_disconnect = []
-      stf_devices = DeviceList.new(DI[:stf].get_user_devices)
-
-      if filter && force_filter
-        disconnect_because_filter = stf_devices.except_filter(filter).as_connect_url_list
-        unless disconnect_because_filter.empty?
-          logger.info 'will be disconnected by filter: ' + disconnect_because_filter.join(',')
-          to_disconnect += disconnect_because_filter
-        end
-      end
-
-      if healthcheck
-        disconnect_by_health = stf_devices.select_not_healthy(healthcheck).as_connect_url_list
-        unless disconnect_by_health.empty?
-          logger.info 'will be disconnected by health check: ' + disconnect_by_health.join(',')
-          to_disconnect += disconnect_by_health
-        end
-      end
-
-      dead_persons = stf_devices.as_connect_url_list - (devices + DI[:connect_ios].connected_ios_urls())
-      unless dead_persons.empty?
-        logger.info 'will be disconnected because not present locally: ' + dead_persons.join(',')
-        to_disconnect += dead_persons
-      end
-
-      to_disconnect.reject {|url| url.to_s.empty?}.uniq.each do |url|
-        logger.info 'Cleanup the device ' + url.to_s
-        DI[:stop_debug_session_interactor].execute(url)
-      end
-    end
   end
 end

data/lib/stf/interactor/start_one_debug_session_interactor.rb

@@ -42,7 +42,7 @@ module Stf
           logger.error "Can't open tunnel to provider with IP #{provider_ip}"
           raise
         end
-        remote_connect_tunneled_url = DI[:device_enhancer].get_tunneled_remote_connect_url(device)
+        remote_connect_tunneled_url = remote_connect_url_split[0] + ":" + result.port.to_s
         logger.info remote_connect_tunneled_url
 
         case device.getValue "platform"
@@ -51,7 +51,7 @@ module Stf
             shell('echo adbtest', {serial: "#{remote_connect_tunneled_url}"}, 30)
             raise ADBError, "Could not execute shell test" unless stdout_contains "adbtest"
         when "iOS"
-            DI[:connect_ios].connect(remote_connect_tunneled_url, device.getValue("serial"))
+            DI[:connect_ios].connect(remote_connect_tunneled_url)
         else
             logger.error "Unrecognized device platform"
         end

data/lib/stf/interactor/stop_all_debug_sessions_interactor.rb

@@ -5,6 +5,7 @@ require 'stf/client'
 require 'stf/log/log'
 require 'stf/interactor/stop_debug_session_interactor'
 require 'stf/model/device_list'
+require 'stf/interactor/android_util'
 
 module Stf
   class StopAllDebugSessionsInteractor
@@ -16,12 +17,51 @@ module Stf
       DI[:demonizer].kill unless options[:nokill]
 
       stf_devices = DeviceList.new(DI[:stf].get_user_devices)
-
       stf_devices = stf_devices.by_filter options[:byFilter] if options[:byFilter]
+      stf_devices.asArray.each {|d| DI[:stop_debug_session_interactor].execute d}
+    end
+
+    def disconnect_unwanted_devices(filter, force_filter, healthcheck)
+      DI[:android_util].cleanup_adb_devices
+      to_disconnect = [] # array of device serials
+      active_user_devices = DeviceList.new(DI[:stf].get_user_devices)
+      adb_serials_to_urls = DI[:android_util].map_serials_to_adb_urls
+
+      if filter && force_filter
+        disconnect_because_filter = active_user_devices.except_filter(filter).asArray.map { |d| d.serial }
+        unless disconnect_because_filter.empty?
+          logger.info 'will be disconnected by filter: ' + disconnect_because_filter.join(',')
+          to_disconnect += disconnect_because_filter
+        end
+      end
 
-      pending_disconnect = stf_devices.as_connect_url_list
+      if healthcheck
+        disconnect_by_health = active_user_devices.select_not_healthy(healthcheck).asArray.map { |d| d.serial }
+        unless disconnect_by_health.empty?
+          logger.info 'will be disconnected by health check: ' + disconnect_by_health.join(',')
+          to_disconnect += disconnect_by_health
+        end
+      end
 
-      pending_disconnect.each {|d| DI[:stop_debug_session_interactor].execute d}
+      dead_persons = active_user_devices.asArray.map { |d| d.serial } - (adb_serials_to_urls.keys + DI[:connect_ios].ios_serials_to_urls.keys)
+      unless dead_persons.empty?
+        logger.info 'will be disconnected because not present locally: ' + dead_persons.join(',')
+        to_disconnect += dead_persons
+      end
+
+      without_active_session = (adb_serials_to_urls.keys + DI[:connect_ios].ios_serials_to_urls.keys) - active_user_devices.asArray.map{ |d| d.serial }
+      unless without_active_session.empty?
+        logger.info 'will be disconnected because session is not active in SmartDust Lab: ' + without_active_session.join(',')
+        to_disconnect += without_active_session
+      end
+
+      DeviceList.new(DI[:stf].get_devices).asArray.filter {|device|
+        to_disconnect.include? device.serial
+      }.each do |device|
+        logger.info 'Cleanup the device ' + device.serial
+        DI[:stop_debug_session_interactor].execute(device)
+      end
     end
+
   end
 end

data/lib/stf/interactor/stop_debug_session_interactor.rb

@@ -9,50 +9,44 @@ module Stf
     include Log
     include ADB
 
-    def execute(remote_connect_url)
-      remote_devices = DI[:stf].get_user_devices
-      device = remote_devices.find {|d| d.remoteConnect == true && DI[:device_enhancer].get_tunneled_remote_connect_url(d).eql?(remote_connect_url)}
-
-      # try to disconnect anyway
-      if DI[:connect_ios].connected_ios_devices.include? remote_connect_url
-        DI[:connect_ios].disconnect()
-      else
-        execute_adb_with 30, "disconnect #{remote_connect_url}"
-      end
+    def execute(device)
 
-      if device.nil?
-        logger.error "Device #{remote_connect_url} is not available"
-        return false
+      if DI[:connect_ios].ios_serials_to_urls.keys.include? device.serial
+        DI[:connect_ios].disconnect(DI[:connect_ios].ios_serials_to_urls[device.serial])
+      elsif devices.include? device.serial
+        execute_adb_with 30, "disconnect #{remote_connect_url}"
       end
 
-      success = false
-
-      1..10.times do
-        begin
-          success = DI[:stf].stop_debug(device.serial)
-          break if success
-        rescue
+      if DeviceList.new(DI[:stf].get_user_devices).asArray.map {|d| d.serial}.include? device.serial
+        success = false
+          1..10.times do
+            begin
+              success = DI[:stf].stop_debug(device.serial)
+              break if success
+            rescue
+            end
+
+            logger.error 'Can\'t stop debug session. Retrying'
+          end
+
+        1..10.times do
+          begin
+            success = DI[:stf].remove_device(device.serial)
+            break if success
+          rescue
+          end
+          logger.error 'Can\'t remove device from user devices. Retrying'
         end
 
-        logger.error 'Can\'t stop debug session. Retrying'
-      end
-
-      1..10.times do
-        begin
-          success = DI[:stf].remove_device(device.serial)
-          break if success
-        rescue
+        if success
+          logger.info "Successfully removed #{device.serial}"
+        else
+          logger.error "Error removing #{device.serial}"
         end
-        logger.error 'Can\'t remove device from user devices. Retrying'
-      end
-
-      if success
-        logger.info "Successfully removed #{remote_connect_url}"
-      else
-        logger.error "Error removing #{remote_connect_url}"
       end
 
       success
     end
   end
+
 end

data/lib/stf/model/device_list.rb

@@ -52,11 +52,6 @@ module Stf
       }
     end
 
-    def as_connect_url_list
-      @devices.reject { |d| d.remoteConnectUrl.nil? || d.remoteConnectUrl.empty? }
-              .map{|d| DI[:device_enhancer].get_tunneled_remote_connect_url(d)}
-    end
-
     def select
       DeviceList.new(@devices.select {|d| yield(d)})
     end

data/lib/stf/version.rb

@@ -1,3 +1,3 @@
 module Stf
-  VERSION = '1.2.0'
+  VERSION = '1.3.1'
 end

data/lib/stf/view/cli.rb

@@ -2,8 +2,10 @@ module Stf
   module CLI
     require 'di'
     require 'gli'
+    require 'stf/log/log'
 
     include GLI::App
+    include Log
 
     extend self
 
@@ -105,8 +107,7 @@ module Stf
     desc 'Add adb public key into Smartdust Lab'
     command :trustme do |c|
       c.desc 'Location of adb public key'
-      c.flag [:k, :adb_public_key_location]
-      c.default_value '~/.android/adbkey.pub'
+      c.flag [:k, :adb_public_key_location], :default_value => '~/.android/adbkey.pub'
 
       c.action do |_, options, _|
         filename = File.expand_path(options[:adb_public_key_location])
@@ -117,5 +118,4 @@ module Stf
 
     exit run(ARGV)
   end
-end
-
+end

data/smartdust-client.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors  = ['Smartdust']
   spec.email    = ['jordan@smartdust.me']
   spec.summary  = %q{Connect to devices from Smartdust Lab via adb from cli}
-  spec.homepage = 'https://github.com/jordus100/stf-client'
+  spec.homepage = 'https://docs.smartdust.me/docs/cli-client'
   spec.license  = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartdust-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Smartdust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -229,6 +229,7 @@ files:
 - lib/stf.rb
 - lib/stf/client.rb
 - lib/stf/interactor/add_adb_public_key.rb
+- lib/stf/interactor/android_util.rb
 - lib/stf/interactor/connect_ios_interactor.rb
 - lib/stf/interactor/get_keys_interactor.rb
 - lib/stf/interactor/get_values_interactor.rb
@@ -239,7 +240,6 @@ files:
 - lib/stf/interactor/stop_debug_session_interactor.rb
 - lib/stf/log/log.rb
 - lib/stf/model/device.rb
-- lib/stf/model/device_enhancer.rb
 - lib/stf/model/device_list.rb
 - lib/stf/system/demonizer.rb
 - lib/stf/validate/uri_validator.rb
@@ -247,7 +247,7 @@ files:
 - lib/stf/view/cli.rb
 - smartdust-client.gemspec
 - smartdust-logo-text-2021.png
-homepage: https://github.com/jordus100/stf-client
+homepage: https://docs.smartdust.me/docs/cli-client
 licenses:
 - MIT
 metadata: {}

data/lib/stf/model/device_enhancer.rb

@@ -1,17 +0,0 @@
-module Stf
-  class DeviceEnhancer
-    def get_tunneled_remote_connect_url(device)
-      provider = device.provider
-      provider_ip = provider["ip"]
-      result = DI[:stf].start_debug device.serial
-      remote_connect_url_split = result.remoteConnectUrl.split ":"
-      remote_connect_port = remote_connect_url_split[1]
-      result = DI[:stf].check_tunnel provider_ip, remote_connect_port
-      if result.success
-        remote_connect_hostname = remote_connect_url_split[0]
-        remote_connect_hostname + ":" + result.port.to_s
-      else nil
-      end
-    end
-  end
-end