mqttopia 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1999a274eff111b5027805925f4c9053adfe992c6ecff4a4f45212d56477978f
-  data.tar.gz: 115798acdb489d407fafc0c53e9dc46624c422555c061b424a066d82d51c06c4
+  metadata.gz: edee59e5d3689309f81800724fae4cf97af41c023bc0e74033af9dfc90986888
+  data.tar.gz: 114e468743d3aa4224143b3693c9ec5ec80e951610842ff5eb16aac47c3e12ac
 SHA512:
-  metadata.gz: 8a2e463f81874aafb17370878bf95290f1a0ccd67a712814687820435f305ada601afa07b5b1431db03988effd8afb2df4b4ec31347b85865bc3913fc23465b1
-  data.tar.gz: 66bbeca571ae0dfdb159cea9c1c31767555a3ee52c5de8ac2ec73c5ed5213342e85edf68eed4230ff55a1ad85a3edf79c573c1cc4f68f1995907200850b9b4c7
+  metadata.gz: 20156c35a36cf6a90272b57c2dcf6911465a6a7889256d1d9adcf9ca9ced463113a1040babf15ae377101be636e44b8cda441a643f43a8aea5e55d4164fd08fa
+  data.tar.gz: 7f74f05a5c489c0da9b4e5ad58d2f902d96b6208ffe697045bdb8f945c4c4fb39fad7e5fbb4909cc85d7e8d70949a1a7bfbb525a73c382ef5899712cf1b4398c

data/.rubocop.yml

@@ -28,9 +28,11 @@ Style/ClassVars:
 Layout/LineLength:
   Max: 120
 Metrics/ClassLength:
-  Max: 180
+  Max: 200
 Metrics/MethodLength:
   Max: 30
+Metrics/BlockLength:
+  Max: 30
 Metrics/AbcSize:
   Enabled: false
 Lint/MissingSuper:

data/lib/mqttopia/client.rb

@@ -9,7 +9,7 @@ module Mqttopia
   class Client
     @instance_mutex = Mutex.new
 
-    attr_reader :mqtt_client, :debugging, :debugging_topic
+    attr_reader :mqtt_client, :debugging, :debugging_topic, :client_id
 
     def self.instance
       @instance_mutex.synchronize do
@@ -25,19 +25,24 @@ module Mqttopia
       port: Mqttopia.port,
       ssl: Mqttopia.ssl
     )
+      @client_id = SecureRandom.hex(3) + "-#{Mqttopia.client_id}"
       @mqtt_client = MQTT::Client.new(
         version: Mqttopia.version,
         port: port,
         username: username,
         password: password,
         ssl: ssl,
-        client_id: SecureRandom.hex(3) + "-#{Mqttopia.client_id}",
+        client_id: @client_id,
         keep_alive: Mqttopia.keep_alive,
         will_topic: Mqttopia.will_topic,
         will_retain: Mqttopia.will_retain,
         will_payload: Mqttopia.will_payload,
         will_qos: Mqttopia.will_qos,
-        ack_timeout: Mqttopia.ack_timeout
+        ack_timeout: Mqttopia.ack_timeout,
+        connect_timeout: Mqttopia.connect_timeout,
+        max_retries: Mqttopia.max_retries,
+        retry_interval: Mqttopia.retry_interval,
+        logger: Mqttopia.logger
       )
       @subscriptions = {}
       @subscription_thread_mutex ||= Mutex.new
@@ -56,7 +61,7 @@ module Mqttopia
         raise ArgumentError, "No hosts available" if host.nil?
 
         mqtt_client.host = host
-        mqtt_client.connect
+        mqtt_client.connect(client_id)
 
         retry_count = 0 # Reset retry count on successful connection
         break # Exit the loop once connected
@@ -143,30 +148,13 @@ module Mqttopia
       @subscription_thread_mutex.synchronize do
         return if @subscription_thread
 
-        @subscription_thread ||= Thread.new do
-          retry_count = 0
-          max_retries = 15
-
-          loop do
-            mqtt_client.get do |topic, message|
-              handle_subscription_message(topic, message)
-            end
-
-            retry_count = 0 # Reset retry count i
-            f successful
-          rescue StandardError => e
-            retry_count += 1
-            log_error("subscription_thread", e)
-
-            if retry_count >= max_retries
-              log_error("subscription_thread", "Terminating after #{max_retries} failed attempts")
-              break # Exit the loop and terminate the thread
-            end
-
-            sleep(2 * retry_count) # Delay before retrying
-            retry # Restart loop if under max retries
+        @subscription_thread = Thread.new do
+          mqtt_client.get do |topic, message|
+            handle_subscription_message(topic, message)
           end
         end
+      rescue StandardError => e
+        log_error("start_subscription_thread", e)
       end
     end
 
@@ -181,6 +169,8 @@ module Mqttopia
 
       @subscriptions.each do |subscribed_topic, callback|
         callback.call(response[:data]) if subscribed_topic.to_s == response[:event]
+      rescue StandardError => e
+        log_error("handle_subscription_message", e)
       end
     end
 

data/lib/mqttopia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mqttopia
-  VERSION = "0.2.2"
+  VERSION = "0.2.6"
 end

data/lib/mqttopia.rb

@@ -27,6 +27,9 @@ module Mqttopia
                  :will_payload,
                  :will_qos,
                  :ack_timeout,
+                 :connect_timeout,
+                 :max_retries,
+                 :retry_interval,
                  :client_id,
                  :debugging,
                  :debugging_topic
@@ -38,8 +41,11 @@ module Mqttopia
   @@will_retain = false
   @@will_payload = nil
   @@will_qos = 0
-  @@keep_alive = 15
-  @@ack_timeout = 10
+  @@keep_alive = 30
+  @@ack_timeout = 5
+  @@connect_timeout = 30
+  @@max_retries = 30
+  @@retry_interval = 20
   @@logger = ::Logger.new($stdout)
   @@logger_level = :info
   @@debugging = false

data/mqttopia.gemspec

@@ -32,9 +32,9 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "activemodel", ">= 4.1"
+  spec.add_dependency "go-mqtt", ">= 0.0.2"
   spec.add_dependency "json", ">= 1.6"
   spec.add_dependency "logger", ">= 1.4"
-  spec.add_dependency "mqtt", ">= 0.6"
   spec.add_dependency "railties", ">= 4.2"
   spec.add_dependency "rake", ">= 11.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqttopia
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Illa Tech
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: go-mqtt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: mqtt
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement