mqtt-sn-ruby 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f119c9d985366ec62ccc92ca76ea7e6d09352df5
-  data.tar.gz: 36fe4d9e280f102cf4d3e61064e486c1a456a97e
+  metadata.gz: 1ec6573a2dc9ed720a687b3219498d0846a6d2c4
+  data.tar.gz: 2e847e9b73f0066b6dca9b7cd9ca63316232a8f9
 SHA512:
-  metadata.gz: b72dc48535dae5f64d3895dcb3a6f4f9721dcd80574f97fe60792dc010ecdb29ee7203ff9cef082e49792af90094586937129773d17b0dec17e25d4d0f910df1
-  data.tar.gz: ad32035222b72f7d4e4d6d6b3db53d79d5ca20253de84162b55a397efcbb878dc6d887fe5916db5291a33a169e918c1a09f6095132c103687cb7a0770c3f8da2
+  metadata.gz: afb381b554159602a31c03931b187aee6395a72e8e73c36f47501af7a1e6147e24ac0527e2cf242c758bab6f028766ba72f4cb36ea87d01fbd1fae2435ab294b
+  data.tar.gz: c067c54a08074a8d11ee6c506c4b73d14e65443868fa07683f0fa6dbd6af946b36ee1035e92be643801e9388ff0a9fd940e62e15e5a849cbf853e12cde1e5f05

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

@@ -49,17 +49,20 @@ update_status = (data) ->
   $(".info").html("State: #{data.state}, gw: #{data.active_gw_id}, app: #{data.options.app_name}, ")
   
 
-xxx = () ->
+@ajax = (obj) ->
+  console.log "doin ajax"
+  form=$(obj).closest("form")
+  key=form.attr('id')
+  q=$( form ).serialize()
+  console.log q
   $.ajax
-    url: "/gateways.json"
+    url: "/action.json?#{q}"
     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

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

@@ -9,6 +9,18 @@
   %body
     %h1 MQTT-SN-SUB Subscriber Utility
     %p.info ?
+    %form{ onsubmit: "ajax(this); return(false);"}
+      Msg:
+      %input{name: "msg", size: 20}
+      Topic:
+      %input{name: "topic", size: 10}
+      QoS:
+      %select.qos{name: "qos"}
+        %option{value: "0"} 0
+        %option{value: "1"} 1
+        %option{value: "2"} 2
+      %button{value: "Publish", onclick: "ajax(this); return(false);"}
+        Publish
     %hr
     %p Gateways:
     %p.data 

data/http/json/action.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# encode: UTF-8
+
+
+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"
+  data={jee: 123}
+  return ["text/json",data]
+end

data/http/json/gateways.rb

@@ -3,13 +3,16 @@
 
 
 
-def json_gateways request,session,event
+def json_gateways request,args,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
+    if size-@http_sessions[session][:log_pos]>30
+      @http_sessions[session][:log_pos]=size-30
+    end
     loglines=$sn.http_log[@http_sessions[session][:log_pos],size-@http_sessions[session][:log_pos]]
     @http_sessions[session][:log_pos]=size
   else

data/lib/mqtt-sn-http.rb

@@ -7,7 +7,8 @@ require "coffee-script"
 def http_server options
   prev_t={}
   #@http_log=[]
-  puts "Starting HTTP services at port #{options[:http_port]}"
+  ports=Socket.getifaddrs.map { |i| i.addr.ip_address if i.addr.ipv4? }.compact
+  puts "Starting HTTP services at port #{options[:http_port]}, server IPs: #{ports}"
   if File.directory? './http'
     $http_dir="http/"
   else
@@ -26,8 +27,18 @@ def http_server options
           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}"
+          req,argss=req.split "\?"
+          puts "req: #{req}, agss:#{argss}"
+          args={}
+          if argss
+            argss.split("&").each do |a|
+              if a
+                k,v=URI.decode(a).force_encoding("UTF-8").split "="
+                args[k]=v
+              end
+            end
+          end
+          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
@@ -57,16 +68,17 @@ 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} request,0,0"  #event handlers get called with zero session => init :)
-                response=response.to_json
+                type,response=eval "json_#{act} req,args,0,0"  #event handlers get called with zero session => init :)
               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
+              response=response.to_json
+             end
           elsif req[/\.css$/] and File.file?(fnc="#{$http_dir}css#{req}")
             type="text/css"
             contents = File.read(fnc)
@@ -94,7 +106,7 @@ def http_server options
               my_event=0
               loop do
                 begin
-                  type,response=eval "json_#{act} request,my_session,my_event"
+                  type,response=eval "json_#{act} request,args,my_session,my_event"
                   my_event+=1
                 rescue => e
                   puts "**** AJAX EXEC #{fn} failed:  #{e}"

data/lib/mqtt-sn-ruby.rb

@@ -69,13 +69,17 @@ class MqttSN
   end
 
   def note str,*args
-    s=sprintf(str,*args)
-    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}
+    begin
+      s=sprintf(str,*args)
+      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
+    rescue => e
+      pp e.backtrace
+      puts "note dies: #{e} '#{str}'"
     end
- 
   end
 
   def log_empty?
@@ -170,6 +174,8 @@ class MqttSN
       @will_msg=nil
       @active_gw_id=nil
       @http_log=[]
+      @local_ifs=Socket.getifaddrs.map { |i| i.addr.ip_address if i.addr.ipv4? }.compact
+
 
       @sem=Mutex.new 
       @gsem=Mutex.new 
@@ -211,8 +217,8 @@ class MqttSN
       end
       if @forwarder
         @s,@server,@port = MqttSN::open_port @server_uri
-        note "Open port to Gateway: #{@server_uri}: #{@server},#{@port} -- Listening local port: #{@local_port}"
-        @local_port=hash[:local_port]||1883
+        @local_port=hash[:local_port]||1882
+        note "Open port to Gateway: #{@server_uri}: #{@server},#{@port} -- Listening local port: #{@local_port} @ IPs: #{@local_ifs}"
         @s.bind("0.0.0.0",@local_port)
         @bcast_period=60
       else
@@ -283,10 +289,14 @@ class MqttSN
         sbytes=@clients[key][:socket].send(r, 0, @server, @port) # to rsmb -- ok as is
         _,port,_,_ = @clients[key][:socket].addr
         dest="#{@server}:#{port}"
-        if @active_gw_id
-          logger "cs %-24.24s -> %-24.24s | %s", @clients[key][:uri],@gateways[@active_gw_id][:uri],m.to_json
-        else
-          logger "cs %-24.24s -> %-24.24s | %s", @clients[key][:uri],"??",m.to_json
+        begin 
+          if @active_gw_id
+            logger "cs %-24.24s -> %-24.24s | %s", @clients[key][:uri],@gateways[@active_gw_id][:uri],m.to_json
+          else
+            logger "cs %-24.24s -> %-24.24s | %s", @clients[key][:uri],"??",m.to_json
+          end
+        rescue Exception =>e
+          puts "logging fails #{e}"
         end
        end
     end
@@ -324,7 +334,6 @@ class MqttSN
   end
 
   def send type,hash={},&block
-    #puts ""  if @verbose
     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
@@ -429,7 +438,7 @@ class MqttSN
       end
       p=[PUBLISH_TYPE,flags,hash[:topic_id] >>8 ,hash[:topic_id] & 0xff,@msg_id >>8 ,@msg_id & 0xff]
       hash[:msg].each_byte do |b|
-        p<<b
+        p<<b.ord
       end
       @msg_id+=1
     when :pubrel 
@@ -573,7 +582,7 @@ class MqttSN
         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
+        logger "od %-24.24s <- %-24.24s | %s",@gateways[@active_gw_id][:uri],src,MqttSN::parse_message(msg).merge(debug).to_json  ###utf-8
       end
     end
     if not ok
@@ -793,7 +802,7 @@ class MqttSN
     when PUBLISH_TYPE
       topic_id=(r[3].ord<<8)+r[4].ord
       msg_id=(r[5].ord<<8)+r[6].ord
-      msg=r[7,len-7]
+      msg=r[7,len-7].force_encoding("UTF-8")
       flags=r[2].ord
       topic_type=:long
       topic=""

metadata

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