druzy-upnp 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05af46c9b98de0c1073ad74433e387c9616252f0
-  data.tar.gz: 2b98f3eefbe44f41b9e158bf82d21f2de30e5f9b
+  metadata.gz: ef31e12c2747c77a8519f682a898a87e9e6939c7
+  data.tar.gz: 63cb56202abc50e9d400c5d1089301ce0544a9dc
 SHA512:
-  metadata.gz: 0c6f0f5a91514c5199a1927fb19e79da36ecc887ace1e340a4e276e8ecea1d862d95049b25cc0621c31cb613ca31cdac675907d2f19019145c03d22632cd7bb4
-  data.tar.gz: 1694f9edf91260a4d5e145ed1a392560015f02a8949468cae629f66d770af45af600e4d0ae320f3ed4b596ddb16315765d33670b39d589f344af115edacd97e0
+  metadata.gz: 6f6592b21116bb309bfc171de869568f5f2dee96a9a6e674ca6c861ab3e9aa0899c5945f748680000ed81eb42dd6292b52e790364be6e6aa5bdcd1a54478bf99
+  data.tar.gz: 9edf72a244a19276b51cdbd00a0fb7e6e4ca3c1f0903e98d42c48bc9208645302a786ae41c87ce0589004df73e778ad020d5e1fae2f4bd3cd8ee43cd9244a473

data/lib/druzy/upnp/ssdp.rb

@@ -1,195 +1,65 @@
-require 'core_ext/socket_patch'
-require 'eventmachine'
-require 'em-synchrony'
-require 'core_ext/to_upnp_s'
-require_relative 'ssdp/error'
-require_relative 'ssdp/network_constants'
-require_relative 'ssdp/listener'
-require_relative 'ssdp/searcher'
-require_relative 'ssdp/notifier'
+require_relative 'upnp_device'
+require_relative 'version'
 
-require_relative 'ssdp/broadcast_searcher'
+require 'socket'
+require 'timeout'
 
 module Druzy
   module Upnp
-  
-    # This is the main class for doing SSDP stuff.  You can have a look at child
-    # classes, but you'll probably want to just use these methods here.
-    #
-    # SSDP is "Simple Service Discovery Protocol", which lets you find and learn
-    # about UPnP devices on your network.  Of the six "steps" of UPnP (given in
-    # the UPnP spec--that's counting step 0), SSDP is what provides step 1, or the
-    # "discovery" step.
-    #
-    # Before you can do anything with any of the UPnP devices on your network, you
-    # need to +search+ your network to see what devices are available.  Once you've
-    # found what's available, you can then decide device(s) you'd like to control
-    # (that's where Control Points come in; take a look at Playful::ControlPoint).
-    # After searching, you should then +listen+ to the activity on your network.
-    # New devices on your network may come online (via +ssdp:alive+) and devices
-    # that you care about may go offline (via +ssdp:byebye+), in which case you
-    # probably shouldn't try to talk to them anymore.
-    #
-    # @todo Add docs for Playful::Device perspective.
-    class SSDP
-      include NetworkConstants
-  
-      # Opens a multicast UDP socket on 239.255.255.250:1900 and listens for
-      # alive and byebye notifications from devices.
-      #
-      # @param [Fixnum] ttl The TTL to use on the UDP socket.
-      #
-      # @return [Hash<Array>,Playful::SSDP::Listener] If the EventMachine reactor is
-      #   _not_ running, it returns two key/value pairs--one for
-      #   alive_notifications, one for byebye_notifications.  If the reactor _is_
-      #   running, it returns a Playful::SSDP::Listener so that that object can be
-      #   used however desired.  The latter method is used in Playful::ControlPoints
-      #   so that an object of that type can keep track of devices it cares about.
-      def self.listen(ttl=TTL)
-        alive_notifications = Set.new
-        byebye_notifications = Set.new
-  
-        listener = proc do
-          l = EM.open_datagram_socket(MULTICAST_IP, MULTICAST_PORT,
-            Playful::SSDP::Listener, ttl)
-          i = 0
-          EM.add_periodic_timer(5) { i += 5; Playful.log "Listening for #{i}\n" }
-          l
-        end
-  
-        if EM.reactor_running?
-          return listener.call
-        else
-          EM.synchrony do
-            l = listener.call
-  
-            alive_getter = Proc.new do |notification|
-              alive_notifications << notification
-              EM.next_tick { l.alive_notifications.pop(&live_getter) }
-            end
-            l.alive_notifications.pop(&alive_getter)
-  
-            byebye_getter = Proc.new do |notification|
-              byebye_notifications << notification
-              EM.next_tick { l.byebye_notifications.pop(&byebye_getter) }
-            end
-            l.byebye_notifications.pop(&byebye_getter)
-  
-            trap_signals
-          end
-        end
-  
-        {
-          alive_notifications: alive_notifications.to_a.flatten,
-          byebye_notifications: byebye_notifications.to_a.flatten
-        }
+    
+    class Ssdp
+      @@port = 1900
+      @@host = "239.255.255.250"
+      
+      def initialize
+        
       end
-  
-      # Opens a UDP socket on 0.0.0.0, on an ephemeral port, has Druzy::Upnp::SSDP::Searcher
-      # build and send the search request, then receives the responses.  The search
-      # will stop after +response_wait_time+.
-      #
-      # @param [String] search_target
-      #
-      # @param [Hash] options
-      #
-      # @option options [Fixnum] response_wait_time
-      # @option options [Fixnum] ttl
-      # @option options [Fixnum] m_search_count
-      # @option options [Boolean] do_broadcast_search Tells the search call to also send
-      #   a M-SEARCH over 255.255.255.255.  This is *NOT* part of the UPnP spec;
-      #   it's merely a hack for working with some types of devices that don't
-      #   properly implement the UPnP spec.
-      #
-      # @return [Array<Hash>,Playful::SSDP::Searcher] Returns a Hash that represents
-      #   the headers from the M-SEARCH response.  Each one of these can be passed
-      #   in to Playful::ControlPoint::Device.new to download the device's
-      #   description file, parse it, and interact with the device's devices
-      #   and/or services.  If the reactor is already running this will return a
-      #   a Playful::SSDP::Searcher which will make its accessors available so you
-      #   can get responses in real time.
-      def self.search(search_target=:all, options = {})
-        response_wait_time = options[:response_wait_time] || 5
-        ttl = options[:ttl] || TTL
-        do_broadcast_search = options[:do_broadcast_search]
-  
-        searcher_options = options
-        searcher_options.delete :do_broadcast_search
-  
-        responses = []
-        search_target = search_target.to_upnp_s
-  
-        multicast_searcher = proc do
-          EM.open_datagram_socket('0.0.0.0', 0, Druzy::Upnp::SSDP::Searcher,
-            search_target, searcher_options)
-        end
-  
-        broadcast_searcher = proc do
-          EM.open_datagram_socket('0.0.0.0', 0, Druzy::Upnp::SSDP::BroadcastSearcher,
-            search_target, response_wait_time, ttl)
-        end
-  
-        if EM.reactor_running?
-          return multicast_searcher.call
-        else
-          EM.synchrony do
-            ms = multicast_searcher.call
-  
-            ms.discovery_responses.subscribe do |notification|
-              responses << notification
-            end
-  
-            if do_broadcast_search
-              bs = broadcast_searcher.call
-  
-              bs.discovery_responses.subscribe do |notification|
-                responses << notification
+      
+      #search only device (not service)
+      def search(st = "ssdp:all", delay = 10)
+        message = <<-MESSAGE
+M-SEARCH * HTTP/1.1\r
+HOST: #{@@host}:#{@@port}\r
+MAN: "ssdp:discover"\r
+MX: #{delay}\r
+ST: #{st}\r
+USER-AGENT: #{RbConfig::CONFIG["host_os"]}/ UPnP/1.1 ruby-druzy-upnp/#{Druzy::Upnp::VERSION}\r
+        MESSAGE
+        
+        s = UDPSocket.new
+        s.send(message,0,@@host,@@port)
+        devices = []
+        begin
+          Timeout::timeout(delay) do
+            loop do
+              message = s.recv(4196)
+              location = message.split("\n").reject{|line| line==nil || line["LOCATION"]==nil}.first
+              location = location[location.index(" ")+1..location.size-2]
+              if !devices.include?(location)
+                devices << location
+                if block_given?
+                  yield UpnpDevice.new(:location => location)
+                end
               end
             end
-  
-            EM.add_timer(response_wait_time) { EM.stop }
-            trap_signals
           end
+        rescue
+          
+        ensure
+          s.close
         end
-  
-        responses.flatten
-      end
-  
-      # @todo This is for Playful::Devices, which aren't implemented yet, and thus
-      #   this may not be working.
-      def self.notify(notification_type, usn, ddf_url, valid_for_duration=1800)
-        responses = []
-        notification_type = notification_type.to_upnp_s
-  
-        EM.synchrony do
-          s = send_notification(notification_type, usn, ddf_url, valid_for_duration)
-          EM.add_shutdown_hook { responses = s.discovery_responses }
-  
-          EM.add_periodic_timer(valid_for_duration) do
-            s = send_notification(notification_type, usn, ddf_url, valid_for_duration)
-          end
-  
-          trap_signals
-        end
-  
-        responses
-      end
-  
-      # @todo This is for Playful::Devices, which aren't implemented yet, and thus
-      #   this may not be working.
-      def self.send_notification(notification_type, usn, ddf_url, valid_for_duration)
-        EM.open_datagram_socket('0.0.0.0', 0, Druzy::Upnp::SSDP::Notifier, notification_type,
-          usn, ddf_url, valid_for_duration)
-      end
-  
-      private
-  
-      # Traps INT, TERM, and HUP signals and stops the reactor.
-      def self.trap_signals
-        trap('INT') { EM.stop }
-        trap('TERM') { EM.stop }
-        trap('HUP')  { EM.stop } if RUBY_PLATFORM !~ /mswin|mingw/
+        
       end
+      
     end
+    
+  end
+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
   end
 end

data/lib/druzy/upnp/upnp_device.rb

@@ -0,0 +1,73 @@
+require_relative 'upnp_service'
+
+require 'net/http'
+require 'nokogiri'
+
+module Druzy
+  module Upnp
+    
+    class UpnpDevice
+    
+      attr_reader :url_base, :device_type, :friendly_name, :manufacturer, :manufacturer_url, :model_description
+      attr_reader :model_name, :model_number, :model_url, :serial_number, :udn, :upc, :icon_list, :service_list
+      attr_reader :device_list
+    
+      def initialize(args)
+        
+        if args[:ssdp_message] != nil
+          
+          mess = args[:ssdp_message]
+          location=mess.split("\n").reject{|line| line==nil || line["LOCATION"]==nil}.first
+          initialize(:location => location[location.index(" ")+1..location.size-2])
+        
+        elsif args[:location] != nil
+
+          uri = URI(args[:location])
+          xml=Net::HTTP.get(uri)
+          xml_nok = Nokogiri::XML(xml)
+          xml_nok.remove_namespaces!
+          initialize(:uri => uri, :xml => Nokogiri::XML(xml_nok.xpath('root/device').to_s))
+          
+        else
+          
+          uri = args[:uri]
+          xml_nok = args[:xml]
+          #puts xml_nok
+          @url_base = uri.scheme+'://'+uri.host+":"+uri.port.to_s
+          @device_type = xml_nok.xpath('device/deviceType').text
+          @friendly_name = xml_nok.xpath('device/friendlyName').text
+          @manufacturer = xml_nok.xpath('device/manufacturer').text
+          @manufacturer_url = xml_nok.xpath('device/manufacturerURL').text
+          @model_description = xml_nok.xpath('device/modelDescription').text
+          @model_name = xml_nok.xpath('device/modelName').text
+          @model_number = xml_nok.xpath('device/modelNumber').text
+          @model_url = xml_nok.xpath('device/modelURL').text
+          @serial_number = xml_nok.xpath('device/serialNumber').text
+          @udn = xml_nok.xpath('device/UDN').text
+          @upc = xml_nok.xpath('device/UPC').text
+          @icon_list = xml_nok.xpath('device/iconList/icon/url').to_a.collect{|el| @url_base+el.text}
+          @service_list = xml_nok.xpath('device/serviceList/service').to_a.collect{|el| UpnpService.new(
+            :service_type => el.xpath("serviceType").text,
+            :service_id => el.xpath("serviceId").text,
+            :location => @url_base+el.xpath("SCPDURL").text,
+            :control_url => @url_base+el.xpath("controlURL").text,
+            :event_sub_url => @url_base+el.xpath("eventSubURL").text
+          )}
+          @service_list.each do |service|
+            method_name = service.service_id[service.service_id.rindex(':')+1..-1]
+            define_singleton_method(method_name.to_sym) do
+              return service
+            end
+          end
+          
+          @device_list = xml_nok.xpath('device/deviceList/device').to_a.collect{|el|
+            UpnpDevice.new(
+            :uri => uri,
+            :xml => Nokogiri::XML(el.to_s)
+          )}
+
+        end
+      end
+    end
+  end
+end

data/lib/druzy/upnp/upnp_service.rb

@@ -0,0 +1,74 @@
+require 'net/http'
+require 'nokogiri'
+require 'uri'
+
+module Druzy
+  module Upnp
+    class UpnpService
+      
+      attr_reader :service_type, :service_id, :location, :control_url, :event_sub_url
+      
+      def initialize(args)
+                  
+        @service_type = args[:service_type]
+        @service_id = args[:service_id]
+        @location = args[:location]
+        @control_url = args[:control_url]
+        @event_sub_url = args[:event_sub_url]
+        
+        uri = URI(@location)
+        xml=Net::HTTP.get(uri)
+        xml_nok = Nokogiri::XML(xml)
+        xml_nok.remove_namespaces!
+        xml_nok.xpath('scpd/actionList/action').to_a.each do |el|
+          
+          action_name = el.xpath('name').text
+          define_singleton_method(action_name.to_sym) do |arguments={}|
+            message = <<-MESSAGE
+<?xml version="1.0"?>
+<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/" s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+<s:Body>
+  <u:#{action_name} xmlns:u="#{@service_type}">
+            MESSAGE
+            
+            arguments.each do |cle, valeur|
+              message.concat <<-MESSAGE
+    <#{cle.to_s}>#{valeur.to_s}</#{cle.to_s}>
+              MESSAGE
+            end
+            
+            message.concat <<-MESSAGE
+  </u:#{action_name}>
+</s:Body>
+</s:Envelope>            
+            MESSAGE
+            
+            header = {
+              "HOST" => uri.host.to_s+':'+uri.port.to_s,
+              "CONTENT-LENGTH" => message.size.to_s,
+              "CONTENT-TYPE" => 'text/xml; charset="utf-8"',
+              "SOAPACTION" => @service_type.to_s+"#"+action_name.to_s
+            }            
+            
+            http = Net::HTTP.new(uri.host,uri.port)
+            request = Net::HTTP::Post.new(uri.request_uri,header)
+            request.body = message
+            response = http.request(request)
+            xml = Nokogiri.XML(response.body)
+            xml.remove_namespaces!
+
+            result = {}
+            puts "avant hash"
+            xml.xpath("Envelope/Body/"+action_name.to_s+"Response").children.each do |child|
+              result[child.name.to_s] = child.text
+            end
+            
+            return result
+          end
+
+        end
+        
+      end
+    end
+  end
+end

data/lib/druzy/upnp/version.rb

@@ -1,5 +1,5 @@
 module Druzy
   module Upnp
-    VERSION = '1.0.0'  
+    VERSION = "2.0.0"
   end
-end
+end

metadata

@@ -1,239 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: druzy-upnp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonathan Le Greneur
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: em-http-request
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nori
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-- !ruby/object:Gem::Dependency
-  name: savon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.6.7.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: em-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.beta
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.beta
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
-description: Fork of Playful. druzy-upnp provides the tools you need to build an app
-  that runs in a UPnP environment.
+        version: '10.0'
+description: Discover and interact with upnp device
 email:
 - jonathan.legreneur@free.fr
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/core_ext/hash_patch.rb
-- lib/core_ext/socket_patch.rb
-- lib/core_ext/to_upnp_s.rb
 - lib/druzy/upnp.rb
-- lib/druzy/upnp/control_point.rb
-- lib/druzy/upnp/control_point/base.rb
-- lib/druzy/upnp/control_point/device.rb
-- lib/druzy/upnp/control_point/error.rb
-- lib/druzy/upnp/control_point/service.rb
-- lib/druzy/upnp/device.rb
 - lib/druzy/upnp/ssdp.rb
-- lib/druzy/upnp/ssdp/broadcast_searcher.rb
-- lib/druzy/upnp/ssdp/error.rb
-- lib/druzy/upnp/ssdp/listener.rb
-- lib/druzy/upnp/ssdp/multicast_connection.rb
-- lib/druzy/upnp/ssdp/network_constants.rb
-- lib/druzy/upnp/ssdp/notifier.rb
-- lib/druzy/upnp/ssdp/searcher.rb
+- lib/druzy/upnp/upnp_device.rb
+- lib/druzy/upnp/upnp_service.rb
 - lib/druzy/upnp/version.rb
-- lib/rack/upnp_control_point.rb
 homepage: https://github.com/druzy/ruby-druzy-upnp
 licenses:
 - MIT
@@ -257,5 +87,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Use me to build a UPnP app!
+summary: A control point UPNP
 test_files: []

data/lib/core_ext/hash_patch.rb

@@ -1,5 +0,0 @@
-class Hash
-  def symbolize_keys!
-    self.inject({}) { |result, (k, v)| result[k.to_sym] = v; result }
-  end
-end