dji_mqtt_connect 0.1.20.1 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c0a46731aaabdaedbb0c44ccf73c73a568440762a2a5b09f9ec23a241bef04
-  data.tar.gz: b7e616d46c8e4701fd28b5a68089e7610fde5a770cf8c01d17144d331d0be3b8
+  metadata.gz: 7c7dcc1c840ccf9aaee09ac40525e54250b00543951b3adf3fc2535fead82529
+  data.tar.gz: 768cbfdd365db52896838434a319742e55dbd82ad021d0a3aa6c76f07d94f8ac
 SHA512:
-  metadata.gz: 40f586f623c7c269b3de4b54265b4efb1a2145f64462b974c3f4b01d9f775f5772c715a7cfff1970a63e8124179619245ce88cf1d282134f7b329857e874a6cc
-  data.tar.gz: 9716ab8742e0e598863e7272ab2c612c00ccf895e8e7d62ecb0aff45f31c1cfef5061c053140120e7fd310406f7a0e691a6024dd58e76a36739331905959b259
+  metadata.gz: 530a33ad82c122710f9a8421553768cd7eff877099722d2ce34918d434703c7fa429fdad587030db3fca04953c5c26411d3665d9bd61e468d4e6ddfc4feafee5
+  data.tar.gz: 01df1da7273ba9b2492cd799c6eb08d8d20bb022c90f3860acd528abc32af4e2d759f6d8ec4a0ed922035db58bd0e7ef9cf68e2f668d68aaa97d00d4532282a7

data/.rubocop.yml

@@ -17,4 +17,4 @@ inherit_from:
 AllCops:
   NewCops: disable
   SuggestExtensions: true
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 2.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dji_mqtt_connect (0.1.20.1)
+    dji_mqtt_connect (0.1.21)
       activesupport (>= 6.0, <= 8)
       dry-struct (~> 1.6)
       dry-transformer (~> 1.0)
@@ -11,19 +11,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.0.8)
-      activesupport (= 7.0.8)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activesupport (7.0.8)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    base64 (0.1.1)
-    concurrent-ruby (1.2.2)
-    diff-lcs (1.5.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
     docile (1.4.0)
+    drb (2.2.1)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
@@ -39,7 +47,8 @@ GEM
       zeitwerk (~> 2.6)
     dry-transformer (1.0.1)
       zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+    dry-types (1.7.2)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
@@ -47,63 +56,66 @@ GEM
       zeitwerk (~> 2.6)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.6.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
-    minitest (5.20.0)
+    minitest (5.22.3)
     mqtt (0.6.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    mutex_m (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    racc (1.7.1)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
+    rake (13.2.1)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    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-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.56.4)
-      base64 (~> 0.1.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      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.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.24.1)
-      rubocop (~> 1.33)
+    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)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -111,24 +123,24 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    standard (1.31.1)
+    standard (1.35.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.56.2)
+      rubocop (~> 1.62.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.2)
+      standard-performance (~> 1.3)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.2.0)
+    standard-performance (1.3.1)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.19.0)
+      rubocop-performance (~> 1.20.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     wisper (2.0.1)
     wisper-rspec (1.1.0)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-22

data/dji_mqtt_connect.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Manages MQTT Connections with DJI Drones"
   # spec.description = "TODO: Write a longer description or delete this line."
   spec.homepage = "https://github.com/sphere-drones/dji_mqtt_connect"
-  spec.required_ruby_version = ">= 3.1.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 

data/lib/dji_mqtt_connect/client.rb

@@ -76,6 +76,11 @@ module DjiMqttConnect
       Thing::Product::ServicesReplyTopicRepository.new(self)
     end
 
+    # Handles topic thing/product/#{pid}/state
+    def thing_product_state_topic
+      Thing::Product::StateTopicRepository.new(self)
+    end
+
     attr_reader :mqtt_client
   end
 end

data/lib/dji_mqtt_connect/factories.rb

@@ -799,6 +799,45 @@ module DjiMqttConnect
       )
     end
 
+    ### Live Stream (Services Messages) ###
+
+    def build_thing_product_live_lens_change_services_message
+      Thing::Product::LiveLensChangeServicesMessage.build(
+        data: {
+          video_id: "1ZNDH1D0010098/39-0-7/normal-0",
+          video_type: "wide"
+        }
+      )
+    end
+
+    def build_thing_product_live_set_quality_services_message
+      Thing::Product::LiveSetQualityServicesMessage.build(
+        data: {
+          video_id: "1ZNDH1D0010098/39-0-7/normal-0",
+          video_quality: 0
+        }
+      )
+    end
+
+    def build_thing_product_live_start_push_services_message
+      Thing::Product::LiveStartPushServicesMessage.build(
+        data: {
+          url: "channel=1ZNDH1D0010098_39-0-7&sn=1ZNDH1D0010098&token=006dca67721582a48768ec4d817b7b25a86IADk%2Fcm%2Fdv%2BHY6qT%2FAKM6y7TcUe4lXNvZpycH7vUMAlM6pFALUKF2zyCIgA82pQE8cCoYAQAAQDxwKhgAgDxwKhgAwDxwKhgBADxwKhg&uid=50000",
+          url_type: 0,
+          video_id: "1ZNDH1D0010098/39-0-7/normal-0",
+          video_quality: 0
+        }
+      )
+    end
+
+    def build_thing_product_live_stop_push_services_message
+      Thing::Product::LiveStopPushServicesMessage.build(
+        data: {
+          video_id: "1ZNDH1D0010098/39-0-7/normal-0"
+        }
+      )
+    end
+
     def build_thing_product_return_home_services_message
       Thing::Product::ReturnHomeServicesMessage.build
     end
@@ -1004,6 +1043,60 @@ module DjiMqttConnect
       )
     end
 
+    ### Live Stream (Services Reply Messages) ###
+
+    def build_thing_product_live_lens_change_services_reply_message
+      message_data = {result: 0}
+
+      Thing::Product::LiveLensChangeServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "live_lens_change",
+        _data: message_data,
+        data: message_data
+      )
+    end
+
+    def build_thing_product_live_set_quality_services_reply_message
+      message_data = {result: 0}
+
+      Thing::Product::LiveSetQualityServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "live_set_quality",
+        _data: message_data,
+        data: message_data
+      )
+    end
+
+    def build_thing_product_live_start_push_services_reply_message
+      message_data = {result: 0}
+
+      Thing::Product::LiveStartPushServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "live_start_push",
+        _data: message_data,
+        data: message_data
+      )
+    end
+
+    def build_thing_product_live_stop_push_services_reply_message
+      message_data = {result: 0}
+
+      Thing::Product::LiveStopPushServicesReplyMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        _method: "live_stop_push",
+        _data: message_data,
+        data: message_data
+      )
+    end
+
     def build_thing_product_return_home_services_reply_message
       message_data = {
         result: 0,
@@ -1032,5 +1125,85 @@ module DjiMqttConnect
         data: message_data
       )
     end
+
+    ### State Messages ###
+
+    def build_thing_product_live_capacity_state_message
+      message_data = {
+        live_capacity: {
+          available_video_number: 3,
+          coexist_video_number_max: 2,
+          device_list: [
+            {
+              sn: "DOCK01",
+              available_video_number: 1,
+              coexist_video_number_max: 1,
+              camera_list: [
+                {
+                  camera_index: "165-0-7",
+                  available_video_number: 1,
+                  coexist_video_number_max: 1,
+                  video_list: [
+                    {
+                      video_index: "normal-0",
+                      video_type: "normal",
+                      switchable_video_types: [
+                        "normal"
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              sn: "DRONE01",
+              available_video_number: 2,
+              coexist_video_number_max: 2,
+              camera_list: [
+                {
+                  camera_index: "39-0-7",
+                  available_video_number: 1,
+                  coexist_video_number_max: 1,
+                  video_list: [
+                    {
+                      video_index: "normal-0",
+                      video_type: "normal",
+                      switchable_video_types: [
+                        "normal"
+                      ]
+                    }
+                  ]
+                },
+                {
+                  camera_index: "52-0-0",
+                  available_video_number: 1,
+                  coexist_video_number_max: 1,
+                  video_list: [
+                    {
+                      video_index: "normal-0",
+                      video_type: "wide",
+                      switchable_video_types: [
+                        "wide",
+                        "zoom",
+                        "ir"
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+
+      Thing::Product::StateMessage.new(
+        bid: Message.generate_bid,
+        tid: Message.generate_tid,
+        timestamp: Message.current_timestamp,
+        gateway: "GATEWAY01",
+        _data: message_data,
+        data: message_data
+      )
+    end
   end
 end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "dry-struct"
+require "dry-transformer"
+require "json"
+
+module DjiMqttConnect
+  module Thing::Product
+    class StateMarshal < 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
+          copy_keys "data" => "_data"
+        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
+        StateMessage.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 #{StateMessage} payload")
+      end
+
+      private
+
+      def attribute_transformer
+        @attribute_transformer ||= AttributeTransformer.new
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services/live_lens_change.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # Live Set Lens
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock1/live.html
+    class LiveLensChangeServicesMessage < Message
+      def self.build(data:, bid: generate_bid, tid: generate_tid, timestamp: current_timestamp)
+        new(
+          bid: bid,
+          tid: tid,
+          data: data,
+          timestamp: timestamp,
+          _method: "live_lens_change"
+        )
+      end
+
+      # {"ir":"Infrared","normal":"Default","wide":"Wide-angle","zoom":"Zoom"}
+      VIDEO_TYPE_INFRARED = "ir"
+      VIDEO_TYPE_DEFAULT = "normal"
+      VIDEO_TYPE_WIDE_ANGLE = "wide"
+      VIDEO_TYPE_ZOOM = "zoom"
+
+      attribute :tid, Types::UUID
+      attribute :bid, Types::UUID
+      attribute :timestamp, Types::Timestamp
+
+      attribute :_method, Types::String.enum("live_lens_change")
+      attribute :data do
+        attribute :video_id, Types::String
+
+        attribute :video_type, Types::String.enum(
+          VIDEO_TYPE_INFRARED,
+          VIDEO_TYPE_DEFAULT,
+          VIDEO_TYPE_WIDE_ANGLE,
+          VIDEO_TYPE_ZOOM
+        )
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services/live_set_quality.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # Live Set Quality
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock1/live.html
+    class LiveSetQualityServicesMessage < Message
+      def self.build(data:, bid: generate_bid, tid: generate_tid, timestamp: current_timestamp)
+        new(
+          bid: bid,
+          tid: tid,
+          data: data,
+          timestamp: timestamp,
+          _method: "live_set_quality"
+        )
+      end
+
+      # {"0":"Adaptive","1":"Smooth","2":"Standard definition","3":"High definition","4":"Ultra-high definition"}
+      VIDEO_QUALITY_ADAPTIVE = 0
+      VIDEO_QUALITY_SMOOTH = 1
+      VIDEO_QUALITY_STANDARD_DEFINITION = 2
+      VIDEO_QUALITY_HIGH_DEFINITION = 3
+      VIDEO_QUALITY_ULTRA_HIGH_DEFINITION = 4
+
+      attribute :tid, Types::UUID
+      attribute :bid, Types::UUID
+      attribute :timestamp, Types::Timestamp
+
+      attribute :_method, Types::String.enum("live_set_quality")
+      attribute :data do
+        attribute :video_id, Types::String
+
+        attribute :video_quality, Types::Integer.enum(
+          VIDEO_QUALITY_ADAPTIVE,
+          VIDEO_QUALITY_SMOOTH,
+          VIDEO_QUALITY_STANDARD_DEFINITION,
+          VIDEO_QUALITY_HIGH_DEFINITION,
+          VIDEO_QUALITY_ULTRA_HIGH_DEFINITION
+        )
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services/live_start_push.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # Live Start Push
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock1/live.html
+    class LiveStartPushServicesMessage < Message
+      def self.build(data:, bid: generate_bid, tid: generate_tid, timestamp: current_timestamp)
+        new(
+          bid: bid,
+          tid: tid,
+          data: data,
+          timestamp: timestamp,
+          _method: "live_start_push"
+        )
+      end
+
+      # {"0":"Agora","1":"RTMP","3":"GB28181","4":"WebRTC"}
+      URL_TYPE_AGORA = 0
+      URL_TYPE_RTMP = 1
+      URL_TYPE_GB28181 = 3
+      URL_TYPE_WEBRTC = 4
+
+      # {"0":"Adaptive","1":"Smooth","2":"Standard definition","3":"High definition","4":"Ultra-high definition"}
+      VIDEO_QUALITY_ADAPTIVE = 0
+      VIDEO_QUALITY_SMOOTH = 1
+      VIDEO_QUALITY_STANDARD_DEFINITION = 2
+      VIDEO_QUALITY_HIGH_DEFINITION = 3
+      VIDEO_QUALITY_ULTRA_HIGH_DEFINITION = 4
+
+      attribute :tid, Types::UUID
+      attribute :bid, Types::UUID
+      attribute :timestamp, Types::Timestamp
+
+      attribute :_method, Types::String.enum("live_start_push")
+      attribute :data do
+        attribute :url, Types::String
+
+        attribute :url_type, Types::Integer.enum(
+          URL_TYPE_AGORA,
+          URL_TYPE_RTMP,
+          URL_TYPE_GB28181,
+          URL_TYPE_WEBRTC
+        )
+
+        attribute :video_id, Types::String
+
+        attribute :video_quality, Types::Integer.enum(
+          VIDEO_QUALITY_ADAPTIVE,
+          VIDEO_QUALITY_SMOOTH,
+          VIDEO_QUALITY_STANDARD_DEFINITION,
+          VIDEO_QUALITY_HIGH_DEFINITION,
+          VIDEO_QUALITY_ULTRA_HIGH_DEFINITION
+        )
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services/live_stop_push.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # Live Stop Push
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/api-reference/dock-to-cloud/mqtt/dock/dock1/live.html
+    class LiveStopPushServicesMessage < Message
+      def self.build(data:, bid: generate_bid, tid: generate_tid, timestamp: current_timestamp)
+        new(
+          bid: bid,
+          tid: tid,
+          data: data,
+          timestamp: timestamp,
+          _method: "live_stop_push"
+        )
+      end
+
+      attribute :tid, Types::UUID
+      attribute :bid, Types::UUID
+      attribute :timestamp, Types::Timestamp
+
+      attribute :_method, Types::String.enum("live_stop_push")
+      attribute :data do
+        attribute :video_id, Types::String
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services_reply/live_lens_change.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class LiveLensChangeServicesReplyMessage < ServicesReplyMessage
+      attribute :_method, Types::String.enum("live_lens_change")
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services_reply/live_set_quality.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class LiveSetQualityServicesReplyMessage < ServicesReplyMessage
+      attribute :_method, Types::String.enum("live_set_quality")
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services_reply/live_start_push.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class LiveStartPushServicesReplyMessage < ServicesReplyMessage
+      attribute :_method, Types::String.enum("live_start_push")
+    end
+  end
+end

data/lib/dji_mqtt_connect/messages/thing/product/services_reply/live_stop_push.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class LiveStopPushServicesReplyMessage < ServicesReplyMessage
+      attribute :_method, Types::String.enum("live_stop_push")
+    end
+  end
+end

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

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # {
+    #   "bid": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx",
+    #   "tid": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx",
+    #   "data": {
+    #     "live_capacity": {
+    #       "available_video_number": 3,
+    #       "coexist_video_number_max": 2,
+    #       "device_list": [
+    #         {
+    #           "sn": "4BKBJ4R1010TGD",
+    #           "available_video_number": 1,
+    #           "coexist_video_number_max": 1,
+    #           "camera_list": [
+    #             {
+    #               "camera_index": "165-0-7",
+    #               "available_video_number": 1,
+    #               "coexist_video_number_max": 1,
+    #               "video_list": [
+    #                 {
+    #                   "video_index": "normal-0",
+    #                   "video_type": "normal",
+    #                   "switchable_video_types": [
+    #                     "normal"
+    #                   ]
+    #                 }
+    #               ]
+    #             }
+    #           ]
+    #         },
+    #         {
+    #           "sn": "1581F4BND22180040075",
+    #           "available_video_number": 2,
+    #           "coexist_video_number_max": 2,
+    #           "camera_list": [
+    #             {
+    #               "camera_index": "39-0-7",
+    #               "available_video_number": 1,
+    #               "coexist_video_number_max": 1,
+    #               "video_list": [
+    #                 {
+    #                   "video_index": "normal-0",
+    #                   "video_type": "normal",
+    #                   "switchable_video_types": [
+    #                     "normal"
+    #                   ]
+    #                 }
+    #               ]
+    #             },
+    #             {
+    #               "camera_index": "52-0-0",
+    #               "available_video_number": 1,
+    #               "coexist_video_number_max": 1,
+    #               "video_list": [
+    #                 {
+    #                   "video_index": "normal-0",
+    #                   "video_type": "wide",
+    #                   "switchable_video_types": [
+    #                     "wide",
+    #                     "zoom",
+    #                     "ir"
+    #                   ]
+    #                 }
+    #               ]
+    #             }
+    #           ]
+    #         }
+    #       ]
+    #     }
+    #   },
+    #   "timestamp:": 1654070968655,
+    #   "gateway": "4BKBJ4R1010TGD"
+    # }
+    class StateMessage < DjiMqttConnect::Message
+      attribute :tid, Types::UUID
+      attribute :bid, Types::UUID
+      attribute :timestamp, Types::Timestamp
+      attribute :gateway, Types::String
+
+      attribute :_data, Types::Hash
+
+      attribute :data do
+        # Not all messages will have a live_capacity attribute
+        attribute? :live_capacity do
+          attribute :available_video_number, Types::Integer
+          attribute :coexist_video_number_max, Types::Integer
+          attribute :device_list, Types::Array do
+            attribute :sn, Types::String
+            attribute :available_video_number, Types::Integer
+            attribute :coexist_video_number_max, Types::Integer
+            attribute :camera_list, Types::Array do
+              attribute :camera_index, Types::String
+              attribute :available_video_number, Types::Integer
+              attribute :coexist_video_number_max, Types::Integer
+              attribute :video_list, Types::Array do
+                attribute :video_index, Types::String
+                attribute :video_type, Types::String
+                attribute :switchable_video_types, Types::Array.of(Types::String)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class StateTopicRepository < TopicRepository
+      STATE_TOPIC_REGEX = /\Athing\/product\/(?<gateway_sn>.+)\/state\z/
+
+      def listen!
+        listen_to_topic("thing/product/+/state") do |topic, raw_message|
+          logger.debug(raw_message)
+
+          matched_topic = STATE_TOPIC_REGEX.match(topic)
+          raise Error, "Unknown topic: #{topic}" unless matched_topic
+
+          gateway_sn = matched_topic[:gateway_sn]
+          message = state_marshal.load(raw_message)
+
+          logger.info("Received #{message} from #{gateway_sn}")
+
+          # Broadcast the state update
+          broadcast(:state_update, gateway_sn, message)
+        rescue ParseError => error
+          broadcast(:parse_error, error, topic, raw_message)
+        end
+      end
+
+      private
+
+      def state_marshal
+        @state_marshal ||= StateMarshal.new
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/version.rb

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

data/lib/dji_mqtt_connect.rb

@@ -90,6 +90,10 @@ module DjiMqttConnect
       autoload :FlighttaskPrepareServicesMessage, "dji_mqtt_connect/messages/thing/product/services/flighttask_prepare"
       autoload :FlighttaskRecoveryServicesMessage, "dji_mqtt_connect/messages/thing/product/services/flighttask_recovery"
       autoload :FlighttaskUndoServicesMessage, "dji_mqtt_connect/messages/thing/product/services/flighttask_undo"
+      autoload :LiveLensChangeServicesMessage, "dji_mqtt_connect/messages/thing/product/services/live_lens_change"
+      autoload :LiveSetQualityServicesMessage, "dji_mqtt_connect/messages/thing/product/services/live_set_quality"
+      autoload :LiveStartPushServicesMessage, "dji_mqtt_connect/messages/thing/product/services/live_start_push"
+      autoload :LiveStopPushServicesMessage, "dji_mqtt_connect/messages/thing/product/services/live_stop_push"
       autoload :ReturnHomeServicesMessage, "dji_mqtt_connect/messages/thing/product/services/return_home"
       autoload :ReturnHomeCancelServicesMessage, "dji_mqtt_connect/messages/thing/product/services/return_home_cancel"
 
@@ -104,9 +108,15 @@ module DjiMqttConnect
       autoload :FlighttaskPrepareServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/flighttask_prepare"
       autoload :FlighttaskRecoveryServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/flighttask_recovery"
       autoload :FlighttaskUndoServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/flighttask_undo"
+      autoload :LiveLensChangeServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/live_lens_change"
+      autoload :LiveSetQualityServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/live_set_quality"
+      autoload :LiveStartPushServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/live_start_push"
+      autoload :LiveStopPushServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/live_stop_push"
       autoload :ReturnHomeServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/return_home"
       autoload :ReturnHomeCancelServicesReplyMessage, "dji_mqtt_connect/messages/thing/product/services_reply/return_home_cancel"
 
+      autoload :StateMessage, "dji_mqtt_connect/messages/thing/product/state_message"
+
       # Topics
       autoload :EventsTopicRepository, "dji_mqtt_connect/topics/thing/product/events"
       autoload :EventsReplyTopicRepository, "dji_mqtt_connect/topics/thing/product/events_reply"
@@ -115,6 +125,7 @@ module DjiMqttConnect
       autoload :RequestsReplyTopicRepository, "dji_mqtt_connect/topics/thing/product/requests_reply"
       autoload :ServicesTopicRepository, "dji_mqtt_connect/topics/thing/product/services"
       autoload :ServicesReplyTopicRepository, "dji_mqtt_connect/topics/thing/product/services_reply"
+      autoload :StateTopicRepository, "dji_mqtt_connect/topics/thing/product/state"
 
       # Marshals
       autoload :EventsMarshal, "dji_mqtt_connect/marshals/thing/product/events_marshal"
@@ -127,6 +138,8 @@ module DjiMqttConnect
 
       autoload :ServicesMarshal, "dji_mqtt_connect/marshals/thing/product/services_marshal"
       autoload :ServicesReplyMarshal, "dji_mqtt_connect/marshals/thing/product/services_reply_marshal"
+
+      autoload :StateMarshal, "dji_mqtt_connect/marshals/thing/product/state_marshal"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.20.1
+  version: 0.1.21
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2024-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,6 +122,7 @@ files:
 - lib/dji_mqtt_connect/marshals/thing/product/requests_reply_marshal.rb
 - lib/dji_mqtt_connect/marshals/thing/product/services_marshal.rb
 - lib/dji_mqtt_connect/marshals/thing/product/services_reply_marshal.rb
+- lib/dji_mqtt_connect/marshals/thing/product/state_marshal.rb
 - lib/dji_mqtt_connect/message.rb
 - lib/dji_mqtt_connect/message_marshal.rb
 - lib/dji_mqtt_connect/messages/sys/product/status/update_topo.rb
@@ -177,6 +178,10 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/services/flighttask_prepare.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/flighttask_recovery.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/flighttask_undo.rb
+- lib/dji_mqtt_connect/messages/thing/product/services/live_lens_change.rb
+- lib/dji_mqtt_connect/messages/thing/product/services/live_set_quality.rb
+- lib/dji_mqtt_connect/messages/thing/product/services/live_start_push.rb
+- lib/dji_mqtt_connect/messages/thing/product/services/live_stop_push.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/return_home.rb
 - lib/dji_mqtt_connect/messages/thing/product/services/return_home_cancel.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_message.rb
@@ -190,9 +195,14 @@ files:
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/flighttask_prepare.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/flighttask_recovery.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/flighttask_undo.rb
+- lib/dji_mqtt_connect/messages/thing/product/services_reply/live_lens_change.rb
+- lib/dji_mqtt_connect/messages/thing/product/services_reply/live_set_quality.rb
+- lib/dji_mqtt_connect/messages/thing/product/services_reply/live_start_push.rb
+- lib/dji_mqtt_connect/messages/thing/product/services_reply/live_stop_push.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/return_home.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply/return_home_cancel.rb
 - lib/dji_mqtt_connect/messages/thing/product/services_reply_message.rb
+- lib/dji_mqtt_connect/messages/thing/product/state_message.rb
 - lib/dji_mqtt_connect/mixins/events_progress_checks.rb
 - lib/dji_mqtt_connect/mixins/latitude_conditional.rb
 - lib/dji_mqtt_connect/mixins/longitude_conditional.rb
@@ -211,6 +221,7 @@ files:
 - lib/dji_mqtt_connect/topics/thing/product/requests_reply.rb
 - lib/dji_mqtt_connect/topics/thing/product/services.rb
 - lib/dji_mqtt_connect/topics/thing/product/services_reply.rb
+- lib/dji_mqtt_connect/topics/thing/product/state.rb
 - lib/dji_mqtt_connect/translations.rb
 - lib/dji_mqtt_connect/types.rb
 - lib/dji_mqtt_connect/utils/message_parsing.rb
@@ -233,14 +244,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: Manages MQTT Connections with DJI Drones