paho-mqtt 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f39a0f32404a6bd397f11413d0ac5630ac629dca3821bde3a8213e59f2f458ac
-  data.tar.gz: a3a47027e5ff76e97dfc3ea32479b0149eb7be1683e901b80b6021a2478d5d4d
+  metadata.gz: aeeb9db2020a2162a6f5581da55c235db4fc26e9cf6786729b5c40352b3560fd
+  data.tar.gz: 68241bd854291fc771c7bdfc90d9c31dffe027c7987383cb5bb06b0e1c871a8f
 SHA512:
-  metadata.gz: 926e0d70043c9cc1b60fbaceec3c354c3d48f632aac6d92d22b7662d220f90ca4a1bc1a753cb16e9571128201de253a69388f86ca224caae0f5ac09709de97a9
-  data.tar.gz: cf753442885c0005ededac63b1517ebe51b10e74725429f834ab4a65cb0710fdf8e83ba9cec4272e7e91c79a470080eba26a31c09e05f838743f978d1b056b42
+  metadata.gz: 802ee8ab38a2afeb1af1ee350278bf8a7b10fd1904ec062baf1e9a0d38dda796da4ced668b7e497888aabc62654368afaf3445096f8cde2a29c2ed59b44496a2
+  data.tar.gz: 17c1ca5fb822a9f1f0f42cdf8f0a02ab9fc4c455da9d7d062fcbbd0a439604cd2bbfadf8644377a28828a89285c33251140cff15ab491fa279a4eba7c4cf04bc

data/lib/paho-mqtt.rb

@@ -25,18 +25,17 @@ module PahoMqtt
   # Default connection setup
   DEFAULT_SSL_PORT      = 8883
   DEFAULT_PORT          = 1883
-  SELECT_TIMEOUT        = 0
-  LOOP_TEMPO            = 0.005
+  SELECT_TIMEOUT        = 0.002
 
   # MAX size of queue
   MAX_SUBACK   = 10
   MAX_UNSUBACK = 10
-  MAX_READ     = 50
+  MAX_READ     = 100
   MAX_PUBACK   = 100
   MAX_PUBREC   = 100
   MAX_PUBREL   = 100
   MAX_PUBCOMP  = 100
-  MAX_WRITING  = MAX_PUBACK + MAX_PUBREC + MAX_PUBREL  + MAX_PUBCOMP
+  MAX_WRITING  = 1000
 
   # Connection states values
   MQTT_CS_NEW        = 0

data/lib/paho_mqtt/client.rb

@@ -163,15 +163,15 @@ module PahoMqtt
     end
 
     def loop_read(max_packet=MAX_READ)
-      max_packet.times do
-        begin
+      begin
+        max_packet.times do
           @handler.receive_packet
-        rescue ReadingException
-          if check_persistence
-            reconnect
-          else
-            raise ReadingException
-          end
+        end
+      rescue ReadingException
+        if check_persistence
+          reconnect
+        else
+          raise ReadingException
         end
       end
     end
@@ -180,7 +180,6 @@ module PahoMqtt
       loop_read
       loop_write
       loop_misc
-      sleep LOOP_TEMPO
     end
 
     def loop_misc
@@ -238,7 +237,6 @@ module PahoMqtt
         MQTT_ERR_SUCCESS
       rescue ProtocolViolation
         PahoMqtt.logger.error("Subscribe topics need one topic or a list of topics.") if PahoMqtt.logger?
-        disconnect(false)
         raise ProtocolViolation
       end
     end
@@ -252,7 +250,6 @@ module PahoMqtt
         MQTT_ERR_SUCCESS
       rescue ProtocolViolation
         PahoMqtt.logger.error("Unsubscribe need at least one topic.") if PahoMqtt.logger?
-        disconnect(false)
         raise ProtocolViolation
       end
     end

data/lib/paho_mqtt/connection_helper.rb

@@ -41,7 +41,6 @@ module PahoMqtt
       connect_timeout = Time.now + @ack_timeout
       while (Time.now <= connect_timeout) && !is_connected? do
         @cs = @handler.receive_packet
-        sleep 0.0001
       end
       unless is_connected?
         PahoMqtt.logger.warn("Connection failed. Couldn't recieve a Connack packet from: #{@host}.") if PahoMqtt.logger?
@@ -144,22 +143,16 @@ module PahoMqtt
       MQTT_ERR_SUCCESS
     end
 
-    def send_pingreq
-      packet = PahoMqtt::Packet::Pingreq.new
-      @sender.send_packet(packet)
-      MQTT_ERR_SUCCESS
-    end
-
     def check_keep_alive(persistent, last_ping_resp, keep_alive)
       now = Time.now
       timeout_req = (@sender.last_ping_req + (keep_alive * 0.7).ceil)
       if timeout_req <= now && persistent
         PahoMqtt.logger.debug("Checking if server is still alive...") if PahoMqtt.logger?
-        send_pingreq
+        @sender.send_pingreq
       end
       timeout_resp = last_ping_resp + (keep_alive * 1.1).ceil
       if timeout_resp <= now
-        PahoMqtt.logger.debug("No activity period over timeout, disconnecting from #{@host}.") if PahoMqtt.logger?
+        PahoMqtt.logger.debug("No activity is over timeout, disconnecting from #{@host}.") if PahoMqtt.logger?
         @cs = MQTT_CS_DISCONNECT
       end
       @cs

data/lib/paho_mqtt/exception.rb

@@ -40,4 +40,10 @@ module PahoMqtt
 
   class LowVersionException < Exception
   end
+
+  class FullWritingException < Exception
+  end
+
+  class FullQueueException < Exception
+  end
 end

data/lib/paho_mqtt/handler.rb

@@ -36,7 +36,7 @@ module PahoMqtt
     end
 
     def receive_packet
-      result = IO.select([@socket], [], [], SELECT_TIMEOUT) unless @socket.nil? || @socket.closed?
+      result = IO.select([@socket], nil, nil, SELECT_TIMEOUT) unless @socket.nil? || @socket.closed?
       unless result.nil?
         packet = PahoMqtt::Packet::Base.read(@socket)
         unless packet.nil?
@@ -86,7 +86,7 @@ module PahoMqtt
         handle_connack_accepted(packet.session_present)
       else
         PahoMqtt.logger.warm(packet.return_msg) if PahoMqtt.logger?
-        MQTT_CS_DISCONNECTED
+        MQTT_CS_DISCONNECT
       end
       @on_connack.call(packet) unless @on_connack.nil?
       MQTT_CS_CONNECTED

data/lib/paho_mqtt/publisher.rb

@@ -41,26 +41,30 @@ module PahoMqtt
       )
       case qos
       when 1
-        @puback_mutex.synchronize do
-          if @waiting_puback.length >= MAX_PUBACK
-            PahoMqtt.logger.error('PUBACK queue is full, could not send with qos=1') if PahoMqtt.logger?
-            return MQTT_ERR_FAIL
-          end
-          @waiting_puback.push(:id => new_id, :packet => packet, :timestamp => Time.now)
-        end
+        push_queue(@waiting_puback, @puback_mutex, MAX_PUBACK, packet, new_id)
       when 2
-        @pubrec_mutex.synchronize do
-          if @waiting_pubrec.length >= MAX_PUBREC
-            PahoMqtt.logger.error('PUBREC queue is full, could not send with qos=2') if PahoMqtt.logger?
-            return MQTT_ERR_FAIL
-          end
-          @waiting_pubrec.push(:id => new_id, :packet => packet, :timestamp => Time.now)
-        end
+        push_queue(@waiting_pubrec, @pubrec_mutex, MAX_PUBREC, packet, new_id)
       end
       @sender.append_to_writing(packet)
       MQTT_ERR_SUCCESS
     end
 
+    def push_queue(waiting_queue, queue_mutex, max_packet, packet, new_id)
+      begin
+        if waiting_queue.length >= max_packet
+          raise FullQueueException
+        end
+        queue_mutex.synchronize do
+          waiting_queue.push(:id => new_id, :packet => packet, :timestamp => Time.now)
+        end
+      rescue FullQueueException
+        PahoMqtt.logger.error("#{packet.type_name} queue is full") if PahoMqtt.logger?
+        sleep SELECT_TIMEOUT
+        retry
+      end
+      MQTT_ERR_SUCCESS
+    end
+
     def do_publish(qos, packet_id)
       case qos
       when 0
@@ -94,14 +98,7 @@ module PahoMqtt
       packet = PahoMqtt::Packet::Pubrec.new(
         :id => packet_id
       )
-      @pubrel_mutex.synchronize do
-        if @waiting_pubrel.length >= MAX_PUBREL
-          PahoMqtt.logger.error('PUBREL queue is full, could not acknowledge qos=2') if PahoMqtt.logger?
-          return MQTT_ERR_FAIL
-        end
-        @waiting_pubrel.push(:id => packet_id , :packet => packet, :timestamp => Time.now)
-      end
-      @sender.append_to_writing(packet)
+      push_queue(@waiting_pubrel, @pubrel_mutex, MAX_PUBREL, packet, packet_id)
       MQTT_ERR_SUCCESS
     end
 
@@ -117,15 +114,7 @@ module PahoMqtt
       packet = PahoMqtt::Packet::Pubrel.new(
         :id => packet_id
       )
-      @pubcomp_mutex.synchronize do
-        if @waiting_pubcomp.length >= MAX_PUBCOMP
-          PahoMqtt.logger.error('PUBCOMP queue is full, could not acknowledge qos=2') if PahoMqtt.logger?
-          return MQTT_ERR_FAIL
-        end
-        @waiting_pubcomp.push(:id => packet_id, :packet => packet, :timestamp => Time.now)
-      end
-      @sender.append_to_writing(packet)
-      MQTT_ERR_SUCCESS
+      push_queue(@waiting_pubcomp, @pubcomp_mutex, MAX_PUBCOMP, packet, packet_id)
     end
 
     def do_pubrel(packet_id)

data/lib/paho_mqtt/sender.rb

@@ -34,14 +34,31 @@ module PahoMqtt
         @socket.write(packet.to_s) unless @socket.nil? || @socket.closed?
         @last_ping_req = Time.now
         MQTT_ERR_SUCCESS
-      rescue StandardError
-        raise WritingException
       end
+    rescue StandardError
+      raise WritingException
+    rescue IO::WaitWritable
+      IO.select(nil, [@socket], nil, SELECT_TIMEOUT)
+      retry
+    end
+
+    def send_pingreq
+      send_packet(PahoMqtt::Packet::Pingreq.new)
     end
 
     def append_to_writing(packet)
-      @writing_mutex.synchronize do
-        @writing_queue.push(packet) unless @writing_queue.length >= MAX_WRITING
+      begin
+        if @writing_queue.length <= MAX_WRITING
+          @writing_mutex.synchronize do
+            @writing_queue.push(packet)
+          end
+        else
+          PahoMqtt.logger.error('Writing queue is full slowing down') if PahoMqtt.logger?
+          raise FullWritingException
+        end
+      rescue FullWritingException
+        sleep SELECT_TIMEOUT
+        retry
       end
       MQTT_ERR_SUCCESS
     end

data/lib/paho_mqtt/subscriber.rb

@@ -124,7 +124,6 @@ module PahoMqtt
           :id     => new_id,
           :topics => topics
         )
-
         @sender.append_to_writing(packet)
         @unsuback_mutex.synchronize do
           if @waiting_suback.length >= MAX_UNSUBACK

data/lib/paho_mqtt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paho-mqtt
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Pierre Goudet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler