dji_mqtt_connect 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9ba8caf2ea370ed33848df512fbebcc63dfd4b63dd07947a1a653f56fdb1a8
-  data.tar.gz: 16ec8180f911733314fc2be3dbfefc5433c758663b3a52fd9a9fe7e6c00ca370
+  metadata.gz: b81ef7e12ef07f8f3d42d5bae091f2f5d3e99c4afe3bea10cf1b5bacf8592a83
+  data.tar.gz: b374963480351bdbb3de7418d3fbcbd8bf6a6c8785b7e107051c3fcddf870676
 SHA512:
-  metadata.gz: dfacde33b13c8aa12e096013273c8ca597a3ae7cf1a54fde85eaf353a6ff3c0b94bc062f0ad351e6d47bdad0f599c2c12b41f1dde9ddf91bd8ae3b666360e725
-  data.tar.gz: ac51091158d1459ca3e6d4666ec86abbae044a04b130e8f4bfc374b7b5dcf315c418b61a25e3a7b78019bc7d3aa024c025656b2de15aa1951e4e1300b82d5c88
+  metadata.gz: e97c71486c48d8c475b212e804c1ad8e12e5e32dc9769dd2332465b34a86c9ff5429e37727000cc606704eba10916d62226f1ebc3ebbef2b23382292ab5274b5
+  data.tar.gz: 6f35209caa9a35bbf8ca3e82fa24d103b6387d026334e7ecb4f3454c0327c03b598ed67b1e614f40742d26ff87f78c5391e9d8e1c947c58ff1d7a076f3d02588

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dji_mqtt_connect (0.1.4)
+    dji_mqtt_connect (0.1.5)
       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,41 @@ 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
+
+          rename_keys "method" => "_method"
         end
       end
 
@@ -28,9 +56,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/topics/thing/product/events.rb

@@ -25,6 +25,8 @@ module DjiMqttConnect
             event_name = message.class.name.demodulize.sub(/sMessage\z/, "").underscore.to_sym
             broadcast(event_name, device_sn, message)
           end
+        rescue ParseError => error
+          broadcast(:parse_error, error, topic, raw_message)
         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/utils/mqttx_fixture_data_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/array/wrap"
 require "stringio"
 
 module DjiMqttConnect
@@ -53,7 +54,7 @@ module DjiMqttConnect
       def extracted_messages
         return enum_for(:extracted_messages) unless block_given?
 
-        mqttx_data.each do |client_output|
+        Array.wrap(mqttx_data).each do |client_output|
           client_messages = client_output["messages"]
 
           client_messages.each do |message|

data/lib/dji_mqtt_connect/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sphere Drones