druzy-upnp 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f9604efe42ea90eb02b2b567e3901a7a32cc1b9
-  data.tar.gz: 2608488daea06e5496e0466bc35c93ea868c8b62
+  metadata.gz: 892091358c3fced9d156e69cad0e861a33ef6e5d
+  data.tar.gz: 04d3dd0ee58e25f3c028986471001a064f1ab030
 SHA512:
-  metadata.gz: 3a359f6328a4660b871404bf9138428687d1bd21ac3e5587ec30d8efe122f5e86345cb8046d544f898e6e18701e571e1e7a0e1b05bc5e4a264847c2a4dea1d22
-  data.tar.gz: e36b3baf467e8a89cb6588d8ca06288c6d9220a8f064b44033e8a23c8ba7ca6d2d69488d27ec1b8916db92d8a5f9b752af32c1fc74e00286c64a548839f9c242
+  metadata.gz: f516ba8f7ca1c7197dd9c14ab99be5b0a5e308430f9d656ddbb05b2b0751af1940ee9d02fd8b5a9010da93dd52c6af20ca64d07b4f8916315949d751f802880d
+  data.tar.gz: 00832c588d4125a9086cc8cb1e02058a16968de6d66a22a532a89b5ef191ed2da84eb9c09614962ce442da9a865a491a1ea644c9ceba7434599afe615b88dfb2

data/lib/druzy/upnp/event/upnp_event_server.rb

@@ -0,0 +1,77 @@
+require 'druzy/server/one_instance_by_port'
+require 'druzy/utils/net'
+require 'nokogiri'
+require 'webrick'
+
+module Druzy
+  module Upnp
+    module Event
+
+      class UpnpEventServer < Druzy::Server::OneInstanceByPort
+        attr_reader :event_address
+                
+        def initialize(port)
+          super(port)
+          
+          #sleep 0.5
+          @server.mount('/event',UpnpServlet, :event_server => self)
+          @listeners = {}
+          @event_address = "http://"+Druzy::Utils.get_local_public_ipv4+":"+@server.config[:Port].to_s+"/event"
+          start_server
+        end
+        
+        def add_property_change_listener(uuid,listener)
+          @listeners[uuid] ||= []              
+          @listeners[uuid] << listener
+        end
+        
+        def remove_property_change_listener(uuid)
+          @listeners.delete(uuid)
+        end
+        
+        def get_listeners(uuid)
+          if @listeners[uuid]!=nil
+            return @listeners[uuid]
+          else
+            return []
+          end
+        end
+      
+      end
+      
+      class UpnpServlet < WEBrick::HTTPServlet::AbstractServlet
+        
+        def do_NOTIFY(request, response)
+          @options=@options[0]
+          xml = Nokogiri::XML(request.body)
+          xml.remove_namespaces!
+          #puts xml.to_s
+          xml.xpath('propertyset/property').each do |el|
+            el.children.each do |child|
+              if child.name.to_s == "LastChange"
+                child.xpath('Event/InstanceID').each do |el2|
+                  el2.children.each do |child2|
+                    @options[:event_server].get_listeners(request['SID']).each do |listener|
+                      listener.property_change(Druzy::MVC::PropertyChangeEvent.new(request.remote_ip,child2.name.to_s,nil,child2.attribute("val")))
+                    end
+                  end
+                end
+              else
+                @options[:event_server].get_listeners(request['SID']).each do |listener|
+                  listener.property_change(Druzy::MVC::PropertyChangeEvent.new(request.remote_ip,child.name.to_s,nil,child.text))
+                end
+              end      
+            end
+          end
+  
+          response.status = 200
+        end
+      end 
+    end
+  end
+end
+
+if $0 == __FILE__
+  Druzy::Server::Event::UpnpEventServer.instance(12345)
+  Thread.list.each {|t| t.join if t!=Thread.main}
+end

data/lib/druzy/upnp/ssdp.rb

@@ -59,7 +59,13 @@ end
 if $0 == __FILE__
   Druzy::Upnp::Ssdp.new.search("urn:schemas-upnp-org:device:MediaRenderer:1") do |device|
     puts device.device_type
-    connection_id, av_transport_id, rcs_id = device.ConnectionManager.PrepareForConnection("RemoteProtocolInfo" => "http-get:*:video/mp4:*", "PeerConnectionManager" => "/", "PeerConnectionID" => -1, "Direction" => "Output").values
-    puts av_transport_id.to_s
+    device.service_list.each do |service|
+      puts service.service_type
+      service.subscribe do |event|
+        puts event.property_name+" : "+event.new_value
+      end
+    end
   end
+  
+  sleep 600
 end

data/lib/druzy/upnp/upnp_device.rb

@@ -2,6 +2,7 @@ require_relative 'upnp_service'
 
 require 'net/http'
 require 'nokogiri'
+require 'uri'
 
 module Druzy
   module Upnp

data/lib/druzy/upnp/upnp_service.rb

@@ -1,11 +1,18 @@
+require_relative 'event/upnp_event_server'
+
+require 'druzy/mvc/event'
+require 'druzy/utils/net'
 require 'net/http'
 require 'nokogiri'
+require 'socket'
 require 'uri'
 
 module Druzy
   module Upnp
     class UpnpService
       
+      @@event_port = 15323
+      
       attr_reader :service_type, :service_id, :location, :control_url, :event_sub_url
       
       def initialize(args)
@@ -15,6 +22,8 @@ module Druzy
         @location = args[:location]
         @control_url = args[:control_url]
         @event_sub_url = args[:event_sub_url]
+        @event_timeout = 300
+        @event_sid = nil
         
         uri = URI(@location)
         xml=Net::HTTP.get(uri)
@@ -68,6 +77,84 @@ module Druzy
         end
         
       end
+      
+      def subscribe
+        if block_given?
+          server = Druzy::Upnp::Event::UpnpEventServer.instance(@@event_port)
+          uri = URI(@event_sub_url)
+          http = Net::HTTP.new(uri.host,uri.port)
+          request = Net::HTTPGenericRequest.new('SUBSCRIBE',false,true,uri)
+          request['CALLBACK'] = '<'+server.event_address+'>'
+          request['NT'] = 'upnp:event'
+          request['TIMEOUT'] = 'Second-'+@event_timeout.to_s
+          
+          response = http.request(request)
+          if response.code.to_i == 200
+            @event_timeout = response['TIMEOUT'][7..-1].to_i
+            @event_sid = response['SID']
+                      
+            Thread.new do
+              puts "début thread renew"
+              sleep @event_timeout
+              if @event_sid !=nil
+                renew_subscription
+              end
+            end
+                      
+            server.add_property_change_listener(@event_sid, Druzy::MVC::PropertyChangeListener.new do |event|
+              yield(event)
+            end)
+            return @event_sid
+          else
+            return nil
+          end
+        else 
+          return nil
+        end
+      end
+      
+      def renew_subscription
+        uri = URI(@event_sub_url)
+        http = Net::HTTP.new(uri.host,uri.port)
+        request = Net::HTTPGenericRequest.new('SUBSCRIBE',false,true,uri)
+        request['SID'] = @event_sid
+        request['TIMEOUT'] = 'Second-'+@event_timeout.to_s
+        
+        response = http.request(request)
+        if response.code.to_i == 200
+          @event_timeout = response['TIMEOUT'][7..-1].to_i
+
+          Thread.new do
+            sleep @event_timeout
+            if @event_sid !=nil
+              renew_subscription
+            end
+          end
+        end
+      end
+      
+      def unsubscribe
+        if @event_sid !=nil
+          server = Druzy::Upnp::Event::UpnpEventServer.instance(@@event_port)
+          server.remove_property_change_listener(@event_sid)
+          
+          uri = URI(@event_sub_url)
+          http = Net::HTTP.new(uri.host,uri.port)
+          request = Net::HTTPGenericRequest.new('UNSUBSCRIBE',false,true,nil)
+          request['SID'] = @event_sid
+          
+          response = http.request(request)
+          if response.code == 200
+            @event_sid = nil
+            return true
+          else
+            return false
+          end
+        else
+          return true
+        end
+      end
+      
     end
   end
 end

data/lib/druzy/upnp/version.rb

@@ -1,5 +1,5 @@
 module Druzy
   module Upnp
-    VERSION = "2.0.1"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: druzy-upnp
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Jonathan Le Greneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-02 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: druzy-mvc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: druzy-server
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: druzy-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/druzy/upnp.rb
+- lib/druzy/upnp/event/upnp_event_server.rb
 - lib/druzy/upnp/ssdp.rb
 - lib/druzy/upnp/upnp_device.rb
 - lib/druzy/upnp/upnp_service.rb