mqtt-sn-ruby 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec6573a2dc9ed720a687b3219498d0846a6d2c4
-  data.tar.gz: 2e847e9b73f0066b6dca9b7cd9ca63316232a8f9
+  metadata.gz: fc76cd166972276f880d322760d35adc7720eaa1
+  data.tar.gz: 2b0f87f21f19caf3e896ab35127a8f88d89aa756
 SHA512:
-  metadata.gz: afb381b554159602a31c03931b187aee6395a72e8e73c36f47501af7a1e6147e24ac0527e2cf242c758bab6f028766ba72f4cb36ea87d01fbd1fae2435ab294b
-  data.tar.gz: c067c54a08074a8d11ee6c506c4b73d14e65443868fa07683f0fa6dbd6af946b36ee1035e92be643801e9388ff0a9fd940e62e15e5a849cbf853e12cde1e5f05
+  metadata.gz: ab598d395528d9cce9126daf3238562be93decda49a6bb2afc8929262a43132d055927c170fa5be9a650ae9d5262217e17f906ef370a7a6b53a5afcccef9f6bd
+  data.tar.gz: 9ac8e5e7bfb3b9c8c8dcc26df8c6432b176a986f77c022a1b7861eb5ddc1020f0bdc31b34972d15107aefd2edc2b4eae27c18c621c29f6eaa79d424a804dcaa2

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

@@ -3,9 +3,35 @@ now=0
 
 update_status = (data) ->
   console.log data.jes
-  console.log data.loglines
+  console.log data.clients
   #console.log data.logpos
   now=data.now
+  html="<table><tr><th>uri</th><th>state</th><th>stamp</th><th>last_send</th><th>counter_send</th><th>last_recv</th><th>counter_recv</th></tr>"
+  for k,v of data.clients
+    html+="<tr>"
+    html+="<td>#{k}</td>"
+    html+="<td>#{v.state}</td>"
+    html+="<td>#{now-v.stamp}</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
+  $(".clients").html(html)
+    
   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)

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

@@ -19,6 +19,8 @@
         %option{value: "0"} 0
         %option{value: "1"} 1
         %option{value: "2"} 2
+      Retain:
+      %input{type: :checkbox,name: "retain", value: "true"}
       %button{value: "Publish", onclick: "ajax(this); return(false);"}
         Publish
     %hr

data/http/json/action.rb

@@ -4,14 +4,18 @@
 
 def json_action request,args,session,event
   #$sn.pub msg: "jees123", server_uri: "udp://20.20.20.21:1882"
-  puts "agrs:#{args}"
   topic="top"
   msg=args['msg']||"test_message"
   topic=args['topic']||"XX"
   qos=(args['qos']||0).to_i
-  puts "1"
-  $sn.publish topic, msg, qos: qos
-  puts "2"
+  if args['retain']=="true"
+    retain=true
+  else
+    retail=nil
+  end
+  pp args
+  pp retain
+  $sn.publish topic, msg, qos: qos, retain: retain
   data={jee: 123}
   return ["text/json",data]
 end

data/http/json/gateways.rb

@@ -23,6 +23,7 @@ def json_gateways request,args,session,event
     now:Time.now.to_i,
     jes: [session,event],
     gateways: $sn.gateways,
+    clients: $sn.clients,
     state: $sn.state,
     active_gw_id: $sn.active_gw_id,
     options: $sn.options, 

data/lib/mqtt-sn-http.rb

@@ -28,7 +28,7 @@ def http_server options
           req=request[1]
           req="/#{http_app}.html" if req=="/" or req=="/index.htm" or req=="/index.html"
           req,argss=req.split "\?"
-          puts "req: #{req}, agss:#{argss}"
+          #puts "req: #{req}, agss:#{argss}"
           args={}
           if argss
             argss.split("&").each do |a|
@@ -38,7 +38,7 @@ def http_server options
               end
             end
           end
-          puts "req: #{req}, args:#{args}"
+          #puts "req: #{req}, args:#{args}"
           if req[/\.html$/] and File.file?(fn="#{$http_dir}haml#{req.gsub('.html','.haml')}")
             contents = File.read(fn)
             response=Haml::Engine.new(contents).render
@@ -68,7 +68,6 @@ def http_server options
               end
             end
             if type!="text/event-stream" and status=="200 OK"
-              puts  "json_#{act} request,args,0,0   '#{req},#{args}'" 
               begin
                 type,response=eval "json_#{act} req,args,0,0"  #event handlers get called with zero session => init :)
               rescue => e

data/lib/mqtt-sn-ruby.rb

@@ -256,7 +256,7 @@ class MqttSN
         key="#{client_ip}:#{client_port}"
         if not @clients[key]
           uri="udp://#{client_ip}:#{client_port}"
-          @clients[key]={ip:client_ip, port:client_port, socket: UDPSocket.new, uri: uri, state: :active  }
+          @clients[key]={ip:client_ip, port:client_port, socket: UDPSocket.new, uri: uri, state: :active, counter_send:0, last_send:0 , counter_recv:0, last_recv:0}
           c=@clients[key]
           puts "thread start for #{key}"
           @clients[key][:thread]=Thread.new(key) do |my_key|
@@ -268,6 +268,11 @@ class MqttSN
               _,port,_,_ = @clients[my_key][:socket].addr
               dest="#{@server}:#{port}"
               logger "sc %-24.24s <- %-24.24s | %s",@clients[my_key][:uri],@gateways[@active_gw_id][:uri],mm.to_json
+              @gateways[@active_gw_id][:last_recv]=Time.now.to_i
+              @gateways[@active_gw_id][:counter_recv]+=1
+              @clients[my_key][:last_send]=Time.now.to_i
+              @clients[my_key][:counter_send]+=1
+
               case mm[:type]
               when :disconnect
                 @clients[my_key][:state]=:disconnected
@@ -289,6 +294,10 @@ class MqttSN
         sbytes=@clients[key][:socket].send(r, 0, @server, @port) # to rsmb -- ok as is
         _,port,_,_ = @clients[key][:socket].addr
         dest="#{@server}:#{port}"
+        @gateways[@active_gw_id][:last_send]=Time.now.to_i
+        @gateways[@active_gw_id][:counter_send]+=1
+        @clients[key][:last_recv]=Time.now.to_i
+        @clients[key][:counter_recv]+=1
         begin 
           if @active_gw_id
             logger "cs %-24.24s -> %-24.24s | %s", @clients[key][:uri],@gateways[@active_gw_id][:uri],m.to_json
@@ -815,7 +824,8 @@ class MqttSN
       end
       qos=(flags>>5)&0x03
       qos=-1 if qos==3
-      m={type: :publish, qos: qos, topic_id: topic_id, topic_type:topic_type, topic: topic, msg_id: msg_id, msg: msg,status: :ok}
+      m={type: :publish, qos: qos, topic_id: topic_id, topic_type:topic_type, topic: topic, msg_id: msg_id, msg: msg,flags: flags, status: :ok}
+      m[:retain]=true if flags & RETAIN_FLAG == RETAIN_FLAG        
     when PUBREL_TYPE
       msg_id=(r[2].ord<<8)+r[3].ord
       m={type: :pub_rel, msg_id: msg_id, status: :ok}

metadata

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