paho-mqtt 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeeb9db2020a2162a6f5581da55c235db4fc26e9cf6786729b5c40352b3560fd
-  data.tar.gz: 68241bd854291fc771c7bdfc90d9c31dffe027c7987383cb5bb06b0e1c871a8f
+  metadata.gz: 36bc2ea31aa16b29dd3630d0d5db7b1e21b9723ce208d5234c0cde283cdf26e4
+  data.tar.gz: 2baf2f376e7be26234ea7a6e94c662648a75442022c080dc76df7fd6bfa9c5e8
 SHA512:
-  metadata.gz: 802ee8ab38a2afeb1af1ee350278bf8a7b10fd1904ec062baf1e9a0d38dda796da4ced668b7e497888aabc62654368afaf3445096f8cde2a29c2ed59b44496a2
-  data.tar.gz: 17c1ca5fb822a9f1f0f42cdf8f0a02ab9fc4c455da9d7d062fcbbd0a439604cd2bbfadf8644377a28828a89285c33251140cff15ab491fa279a4eba7c4cf04bc
+  metadata.gz: 5293b974ec90097bf707b6d14870d6347c704a4a7da0622c63fe0cfba6591536b19673804d68726b2b0b2e77496a654caaddd8aa47cb5f6cfe58e2ce501979f7
+  data.tar.gz: f6f1f6c5c6f2659399cd70566b6af1d80606cdff9ee1c8fde8645799943a0b8a0d7c9608f8842d56cef8a9d885d42c0deb8fc5fcee875498b3da962fe4284c67

data/lib/paho-mqtt.rb

@@ -22,6 +22,8 @@ module PahoMqtt
   extend self
   attr_accessor :logger
 
+  MAX_PACKET_ID = 65535
+
   # Default connection setup
   DEFAULT_SSL_PORT      = 8883
   DEFAULT_PORT          = 1883
@@ -30,12 +32,12 @@ module PahoMqtt
   # MAX size of queue
   MAX_SUBACK   = 10
   MAX_UNSUBACK = 10
-  MAX_READ     = 100
   MAX_PUBACK   = 100
   MAX_PUBREC   = 100
   MAX_PUBREL   = 100
+  MAX_PUBLISH  = 1000
   MAX_PUBCOMP  = 100
-  MAX_WRITING  = 1000
+  MAX_QUEUE    = MAX_PUBACK + MAX_PUBREC + MAX_PUBREL + MAX_PUBCOMP
 
   # Connection states values
   MQTT_CS_NEW        = 0

data/lib/paho_mqtt/client.rb

@@ -150,9 +150,9 @@ module PahoMqtt
       Thread.current == @reconnect_thread
     end
 
-    def loop_write(max_packet=MAX_WRITING)
+    def loop_write
       begin
-        @sender.writing_loop(max_packet)
+        @sender.writing_loop
       rescue WritingException
         if check_persistence
           reconnect
@@ -162,10 +162,11 @@ module PahoMqtt
       end
     end
 
-    def loop_read(max_packet=MAX_READ)
+    def loop_read
       begin
-        max_packet.times do
-          @handler.receive_packet
+        MAX_QUEUE.times do
+          result = @handler.receive_packet
+          break if result.nil?
         end
       rescue ReadingException
         if check_persistence
@@ -188,6 +189,7 @@ module PahoMqtt
       end
       @publisher.check_waiting_publisher
       @subscriber.check_waiting_subscriber
+      sleep SELECT_TIMEOUT
     end
 
     def reconnect
@@ -351,7 +353,8 @@ module PahoMqtt
 
     def next_packet_id
       @id_mutex.synchronize do
-        @last_packet_id = (@last_packet_id || 0).next
+        @last_packet_id = 0 if @last_packet_id >= MAX_PACKET_ID
+        @last_packet_id = @last_packet_id.next
       end
     end
 

data/lib/paho_mqtt/handler.rb

@@ -42,13 +42,14 @@ module PahoMqtt
         unless packet.nil?
           if packet.is_a?(PahoMqtt::Packet::Connack)
             @last_ping_resp = Time.now
-            handle_connack(packet)
+            return handle_connack(packet)
           else
             handle_packet(packet)
             @last_ping_resp = Time.now
           end
         end
       end
+      return result
     end
 
     def handle_packet(packet)
@@ -85,7 +86,7 @@ module PahoMqtt
         PahoMqtt.logger.debug(packet.return_msg) if PahoMqtt.logger?
         handle_connack_accepted(packet.session_present)
       else
-        PahoMqtt.logger.warm(packet.return_msg) if PahoMqtt.logger?
+        PahoMqtt.logger.warn(packet.return_msg) if PahoMqtt.logger?
         MQTT_CS_DISCONNECT
       end
       @on_connack.call(packet) unless @on_connack.nil?
@@ -140,12 +141,12 @@ module PahoMqtt
     end
 
     def handle_publish(packet)
-        id = packet.id
-        qos = packet.qos
-        if @publisher.do_publish(qos, id) == MQTT_ERR_SUCCESS
-          @on_message.call(packet) unless @on_message.nil?
-          check_callback(packet)
-        end
+      id = packet.id
+      qos = packet.qos
+      if @publisher.do_publish(qos, id) == MQTT_ERR_SUCCESS
+        @on_message.call(packet) unless @on_message.nil?
+        check_callback(packet)
+      end
     end
 
     def handle_puback(packet)
@@ -254,7 +255,7 @@ module PahoMqtt
         type.to_s.split('::').last.downcase
       else
         PahoMqtt.logger.error("Received an unexpeceted packet: #{packet}.") if PahoMqtt.logger?
-         raise PacketException.new('Invalid packet type id')
+        raise PacketException.new('Invalid packet type id')
       end
     end
 

data/lib/paho_mqtt/publisher.rb

@@ -99,6 +99,7 @@ module PahoMqtt
         :id => packet_id
       )
       push_queue(@waiting_pubrel, @pubrel_mutex, MAX_PUBREL, packet, packet_id)
+      @sender.append_to_writing(packet)
       MQTT_ERR_SUCCESS
     end
 
@@ -107,7 +108,6 @@ module PahoMqtt
         @waiting_pubrec.delete_if { |pck| pck[:id] == packet_id }
       end
       send_pubrel(packet_id)
-      MQTT_ERR_SUCCESS
     end
 
     def send_pubrel(packet_id)
@@ -115,6 +115,8 @@ module PahoMqtt
         :id => packet_id
       )
       push_queue(@waiting_pubcomp, @pubcomp_mutex, MAX_PUBCOMP, packet, packet_id)
+      @sender.append_to_writing(packet)
+      MQTT_ERR_SUCCESS
     end
 
     def do_pubrel(packet_id)
@@ -122,7 +124,6 @@ module PahoMqtt
         @waiting_pubrel.delete_if { |pck| pck[:id] == packet_id }
       end
       send_pubcomp(packet_id)
-      MQTT_ERR_SUCCESS
     end
 
     def send_pubcomp(packet_id)

data/lib/paho_mqtt/sender.rb

@@ -18,11 +18,13 @@ module PahoMqtt
     attr_accessor :last_ping_req
 
     def initialize(ack_timeout)
-      @socket        = nil
-      @writing_queue = []
-      @writing_mutex = Mutex.new
-      @last_ping_req = -1
-      @ack_timeout   = ack_timeout
+      @socket          = nil
+      @writing_queue   = []
+      @publish_queue   = []
+      @publish_mutex   = Mutex.new
+      @writing_mutex   = Mutex.new
+      @last_ping_req   = -1
+      @ack_timeout     = ack_timeout
     end
 
     def socket=(socket)
@@ -46,15 +48,24 @@ module PahoMqtt
       send_packet(PahoMqtt::Packet::Pingreq.new)
     end
 
+    def prepare_sending(queue, mutex, max_packet, packet)
+      if queue.length < max_packet
+        mutex.synchronize do
+          queue.push(packet)
+        end
+      else
+        PahoMqtt.logger.error('Writing queue is full, slowing down') if PahoMqtt.logger?
+        raise FullWritingException
+      end
+    end
+
     def append_to_writing(packet)
       begin
-        if @writing_queue.length <= MAX_WRITING
-          @writing_mutex.synchronize do
-            @writing_queue.push(packet)
-          end
+        case packet
+        when packet.is_a?(PahoMqtt::Packet::Publish)
+          prepare_sending(@publish_queue, @publish_mutex, MAX_PUBLISH, packet)
         else
-          PahoMqtt.logger.error('Writing queue is full slowing down') if PahoMqtt.logger?
-          raise FullWritingException
+          prepare_sending(@writing_queue, @writing_mutex, MAX_QUEUE, packet)
         end
       rescue FullWritingException
         sleep SELECT_TIMEOUT
@@ -63,13 +74,19 @@ module PahoMqtt
       MQTT_ERR_SUCCESS
     end
 
-    def writing_loop(max_packet)
+    def writing_loop
       @writing_mutex.synchronize do
-        cnt = 0
-        while !@writing_queue.empty? && cnt < max_packet do
+        MAX_QUEUE.times do
+          break if @writing_queue.empty?
           packet = @writing_queue.shift
           send_packet(packet)
-          cnt += 1
+        end
+      end
+      @publish_mutex.synchronize do
+        MAX_PUBLISH.times do
+          break if @publish_queue.empty?
+          packet = @publish_queue.shift
+          send_packet(packet)
         end
       end
       MQTT_ERR_SUCCESS

data/lib/paho_mqtt/version.rb

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

metadata

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