smartdust-client 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626d11e60ef6fec0b2bb5427799e640f4241fa2ef58ab4adf94af2f73140e730
-  data.tar.gz: '072582406d885803b8afb8f724b2f0a297d8b62ca88cc7e8e6c80c41d52aca7f'
+  metadata.gz: 2af1a413ea84e37dedbc6a834955cdad82661d5a4a61185fb405442583c36ae2
+  data.tar.gz: c55e850f6291ea41eb1a7259afc06384fe791b3b8381415683714bcf7efccf58
 SHA512:
-  metadata.gz: 9c82d5bf891b09ba4e174abaf599770fe22b4b8ca66d6b5f6b953a553272bdcb8a7f88a38dd1682c5de7bc0f7867bc405378ae93541ea8dd8532bad57abc67e9
-  data.tar.gz: e636958492f295494cecdefe74cb85ce8a1c8eb82c103ccb3b9a00f3d85d0622dc9921dab83cb03294794049ba8888e94673c1551e017a5c4510c4b4107796d8
+  metadata.gz: d04347117e4db242dae76e8c64ca619b05865961441f9a09a3e03ba3727ed1855887ad2e51b220fa62678160211a4ef2232c1a88f2cf21c53ab82c853edf347d
+  data.tar.gz: f7c5351efdf519fb6f4799371f8c5cd707d041b0bba03d9fd73f9761bd31bdfc246312084c478c08d5c4117ca7d5045095b6974468f8c20a1b0782e49378796d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smartdust-client (1.3.1)
+    smartdust-client (1.3.3)
       ADB (~> 0.5)
       dante (~> 0.2.0)
       dry-configurable (~> 0.1.4)

data/README.md

@@ -4,7 +4,7 @@
 
 # Smartdust CLI client
 ![smartdust-logo-text-2021.png](smartdust-logo-text-2021.png)
-Documentation: https://docs.smartdust.me/docs/cli-client.
+Documentation: https://docs.smartdust.me/docs/CLI%20Lab%20client/cli-client-1-3
 
 Automation client for connecting to Smartdust Lab devices via adb from a terminal.
 Designed with the following scenario in mind:
@@ -26,7 +26,6 @@ e.g. all unique names of devices in the lab instance.
 - 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
@@ -39,13 +38,13 @@ e.g. all unique names of devices in the lab instance.
 - "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)
+- ```gem install smartdust-client-1.3.4.gem``` (or different version, see output of the previous command)
 
 ## Usage
 
 ```
 NAME
-    smartdust-client - Smartdust Lab client (version 1.2.0)
+    smartdust-client - Smartdust Lab client (version 1.3.3)
 
 SYNOPSIS
     smartdust-client [global options] command [command options] [arguments...]

data/lib/stf/client.rb

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

data/lib/stf/interactor/connect_ios_interactor.rb

@@ -22,7 +22,6 @@ module Stf
             end
         end
 
-
         def connect(url)
             raise "iOS connecting is not active" unless @active
             Open3.capture3("usbfluxctl add #{url}")

data/lib/stf/interactor/stop_debug_session_interactor.rb

@@ -11,35 +11,20 @@ module Stf
 
     def execute(device)
 
-      if DI[:connect_ios].ios_serials_to_urls.keys.include? device.serial
+      if DI[:connect_ios].ios_serials_to_urls.has_key? 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
 
       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
+
+        success = close_tunnel(device)
+        success = stop_debug(device)
+        success = release_control(device)
 
         if success
-          logger.info "Successfully removed #{device.serial}"
+          logger.info "Removed #{device.serial}"
         else
           logger.error "Error removing #{device.serial}"
         end
@@ -47,6 +32,47 @@ module Stf
 
       success
     end
+
+    def close_tunnel(device)
+      success = false
+      provider_ip = device.getValue("provider")["ip"]
+      port = device.getValue("remoteConnectUrl")&.split(":")[1].to_i
+      return false if provider_ip.nil? || port.nil?
+      1..10.times do
+        begin
+          success = DI[:stf].destroy_tunnel(provider_ip, port)
+          break if success
+        rescue
+        end
+        logger.error "Can't close tunnel for device #{device.serial}. Retrying"
+      end
+      success
+    end
+
+    def stop_debug(device)
+      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
+      success
+    end
+
+    def release_control(device)
+      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
+    end
+
   end
 
 end

data/lib/stf/version.rb

@@ -1,3 +1,3 @@
 module Stf
-  VERSION = '1.3.2'
+  VERSION = '1.3.4'
 end

data/smartdust-client.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version  = Stf::VERSION
   spec.authors  = ['Smartdust']
   spec.email    = ['jordan@smartdust.me']
-  spec.summary  = %q{Connect to devices from Smartdust Lab via adb from cli}
-  spec.homepage = 'https://docs.smartdust.me/docs/cli-client'
+  spec.summary  = %q{Connect to devices from Smartdust Lab from cli}
+  spec.homepage = 'https://docs.smartdust.me/docs/CLI%20Lab%20client/cli-client-1-3'
   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.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Smartdust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-28 00:00:00.000000000 Z
+date: 2025-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -247,7 +247,7 @@ files:
 - lib/stf/view/cli.rb
 - smartdust-client.gemspec
 - smartdust-logo-text-2021.png
-homepage: https://docs.smartdust.me/docs/cli-client
+homepage: https://docs.smartdust.me/docs/CLI%20Lab%20client/cli-client-1-3
 licenses:
 - MIT
 metadata: {}
@@ -269,5 +269,5 @@ requirements: []
 rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
-summary: Connect to devices from Smartdust Lab via adb from cli
+summary: Connect to devices from Smartdust Lab from cli
 test_files: []