mqtt-sn-ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 039a346b9a168561fb786790f130fae2e62ed049
-  data.tar.gz: 92ee170999744efabe899e8e9c8c23e650c1ca7c
+  metadata.gz: 1ae50f9d0024bbb67caaa79b891a922b7aaa321c
+  data.tar.gz: 504162553c549334abeed8b5049efc62c1ceeb06
 SHA512:
-  metadata.gz: fc9ced0a03a300d6a1254506f8eeea48aebc2f46fe54519752b4dd365b34be43dbefece49fe0c0ad14afe7ce55f95be33236f85d70fb2dc9f5ef7db8271c1248
-  data.tar.gz: c45cc715e4ca498be66eeeb1bde3eae033b0db55ac8c6c6b4d003b2ee08c62f82077632443c24a1836ae6fc1ea27531b31a202da4ebbe6ca0c7f4396ab68a7bb
+  metadata.gz: af7aae3fa39905eb1a80f0eed6b925d21fa4155ab7f13bd0abd5ff208998b6381a7137dcfbda86516e0e1c9704d6434c179e15f187c1099b3d9a620b8c527e54
+  data.tar.gz: 0b12a0b5c46530691cdede75bd99f34df4bdc9ddf196434de031a955d98780426aead098b8c3a7eee7bce4e19934da0f957169f53edbe4816fd31e94fa89c1c4

data/bin/mqtt-sn-pub.rb

@@ -25,6 +25,10 @@ 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
+  options[:broadcast_uri] = "udp://225.4.5.6:5000"
+  opts.on("-b", "--[no-]broadcast uri", "Multicast URI for Autodiscovery: ADVERTISE, SEARCHGW and GWINFO (udp://225.4.5.6:5000)") do |v|
+    options[:broadcast_uri] = v
+  end
   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
@@ -46,10 +50,12 @@ begin
   sn.pub options
 rescue SystemExit, Interrupt
   puts "\nExiting after Disconnect\n"
-rescue => e
+rescue Exception => e
   puts "\nError: '#{e}' -- Quit after Disconnect\n"
   e.backtrace
 end
-sn.disconnect if sn
+sn.disconnect if sn 
+
+sn.log_flush
 
 puts "MQTT-SN-PUB Done."

data/bin/mqtt-sn-sub.rb

@@ -5,6 +5,7 @@ require "pp"
 require 'socket'
 require 'json'
 require 'optparse'
+
 if File.file? './lib/mqtt-sn-ruby.rb'
   require './lib/mqtt-sn-ruby.rb'
   puts "using local lib"
@@ -12,9 +13,9 @@ else
   require 'mqtt-sn-ruby'
 end
 
-options = {}
+options = {app_name: "mqtt-sn-sub"}
 OptionParser.new do |opts|
-  opts.banner = "Usage: mqtt-sn-sub.rb [options]"
+  opts.banner = "Usage: #{options[:app_name]}.rb [options]"
 
   opts.on("-v", "--[no-]verbose", "Run verbosely; creates protocol log on console (false)") do |v|
     options[:verbose] = v
@@ -50,34 +51,13 @@ 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",$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"
-        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
+  if File.file? './lib/mqtt-sn-ruby.rb'
+    require './lib/mqtt-sn-http.rb'
+    puts "using local http lib"
+  else
+    require 'mqtt-sn-http'
   end
+  http_server options
 end
 
 puts "MQTT-SN-SUB: #{options.to_json}"

data/c/mqtt-sn-pub.c

@@ -27,7 +27,7 @@ int main(int argc, char**argv)
 {
    if (argc != 5)
    {
-      printf("usage: pub Ip Port Topic Msg \n");
+      printf("usage: mqtt-sn-pub Ip Port Topic Msg \n");
       exit(1);
    }
    MqttSN_open_socket(argv[1],atoi(argv[2]));

data/http/coffee/mqtt-sn-sub.coffee

@@ -0,0 +1,78 @@
+
+now=0
+
+update_status = (data) ->
+  #console.log data
+  now=data.now
+  html="<table><tr><th>gw_id</th><th>uri</th><th>source</th><th>stamp</th><th>last_use</th><th>last_ping</th><th>last_send</th><th>counter_send</th><th>last_recv</th><th>counter_recv</th></tr>"
+  for k,v of data.gateways
+    k=parseInt(k,10)
+    col="white"
+    if data.active_gw_id== k
+      col="#d0ffd0" 
+    html+="<tr bgcolor='#{col}'>"
+    html+="<td>#{k}</td>"
+    html+="<td>#{v.uri}</td>"
+    html+="<td>#{v.source}</td>"
+    html+="<td>#{now-v.stamp}</td>"
+    if v.last_use
+      html+="<td>#{now-v.last_use}</td>"
+    else
+      html+="<td></td>"
+    if v.last_ping
+      html+="<td>#{now-v.last_ping}</td>"
+    else
+      html+="<td></td>"
+      
+    if v.last_send
+      html+="<td>#{now-v.last_send}</td>"
+    else
+      html+="<td></td>"
+    html+="<td>#{v.counter_send}</td>"
+
+    if v.last_recv
+      html+="<td>#{now-v.last_recv}</td>"
+    else
+      html+="<td></td>"
+    html+="<td>#{v.counter_recv}</td>"
+    html+="</tr>"
+
+  html+="</table>"
+  #console.log html
+  $(".data").html(html)
+  $(".state").html(data.state)
+  $(".active_gw_id").html(data.active_gw_id)
+
+
+xxx = () ->
+  $.ajax
+    url: "/gateways.json"
+    type: "GET"
+    data: "123"
+    processData: false
+    contentType: false
+    success: (data) ->
+      console.log "ajax returns: ", data
+      $(".data").html(html)
+
+      return
+    error: (xhr, ajaxOptions, thrownError) ->
+      alert thrownError
+      return
+
+
+$ ->
+  console.log "tadaa"
+  #update_gw()
+  #setInterval(->
+  #  update_gw()
+  #  return
+  #, 200000)
+  stream = new EventSource("/gateways.json")
+  stream.addEventListener "message", (event) ->
+    update_status($.parseJSON(event.data))
+    return
+  
+
+
+  

data/http/coffee/mqtt-sn.coffee

@@ -0,0 +1 @@
+

data/http/haml/mqtt-sn-sub.haml

@@ -0,0 +1,30 @@
+%html{lang: "fi"}
+  %head
+    %title MQTT-SN-RUBY Subscribe Utility
+    %meta{:charset => "utf-8"}/
+    %link{:href => "/mqtt-sn.css", :rel => "stylesheet", :type => "text/css"}
+    %script{:src => "https://code.jquery.com/jquery-2.1.1.min.js"}
+    %script{:src => "/mqtt-sn.js"}
+    %script{:src => "/mqtt-sn-sub.js"}
+  %body
+    %h1 MQTT-SN-SUB Subscriber Utility
+    %p
+      State:
+      %span.state 
+        ?
+      , Current GW:
+      %span.active_gw_id 
+        ?
+    %hr
+    %p Gateways:
+    %p.data datat tähän
+    %hr
+    %p Clients:
+    %p.data datat tähän
+    %hr
+    %p
+      %font{size: "-1"}
+        Written by
+        %a{href: "mailto:jalopuuverstas@gmail.com"}
+          Ari Siitonen 
+        2014 

data/http/json/clients.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# encode: UTF-8
+
+def json_clients request
+  dd
+  return $sn.clients.to_json
+end 

data/http/json/gateways.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encode: UTF-8
+$jes=123
+def json_gateways request
+  #puts "json_gateways!"
+  $jes+=1
+  data={
+    now:Time.now.to_i,
+    jes: $jes,
+    gateways: $sn.gateways,
+    state: $sn.state,
+    active_gw_id: $sn.active_gw_id,
+  }
+  #pp data
+  return ["text/event-stream",data]
+end 

data/lib/mqtt-sn-http.rb

@@ -0,0 +1,116 @@
+#!/usr/bin/env ruby
+# encode: UTF-8
+
+require "haml"
+require "coffee-script"
+
+def http_server options
+  prev_t={}
+  puts "Starting HTTP services at port #{options[:http_port]}"
+  $http_dir="http/"
+
+  Thread.new(options[:http_port],options[:app_name]) do |http_port,http_app|
+    server = TCPServer.new("0.0.0.0",http_port)
+    loop do
+      Thread.start(server.accept) do |client|
+        begin
+          request = client.gets.split " "
+          status="200 OK"
+          type="text/html"
+          req=request[1]
+          req="/#{http_app}.html" if req=="/" or req=="/index.htm" or req=="/index.html"
+          req,args=req.split "\?"
+          #puts "req: #{req}"
+          if req[/\.html$/] and File.file?(fn="#{$http_dir}haml#{req.gsub('.html','.haml')}")
+            contents = File.read(fn)
+            response=Haml::Engine.new(contents).render
+          elsif req[/\.js$/] and File.file?(fn="#{$http_dir}coffee#{req.gsub('.js','.coffee')}")
+            type="application/javascript"
+            contents = File.read(fn)
+            begin
+              response=CoffeeScript.compile contents
+            rescue => e
+              response="Coffee Compile error: #{e}"
+            end
+          elsif req[/^\/(.+)\.json$/] and File.file?(fn="#{$http_dir}json#{req.gsub('.json','.rb')}")
+            req[/\/(.+).json$/] 
+            act=$1
+            #puts "act:#{act} args:#{args}"
+            t=File.mtime(fn)
+            if not prev_t[fn] or prev_t[fn]<t
+              begin
+                load_ok=load fn
+                prev_t[fn]=t
+              rescue Exception => e
+                puts "**** RELOAD #{fn} failed:  #{e}"
+                pp e.backtrace
+                response=[{act: :error, msg:"Error loading JSON",alert: "Load error #{e} in #{fn}"}].to_json
+                type="text/json"
+                status="404 Not Found"
+              end
+            end
+            if type!="text/event-stream" and status=="200 OK"
+              begin
+                type,response=eval "json_#{act} request"
+                response=response.to_json
+              rescue => e
+                puts "**** AJAX EXEC #{fn} failed:  #{e}"
+                pp e.backtrace
+                response=[{act: :error, msg:"Error executing JSON",alert: "Syntax error '#{e}' in '#{fn}'"}].to_json
+                type="text/json"
+              end
+            end
+          elsif req[/\.css$/] and File.file?(fnc="#{$http_dir}css#{req}")
+            type="text/css"
+            contents = File.read(fnc)
+            response=contents
+          else
+            status="404 Not Found"
+            response="Not Found: #{request[1]}"
+          end
+          client.print "HTTP/1.1 #{status}\r\n" +
+                 "Content-Type: #{type}\r\n"
+          if type!="text/event-stream"
+            client.print "Content-Length: #{response.bytesize}\r\n"
+            client.print "Connection: close\r\n"
+            client.print "\r\n"
+            client.print response 
+          else
+            client.print "Expires: -1\r\n"
+            #client.print "\r\n"
+            cnt=0
+            begin
+              loop do
+                begin
+                  type,response=eval "json_#{act} request"
+                  cnt+=1
+                rescue => e
+                  puts "**** AJAX EXEC #{fn} failed:  #{e}"
+                  puts "#{e.backtrace[0..2]}"
+                  pp e.backtrace
+                  response=[{act: :error, msg:"Error executing JSON",alert: "Syntax error '#{e}' in '#{fn}'"}].to_json
+                end 
+                if not response or response==[] or response=={}
+                else
+                  client.print  "retry: 1000\n"
+                  client.print  "data: #{response.to_json}\n\n"
+                end
+                sleep 1
+                break if cnt>10 
+              end
+            rescue => e
+              puts "stream #{client} died #{e}"
+            end
+
+          end
+          client.close
+        rescue Exception =>e
+          puts "http thread died #{e}"
+          pp e.backtrace
+          client.print "Error #{e}"
+          client.close
+        end
+      end
+    end
+  end
+end

data/lib/mqtt-sn-ruby.rb

@@ -14,7 +14,6 @@ class MqttSN
   Nretry = 3  # Max retry
   Tretry = 3 # Timeout before retry 
 
-  # :stopdoc:
   SEARCHGW_TYPE  =0x01
   GWINFO_TYPE    =0x02
   ADVERTISE_TYPE =0x03
@@ -131,13 +130,28 @@ class MqttSN
 
   attr_accessor :clients
   attr_accessor :gateways
+  attr_accessor :state
+  attr_accessor :active_gw_id
+
+  def add_gateway gw_id,hash
+    if not @gateways[gw_id]
+       @gateways[gw_id]={stamp: Time.now.to_i, status: :ok, last_use: 0,last_ping: 0,counter_send:0, last_send: 0,counter_recv:0, last_recv: 0}.merge(hash)
+    else
+      if @gateways[gw_id][:uri]!=hash[:uri]
+        note "conflict -- gateway has moved? or duplicate"
+      else
+        @gateways[gw_id][:stamp]=Time.now.to_i
+        @gateways[gw_id]=@gateways[gw_id].merge hash
+      end
+    end
+  end
 
   def initialize(hash={})
       @options=hash #save these
       @server_uri=hash[:server_uri]
       @debug=hash[:debug]
       @verbose=hash[:verbose]
-      @state=:inited
+      @state=:disconnected
       @bcast_port=5000
       @keepalive=(hash[:keepalive]||25).to_i
       @forwarder=hash[:forwarder] #flag to indicate forward mode 
@@ -156,13 +170,13 @@ class MqttSN
 
       if @server_uri
         note "Using Default Gateway: #{@server_uri}"
-        @gateways[0]={stamp: Time.now.to_i,uri: @server_uri, duration: 0, source: 'default', status: :ok}
+        add_gateway(0,{uri: @server_uri,source: "default"})
         pick_new_gateway 
       elsif @broadcast_uri
         note "Autodiscovery Active, using #{@broadcast_uri}"
         @autodiscovery=true
       else
-        note "No autodiscovery and no Default Gateway -- cannot proceed"
+        puts "No autodiscovery and no Default Gateway -- cannot proceed"
         exit -1
       end
 
@@ -299,7 +313,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  and type!=:searchgw 
+    if @state==:disconnected and type!=:connect and type!=:will_topic  and type!=:will_msg  and type!=:searchgw 
       if type==:disconnect
         return #already disconnected.. nothing to do
       elsif type==:publish and hash[:qos]==-1
@@ -535,17 +549,22 @@ class MqttSN
         end
       end
       note "Gw Ok!"  
-    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 "od %-24.24s <- %-24.24s | %s",@gateways[@active_gw_id][:uri],src,MqttSN::parse_message(msg).merge(debug).to_json
-    else
+    end
+    ok=false  
+    @gsem.synchronize do
+      if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket] 
+        ok=true
+        @gateways[@active_gw_id][:last_send]=Time.now.to_i
+        @gateways[@active_gw_id][:counter_send]+=1
+        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 "od %-24.24s <- %-24.24s | %s",@gateways[@active_gw_id][:uri],src,MqttSN::parse_message(msg).merge(debug).to_json
+      end
+    end
+    if not ok
       puts "no gw to send.."
       sleep 1
     end
@@ -576,7 +595,7 @@ class MqttSN
   end
   
   def will_and_testament topic,msg
-    if @state==:connected #if already connected, send changes, otherwise wait until connect does it.
+    if @state!=:disconnected #if already connected, send changes, otherwise wait until connect does it.
       if @will_topic!=topic
         send :will_topic_upd, topic: topic, expect: :will_topic_resp do |status,message|
           puts "will topic updated"
@@ -652,7 +671,7 @@ class MqttSN
             block.call :got_data,m
           end
           sleep 0.1
-          if @state!=:connected
+          if @state==:disconnected
             block.call :disconnect,{}
             #gateway_close :subscribe_disconnected
             break
@@ -860,6 +879,14 @@ class MqttSN
       end
     when :connect_ack
       @state=:connected
+    when :sub_ack
+      @state=:subscribed
+    when :pong
+      @gsem.synchronize do #one command at a time -- 
+        if @active_gw_id and @gateways[@active_gw_id] 
+          @gateways[@active_gw_id][:last_ping]=Time.now.to_i
+        end
+      end
     when :searchgw
       done=true
     when :advertise
@@ -878,7 +905,7 @@ class MqttSN
     Thread.new do #ping thread
       while true do
         begin
-          while @state!=:connected 
+          while @state==:disconnected 
             sleep 1
           end
           sleep @keepalive
@@ -901,21 +928,24 @@ class MqttSN
     Thread.new do #work thread
       while true do
         begin
-          if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket] #if we are connected...
-            if pac=MqttSN::poll_packet(@gateways[@active_gw_id][:socket]) #cannot block -- gateway may change...
-              r,client_ip,client_port=pac 
-              m=MqttSN::parse_message r
-              if @debug and m
-                m[:debug]=MqttSN::hexdump r
+          do_sleep=true
+            if @active_gw_id and @gateways[@active_gw_id] and @gateways[@active_gw_id][:socket] #if we are connected...
+              if pac=MqttSN::poll_packet(@gateways[@active_gw_id][:socket]) #cannot block -- gateway may change...
+                r,client_ip,client_port=pac 
+                m=MqttSN::parse_message r
+                if @debug and m
+                  m[:debug]=MqttSN::hexdump r
+                end
+                _,port,_,_= @gateways[@active_gw_id][:socket].addr
+                src="udp://0.0.0.0:#{port}"
+                logger "id %-24.24s -> %-24.24s | %s",@gateways[@active_gw_id][:uri],src,m.to_json
+                process_message m
+                do_sleep=false
+                @gateways[@active_gw_id][:last_recv]=Time.now.to_i
+                @gateways[@active_gw_id][:counter_recv]+=1
               end
-              _,port,_,_= @gateways[@active_gw_id][:socket].addr
-              src="udp://0.0.0.0:#{port}"
-              logger "id %-24.24s -> %-24.24s | %s",@gateways[@active_gw_id][:uri],src,m.to_json
-              process_message m
-            else
-              sleep 0.01
             end
-          else
+          if do_sleep
             sleep 0.01
           end
         rescue => e
@@ -938,17 +968,7 @@ class MqttSN
       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, last_use: 0}
-      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
+      add_gateway(gw_id,{uri: uri, source: m[:type], duration:duration,stamp: Time.now.to_i})
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ari Siitonen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies: []
 description: Ruby toolkit for MQTT-SN, compatible with RSMB, command line tools and
   API
@@ -28,6 +28,13 @@ files:
 - c/mqtt-sn.h
 - examples/recv.rb
 - examples/send.rb
+- http/coffee/mqtt-sn-sub.coffee
+- http/coffee/mqtt-sn.coffee
+- http/css/mqtt-sn.css
+- http/haml/mqtt-sn-sub.haml
+- http/json/clients.rb
+- http/json/gateways.rb
+- lib/mqtt-sn-http.rb
 - lib/mqtt-sn-ruby.rb
 homepage: https://github.com/arisi/mqtt-sn-ruby
 licenses: