remotedroid 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffd9a9a0c4d6d86dcf23408d9345c0a57bef2b6a516b8effcce7dc4b2b8bb0d3
-  data.tar.gz: e752e40ee31bf64505e84dc7c2e49a45f61185d3e2573dfb1f4b73526c8a5cb5
+  metadata.gz: f599ec7df2216b5703047cceb92aa8c0e654bde02155919e2f4495407367d1c7
+  data.tar.gz: a508f24d92d1886c10e18ab8288fd6aafc3784dcd0d69552b922629d768c1ced
 SHA512:
-  metadata.gz: '090b89b8e66c0b6368015741e4db9b9344f6714c96f393efaa40a0a019f467fd04b078a716ae2a9ca2af6e687ea328eccbf67e1d87eee0a278281b34d72e0394'
-  data.tar.gz: ed2ca4e908800cb5f88c34d5352cde163168959d994bf82c66a3f90b0e5bc187ccc6b73c9afcf24cd6fbe00fb52a668c3b2d5b29a09410f7ac7eb9614c401a79
+  metadata.gz: 5bd97bfa9e552a8ceb6c773d3aa3586a5be4728e53bea999d2b801c284f631fef21c5a090651028f048c5df6735a82ae1a7a94a493a3c79e9f6053e1d5eb2535
+  data.tar.gz: 6ade1995bbce809a3a65bcf3e9202127d3c9b53617c775c0ca75caa13a26830dac286b264143b6de3f48d15498582ee74aa043a3b54b9b67e430f0a93d14c6fc

data/lib/remotedroid.rb

@@ -45,6 +45,7 @@ require 'ruby-macrodroid'
 # ## Camera/Photo
 #
 # * Take Picture
+# * Take Screenshot
 #
 # ## Connectivity
 #
@@ -66,7 +67,7 @@ require 'ruby-macrodroid'
 #
 # ## MacroDroid specific
 #
-# * Disable Macro
+# * Enable/Disable Macro
 #
 # ## Media
 #
@@ -79,7 +80,7 @@ require 'ruby-macrodroid'
 # ## Screen
 #
 # * Keep Device Awake
-# * Screen On
+# * Screen On/Off
 #
 
 # Variables which can be queried
@@ -197,6 +198,100 @@ 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: Voice search
+t: webhook
+a: Voice search
+
+m: Ask Alexa
+t: webhook
+a: shortcut Ask Alexa
+
+m: Set Auto Rotate
+; toggle doesn't currently work because of a bug with else if
+v: state
+t: webhook
+a:
+  if state = 0
+    Auto Rotate On
+  Else If
+    Auto Rotate Off
+  else
+    Auto Rotate Toggle
+  end if
+
 m: Share location
 t: 
   WebHook
@@ -276,9 +371,12 @@ m: Power connected
 t: Power Connected: Any
 a: webhook
 
-m: screen on off
+m: Screen on
 t: screen on
-a: webhook
+a:
+  webhook
+    identifier: screen_on_off
+    screen_on: true
 
 m: Power Button Toggle3
 t: Power Button Toggle (3)
@@ -305,69 +403,121 @@ m: In Vehicle
 t:
   Activity - In Vehicle
     Confidence >= 50%
-a: webhook    
+a:
+  webhook
+    identifier: activity
+    index: 0
 
 m: On Bicycle
 t:
   Activity - On Bicycle
     Confidence >= 50%
-a: webhook
-
+a:
+  webhook
+    identifier: activity
+    index: 1
+    
 m: Running
 t:
   Activity - Running
     Confidence >= 50%
-a: webhook    
+a:
+  webhook
+    identifier: activity
+    index: 2
 
 m: Walking
 t:
   Activity - Walking
     Confidence >= 50%
-a: webhook
+a:
+  webhook
+    identifier: activity
+    index: 3
 
 m: Still
 t:
   Activity - Still
     Confidence >= 83%
-a: webhook
-
+a:
+  webhook
+    identifier: activity
+    index: 4
+    
 m: Swipe top left across
 t:
   Swipe Screen
     Top Left - Across
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 0
 
 m: Swipe top left diagonal
 t:
   Swipe Screen
     Top Left - Diagonal
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 1
 
 m: Swipe top left down
 t:
   Swipe Screen
     Top Left - Down
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 0
+    motion: 2
 
 m: Swipe top right across
 t:
   Swipe Screen
     Top Right - Across
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 0    
+    
 
 m: Swipe top right diagonal
 t:
   Swipe Screen
     Top Right - Diagonal
-a: webhook
+a:
+  webhook
+    identifier: swipe
+    start: 1
+    motion: 1
 
 m: Swipe top right down
 t:
   Swipe Screen
     Top Right - Down
-a: webhook
+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
 
 
@@ -423,8 +573,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,8 +46,16 @@ module RemoteDroid
       @drb.store
     end
     
+    def syslog()
+      @drb.syslog
+    end
+    
     # -- helpful methods -----------------
     
+    def ask_alexa()
+      control.ask_alexa
+    end
+    
     def battery()
       query.battery
     end
@@ -50,6 +64,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 +79,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 +118,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 +137,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('Next')
+    end
+    
+    def pause()
+      control_media('Pause')
+    end    
+
+    def play()
+      control_media('Play')
+    end    
+    
+    def play_pause()
+      control_media('Play/Pause')
+    end
+    
     def photo()
       take_picture
     end
     
+    def previous()
+      control.control_media(option: 'Previous')
+    end    
+    
     def say(text)
       control.speak_text text
     end
@@ -115,6 +194,22 @@ module RemoteDroid
       screen :off
     end
     
+    def set_auto_rotate(state=nil)
+      control.set_auto_rotate state
+    end
+    
+    def set_auto_rotate_on()
+      control.set_auto_rotate 0
+    end    
+    
+    def set_auto_rotate_off()
+      control.set_auto_rotate 1
+    end
+    
+    def set_auto_rotate_toggle()
+      control.set_auto_rotate 2
+    end
+
     def stay_awake()
       control.stay_awake
     end
@@ -123,13 +218,20 @@ module RemoteDroid
       control.stay_awake_off
     end
     
+    alias awake_off stay_awake_off
+    
+    def stop()
+      control_media(option: 'Stop')
+    end
+    
     def take_picture(ftp_src: nil, fileout: '.')
       
       #screen.on
-      r = query.take_picture
+      #launch 'camera'
             
       if ftp_src then
         
+        r = query.take_picture        
         # give the device a second to write the image to file
         sleep 1
         
@@ -139,12 +241,37 @@ module RemoteDroid
         filename = ftp.ls.sort_by {|x| x[:ctime]}.last[:name]
         ftp.cp filename, fileout
         
+      else
+        
+        contro.take_picture
+        
       end
       
     end   
     
     alias take_photo take_picture
     
+    def take_screenshot(ftp_src: nil, fileout: '.')
+      
+      #screen.on
+ 
+            
+      if ftp_src then
+         
+        r = query.take_screenshot
+        # 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    
@@ -152,6 +279,26 @@ module RemoteDroid
     def vibrate
       control.vibrate
     end
+    
+    def voice_search
+      control.voice_search
+    end    
+    
+    def volume(context=nil)      
+      query.volume context
+    end
+
+    alias vol volume
       
   end
+  
+  
+  class WebServer < AppHttp
+    
+    def initialize(port: 9292)
+      super(RemoteDroid::Client.new, port: port)
+    end
+    
+  end
+  
 end

data/lib/remotedroid/control.rb

@@ -8,22 +8,42 @@ module RemoteDroid
 
     end    
     
+    def ask_alexa(options={})
+      http_exec 'ask-alexa', options
+    end    
+    
     def bluetooth()
-      @bluetooth
+      #to-do
     end
     
     def camera_flash_light(options={})
       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 +85,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    
@@ -94,6 +142,29 @@ module RemoteDroid
       end
     end
     
+    def set_auto_rotate(state=nil)
+      
+      if state then
+        http_exec 'set-auto-rotate', {state: state} 
+      else        
+        
+        def self.on()
+          http_exec 'set-auto-rotate', {state: 0}
+        end
+        
+        def self.off()
+          http_exec 'set-auto-rotate', {state: 1} 
+        end
+        
+        def self.toggle()
+          http_exec 'set-auto-rotate', {state: 2} 
+        end        
+        
+        self
+        
+      end      
+    end    
+    
     def share_location(options={})
       http_exec 'share-location'
     end
@@ -126,6 +197,9 @@ module RemoteDroid
     
     alias take_photo take_picture
 
+    def take_screenshot(options={})
+      http_exec 'take-screenshot', options
+    end    
     
     def toast(options={})
       http_exec :toast, options
@@ -138,6 +212,10 @@ module RemoteDroid
     def vibrate(options={})
       http_exec :vibrate
     end    
+        
+    def voice_search(options={})
+      http_exec 'voice-search'
+    end    
 
 
     def write(s)

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,31 @@ module RemoteDroid
       @callback.query(:'take-picture')
     end
     
+    def take_screenshot()      
+      @callback.query(:'take-screenshot')
+    end   
+    
+    def volume(context=nil)
+      
+      if context then
+        q(context)
+      else        
+        
+        def self.alarm()     q(:vol_alarm)    end        
+        def self.bt_voice()  q(:vol_bt_voice) end
+        def self.call()      q(:vol_call)     end          
+        def self.music()     q(:vol_music)    end
+        def self.notify()    q(:vol_notif)   end
+        def self.system()    q(:vol_system)   end          
+          
+        self
+        
+      end
+    end    
+    
+    alias vol volume
+    
+    
     private
     
     def q(id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotedroid
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   io3WPRDjULC924M5S8wbrus31v2AUjqFBPvmHr7caf/VHErWypV482xcDhWt1eif
   0G2k2ptozXcBS9odsqGUTb5N
   -----END CERTIFICATE-----
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onedrb
@@ -97,6 +97,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.7
+- !ruby/object:Gem::Dependency
+  name: sps-pub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: apphttp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: ruby-macrodroid
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +146,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,7 +156,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.17
 description: 
 email: james@jamesrobertson.eu
 executables: []