mqtt-sn-ruby 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d215dd5f4e11c65675f57b7b4cf605f759931f
-  data.tar.gz: 8f9072ae324bd014b1051dc0dc7dddfdecf0e1ac
+  metadata.gz: cad9bc3bc78a80dccac6baba83cb3e634c13e3a9
+  data.tar.gz: 989fdd5fdd51f43bb291740e44368ac411db83d5
 SHA512:
-  metadata.gz: 6bd5a86aecc7bc02622e1e6dd7d36b6e45de68f0c5322d7ed221da3a0d129033b0a34110092ac3d4ed8614a69b658ef466afe4fe237d5a0c3814fd1d3b10b695
-  data.tar.gz: 0bc34db03e72c227dc7faf9e4df00ecd10f8d03cdd6405378938a54a555ff31c4cb893cbfa1da62ac87dd15f3cf82acc3d3b068dd80fdc5a63576a5f68942e4e
+  metadata.gz: cf0299e126aa60c1614be436eac864c2d52519ae07efa38601e41f23b240bb48d99593ccf4e5835b19f5fa5e20467908e6bf91031e62c6d7605abd169f22c149
+  data.tar.gz: ace1150d210c367fefe9a25a71d2d62996b897039c00a48a21edaf804e0d720a9ca7d2c66ad4b0fac0d51e602707dff82dfbaa7476251ec10fba288fce1d552b

data/bin/mqtt-sn-forwarder.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# encode: UTF-8
+
+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"
+else
+  require 'mqtt-sn-ruby'
+end
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: mqtt-sn-sub.rb [options]"
+
+  opts.on("-v", "--[no-]verbose", "Run verbosely (false)") do |v|
+    options[:verbose] = v
+  end
+  opts.on("-d", "--[no-]debug", "Produce Debug dump on console (false)") do |v|
+    options[:debug] = v
+  end
+  opts.on("-h", "--host host", "MQTT-SN Host to connect (localhost)") do |v|
+    options[:server] = v
+  end
+  opts.on("-p", "--port port", "MQTT-SN Port to connect (1883)") do |v|
+    options[:port] = v.to_i
+  end
+end.parse!
+
+puts "MQTT-SN-FORWARDER: #{options.to_json}"
+begin
+  MqttSN.forwarder "20.20.20.21",3333,options
+rescue SystemExit, Interrupt
+  puts "\nExiting after Disconnect\n"
+rescue => e
+  puts "\nError: '#{e}' -- Quit after Disconnect\n"
+end
+
+puts "MQTT-SN-FORWARDER Done."

data/lib/mqtt-sn-ruby.rb

@@ -46,11 +46,13 @@ class MqttSN
   @@msg_id=1
 
   def initialize(hash={})
+      @options=hash #save these
       @server=hash[:server]||"127.0.0.1"
       @port=hash[:port]||1883
       @debug=hash[:debug]
       @verbose=hash[:verbose]
       @state=:inited
+      @forward=hash[:forward] #flag to indicate forward mode 
       @will_topic=nil
       @will_msg=nil
       @id="?"
@@ -87,6 +89,10 @@ class MqttSN
     hexdump msg
   end
 
+  def raw_send_packet msg
+    @s.send(msg, 0, @server, @port)
+  end
+
   def send type,hash={},&block
     puts ""  if @verbose
     if @state!=:connected and type!=:connect and type!=:will_topic  and type!=:will_msg
@@ -214,7 +220,7 @@ class MqttSN
         @iq.clear
       end
       raw=send_packet p
-      hash[:raw]=raw if @debug
+      hash[:debug]=raw if @debug
       puts "send:#{@id} #{type},#{hash.to_json}" if @verbose
       timeout=hash[:timeout]||Tretry
      retries=0
@@ -250,6 +256,54 @@ class MqttSN
 
   end
 
+  def self.forwarder listen_ip,listen_port,hash={}
+    @options=hash #save these
+    @server=hash[:server]||"127.0.0.1"
+    @port=hash[:port]||1883
+    @debug=hash[:debug]
+    @verbose=hash[:verbose]
+
+    socket = UDPSocket.new
+    socket.bind(listen_ip,listen_port)
+    puts "listening #{listen_ip}:#{listen_port}"
+    clients={}
+    begin 
+      while true
+        begin
+          r,stuff=socket.recvfrom_nonblock(200)
+          puts "got packet:"
+          client_ip=stuff[2]
+          client_port=stuff[1]
+          key="#{client_ip}:#{client_port}"
+          if not clients[key]
+            clients[key]={ip:client_ip, port:client_port, socket: UDPSocket.new  }
+          end
+          clients[key][:socket].send(r, 0, @server, @port)
+          #process_message r
+
+        rescue IO::WaitReadable
+        rescue => e
+          puts "Error: receive thread died: #{e}"
+          pp e.backtrace
+        end
+        clients.each do |key,c|
+          begin
+            r,stuff=c[:socket].recvfrom_nonblock(200)
+            puts "got packet from server to client #{key}:"
+            puts "sending to #{c[:ip]}:#{c[:port]}"
+            socket.send(r, 0, c[:ip], c[:port])
+            #process_message r
+          rescue IO::WaitReadable
+          rescue => e
+            puts "Error: receive thread died: #{e}"
+            pp e.backtrace
+          end
+        end
+        sleep 0.01
+      end
+    end
+  end
+
   def will_and_testament topic,msg
     if @state==:connected #if already connected, send changes, otherwise wait until connect does it.
       if @will_topic!=topic
@@ -377,106 +431,119 @@ class MqttSN
     end
   end
 
+  def process_message r
+    m=nil
+    len=r[0].ord
+    case r[len-1].ord
+    when 0x00
+      status=:ok
+    when 0x01
+      status=:rejected_congestion
+    when 0x02
+      status=:rejected_invalid_topic_id
+    when 0x03
+      status=:rejected_not_supported
+    else
+      status=:unknown_error
+    end
+    type_byte=r[1].ord
+    done=false
+    case type_byte
+    when CONNACK_TYPE
+      m={type: :connect_ack,status: status}
+      @state=:connected
+    when SUBACK_TYPE
+      topic_id=(r[3].ord<<8)+r[4].ord
+      msg_id=(r[5].ord<<8)+r[6].ord
+      m={type: :sub_ack, topic_id: topic_id, msg_id: msg_id, status: status}
+    when UNSUBACK_TYPE
+      msg_id=(r[2].ord<<8)+r[3].ord
+      m={type: :unsub_ack, msg_id: msg_id, status: :ok}
+    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]
+      flags=r[2].ord
+      qos=(flags>>5)&0x03
+      topic=@topics.key(topic_id)
+      m={type: :publish, qos: qos, topic_id: topic_id, topic: topic,msg_id: msg_id, msg: msg,status: :ok}
+      @dataq<<m
+      if not @transfer
+        if qos==1 
+          send :publish_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
+        elsif qos==2 
+          send :pub_rec, msg_id: msg_id
+        end
+        done=true
+      end
+    when PUBREL_TYPE
+      msg_id=(r[2].ord<<8)+r[3].ord
+      m={type: :pub_rel, status: :ok}
+      if not @transfer
+        send :pub_comp, msg_id: msg_id
+        done=true
+      end
+    when DISCONNECT_TYPE
+      m={type: :disconnect,status: :ok}
+      @state=:disconnected if not @transfer
+    when REGISTER_TYPE
+      topic_id=(r[2].ord<<8)+r[3].ord
+      msg_id=(r[4].ord<<8)+r[5].ord
+      topic=r[6,len-6]
+      m={type: :register, topic_id: topic_id, msg_id: msg_id, topic: topic,status: :ok}
+      @topics[topic]=m[:topic_id]
+      if not @transfer
+        send :register_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
+        done=true
+      end
+    when REGACK_TYPE
+      topic_id=(r[2].ord<<8)+r[3].ord
+      m={type: :register_ack,topic_id: topic_id,status: status}
+    when PUBREC_TYPE
+      msg_id=(r[2].ord<<8)+r[3].ord
+      m={type: :pubrec,msg_id: msg_id,status: :ok}
+    when PUBACK_TYPE
+      topic_id=(r[2].ord<<8)+r[3].ord
+      msg_id=(r[4].ord<<8)+r[5].ord
+      m={type: :publish_ack,topic_id: topic_id,msg_id: msg_id, status: status}
+    when PUBCOMP_TYPE
+      msg_id=(r[2].ord<<8)+r[3].ord
+      m={type: :pubcomp,status: :ok, msg_id: msg_id}
+
+    when WILLTOPICREQ_TYPE
+      m={type: :will_topic_req, status: :ok}
+    when WILLMSGREQ_TYPE
+      m={type: :will_msg_req, status: :ok}
+
+    when WILLTOPICRESP_TYPE
+      m={type: :will_topic_resp, status: :ok}
+    when WILLMSGRESP_TYPE
+      m={type: :will_msg_resp, status: :ok}
+
+    when PINGRESP_TYPE
+      m={type: :pong, status: :ok}
+    else
+      m={type: :unknown, type_byte: type_byte }
+    end
+    if @debug and m
+      m[:debug]=hexdump r
+    end
+    if @transfer
+      m[:raw]=r
+    end
+    puts "got :#{@id} #{m.to_json}"  if @verbose
+    if not done
+      puts "pushed to q"
+      @iq<<m if m
+    end
+    m
+  end
+
   def recv_thread
     while true do
       begin 
         r,stuff=@s.recvfrom(200) #_nonblock(200)
-        m=nil
-        len=r[0].ord
-        case r[len-1].ord
-        when 0x00
-          status=:ok
-        when 0x01
-          status=:rejected_congestion
-        when 0x02
-          status=:rejected_invalid_topic_id
-        when 0x03
-          status=:rejected_not_supported
-        else
-          status=:unknown_error
-        end
-        type_byte=r[1].ord
-        done=false
-        case type_byte
-        when CONNACK_TYPE
-          m={type: :connect_ack,status: status}
-          @state=:connected
-        when SUBACK_TYPE
-          topic_id=(r[3].ord<<8)+r[4].ord
-          msg_id=(r[5].ord<<8)+r[6].ord
-          m={type: :sub_ack, topic_id: topic_id, msg_id: msg_id, status: status}
-        when UNSUBACK_TYPE
-          msg_id=(r[2].ord<<8)+r[3].ord
-          m={type: :unsub_ack, msg_id: msg_id, status: :ok}
-        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]
-          flags=r[2].ord
-          qos=(flags>>5)&0x03
-          topic=@topics.key(topic_id)
-          m={type: :publish, qos: qos, topic_id: topic_id, topic: topic,msg_id: msg_id, msg: msg,status: :ok}
-          @dataq<<m
-          if qos==1 
-            send :publish_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
-          elsif qos==2 
-            send :pub_rec, msg_id: msg_id
-          end
-          done=true
-        when PUBREL_TYPE
-          msg_id=(r[2].ord<<8)+r[3].ord
-          m={type: :pub_rel, status: :ok}
-          send :pub_comp, msg_id: msg_id
-          done=true
-        when DISCONNECT_TYPE
-          m={type: :disconnect,status: :ok}
-          @state=:disconnected
-        when REGISTER_TYPE
-          topic_id=(r[2].ord<<8)+r[3].ord
-          msg_id=(r[4].ord<<8)+r[5].ord
-          topic=r[6,len-6]
-          m={type: :register, topic_id: topic_id, msg_id: msg_id, topic: topic,status: :ok}
-          @topics[topic]=m[:topic_id]
-          #pp @topics
-          send :register_ack,topic_id: topic_id, msg_id: msg_id, return_code: 0
-          done=true
-        when REGACK_TYPE
-          topic_id=(r[2].ord<<8)+r[3].ord
-          m={type: :register_ack,topic_id: topic_id,status: status}
-          #@state=:registered
-        when PUBREC_TYPE
-          msg_id=(r[2].ord<<8)+r[3].ord
-          m={type: :pubrec,msg_id: msg_id,status: :ok}
-        when PUBACK_TYPE
-          topic_id=(r[2].ord<<8)+r[3].ord
-          msg_id=(r[4].ord<<8)+r[5].ord
-          m={type: :publish_ack,topic_id: topic_id,msg_id: msg_id, status: status}
-        when PUBCOMP_TYPE
-          msg_id=(r[2].ord<<8)+r[3].ord
-          m={type: :pubcomp,status: :ok, msg_id: msg_id}
-
-        when WILLTOPICREQ_TYPE
-          m={type: :will_topic_req, status: :ok}
-        when WILLMSGREQ_TYPE
-          m={type: :will_msg_req, status: :ok}
-
-        when WILLTOPICRESP_TYPE
-          m={type: :will_topic_resp, status: :ok}
-        when WILLMSGRESP_TYPE
-          m={type: :will_msg_resp, status: :ok}
-
-        when PINGRESP_TYPE
-          m={type: :pong, status: :ok}
-        else
-          m={type: :unknown, type_byte: type_byte }
-        end
-        if @debug and m
-          m[:raw]=hexdump r
-        end
-        puts "got :#{@id} #{m.to_json}"  if @verbose
-        if not done
-          @iq<<m if m
-        end
+        process_message r
       rescue IO::WaitReadable
         IO.select([@s])
         retry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-sn-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ari Siitonen
@@ -16,9 +16,11 @@ email: jalopuuverstas@gmail.com
 executables:
 - mqtt-sn-pub.rb
 - mqtt-sn-sub.rb
+- mqtt-sn-forwarder.rb
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/mqtt-sn-forwarder.rb
 - bin/mqtt-sn-pub.rb
 - bin/mqtt-sn-sub.rb
 - lib/mqtt-sn-ruby.rb