remotedroid 0.5.4 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667844020454a5bcfa4e47c7db865a9e1cfc70364da42840c8f6d4d1a6d4b021
-  data.tar.gz: 9058f9b6b4206cbf42e8c10ebdba4825bab4c1dcc9da477120bd6e09758af97c
+  metadata.gz: d8b216c60a929b3c6ece03a4b5979da738a0e3f7fb2994060a605391ab8068b9
+  data.tar.gz: d5bfed22b7fbc59767cc1a3af2597cc95b05ddbf8aca80420305a6bdbc12960c
 SHA512:
-  metadata.gz: 116782fbe0c6da9a938e3eeb59961189893fe6221bbdf7fd77d626ab374ab786480c977e0c6b847652e1f1e47b9300c160275cdec8241686209c7a10e190a7ea
-  data.tar.gz: 3521f559ef0febc0f37ce17aa174900ed8697dea131cbfec68db40fa6841d075930c972dfb33f2f4b8cd951d24054a3c7660c5daea5e54d0f38978444872630b
+  metadata.gz: 1fb42e16c68052d50a4ac532a88997fd723178142951dfb4aaaf2da6458128ff7fedea58d56b20020dac6b631f8a439371e4ac231b43ba9dd61db96aef1dd9f0
+  data.tar.gz: 763dc18a3b896bb77b53d1dddf70e4b839a314301e00642e96c326b36f0cdf2d7beed025df3a7232f6879fd097f715ff813fac62913a7988a57d5deec1543b8f

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,48 +198,43 @@ 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)
+    Simulate Audio Button
     
 m: Media Pause
 t: webhook
 a:
   Media Pause
-    Simulate Media Button (Google Play Music)
+    Simulate Audio Button
     
 m: Media Play
 t: webhook
 a:
   Media Play
-    Simulate Media Button (Google Play Music)
+    Simulate Audio Button
     
 m: Media Play Pause
 t: webhook
 a:
   Media Play/Pause
-    Simulate Media Button (Google Play Music)
+    Simulate Audio Button
 
 m: Media Previous
 t: webhook
 a:
   Media Previous
-    Simulate Media Button (Google Play Music)
+    Simulate Audio Button
     
 m: Media Stop
 t: webhook
 a:
   Media Stop
-    Simulate Media Button (Google Play Music)    
+    Simulate Audio Button
 
-m: Open website
+m: Open web page
 v: url
 t: webhook
 a: goto [lv=url]
@@ -249,14 +245,90 @@ t: webhook
 a:
   Fill Clipboard
     [lv=clipboard]
-    
+
 m: click text content
 v: content
 t: webhook
 a:
   UI Interaction
-    Click [[lv=content]]
+    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
+v: state
+t: webhook
+a:
+  if state = 0
+    Auto Rotate On
+  Else If state = 1
+    Auto Rotate Off
+  Else If state = 2
+    Auto Rotate Toggle
+  end if
+  
+m: Set Bluetooth
+v: state
+t: webhook
+a:
+  if state = 0
+    Enable Bluetooth
+  Else If state = 1
+    Disable Bluetooth
+  Else If state = 2
+    Toggle Bluetooth
+  Else If state = 3
+    Connect Audio Device
+  Else If state = 4
+    Disconnect Audio Device
+  end if
+
+m: Set Airplane Mode
+v: state
+t: webhook
+a:
+  if state = 0
+    Airplane Mode On
+  Else If state = 1
+    Airplane Mode Off
+  Else If state = 2
+    Airplane Mode Toggle
+  end if 
+  
+m: Set Wifi
+v: state
+t: webhook
+a:
+  if state = 0
+    Enable Wifi
+  Else If state = 1
+    Disable Wifi
+  Else If state = 2
+    Toggle Wifi
+  Else If state = 3
+    Connect to Network
+  end if  
+
+
 m: Share location
 t: 
   WebHook
@@ -345,15 +417,24 @@ a:
 
 m: Power Button Toggle3
 t: Power Button Toggle (3)
-a: webhook
+a:
+  webhook
+    identifier: power-button-toggle
+    num_toggles: 3
 
 m: Power Button Toggle4
 t: Power Button Toggle (4)
-a: webhook
+a:
+  webhook
+    identifier: power-button-toggle
+    num_toggles: 4
 
 m: Power Button Toggle5
 t: Power Button Toggle (5)
-a: webhook
+a:
+  webhook
+    identifier: power-button-toggle
+    num_toggles: 5
 
 m: Connected to network
 t:
@@ -490,10 +571,10 @@ module RemoteDroid
   
   class Server
     
-    def initialize(s, drb_host: '127.0.0.1', deviceid: nil)
+    def initialize(s, drb_host: '127.0.0.1', devices: nil, debug: false)
       
       md = MacroDroid.new(s)
-      rdc = RemoteDroid::Controller.new(md, deviceid: deviceid)
+      rdc = RemoteDroid::Controller.new(md, devices: devices, debug: debug)
       @drb = OneDrb::Server.new host: drb_host, port: '5777', obj: rdc
       
     end
@@ -505,20 +586,25 @@ module RemoteDroid
   end
     
   class TriggerSubscriber < SPSSub
+    using ColouredText
     
     def initialize(host: 'sps.home', drb_host: '127.0.0.1')
       @remote = OneDrb::Client.new host: drb_host, port: '5777'    
       super(host: host)
+      puts 'TriggerSubscriber'.highlight
     end
     
-    def subscribe(topic: 'macrodroid/trigger')
+    def subscribe(topic: 'macrodroid/#/trigger')
       
-      super(topic: topic) do |msg|
+      super(topic: topic) do |msg, topic|
         
+        dev_id = topic.split('/')[1]
         trigger, json = msg.split(/:\s+/,2)
+        
         a = @remote.trigger_fired trigger.to_sym, 
             JSON.parse(json, symbolize_names: true)
-        a.each {|msg| self.notice 'macrodroid/action: ' + msg }
+        
+        a.each {|msg| self.notice "macrodroid/%s/action: %s" % [dev_id, msg] }
         
       end        
     end
@@ -526,13 +612,15 @@ module RemoteDroid
   end
   
   class ActionSubscriber < SPSSub
+    using ColouredText
     
     def initialize(host: 'sps.home', drb_host: '127.0.0.1')
       @remote = OneDrb::Client.new host: drb_host, port: '5777'    
       super(host: host)
+      puts 'ActionSubscriber'.highlight
     end    
     
-    def subscribe(topic: 'macrodroid/action')
+    def subscribe(topic: 'macrodroid/#/action')
       
       super(topic: topic) do |msg|
         
@@ -541,10 +629,21 @@ module RemoteDroid
         
         h = JSON.parse(json, symbolize_names: true)
         
-        if action == 'force_macro_run' and h[:serverside] then
+        if h[:serverside]then
           
-          a = @remote.run_macro(h)
-          a.each {|msg| self.notice 'macrodroid/action: ' + msg }
+          if action == 'force_macro_run' then
+            
+            a = @remote.run_macro(h)
+            a.each {|msg| self.notice 'macrodroid/action: ' + msg }
+            
+          else
+            
+            puts 'action: ' + action.inspect
+            puts 'h: ' + h.inspect
+            r = @remote.local(action.to_sym, h)
+            puts 'r: ' + r.inspect
+            
+          end
 
         else
           
@@ -559,27 +658,57 @@ module RemoteDroid
   end
   
   class ResponseSubscriber < SPSSub
+    using ColouredText
     
     def initialize(host: 'sps.home', drb_host: '127.0.0.1')
       @remote = OneDrb::Client.new host: drb_host, port: '5777'    
       super(host: host)
+      puts 'ResponseSubscriber'.highlight
     end    
     
-    def subscribe(topic: 'macrodroid/response')
+    def subscribe(topic: 'macrodroid/#/response')
       
       super(topic: topic) do |msg|
         
+        #puts 'msg: ' + msg.inspect
         json, id = msg.split(/:\s+/,2).reverse
         
         h = JSON.parse(json, symbolize_names: true)
         id ||= h.keys.first
+        #puts '->' + [id, h].inspect
         @remote.update id.to_sym, h
         
       end
       
     end
     
-  end  
+  end
+
+
+  class Clients
+    using ColouredText
+    
+    attr_reader :devices
+    
+    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        
+      #sleep 3
+      @devices = @drb.devices.keys.inject({}) do |r, name|
+        obj = RemoteDroid::Client.new(host: host, port: port, 
+                          sps_host: sps_host, sps_port: sps_port, device: name)
+        r.merge!(name => obj)
+      end
+      
+    end
+
+    def device(name)
+      idx = @devices.index name.to_sym
+      @devices[idx] if idx
+    end
+    
+  end
 end
 
 # PASTE_END

data/lib/remotedroid/client.rb

@@ -3,13 +3,19 @@ module RemoteDroid
   class Client
     using ColouredText
     
-    def initialize(hostx='127.0.0.1', host: hostx, port: '5777', sps_host: 'sps.home', sps_port: '59000')
+    def initialize(hostx='127.0.0.1', host: hostx, port: '5777', 
+                   sps_host: 'sps.home', sps_port: '59000', device: nil)
+      
+      raise 'supply a device name' unless device
+      
+      @device = device
       @drb = OneDrb::Client.new host: host, port: port    
       @sps = SPSPub.new host: sps_host, port: sps_port
+      
     end
     
     def control
-      @drb.control
+      @drb.control @device
     end
     
     def export(s)
@@ -17,7 +23,7 @@ module RemoteDroid
     end
     
     def invoke(s, *args)
-      @drb.invoke(s, *args)
+      @drb.invoke(@device, s, *args)
     end
     
     def macros()
@@ -26,9 +32,9 @@ module RemoteDroid
     
     def query(id=nil)
       
-      return @drb.query unless id
+      return @drb.query(@device) unless id
       t = Time.now
-      h = @drb.query(id)
+      h = @drb.query(@device, id)
       h.merge({latency: (Time.now - t).round(3)})
       
     end
@@ -52,25 +58,61 @@ module RemoteDroid
     
     # -- helpful methods -----------------
     
+    def ask_alexa()
+      control.ask_alexa
+    end
+    
     def battery()
       query.battery
     end
     
+    def bluetooth()
+      control.bluetooth
+    end
+    
     def cell_tower()
       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
+    def disable_airplane_mode()
+      control.disable_airplane_mode
+    end      
+
+    def disable_bluetooth()
+      control.disable_bluetooth
+    end    
+    
+    def disable_macro(macro)
+      control.disable_macro macro
     end
     
-    def enable(macro)
-      control.enable macro
-    end    
+    def disable_wifi()
+      control.disable_wifi
+    end        
+        
+    def enable_airplane_mode()
+      control.enable_airplane_mode
+    end      
+
+    def enable_bluetooth()
+      control.enable_bluetooth
+    end
+    
+    def enable_macro(macro)
+      control.enable_macro macro
+    end        
+    
+    def enable_wifi()
+      control.enable_wifi
+    end
 
     def fill_clipboard(text)
       control.fill_clipboard clipboard: text
@@ -81,11 +123,34 @@ module RemoteDroid
     def hotspot(state=nil)      
       control.hotspot state
     end
+    
+    def last_loc()
+      query.last_loc
+    end
+    
+    def last_loc_link()
+      "<a href='%s' target='_blank'>map link</a>" % last_loc.link
+    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        
 
-    def launch_activity(app='')
-      control.launch_activity(app)
     end
     
+    def launch_package(name)
+      
+      control.launch_package(package: name)
+
+    end    
+    
     alias launch launch_activity
     
     def location()
@@ -95,7 +160,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
@@ -115,32 +179,43 @@ 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')
+      control_media('Next')
     end
     
     def pause()
-      control_media(option='Pause')
+      control_media('Pause')
     end    
 
     def play()
-      control_media(option='Play')
+      control_media('Play')
     end    
     
     def play_pause()
-      control_media(option='Play/Pause')
+      control_media('Play/Pause')
     end
     
     def photo()
       take_picture
     end
     
+    def power_connected?()
+      query.power_connected?
+    end
+    
     def previous()
-      control_media(option='Previous')
+      control.control_media(option: 'Previous')
     end    
     
     def say(text)
@@ -165,6 +240,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
@@ -173,17 +264,20 @@ module RemoteDroid
       control.stay_awake_off
     end
     
+    alias awake_off stay_awake_off
+    
     def stop()
-      control_media(option='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
         
@@ -193,12 +287,49 @@ 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 toggle_airplane_mode()
+      control.toggle_airplane_mode
+    end
+    
+    def toggle_bluetooth()
+      control.toggle_bluetooth
+    end    
+    
+    def toggle_wifi()
+      control.toggle_wifi
+    end    
+    
     def torch()
       control.torch
     end    
@@ -206,6 +337,28 @@ module RemoteDroid
     def vibrate
       control.vibrate
     end
+    
+    def voice_search
+      control.voice_search
+    end    
+    
+    def volume(context=nil)      
+      query.volume context
+    end
+
+    def vol()
+      volume.music
+    end
       
   end
+  
+  
+  class WebServer < AppHttp
+    
+    def initialize(port: 9292)
+      super(RemoteDroid::Client.new, port: port)
+    end
+    
+  end
+  
 end

data/lib/remotedroid/control.rb

@@ -8,26 +8,129 @@ module RemoteDroid
 
     end    
     
+    def airplane_mode()
+      
+      def self.enable()
+        http_exec 'set-airplane-mode', {state: 0}
+      end                
+      
+      def self.on()
+        self.enable
+      end                
+      
+      def self.disable()
+        http_exec 'set-airplane-mode', {state: 1}
+      end
+      
+      def self.off()
+        self.disable
+      end         
+      
+      def self.toggle()
+        http_exec 'set-airplane-mode', {state: 2}
+      end      
+      
+      self
+    end    
+    
+    def ask_alexa(options={})
+      http_exec 'ask-alexa', options
+    end
+
+    def autorotate()
+      
+      def self.enable()
+        http_exec 'set-auto-rotate', {state: 0}
+      end                
+      
+      def self.on()
+        self.enable
+      end
+      
+      def self.disable()
+        http_exec 'set-auto-rotate', {state: 1}
+      end
+      
+      def self.off()
+        self.disable
+      end         
+      
+      def self.toggle()
+        http_exec 'set-auto-rotate', {state: 2}
+      end      
+      
+      self
+    end    
+    
     def bluetooth()
-      @bluetooth
+      
+      def self.enable()
+        http_exec 'set-bluetooth', {state: 0}
+      end                
+      
+      def self.on()
+        self.enable
+      end                
+      
+      def self.disable()
+        http_exec 'set-bluetooth', {state: 1}
+      end
+      
+      def self.off()
+        self.disable
+      end         
+      
+      def self.toggle()
+        http_exec 'set-bluetooth', {state: 2}
+      end      
+      
+      self
     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)
+    def disable_airplane_mode()
+      http_exec 'set-airplane-mode', {state: 1}
+    end
+    
+    def disable_bluetooth()
+      http_exec 'set-bluetooth', {state: 1}
+    end    
+        
+    def disable_macro(macro)
       http_exec 'disable-macro', {name: macro}
     end
     
-    def enable(macro)
+    def disable_wifi()
+      http_exec 'set-wifi', {state: 1}
+    end        
+
+    def enable_airplane_mode()
+      http_exec 'set-airplane-mode', {state: 0}
+    end
+    
+    def enable_bluetooth()
+      http_exec 'set-bluetooth', {state: 0}
+    end        
+    
+    def enable_macro(macro)
       http_exec 'enable-macro', {name: macro}
     end
     
+    def enable_wifi()
+      http_exec 'set-wifi', {state: 0}
+    end    
+    
     def fill_clipboard(options={})
       http_exec 'fill-clipboard', options
     end    
@@ -77,15 +180,39 @@ module RemoteDroid
       
     end
     
-    def launch_activity(options={})
-      app = options[:app].downcase.gsub(/ /,'-')
-      http_exec 'launch-' + app
+    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_web_page(options={url: ''})
+      http_exec 'open-web-page', options
+    end
+    
+    alias open_website open_web_page
+    alias goto open_web_page
+    alias visit open_web_page
+    
     def say_current_time(options={})
       http_exec 'say-current-time'
     end    
@@ -111,6 +238,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
@@ -143,6 +293,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
@@ -155,8 +308,36 @@ module RemoteDroid
     def vibrate(options={})
       http_exec :vibrate
     end    
+        
+    def voice_search(options={})
+      http_exec 'voice-search'
+    end    
 
-
+    def wifi()
+      
+      def self.enable()
+        http_exec 'set-wifi', {state: 0}
+      end                
+      
+      def self.on()
+        self.enable
+      end                
+      
+      def self.disable()
+        http_exec 'set-wifi', {state: 1}
+      end
+      
+      def self.off()
+        self.disable
+      end         
+      
+      def self.toggle()
+        http_exec 'set-wifi', {state: 2}
+      end      
+      
+      self
+    end
+    
     def write(s)
             
       d = MacroDroid.new(RD_MACROS, deviceid: @deviceid, 

data/lib/remotedroid/controller.rb

@@ -2,15 +2,20 @@ module RemoteDroid
   
   class Controller
     
-    attr_reader :model, :control, :syslog
+    attr_reader :model, :syslog, :devices
     attr_accessor :title, :macros, :store
 
-    def initialize(mcs, model=MODEL, deviceid: nil, debug: false)
+    def initialize(mcs, model=MODEL, devices: {}, debug: false)
       
       @debug = debug
       @syslog = []
-            
-      @control = Control.new(deviceid)
+       
+      @devices = devices
+      
+      @devices.each do |key, deviceid|
+        devices[key] = Control.new(deviceid)
+      end
+      
       @macros = mcs.macros
       
       if model then
@@ -18,7 +23,7 @@ module RemoteDroid
       end
       
       @store = {}
-      @query = Query.new(self)
+      #@query = Query.new(self)
       
       # enable the required triggers on the Android device
       #
@@ -35,6 +40,10 @@ module RemoteDroid
 =end
     end
     
+    def control(device)
+      @devices[device]
+    end
+    
     def delete_all()
       @macros = []
     end
@@ -42,16 +51,24 @@ module RemoteDroid
     def export(s, replace: false)
       
       macros = MacroDroid.new(s).macros
-      replace ? @macros = macros : @macros << macros
+      replace ? @macros = macros : @macros.concat(macros)
       
     end
     
-    def invoke(name, options={})      
+    def invoke(device, name, options={})      
       
-      if @control.respond_to? name.to_sym then
-        @control.method(name.to_sym).call(options)
+      if control(device).respond_to? name.to_sym then
+        control(device).method(name.to_sym).call(options)
       else
-        @control.http_exec name.to_sym, options
+        control(device).http_exec name.to_sym, options
+      end
+    end
+    
+    def local(action, options={})
+      
+      case action.to_sym
+      when :open_web_page
+        open(options[:url_to_open]).read
       end
     end
 
@@ -63,9 +80,9 @@ module RemoteDroid
       @model.op
     end
     
-    def query(id=nil)
+    def query(device, id=nil)
       
-      return @query unless id
+      return Query.new(device, self) unless id
       
       @store[id] = nil
 
@@ -79,20 +96,22 @@ module RemoteDroid
       
       # send http request via macrodroid.com API
       
-      if id.downcase.to_sym == :location then
-        @control.http_exec id
+      identifier, options = if id.downcase.to_sym == :location then
+        id
       elsif sys.include? id
-        @control.http_exec :'query-setting-system', {qvar: id}        
+        [:'query-setting-system', {qvar: id}]
       elsif global.include? id
-        @control.http_exec :'query-setting-global', {qvar: id}
+        [:'query-setting-global', {qvar: id}]
       elsif secure.include? id
-        @control.http_exec :'query-setting-secure', {qvar: id}        
+        [:'query-setting-secure', {qvar: id}]
       elsif id.downcase.to_sym == :'take-picture'
-        @control.http_exec id
+        id
       else
-        @control.http_exec :query, {qvar: id}
+        [:query, {qvar: id}]
       end
       
+      control(device).http_exec identifier, options
+      
       # wait for the local variable to be updated
       # timeout after 5 seoncds
       t = Time.now
@@ -155,6 +174,11 @@ module RemoteDroid
     
     def update(id, val)
       
+      if @debug then
+        puts 'inside update' 
+        puts [id, val].inspect
+      end
+      
       key  = if %i(location take-picture).include? id
         id
       else

data/lib/remotedroid/query.rb

@@ -4,8 +4,8 @@ module RemoteDroid
     
     attr_accessor :locations
     
-    def initialize(callback)
-      @callback = callback
+    def initialize(device, callback)
+      @device, @callback = device, callback
       @locations = []
     end
     
@@ -33,9 +33,19 @@ module RemoteDroid
       q(:ip)
     end    
     
+    def last_loc()
+      
+      def self.alt()     q(:last_loc_alt)           end        
+      def self.latlon()  q(:last_latlong)           end        
+      def self.link()    q(:last_loc_link)          end        
+      def self.time()    q(:last_loc_age_timestamp) end                
+          
+      self      
+    end
+    
     def location()      
       
-      r = @callback.query(:location)
+      r = @callback.query(@device, :location)
       return r if r.nil? or r.empty? or r[:coords].nil?
       
       r[:coords] = r[:coords].split(',')
@@ -44,16 +54,46 @@ module RemoteDroid
       @locations.shift if @locations.length > 1000
       
       return r
+    end
+    
+    def power_connected?()
+      status = q(:power)
+      status.downcase == 'on' if status
     end    
 
     def take_picture()      
-      @callback.query(:'take-picture')
+      @callback.query(@device, :'take-picture')
     end
     
+    def take_screenshot()      
+      @callback.query(@device, :'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)
-      @callback.query(id)[id]
+      @callback.query(@device, id)[id]
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotedroid
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   io3WPRDjULC924M5S8wbrus31v2AUjqFBPvmHr7caf/VHErWypV482xcDhWt1eif
   0G2k2ptozXcBS9odsqGUTb5N
   -----END CERTIFICATE-----
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-11-01 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: []