dji_mqtt_connect 0.1.19.2 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ee39b795f662201b49e2390046aba2b90963940ce03980fd6e07f9f7de6c0e
-  data.tar.gz: d47a3c8bc1154aba8d282ed0095a9c4b986c82dde7359e3ef15db241569085f7
+  metadata.gz: df34f882455e0115d20170670c3cfeff6d52af9184be36f221b22b092bf696a6
+  data.tar.gz: c0df3c4b7415e9ebee4e8b232268add1a475e92c6add94ed90eee4f3f4b2d855
 SHA512:
-  metadata.gz: a75908421b0588112f72b1b08452c18cd6209efb45e6be675c544acf7e5d5e475c4bb85e2a7f3803b49bed114efb9827522285f581489699a59c4079765b89a3
-  data.tar.gz: 5fc3beab2ba3cb2514704491ce4e084b1578f36e126e71c1e91971b9a7d0a7d26eb2cec9bd6b1d5de9eb48808bd31b492df6ddfcf011d89cdbaf2571c4ce49c3
+  metadata.gz: a4c8ab91a478f5bb8e1b70071b1ba0999277cacae5fe36f9195a69f035bc292f2175734fb9a701e5fb6c3fc0ed3a255c0d57cfe2d3337ce66d583094186b97c0
+  data.tar.gz: 4bf14e95502fd070111c3928b06488457a44edb1943a6db563339fb106b0f48c7f2fc174c6ba94f66dcd58e94a8432a37056dfcd4b7226016dd778b77046e090

data/Gemfile.lock

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

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

@@ -20,7 +20,7 @@ module DjiMqttConnect
           copy_keys "data" => "_data"
 
           # Fix the legacy hms message
-          guard ->(message) { message.dig("data", "method") == "hms" } do
+          guard ->(message) { message["method"].blank? && message.dig("data", "method") == "hms" } do
             map_value "data" do
               reject_keys ["event"]
 
@@ -47,7 +47,7 @@ module DjiMqttConnect
           end
 
           # Fix the legacy status code message
-          guard ->(message) { message.dig("data", "method") == "status_code" } do
+          guard ->(message) { message["method"].blank? && message.dig("data", "method") == "status_code" } do
             map_value "data" do
               unwrap "output", ["codes"]
             end
@@ -75,9 +75,6 @@ module DjiMqttConnect
         raise ParseError.new(e, "Unable to parse message as JSON")
       rescue Dry::Struct::Error => e
         raise ParseError.new(e, "Unexpected #{message_class} payload")
-      rescue TypeError => e
-        # FIXME: airsense messages have data as an array, this breaks a lot of code...
-        raise ParseError.new(e, "Unable to parse message")
       end
 
       private

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class AirsenseWarningEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("airsense_warning")
+      attribute :_data, Types::Array
+
+      attribute :data, Types::Array do
+        attribute :icao, Types::String
+
+        # {"0":"No danger","1":"Level one","2":"Level two","3":"Level three","4":"Level four"}
+        attribute :warning_level, Types::Integer.enum(0, 1, 2, 3, 4)
+
+        attribute :latitude, Types::Latitude
+
+        attribute :longitude, Types::Longitude
+
+        attribute :altitude, Types::Integer
+
+        # {"0":"Ellipsoid height","1":"altitude"}
+        attribute :altitude_type, Types::Integer.enum(0, 1)
+
+        attribute :distance, Types::Integer
+
+        attribute :heading, Types::JSON::Decimal
+
+        attribute :relative_altitude, Types::Integer
+
+        # {"0":"Relative height unchanged","1":"Relative height increase","2":"Relative height decrease"}
+        attribute :vert_trend, Types::Integer.enum(0, 1, 2)
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/version.rb

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

data/lib/dji_mqtt_connect.rb

@@ -34,6 +34,7 @@ module DjiMqttConnect
   module Thing
     module Product
       # Messages
+      autoload :AirsenseWarningEventsMessage, "dji_mqtt_connect/messages/thing/product/events/airsense_warning"
       autoload :CoverCloseEventsMessage, "dji_mqtt_connect/messages/thing/product/events/cover_close"
       autoload :CoverOpenEventsMessage, "dji_mqtt_connect/messages/thing/product/events/cover_open"
       autoload :DeviceLogEventsMessage, "dji_mqtt_connect/messages/thing/product/events/device_log"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.19.2
+  version: 0.1.20
 platform: ruby
 authors:
 - Sphere Drones
@@ -127,6 +127,7 @@ files:
 - lib/dji_mqtt_connect/messages/sys/product/status/update_topo.rb
 - lib/dji_mqtt_connect/messages/sys/product/status_message.rb
 - lib/dji_mqtt_connect/messages/sys/product/status_reply/update_topo.rb
+- lib/dji_mqtt_connect/messages/thing/product/events/airsense_warning.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/cover_close.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/cover_open.rb
 - lib/dji_mqtt_connect/messages/thing/product/events/device_exit_homing_notify.rb