remotedroid 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2eedf64071cbde99c208add4801a434aa0d3ec0a8750a7c2b94d283918b580
-  data.tar.gz: b47344083acbdd1ae6fa674249e22312e80aa91c654e2cd51150fa4cd27657d5
+  metadata.gz: d8b216c60a929b3c6ece03a4b5979da738a0e3f7fb2994060a605391ab8068b9
+  data.tar.gz: d5bfed22b7fbc59767cc1a3af2597cc95b05ddbf8aca80420305a6bdbc12960c
 SHA512:
-  metadata.gz: a131d644b51b337e8a6ea54164306f612cae6989591eb00b0756e497ae2fa7f630e11b5c7484d95f3e12f6dbc5130403c469bf8fd96a398fdc3c82ea98dcd4d3
-  data.tar.gz: 8148f0cae8dbecabcca111dbcbad14f0c2884c026c21c3bea3ca2f420681fe3d2f3678ca226272b9344da277f6eefea1e650086d816e81016b1389c3f3542ea1
+  metadata.gz: 1fb42e16c68052d50a4ac532a88997fd723178142951dfb4aaaf2da6458128ff7fedea58d56b20020dac6b631f8a439371e4ac231b43ba9dd61db96aef1dd9f0
+  data.tar.gz: 763dc18a3b896bb77b53d1dddf70e4b839a314301e00642e96c326b36f0cdf2d7beed025df3a7232f6879fd097f715ff813fac62913a7988a57d5deec1543b8f

data/lib/remotedroid.rb

@@ -571,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
@@ -586,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
@@ -607,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|
         
@@ -622,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
           
@@ -640,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

@@ -4,15 +4,18 @@ module RemoteDroid
     using ColouredText
     
     def initialize(hostx='127.0.0.1', host: hostx, port: '5777', 
-                   sps_host: 'sps.home', sps_port: '59000')
+                   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)
@@ -20,7 +23,7 @@ module RemoteDroid
     end
     
     def invoke(s, *args)
-      @drb.invoke(s, *args)
+      @drb.invoke(@device, s, *args)
     end
     
     def macros()
@@ -29,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

data/lib/remotedroid/control.rb

@@ -45,7 +45,7 @@ module RemoteDroid
       
       def self.on()
         self.enable
-      end                
+      end
       
       def self.disable()
         http_exec 'set-auto-rotate', {state: 1}

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
@@ -46,12 +55,20 @@ module RemoteDroid
       
     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
     
@@ -45,7 +45,7 @@ module RemoteDroid
     
     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(',')
@@ -62,11 +62,11 @@ module RemoteDroid
     end    
 
     def take_picture()      
-      @callback.query(:'take-picture')
+      @callback.query(@device, :'take-picture')
     end
     
     def take_screenshot()      
-      @callback.query(:'take-screenshot')
+      @callback.query(@device, :'take-screenshot')
     end   
     
     def volume(context=nil)
@@ -93,7 +93,7 @@ module RemoteDroid
     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.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   io3WPRDjULC924M5S8wbrus31v2AUjqFBPvmHr7caf/VHErWypV482xcDhWt1eif
   0G2k2ptozXcBS9odsqGUTb5N
   -----END CERTIFICATE-----
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onedrb