mqtt-sn-ruby 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e34953b26fefce4f5e92f3d3b5ce9761fedac071
-  data.tar.gz: 97786a47fa00c49c902edc99fc30072aa00fbc03
+  metadata.gz: 4ab4b9eba338888a0b00c99ba73f7427f40b826c
+  data.tar.gz: f3c2bffc82613335aac13286c1369c3e5200b8be
 SHA512:
-  metadata.gz: 4e459aca2a8410edadf97935beec968a7fc59c9a9ee0275b05122a71d2c3ffbbf3e5db328528d1ce43c530d85df1f7b3777ee9051f85fae0fb83d8e52a595180
-  data.tar.gz: 934ebee4d63c118429b5b257d2698efd36761eb7a6cff7675b4b360bfd8a8b36e3e241b4ceae8b16bf8bb2df87faa8e30ed97d8119d89bf77b2c5adba31fc944
+  metadata.gz: 22e80e19b73ae5aabe5b95eec0dba90a0cdbab42120b24f1f63aa4127a2a029be3c23829cae734feac56ebba8c6d00ec1ce0883811e82dac956328ec46a9315a
+  data.tar.gz: d955340f857b4a7cd121a922f4a8182327688f92b0be9efd8248d63c21348de3a38f5359d9829484769a16325064d909f794b597c6609bf93a98e4efaef4d56c

data/bin/mqtt-sn-forwarder.rb

@@ -43,6 +43,7 @@ rescue SystemExit, Interrupt
   puts "\nExiting after Disconnect\n"
 rescue => e
   puts "\nError: '#{e}' -- Quit after Disconnect\n"
+  pp e.backtrace
 end
 
 puts "MQTT-SN-FORWARDER Done."

data/bin/mqtt-sn-pub.rb

@@ -46,6 +46,9 @@ puts "MQTT-SN-PUB: #{options.to_json}"
 begin
   sn=MqttSN.new options
   sn.connect options[:id]
+  sn.send :searchgw, expect: :gwinfo do |status,message|
+    puts "got gwinfo: #{status}: #{message}"
+  end
   sn.publish options[:topic]||"test/message/123", options[:msg]||"test_value", qos: options[:qos]
   puts "Sent ok."
 rescue SystemExit, Interrupt

data/lib/mqtt-sn-ruby.rb

@@ -10,6 +10,8 @@ class MqttSN
   Nretry = 5  # Max retry
   Tretry = 10 # Timeout before retry 
 
+  SEARCHGW_TYPE  =0x01
+  GWINFO_TYPE    =0x02
   CONNECT_TYPE   =0x04
   CONNACK_TYPE   =0x05
   WILLTOPICREQ_TYPE=0x06
@@ -66,9 +68,7 @@ class MqttSN
       end
   end
 
-
-
-  def hexdump data
+  def self.hexdump data
     raw=""
     data.each_byte do |b|
       raw=raw+"," if raw!=""
@@ -77,7 +77,7 @@ class MqttSN
     raw
   end
 
-  def send_packet m
+  def self.build_packet m
     msg=" "
     len=1
     m.each_with_index do |b,i|
@@ -85,16 +85,13 @@ class MqttSN
       len+=1
     end
     msg[0]=len.chr
-    @s.send(msg, 0, @server, @port)
-    hexdump msg
+    msg
   end
 
-  def raw_send_packet msg
-    @s.send(msg, 0, @server, @port)
-  end
+
 
   def send type,hash={},&block
-    puts ""  if @verbose
+    #puts ""  if @verbose
     if @state!=:connected and type!=:connect and type!=:will_topic  and type!=:will_msg
       if type==:disconnect
         return #already disconnected.. nothing to do
@@ -199,6 +196,8 @@ class MqttSN
       p=[PUBREL_TYPE,hash[:msg_id] >>8 ,hash[:msg_id] & 0xff]
     when :ping
       p=[PINGREQ_TYPE]
+     when :searchgw
+      p=[SEARCHGW_TYPE,0]
     when :disconnect
       if hash[:duration]
         p=[DISCONNECT_TYPE,hash[:duration] >>8 ,hash[:duration] & 0xff]
@@ -221,7 +220,7 @@ class MqttSN
       end
       raw=send_packet p
       hash[:debug]=raw if @debug
-      puts "send:#{@id} #{type},#{hash.to_json}" if @verbose
+      #puts "send:#{@id} #{type},#{hash.to_json}" if @verbose
       timeout=hash[:timeout]||Tretry
      retries=0
       if hash[:expect]
@@ -256,6 +255,41 @@ class MqttSN
 
   end
 
+  def self.send_raw_packet msg,socket,server,port
+    socket.send(msg, 0, server, port)
+    MqttSN::hexdump msg
+  end
+
+  def self.send_packet m,socket,server,port
+    msg=MqttSN::build_packet m
+    MqttSN::send_raw_packet msg,socket,server,port
+    dest="#{server}:#{port}"
+     _,port,_,_ = socket.addr
+    src=":#{port}"
+    printf "< %-18.18s <- %-18.18s | %s\n",dest,src,parse_message(msg).to_json
+
+  end
+
+
+  def send_packet m
+    MqttSN::send_packet m,@s,@server,@port
+  end
+
+  def self.poll_packet socket
+    #decide how to get data -- UDP-socket or FM-radio
+    begin
+      r,stuff=socket.recvfrom_nonblock(200) #get_packet --high level func!
+      client_ip=stuff[2]
+      client_port=stuff[1]
+      return [r,client_ip,client_port]
+    rescue IO::WaitReadable
+    rescue => e
+      puts "Error: receive thread died: #{e}"
+      pp e.backtrace
+    end
+    return nil
+  end
+
   def self.forwarder hash={}
     @options=hash #save these
     @server=hash[:server]||"127.0.0.1"
@@ -268,35 +302,46 @@ class MqttSN
     clients={}
     begin 
       while true
-        begin
-          r,stuff=socket.recvfrom_nonblock(200)
-          puts "got packet:"
-          client_ip=stuff[2]
-          client_port=stuff[1]
+        #periodically broadcast :advertize
+        if pac=poll_packet(socket)
+          r,client_ip,client_port=pac
           key="#{client_ip}:#{client_port}"
           if not clients[key]
             clients[key]={ip:client_ip, port:client_port, socket: UDPSocket.new  }
+            dest="#{client_ip}:#{client_port}"
+            printf "+ %s\n",dest
           end
-          clients[key][:socket].send(r, 0, @server, @port)
           m=MqttSN::parse_message r
-          puts ">#{m.to_json}"
-        rescue IO::WaitReadable
-        rescue => e
-          puts "Error: receive thread died: #{e}"
-          pp e.backtrace
+          done=false
+          case m[:type]
+          when :searchgw
+            #do it here! and reply with :gwinfo
+            dest="#{client_ip}:#{client_port}"
+            printf "C %-18.18s -> %-18.18s | %s\n",key,dest,m.to_json
+            MqttSN::send_packet [GWINFO_TYPE,0xAB],socket,client_ip,client_port
+            done=true
+          end
+          if not done # not done locally -> forward it
+            sbytes=clients[key][:socket].send(r, 0, @server, @port) # to rsmb -- ok as is
+            _,port,_,_ = clients[key][:socket].addr
+            dest="#{@server}:#{port}"
+            printf "C %-18.18s -> %-18.18s | %s\n",key,dest,m.to_json
+          end
         end
         clients.each do |key,c|
-          begin
-            r,stuff=c[:socket].recvfrom_nonblock(200)
-            puts "got packet from server to client #{key}:"
-            puts "sending to #{c[:ip]}:#{c[:port]}"
-            socket.send(r, 0, c[:ip], c[:port])
+          if pac=poll_packet(c[:socket])
+            r,client_ip,client_port=pac
+            #puts "got packet #{pac} from server to client #{key}:"
+            #puts "sending to #{c[:ip]}:#{c[:port]}"
+            socket.send(r, 0, c[:ip], c[:port]) # send_packet
             m=MqttSN::parse_message r
-            puts "<#{m.to_json}"
-          rescue IO::WaitReadable
-          rescue => e
-            puts "Error: receive thread died: #{e}"
-            pp e.backtrace
+            _,port,_,_ = clients[key][:socket].addr
+            dest="#{@server}:#{port}"
+            printf "S %-18.18s <- %-18.18s | %s\n",key,dest,m.to_json
+            case m[:type]
+            when :disconnect
+              puts "disco -- kill me!"
+            end
           end
         end
         sleep 0.01
@@ -448,12 +493,20 @@ class MqttSN
     type_byte=r[1].ord
     done=false
     case type_byte
+    when CONNECT_TYPE
+      duration=(r[4].ord<<8)+r[5].ord
+      id=r[6,len-6]
+      m={type: :connect, flags: r[2].ord, duration: duration, client_id: id, status: :ok}
     when CONNACK_TYPE
       m={type: :connect_ack,status: status}
     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 SUBSCRIBE_TYPE
+      msg_id=(r[5].ord<<8)+r[6].ord
+      topic=r[5,len-5]
+      m={type: :subscribe, flags: r[2].ord, topic: topic, msg_id: msg_id, status: :ok}
     when UNSUBACK_TYPE
       msg_id=(r[2].ord<<8)+r[3].ord
       m={type: :unsub_ack, msg_id: msg_id, status: :ok}
@@ -498,6 +551,11 @@ class MqttSN
     when WILLMSGRESP_TYPE
       m={type: :will_msg_resp, status: :ok}
 
+    when SEARCHGW_TYPE
+      m={type: :searchgw, radius: r[2].ord, status: :ok}
+    when GWINFO_TYPE
+      m={type: :gwinfo, gw_id: r[2].ord, status: :ok}
+
     when PINGRESP_TYPE
       m={type: :pong, status: :ok}
     else
@@ -506,11 +564,7 @@ class MqttSN
     m
   end
 
-  def process_message r
-    m=MqttSN::parse_message r
-    if @debug and m
-      m[:debug]=hexdump r
-    end
+  def process_message m    
     done=false
     case m[:type]
     when :register
@@ -541,9 +595,8 @@ class MqttSN
     when :connect_ack
       @state=:connected
     end
-    puts "got :#{@id} #{m.to_json}"  if @verbose
+   # puts "got :#{@id} #{m.to_json}"  if @verbose
     if not done
-      puts "pushed to q"
       @iq<<m if m
     end
     m
@@ -551,12 +604,20 @@ class MqttSN
 
   def recv_thread
     while true do
-      begin 
-        r,stuff=@s.recvfrom(200) #_nonblock(200)
-        process_message r
-      rescue IO::WaitReadable
-        IO.select([@s])
-        retry
+      begin
+        if pac=MqttSN::poll_packet(@s)
+          r,client_ip,client_port=pac 
+          m=MqttSN::parse_message r
+          if @debug and m
+            m[:debug]=MqttSN::hexdump r
+          end
+          dest="#{client_ip}:#{client_port}"
+          _,port,_,_ = @s.addr
+          src=port
+          printf "> %-18.18s <- %-18.18s | %s\n",dest,":#{port}",m.to_json
+          process_message m
+
+        end
       rescue => e
         puts "Error: receive thread died: #{e}"
         pp e.backtrace

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Ari Siitonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies: []
 description: Ruby toolkit for MQTT-SN, compatible with RSMB, command line tools and
   API