mqttopia 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e187ae43b2ef47585aa3e90f989bf95e4b6a5a2ce5435050b6197b1de69d5867
-  data.tar.gz: f28d85e56435d9a70eff252b638c98d1506de4ca58678a09de79cf01bf6ed9e4
+  metadata.gz: 1999a274eff111b5027805925f4c9053adfe992c6ecff4a4f45212d56477978f
+  data.tar.gz: 115798acdb489d407fafc0c53e9dc46624c422555c061b424a066d82d51c06c4
 SHA512:
-  metadata.gz: 38e1e64174271e7df513c72fd8f2475cb35de740407e93c5ecadb6552ccd435d9e1c9a6c79436b1b5b9d20525180c6138abfb2584b0e46334e3ac6a2fdecbdd4
-  data.tar.gz: 3052bd4fe4f365a2bc4e58894ef043df13f2ef43af3eb33ab110f72a4f1db2243bbd670eb9cafeafe2d658891e3c6076b0c98d2fd941af06cfaaf4ac4877ff52
+  metadata.gz: 8a2e463f81874aafb17370878bf95290f1a0ccd67a712814687820435f305ada601afa07b5b1431db03988effd8afb2df4b4ec31347b85865bc3913fc23465b1
+  data.tar.gz: 66bbeca571ae0dfdb159cea9c1c31767555a3ee52c5de8ac2ec73c5ed5213342e85edf68eed4230ff55a1ad85a3edf79c573c1cc4f68f1995907200850b9b4c7

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/serializers/trip_point.rb

@@ -24,6 +24,7 @@ module Mqttopia
           longitude: point[:lon],
           accuracy: point[:acc],
           altitude: point[:alt],
+          action_type: action_type_mapper(point[:act]),
           current_trip_point_id: point[:ctp_id]
         }
       end
@@ -35,6 +36,13 @@ module Mqttopia
       def current_timestamp
         DateTime.now.strftime("%Q")
       end
+
+      def action_type_mapper(action_type)
+        {
+          "0" => "arrival",
+          "1" => "departure"
+        }.fetch(action_type&.to_s) { nil }
+      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.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mqttopia
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Illa Tech
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -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