smartdust-client 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ad0e2e8968ddc2d92112ef56c8ad15403b99507f9699b45e18fd75c42adf76
-  data.tar.gz: a44754161a3a0a3eb9ce069717c6c00e5ce2ffce12d00380c43764863172101d
+  metadata.gz: aecd7f3f68308d02daca89b7dde9ac29af0f591b9b6958156f88ad8b3220e392
+  data.tar.gz: 12ec2efbf1d1c92858e751991b7199d4c3eab74ea2fcca89cd89146f255a8456
 SHA512:
-  metadata.gz: 9ff4070a8ba7c49778a713b777e149487747a9aa28462f5cbc8bbbc7f0e8d918a344312f6652c49a4a6a2469fd4ab56d0ef09f4f6cb1b3feb1cb49598df3a7df
-  data.tar.gz: 84bd40b60b759ea84d4b498c96b0a91c139be9bc398bb0de72c3cc71d89347b5713b0c502d034bc3e75edd25447bd38c36832263059b632754bf5dd8145ad03f
+  metadata.gz: c9135de81485161d76a5d7f245a363eac06f37aafa64c7df012579a41d69b3000b76fe13b86629210de374e10015f636d453221e2dece03f29873320dbb3a839
+  data.tar.gz: 41aa90c194c5c10f9cde3a85ee694556ccd77a74d952e2458ef8e1f4260ca41fdd35fdb2e7cb94b98017df6dc24636d405033e0f6510830632de39cf8dfc71a3

data/lib/di.rb

@@ -10,6 +10,7 @@ require 'stf/interactor/remove_all_user_devices_interactor'
 require 'stf/interactor/get_keys_interactor'
 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'
 
@@ -70,9 +71,14 @@ class DI
       c.register(:add_adb_public_key_interactor,
                  -> {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")},
+                memoize: true)
     end
 
     def [](what)
@@ -83,4 +89,4 @@ class DI
       @@container
     end
   end
-end
+end

data/lib/stf/interactor/connect_ios_interactor.rb

@@ -0,0 +1,50 @@
+module Stf
+    class ConnectIosInteractor
+
+        @@connected_ios_urls = Array.new
+
+        def initialize(sd_remote_ios_path, ideviceid_path)
+            @sd_remote_ios = sd_remote_ios_path
+            @ideviceid = ideviceid_path
+        end
+
+        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"
+                end
+            end
+        end
+
+        def disconnect()
+            `sudo pkill -f #{@sd_remote_ios}`
+            @@connected_ios_urls = Array.new
+        end
+
+        def connected_ios_urls()
+            return @@connected_ios_urls
+        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
+            end
+        end
+
+    end
+end

data/lib/stf/interactor/start_debug_session_interactor.rb

@@ -1,8 +1,10 @@
 require 'ADB'
 
+require 'di'
 require 'stf/client'
 require 'stf/log/log'
 require 'stf/model/device_list'
+require 'stf/interactor/connect_ios_interactor'
 
 module Stf
   class StartDebugSessionInteractor
@@ -94,7 +96,7 @@ module Stf
         if all_flag
           to_connect = stf_devices.size
         else
-          connected = devices & all_devices.as_connect_url_list
+          connected = (devices + DI[:connect_ios].connected_ios_urls()) & all_devices.as_connect_url_list
           to_connect = wanted - connected.size
         end
 
@@ -117,7 +119,7 @@ module Stf
     def count_connected_devices(filter)
       stf_devices = DeviceList.new(DI[:stf].get_user_devices)
       stf_devices = stf_devices.by_filter(filter) if filter
-      connected = devices & stf_devices.as_connect_url_list
+      connected = (devices + DI[:connect_ios].connected_ios_urls()) & stf_devices.as_connect_url_list
       connected.size
     end
 
@@ -141,7 +143,7 @@ module Stf
         end
       end
 
-      dead_persons = stf_devices.as_connect_url_list - devices
+      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

data/lib/stf/interactor/start_one_debug_session_interactor.rb

@@ -44,10 +44,17 @@ module Stf
         end
         remote_connect_tunneled_url = DI[:device_enhancer].get_tunneled_remote_connect_url(device)
         logger.info remote_connect_tunneled_url
-        execute_adb_with 30, "connect #{remote_connect_tunneled_url}"
 
-        shell('echo adbtest', {serial: "#{remote_connect_tunneled_url}"}, 30)
-        raise ADBError, "Could not execute shell test" unless stdout_contains "adbtest"
+        case device.getValue "platform"
+        when "Android"
+            execute_adb_with 30, "connect #{remote_connect_tunneled_url}"
+            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"))
+        else
+            logger.error "Unrecognized device platform"
+        end
 
         return true
 
@@ -73,4 +80,4 @@ module Stf
       s.gsub(/["]/, '\"').gsub(/[ ]/, '\ ').gsub(/[=]/, '\=').gsub(/[,]/, '\,')
     end
   end
-end
+end

data/lib/stf/interactor/stop_debug_session_interactor.rb

@@ -14,7 +14,11 @@ module Stf
       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
-      execute_adb_with 30, "disconnect #{remote_connect_url}"
+      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
 
       if device.nil?
         logger.error "Device #{remote_connect_url} is not available"

data/lib/stf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartdust-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Smartdust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-01 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/connect_ios_interactor.rb
 - lib/stf/interactor/get_keys_interactor.rb
 - lib/stf/interactor/get_values_interactor.rb
 - lib/stf/interactor/remove_all_user_devices_interactor.rb