remotedroid 0.4.2 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bd8aa94326f04e26626c2919060c259afea85c5e89f6ae33de505d0af5381b6
-  data.tar.gz: efbb77b568cc56a821569021dfd6a1c4001645a0019d0d3d56445a3f31887737
+  metadata.gz: 99592d4ac1baaef0d04b87d8bb9dd6cfcbdfc5572dacc39c6fabbd5a960f85f3
+  data.tar.gz: a5fbd36d797423dd183dccbb2351736ac58f706acf3b88932ae737d43e55a8e9
 SHA512:
-  metadata.gz: 68ca84c69885979de74d5265b216808dba934f63854978ffde5e48a49458f88e3483294f555f36685b1a5cc44b2309b285870228c5eb63ca3759b0e41eb7b752
-  data.tar.gz: ba2aa7d3d3fbf3512b3cfdbd55aa7442499355c3110bcfed6b92a5da516f4a4e39eb3ff8eff6fba5f3702aeb739562d2bde777c31e2c0ce6a9a9581287fda93f
+  metadata.gz: 893732ed1fb124c982bdcd6b55d4d2f54acd9a32256d707cde13a13d86fb9547a9b126ab6200b98ed211ae739cf42e95136c5fe444fbd435646607b6e8fda9a7
+  data.tar.gz: a651dd655ab1dcb59549d7abd5d32a948f4fbf04ec134f9c35ff104ff7f9def9308a8f8acf9751e7cefa27e7ca4517af7e310a5603de6ab6a196271a1ca54b5c

data/lib/remotedroid.rb

@@ -8,21 +8,45 @@ require 'app-routes'
 require 'sps-sub'
 require 'ruby-macrodroid'
 
+# PASTE_START
 
 # Here's what's available so far:
 # 
 # # 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
 #
-## Connectivity
+# ## Camera/Photo
+#
+# * Take Picture
+#
+# ## Connectivity
 #
 # * Enable HotSpot
 #
@@ -40,6 +64,10 @@ require 'ruby-macrodroid'
 #
 # * Share Location
 #
+# ## MacroDroid specific
+#
+# * Disable Macro
+#
 # ## Media
 #
 # * Play sound (Doda)
@@ -50,6 +78,7 @@ require 'ruby-macrodroid'
 #
 # ## Screen
 #
+# * Keep Device Awake
 # * Screen On
 #
 
@@ -152,7 +181,22 @@ a:
     Disable Hotspot
   End If
 
-  
+m: Take Picture
+t: webhook
+a:
+  Take Picture
+    Rear Facing
+a: wait 2 seconds
+a: webhook
+
+m: stay awake
+t: webhook
+a: stay awake
+
+m: stay awake off
+t: webhook
+a: stay awake off
+
 m: Share location
 t: 
   WebHook
@@ -165,7 +209,16 @@ a:
   HTTP GET
     identifier: location
     coords: [lv=coords]
+    cell: [cell_id]
+    ssid: [ssid]
+    alt: [last_loc_alt]
+    time: [last_loc_age_timestamp]
+    mph: [last_loc_speed_mph]
+    kph: [last_loc_speed_kmh]
+    device: [device_model]
+    battery: [battery]
     type: query
+    
 
 m: query
 t: WebHook
@@ -222,586 +275,162 @@ a:
 m: Power connected
 t: Power Connected: Any
 a: webhook
-    
-
-EOF
-
-=begin
-m: Screen
-v: on: true
-t: WebHook
-a:
-  If on = true
-    Screen On
-  Else
-    Screen Off
-  End If
-
-=end
-
-module RemoteDroid
-
-  class Model
-    include AppRoutes
-
-    def initialize(obj=nil, root: 'device1', debug: false)
-
-      super()
-      @root, @debug = root, debug
-      @location = nil
-      
-      if obj then
-        
-        s = obj.strip
-        
-        puts 's: ' + s.inspect if @debug
-        
-        if s[0] == '<' or s.lines[1][0..1] == '  ' then
-          
-          puts 'before easydom' if @debug
-          
-          s2 = if s.lines[1][0..1] == '  ' then
-          
-            lines = s.lines.map do |line|
-              line.sub(/(\w+) +is +(\w+)$/) {|x| "#{$1} {switch: #{$2}}" }
-            end
-            
-            lines.join
-            
-          else
-            s
-          end
-          
-          @ed = EasyDom.new(s2)
-        else
-          build(s, root: root) 
-        end
-
-      end
-
-    end
-
-    def build(raw_requests, root: @root)
-
-      @ed = EasyDom.new(debug: false, root: root)
-      raw_requests.lines.each {|line| request(line) }
-
-    end
-    
-    
-    def get_thing(h)
-      
-      h[:thing].gsub!(/ /,'_')
-      
-      if not h.has_key? :location then
-        location = false
-        h[:location] = find_path(h[:thing]) 
-      else
-        location = true
-      end
-      
-      puts 'h: ' + h.inspect if @debug
-      
-      a = []
-      a += h[:location].split(/ /)
-      a << h[:thing]
-      status = a.inject(@ed) {|r,x| r.send(x)}.send(h[:action])
-      
-      if location then
-        "The %s %s is %s." % [h[:location], h[:thing], status]
-      else
-        "%s is %s." % [h[:thing].capitalize, status]
-      end
-      
-    end          
-
-    # Object Property (op)
-    # Helpful for accessing properites in dot notation 
-    # e.g. op.livingroom.light.switch = 'off'
-    #
-    def op()
-      @ed
-    end
-
-    def query(s)
-      @ed.e.element(s)
-    end
-    
-    # request accepts a string in plain english 
-    # e.g. request 'switch the livingroom light on'
-    #
-    def request(s)
-
-      params = {request: s}
-      requests(params)
-      h = find_request(s)
-
-      method(h.first[-1]).call(h).gsub(/_/,' ')
-      
-    end      
-    
-    def set_thing(h)
-
-      h[:thing].gsub!(/ /,'_')
-      h[:location] = find_path(h[:thing]) unless h.has_key? :location
-      
-      a = []
-      a += h[:location].split(/ /)
-      a << h[:thing]
-      
-      a.inject(@ed) {|r,x| r.send(x)}.send(h[:action], h[:value])
-      
-    end       
-
-    def to_sliml(level: 0)
-      
-      s = @ed.to_sliml
-
-      return s if level.to_i > 0
-      
-      lines = s.lines.map do |line|
-        
-        line.sub(/\{[^\}]+\}/) do |x|
-          
-          a = x.scan(/\w+: +[^ ]+/)
-          if a.length == 1 and x[/switch:/] then
 
-            val = x[/(?<=switch: ) *["']([^"']+)/,1]
-            'is ' + val
-          else
-            x
-          end
-
-        end
-      end
-      
-      lines.join
-      
-    end
-
-    def to_xml(options=nil)
-      @ed.xml(pretty: true).gsub(' style=\'\'','')
-    end
-    
-    alias xml to_xml
-    
-    # to_xml() is the preferred method
-
-    protected      
-
-    def requests(params) 
-
-      # e.g. switch the livingroom gas_fire off
-      #
-      get /(?:switch|turn) the ([^ ]+) +([^ ]+) +(on|off)$/ do |location, device, onoff|
-        {type: :set_thing, action: 'switch=', location: location, thing: device, value: onoff}
-      end
-      
-      # e.g. switch the gas _fire off
-      #
-      get /(?:switch|turn) the ([^ ]+) +(on|off)$/ do |device, onoff|
-        {type: :set_thing, action: 'switch=', thing: device, value: onoff}
-      end            
-      
-      # e.g. is the livingroom gas_fire on?
-      #
-      get /is the ([^ ]+) +([^ ]+) +(?:on|off)\??$/ do |location, device|
-        {type: :get_thing, action: 'switch', location: location, thing: device}
-      end
-      
-      # e.g. enable airplane mode
-      #
-      get /((?:dis|en)able) ([^$]+)$/ do |state, service|
-        {type: :set_thing, action: 'switch=', thing: service, value: state + 'd'}
-      end
-      
-      # e.g. switch airplane mode off
-      #
-      get /switch (.*) (on|off)/ do |service, rawstate|        
-        
-        state = rawstate == 'on' ? 'enabled' : 'disabled'
-        {type: :set_thing, action: 'switch=', thing: service, value: state}
-        
-      end               
-      
-      # e.g. is airplane mode enabed?
-      #
-      get /is (.*) +(?:(?:dis|en)abled)\??$/ do |service|
-        {type: :get_thing, action: 'switch', thing: service.gsub(/ /,'_')}
-      end      
-
-      # e.g. is the gas_fire on?
-      #
-      get /is the ([^ ]+) +(?:on|off)\??$/ do |device|
-        location = find_path(device)        
-        {type: :get_thing, action: 'switch', location: location, thing: device}
-      end            
-      
-      # e.g. fetch the livingroom temperature reading
-      #
-      get /fetch the ([^ ]+) +([^ ]+) +(?:reading)$/ do |location, device|
-        {type: :get_thing, action: 'reading', location: location, thing: device}
-      end
-
-      # e.g. fetch the temperature reading
-      #
-      get /fetch the ([^ ]+) +(?:reading)$/ do |device|
-        location = find_path(device)        
-        {type: :get_thing, action: 'reading', location: location, thing: device}
-      end          
+m: screen on off
+t: screen on
+a: webhook
 
-    end
-    
-    private
-    
-    def find_path(s)
-      puts 'find_path s: ' + s.inspect if @debug
-      found = query('//'+ s)
-      return unless found
-      a = found.backtrack.to_xpath.split('/')
-      a[1..-2].join(' ')            
-    end
-        
-    alias find_request run_route    
+m: Power Button Toggle3
+t: Power Button Toggle (3)
+a: webhook
 
-  end
+m: Power Button Toggle4
+t: Power Button Toggle (4)
+a: webhook
 
-  class Controller
-    
-    attr_reader :model, :control
-    attr_accessor :title, :macros, :store
+m: Power Button Toggle5
+t: Power Button Toggle (5)
+a: webhook
 
-    def initialize(mcs, model=MODEL, deviceid: nil, debug: false)
-      
-      @debug = debug
-      @syslog = []
-            
-      @control = Control.new(deviceid)
-      @macros = mcs.macros
-      
-      if model then
-        @model = Model.new(model)
-      end
-      
-      @store = {}
-      @query = Query.new(self)
+m: Connected to network
+t:
+  Connected to network
+    Any Network
+a: wait 2 seconds    
+a:
+  webhook
+    ssid: [ssid]
 
-    end
-    
-    def export(s)
-      @macros = MacroDroid.new(s).macros
-    end
-    
-    def invoke(name, options={})      
-      
-      if @control.respond_to? name.to_sym then
-        @control.method(name.to_sym).call(options)
-      else
-        @control.http_exec name.to_sym, options
-      end
-    end
+m: In Vehicle
+t:
+  Activity - In Vehicle
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 0
 
-    # Object Property (op)
-    # Helpful for accessing properites in dot notation 
-    # e.g. op.livingroom.light.switch = 'off'
-    #    
-    def op()
-      @model.op
-    end
+m: On Bicycle
+t:
+  Activity - On Bicycle
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 1
     
-    def query(id=nil)
-      
-      return @query unless id
-      
-      @store[id] = nil
-
-      sys = %i(accelerometer_rotation)      
-      
-      global = [:airplane_mode_on, :bluetooth_on, :cell_on, :device_name, \
-                :usb_mass_storage_enabled, :wifi_on]       
-      
-      secure = %i(bluetooth_name flashlight_enabled)
-
-      
-      # send http request via macrodroid.com API
-      
-      if id.downcase.to_sym == :location then
-        @control.http_exec id
-      elsif sys.include? id
-        @control.http_exec :'query-setting-system', {qvar: id}        
-      elsif global.include? id
-        @control.http_exec :'query-setting-global', {qvar: id}
-      elsif secure.include? id
-        @control.http_exec :'query-setting-secure', {qvar: id}        
-      else
-        @control.http_exec :query, {qvar: id}
-      end
-      
-      # wait for the local variable to be updated
-      # timeout after 5 seoncds
-      t = Time.now
-      
-      begin
-        sleep 1
-      end until @store[id] or Time.now > t + 5
-      
-      return {warning: 'HTTP response timeout'} if Time.now > t+5
-      
-      return @store[id]
+m: Running
+t:
+  Activity - Running
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 2
 
-      
-    end    
-    
-    def request(s)
-      @model.request s
-    end
-    
-    
-    def trigger(name, detail={time: Time.now})
-      
-      macros = @macros.select do |macro|
-        
-        puts 'macro: '  + macro.inspect if @debug
+m: Walking
+t:
+  Activity - Walking
+    Confidence >= 50%
+a:
+  webhook
+    identifier: activity
+    index: 3
 
-        # fetch the associated properties from the model if possible and 
-        # merge them into the detail.
-        #
-        valid_trigger = macro.match?(name, detail, @model.op)
-        
-        puts 'valid_trigger: ' + valid_trigger.inspect if @debug
-        
-        if valid_trigger then
-          @syslog << [Time.now, :trigger, name] 
-          @syslog << [Time.now, :macro, macro.title]
-        end
-                     
-        valid_trigger
-        
-      end
-      
-      puts 'macros: ' + macros.inspect if @debug
-      
-      macros.flat_map(&:run)
-    end
+m: Still
+t:
+  Activity - Still
+    Confidence >= 83%
+a:
+  webhook
+    identifier: activity
+    index: 4
     
-    alias trigger_fired trigger
+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    
     
-    def update(id, val)
-      key  = id == :location ? id : val.keys.first.to_sym
-      @store[key] = val      
-    end
-        
 
-  end
+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
 
-  class Service
-    def initialize(callback)
-      @callback = callback
-    end
-  end
-  
-  class Bluetooth
-    def enable()
-    end
-  end
-  
-  class Toast < Service
-        
-    def invoke()
-      @callback.call :toast
-    end
-    
-  end  
-  
-  class Torch < Service
-        
-    def toggle()
-      @callback.http_exec :torch      
-    end
-    
-  end
-  
-  class ControlHelper
-    
-    def initialize(callback)
-      @callback
-    end
-  end
+m: flip from up to down
+t: Flip Device Face Up -> Face Down
+a:
+  webhook
+    identifier: flip_device
+    facedown: true
 
-  class Control        
-    
-    def initialize(dev=nil, deviceid: dev, remote_url: nil, debug: false)
-      
-      @deviceid, @remote_url, @debug = deviceid, remote_url, debug
-      @torch = Torch.new(self)
-    end    
-    
-    def bluetooth()
-      @bluetooth
-    end
-    
-    def camera_flash_light(options={})
-      http_exec 'camera-flash-light', options
-    end
+m: flip from down to up
+t: Flip Device Face Down -> Face Up
+a:
+  webhook
+    identifier: flip_device
+    facedown: false    
+EOF
+s="
     
-    def hotspot(state=nil)      
-      
-      if state then
-        http_exec 'hotspot', {enable: state == :enable} 
-      else        
 
-        def self.enable()
-          http_exec 'hotspot', {enable: true}
-        end                
-        
-        def self.on()
-          self.enable
-        end                
-        
-        def self.disable()
-          http_exec 'hotspot', {enable: false} 
-        end
-        
-        def self.off()
-          self.disable
-        end         
-        
-        self
-        
-      end
-    end    
-        
-    def http_exec(command, options={})
-      
-      url = "https://trigger.macrodroid.com/%s/%s" % [@deviceid, command]
-      
-      if options and options.any? then
-        h = options
-        url += '?' + \
-            URI.escape(h.map {|key,value| "%s=%s" % [key, value]}.join('&'))
-      end
-      
-      s = open(url).read
-      
-    end
-    
-    def location(options={})
-      http_exec 'location'
-    end    
-    
-    def say_current_time(options={})
-      http_exec 'say-current-time'
-    end    
-    
-    alias say_time say_current_time
-    
-    def screen(state=nil)      
-      
-      if state then
-        http_exec 'screen', {on: state == :on} 
-      else        
-        
-        def self.on()
-          http_exec 'screen', {on: true}
-        end
-        
-        def self.off()
-          http_exec 'screen', {on: false} 
-        end
-        
-        self
-        
-      end
-    end
-    
-    def share_location(options={})
-      http_exec 'share-location'
-    end
-    
-    def speak_text(obj)
-      
-      options = case obj
-      when String
-        {text: obj}
-      when Hash
-        obj
-      end
-    
-      http_exec 'speak-text', options
-    end
-    
-    alias say speak_text
-    
-    def toast(options={})
-      http_exec :toast, options
-    end
-    
-    def torch(options={})
-      http_exec :torch 
-    end
-    
-    def vibrate(options={})
-      http_exec :vibrate
-    end    
 
 
-    def write(s)
-            
-      MacroDroid.new(RD_MACROS, deviceid: @deviceid, 
-                     remote_url: @remote_url, debug: @debug).export s
-      
-    end
-    
-    alias export write
-    
-    def method_missing2(method_name, *args)
-      http_exec(method_name, args.first)
-    end    
-    
-  end
-  
-  class Query
-    
-    def initialize(callback)
-      @callback = callback
-    end
-    
-    def airplane_mode_enabled?()
-      q(:airplane_mode_on).to_i > 0 
-    end
-    
-    def battery()      
-      q(:battery).to_i
-    end
-    
-    def current_brightness()      
-      q(:current_brightness).to_i
-    end
+   
 
-    alias brightness current_brightness
-    
-    def cell_id()      
-      q(:cell_id)
-    end
-    
-    alias cell_tower cell_id
-    
-    def ip()      
-      q(:ip)
-    end    
-    
-    def location()      
-      @callback.query(:location)[:coords]
-    end
+"
 
-    
-    private
-    
-    def q(id)
-      @callback.query(id)[id]
-    end
-    
-  end
+module RemoteDroid
   
   class Server
     
@@ -818,92 +447,7 @@ module RemoteDroid
     end
 
   end
-  
-  class Client
-    
-    def initialize(host='127.0.0.1')
-      @drb = OneDrb::Client.new host: host, port: '5777'    
-    end
-    
-    def control
-      @drb.control
-    end
-    
-    def export(s)
-      @drb.export(s)
-    end
-    
-    def invoke(s, *args)
-      @drb.invoke(s, *args)
-    end
-    
-    def query(id=nil)
-      
-      return @drb.query unless id
-      t = Time.now
-      h = @drb.query(id)
-      h.merge({latency: (Time.now - t).round(3)})
-      
-    end
-    
-    def update(key, val)
-      @drb.update key.to_sym, val
-    end
-    
-    def store()
-      @drb.store
-    end
-    
-    # -- helpful methods -----------------
-    
-    def battery()
-      query.battery
-    end
-    
-    def cell_tower()
-      query.cell_tower
-    end
-    
-    def hotspot(state=nil)      
-      control.hotspot state
-    end    
-    
-    def location()
-      query.location
-    end
-    
-    def say(text)
-      control.speak_text text
-    end
-    
-    def say_time()
-      control.say_time
-    end
-    
-    alias saytime say_time
-    
-    def screen(state=nil)      
-      control.screen state
-    end
-    
-    def screen_on()
-      screen :on
-    end
     
-    def screen_off()
-      screen :off
-    end
-    
-    def torch()
-      control.torch
-    end    
-    
-    def vibrate
-      control.vibrate
-    end
-      
-  end
-  
   class TriggerSubscriber < SPSSub
     
     def initialize(host: 'sps.home', drb_host: '127.0.0.1')
@@ -938,8 +482,20 @@ module RemoteDroid
         
         context, json = msg.split(/:\s+/,2)
         category, action = context.split('/',2)
-        @remote.control.method(action.to_sym)\
+        
+        if action == 'force_macro_run' 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
+
+        else
+          @remote.control.method(action.to_sym)\
             .call(JSON.parse(json, symbolize_names: true))
+        end
         
       end
       
@@ -959,6 +515,7 @@ module RemoteDroid
       super(topic: topic) do |msg|
         
         json, id = msg.split(/:\s+/,2).reverse
+        
         h = JSON.parse(json, symbolize_names: true)
         id ||= h.keys.first
         @remote.update id.to_sym, h
@@ -969,3 +526,12 @@ module RemoteDroid
     
   end  
 end
+
+# PASTE_END
+
+
+require 'remotedroid/model'
+require 'remotedroid/query'
+require 'remotedroid/control'
+require 'remotedroid/controller'
+require 'remotedroid/client'