mqtt-ccutrer 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b93bce8e1cc0e50a0161ac2447fbff2c293ad89f64dc98cb848e20026e754e3
-  data.tar.gz: 4b480e5ffb4df550469d112274f6c831b96f4a2118bb29e32940156b9dccce58
+  metadata.gz: c95449b66faaba1f857dbb64e535b2f4a8565a91a8611aa3b53d1b1a3c802f7d
+  data.tar.gz: 053ce243061cf20b3326d53e7fda9afaa82972d4029631e6e0857efc465e7bcf
 SHA512:
-  metadata.gz: 3227b778e824d891845cab272ffe73f875ffe2de3440a56e1a3f73bffb5d6fa9edb41844665aead5411276c0241ef4f176fc369b98d1398c54bbdf78dc9103d9
-  data.tar.gz: 51254e256507a8c01dd9197266eed692ccad64c3a7b0baa8bbc3ec50350ea712bc2a8bbfd1b575fca4527d5fe4da0a706f33aa998a932aca8a517f5af40b6721
+  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']))
@@ -560,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

data/lib/mqtt/version.rb

@@ -2,5 +2,5 @@
 
 module MQTT
   # The version number of the MQTT gem
-  VERSION = '1.0.2'
+  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.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Implementation of the MQTT protocol