mqttopia 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c742f5f768390150ffadb94a8c47dc197f95e02c0ff137ba0fee384fbd8f8313
-  data.tar.gz: a8da45694aef218efa74d141979869c264252fba7a1c8fe736728933971c70c4
+  metadata.gz: edee59e5d3689309f81800724fae4cf97af41c023bc0e74033af9dfc90986888
+  data.tar.gz: 114e468743d3aa4224143b3693c9ec5ec80e951610842ff5eb16aac47c3e12ac
 SHA512:
-  metadata.gz: 62e6988922837919ecb0943033ceff222a43439fa7041569c76ecb83f6c26fa73c11d601b8bd288e2dd886bb0c20aac5a69ea7cb1a9afd8354f5580010297c5c
-  data.tar.gz: 7b9c96b9748df2ad82e2b17967070dc96afc21e2f9821b0c7ab64da4230328fd50aeefb9e9205c82f3c76497793612b0ce4b3678759cfd3f2b313ba61da17412
+  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/serializers/live_location.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Mqttopia
+  module Serializers
+    module LiveLocation
+      module_function
+
+      KEYS = %i[tid batt loc].freeze
+
+      def serialize(body)
+        return unless valid_live_location?(body[:live_location])
+
+        {
+          trip_id: body[:trip_id],
+          live_location: serialize_live_location(
+            body.dig(:live_location, :loc)&.merge!(batt: body.dig(:live_location, :batt))
+          ),
+          logged_at: body.dig(:live_location, :loc, :ts)&.to_s,
+          received_at: current_timestamp
+        }
+      end
+
+      def serialize_live_location(live_location)
+        {
+          latitude: live_location[:lat],
+          longitude: live_location[:lon],
+          accuracy: live_location[:acc],
+          altitude: live_location[:alt],
+          speed: live_location[:spd],
+          battery: live_location[:batt]
+        }
+      end
+
+      def valid_live_location?(live_location)
+        live_location.is_a?(Hash) && KEYS.all? { |key| live_location.key?(key) }
+      end
+
+      def current_timestamp
+        DateTime.now.strftime("%Q")
+      end
+    end
+  end
+end

data/lib/mqttopia/subscriptions/redirect.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "services/trip_metrics"
-require_relative "services/test_debug"
-require_relative "services/trip_points"
+# require_relative "services/trip_metrics"
+# require_relative "services/test_debug"
+# require_relative "services/trip_points"
+# require_relative "services/live_locations"
+Dir[File.join(__dir__, "services", "*.rb")].sort.each { |file| require_relative file }
+
 require_relative "../topics/services"
 
 module Mqttopia

data/lib/mqttopia/subscriptions/services/base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_model"
 require_relative "../../helpers/data_extractor"
 
 module Mqttopia

data/lib/mqttopia/subscriptions/services/live_locations.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative "../../serializers/live_location"
+require_relative "./base"
+
+module Mqttopia
+  module Subscriptions
+    module Services
+      class LiveLocations < Mqttopia::Subscriptions::Services::Base
+        class LiveLocationsInvalidError < ArgumentError
+        end
+
+        attr_reader :trip_id, :live_location, :options, :user_id
+
+        validates :trip_id, presence: true, numericality: { only_integer: true, greater_than: 0 }
+        validates :live_location, presence: true
+        # validate :live_location_json_format
+
+        def initialize(trip_id:, live_location:, options: {})
+          @trip_id = trip_id
+          @live_location = live_location
+          @options = options
+          @user_id = options[:user_id]
+        end
+
+        def self.call(topic, payload, options = {})
+          trip_id = payload[:tid]
+          options[:user_id] = topic.include?("user/") && topic.match(%r{user/[^/]+}) && extract_user_id(topic)
+
+          new(trip_id: trip_id, live_location: payload, options: options).process
+        end
+
+        def process
+          raise LiveLocationsInvalidError, errors.full_messages.to_sentence unless valid?
+
+          Mqttopia::Serializers::LiveLocation.serialize({
+                                                          trip_id: trip_id,
+                                                          live_location: live_location
+                                                        })
+        end
+      end
+    end
+  end
+end

data/lib/mqttopia/subscriptions/services/test_debug.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "active_model"
 require_relative "../../serializers/test_debug"
 require_relative "./base"
 

data/lib/mqttopia/subscriptions/services/trip_metrics.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "active_model"
 require_relative "../../serializers/trip_metric"
 require_relative "./base"
 

data/lib/mqttopia/subscriptions/services/trip_points.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "active_model"
 require_relative "../../serializers/trip_point"
 require_relative "./base"
 

data/lib/mqttopia/topics/services.rb

@@ -16,6 +16,12 @@ module Mqttopia
           serializer: "Mqttopia::Serializers::TripPoint",
           regex: %r{\Ailla/trips/(?<trip_id>\d+)/driver_trip_point/send(?:/user/(?<user_id>\d+))?\z}
         },
+        live_location: {
+          topic_name: "illa/fleet/location/vehicle/:trip_id/user/:user_id",
+          service: "Mqttopia::Subscriptions::Services::LiveLocations",
+          serializer: "Mqttopia::Serializers::LiveLocation",
+          regex: %r{\Ailla/fleet/location/vehicle/(?<trip_id>\d+)(?:/user/(?<user_id>\d+))?\z}
+        },
         test_debug: {
           topic_name: "test",
           service: "Mqttopia::Subscriptions::Services::TestDebug",

data/lib/mqttopia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mqttopia
-  VERSION = "0.2.1"
+  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.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Illa Tech
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-18 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
@@ -184,11 +184,13 @@ files:
 - lib/mqttopia/client.rb
 - lib/mqttopia/helpers/data_extractor.rb
 - lib/mqttopia/logger.rb
+- lib/mqttopia/serializers/live_location.rb
 - lib/mqttopia/serializers/test_debug.rb
 - lib/mqttopia/serializers/trip_metric.rb
 - lib/mqttopia/serializers/trip_point.rb
 - lib/mqttopia/subscriptions/redirect.rb
 - lib/mqttopia/subscriptions/services/base.rb
+- lib/mqttopia/subscriptions/services/live_locations.rb
 - lib/mqttopia/subscriptions/services/test_debug.rb
 - lib/mqttopia/subscriptions/services/trip_metrics.rb
 - lib/mqttopia/subscriptions/services/trip_points.rb