mqtt-ccutrer 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbcc93715636fd1a6f3491005dccf8c9805c519145145154a9895d5fb3df0670
-  data.tar.gz: f978d8185287327b475f69881546dde182fbbd3c9d665253d9625bc48df1f9a9
+  metadata.gz: c95449b66faaba1f857dbb64e535b2f4a8565a91a8611aa3b53d1b1a3c802f7d
+  data.tar.gz: 053ce243061cf20b3326d53e7fda9afaa82972d4029631e6e0857efc465e7bcf
 SHA512:
-  metadata.gz: 53cb56f81cd0eed1d41d6a0c5a7b7fcb88e53f5fcea755cdf544715d38fd698b931c7b5d23bbf161709a0f46fe72ce14a0f0107f2bfe5f59e92225c72d8d0556
-  data.tar.gz: 845ec674c88c7be5b7835adeb1d6b52397661f3e02ae775240cb2621058eba72956327ca961c0ce82172a13485faee720d9b0c9c37e99f03643f1918d5d0d203
+  metadata.gz: e465141738a3352c562474041f199a260496d9d499d81899613381de8521a9fb215bdde351b608ac9630a463b3fa2e2dd4cfe22046ab179926d0c657ffebaa08
+  data.tar.gz: 0b87b975e3c9a792f17dcc663c9aa0c0be764a6866eeeedb1a88ba9d38511f661995c412920d6798e580929317d4e633fdd744f33177fb7609c30542b4394e5d

data/lib/mqtt/client.rb

@@ -43,14 +43,17 @@ module MQTT
     attr_accessor :resend_limit
 
     # How many attempts to re-establish a connection after it drops before
-    # giving up (default 5)
+    # giving up (default 5); nil for unlimited retries
     attr_accessor :reconnect_limit
 
     # How long to wait between re-connection attempts (exponential - i.e.
     # immediately after first drop, then 5s, then 25s, then 125s, etc.
-    # when theis value defaults to 5)
+    # when this value defaults to 5)
     attr_accessor :reconnect_backoff
 
+    # the longest amount of time to wait before attempting a reconnect
+    attr_accessor :reconnect_backoff_max
+
     # Username to authenticate to the server with
     attr_accessor :username
 
@@ -80,7 +83,8 @@ module MQTT
       ack_timeout: 5,
       resend_limit: 5,
       reconnect_limit: 5,
-      reconnect_backoff: 5,
+      reconnect_backoff: 2,
+      reconnect_backoff_max: 30,
       username: nil,
       password: nil,
       will_topic: nil,
@@ -130,8 +134,11 @@ module MQTT
     #  client = MQTT::Client.new('myserver.example.com', 18830)
     #  client = MQTT::Client.new(host: 'myserver.example.com')
     #  client = MQTT::Client.new(host: 'myserver.example.com', keep_alive: 30)
+    #  client = MQTT::Client.new(uri: 'mqtt://myserver.example.com', keep_alive: 30)
     #
     def initialize(host = nil, port = nil, **attributes)
+      host = attributes.delete(:uri) if attributes.key?(:uri)
+
       # Set server URI from environment if present
       if host.nil? && port.nil? && attributes.empty? && ENV['MQTT_SERVER']
         attributes.merge!(parse_uri(ENV['MQTT_SERVER']))
@@ -173,6 +180,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 +524,7 @@ module MQTT
 
       # Send packet
       @socket.write(packet.to_s)
+      @last_packet_sent_at = current_time
 
       # Receive response
       receive_connack
@@ -528,6 +539,7 @@ module MQTT
             next
           end
           @socket.write(packet.to_s)
+          @last_packet_sent_at = current_time
         end
       rescue => e
         @write_queue << packet if packet
@@ -555,9 +567,10 @@ module MQTT
         rescue
           @socket&.close
           @socket = nil
+          retries += 1
 
-          if (retries += 1) < @reconnect_limit
-            sleep @reconnect_backoff ** retries
+          if @reconnect_limit.nil? || retries < @reconnect_limit
+            sleep [@reconnect_backoff ** retries, @reconnect_backoff_max].min
             retry
           end
         end
@@ -643,7 +656,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
@@ -661,9 +674,9 @@ module MQTT
 
     def handle_timeouts
       @acks_mutex.synchronize do
-        current_time = self.current_time
+        current_time_local = current_time
         @acks.each_value do |pending_ack|
-          break unless pending_ack.timeout_at <= current_time
+          break unless pending_ack.timeout_at <= current_time_local
 
           resend(pending_ack)
         end
@@ -694,21 +707,26 @@ 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
-      current_time = self.current_time
-      [([timeout_from_acks, next_ping].compact.min || current_time) - current_time, 0].max
+      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
 
     def handle_keep_alives
       return unless @keep_alive && @keep_alive > 0
 
-      current_time = self.current_time
-      if current_time >= @last_packet_received_at + @keep_alive && !@keep_alive_sent
+      current_time_local = current_time
+      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
-      elsif current_time >= @last_packet_received_at + @keep_alive + @ack_timeout
+      elsif current_time_local >= @last_packet_received_at + @keep_alive + @ack_timeout
         raise KeepAliveTimeout
       end
     end
@@ -764,7 +782,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.0'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqtt-ccutrer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Cody Cutrer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,7 +159,7 @@ homepage: http://github.com/ccutrer/ruby-mqtt
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -174,8 +174,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: Implementation of the MQTT protocol
 test_files: