mqtt-sn-ruby 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a492971db9c5de09281233ae0e40ea59b6f7c32
-  data.tar.gz: 28f49ddd567b034cf679df6d012e04f20b427179
+  metadata.gz: f119c9d985366ec62ccc92ca76ea7e6d09352df5
+  data.tar.gz: 36fe4d9e280f102cf4d3e61064e486c1a456a97e
 SHA512:
-  metadata.gz: a4921bad44881387bb787f2fcd588b3b9596e1f59d402f264d47ae44fa97a24c3e35703a74cbe6d3cee328257be80c05f4f34726d84a7ebb493d90894c75b2ec
-  data.tar.gz: a0e56d2e0621d354e9f29d36e92d94be56abecac22d155834d38f8550ec06437e2450a75c9d6fd12d4609b3841230fe057b525e21fb96834b4a2552c299381eb
+  metadata.gz: b72dc48535dae5f64d3895dcb3a6f4f9721dcd80574f97fe60792dc010ecdb29ee7203ff9cef082e49792af90094586937129773d17b0dec17e25d4d0f910df1
+  data.tar.gz: ad32035222b72f7d4e4d6d6b3db53d79d5ca20253de84162b55a397efcbb878dc6d887fe5916db5291a33a169e918c1a09f6095132c103687cb7a0770c3f8da2

data/bin/mqtt-sn-forwarder.rb

@@ -14,14 +14,15 @@ else
   require 'mqtt-sn-ruby'
 end
 
-options = {forwarder: true}
+options = {forwarder: true,app_name: "mqtt-sn-forwarder"}
 OptionParser.new do |opts|
   opts.banner = "Usage: mqtt-sn-sub.rb [options]"
 
-  opts.on("-v", "--[no-]verbose", "Run verbosely (false)") do |v|
+ 
+  opts.on("-v", "--[no-]verbose", "Run verbosely; creates protocol log on console (false)") do |v|
     options[:verbose] = v
   end
-  opts.on("-d", "--[no-]debug", "Produce Debug dump on console (false)") do |v|
+  opts.on("-d", "--[no-]debug", "Produce Debug dump on verbose log (false)") do |v|
     options[:debug] = v
   end
   options[:server_uri] = "udp://localhost:1883"
@@ -46,38 +47,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"
-        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
+  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-FORWARDER: #{options.to_json}"

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

@@ -2,7 +2,9 @@
 now=0
 
 update_status = (data) ->
-  #console.log data
+  console.log data.jes
+  console.log data.loglines
+  #console.log data.logpos
   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
@@ -36,13 +38,16 @@ update_status = (data) ->
       html+="<td></td>"
     html+="<td>#{v.counter_recv}</td>"
     html+="</tr>"
-
+  if data.jes[1]==0
+    $(".log").html("")
+  for l in data.loglines
+    #console.log l
+    $(".log").prepend(l.text+"\n")  
   html+="</table>"
   #console.log html
   $(".data").html(html)
-  $(".state").html(data.state)
-  $(".active_gw_id").html(data.active_gw_id)
-
+  $(".info").html("State: #{data.state}, gw: #{data.active_gw_id}, app: #{data.options.app_name}, ")
+  
 
 xxx = () ->
   $.ajax

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

@@ -0,0 +1,27 @@
+%html{lang: "fi"}
+  %head
+    %title MQTT-SN-RUBY Forwarder 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 Forwarder Utility
+    %p.info ?
+    %hr
+    %p Gateways:
+    %p.data 
+    %hr
+    %p Clients:
+    %p.clients 
+    %hr
+    %p Log:
+    %pre.log 
+    %hr
+    %p
+      %font{size: "-1"}
+        Written by
+        %a{href: "mailto:jalopuuverstas@gmail.com"}
+          Ari Siitonen 
+        2014 

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

@@ -8,19 +8,13 @@
     %script{:src => "/mqtt-sn-sub.js"}
   %body
     %h1 MQTT-SN-SUB Subscriber Utility
-    %p
-      State:
-      %span.state 
-        ?
-      , Current GW:
-      %span.active_gw_id 
-        ?
+    %p.info ?
     %hr
     %p Gateways:
-    %p.data datat tähän
+    %p.data 
     %hr
-    %p Clients:
-    %p.data datat tähän
+    %p Log:
+    %pre.log 
     %hr
     %p
       %font{size: "-1"}

data/http/json/gateways.rb

@@ -1,16 +1,32 @@
 #!/usr/bin/env ruby
 # encode: UTF-8
-$jes=123
-def json_gateways request
-  #puts "json_gateways!"
-  $jes+=1
+
+
+
+def json_gateways request,session,event
+  if not session or session==0
+    return ["text/event-stream",{}]
+  end
+  @http_sessions[session][:log_pos]=0 if not @http_sessions[session][:log_pos]
+  size=$sn.http_log.size
+  if @http_sessions[session][:log_pos]!=size
+    loglines=$sn.http_log[@http_sessions[session][:log_pos],size-@http_sessions[session][:log_pos]]
+    @http_sessions[session][:log_pos]=size
+  else
+    loglines=[]
+  end
+  #puts ">> #{loglines.size} "
   data={
     now:Time.now.to_i,
-    jes: $jes,
+    jes: [session,event],
     gateways: $sn.gateways,
     state: $sn.state,
     active_gw_id: $sn.active_gw_id,
+    options: $sn.options, 
+    logpos: @http_sessions[session][:log_pos],
+    loglines: loglines,
   }
-  #pp data
+  #puts  "#{session}/#{event}: #{@http_sessions[session].to_json}"
+  
   return ["text/event-stream",data]
 end 

data/lib/mqtt-sn-http.rb

@@ -6,6 +6,7 @@ require "coffee-script"
 
 def http_server options
   prev_t={}
+  #@http_log=[]
   puts "Starting HTTP services at port #{options[:http_port]}"
   if File.directory? './http'
     $http_dir="http/"
@@ -15,6 +16,8 @@ def http_server options
 
   Thread.new(options[:http_port],options[:app_name]) do |http_port,http_app|
     server = TCPServer.new("0.0.0.0",http_port)
+    @http_sessions={}
+    http_session_counter=1
     loop do
       Thread.start(server.accept) do |client|
         begin
@@ -55,7 +58,7 @@ def http_server options
             end
             if type!="text/event-stream" and status=="200 OK"
               begin
-                type,response=eval "json_#{act} request"
+                type,response=eval "json_#{act} request,0,0"  #event handlers get called with zero session => init :)
                 response=response.to_json
               rescue => e
                 puts "**** AJAX EXEC #{fn} failed:  #{e}"
@@ -81,13 +84,18 @@ def http_server options
             client.print response 
           else
             client.print "Expires: -1\r\n"
-            #client.print "\r\n"
-            cnt=0
+            client.print "\r\n"
             begin
+              my_session=client.peeraddr[1]
+              if not @http_sessions[my_session]
+                #puts "**************** new port #{my_session}"
+                @http_sessions[my_session]={client_port:client.peeraddr[1],client_ip:client.peeraddr[2] , log_position:0 }
+              end
+              my_event=0
               loop do
                 begin
-                  type,response=eval "json_#{act} request"
-                  cnt+=1
+                  type,response=eval "json_#{act} request,my_session,my_event"
+                  my_event+=1
                 rescue => e
                   puts "**** AJAX EXEC #{fn} failed:  #{e}"
                   puts "#{e.backtrace[0..2]}"
@@ -100,10 +108,11 @@ def http_server options
                   client.print  "data: #{response.to_json}\n\n"
                 end
                 sleep 1
-                break if cnt>10 
+                break if my_event>100
               end
             rescue => e
               puts "stream #{client} died #{e}"
+              pp e.backtrace
             end
 
           end

data/lib/mqtt-sn-ruby.rb

@@ -54,19 +54,28 @@ class MqttSN
 
 
   def logger str,*args
+    s=sprintf(str,*args)
+    if not @forwarder
+      text=sprintf("%s: (%3.3s) | %s",Time.now.iso8601,@active_gw_id,s)
+    else
+      text=sprintf("%s: [%3.3s] | %s",Time.now.iso8601,@options[:gw_id],s)
+    end
     if @verbose or @debug
-      s=sprintf(str,*args)
-      if not @forwarder
-        @log_q << sprintf("%s: (%3.3s) | %s",Time.now.iso8601,@active_gw_id,s)
-      else
-        @log_q << sprintf("%s: [%3.3s] | %s",Time.now.iso8601,@options[:gw_id],s)
-      end
-     end
+      @log_q << text
+    end
+    if @options[:http_port] and @http_log
+      @http_log << {stamp: Time.now.to_i, text: text}
+    end
   end
 
   def note str,*args
     s=sprintf(str,*args)
-    @log_q << sprintf("%s: %s",Time.now.iso8601,s)
+    text=sprintf("%s: %s",Time.now.iso8601,s)
+    @log_q << text
+    if @options[:http_port] and @http_log
+      @http_log << {stamp: Time.now.to_i, text: text}
+    end
+ 
   end
 
   def log_empty?
@@ -131,7 +140,9 @@ class MqttSN
   attr_accessor :clients
   attr_accessor :gateways
   attr_accessor :state
+  attr_accessor :options
   attr_accessor :active_gw_id
+  attr_accessor :http_log
 
   def add_gateway gw_id,hash
     if not @gateways[gw_id]
@@ -158,6 +169,7 @@ class MqttSN
       @will_topic=nil
       @will_msg=nil
       @active_gw_id=nil
+      @http_log=[]
 
       @sem=Mutex.new 
       @gsem=Mutex.new 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ari Siitonen
@@ -31,6 +31,7 @@ files:
 - http/coffee/mqtt-sn-sub.coffee
 - http/coffee/mqtt-sn.coffee
 - http/css/mqtt-sn.css
+- http/haml/mqtt-sn-forwarder.haml
 - http/haml/mqtt-sn-sub.haml
 - http/json/clients.rb
 - http/json/gateways.rb