ssdp 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a650ded600f6688ce2d53aa7185b275d39b279f3
-  data.tar.gz: 65f3d49aa1aae08d792d61424c7891e4ffc4c35d
+  metadata.gz: 45a022bdf308b1a26cb8e290067a9882f97e0d15
+  data.tar.gz: c5b651cee29b9a61788da711ec6e9797fef72c2d
 SHA512:
-  metadata.gz: 428f3aa8fb465cd6407f9ef31723187ea2fe7810bb96da72a807dd8fe18c04e1e9be656e74567a27520b5dffc4f1c5f01448f18673e3ab6656a0017babd83964
-  data.tar.gz: 61af0480b1a12ac1230c7452d3a6d5271748686adf9aa8c11c6852eb8aa2508f8b1f3297442d9b0dc3f10bdb593218df0971791716f3514c1851ff8e89c555d5
+  metadata.gz: 60672a24ffd30f738f26773195cd2956be4c860a5580f5d79d4bea223e83d45587f4d38e5f114490f01e378da9fa1586eedb5ea575b090c9a69ad56d485d2257
+  data.tar.gz: fd617fa6bc5d97013297fb7542cd58ebd5e6e9d2178d0f3534d3117f7ba5d12b45ab0a302c10207d893bad4f551cd80936b8bca25ade21c35e887069662660a1

data/lib/ssdp.rb

@@ -6,18 +6,19 @@ require_relative 'ssdp/consumer'
 module SSDP
   DEFAULTS = {
     # Shared
-    :broadcast   => '239.255.255.250',
-    :bind        => '0.0.0.0',
-    :port        => 1900,
-    :maxpack     => 65_507,
+    :broadcast      => '239.255.255.250',
+    :bind           => '0.0.0.0',
+    :port           => 1900,
+    :maxpack        => 65_507,
     # Producer-Only
-    :interval    => 30,
-    :notifier    => true,
+    :interval       => 30,
+    :notifier       => true,
+    :respond_to_all => true,
     # Consumer-Only
-    :timeout     => 30,
-    :first_only  => false,
-    :synchronous => true,
-    :no_warnings => false
+    :timeout        => 30,
+    :first_only     => false,
+    :synchronous    => true,
+    :no_warnings    => false
   }
 
   HEADER_MATCH = /^([^:]+):\s*(.+)$/

data/lib/ssdp/consumer.rb

@@ -13,7 +13,7 @@ module SSDP
       }
     end
 
-    def search(options, &block)
+    def search(options = {}, &block)
       options = @options.merge options
       options[:callback] ||= block unless block.nil?
       fail "SSDP consumer async search missing callback." if (options[:synchronous] == false) && options[:callback].nil?
@@ -74,16 +74,26 @@ module SSDP
 
     def search_single(options)
       result = nil
+      found = false
 
       if options[:timeout]
-        ready = IO::select [@search_socket], nil, nil, options[:timeout]
-        if ready
+        began = Time.now
+        remaining = options[:timeout]
+        while !found && remaining > 0
+          ready = IO::select [@search_socket], nil, nil, remaining
+          if ready
+            message, producer = @search_socket.recvfrom options[:maxpack]
+            result = process_ssdp_packet message, producer
+            found = options[:filter].nil? ? true : options[:filter].call(result)
+          end
+          remaining = options[:timeout] - (Time.now - began).to_i
+        end
+      else
+        while !found
           message, producer = @search_socket.recvfrom options[:maxpack]
           result = process_ssdp_packet message, producer
+          found = options[:filter].nil? ? true : options[:filter].call(result)
         end
-      else
-        message, producer = @search_socket.recvfrom options[:maxpack]
-        result = process_ssdp_packet message, producer
       end
 
       if options[:synchronous]
@@ -102,7 +112,12 @@ module SSDP
         ready = IO::select [@search_socket], nil, nil, remaining
         if ready
           message, producer = @search_socket.recvfrom options[:maxpack]
-          responses << process_ssdp_packet(message, producer)
+          if options[:filter].nil?
+            responses << process_ssdp_packet(message, producer)
+          else
+            result = process_ssdp_packet message, producer
+            responses << result if options[:filter].call(result)
+          end
         end
         remaining -= (Time.now - start_time).to_i
       end

data/lib/ssdp/producer.rb

@@ -20,12 +20,12 @@ module SSDP
     end
 
     def start
-      start_notifier if @options[:notifier]
-      start_listener
+      start_notifier if @notifier[:thread].nil? && @options[:notifier]
+      start_listener if @listener[:thread].nil?
     end
 
     def stop(bye_bye = true)
-      @services.each { |type, params| send_bye_bye type, params } if bye_bye
+      was_running = running?
 
       if @listener[:thread] != nil
         @listener[:thread].exit
@@ -35,6 +35,8 @@ module SSDP
         @notifier[:thread].exit
         @notifier[:thread] = nil
       end
+
+      @services.each { |type, params| send_bye_bye type, params } if bye_bye && @options[:notifier] && was_running
     end
 
     def add_service(type, location_or_param_hash)
@@ -47,11 +49,11 @@ module SSDP
       end
 
       @services[type] = params
-      send_notification type, params if @options[:notifier]
+      send_notification type, params if @options[:notifier] && running?
     end
 
     def remove_service(type)
-      @services.delete[type]
+      @services.delete type
     end
 
     private
@@ -61,6 +63,12 @@ module SSDP
       return unless ssdp[:status].start_with? 'M-SEARCH * HTTP'
 
       return if ssdp[:params]['ST'].nil?
+
+      if @options[:respond_to_all] && ssdp[:params]['ST'].downcase == 'ssdp:all'
+        @services.each { |service, _| send_response service, consumer }
+        return
+      end
+
       return if @services[ssdp[:params]['ST']].nil?
       send_response ssdp[:params]['ST'], consumer
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssdp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Dillon Aumiller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies: []
 description: SSDP client/server library. Server notify/part/respond; client search/listen.
 email: dillonaumiller@gmail.com