dji_mqtt_connect 0.1.29.2 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbbbf8d76b4b59cfa044b9bc78b1f15d29da687eb415ff3ace8b5b5eea8c65fc
-  data.tar.gz: 249408710024a2b88f9b43550c62051b712d18ff2e9c90ce14e2ba049a05a180
+  metadata.gz: 1970e0a7336ae5097dce7afb34a8ebd0d5267eee02c326199716ed2c95e7d276
+  data.tar.gz: 21baf8d1756fb4add30ce19ae7cc4f7f3df7d893cbe18853a748d7c08a5aec06
 SHA512:
-  metadata.gz: e7459b05b6ab7bdf2940280bf5b9512e5dc71c371ddca6c738d8e857fcc78d9f017758b298dbb2514e0f9e5d76bc811406660e71fc19d1084936334c7d715e8e
-  data.tar.gz: b590ee8f812a960bd32f4dc66307cc992014236da45647bb2d9189fe751e742ab07f45bbdc26b93eb2054b37fc28eb1e4b47816817eb0a4e4c6b57d65a18b330
+  metadata.gz: f7a5b75dad5eba4150c375d573ed4ebbc9a808f20d388de161383e1e306254bf01177e229035b4f55836302699ff32fd431d78ffff9a09bb035e52198d6e10bf
+  data.tar.gz: 46da87f973ee3ef4eb11beec649c3dcb4e7c392a778c72b66a82e766391b1102de9f585f614da69de81a2142e58b04a0ae3558a0c0e49eda3f712aabeac01f27

data/config/locales/thing_product_osd.en.yml

@@ -3,6 +3,7 @@ en:
     thing_product_osd_summary:
       default: "Received OSD message"
       flight_hub_dock: "Received OSD message from FlightHub Dock"
+      flight_hub_drone: "Received OSD message from FlightHub Drone"
       dock: "Received OSD message from Dock"
       drone: "Received OSD message from Drone"
       remote: "Received OSD message from Remote"

data/lib/dji_mqtt_connect/factories.rb

@@ -243,6 +243,77 @@ module DjiMqttConnect
       )
     end
 
+    def build_thing_product_flight_hub_drone_osd_message
+      message_data = {
+        host: {
+          activation_time: 1682969151,
+          attitude_head: 164.2085418701172,
+          attitude_pitch: -2.0999999046325684,
+          attitude_roll: 0.30000001192092896,
+          battery: {
+            batteries: [
+              {
+                capacity_percent: 95,
+                firmware_version: "01.00.0600",
+                index: 0,
+                loop_times: 27,
+                sn: "BATTERY01",
+                sub_type: 67,
+                temperature: 38,
+                type: 2,
+                voltage: 24200
+              }
+            ],
+            capacity_percent: 95,
+            landing_power: 20,
+            remain_flight_time: 19,
+            return_home_power: 25
+          },
+          distance_limit_status: {
+            distance_limit: 500,
+            is_near_distance_limit: 0,
+            state: 1
+          },
+          elevation: 62.20537567138672,
+          firmware_version: "01.00.0600",
+          gear: 0,
+          height: 62.20537567138672,
+          height_limit: 500,
+          home_distance: 23.390625,
+          horizontal_speed: 0.10000000149011612,
+          latitude: -33.768706649492614,
+          longitude: 150.9497880000493,
+          mode_code: 0,
+          position_state: {
+            gps_number: 6,
+            is_fixed: 3,
+            quality: 5,
+            rtk_number: 30
+          },
+          storage: {
+            total: 53082240,
+            used: 14370264
+          },
+          total_flight_distance: 1234.5,
+          total_flight_time: 146930,
+          track_id: nil,
+          vertical_speed: -0.30000001192092896,
+          wind_direction: 180,
+          wind_speed: 0.800000011920929
+        },
+        sn: "DRONE01"
+      }
+
+      Thing::Product::FlightHubDroneOsdMessage.new(
+        OrganizationUUID: "b13d0443-4379-461b-b985-18184ffd324d",
+        biz_code: "device_osd",
+        version: "1.0",
+        timestamp: Message.current_timestamp,
+        data: message_data,
+        _data: message_data
+      )
+    end
+
     # Status
 
     def build_thing_product_update_topo_message_with_online_device

data/lib/dji_mqtt_connect/marshals/thing/product/osd_marshal.rb

@@ -59,7 +59,9 @@ module DjiMqttConnect
 
         message_data = parsed_message.fetch("data", {})
 
-        message_class = if parsed_message.key?("OrganizationUUID")
+        message_class = if FlightHubDroneOsdMessage.matches?(parsed_message)
+          FlightHubDroneOsdMessage
+        elsif FlightHubDockOsdMessage.matches?(parsed_message)
           FlightHubDockOsdMessage
         elsif drone_osd_data_attributes.all? { |attribute| message_data.key?(attribute.to_s) }
           DroneOsdMessage
@@ -74,8 +76,6 @@ module DjiMqttConnect
 
         transformed_message = osd_transformer.call(parsed_message)
 
-        puts JSON.pretty_generate(transformed_message)
-
         build_message(message_class, transformed_message)
       end
 

data/lib/dji_mqtt_connect/marshals/thing/product/requests_marshal.rb

@@ -12,9 +12,18 @@ module DjiMqttConnect
       # Rename pesky `method` argument to `_method` and makes a copy of the raw data
       class RequestsTransformer < Dry::Transformer::Pipe
         import Dry::Transformer::HashTransformations
+        import Dry::Transformer::Conditional
 
         define! do
+          # Convert nil data to empty hash
+          guard ->(data) { data["data"].nil? } do
+            map_value "data", ->(_) { {} }
+          end
+
+          # Keep a copy of the original data hash
           copy_keys "data" => "_data"
+
+          # Prevent clash with Ruby reserved word
           rename_keys "method" => "_method"
         end
       end

data/lib/dji_mqtt_connect/messages/sys/product/status_message.rb

@@ -6,7 +6,7 @@ module DjiMqttConnect
     class StatusMessage < DjiMqttConnect::Message
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_data, Types::Hash
       attribute :_method, Types::String

data/lib/dji_mqtt_connect/messages/sys/product/status_reply_message.rb

@@ -8,7 +8,7 @@ module DjiMqttConnect
 
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_method, Types::String
 

data/lib/dji_mqtt_connect/messages/thing/product/events/device_log.rb

@@ -12,7 +12,7 @@ module DjiMqttConnect
         attribute :level, Types::Integer
         attribute :key, Types::Integer
         attribute :module, Types::Integer
-        attribute :create_time, Types::Timestamp
+        attribute :create_time, Types::TimestampMS
         attribute :args, Types::Hash
       end
     end

data/lib/dji_mqtt_connect/messages/thing/product/events/fileupload_progress.rb

@@ -26,7 +26,7 @@ module DjiMqttConnect
                 attribute :current_step, Types::Integer
                 attribute? :total_step, Types::Integer
                 attribute :progress, Types::Integer
-                attribute? :finish_time, Types::Timestamp
+                attribute? :finish_time, Types::TimestampMS
                 attribute :upload_rate, Types::Integer
                 attribute? :result, Types::Integer
                 attribute :status, Types::String

data/lib/dji_mqtt_connect/messages/thing/product/events_message.rb

@@ -5,7 +5,7 @@ module DjiMqttConnect
     class EventsMessage < DjiMqttConnect::Message
       attribute :bid, Types::UUID
       attribute :tid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       # Can be determined from the topic, but included for convenience
       attribute? :gateway, Types::SerialNumber

data/lib/dji_mqtt_connect/messages/thing/product/events_reply_message.rb

@@ -22,7 +22,7 @@ module DjiMqttConnect
 
       attribute :bid, Types::UUID
       attribute :tid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_method, Types::String
 

data/lib/dji_mqtt_connect/messages/thing/product/osd/flight_hub_dock.rb

@@ -3,6 +3,18 @@
 module DjiMqttConnect
   module Thing::Product
     class FlightHubDockOsdMessage < OsdMessage
+      def self.matches?(parsed_message_data)
+        parsed_message_data.key?("OrganizationUUID") &&
+          parsed_message_data.dig("data", "host").is_a?(Hash) &&
+          FlightHubDockOsdMessage::Data::Host.schema.keys.all? do |key|
+            key.required? ? parsed_message_data.dig("data", "host").key?(key.name.to_s) : true
+          end
+      end
+
+      attribute :OrganizationUUID, Types::UUID
+      attribute :biz_code, Types::String
+      attribute :version, Types::String
+
       attribute :data do
         attribute :host do
           attribute? :acc_time, Types::Integer

data/lib/dji_mqtt_connect/messages/thing/product/osd/flight_hub_drone.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class FlightHubDroneOsdMessage < OsdMessage
+      def self.matches?(parsed_message_data)
+        required_keys = FlightHubDroneOsdMessage::Data::Host.schema.keys.select(&:required?)
+
+        parsed_message_data.key?("OrganizationUUID") &&
+          parsed_message_data.dig("data", "host").is_a?(Hash) &&
+          required_keys.all? do |key|
+            parsed_message_data.dig("data", "host").key?(key.name.to_s)
+          end
+      end
+
+      attribute :OrganizationUUID, Types::UUID
+      attribute :biz_code, Types::String
+      attribute :version, Types::String
+
+      attribute :data do
+        attribute :host do
+          attribute :activation_time, Types::Timestamp | Types::NullInteger
+
+          attribute :attitude_head, Types::JSON::Decimal
+
+          attribute :attitude_pitch, Types::JSON::Decimal
+
+          attribute :attitude_roll, Types::JSON::Decimal
+
+          attribute :battery do
+            attribute :batteries, Types::Array do
+              attribute :capacity_percent, Types::Integer
+              include Mixins::CapacityPercent
+
+              attribute :firmware_version, Types::String | Types::Nil
+              attribute? :high_voltage_storage_days, Types::Integer
+
+              attribute :index, Types::Integer
+
+              attribute :loop_times, Types::Integer
+
+              attribute :sn, Types::SerialNumber | Types::Nil
+
+              attribute :sub_type, Types::DeviceSubType
+
+              attribute :temperature, Types::Temperature
+              include Mixins::Temperature
+
+              attribute :type, Types::DeviceType
+
+              attribute :voltage, Types::Integer
+            end
+
+            attribute :capacity_percent, Types::Integer
+            include Mixins::CapacityPercent
+
+            attribute :landing_power, Types::Integer
+
+            attribute :remain_flight_time, Types::Integer
+
+            attribute :return_home_power, Types::Integer
+          end
+          attribute? :distance_limit_status do
+            attribute :distance_limit, Types::Integer
+
+            # {"0":"Not reached","1":"Reached"}
+            attribute? :is_near_distance_limit, Types::Integer.enum(0, 1)
+
+            # {"0":"Not set","1":"Have been set"}
+
+            attribute :state, Types::Integer.enum(0, 1)
+          end
+
+          attribute :elevation, Types::JSON::Decimal
+
+          attribute? :firmware_version, Types::String | Types::Nil
+
+          attribute :gear, Types::Integer
+
+          attribute :height, Types::JSON::Decimal
+
+          attribute? :height_limit, Types::JSON::Decimal
+
+          attribute :home_distance, Types::JSON::Decimal
+
+          attribute :horizontal_speed, Types::JSON::Decimal
+
+          attribute :latitude, Types::Latitude
+          include Mixins::Latitude
+
+          attribute :longitude, Types::Longitude
+          include Mixins::Longitude
+
+          # {"0":"Standby","1":"Takeoff preparation","2":"Takeoff preparation completed","3":"Manual flight","4":"Automatic takeoff","5":"Wayline flight","6":"Panoramic photography","7":"Intelligent tracking","8":"ADS-B avoidance","9":"Auto returning to home","10":"Automatic landing","11":"Forced landing","12":"Three-blade landing","13":"Upgrading","14":"Not connected","15":"APAS","16":"Virtual stick state","17":"Live Flight Controls","18":"Airborne RTK fixing mode","19":"Dock address selecting","20":"POI"}
+
+          attribute :mode_code, Types::DroneModeCode
+
+          attribute :position_state do
+            attribute :gps_number, Types::Integer
+
+            attribute :is_fixed, Types::Integer
+
+            attribute :quality, Types::Integer
+            include Mixins::PositionStateQuality
+
+            attribute :rtk_number, Types::Integer
+          end
+          attribute? :storage do
+            attribute :total, Types::Integer
+
+            attribute :used, Types::Integer
+          end
+
+          attribute :total_flight_distance, Types::JSON::Decimal
+
+          attribute :total_flight_time, Types::JSON::Decimal
+
+          attribute? :track_id, Types::String | Types::Nil
+
+          attribute :vertical_speed, Types::JSON::Decimal
+
+          attribute :wind_direction, Types::JSON::Decimal
+
+          attribute :wind_speed, Types::JSON::Decimal
+        end # end #data
+
+        attribute :sn, Types::SerialNumber
+      end
+
+      def humanized_summary
+        Translations.thing_product_flight_hub_drone_osd_summary(**humanized_summary_interpolation)
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/osd_message.rb

@@ -5,7 +5,7 @@ module DjiMqttConnect
     class OsdMessage < DjiMqttConnect::Message
       attribute? :tid, Types::UUID
       attribute? :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       # Can be determined from the topic, but included for convenience
       attribute? :gateway, Types::SerialNumber

data/lib/dji_mqtt_connect/messages/thing/product/requests/offline_map_get_v2.rb

@@ -6,7 +6,7 @@ module DjiMqttConnect
       attribute :_method, Types::String.enum("offline_map_get_v2")
 
       attribute :data do
-        attribute :tile_type, Types::Array.of(Types::String).default([].freeze)
+        attribute? :tile_type, Types::Array.of(Types::String).default([].freeze)
       end
     end
   end

data/lib/dji_mqtt_connect/messages/thing/product/requests_message.rb

@@ -5,7 +5,7 @@ module DjiMqttConnect
     class RequestsMessage < DjiMqttConnect::Message
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       # Can be determined from the topic, but included for convenience
       attribute? :gateway, Types::SerialNumber

data/lib/dji_mqtt_connect/messages/thing/product/requests_reply_message.rb

@@ -8,7 +8,7 @@ module DjiMqttConnect
 
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_method, Types::String
 

data/lib/dji_mqtt_connect/messages/thing/product/services/fileupload_start.rb

@@ -29,9 +29,9 @@ module DjiMqttConnect
           attribute :files, Types::Array do
             attribute :list, Types::Array do
               attribute :boot_index, Types::Integer
-              attribute :end_time, Types::Timestamp
+              attribute :end_time, Types::TimestampMS
               attribute :size, Types::Integer
-              attribute :start_time, Types::Timestamp
+              attribute :start_time, Types::TimestampMS
             end
             attribute :module, Types::Coercible::String.enum("0", "3")
             attribute :object_key, Types::String

data/lib/dji_mqtt_connect/messages/thing/product/services/flighttask_prepare.rb

@@ -20,7 +20,7 @@ module DjiMqttConnect
       attribute :data do
         # Millisecond timestamp of task execution time.
         # Optional field. When the task_type is 0 or 1, it is required. When the task_type is 2, it is not required.
-        attribute? :execute_time, Types::Timestamp
+        attribute? :execute_time, Types::TimestampMS
 
         attribute :flight_id, Types::FlightID
 
@@ -47,9 +47,9 @@ module DjiMqttConnect
         attribute? :ready_conditions do
           attribute? :battery_capacity, Types::Integer
 
-          attribute? :begin_time, Types::Timestamp
+          attribute? :begin_time, Types::TimestampMS
 
-          attribute? :end_time, Types::Timestamp
+          attribute? :end_time, Types::TimestampMS
         end
 
         # Optional field. Pre-check conditions added for task execution on the device side. If any condition is not satisfied, execution will fail.

data/lib/dji_mqtt_connect/messages/thing/product/services/flighttask_stop.rb

@@ -17,7 +17,7 @@ module DjiMqttConnect
 
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_method, Types::String.enum("flighttask_stop")
 

data/lib/dji_mqtt_connect/messages/thing/product/services/live_stop_push.rb

@@ -17,7 +17,7 @@ module DjiMqttConnect
 
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_method, Types::String.enum("live_stop_push")
 

data/lib/dji_mqtt_connect/messages/thing/product/services_message.rb

@@ -8,7 +8,7 @@ module DjiMqttConnect
 
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_method, Types::String
 

data/lib/dji_mqtt_connect/messages/thing/product/services_reply_message.rb

@@ -5,7 +5,7 @@ module DjiMqttConnect
     class ServicesReplyMessage < DjiMqttConnect::Message
       attribute :tid, Types::UUID
       attribute :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :_data, Types::Hash
       attribute :_method, Types::String

data/lib/dji_mqtt_connect/messages/thing/product/state_message.rb

@@ -77,7 +77,7 @@ module DjiMqttConnect
     class StateMessage < DjiMqttConnect::Message
       attribute? :tid, Types::UUID
       attribute? :bid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       # Can be determined from the topic, but included for convenience
       attribute? :gateway, Types::SerialNumber

data/lib/dji_mqtt_connect/messages/thing/product/state_reply_message.rb

@@ -20,7 +20,7 @@ module DjiMqttConnect
 
       attribute :bid, Types::UUID
       attribute :tid, Types::UUID
-      attribute :timestamp, Types::Timestamp
+      attribute :timestamp, Types::TimestampMS
 
       attribute :data do
         attribute :result, Types::ResultCode

data/lib/dji_mqtt_connect/translations.rb

@@ -157,6 +157,10 @@ module DjiMqttConnect
       I18n.t("flight_hub_dock", **data, scope: "dji_mqtt_connect.thing_product_osd_summary", default: :default)
     end
 
+    def thing_product_flight_hub_drone_osd_summary(**data)
+      I18n.t("flight_hub_drone", **data, scope: "dji_mqtt_connect.thing_product_osd_summary", default: :default)
+    end
+
     def thing_product_dock_osd_summary(**data)
       I18n.t("dock", **data, scope: "dji_mqtt_connect.thing_product_osd_summary", default: :default)
     end

data/lib/dji_mqtt_connect/types.rb

@@ -16,8 +16,11 @@ module DjiMqttConnect
     # Not a Strict UUID format... turns out DJI doesn't follow one
     UUID = Strict::String.constrained(format: /\A[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\z/i)
 
-    # Just make sure Timestamps are 13 digits long
-    Timestamp = Types::Integer & Types::Coercible::String.constrained(format: /\A[1-9][0-9]{12}\z/)
+    # Timestamp in seconds since epoch
+    Timestamp = Types::Integer & Types::Coercible::String.constrained(format: /\A[1-9][0-9]{9}\z/)
+
+    # Just make sure Timestamps are 13 digits long (millisecond precision)
+    TimestampMS = Types::Integer & Types::Coercible::String.constrained(format: /\A[1-9][0-9]{12}\z/)
 
     # Serial Numbers are alphanumeric with optional hyphen
     SerialNumber = Types::String.constrained(format: /\A[0-9A-Z]+(-[0-9A-Z]+)?\z/)

data/lib/dji_mqtt_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DjiMqttConnect
-  VERSION = "0.1.29.2"
+  VERSION = "0.1.30"
 end

data/lib/dji_mqtt_connect.rb

@@ -65,6 +65,7 @@ module DjiMqttConnect
 
       autoload :OsdMessage, "dji_mqtt_connect/messages/thing/product/osd_message"
       autoload :FlightHubDockOsdMessage, "dji_mqtt_connect/messages/thing/product/osd/flight_hub_dock"
+      autoload :FlightHubDroneOsdMessage, "dji_mqtt_connect/messages/thing/product/osd/flight_hub_drone"
       autoload :DockOsdMessage, "dji_mqtt_connect/messages/thing/product/osd/dock"
       autoload :DroneOsdMessage, "dji_mqtt_connect/messages/thing/product/osd/drone"
       autoload :RemoteOsdMessage, "dji_mqtt_connect/messages/thing/product/osd/remote"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.29.2
+  version: 0.1.30
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-03 00:00:00.000000000 Z
+date: 2025-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,6 +187,7 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/osd/dock.rb
 - lib/dji_mqtt_connect/messages/thing/product/osd/drone.rb
 - lib/dji_mqtt_connect/messages/thing/product/osd/flight_hub_dock.rb
+- lib/dji_mqtt_connect/messages/thing/product/osd/flight_hub_drone.rb
 - lib/dji_mqtt_connect/messages/thing/product/osd/remote.rb
 - lib/dji_mqtt_connect/messages/thing/product/osd_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/requests/airport_bind_status.rb