aws_iot_device 0.1.5 → 1.0.0

data/lib/aws_iot_device/mqtt_adapter/paho_mqtt_adapter.rb

@@ -0,0 +1,207 @@
+require 'paho-mqtt'
+
+module AwsIotDevice
+  module MqttAdapter
+    class PahoMqttAdapter
+
+      def initialize(*args)
+        @client = PahoMqtt::Client.new(*args)
+      end
+
+      def client_id
+        @client.client_id
+      end
+
+      def connect(*args, &block)
+        if args.last.is_a?(Hash)
+          attr = args.last
+          attr.each_pair do |k, v|
+            if [:host, :port, :keep_alive, :persistent].include?(k)
+              @client.send("#{k}=", v)
+            else
+              raise ArgumentError, "Parameter error, invalid paramater \"#{k}\" for connect with paho-mqtt"
+            end
+          end
+        end
+        @client.connect
+        if block_given?
+          begin
+            yield(self)
+          ensure
+            @mqtt_client.disconnect
+          end
+        end
+      end
+
+      def publish(topic, payload="", retain=false, qos=0)
+        @client.publish(topic, payload, retain, qos)
+      end
+
+      def loop_start
+        Thread.new { loop_forever }
+      end
+
+      def loop_stop(thread)
+        thread.join
+      end
+
+      def loop_forever
+        loop do
+          @client.mqtt_loop
+        end
+      end
+      
+      def mqtt_loop
+        @client.mqtt_loop
+      end
+      
+      def loop_read
+        @client.loop_read
+      end
+
+      def loop_write
+        @client.loop_write
+      end
+
+      def loop_misc
+        @client.loop_misc
+      end
+
+      def get(topic=nil, &block)
+        @client.loop_read(1)
+      end
+
+      def get_packet(topic=nil, &block)
+        @client.loop_read(1)
+      end
+
+      def generate_client_id
+        @client.generate_client_id
+      end
+
+      def disconnect(send_msg)
+        @client.disconnect(send_msg)
+      end
+
+      def connected?
+        @client.connected?
+      end
+
+      def subscribe(topic, qos)
+        @client.subscribe([topic, qos])
+      end
+
+      def subscribe_bunch(topics)
+        @client.subscribe(topics)
+      end
+      
+      def unsubscribe(topic)
+        @client.unsubscribe(topic)
+      end
+
+      def unsubscribe_bunch(topics)
+        @client.unsubscribe(topics)
+      end
+      
+      def set_tls_ssl_context(ca_cert=nil, cert=nil, key=nil)
+        @client.config_ssl_context(cert, key, ca_cert)
+      end      
+      
+      def add_callback_filter_topic(topic, callback=nil, &block)
+        @client.add_topic_callback(topic, callback, &block)
+      end
+
+      def remove_callback_filter_topic(topic)
+        @client.remove_topic_callback(topic)
+      end
+
+      def on_connack=(callback)
+        @client.on_connack = callback
+      end
+      
+      def on_suback=(callback)
+        @client.on_suback = callback
+      end
+
+      def on_unsuback=(callback)
+        @client.on_unsuback = callback
+      end
+
+      def on_puback=(callback)
+        @client.on_puback = callback
+      end
+
+      def on_pubrec=(callback)
+        @client.on_pubrec = callback
+      end
+
+      def on_pubrel=(callback)
+        @client.on_pubrel = callback 
+      end
+
+      def on_pubcomp=(callback)
+        @client.on_pubcomp = callback
+      end
+      
+      def on_message=(callback)
+        @client.on_message = callback
+      end
+      
+      def on_connack(&block)
+        @client.on_connack(&block)
+      end
+      
+      def on_suback(&block)
+        @client.on_suback(&block)
+      end
+
+      def on_unsuback(&block)
+        @client.on_unsuback(&block)
+      end
+
+      def on_puback(&block)
+        @client.on_puback(&block)
+      end
+
+      def on_pubrec(&block)
+        @client.on_pubrec(&block)
+      end
+
+      def on_pubrel(&block)
+        @client.on_pubrel(&block)
+      end
+
+      def on_pubcomp(&block)
+        @client.on_pubcomp(&block)
+      end
+      
+      def on_message(&block)
+        @client.on_message(&block)
+      end
+      
+      def host
+        @client.host
+      end
+
+      def host=(host)
+        @client.host = host
+      end
+
+      def port
+        @client.port
+      end
+
+      def port=(port)
+        @client.port = port
+      end
+
+      def ssl
+        @client.ssl
+      end
+
+      def ssl=(ssl)
+        @client.ssl = ssl
+      end
+    end
+  end
+end

data/lib/aws_iot_device/mqtt_adapter/ruby_mqtt_adapter.rb

@@ -29,7 +29,7 @@ module AwsIotDevice
       end
 
       def connect(*args, &block)
-        client = create_client(*args) if @client.nil?
+        @client = create_client(*args) if @client.nil?
         @client.connect(&block)
         loop_start
       end
@@ -87,7 +87,6 @@ module AwsIotDevice
         @client.port
       end
 
-
       def port=(port)
         @client.port = port
       end
@@ -134,7 +133,7 @@ module AwsIotDevice
           ### Fitlering message if matching to filtered topic
           topic = message.topic
           if @filtered_topics.key?(topic)
-            callback = @filtered_topics[topic] 
+            callback = @filtered_topics[topic]
             callback.call(message)
           else
             on_message_callback(message)
@@ -144,17 +143,24 @@ module AwsIotDevice
       end
 
       def loop_write
+        puts "loop_write is unavailable for ruby-mqtt client's"
       end
 
       def loop_misc
+        puts "loop_misc is unavailable for ruby-mqtt client's"
       end
 
       def on_message=(callback)
         @on_message = callback
       end
 
+      def on_message(&block)
+        @on_message = block if block_given?
+        @on_message
+      end
+
       def on_message_callback(message)
-        if @on_message.is_a? Proc
+        if @on_message.is_a?(Proc) || @on_message.lambda?
           @on_message.call(message)
         end
       end

data/lib/aws_iot_device/mqtt_shadow_client.rb

@@ -2,5 +2,6 @@ require 'aws_iot_device/mqtt_shadow_client/shadow_client'
 
 module AwsIotDevice
   module MqttShadowClient
+    ACTION_NAME = %w(get update delete delta).freeze
   end
 end

data/lib/aws_iot_device/mqtt_shadow_client/mqtt_manager.rb

@@ -10,49 +10,32 @@ module AwsIotDevice
 
       attr_accessor :mqtt_operation_timeout_s
 
-      attr_accessor :host
-
-      attr_accessor :port
-
       attr_accessor :ssl
 
       def initialize(*args)
         @client = create_mqtt_adapter(*args)
+        @mqtt_operation_timeout_s = 2
         @mutex_publish = Mutex.new()
         @mutex_subscribe = Mutex.new()
         @mutex_unsubscribe = Mutex.new()
-        @ssl_configured = false
-
-        if args.last.is_a?(Hash)
-          attr = args.pop
-          attr.each_pair do |k, v|
-            self.send("#{k}=", v)
-          end
-        end
-
-        if need_ssl_configure?
-          @client.set_tls_ssl_context(@ca_file, @cert, @key)
-          @ssl_configured = true
-        end
-
-        ### Set the on_message's callback
-        @client.on_message = Proc.new do |message|
-          on_message_callback(message)
-        end
       end
 
-      def cert_file=(path)
-        @cert = path
+      def host=(host)
+        @client.host = host
       end
 
-      def key_file=(path)
-        @key = path
+      def host
+        @client.host
       end
 
-      def ca_file=(path)
-        @ca_file = path
+      def port=(port)
+       @client.port = port
       end
 
+      def port
+        @client.port
+      end
+      
       def client_id
         @client.client_id
       end
@@ -61,74 +44,157 @@ module AwsIotDevice
         @client = MqttAdapter::Client.new(*args)
       end
 
-      def on_message_callback(message)
-        puts "Received (with no custom callback registred) : "
-        puts "------------------- Topic: #{message.topic}"
-        puts "------------------- Payload: #{message.payload}"
-      end
-
       def config_endpoint(host, port)
-        if host.nil? || port.nil?
-          raise "config_endpoint error: either host || port is undefined error"
-        end
-        @host = host
-        @port = port
+        raise ArgumentError, "configure endpoint either host or port is nil" if host.nil? || port.nil?
+        @client.host = host
+        @client.port = port
       end
 
       def config_ssl_context(ca_file, key, cert)
-        @ca_file = ca_file
-        @key = key
-        @cert = cert
-        @client.set_tls_ssl_context(ca_file, cert, key)
+        self.ca_file = ca_file
+        self.key = key
+        self.cert = cert
+        @client.set_tls_ssl_context(@ca_file, @cert, @key)
       end
 
-      def connect(keep_alive_interval=30, &block)
-        if keep_alive_interval.nil? && keep_alive_interval.is_a(Integer)
-          raise "connect error: keep_alive_interval cannot be a not nil Interger"
-        end
-
-        @client.host=(@host)
-        @client.port=(@port)
+      def connect(*args, &block)
         ### Execute a mqtt opration loop in background for time period defined by mqtt_connection_timeout
-        @client.connect(block)
+        @client.connect(*args, &block)
       end
 
       def disconnect
         @client.disconnect
       end
 
-      def publish(topic, payload="", qos=0, retain=nil)
-        if topic.nil?
-          raise "publish error: topic cannot be nil"
-        end
-        @mutex_publish.synchronize{
-          @client.publish(topic,payload,qos,retain)
+      def publish(topic, payload="", retain=nil, qos=0)
+        raise ArgumentError, "publish topic cannot be nil" if topic.nil?
+        @mutex_publish.synchronize {
+          @client.publish(topic, payload, retain, qos)
         }
       end
 
       def subscribe(topic, qos=0, callback=nil)
-        if topic.nil?
-          raise "subscribe error: topic cannot be nil"
-        end
-        ret = false
+        raise ArgumentError, "subscribe topic cannot be nil" if topic.nil?
         @mutex_subscribe.synchronize {
           @client.add_callback_filter_topic(topic, callback)
-          @client.subscribe(topic)
+          @client.subscribe(topic, qos)
         }
       end
 
+      def subscribe_bunch(*topics)
+        @mutex_subscribe.synchronize {
+          topics.each do |topic|
+            @client.add_callback_filter_topic(topic.first, topic.pop) if !topic[2].nil? && topic[2].is_a?(Proc)
+          end
+          @client.subscribe_bunch(topics)
+        }
+      end
+      
       def unsubscribe(topic)
-        if topic.nil?
-          raise "unsubscribe error: topic cannot be nil"
-        end
+        raise ArgumentError, "unsubscribe topic cannot be nil" if topic.nil?
         @mutex_unsubscribe.synchronize{
           @client.remove_callback_filter_topic(topic)
           @client.unsubscribe(topic)
         }
       end
 
-      def need_ssl_configure?
-        !( @ca_file.nil? || @cert.nil? || @key.nil? ) && @ssl
+      def unsubscribe_bunch(*topics)
+        @mutex_unsubscribe.synchronize {
+          topics.each do |topic|
+            @client.remove_callback_filter_topic(topic)
+          end
+          @client.unsubscribe_bunch(topics)
+        }
+      end
+
+      def on_connack=(callback)
+        @client.on_connack = callback if paho_client?
+      end
+
+      def on_suback=(callback)
+        @client.on_suback = callback if paho_client?
+      end
+
+      def on_unsuback=(callback)
+        @client.on_unsuback = callback if paho_client?
+      end
+
+      def on_puback=(callback)
+        @client.on_puback = callback if paho_client?
+      end
+
+      def on_pubrec=(callback)
+        @client.on_pubrec = callback if paho_client?
+      end
+
+      def on_pubrel=(callback)
+        @client.on_pubrel = callback if paho_client?
+      end
+
+      def on_pubcomp=(callback)
+        @client.on_pubcomp = callback if paho_client?
+      end
+
+      def on_message=(callback)
+        @client.on_message = callback
+      end
+
+      def on_connack(&block)
+        @client.on_connack(&block) if paho_client?
+      end
+
+      def on_suback(&block)
+        @client.on_suback(&block) if paho_client?
+      end
+
+      def on_unsuback(&block)
+        @client.on_unsuback(&block) if paho_client?
+      end
+
+      def on_puback(&block)
+        @client.on_puback(&block) if paho_client?
+      end
+
+      def on_pubrec(&block)
+        @client.on_pubrec(&block) if paho_client?
+      end
+
+      def on_pubrel(&block)
+        @client.on_pubrel(&block) if paho_client?
+      end
+
+      def on_pubcomp(&block)
+        @client.on_pubcomp(&block) if paho_client?
+      end
+
+      def on_message(&block)
+        @client.on_message(&block)
+      end
+
+      def add_topic_callback(topic, callback, &block)
+        @client.add_callback_filter_topic(topic, callback, &block)
+      end
+
+      def remove_topic_callback(topic)
+        @client.remove_callback_filter_topic(topic)
+      end
+
+      def paho_client?
+        @client.adapter.class == MqttAdapter::PahoMqttAdapter
+      end
+
+      private
+
+      def cert=(path)
+        @cert = path
+      end
+
+      def key=(path)
+        @key = path
+      end
+
+      def ca_file=(path)
+        @ca_file = path
       end
     end
   end