dji_mqtt_connect 0.1.3 → 0.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e40cb40801a11ebd25bc5ae79c3b6b332c879cb1ddb026e5e2a4cf8c48415564
-  data.tar.gz: b0629c19cbc9a6e3c7378727c0fa1a0253c42def15ac0ff0602c64ea8d071357
+  metadata.gz: fbb1f6a5cee41059ec3528a88ec50e9d0c558c41280024d45556fcab092d6508
+  data.tar.gz: d7b5bd0c3e7d06e098b0c384d40175d1e284290ee12a4de1a316c91da01157e6
 SHA512:
-  metadata.gz: 8bc46c0f8448ae3d551c7bc99f74e432e5a253a6686aff92a7e4798867ff801bcbff895675813646a3fbf727a1d8db93c82e30613eaef14f4d8bf1c0d834624b
-  data.tar.gz: a91a113aa29a75f636704b2266dff13e10a2e7daeb0e1fe1f3ee4951a8cdf85b255fe88502534fe28e98a512751f6d00731f11ef029311a8281a55427c9557e5
+  metadata.gz: 931690b396410a56c174dc004a64c466e843d9f48d6cb6467a74d3e02116c68bc97390791d586f65db2a8cafa00263e8eff420481ffe52ff3e61d8b20bd403f2
+  data.tar.gz: 4356a30715205936278d0a1ef01e997b9551131ae1e581dd094008b1129f80de93aa2d8713fc843bb4d5bc5074140a769447d7ff4214ed8af5a1f2bfc44a2f43

data/Gemfile.lock

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

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

@@ -29,7 +29,7 @@ module DjiMqttConnect
         transformed_message = attribute_transformer.call(parsed_message)
 
         # Build an instance of the class, or a generic message from the current class
-        message_class = message_class_for_parsed_message(parsed_message, StatusMessage)
+        message_class = message_class_from_method_value(parsed_message, 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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "dry-struct"
+require "dry-transformer"
+require "json"
+
+module DjiMqttConnect
+  module Thing::Product
+    class EventsMarshal < MessageMarshal
+      include Utils::MessageParsing
+
+      # Rename pesky `method` argument to `_method` and makes a copy of the raw data
+      class AttributeTransformer < Dry::Transformer::Pipe
+        import Dry::Transformer::HashTransformations
+
+        define! do
+          symbolize_keys
+
+          copy_keys data: :_data
+          rename_keys method: :_method
+        end
+      end
+
+      # Attempts to look a the method attribute, and builds a specific Message class for the message
+      def load(raw_message)
+        # Parse the message from JSON
+        parsed_message = JSON.parse(raw_message)
+
+        # Transform the message
+        transformed_message = attribute_transformer.call(parsed_message)
+
+        # 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.new transformed_message
+      rescue JSON::ParserError => e
+        raise ParseError.new(e, "Unable to parse message as JSON")
+      rescue Dry::Struct::Error => e
+        raise ParseError.new(e, "Unexpected #{message_class} payload")
+      end
+
+      private
+
+      def attribute_transformer
+        @attribute_transformer ||= AttributeTransformer.new
+      end
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module DjiMqttConnect
         transformed_message = attribute_transformer.call(parsed_message)
 
         # Build an instance of the class, or a generic message from the current class
-        message_class = message_class_for_parsed_message(parsed_message, RequestsMessage)
+        message_class = message_class_from_method_value(parsed_message, 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/events_message.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class EventsMessage < Message
+      attribute :bid, Types::UUID
+      attribute :tid, Types::UUID
+      attribute :timestamp, Types::Timestamp
+
+      attribute :_data, Types::Hash
+      attribute :_method, Types::String
+
+      def to_s
+        # Include data method for Generic messages
+        instance_of?(EventsMessage) ? "#{super}[#{_method}]" : super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class HmsEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("hms")
+
+      attribute :data do
+        attribute :list, Types::Array do
+          # {"0":"Inform","1":"Notice","2":"Alarm"}
+          attribute :level, Types::Integer.enum(0, 1, 2)
+
+          # {"0":"flight mission","1":"device management","2":"media","3":"hms"}
+          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 :code, Types::String
+
+          # {"0":"No","1":"Yes"}
+          attribute :imminent, Types::Integer.enum(0, 1)
+
+          attribute :args do
+            attribute :component_index, Types::Integer
+
+            attribute :sensor_index, Types::Integer
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/topics/thing/product/events.rb

@@ -12,8 +12,21 @@ module DjiMqttConnect
           matched_topic = EVENTS_TOPIC_REGEX.match(topic)
           raise Error, "Unknown topic: #{topic}" unless matched_topic
 
-          # Everything is Unsupported
-          broadcast(:unsupported_message, topic, raw_message)
+          device_sn = matched_topic[:device_sn]
+          message = EventsMarshal.load(raw_message)
+
+          logger.info("Received #{message} from #{device_sn}")
+
+          if message.instance_of?(EventsMessage)
+            # Broadcast an unsupported message event
+            broadcast(:unsupported_message, topic, raw_message)
+          else
+            # Build event name and broadcast (i.e. ::HmsEventsMessage => hms_event)
+            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,9 +5,12 @@ module DjiMqttConnect
     module MessageParsing
       private
 
-      def message_class_for_parsed_message(parsed_message, generic_class)
+      def message_class_from_method_value(parsed_message, generic_class)
+        message_method = parsed_message["method"]
+        return generic_class if message_method.blank?
+
         # update_topo => UpdateTopo
-        classified_method = ActiveSupport::Inflector.classify(parsed_message["method"])
+        classified_method = message_method.split("_").collect! { |w| w.capitalize }.join
 
         # UpdateTopo => DjiMqttConnect::Sys::Product::UpdateTopoStatusMessage
         module_prefix, joiner, class_suffix = generic_class.name.rpartition("::")

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.3"
+  VERSION = "0.1.4.1"
 end

data/lib/dji_mqtt_connect.rb

@@ -33,6 +33,9 @@ module DjiMqttConnect
   module Thing
     module Product
       # Messages
+      autoload :HmsEventsMessage, "dji_mqtt_connect/messages/thing/product/hms_events_message"
+      autoload :EventsMessage, "dji_mqtt_connect/messages/thing/product/events_message"
+
       autoload :OsdMessage, "dji_mqtt_connect/messages/thing/product/osd_message"
       autoload :DockOsdMessage, "dji_mqtt_connect/messages/thing/product/dock_osd_message"
       autoload :DroneOsdMessage, "dji_mqtt_connect/messages/thing/product/drone_osd_message"
@@ -56,6 +59,8 @@ module DjiMqttConnect
       autoload :RequestsReplyTopicRepository, "dji_mqtt_connect/topics/thing/product/requests_reply"
 
       # Marshals
+      autoload :EventsMarshal, "dji_mqtt_connect/marshals/thing/product/events_marshal"
+
       autoload :OsdMarshal, "dji_mqtt_connect/marshals/thing/product/osd_marshal"
 
       autoload :RequestsMarshal, "dji_mqtt_connect/marshals/thing/product/requests_marshal"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4.1
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-12 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -110,6 +110,7 @@ files:
 - lib/dji_mqtt_connect/factories.rb
 - lib/dji_mqtt_connect/marshals/sys/product/status_marshal.rb
 - lib/dji_mqtt_connect/marshals/sys/product/status_reply_marshal.rb
+- lib/dji_mqtt_connect/marshals/thing/product/events_marshal.rb
 - lib/dji_mqtt_connect/marshals/thing/product/osd_marshal.rb
 - lib/dji_mqtt_connect/marshals/thing/product/requests_marshal.rb
 - lib/dji_mqtt_connect/marshals/thing/product/requests_reply_marshal.rb
@@ -126,6 +127,8 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/config_requests_reply_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/dock_osd_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/drone_osd_message.rb
+- lib/dji_mqtt_connect/messages/thing/product/events_message.rb
+- lib/dji_mqtt_connect/messages/thing/product/hms_events_message.rb
 - 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