mqtt-sn-ruby 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 027cc20a4444e3c7057ac78c80f228c32eaf6821
-  data.tar.gz: 3196be2b522910d4a9be4f9fc36cf94c080a7987
+  metadata.gz: f6e0d50a6122a25b13a777d12126907b20245da1
+  data.tar.gz: eb53d010e6489de64806a3542e1133c5e5bddbfb
 SHA512:
-  metadata.gz: fd37c4ff4f979269e107062f940e3d391e98d5c04b018427c79e679d39625a45707c1ba141296404c21f48e1e4b8aee0bc85c7ad94c52716b157c242242572b9
-  data.tar.gz: ce37e48888c66fd0e085a44feae578fac2d79cc40f047fbb5c3a2a4ebf4be926bf76755566c3589e2b58a94e2692583aa4792bd6bddc23e561f061402ceb319a
+  metadata.gz: df1ab2aea08c3df21868bf4f55fad77f3b37dea31c72a5bb632a678d400127cc88ddaead67c783e584486499ae989eda75a40e1f2ce0db0c5fe2b01616101a49
+  data.tar.gz: fece50d44b9beccd91caf410275a27ef93aa06e0003bf8a5eb9319726eaf22696acbdfd8b1c33992b415aa605c1e942bcf9879ba611ab3dee9a8a67f4ea972c8

data/bin/mqtt-sn-pub.rb

@@ -22,8 +22,7 @@ OptionParser.new do |opts|
   opts.on("-d", "--[no-]debug", "Produce Debug dump on console (false)") do |v|
     options[:debug] = v
   end
-  options[:server_uri] = "udp://localhost:1883"
-  opts.on("-s", "--server uri", "URI of the MQTT-SN Server to connect to (udp://localhost:1883)") do |v|
+  opts.on("-s", "--server uri", "URI of the MQTT-SN Server to connect to. Example udp://localhost:1883. Default: Use Autodiscovery.") do |v|
     options[:server_uri] = v
   end
   opts.on("-q", "--qos level", "QoS level (0)") do |v|
@@ -39,8 +38,7 @@ OptionParser.new do |opts|
     options[:topic] = topic
   end
 end.parse!
-#require 'ruby-prof'
-#RubyProf.start
+
 puts "MQTT-SN-PUB: #{options.to_json}"
 begin
   sn=MqttSN.new options
@@ -57,9 +55,3 @@ end
 sn.disconnect if sn
 
 puts "MQTT-SN-PUB Done."
-
-#result = RubyProf.stop
-
-# Print a flat profile to text
-#printer = RubyProf::FlatPrinter.new(result)
-#printer.print(STDOUT)

data/bin/mqtt-sn-sub.rb

@@ -22,8 +22,7 @@ OptionParser.new do |opts|
   opts.on("-d", "--[no-]debug", "Produce Debug dump on console (false)") do |v|
     options[:debug] = v
   end
-  options[:server_uri] = "udp://localhost:1883"
-  opts.on("-s", "--server uri", "URI of the MQTT-SN Server to connect to (udp://localhost:1883)") do |v|
+  opts.on("-s", "--server uri"," URI of the MQTT-SN Server to connect to. Example udp://localhost:1883. Default: Use Autodiscovery.") do |v|
     options[:server_uri] = v
   end
   opts.on("-q", "--qos level", "QoS level (0)") do |v|

data/lib/mqtt-sn-ruby.rb

@@ -67,7 +67,7 @@ class MqttSN
   end
 
   def log_flush
-    while not sn.log_empty?
+    while not log_empty?
       sleep 0.1
     end
   end
@@ -125,7 +125,7 @@ class MqttSN
 
   def initialize(hash={})
       @options=hash #save these
-      @server_uri=hash[:server_uri]||"udp://localhost:1883"
+      @server_uri=hash[:server_uri]
       @debug=hash[:debug]
       @verbose=hash[:verbose]
       @state=:inited
@@ -139,6 +139,17 @@ class MqttSN
       @msg_id=1
       @clients={}
       @gateways={}
+      @autodiscovery=false
+      if @server_uri
+        puts "adding default gateway #{@server_uri}"
+        @gateways[0]={stamp: Time.now.to_i,uri: @server_uri, duration: 0, source: 'default', status: :ok}
+        pick_new_gateway 
+        pp @gateways
+      else
+        puts "Autodiscovery Active"
+        @autodiscovery=true
+      end
+
       @log_q = Queue.new #log queue :) 
 
       @log_t=Thread.new do
@@ -150,28 +161,25 @@ class MqttSN
       @iq = Queue.new
       @dataq = Queue.new
       
-
       @bcast_s=MqttSN::open_multicast_send_port @bcast_port
       @bcast=MqttSN::open_multicast_recv_port @bcast_port
 
       @roam_t=Thread.new do
         roam_thread @bcast
       end
-      if not @forwarder
-         @client_t=Thread.new do
-          client_thread @s
-        end
-      else
+      if @forwarder
         @s,@server,@port = MqttSN::open_port @server_uri
         puts "Open port to Gateway: #{@server_uri}: #{@server},#{@port} -- local port: #{@local_port}"
         @local_port=hash[:local_port]||1883
         @s.bind("0.0.0.0",@local_port)
         @bcast_period=60
+      else
+        @client_t=Thread.new do
+          client_thread 
+        end
       end
- 
   end
 
-
   def forwarder_thread
     if not @forwarder 
       raise "Cannot Forward if no Forwarder!"
@@ -771,7 +779,7 @@ class MqttSN
     m
   end
 
-  def client_thread socket
+  def client_thread 
     while true do
       begin
         if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket] #if we are connected...
@@ -856,7 +864,7 @@ class MqttSN
           sleep @bcast_period
         end
       end
-    else #client should try to find some gateways..
+    elsif @autodiscovery  #client should try to find some gateways..
       Thread.new do
         while true do
           send :searchgw #replies may or may not come -- even multiple!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Ari Siitonen