paho-mqtt 1.0.7 → 1.0.9

data/lib/paho_mqtt/sender.rb

@@ -16,13 +16,13 @@ module PahoMqtt
   class Sender
 
     attr_accessor :last_ping_req
-    
+
     def initialize(ack_timeout)
-      @socket = nil
+      @socket        = nil
       @writing_queue = []
       @writing_mutex = Mutex.new
       @last_ping_req = -1
-      @ack_timeout = ack_timeout
+      @ack_timeout   = ack_timeout
     end
 
     def socket=(socket)
@@ -39,52 +39,48 @@ module PahoMqtt
       end
     end
 
-    def append_to_writing(packet)      
-      @writing_mutex.synchronize {
-        @writing_queue.push(packet)
-      }
+    def append_to_writing(packet)
+      @writing_mutex.synchronize do
+        @writing_queue.push(packet) unless @writing_queue.length >= MAX_WRITING
+      end
       MQTT_ERR_SUCCESS
     end
 
     def writing_loop(max_packet)
-      @writing_mutex.synchronize {
+      @writing_mutex.synchronize do
         cnt = 0
         while !@writing_queue.empty? && cnt < max_packet do
           packet = @writing_queue.shift
           send_packet(packet)
           cnt += 1
         end
-      }
+      end
       MQTT_ERR_SUCCESS
     end
-    
+
     def flush_waiting_packet(sending=true)
       if sending
-        @writing_mutex.synchronize {
+        @writing_mutex.synchronize do
           @writing_queue.each do |m|
             send_packet(m)
           end
-        }
+        end
       else
         @writing_queue = []
       end
     end
-    
-    def check_ack_alive(queue, mutex, max_packet)
-      mutex.synchronize {
+
+    def check_ack_alive(queue, mutex)
+      mutex.synchronize do
         now = Time.now
-        cnt = 0
         queue.each do |pck|
           if now >= pck[:timestamp] + @ack_timeout
             pck[:packet].dup ||= true unless pck[:packet].class == PahoMqtt::Packet::Subscribe || pck[:packet].class == PahoMqtt::Packet::Unsubscribe
-            unless cnt > max_packet
-              append_to_writing(pck[:packet]) 
-              pck[:timestamp] = now
-              cnt += 1
-            end
+            append_to_writing(pck[:packet])
+            pck[:timestamp] = now
           end
         end
-      }
+      end
     end
   end
 end

data/lib/paho_mqtt/subscriber.rb

@@ -18,13 +18,13 @@ module PahoMqtt
     attr_reader :subscribed_topics
 
     def initialize(sender)
-      @waiting_suback = []
-      @waiting_unsuback = []
-      @subscribed_mutex = Mutex.new
+      @waiting_suback    = []
+      @waiting_unsuback  = []
+      @subscribed_mutex  = Mutex.new
       @subscribed_topics = []
-      @suback_mutex = Mutex.new
-      @unsuback_mutex = Mutex.new
-      @sender = sender
+      @suback_mutex      = Mutex.new
+      @unsuback_mutex    = Mutex.new
+      @sender            = sender
     end
 
     def sender=(sender)
@@ -34,24 +34,28 @@ module PahoMqtt
     def config_subscription(new_id)
       unless @subscribed_topics == [] || @subscribed_topics.nil?
         packet = PahoMqtt::Packet::Subscribe.new(
-          :id => new_id,
+          :id     => new_id,
           :topics => @subscribed_topics
         )
-        @subscribed_mutex.synchronize {
+        @subscribed_mutex.synchronize do
           @subscribed_topics = []
-        }
-        @suback_mutex.synchronize {
-          @waiting_suback.push({ :id => new_id, :packet => packet, :timestamp => Time.now })
-        }
+        end
+        @suback_mutex.synchronize do
+          if @waiting_suback.length >= MAX_SUBACK
+            PahoMqtt.logger.error('SUBACK queue is full, could not send subscribe') if PahoMqtt.logger?
+            return MQTT_ERR_FAILURE
+          end
+          @waiting_suback.push(:id => new_id, :packet => packet, :timestamp => Time.now)
+        end
         @sender.send_packet(packet)
       end
       MQTT_ERR_SUCCESS
     end
 
     def add_subscription(max_qos, packet_id, adjust_qos)
-      @suback_mutex.synchronize {
+      @suback_mutex.synchronize do
         adjust_qos, @waiting_suback = @waiting_suback.partition { |pck| pck[:id] == packet_id }
-      }
+      end
       if adjust_qos.length == 1
         adjust_qos = adjust_qos.first[:packet].topics
         adjust_qos.each do |t|
@@ -60,51 +64,54 @@ module PahoMqtt
           elsif max_qos[0] == 128
             adjust_qos.delete(t)
           else
-
-            @logger.error("The qos value is invalid in subscribe.") if PahoMqtt.logger?
-            raise PacketException
+            PahoMqtt.logger.error("The QoS value is invalid in subscribe.") if PahoMqtt.logger?
+            raise PacketException.new('Invalid suback QoS value')
           end
         end
       else
-        @logger.error("The packet id is invalid, already used.") if PahoMqtt.logger?
-        raise PacketException
+        PahoMqtt.logger.error("The packet id is invalid, already used.") if PahoMqtt.logger?
+        raise PacketException.new("Invalid suback packet id: #{packet_id}")
       end
-      @subscribed_mutex.synchronize {
+      @subscribed_mutex.synchronize do
         @subscribed_topics.concat(adjust_qos)
-      }
+      end
       return adjust_qos
     end
 
     def remove_subscription(packet_id, to_unsub)
-      @unsuback_mutex.synchronize {
+      @unsuback_mutex.synchronize do
         to_unsub, @waiting_unsuback = @waiting_unsuback.partition { |pck| pck[:id] == packet_id }
-      }
-      
+      end
+
       if to_unsub.length == 1
         to_unsub = to_unsub.first[:packet].topics
       else
-        @logger.error("The packet id is invalid, already used.") if PahoMqtt.logger?
-        raise PacketException
+        PahoMqtt.logger.error("The packet id is invalid, already used.") if PahoMqtt.logger?
+        raise PacketException.new("Invalid unsuback packet id: #{packet_id}")
       end
 
-      @subscribed_mutex.synchronize {
+      @subscribed_mutex.synchronize do
         to_unsub.each do |filter|
           @subscribed_topics.delete_if { |topic| PahoMqtt.match_filter(topic.first, filter) }
         end
-      }
+      end
       return to_unsub
     end
-    
+
     def send_subscribe(topics, new_id)
       unless valid_topics?(topics) == MQTT_ERR_FAIL
         packet = PahoMqtt::Packet::Subscribe.new(
-          :id => new_id,
+          :id     => new_id,
           :topics => topics
-        )        
+        )
         @sender.append_to_writing(packet)
-        @suback_mutex.synchronize {
-          @waiting_suback.push({ :id => new_id, :packet => packet, :timestamp => Time.now })
-        }
+        @suback_mutex.synchronize do
+          if @waiting_suback.length >= MAX_SUBACK
+            PahoMqtt.logger.error('SUBACK queue is full, could not send subscribe') if PahoMqtt.logger?
+            return MQTT_ERR_FAILURE
+          end
+          @waiting_suback.push(:id => new_id, :packet => packet, :timestamp => Time.now)
+        end
         MQTT_ERR_SUCCESS
       else
         raise ProtocolViolation
@@ -114,14 +121,18 @@ module PahoMqtt
     def send_unsubscribe(topics, new_id)
       unless valid_topics?(topics) == MQTT_ERR_FAIL
         packet = PahoMqtt::Packet::Unsubscribe.new(
-          :id => new_id,
+          :id     => new_id,
           :topics => topics
         )
-        
+
         @sender.append_to_writing(packet)
-        @unsuback_mutex.synchronize {
-          @waiting_unsuback.push({:id => new_id, :packet => packet, :timestamp => Time.now})
-        }
+        @unsuback_mutex.synchronize do
+          if @waiting_suback.length >= MAX_UNSUBACK
+            PahoMqtt.logger.error('UNSUBACK queue is full, could not send unbsubscribe') if PahoMqtt.logger?
+            return MQTT_ERR_FAIL
+          end
+          @waiting_unsuback.push(:id => new_id, :packet => packet, :timestamp => Time.now)
+        end
         MQTT_ERR_SUCCESS
       else
         raise ProtocolViolation
@@ -129,8 +140,8 @@ module PahoMqtt
     end
 
     def check_waiting_subscriber
-      @sender.check_ack_alive(@waiting_suback, @suback_mutex, @waiting_suback.length)
-      @sender.check_ack_alive(@waiting_unsuback, @unsuback_mutex, @waiting_unsuback.length)
+      @sender.check_ack_alive(@waiting_suback, @suback_mutex)
+      @sender.check_ack_alive(@waiting_unsuback, @unsuback_mutex)
     end
 
     def valid_topics?(topics)

data/lib/paho_mqtt/version.rb

@@ -1,3 +1,3 @@
 module PahoMqtt
-  VERSION = "1.0.7"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paho-mqtt
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Pierre Goudet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - lib/paho-mqtt.rb
 - lib/paho_mqtt/client.rb
 - lib/paho_mqtt/connection_helper.rb
+- lib/paho_mqtt/exception.rb
 - lib/paho_mqtt/handler.rb
 - lib/paho_mqtt/packet.rb
 - lib/paho_mqtt/packet/base.rb