mqtt-sn-ruby 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8cea07a29fac1f0ee317f5f8b1923227a26e55
-  data.tar.gz: 7382ccd3bb7087a54e681dc00c0f4b7face5ca27
+  metadata.gz: 552d49593797c45d53598fe3d5787e3ffd692b56
+  data.tar.gz: 6c955790706011b9690186974084418488733af0
 SHA512:
-  metadata.gz: 345a18e8b8f90de15cbeeb57e887a34319cf74efaac95a2292f7eda74e2adc2fcb989c53276a099b125dfa8958535c390b97a227728bb62ae8853096d61dcbab
-  data.tar.gz: 1d5f9f86870762d83c8b73946b93816583c5f024bd02ebde54a9118b08a62d8b9668a50e00e8e9def99f3a92d828dd9336d5e0448ac91627a926db4d0dc2a45b
+  metadata.gz: 6edfcee73ea914ed1e4272e0c38eae30954b5ae3c76ff2fd0143a00b990879226efffb5a702826b4c90b17a49b04159fe7350fb536bb046506fa6b09903f88ae
+  data.tar.gz: 82aa807b9ff23d63aa707aea3937251a0ecc296717bf982a485d5c30b1d0f241f5c5e5f90b46e80085c679ffaaf7284cdd26ffc5d4e6b3afcb25423c25b99b1c

data/lib/mqtt-sn-ruby.rb

@@ -53,8 +53,10 @@ class MqttSN
       @will_topic=nil
       @will_msg=nil
       @id="?"
+      @sem=Mutex.new 
       @topics={} #hash of registered topics is stored here
       @iq = Queue.new
+      @dataq = Queue.new
       @s = UDPSocket.new
       @t=Thread.new do
         recv_thread
@@ -88,6 +90,7 @@ class MqttSN
     hexdump msg
   end
 
+  
   def send type,hash={},&block
     puts ""
     if @state!=:connected and type!=:connect and type!=:will_topic  and type!=:will_msg
@@ -160,6 +163,13 @@ class MqttSN
       end
       @@msg_id+=1
 
+    when :unsubscribe 
+      raise "Need :topic to :unsubscribe" if not hash[:topic]
+      p=[UNSUBSCRIBE_TYPE,0,@@msg_id >>8 ,@@msg_id & 0xff]
+      hash[:topic].each_byte do |b|
+        p<<b
+      end
+      @@msg_id+=1
 
     when :publish
       raise "Need :topic_id to Publish!" if not hash[:topic_id]
@@ -191,49 +201,51 @@ class MqttSN
       puts "Error: Strange send?? #{type}"
       return nil
     end
-    if hash[:expect] 
-      while not @iq.empty?
-        mp=@iq.pop
-        puts "WARN:#{@id} ************** Purged message: #{mp}"
-      end
-      @iq.clear
-    end
-    raw=send_packet p
-    hash[:raw]=raw if @debug
-    puts "send:#{@id} #{type},#{hash.to_json}"
-    timeout=hash[:timeout]||Tretry
     status=:timeout
-    retries=0
     m={}
-    if hash[:expect] 
-      while retries<Nretry do
-        stime=Time.now.to_i
-        while Time.now.to_i<stime+timeout
-          if not @iq.empty?
-            m=@iq.pop
-            if Array(hash[:expect]).include? m[:type]
-              status=:ok
-              break
-            else
-              puts "WARN:#{@id} ************** Discarded message: #{m}"
+    @sem.synchronize do #one command at a time -- 
+      if hash[:expect]
+        while not @iq.empty?
+          mp=@iq.pop
+          puts "WARN:#{@id} ************** Purged message: #{mp}"
+        end
+        @iq.clear
+      end
+      raw=send_packet p
+      hash[:raw]=raw if @debug
+      puts "send:#{@id} #{type},#{hash.to_json}"
+      timeout=hash[:timeout]||Tretry
+     retries=0
+      if hash[:expect]
+        while retries<Nretry do
+          stime=Time.now.to_i
+          while Time.now.to_i<stime+timeout
+            if not @iq.empty?
+              m=@iq.pop
+              if Array(hash[:expect]).include? m[:type]
+                status=:ok
+                break
+              else
+                puts "WARN:#{@id} ************** Discarded message: #{m}"
+              end
             end
+            sleep 0.1
+          end
+          if status==:ok
+            break
+          else
+            retries+=1
+            send_packet p
+            puts "fail to get ack, retry #{retries} :#{@id} #{type},#{hash.to_json}"
+            #need to set DUP flag !
           end
-          sleep 0.1
-        end
-        if status==:ok
-          break
-        else
-          retries+=1
-          send_packet p
-          puts "fail to get ack, retry #{retries} :#{@id} #{type},#{hash.to_json}"
-          #need to set DUP flag !
         end
       end
-
-      if block
-        block.call  status,m
-      end
+    end #sem
+    if block
+      block.call  status,m
     end
+
   end
 
   def will_and_testament topic,msg
@@ -288,8 +300,33 @@ class MqttSN
     end
   end
 
-  def subscribe topic,hash={}
-    send :subscribe, topic: topic, qos: hash[:qos],expect: :sub_ack do |status,message|
+  
+  def subscribe topic,hash={},&block
+    send :subscribe, topic: topic, qos: hash[:qos],expect: :sub_ack do |s,m|
+      if s==:ok
+        if m[:topic_id] and m[:topic_id]>0 #when subs topic has no wild cards, we get topic id here:
+          @topics[topic]=m[:topic_id]
+        end
+      end
+      if block
+        block.call :sub_ack,m
+        while true
+          if not @dataq.empty?
+            m=@dataq.pop
+            block.call :got_data,m
+          end
+          sleep 0.1
+          if @state!=:connected
+            block.call :disconnect,{}
+            break
+          end
+        end
+      end
+    end
+  end
+
+  def unsubscribe topic
+    send :unsubscribe, topic: topic, expect: :unsub_ack do |s,m|
     end
   end
 
@@ -322,7 +359,6 @@ class MqttSN
     when 1
       send :publish,msg: msg, retain: hash[:retain], topic_id: @topics[topic], qos: 1, expect: [:publish_ack] do |s,m|
         if s==:ok
-          puts "got handshaken once! status=#{s}, message=#{m.to_json}"
         end
       end
     when 2
@@ -330,7 +366,6 @@ class MqttSN
         if s==:ok
           if m[:type]==:pubrec
             send :pubrel,msg_id: m[:msg_id], expect: :pubcomp do |s,m|
-              puts "got handshaken twice!  status=#{s}, message=#{m.to_json}"
             end
           end
         end
@@ -364,33 +399,37 @@ class MqttSN
         when CONNACK_TYPE
           m={type: :connect_ack,status: status}
           @state=:connected
-
         when SUBACK_TYPE
           topic_id=(r[3].ord<<8)+r[4].ord
           msg_id=(r[5].ord<<8)+r[6].ord
           m={type: :sub_ack, topic_id: topic_id, msg_id: msg_id, status: status}
+        when UNSUBACK_TYPE
+          msg_id=(r[2].ord<<8)+r[3].ord
+          m={type: :unsub_ack, msg_id: msg_id, status: :ok}
         when PUBLISH_TYPE
           topic_id=(r[3].ord<<8)+r[4].ord
           msg_id=(r[5].ord<<8)+r[6].ord
           msg=r[7,len-7]
           flags=r[2].ord
           qos=(flags>>5)&0x03
-          m={type: :publish, qos: qos, topic_id: topic_id, msg_id: msg_id, msg: msg,status: :ok}
-          done=true
-          if qos==1 #send ack
+          topic=@topics.key(topic_id)
+          m={type: :publish, qos: qos, topic_id: topic_id, topic: topic,msg_id: msg_id, msg: msg,status: :ok}
+          @dataq<<m
+          if qos==1 
             send :publish_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
-          elsif qos==2 #send ack
+          elsif qos==2 
             send :pub_rec, msg_id: msg_id
           end
+          done=true
         when PUBREL_TYPE
           msg_id=(r[2].ord<<8)+r[3].ord
+          m={type: :pub_rel, status: :ok}
           send :pub_comp, msg_id: msg_id
           done=true
         when DISCONNECT_TYPE
           m={type: :disconnect,status: :ok}
           @state=:disconnected
         when REGISTER_TYPE
-          puts "registering... *************************"
           topic_id=(r[2].ord<<8)+r[3].ord
           msg_id=(r[4].ord<<8)+r[5].ord
           topic=r[6,len-6]
@@ -429,13 +468,10 @@ class MqttSN
         else
           m={type: :unknown, type_byte: type_byte }
         end
-        if @debug
+        if @debug and m
           m[:raw]=hexdump r
         end
         puts "got :#{@id} #{m.to_json}"
-        if m[:type]==:publish
-          puts "**************************** PUBLISH"
-        end
         if not done
           @iq<<m if m
         end

data/test.rb

@@ -27,18 +27,24 @@ sn2.connect "toka"
 
 sn3.connect "kolmas"
 
-sn3.subscribe "eka/+",qos:2
+Thread.new do
+  sn3.subscribe "eka/2",qos:2 do |s,m|
+    puts ">>>>>>>>>>>> subscribe got: #{s},#{m}"
+  end
+end
+sn3.unsubscribe "eka/2"
 
 topic_id=0
 sn.will_and_testament "top2","testamentti2"
 
 sn2.ping
-
+sn3.subscribe "eka/3",qos:2 
 #sn.register_topic "jeesus/perkele/toimii"
 sn.publish "eka/1","perkkule0",qos: 0
 sn.publish "eka/2","perkkule1",qos: 1
 sn.publish "eka/3","perkkule2",qos: 2
 
+
 sn2.publish "eka/4","2perkkule0",qos: 0
 sn2.publish "eka/5","2perkkule1rrrr",qos: 1, retain: true
 sn2.publish "eka/6","2perkkule2",qos: 2

metadata

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