mqtt-sn-ruby 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36933af1cb091daf1589de7c56e0fd405aa9d498
-  data.tar.gz: acfaa8908bd286530b1d2d57ee755401c867820b
+  metadata.gz: 355869b8237db560d527d053840b5cf3e6004f67
+  data.tar.gz: 7eb4e42c4d935ad629fdaf53709953d5e87c8acd
 SHA512:
-  metadata.gz: 08b91c72b2b0819b9aae457eb7f9c97d38bb3e999b4b8f098191c62f07c69cd1bcbfdba9431d76b05636bac43a1b8702b5628ba5c35ca16702bcd0e3366649ca
-  data.tar.gz: a1d0cd9bd2b15a1fd88883dfb82c88cf33a4b2aa1dd1b34de350a225a63f4a774a314554db75e5013a86a37269b19089859f4a30231fbb15bbf77917b07e40b2
+  metadata.gz: 6b04c285a66b26ce92e411df4f22c292c8de65b685f8ec2e11c904745fc8c6c3dfa72fbfe3be85f53e9e07330632df723da80e42555bd5814b83f7137ca67966
+  data.tar.gz: 86bbb6373d0790ed3e78e0123d8d4cfc0190093f2db248876650863cc5cdf39a5b9afddaaf7fba666fecb4f17b716a09291bf9debf7f63d31e8f3cabfd835111

data/bin/mqtt-sn-pub.rb

@@ -25,7 +25,7 @@ OptionParser.new do |opts|
   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|
+  opts.on("-q", "--qos level", "QoS level (0). When using QoS -1, you must provide either Short Topic (2-char) or Topic_Id") do |v|
     options[:qos] = v.to_i
   end
   opts.on("-i", "--id id", "This client's id -- free choice (hostname-pid)") do |name|
@@ -34,7 +34,7 @@ OptionParser.new do |opts|
   opts.on("-m", "--msg msg", "Message to send (test_value)") do |msg|
     options[:msg] = msg
   end
-  opts.on("-t", "--topic topic", "Topic to use (test/message/123)") do |topic|
+  opts.on("-t", "--topic topic", "Topic to use (test/message/123). For predefined Topics, use this notation '=123'") do |topic|
     options[:topic] = topic
   end
   

data/lib/mqtt-sn-ruby.rb

@@ -11,11 +11,9 @@ require 'time'
 
 class MqttSN
 
-  Nretry = 5  # Max retry
-  Tretry = 10 # Timeout before retry 
+  Nretry = 3  # Max retry
+  Tretry = 3 # Timeout before retry 
   
-  MULTICAST_ADDR = "225.4.5.6" 
-
   SEARCHGW_TYPE  =0x01
   GWINFO_TYPE    =0x02
   ADVERTISE_TYPE =0x03
@@ -51,6 +49,7 @@ class MqttSN
   QOS2_FLAG  =0x40
   QOS1_FLAG  =0x20
   QOS0_FLAG  =0x00
+  TOPIC_PREDEFINED_FLAG =0x01
   TOPIC_SHORT_FLAG =0x02
 
 
@@ -245,6 +244,12 @@ class MqttSN
         end
         @clients[key][:stamp]=Time.now.to_i
         m=MqttSN::parse_message r
+        case m[:type]
+        when :publish
+          if m[:qos]==-1
+            @clients[key][:state]=:disconnected #one shot
+          end
+        end
         sbytes=@clients[key][:socket].send(r, 0, @server, @port) # to rsmb -- ok as is
         _,port,_,_ = @clients[key][:socket].addr
         dest="#{@server}:#{port}"
@@ -389,6 +394,8 @@ class MqttSN
       end
       if hash[:topic_type]==:short
         flags+=TOPIC_SHORT_FLAG
+      elsif hash[:topic_type]==:predefined
+        flags+=TOPIC_PREDEFINED_FLAG
       end
       p=[PUBLISH_TYPE,flags,hash[:topic_id] >>8 ,hash[:topic_id] & 0xff,@msg_id >>8 ,@msg_id & 0xff]
       hash[:msg].each_byte do |b|
@@ -495,10 +502,10 @@ class MqttSN
   end
 
   def send_packet_bcast m
-    socket,server,port=[@bcast_s,MULTICAST_ADDR,@bcast_port]
+    uri = URI.parse(@broadcast_uri)
     msg=MqttSN::build_packet m
-    MqttSN::send_raw_packet msg,socket,server,port
-     _,port,_,_ = socket.addr
+    MqttSN::send_raw_packet msg,@bcast_s,uri.host,uri.port
+     _,port,_,_ = @bcast_s.addr
     src="udp://0.0.0.0:#{port}"
     logger "ob %-24.24s <- %-24.24s | %s",@broadcast_uri,src,MqttSN::parse_message(msg).to_json
   end
@@ -676,15 +683,22 @@ class MqttSN
   end
 
   def publish topic,msg,hash={}
-    topic_type=:long
-    if topic.size!=2
+    puts "op='#{topic}','#{topic[0]}'"
+   
+    if topic[0]=="="
+      puts "yeah"
+      topic[0]=""
+      topic_id=topic.to_i
+      topic_type=:predefined
+    elsif topic.size==2
+      topic_id=((topic[0].ord&0xff)<<8)+(topic[1].ord&0xff)
+      topic_type=:short
+    else
+      topic_type=:long
       if not @topics[topic]
         register_topic topic
       end
       topic_id=@topics[topic]
-    else
-      topic_id=((topic[0].ord&0xff)<<8)+(topic[1].ord&0xff)
-      topic_type=:short
     end
     case hash[:qos]
     when 1
@@ -752,6 +766,9 @@ class MqttSN
       if flags&0x03==TOPIC_SHORT_FLAG
         topic_type=:short
         topic=r[3].chr+r[4].chr
+      elsif flags&0x03==TOPIC_PREDEFINED_FLAG
+        topic_type=:predefined
+        topic=""
       end
       qos=(flags>>5)&0x03
       qos=-1 if qos==3

metadata

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