mqtt-ccutrer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6edb25957b0e8c0253a47920bea2c49b7062f890364bdb7b85831715d2780fb2
-  data.tar.gz: 8de9202fe28cbcff6b2f95c7fad8e9d87e693713115fff6237d69213021f3a84
+  metadata.gz: 5b93bce8e1cc0e50a0161ac2447fbff2c293ad89f64dc98cb848e20026e754e3
+  data.tar.gz: 4b480e5ffb4df550469d112274f6c831b96f4a2118bb29e32940156b9dccce58
 SHA512:
-  metadata.gz: b9d3a01a30f91600f5e5005d1b13c240b4e0b6cb250d3c14f258fd86911cd80b443b9e3b34a1ef6b3c0170746d0b08128559f518aeb8f868218ac08c115fd58c
-  data.tar.gz: 4b4065cedf0deda00ef06d207a7c25f8fb3c968c9ce81558229b469c19349c93fb650d9ca09a7261dbadc99dc802cdab194de49f608589dd9feb37d17fa46c91
+  metadata.gz: 3227b778e824d891845cab272ffe73f875ffe2de3440a56e1a3f73bffb5d6fa9edb41844665aead5411276c0241ef4f176fc369b98d1398c54bbdf78dc9103d9
+  data.tar.gz: 51254e256507a8c01dd9197266eed692ccad64c3a7b0baa8bbc3ec50350ea712bc2a8bbfd1b575fca4527d5fe4da0a706f33aa998a932aca8a517f5af40b6721

data/lib/mqtt/client.rb

@@ -173,6 +173,9 @@ module MQTT
       @wake_up_pipe = IO.pipe
 
       @connected = false
+      @keep_alive_sent = false
+      @last_packet_id = 0
+      @batch_publish = false
     end
 
     # Get the OpenSSL context, that is used if SSL/TLS is enabled
@@ -514,6 +517,7 @@ module MQTT
 
       # Send packet
       @socket.write(packet.to_s)
+      @last_packet_sent_at = current_time
 
       # Receive response
       receive_connack
@@ -528,6 +532,7 @@ module MQTT
             next
           end
           @socket.write(packet.to_s)
+          @last_packet_sent_at = current_time
         end
       rescue => e
         @write_queue << packet if packet
@@ -643,7 +648,7 @@ module MQTT
         # Add to queue
         @read_queue.push(packet)
       when MQTT::Packet::Pingresp
-        # do nothing; setting @last_packet_received_at already handled it
+        # do nothing; setting @keep_alive_sent already handled it
       when MQTT::Packet::Puback,
         MQTT::Packet::Suback,
         MQTT::Packet::Unsuback
@@ -694,8 +699,13 @@ module MQTT
       end
       return nil if timeout_from_acks.nil? && @keep_alive.nil?
 
-      next_ping = @last_packet_received_at + @keep_alive if @keep_alive && !@keep_alive_sent
-      next_ping = @last_packet_received_at + @keep_alive + @ack_timeout if @keep_alive && @keep_alive_sent
+      if @keep_alive
+        next_ping = if @keep_alive_sent
+                      @last_packet_received_at + @keep_alive + @ack_timeout
+                    else
+                      @last_packet_sent_at + @keep_alive
+                    end
+      end
       current_time_local = current_time
       [([timeout_from_acks, next_ping].compact.min || current_time_local) - current_time_local, 0].max
     end
@@ -704,7 +714,7 @@ module MQTT
       return unless @keep_alive && @keep_alive > 0
 
       current_time_local = current_time
-      if current_time_local >= @last_packet_received_at + @keep_alive && !@keep_alive_sent
+      if current_time_local >= @last_packet_sent_at + @keep_alive && !@keep_alive_sent
         packet = MQTT::Packet::Pingreq.new
         send_packet(packet)
         @keep_alive_sent = true
@@ -764,7 +774,7 @@ module MQTT
     end
 
     def next_packet_id
-      @last_packet_id = (@last_packet_id || 0).next
+      @last_packet_id = @last_packet_id.next
       @last_packet_id = 1 if @last_packet_id > 0xffff
       @last_packet_id
     end

data/lib/mqtt/version.rb

@@ -2,5 +2,5 @@
 
 module MQTT
   # The version number of the MQTT gem
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-ccutrer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler