mqtt-sn-ruby 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bdd116c2da406a3163968c7f8111b7649a83cf8
-  data.tar.gz: 775b6358cb108c2475679dc35e5844b0c9f68428
+  metadata.gz: 027cc20a4444e3c7057ac78c80f228c32eaf6821
+  data.tar.gz: 3196be2b522910d4a9be4f9fc36cf94c080a7987
 SHA512:
-  metadata.gz: ee3244e7ffe27bd3ebcb2894a731f1e3ecc9afa8bd7807c6755ce035d9621293b83344590619f5a87354c2de6de901dbb3b087324a2eb3b812dfde512dddee2b
-  data.tar.gz: 3a7b1be4136a6866bfed5d08dcd14f6a340f582affb25409d14f267e60a0ddf4837afa53c1b39b66ac029709117ddd31457bee156bac972b91fb4609b624b04e
+  metadata.gz: fd37c4ff4f979269e107062f940e3d391e98d5c04b018427c79e679d39625a45707c1ba141296404c21f48e1e4b8aee0bc85c7ad94c52716b157c242242572b9
+  data.tar.gz: ce37e48888c66fd0e085a44feae578fac2d79cc40f047fbb5c3a2a4ebf4be926bf76755566c3589e2b58a94e2692583aa4792bd6bddc23e561f061402ceb319a

data/bin/mqtt-sn-forwarder.rb

@@ -14,7 +14,7 @@ else
   require 'mqtt-sn-ruby'
 end
 
-options = {}
+options = {forwarder: true}
 OptionParser.new do |opts|
   opts.banner = "Usage: mqtt-sn-sub.rb [options]"
 
@@ -32,7 +32,7 @@ OptionParser.new do |opts|
     options[:local_port] = v.to_i
   end 
   options[:gw_id] = 123
-  opts.on("-i", "--id GwId", "MQTT-SN if of this GateWay (123)") do |v|
+  opts.on("-i", "--id GwId", "MQTT-SN id of this GateWay (123)") do |v|
     options[:gw_id] = v.to_i
   end 
   opts.on("-h", "--http port", "Http port for debug/status JSON server (false)") do |v|
@@ -40,37 +40,52 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-
+$sn=MqttSN.new options
 if options[:http_port]
-  require "sinatra/base"
   puts "Starting HTTP services at port #{options[:http_port]}"
-  @hp=options[:http_port]
-  class MySinatra < Sinatra::Base
-    set :bind, '0.0.0.0'
-    set :port, @hp
-
-    get "/clients" do
-      content_type :json
-      MqttSN.get_clients.to_json
-    end
-    get "/gateways" do
-      content_type :json
-      MqttSN.get_gateways.to_json
-    end
-  end
+  $hp=options[:http_port]
   Thread.new do
-    MySinatra.run!
+    server = TCPServer.new("20.20.20.21",$hp)
+    loop do
+      Thread.start(server.accept) do |client|
+        request = client.gets.split " "
+        type="text/html"
+        case request[1]
+        when '/gw'
+          response=$sn.gateways.to_json
+          status="200 OK"
+          type="text/json"
+        when '/cli'
+          response=$sn.clients.to_json
+          status="200 OK"
+          type="text/json"
+        else
+          status="404 Not Found"
+          response="?que"
+        end
+        client.print "HTTP/1.1 #{status}\r\n" +
+               "Content-Type: #{type}\r\n" +
+               "Content-Length: #{response.bytesize}\r\n" +
+               "Connection: close\r\n"
+        client.print "\r\n"
+        client.print response 
+        client.close
+        puts "#{request} -> #{response}"
+      end
+    end
   end
 end
-options[:forwarder]=true
+
 puts "MQTT-SN-FORWARDER: #{options.to_json}"
+
 begin
-  f=MqttSN.new options
+  $sn.forwarder_thread
 rescue SystemExit, Interrupt
   puts "\nExiting after Disconnect\n"
 rescue => e
   puts "\nError: '#{e}' -- Quit after Disconnect\n"
   pp e.backtrace
 end
+$sn.kill_clients #if $sn
 
 puts "MQTT-SN-FORWARDER Done."

data/bin/mqtt-sn-pub.rb

@@ -45,12 +45,9 @@ puts "MQTT-SN-PUB: #{options.to_json}"
 begin
   sn=MqttSN.new options
   sn.connect options[:id]
-  sn.send :searchgw #replies may or may not come -- even multiple!
   sn.publish options[:topic]||"test/message/123", options[:msg]||"test_value", qos: options[:qos]
   puts "Sent ok."
-  while not sn.log_empty?
-    sleep 0.1
-  end
+  sn.log_flush
 rescue SystemExit, Interrupt
   puts "\nExiting after Disconnect\n"
 rescue => e

data/bin/mqtt-sn-sub.rb

@@ -41,22 +41,34 @@ OptionParser.new do |opts|
 
 end.parse!
 
+$sn=MqttSN.new options
 
 if options[:http_port]
   puts "Starting HTTP services at port #{options[:http_port]}"
   $hp=options[:http_port]
   Thread.new do
-    server = TCPServer.new("20.20.20.21",8083)
+    server = TCPServer.new("20.20.20.21",$hp)
     loop do
       Thread.start(server.accept) do |client|
-        response= MqttSN::get_gateways.to_json
-        client.print "HTTP/1.1 200 OK\r\n" +
-               "Content-Type: text/json\r\n" +
+        request = client.gets.split " "
+        type="text/html"
+        case request[1]
+        when '/gw'
+          response=$sn.gateways.to_json
+          status="200 OK"
+          type="text/json"
+        else
+          status="404 Not Found"
+          response="?que"
+        end
+        client.print "HTTP/1.1 #{status}\r\n" +
+               "Content-Type: #{type}\r\n" +
                "Content-Length: #{response.bytesize}\r\n" +
                "Connection: close\r\n"
         client.print "\r\n"
         client.print response 
         client.close
+        puts "#{request} -> #{response}"
       end
     end
   end
@@ -64,9 +76,9 @@ end
 
 puts "MQTT-SN-SUB: #{options.to_json}"
 begin
-  sn=MqttSN.new options
-  sn.connect options[:id]
-  sn.subscribe options[:topic]||"test/message/123", qos: options[:qos] do |s,m|
+ 
+  $sn.connect options[:id]
+  $sn.subscribe options[:topic]||"test/message/123", qos: options[:qos] do |s,m|
     if s==:sub_ack
       puts "Subscribed Ok! Waiting for Messages!"
     else
@@ -79,7 +91,7 @@ rescue SystemExit, Interrupt
 rescue => e
   puts "\nError: '#{e}' -- Quit after Disconnect\n"
 end
-sn.disconnect if sn
+$sn.disconnect if $sn
 
 puts "MQTT-SN-SUB Done."
 

data/lib/mqtt-sn-ruby.rb

@@ -61,7 +61,33 @@ class MqttSN
   def note str,*args
     @log_q << sprintf(str,*args)
   end
-  
+
+  def log_empty?
+    @log_q.empty? or not @verbose
+  end
+
+  def log_flush
+    while not sn.log_empty?
+      sleep 0.1
+    end
+  end
+
+  def log_thread 
+    while true do
+      begin
+        if not @log_q.empty?
+          l=@log_q.pop
+          puts l
+        else
+          sleep 0.01
+        end
+      rescue => e
+        puts "Error: receive thread died: #{e}"
+        pp e.backtrace
+      end
+    end
+  end
+
   def self.open_port uri_s
     begin
       uri = URI.parse(uri_s)
@@ -92,6 +118,11 @@ class MqttSN
     s
   end
 
+
+  attr_accessor :clients
+  attr_accessor :gateways
+
+
   def initialize(hash={})
       @options=hash #save these
       @server_uri=hash[:server_uri]||"udp://localhost:1883"
@@ -99,13 +130,12 @@ class MqttSN
       @verbose=hash[:verbose]
       @state=:inited
       @bcast_port=5000
-      @bcast_period=10
-      @forward=hash[:forward] #flag to indicate forward mode 
+      @forwarder=hash[:forwarder] #flag to indicate forward mode 
       @will_topic=nil
       @will_msg=nil
+      @active_gw_id=nil
       @id="?"
 
-
       @msg_id=1
       @clients={}
       @gateways={}
@@ -115,12 +145,11 @@ class MqttSN
         log_thread
       end
 
-
       @sem=Mutex.new 
       @topics={} #hash of registered topics is stored here
       @iq = Queue.new
       @dataq = Queue.new
-      @s,@server,@port = MqttSN::open_port @server_uri
+      
 
       @bcast_s=MqttSN::open_multicast_send_port @bcast_port
       @bcast=MqttSN::open_multicast_recv_port @bcast_port
@@ -128,22 +157,25 @@ class MqttSN
       @roam_t=Thread.new do
         roam_thread @bcast
       end
-      if not @options[:forwarder]
-        @client_t=Thread.new do
+      if not @forwarder
+         @client_t=Thread.new do
           client_thread @s
         end
       else
-        @s.bind("0.0.0.0",hash[:local_port]||1883)
+        @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
-        loop do      
-          forwarder_thread @s
-        end
       end
  
   end
 
 
-  def forwarder_thread socket
+  def forwarder_thread
+    if not @forwarder 
+      raise "Cannot Forward if no Forwarder!"
+    end
     begin 
       last_kill=0
       stime=Time.now.to_i
@@ -165,7 +197,7 @@ class MqttSN
         end
       end
       while true
-        pac=MqttSN::poll_packet_block(socket) #data from clients to our service sovket
+        pac=MqttSN::poll_packet_block(@s) #data from clients to our service sovket
         r,client_ip,client_port=pac
         key="#{client_ip}:#{client_port}"
         if not @clients[key]
@@ -202,6 +234,16 @@ class MqttSN
     end
   end
 
+  def kill_clients
+    puts "Killing Clients:"
+    @clients.each do |key,c|
+      puts "Killing #{key}"
+      send_packet [DISCONNECT_TYPE],@s,c[:ip], c[:port]
+      send_packet [DISCONNECT_TYPE],c[:socket], @server,@port
+    end
+    puts "Killing Clients Done."
+  end
+
 
   def self.hexdump data
     raw=""
@@ -225,7 +267,7 @@ class MqttSN
 
   def send type,hash={},&block
     #puts ""  if @verbose
-    if @state!=:connected and type!=:connect and type!=:will_topic  and type!=:will_msg
+    if @state!=:connected and type!=:connect and type!=:will_topic  and type!=:will_msg  and type!=:searchgw
       if type==:disconnect
         return #already disconnected.. nothing to do
       else
@@ -241,7 +283,7 @@ class MqttSN
       flags+=CLEAN_FLAG if hash[:clean]
       flags+=RETAIN_FLAG if hash[:retain]
       flags+=WILL_FLAG if @will_topic
-      p=[CONNECT_TYPE,flags,0x01,0,30]
+      p=[CONNECT_TYPE,flags,0x01,hash[:duration]>>8 ,hash[:duration] & 0xff]
       hash[:id].each_byte do |b|
         p<<b
       end
@@ -347,7 +389,7 @@ class MqttSN
       if type==:searchgw
         raw=send_packet p,@bcast,MULTICAST_ADDR,@bcast_port
       else
-        raw=send_packet p,@s,@server,@port
+        raw=send_packet_gw p
       end
       hash[:debug]=raw if @debug
       return
@@ -363,7 +405,7 @@ class MqttSN
       if type==:searchgw
         raw=send_packet p,@bcast,MULTICAST_ADDR,@bcast_port
       else
-        raw=send_packet p,@s,@server,@port
+        raw=send_packet_gw p
       end
       hash[:debug]=raw if @debug
       #puts "send:#{@id} #{type},#{hash.to_json}" if @verbose
@@ -388,7 +430,7 @@ class MqttSN
             break
           else
             retries+=1
-            send_packet p,@s,@server,@port
+            send_packet_gw p
             puts "fail to get ack, retry #{retries} :#{@id} #{type},#{hash.to_json}"
             #need to set DUP flag !
           end
@@ -419,6 +461,28 @@ class MqttSN
     logger "< %-18.18s <- %-18.18s | %s",dest,src,MqttSN::parse_message(msg).to_json
   end
 
+  def send_packet_gw m
+    msg=MqttSN::build_packet m
+    waits=0
+    while not @active_gw_id or not @gateways[@active_gw_id] or not @gateways[@active_gw_id][:socket] 
+      sleep 0.1
+      waits+=1
+      break if waits>30
+    end
+    if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket] 
+      #get server & port from uri!
+      uri=URI.parse(@gateways[@active_gw_id][:uri])
+      #uri.scheme
+      MqttSN::send_raw_packet msg,@gateways[@active_gw_id][:socket],uri.host,uri.port
+      _,port,_,_ = @gateways[@active_gw_id][:socket].addr
+      src="udp://0.0.0.0:#{port}"
+      logger "< %-24.24s <- %-24.24s | %s",@gateways[@active_gw_id][:uri],src,MqttSN::parse_message(msg).to_json
+    else
+      puts "no gw to send.."
+      sleep 1
+    end
+  end
+
   def self.poll_packet socket
     #decide how to get data -- UDP-socket or FM-radio
     begin
@@ -442,15 +506,6 @@ class MqttSN
     client_port=stuff[1]
     return [r,client_ip,client_port]
   end
-
-  def self.get_clients
-    @clients
-  end
-
-  def self.get_gateways
-    @gateways
-  end
-
   
   def will_and_testament topic,msg
     if @state==:connected #if already connected, send changes, otherwise wait until connect does it.
@@ -477,8 +532,8 @@ class MqttSN
     @will_msg=msg
   end
 
-  def connect id
-    send :connect,id: id, clean: true, expect: [:connect_ack,:will_topic_req] do |s,m| #add will here!
+  def connect id,duration=30
+    send :connect,id: id, clean: false, duration: duration, expect: [:connect_ack,:will_topic_req] do |s,m| #add will here!
       if s==:ok
         if m[:type]==:will_topic_req
           puts "will topic!"
@@ -719,16 +774,17 @@ class MqttSN
   def client_thread socket
     while true do
       begin
-        if pac=MqttSN::poll_packet_block(socket)
+        if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket] #if we are connected...
+          pac=MqttSN::poll_packet_block(@gateways[@active_gw_id][:socket])
           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
-          logger "> %-18.18s -> %-18.18s | %s",dest,":#{port}",m.to_json
+          _,port,_,_= @gateways[@active_gw_id][:socket].addr
+          src="udp://0.0.0.0:#{port}"
+          logger "i %-24.24s -> %-24.24s | %s",@gateways[@active_gw_id][:uri],src,m.to_json
           process_message m
         else
           sleep 0.01
@@ -743,36 +799,84 @@ class MqttSN
   def process_broadcast_message m,client_ip,client_port
     case m[:type]
     when :searchgw
-      note "hey, someone is looking for gateway..."
       key="#{client_ip}:#{client_port}"
       dest="#{MULTICAST_ADDR};#{@bcast_port}"
       #actually -- send data on all gateways we know...
-      if @options[:forwarder]
+      if @forwarder
         logger "r %-18.18s -> %-18.18s | %s",key,dest,m.to_json
         send_packet [GWINFO_TYPE,@options[:gw_id]],@bcast_s,MULTICAST_ADDR,@bcast_port
       end
     when :advertise,:gwinfo
-      note "hey, we have gateway there!"
-      if not @gateways[client_ip]
-         @gateways[client_ip]={stamp: Time.now.to_i}
+      gw_id=m[:gw_id]  
+      duration=m[:duration]||180
+      uri="udp://#{client_ip}:1882"
+      if not @gateways[gw_id]
+         @gateways[gw_id]={stamp: Time.now.to_i,uri: uri, duration: duration, source: m[:type], status: :ok}
+      else
+        if @gateways[gw_id][:uri]!=uri
+          note "conflict -- gateway has moved? or duplicate"
+        else
+          @gateways[gw_id][:stamp]=Time.now.to_i
+          @gateways[gw_id][:duration]=duration 
+          @gateways[gw_id][:source]=m[:type] 
+        end
+      end
+    end
+  end
+
+
+  def pick_new_gateway 
+    begin
+      use_gw=nil
+      @gateways.each do |gw_id,data|
+        if data[:uri]
+          use_gw=gw_id
+        end
+      end
+      if use_gw
+        @active_gw_id=use_gw
+        puts "using gateway #{@active_gw_id} #{@gateways[@active_gw_id][:uri]}"
+        @s,@server,@port = MqttSN::open_port @gateways[@active_gw_id][:uri]
+        @gateways[use_gw][:socket]=@s
       else
-         @gateways[client_ip][:stamp]=Time.now.to_i
+        #note "Error: no usable gw found !!"
       end
-      @gateways[client_ip][:gw_id]=m[:gw_id]
-      @gateways[client_ip][:duration]=m[:duration]
-      note "gw: #{@gateways.to_json}"
+    rescue => e
+      puts "Error: receive thread died: #{e}"
+      pp e.backtrace
     end
   end
 
   def roam_thread socket
     @last_bcast=0
-    if @options[:forwarder]
+    if @forwarder
       Thread.new do
         while true do
           send_packet [ADVERTISE_TYPE,@options[:gw_id],@bcast_period>>8,@bcast_period&0xff],@bcast_s,MULTICAST_ADDR,@bcast_port
           sleep @bcast_period
         end
       end
+    else #client should try to find some gateways..
+      Thread.new do
+        while true do
+          send :searchgw #replies may or may not come -- even multiple!
+          if @gateways=={}
+            sleep 5
+          else
+            #pp @gateways
+            sleep 30
+          end
+        end
+      end
+      Thread.new do
+        while true do
+          if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket]
+          else # not so ok -- pick one!
+            pick_new_gateway 
+          end
+          sleep 0.01
+        end
+      end
     end
     while true do
       begin
@@ -796,24 +900,6 @@ class MqttSN
     end
   end
 
-  def log_empty?
-    @log_q.empty? or not @verbose
-  end
 
-  def log_thread 
-    while true do
-      begin
-        if not @log_q.empty?
-          l=@log_q.pop
-          puts l
-        else
-          sleep 0.01
-        end
-      rescue => e
-        puts "Error: receive thread died: #{e}"
-        pp e.backtrace
-      end
-    end
-  end
 
 end

metadata

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