dji_mqtt_connect 0.1.25.1 → 0.1.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641f953b267980d632c395423af50f45b219cc14908f186a5ca43bd6208177f0
-  data.tar.gz: e9eddfd13a0671236148ed29f233dbbb543eba76ab5c1257c4b000c93936890e
+  metadata.gz: f5ebb4aa93615a5f9bf4b1fd5e4940124097e5e39be3da6689811cdd901279e4
+  data.tar.gz: d01e12d6cffd21964e6d1b0318a788d9bb97c096c84349847020ee04743fc2d1
 SHA512:
-  metadata.gz: 73d4491a720405a71d983068ae6f509e5983713a962dfe32fab9d6a8b7ab4740431f3d3806154da7937193440c77835176a0a621ec702188bea59313ea313511
-  data.tar.gz: 67bfb358102f7622252433cb488afc31b080957710ba96aaafae865e0d696c8a7befd2ad22bacfaa2edbf7d50b3e4814bf989a5a4bb4c1cf2a01337734068b95
+  metadata.gz: f57cb155efddf6819381c5d23694f8fc620efdfdc4d565eb38ab373207745f7cf18fc646005738e1ff19a14e48e68f7d064496729f10decfa20c3dcf82901e87
+  data.tar.gz: f9acf914b4d687195233b267b22b6ef341988e19bb2f50bdfca62b8289cfae0ed3f1705ddbf16bf3d44213d611f2a34a96c553110220e9aa1402260c44dbadea

data/.rubocop/rspec.yml

@@ -1,4 +1,6 @@
 require:
+  - rubocop-capybara
+  - rubocop-factory_bot
   - rubocop-rspec
 
 # Disable all cops by default,

data/Gemfile

@@ -14,7 +14,8 @@ gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.21"
 
 gem "rubocop-rake"
-
+gem "rubocop-capybara"
+gem "rubocop-factory_bot"
 gem "rubocop-rspec"
 
 gem "simplecov", require: false

data/Gemfile.lock

@@ -1,53 +1,59 @@
 PATH
   remote: .
   specs:
-    dji_mqtt_connect (0.1.25.1)
+    dji_mqtt_connect (0.1.25.2)
       activesupport (>= 6.0, <= 8)
-      dry-struct (~> 1.6)
+      dry-struct (~> 1.7)
       dry-transformer (~> 1.0)
+      json (~> 2.10)
       mqtt (~> 0.6.0)
       wisper (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activejob (7.2.2.1)
+      activesupport (= 7.2.2.1)
       globalid (>= 0.3.6)
-    activesupport (7.1.3.2)
+    activesupport (7.2.2.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     diff-lcs (1.5.1)
-    docile (1.4.0)
+    docile (1.4.1)
     drb (2.2.1)
-    dry-core (1.0.1)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
-    dry-logic (1.5.0)
+    dry-inflector (1.2.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-struct (1.6.0)
-      dry-core (~> 1.0, < 2)
-      dry-types (>= 1.7, < 2)
+    dry-struct (1.7.1)
+      dry-core (~> 1.1)
+      dry-types (~> 1.8, >= 1.8.2)
       ice_nine (~> 0.11)
       zeitwerk (~> 2.6)
     dry-transformer (1.0.1)
       zeitwerk (~> 2.6)
-    dry-types (1.7.2)
+    dry-types (1.8.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
@@ -56,91 +62,87 @@ GEM
       zeitwerk (~> 2.6)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.4)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    json (2.10.1)
+    language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
-    minitest (5.22.3)
+    logger (1.6.5)
+    minitest (5.25.4)
     mqtt (0.6.0)
-    mutex_m (0.2.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rspec-support (3.13.2)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.0)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-performance (1.20.2)
+    rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.29.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.4.0)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    standard (1.35.1)
+    standard (1.45.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.62.0)
+      rubocop (~> 1.71.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.3)
+      standard-performance (~> 1.6)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.3.1)
+    standard-performance (1.6.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.20.2)
+      rubocop-performance (~> 1.23.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    zeitwerk (2.6.13)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   arm64-darwin-22
@@ -154,6 +156,8 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.21)
+  rubocop-capybara
+  rubocop-factory_bot
   rubocop-rake
   rubocop-rspec
   simplecov

data/dji_mqtt_connect.gemspec

@@ -33,8 +33,10 @@ Gem::Specification.new do |spec|
   # Use Active Support for inflection and logging
   spec.add_dependency "activesupport", ">= 6.0", "<= 8"
 
+  spec.add_dependency "json", "~> 2.10"
+
   # Use Dry-rb for valid POROs
-  spec.add_dependency "dry-struct", "~> 1.6"
+  spec.add_dependency "dry-struct", "~> 1.7"
   spec.add_dependency "dry-transformer", "~> 1.0"
 
   # Use MQTT as a client for receiving/sending messages

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

@@ -20,9 +20,9 @@ module DjiMqttConnect
           attribute :ext do
             attribute :flight_id, Types::FlightID
 
-            attribute :drone_model_key, Types::String
+            attribute :drone_model_key, Types::String | Types::Nil
 
-            attribute :payload_model_key, Types::String
+            attribute :payload_model_key, Types::String | Types::Nil
 
             # {"0":"No","1":"Yes"}
             attribute :is_original, Types::Bool

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

@@ -12,7 +12,7 @@ module DjiMqttConnect
           attribute :organization_id, Types::String | Types::Nil
           attribute :device_callsign, Types::String | Types::Nil
           attribute :sn, Types::SerialNumber | Types::Nil
-          attribute :device_model_key, Types::String
+          attribute :device_model_key, Types::String | Types::Nil
           attribute :device_nonce, Types::String | Types::Nil
           attribute :device_secret, Types::String | Types::Nil
 

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

@@ -97,7 +97,7 @@ module DjiMqttConnect
         end
 
         attribute? :cameras, Types::Array do
-          attribute :camera_mode, Types::Integer
+          attribute? :camera_mode, Types::Integer
           attribute :liveview_world_region do
             attribute :bottom, Types::JSON::Decimal
             attribute :left, Types::JSON::Decimal
@@ -105,34 +105,34 @@ module DjiMqttConnect
             attribute :top, Types::JSON::Decimal
           end
           attribute :payload_index, Types::String
-          attribute :photo_state, Types::Integer
-          attribute :record_time, Types::Integer
-          attribute :recording_state, Types::Integer
-          attribute :remain_photo_num, Types::Integer
-          attribute :remain_record_duration, Types::Integer
-          attribute :wide_calibrate_farthest_focus_value, Types::Integer
-          attribute :wide_calibrate_nearest_focus_value, Types::Integer
-          attribute :wide_exposure_mode, Types::Integer
-          attribute :wide_exposure_value, Types::Integer
-          attribute :wide_focus_mode, Types::Integer
-          attribute :wide_focus_state, Types::Integer
-          attribute :wide_focus_value, Types::Integer
-          attribute :wide_iso, Types::Integer
-          attribute :wide_max_focus_value, Types::Integer
-          attribute :wide_min_focus_value, Types::Integer
-          attribute :wide_shutter_speed, Types::Integer
-          attribute :zoom_calibrate_farthest_focus_value, Types::Integer
-          attribute :zoom_calibrate_nearest_focus_value, Types::Integer
-          attribute :zoom_exposure_mode, Types::Integer
-          attribute :zoom_exposure_value, Types::Integer
-          attribute :zoom_factor, Types::JSON::Decimal
-          attribute :zoom_focus_mode, Types::Integer
-          attribute :zoom_focus_state, Types::Integer
-          attribute :zoom_focus_value, Types::Integer
-          attribute :zoom_iso, Types::Integer
-          attribute :zoom_max_focus_value, Types::Integer
-          attribute :zoom_min_focus_value, Types::Integer
-          attribute :zoom_shutter_speed, Types::Integer
+          attribute? :photo_state, Types::Integer
+          attribute? :record_time, Types::Integer
+          attribute? :recording_state, Types::Integer
+          attribute? :remain_photo_num, Types::Integer
+          attribute? :remain_record_duration, Types::Integer
+          attribute? :wide_calibrate_farthest_focus_value, Types::Integer
+          attribute? :wide_calibrate_nearest_focus_value, Types::Integer
+          attribute? :wide_exposure_mode, Types::Integer
+          attribute? :wide_exposure_value, Types::Integer
+          attribute? :wide_focus_mode, Types::Integer
+          attribute? :wide_focus_state, Types::Integer
+          attribute? :wide_focus_value, Types::Integer
+          attribute? :wide_iso, Types::Integer
+          attribute? :wide_max_focus_value, Types::Integer
+          attribute? :wide_min_focus_value, Types::Integer
+          attribute? :wide_shutter_speed, Types::Integer
+          attribute? :zoom_calibrate_farthest_focus_value, Types::Integer
+          attribute? :zoom_calibrate_nearest_focus_value, Types::Integer
+          attribute? :zoom_exposure_mode, Types::Integer
+          attribute? :zoom_exposure_value, Types::Integer
+          attribute? :zoom_factor, Types::JSON::Decimal
+          attribute? :zoom_focus_mode, Types::Integer
+          attribute? :zoom_focus_state, Types::Integer
+          attribute? :zoom_focus_value, Types::Integer
+          attribute? :zoom_iso, Types::Integer
+          attribute? :zoom_max_focus_value, Types::Integer
+          attribute? :zoom_min_focus_value, Types::Integer
+          attribute? :zoom_shutter_speed, Types::Integer
         end
 
         # Not all messages will have a live_capacity attribute
@@ -175,10 +175,10 @@ module DjiMqttConnect
         end
 
         attribute? :payloads, Types::Array do
-          attribute :control_source, Types::String
-          attribute? :firmware_version, Types::String
+          attribute :control_source, Types::String | Types::Nil
+          attribute? :firmware_version, Types::String | Types::Nil
           attribute :payload_index, Types::String
-          attribute? :sn, Types::SerialNumber
+          attribute? :sn, Types::SerialNumber | Types::Nil
         end
 
         attribute? :rtcm_info do
@@ -209,7 +209,7 @@ module DjiMqttConnect
         attribute? :commander_flight_height, Types::Integer
         attribute? :commander_flight_mode, Types::Integer
         attribute? :commander_mode_lost_action, Types::Integer
-        attribute? :control_source, Types::String
+        attribute? :control_source, Types::String | Types::Nil
         attribute? :current_commander_flight_mode, Types::Integer
         attribute? :current_rth_mode, Types::Integer
         attribute? :flysafe_database_version, Types::String

data/lib/dji_mqtt_connect/utils/message_parsing.rb

@@ -28,6 +28,8 @@ module DjiMqttConnect
       def build_message(message_class, transformed_message)
         message_class.new transformed_message
       rescue Dry::Struct::Error => e
+        e = find_deepest_dry_struct_error(e, e)
+
         # Get the source of the error and the error message (without the source)
         source = e.message.include?(".new] ") ? e.message.split(".new] ").first.sub(/\A\[/, "") : message_class.name
         error_message = e.message.split(".new] ").last
@@ -39,6 +41,7 @@ module DjiMqttConnect
           # e.cause.message: nil (NilClass) has invalid type for :_data violates constraints (type?(Hash, nil) failed)
           cause_key = e.cause.key.to_s.sub("_data", "data")
           cause_message = "#{e.cause.value.inspect} (#{e.cause.value.class.name}) is invalid type for :#{cause_key}"
+
           # cause_message: nil (NilClass) is invalid type for :data
           raise ParseError.new(e, "Unexpected #{source} payload (#{cause_message})")
         else
@@ -46,6 +49,16 @@ module DjiMqttConnect
         end
       end
 
+      def find_deepest_dry_struct_error(error, deepest)
+        if error.is_a?(Dry::Struct::Error)
+          find_deepest_dry_struct_error(error.cause, error)
+        elsif error.respond_to?(:cause) && error.cause
+          find_deepest_dry_struct_error(error.cause, deepest)
+        else
+          deepest
+        end
+      end
+
       def message_class_from_message_method(message_method, generic_class)
         return generic_class if message_method.blank?
 

data/lib/dji_mqtt_connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.25.1
+  version: 0.1.25.2
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,20 +30,34 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '8'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: dry-transformer
   requirement: !ruby/object:Gem::Requirement