remotedroid 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99592d4ac1baaef0d04b87d8bb9dd6cfcbdfc5572dacc39c6fabbd5a960f85f3
-  data.tar.gz: a5fbd36d797423dd183dccbb2351736ac58f706acf3b88932ae737d43e55a8e9
+  metadata.gz: f464457d6a2b72b862d9f461ce541e65a242c3ed1a0a92c24223c5a6b917969d
+  data.tar.gz: 93e362cc4b51741d7245bd68eaa5dd30fef270b7c92269243bd01bfa93f6e206
 SHA512:
-  metadata.gz: 893732ed1fb124c982bdcd6b55d4d2f54acd9a32256d707cde13a13d86fb9547a9b126ab6200b98ed211ae739cf42e95136c5fe444fbd435646607b6e8fda9a7
-  data.tar.gz: a651dd655ab1dcb59549d7abd5d32a948f4fbf04ec134f9c35ff104ff7f9def9308a8f8acf9751e7cefa27e7ca4517af7e310a5603de6ab6a196271a1ca54b5c
+  metadata.gz: 35c018689e167a3ea7ba58d722b4a7964b7c7696c4f0aa4ba8be583deebd00f80c0353c787be91e2ba6a969d27de80f5a989685be238da808c231b0a0396ccaa
+  data.tar.gz: fe5f330c8958cb4bbe60b97ade143e85b6b2d3139240f0f73dd28ed5d8133222616460124e946a6e627d21681de7fb1a6fddb7ddbff845d3f66307c603a7a032

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,137 @@ m: stay awake off
 t: webhook
 a: stay awake off
 
+m: Media Next
+t: webhook
+a:
+  Media Next
+    Simulate Audio Button
+    
+m: Media Pause
+t: webhook
+a:
+  Media Pause
+    Simulate Audio Button
+    
+m: Media Play
+t: webhook
+a:
+  Media Play
+    Simulate Audio Button
+    
+m: Media Play Pause
+t: webhook
+a:
+  Media Play/Pause
+    Simulate Audio Button
+
+m: Media Previous
+t: webhook
+a:
+  Media Previous
+    Simulate Audio Button
+    
+m: Media Stop
+t: webhook
+a:
+  Media Stop
+    Simulate Audio Button
+
+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
+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
@@ -276,9 +408,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)
@@ -421,15 +556,8 @@ a:
     identifier: flip_device
     facedown: false    
 EOF
-s="
-    
-
 
 
-   
-
-"
-
 module RemoteDroid
   
   class Server
@@ -483,18 +611,17 @@ module RemoteDroid
         context, json = msg.split(/:\s+/,2)
         category, action = context.split('/',2)
         
-        if action == 'force_macro_run' then
+        h = JSON.parse(json, symbolize_names: true)
+        
+        if action == 'force_macro_run' and h[:serverside] then
           
-          self.notice 'macrodroid2: fmr'
-          a = @remote.run_macro(JSON.parse(json, symbolize_names: true))
-
-          a.each do |msg|
-            self.notice 'macrodroid/action: ' + msg
-          end
+          a = @remote.run_macro(h)
+          a.each {|msg| self.notice 'macrodroid/action: ' + msg }
 
         else
-          @remote.control.method(action.to_sym)\
-            .call(JSON.parse(json, symbolize_names: true))
+          
+          @remote.control.method(action.to_sym).call(h)
+          
         end
         
       end

data/lib/remotedroid/client.rb

@@ -52,25 +52,100 @@ 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 disable(macro)
-      control.disable macro
+    def click(s)
+      control.click content: s
     end
     
-    def enable(macro)
-      control.enable macro
+    def control_media(option='Play/Pause')
+      control.control_media({option: option})
+    end    
+    
+    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 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
+    end
+    
+    alias copy fill_clipboard
+    
     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        
+
+    end
+    
+    def launch_package(name)
+      
+      control.launch_package(package: name)
+
+    end    
+    
+    alias launch launch_activity
     
     def location()
       query.location
@@ -79,7 +154,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
@@ -99,10 +173,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
@@ -125,6 +230,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
@@ -133,13 +254,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
         
@@ -149,12 +277,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    
@@ -162,6 +327,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,22 +8,137 @@ 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 disable(macro)
+    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_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    
     
+    def force_macro_run(options={})
+      http_exec option[:macro_name].downcase.gsub(/ /,'-')
+    end
+    
     def hotspot(state=nil)      
       
       if state then
@@ -65,10 +180,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 +237,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 +292,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,8 +307,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/query.rb

@@ -33,6 +33,16 @@ 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)
@@ -50,6 +60,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.2
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   io3WPRDjULC924M5S8wbrus31v2AUjqFBPvmHr7caf/VHErWypV482xcDhWt1eif
   0G2k2ptozXcBS9odsqGUTb5N
   -----END CERTIFICATE-----
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2020-10-26 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: []