dji_mqtt_connect 0.1.4.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbb1f6a5cee41059ec3528a88ec50e9d0c558c41280024d45556fcab092d6508
-  data.tar.gz: d7b5bd0c3e7d06e098b0c384d40175d1e284290ee12a4de1a316c91da01157e6
+  metadata.gz: f3489491c80c51e9cbebab42f61424b155f1f4d59d33a148e2b44e7a4c614656
+  data.tar.gz: 8a54082a6edf3be34c1ddb1db361d1d684638e1570eb0a68a69ed21c7f13da1f
 SHA512:
-  metadata.gz: 931690b396410a56c174dc004a64c466e843d9f48d6cb6467a74d3e02116c68bc97390791d586f65db2a8cafa00263e8eff420481ffe52ff3e61d8b20bd403f2
-  data.tar.gz: 4356a30715205936278d0a1ef01e997b9551131ae1e581dd094008b1129f80de93aa2d8713fc843bb4d5bc5074140a769447d7ff4214ed8af5a1f2bfc44a2f43
+  metadata.gz: 6881b79bc2c695280c83d1ed70515cd26a8aa842a6676c3775b038f42b36eac76712462606676239638a626a838e7a8ecfdfae64004dd6401c23d37d0ce2605a
+  data.tar.gz: c1f9ae6a703e2143feb06798566e1297a2e883f438ab78d1713e9392380b090c359a85b93707e7d341de9e7822509b83446e904b9c567b63e91b0806eaec56fb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dji_mqtt_connect (0.1.4.1)
+    dji_mqtt_connect (0.1.6)
       activesupport (>= 6.0, <= 8)
       dry-struct (~> 1.6)
       dry-transformer (~> 1.0)

data/lib/dji_mqtt_connect/marshals/sys/product/status_marshal.rb

@@ -13,10 +13,8 @@ module DjiMqttConnect
         import Dry::Transformer::HashTransformations
 
         define! do
-          symbolize_keys
-
-          copy_keys data: :_data
-          rename_keys method: :_method
+          copy_keys "data" => "_data"
+          rename_keys "method" => "_method"
         end
       end
 
@@ -27,9 +25,10 @@ module DjiMqttConnect
 
         # Transform the message
         transformed_message = attribute_transformer.call(parsed_message)
+        message_method = transformed_message["_method"]
 
         # Build an instance of the class, or a generic message from the current class
-        message_class = message_class_from_method_value(parsed_message, StatusMessage)
+        message_class = message_class_from_message_method(message_method, StatusMessage)
         message_class.new transformed_message
       rescue JSON::ParserError => e
         raise ParseError.new(e, "Unable to parse message as JSON")

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

@@ -11,13 +11,50 @@ module DjiMqttConnect
 
       # Rename pesky `method` argument to `_method` and makes a copy of the raw data
       class AttributeTransformer < Dry::Transformer::Pipe
+        import Dry::Transformer::Conditional
+        import Dry::Transformer::ArrayTransformations
         import Dry::Transformer::HashTransformations
 
         define! do
-          symbolize_keys
+          # Keep a copy of the original data hash
+          copy_keys "data" => "_data"
 
-          copy_keys data: :_data
-          rename_keys method: :_method
+          # Fix the legacy hms message
+          guard ->(message) { message.dig("data", "method") == "hms" } do
+            map_value "data" do
+              reject_keys ["event"]
+
+              map_value "output" do
+                map_value "codes" do
+                  map_array do
+                    nest "args", ["component_index", "sensor_index"]
+
+                    map_value "id", ->(id) { "0x#{id}" }
+                    rename_keys "id" => "code"
+
+                    deep_merge({"module" => 3}) # hardcoded to hms module
+                  end
+                end
+              end
+
+              unwrap "output", ["codes"]
+
+              rename_keys "codes" => "list"
+            end
+
+            unwrap "data", ["method"]
+          end
+
+          # Fix the legacy status code message
+          guard ->(message) { message.dig("data", "method") == "status_code" } do
+            map_value "data" do
+              unwrap "output", ["codes"]
+            end
+
+            unwrap "data", ["method"]
+          end
+
+          rename_keys "method" => "_method"
         end
       end
 
@@ -28,9 +65,10 @@ module DjiMqttConnect
 
         # Transform the message
         transformed_message = attribute_transformer.call(parsed_message)
+        message_method = transformed_message["_method"]
 
         # Build an instance of the class, or a generic message from the current class
-        message_class = message_class_from_method_value(parsed_message, EventsMessage)
+        message_class = message_class_from_message_method(message_method, EventsMessage)
         message_class.new transformed_message
       rescue JSON::ParserError => e
         raise ParseError.new(e, "Unable to parse message as JSON")

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

@@ -14,10 +14,8 @@ module DjiMqttConnect
         import Dry::Transformer::HashTransformations
 
         define! do
-          symbolize_keys
-
-          copy_keys data: :_data
-          rename_keys method: :_method
+          copy_keys "data" => "_data"
+          rename_keys "method" => "_method"
         end
       end
 
@@ -28,9 +26,10 @@ module DjiMqttConnect
 
         # Transform the message
         transformed_message = attribute_transformer.call(parsed_message)
+        message_method = transformed_message["_method"]
 
         # Build an instance of the class, or a generic message from the current class
-        message_class = message_class_from_method_value(parsed_message, RequestsMessage)
+        message_class = message_class_from_message_method(message_method, RequestsMessage)
         message_class.new transformed_message
       rescue JSON::ParserError => e
         raise ParseError.new(e, "Unable to parse message as JSON")

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

@@ -14,12 +14,12 @@ module DjiMqttConnect
           attribute :module, Types::Integer.enum(0, 1, 2, 3)
 
           # {"0":"on the ground","1":"in the sky"}
-          attribute :in_the_sky, Types::Integer.enum(0, 1)
+          attribute? :in_the_sky, Types::Integer.enum(0, 1)
 
           attribute :code, Types::String
 
           # {"0":"No","1":"Yes"}
-          attribute :imminent, Types::Integer.enum(0, 1)
+          attribute? :imminent, Types::Integer.enum(0, 1)
 
           attribute :args do
             attribute :component_index, Types::Integer

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # NOTE: Message is not documented, but observed from M30 Drones
+    class StatusCodeEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("status_code")
+
+      attribute :data do
+        attribute :codes, Types::Array do
+          attribute :id, Types::Integer
+        end
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/utils/message_parsing.rb

@@ -5,8 +5,7 @@ module DjiMqttConnect
     module MessageParsing
       private
 
-      def message_class_from_method_value(parsed_message, generic_class)
-        message_method = parsed_message["method"]
+      def message_class_from_message_method(message_method, generic_class)
         return generic_class if message_method.blank?
 
         # update_topo => UpdateTopo

data/lib/dji_mqtt_connect/version.rb

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

data/lib/dji_mqtt_connect.rb

@@ -34,6 +34,7 @@ module DjiMqttConnect
     module Product
       # Messages
       autoload :HmsEventsMessage, "dji_mqtt_connect/messages/thing/product/hms_events_message"
+      autoload :StatusCodeEventsMessage, "dji_mqtt_connect/messages/thing/product/status_code_events_message"
       autoload :EventsMessage, "dji_mqtt_connect/messages/thing/product/events_message"
 
       autoload :OsdMessage, "dji_mqtt_connect/messages/thing/product/osd_message"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.4.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,7 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/osd_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/remote_osd_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/requests_message.rb
+- lib/dji_mqtt_connect/messages/thing/product/status_code_events_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/storage_config_get_requests_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/storage_config_get_requests_reply_message.rb
 - lib/dji_mqtt_connect/mixins/latitude_conditional.rb