remotedroid 0.5.0 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec97faa80816c99a0b7beed8f4274c90f9b3015d6a0db1586a520e3167849351
-  data.tar.gz: 73734010ed7db6576c84988d909ca21aed08e8561b7a9e55e3d657bcdabd0b33
+  metadata.gz: a86c870441f3c62f297cbcfc00422258f19d0061d0f4379c825f8abfb1d37f4b
+  data.tar.gz: 71f5eef47bf451ea91cbbd0b0cf2d45d4c1f656505d97bc65287bf673e7e0416
 SHA512:
-  metadata.gz: a493dc47aa1c0cbe51c87e7189f1504eb0734088f6ae679da563fee60ea8ae45c4225d1f77909bfb91266b78f81614c89bdba6dec1dfaabedf5c3da0be1bc33e
-  data.tar.gz: 8ff28ae91aaccf51919732e516c3915c136acf8be4511b0acfad80ef44447ee5e4b35796003ba0a010da4ed7559674caff94786434e9ba83811cff56e828af75
+  metadata.gz: f018dbb7e614a4555a658a8723dacbfff6127388b80d5b78a161af07076438b214ad30ed7d09d97f23ce178ccf32ee533b55e4b3fe84444c4d4c73c1d0adde96
+  data.tar.gz: e373a0b5a31d9e6648376bf8a17e1745dc041658f7250767da2f6ab063b7a1ea621ad4cbc66cf7cdad2e467e048b5e7f8365f3597bf63d69d6635e47d093af33

data/lib/remotedroid.rb

@@ -14,15 +14,30 @@ require 'ruby-macrodroid'
 # 
 # # Triggers
 #
+# ## Battery/Power
+#
+# * Power button toggle
+#
+# ## Connectivity
+#
+# ### Wifi State Change
+#
+# * Connected to Network
+#
 # ## Device Events
 #
 # * screen on
 #
 # ## Sensors
-# 
+#
+# * Activity Recognition
 # * proximity (near)
 # * shake device
 #
+# ## User Input
+#
+# * Swipe Screen
+#
 # ------------------------------------
 #
 # # Actions
@@ -182,6 +197,79 @@ m: stay awake off
 t: webhook
 a: stay awake off
 
+m: Launch Google Play Music
+t: webhook
+a: Launch Google Play Music
+
+
+m: Media Next
+t: webhook
+a:
+  Media Next
+    Simulate Media Button (Google Play Music)
+    
+m: Media Pause
+t: webhook
+a:
+  Media Pause
+    Simulate Media Button (Google Play Music)
+    
+m: Media Play
+t: webhook
+a:
+  Media Play
+    Simulate Media Button (Google Play Music)
+    
+m: Media Play Pause
+t: webhook
+a:
+  Media Play/Pause
+    Simulate Media Button (Google Play Music)
+
+m: Media Previous
+t: webhook
+a:
+  Media Previous
+    Simulate Media Button (Google Play Music)
+    
+m: Media Stop
+t: webhook
+a:
+  Media Stop
+    Simulate Media Button (Google Play Music)    
+
+m: Open website
+v: url
+t: webhook
+a: goto [lv=url]
+
+m: Fill clipboard
+v: clipboard
+t: webhook
+a:
+  Fill Clipboard
+    [lv=clipboard]
+
+m: click text content
+v: content
+t: webhook
+a:
+  UI Interaction
+    Click [[lv=content]]    
+    
+m: Launch by package
+v: package
+t: webhook
+a: Launch [lv=package]
+    
+m: Take Screenshot
+t: webhook
+a:
+  Take Screenshot
+    Save to device
+a: wait 2 seconds
+a: webhook
+
 m: Share location
 t: 
   WebHook
@@ -261,12 +349,163 @@ m: Power connected
 t: Power Connected: Any
 a: webhook
 
-m: screen on off
+m: Screen on
 t: screen on
+a:
+  webhook
+    identifier: screen_on_off
+    screen_on: true
+
+m: Power Button Toggle3
+t: Power Button Toggle (3)
 a: webhook
 
-EOF
+m: Power Button Toggle4
+t: Power Button Toggle (4)
+a: webhook
+
+m: Power Button Toggle5
+t: Power Button Toggle (5)
+a: webhook
+
+m: Connected to network
+t:
+  Connected to network
+    Any Network
+a: wait 2 seconds    
+a:
+  webhook
+    ssid: [ssid]
+
+m: In Vehicle
+t:
+  Activity - In Vehicle
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 0
+
+m: On Bicycle
+t:
+  Activity - On Bicycle
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 1
+    
+m: Running
+t:
+  Activity - Running
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 2
+
+m: Walking
+t:
+  Activity - Walking
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 3
+
+m: Still
+t:
+  Activity - Still
+    Confidence >= 83%
+a:
+  webhook
+    identifier: activity
+    index: 4
+    
+m: Swipe top left across
+t:
+  Swipe Screen
+    Top Left - Across
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 0
+
+m: Swipe top left diagonal
+t:
+  Swipe Screen
+    Top Left - Diagonal
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 1
 
+m: Swipe top left down
+t:
+  Swipe Screen
+    Top Left - Down
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 2
+
+m: Swipe top right across
+t:
+  Swipe Screen
+    Top Right - Across
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 0    
+    
+
+m: Swipe top right diagonal
+t:
+  Swipe Screen
+    Top Right - Diagonal
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 1
+
+m: Swipe top right down
+t:
+  Swipe Screen
+    Top Right - Down
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 2
+
+m: flip from up to down
+t: Flip Device Face Up -> Face Down
+a:
+  webhook
+    identifier: flip_device
+    facedown: true
+
+m: flip from down to up
+t: Flip Device Face Down -> Face Up
+a:
+  webhook
+    identifier: flip_device
+    facedown: false    
+EOF
+s='
+    
+m: click text content
+v: content
+t: webhook
+a:
+  UI Interaction
+    Click [[[lv=content]]]
+    '
 
 module RemoteDroid
   
@@ -320,8 +559,19 @@ module RemoteDroid
         
         context, json = msg.split(/:\s+/,2)
         category, action = context.split('/',2)
-        @remote.control.method(action.to_sym)\
-            .call(JSON.parse(json, symbolize_names: true))
+        
+        h = JSON.parse(json, symbolize_names: true)
+        
+        if action == 'force_macro_run' and h[:serverside] then
+          
+          a = @remote.run_macro(h)
+          a.each {|msg| self.notice 'macrodroid/action: ' + msg }
+
+        else
+          
+          @remote.control.method(action.to_sym).call(h)
+          
+        end
         
       end
       

data/lib/remotedroid/client.rb

@@ -3,8 +3,9 @@ module RemoteDroid
   class Client
     using ColouredText
     
-    def initialize(host='127.0.0.1')
-      @drb = OneDrb::Client.new host: host, port: '5777'    
+    def initialize(hostx='127.0.0.1', host: hostx, port: '5777', sps_host: 'sps.home', sps_port: '59000')
+      @drb = OneDrb::Client.new host: host, port: port    
+      @sps = SPSPub.new host: sps_host, port: sps_port
     end
     
     def control
@@ -32,6 +33,11 @@ module RemoteDroid
       
     end
     
+    def run_macro(name)
+      a = @drb.run_macro name
+      a.each {|msg| @sps.notice 'macrodroid/action: ' + msg }
+    end
+    
     def update(key, val)
       @drb.update key.to_sym, val
     end
@@ -40,6 +46,10 @@ module RemoteDroid
       @drb.store
     end
     
+    def syslog()
+      @drb.syslog
+    end
+    
     # -- helpful methods -----------------
     
     def battery()
@@ -50,6 +60,14 @@ module RemoteDroid
       query.cell_tower
     end
     
+    def click(s)
+      control.click content: s
+    end
+    
+    def control_media(option='Play/Pause')
+      control.control_media({option: option})
+    end    
+    
     def disable(macro)
       control.disable macro
     end
@@ -57,11 +75,38 @@ module RemoteDroid
     def enable(macro)
       control.enable macro
     end    
+
+    def fill_clipboard(text)
+      control.fill_clipboard clipboard: text
+    end
+    
+    alias copy fill_clipboard
     
     def hotspot(state=nil)      
       control.hotspot state
+    end
+
+    def launch_activity(app='')
+            
+      package = APPS[app]
+      
+      if package then
+        control.launch_package package: package
+      else       
+        r = APPS.find {|k,v| k =~ /#{app}/i}
+        control.launch_package(package: r[1]) if r
+      end        
+
+    end
+    
+    def launch_package(name='')
+      
+      control.launch_package(package: name)
+
     end    
     
+    alias launch launch_activity
+    
     def location()
       query.location
     end
@@ -69,7 +114,6 @@ module RemoteDroid
     def location_watch(refresh: '1 minute', interval: refresh, 
                        duration: '30 minutes')
       
-
       d = ChronicDuration.parse(duration)
       seconds = ChronicDuration.parse(interval)
       puts ("monitoring location every %s for %s" % [interval, duration]).info
@@ -89,10 +133,41 @@ module RemoteDroid
       
     end
     
+    def open_website(url)
+      control.open_website url: url
+    end
+    
+    alias goto open_website
+    alias visit open_website
+    
+    def ip()
+      query.ip
+    end
+
+    def next()
+      control_media(option='Next')
+    end
+    
+    def pause()
+      control_media(option='Pause')
+    end    
+
+    def play()
+      control_media(option='Play')
+    end    
+    
+    def play_pause()
+      control_media(option='Play/Pause')
+    end
+    
     def photo()
       take_picture
     end
     
+    def previous()
+      control_media(option='Previous')
+    end    
+    
     def say(text)
       control.speak_text text
     end
@@ -123,6 +198,10 @@ module RemoteDroid
       control.stay_awake_off
     end
     
+    def stop()
+      control_media(option='Stop')
+    end
+    
     def take_picture(ftp_src: nil, fileout: '.')
       
       #screen.on
@@ -145,6 +224,26 @@ module RemoteDroid
     
     alias take_photo take_picture
     
+    def take_screenshot(ftp_src: nil, fileout: '.')
+      
+      #screen.on
+      r = query.take_screenshot
+            
+      if ftp_src then
+        
+        # give the device a second to write the image to file
+        sleep 1
+        
+        credentials, dir = ftp_src.match(/(ftp:\/\/[^\/]+)\/([^$]+)/).captures
+        ftp = MyMediaFTP.new(credentials)
+        ftp.cd dir
+        filename = ftp.ls.sort_by {|x| x[:ctime]}.last[:name]
+        ftp.cp filename, fileout
+        
+      end
+      
+    end      
+    
     def torch()
       control.torch
     end    

data/lib/remotedroid/control.rb

@@ -16,14 +16,30 @@ module RemoteDroid
       http_exec 'camera-flash-light', options
     end
     
+    def click(options={content: ''})
+      http_exec 'click-text-content', options
+    end
+    
+    def control_media(options={})      
+      http_exec 'media-' + options[:option].downcase.gsub(/\W/,'-')
+    end
+    
     def disable(macro)
       http_exec 'disable-macro', {name: macro}
     end
     
     def enable(macro)
       http_exec 'enable-macro', {name: macro}
+    end
+    
+    def fill_clipboard(options={})
+      http_exec 'fill-clipboard', options
     end    
     
+    def force_macro_run(options={})
+      http_exec option[:macro_name].downcase.gsub(/ /,'-')
+    end
+    
     def hotspot(state=nil)      
       
       if state then
@@ -65,10 +81,38 @@ module RemoteDroid
       
     end
     
+    def launch_activity(options={app: ''})
+      
+      return if options[:app].empty?
+      
+      app = options[:app]
+      
+      package = APPS[app]
+      
+      if package then
+        launch_package package: package
+      else       
+        r = APPS.find {|k,v| k =~ /#{app}/i}
+        launch_package(package: r[1]) if r
+      end      
+      
+    end
+    
+    def launch_package(options={package: 'com.google.android.chrome'})
+      http_exec 'launch-by-package', options
+    end    
+    
     def location(options={})
       http_exec 'location'
     end    
     
+    def open_website(options={url: ''})
+      http_exec 'open-website', options
+    end
+    
+    alias goto open_website
+    alias visit open_website
+    
     def say_current_time(options={})
       http_exec 'say-current-time'
     end    

data/lib/remotedroid/controller.rb

@@ -2,7 +2,7 @@ module RemoteDroid
   
   class Controller
     
-    attr_reader :model, :control
+    attr_reader :model, :control, :syslog
     attr_accessor :title, :macros, :store
 
     def initialize(mcs, model=MODEL, deviceid: nil, debug: false)
@@ -25,18 +25,25 @@ module RemoteDroid
       names = @macros.map {|x| x.triggers.first.type}.uniq
       #@control.enable names.first.to_s.gsub('_',' ')
       puts 'Enabling ' + names.join(',')
-      
+=begin      
       Thread.new do
         names.each do |title|
           @control.enable title.to_s.gsub('_',' ')
           sleep 0.8
         end
       end
-
+=end
     end
     
-    def export(s)
-      @macros = MacroDroid.new(s).macros
+    def delete_all()
+      @macros = []
+    end
+    
+    def export(s, replace: false)
+      
+      macros = MacroDroid.new(s).macros
+      replace ? @macros = macros : @macros << macros
+      
     end
     
     def invoke(name, options={})      
@@ -105,8 +112,17 @@ module RemoteDroid
       @model.request s
     end
     
+    def run_macro(macro_name: '')
+      
+      found = @macros.find do |macro|
+        macro.title.downcase == macro_name.downcase
+      end
+      
+      found.run if found
+      
+    end
     
-    def trigger(name, detail={time: Time.now})
+    def trigger(name, detail={})
       
       macros = @macros.select do |macro|
         
@@ -117,12 +133,14 @@ module RemoteDroid
         #
         valid_trigger = macro.match?(name, detail, @model.op)
         
-        puts 'valid_trigger: ' + valid_trigger.inspect if @debug
+        #puts 'valid_trigger: ' + valid_trigger.inspect if @debug
         
-        if valid_trigger then
-          @syslog << [Time.now, :trigger, name] 
-          @syslog << [Time.now, :macro, macro.title]
-        end
+        #if valid_trigger then
+        #  @syslog << [Time.now, :trigger, name] 
+        #  @syslog << [Time.now, :macro, macro.title]
+        #end
+        
+        @syslog << [Time.now, name, detail]
                      
         valid_trigger
         
@@ -143,7 +161,9 @@ module RemoteDroid
         val.keys.first.to_sym
       end
       
-      @store[key] = val      
+      @syslog << [id, val]      
+      @store[key] = val   
+      
     end
         
   end

data/lib/remotedroid/query.rb

@@ -50,6 +50,10 @@ module RemoteDroid
       @callback.query(:'take-picture')
     end
     
+    def take_screenshot()      
+      @callback.query(:'take-screenshot')
+    end    
+    
     private
     
     def q(id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotedroid
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   io3WPRDjULC924M5S8wbrus31v2AUjqFBPvmHr7caf/VHErWypV482xcDhWt1eif
   0G2k2ptozXcBS9odsqGUTb5N
   -----END CERTIFICATE-----
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onedrb