lora-rb 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e06d7a345ef9d3fbd6d15f3b83def826bb7b1d
-  data.tar.gz: 342d7271ad93a511afb6d961b24a98c7622ca82e
+  metadata.gz: fa20e294270b6a37671b7d98b8afe2d70f19ea1f
+  data.tar.gz: 5510af9e4a7d1a0ffe716531ae595a4680812905
 SHA512:
-  metadata.gz: 57bdf6e6a7a1f395ac9000a0c579999e6932c542e77f42b9abadd2e14753f20a499f7c26a5e0751d00819a3e8062bf1cc203fb0e4efc759b2daa74a9d0d1ae7d
-  data.tar.gz: b73ce87d688ea98f6760ef2e92275ac384496e3d2443b8681db4f1544b0d633609a7bf0455e3e8a61554f4277c41065c691674fea28ec1ebd39227d3f4e48e40
+  metadata.gz: 76a047649347b811eb85fa7e8f1728208b1c404c318fc75360421dab2011e245a4b4ffd51344ffb237daac85ff8e1eb08999e3769865a3406b2e1a2532ff39d3
+  data.tar.gz: d7400a832dabe4cb4d2bc69917048be49d12406886e36fd55ad90136efc0d38cac7bb75d019bce2fe5c4408d245bbab0b0505058f8cfbb7d984b6c91b58f86b4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v0.11.0 [☰](https://bitbucket.org/fractalgarden/loriot-rb/branches/compare/v0.10.0..v0.11.0) August 10th, 2017
+------------------------------
+* Mqtt:
+    * now you can manage response from the configuration and define multiple response topics: queued, transmitted...
+    * send cmd message now contains multiple informations
+
 v0.10.0 [☰](https://bitbucket.org/fractalgarden/loriot-rb/branches/compare/v0.9.0..v0.10.0) August 8th, 2017
 ------------------------------
 * Mqtt: 

data/README.md

@@ -25,9 +25,10 @@ To use this gem you have to choose your provider. Each of them has its own featu
 among which you can choose to connect to the lora network.
 
 This version supports:
-    1. TLS protocol with [Loriot](http://loriot.io)
-    1. Http push with [Resiot](http://resiot.io)
-    1. MQTT with [A2aSmartCity](http://www.a2asmartcity.io/)
+    
+1. TLS protocol with [Loriot](http://loriot.io)
+2. Http push with [Resiot](http://resiot.io)
+3. MQTT with [A2aSmartCity](http://www.a2asmartcity.io/)
 
 ## Configuration
 
@@ -103,6 +104,10 @@ end
 
 ### MQTT (with A2a)
 
+Insert in uplink_url the topic url where to wait the device messages. 
+Insert in downlink_url the topic url where publish the message to send to the device. 
+Insert in downlink_response_urls the list of topic urls where the lora network put the response. Use a label as phase's name. 
+
 ```ruby
 LoraRb.configure do |config|
   config.protocol = :mqtt
@@ -110,6 +115,10 @@ LoraRb.configure do |config|
   config.port = 8883
   config.uplink_url = '/sub/v1/users/{username}/apps/{appid}/devices/+/uplink/+'
   config.downlink_url = '/api/v1/users/{username}/apps/{appid}/devices/{deveui}/downlink/post/reply/{clientid}/id/{requestid}'
+  config.downlink_response_urls = {
+      queued: 'reply/{clientid}/id/{requestid}',
+      transmitted: '/sub/v1/users/{username}/apps/{appid}/devices/{deveui}/events/downlink'
+  }
   config.ssl = true
   config.ssl_file = 'ssl_certificates/mqtt_ca.crt'
 end

data/lib/config/config.rb

@@ -12,6 +12,10 @@ LoraRb.configure do |config|
   config.port = 8883
   config.uplink_url = '/sub/v1/users/{username}/apps/{appid}/devices/+/uplink/+'
   config.downlink_url = '/api/v1/users/{username}/apps/{appid}/devices/{deveui}/downlink/post/reply/{clientid}/id/{requestid}'
+  config.downlink_response_urls = {
+      queued: 'reply/{clientid}/id/{requestid}',
+      transmitted: '/sub/v1/users/{username}/apps/{appid}/devices/{deveui}/events/downlink'
+  }
   config.ssl = true
   config.ssl_file = 'ssl_certificates/mqtt_ca.crt'
 end

data/lib/core/configuration.rb

@@ -2,13 +2,15 @@ module LoraRb
   class Configuration
     # attr_writer :allow_sign_up
 
-    attr_accessor :protocol, :host, :port, :uplink_url, :downlink_url, :ssl, :ssl_file, :env
+    attr_accessor :protocol, :host, :port, :uplink_url, :downlink_url, :downlink_response_urls, :ssl, :ssl_file, :env
 
     def initialize
       @protocol = nil
       @host = nil
       @port = nil
-      @url = nil
+      @uplink_url = nil
+      @downlink_url = nil
+      @downlink_response_urls = nil
       @ssl = nil # True if uses tls
       @ssl_file = nil # The certificate's path
       @env = 'development'

data/lib/lora-rb/base.rb

@@ -16,6 +16,9 @@ class LoraClient
                port: LoraRb.configuration.port,
                uplink_url: LoraRb.configuration.uplink_url,
                downlink_url: LoraRb.configuration.downlink_url,
+               downlink_response_urls: LoraRb.configuration.downlink_response_urls,
+               username: LoraRb::Settings.username,
+               password: LoraRb::Settings.password,
                ssl: LoraRb.configuration.ssl,
                ssl_file: LoraRb.configuration.ssl_file
                 }.merge(options)

data/lib/lora-rb/mqtt/call.rb

@@ -10,15 +10,18 @@ module LoraRb
     def sub_initialize(options={})
       require 'mqtt'
 
-      raise 'Specify aaa to continue!' unless options[:uplink_url]
-      raise 'Specify aaa to continue!' unless options[:downlink_url]
-      raise 'Specify aaa to continue!' unless options[:host]
-      raise 'Specify aaa to continue!' unless options[:port]
+      raise 'Specify uplink_url to continue!' unless options[:uplink_url]
+      raise 'Specify downlink_url to continue!' unless options[:downlink_url]
+      raise 'Specify downlink_response_urls to continue!' unless options[:downlink_response_urls]
+      raise 'Specify host to continue!' unless options[:host]
+      raise 'Specify port to continue!' unless options[:port]
+      raise 'Specify username to continue!' unless options[:username]
+      raise 'Specify password to continue!' unless options[:password]
       raise 'Specify ssl_file to continue!' if options[:ssl] && !options[:ssl_file]
 
-      @username = LoraRb::Settings.username
-      password = LoraRb::Settings.password
+      @username = options[:username]
       @client_id = "#{@username}::ssg#{generate_request_id}"
+      @downlink_response_urls = options[:downlink_response_urls]
 
       @client = MQTT::Client.connect(
           host: options[:host],
@@ -26,7 +29,7 @@ module LoraRb
           ssl:  options[:ssl],
           cert_file: options[:ssl_file],
           username: @username,
-          password: password,
+          password: options[:password],
           client_id: @client_id
       )
 
@@ -69,31 +72,41 @@ module LoraRb
       puts "#{Time.now} publish #{h_request.to_json} to #{publish_url}" if options[:debug]
 
 
-      response = nil
+      responses = []
+      thr_responses = []
       if options[:wait_response]
-        response_topic = "reply/#{@client_id}/id/#{request_id}"
-        puts " [x] Starting thread to wait response on topic #{response_topic} ..." if options[:debug]
-        thr_response = Thread.new { response_topic, response = sub_read_data(topic: response_topic) }
-        #sleep 0.1
+        @downlink_response_urls.each do |name, response_url|
+          # response_topic = "reply/#{@client_id}/id/#{request_id}"
+          response_topic = merge_tags_to_url(response_url,
+                                             username: @username,
+                                             appid: @appid,
+                                             deveui: options[:eui],
+                                             clientid: @client_id,
+                                             requestid: request_id)
+          puts " [x] Starting thread #{name} to wait response on topic #{response_topic} ..." if options[:debug] == :full
+          thr_responses << Thread.new do
+            response_topic, response_message = sub_read_data(topic: response_topic)
+            response = { name: name, topic: response_topic, json: response_message }
+            puts " [x] End thread with response #{response} " if options[:debug] == :full
+            responses << response
+          end
+        end
       end
 
-      response = @client.publish(publish_url, h_request.to_json, false)
+      @client.publish(publish_url, h_request.to_json, false)
 
       if options[:wait_response]
-        # Waiting for the response
-        thr_response.join
-        puts " [x] Topic response: #{response}" if options[:debug]
-      else
-        puts " [x] Publish response: #{response}" if options[:debug]
+        # Waiting for all the responses
+        thr_responses.each { |thr_response| thr_response.join }
       end
-      response
+      responses
     end
 
     # Receive the payload from the network
     def sub_read_data(options={})
       topic = options[:topic] || @topic
       puts " [x] Reading topic #{topic}..." if options[:debug]
-      topic, message = @client.get(topic)
+      topic, message = @client.get(topic.dup)
       message = JSON.parse(message)
       if message.respond_to? '[]'
         message['eui'] ||= get_eui_from_topic(topic)
@@ -108,7 +121,7 @@ module LoraRb
       topic = options[:topic] || @topic
       puts " [*] Waiting for messages in #{topic}. To exit press CTRL+C" if options[:debug]
 
-      @client.get(topic) do |topic, message|
+      @client.get(topic.dup) do |topic, message|
         # Block is executed for every message received
         puts " [x] #{topic}: #{message}" if options[:debug]
         message = JSON.parse(message)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module LoraRb
   def self.version
-    "0.10.0"
+    "0.11.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lora-rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Marco Mastrodonato