dji_mqtt_connect 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3489491c80c51e9cbebab42f61424b155f1f4d59d33a148e2b44e7a4c614656
-  data.tar.gz: 8a54082a6edf3be34c1ddb1db361d1d684638e1570eb0a68a69ed21c7f13da1f
+  metadata.gz: a011ad0cc1d0fa6ac5a2a46ca0b2189d019021689b4b28aba9487a7dfd5b0b04
+  data.tar.gz: 4e963910473c5cba3ef2052c6cfc1b1d0c1f4e4a5053a10981f67ee52b925068
 SHA512:
-  metadata.gz: 6881b79bc2c695280c83d1ed70515cd26a8aa842a6676c3775b038f42b36eac76712462606676239638a626a838e7a8ecfdfae64004dd6401c23d37d0ce2605a
-  data.tar.gz: c1f9ae6a703e2143feb06798566e1297a2e883f438ab78d1713e9392380b090c359a85b93707e7d341de9e7822509b83446e904b9c567b63e91b0806eaec56fb
+  metadata.gz: 92607be71eb3fa9ae96075a1f1a95ec0badea279ca788be9f9b6ad3a032837026a75cae52e9a80174f117e4cccd06d4dddaaf9a11a1a643d7062ad9426c25cf4
+  data.tar.gz: 1ddc4e521211e8e226fcf1987dad023dcb425e00337f4c4c181eb9cd216215ba370a210667d5256f1943e5f0b7cf27af05c9932222dd1715999429527055341d

data/Gemfile.lock

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

data/lib/dji_mqtt_connect/client.rb

@@ -6,7 +6,7 @@ module DjiMqttConnect
   # Client for communicating with DJI Cloud API MQTT Messages
   # see: https://developer.dji.com/doc/cloud-api-tutorial/en/server-api-reference/mqtt/topic-definition.html
   class Client
-    def self.build(mqtt_address, username:, password:, &block)
+    def self.build(mqtt_address, username:, password:, client_name: DjiMqttConnect.client_name, &block)
       mqtt_url = URI.parse(mqtt_address)
       mqtt_host = mqtt_url.host
       mqtt_port = mqtt_url.port.to_i
@@ -18,7 +18,7 @@ module DjiMqttConnect
         mqtt_client = MQTT::Client.connect(
           host: mqtt_host,
           port: mqtt_port,
-          client_id: DjiMqttConnect.client_id,
+          client_id: MQTT::Client.generate_client_id(client_name),
           username: username,
           password: password,
           ssl: !%w[tcp mqtt ws].include?(mqtt_scheme)

data/lib/dji_mqtt_connect/factories.rb

@@ -115,6 +115,50 @@ module DjiMqttConnect
       )
     end
 
+    def build_thing_product_airport_organization_bind_requests_message
+      message_data = {
+        bind_devices: [
+          {
+            device_binding_code: "",
+            organization_id: "curo",
+            device_callsign: "",
+            sn: "DOCK01",
+            device_secret: "DEVICE_SECRET",
+            device_nonce: "DEVICE_NONCE",
+            device_model_key: "3-1-0"
+          },
+          {
+            device_binding_code: "",
+            organization_id: "curo",
+            device_callsign: "",
+            sn: "M30DRONE01",
+            device_secret: "DEVICE_SECRET",
+            device_nonce: "DEVICE_NONCE",
+            device_model_key: "0-67-0"
+          }
+        ]
+      }
+
+      Thing::Product::AirportOrganizationBindRequestsMessage.new(
+        _method: "airport_organization_bind",
+        _data: message_data,
+        tid: "3093aad5-bb98-5026-685a-cea540eb9267",
+        bid: "479533e0-cb01-933c-3758-22f2a82abeb8",
+        timestamp: 1679380233000,
+        data: message_data,
+        gateway: "DOCK01"
+      )
+    end
+
+    def build_thing_product_airport_organization_bind_requests_reply_message
+      airport_organization_bind_request = build_thing_product_airport_organization_bind_requests_message
+
+      Thing::Product::AirportOrganizationBindRequestsReplyMessage.build_for(
+        airport_organization_bind_request,
+        result: 0
+      )
+    end
+
     def build_thing_product_airport_organization_get_requests_message
       message_data = {
         device_binding_code: "device_binding_code",

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/server-api-reference/mqtt/thing-model/gateway/dock/organization.html#device-bind-to-organization
+    class AirportOrganizationBindRequestsMessage < RequestsMessage
+      attribute :_method, Types::String.enum("airport_organization_bind")
+
+      attribute :data do
+        attribute :bind_devices, Types::Array do
+          attribute :device_binding_code, Types::String
+          attribute :organization_id, Types::String
+          attribute :device_callsign, Types::String
+          attribute :sn, Types::String
+          attribute :device_model_key, Types::String
+          attribute :device_nonce, Types::String
+          attribute :device_secret, Types::String
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    # https://developer.dji.com/doc/cloud-api-tutorial/en/server-api-reference/mqtt/thing-model/gateway/dock/organization.html#device-bind-to-organization
+    class AirportOrganizationBindRequestsReplyMessage < Message
+      def self.build_for(airport_organization_bind_message, err_infos: [], result: 0)
+        new(
+          _method: airport_organization_bind_message._method,
+          tid: airport_organization_bind_message.tid,
+          bid: airport_organization_bind_message.bid,
+          timestamp: Time.now.strftime("%s%L").to_i,
+          data: {
+            result: result,
+            err_infos: err_infos
+          }
+        )
+      end
+
+      attribute :tid, Types::UUID
+      attribute :bid, Types::UUID
+      attribute :timestamp, Types::Timestamp
+
+      attribute :_method, Types::String.enum("airport_organization_bind")
+
+      attribute :data do
+        attribute :result, Types::Integer
+        attribute :err_infos, Types::Array do
+          attribute :sn, Types::String
+
+          # Custom field. Non-zero indicates that the bind was unsuccessful.
+          attribute :err_code, Types::Integer
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module DjiMqttConnect
+  module Thing::Product
+    class FileUploadCallbackEventsMessage < EventsMessage
+      attribute :_method, Types::String.enum("file_upload_callback")
+
+      # NOTE: Not documented, but appears in examples
+      attribute? :need_reply, Types::Integer.enum(0, 1)
+
+      attribute :data do
+        attribute :file do
+          attribute :object_key, Types::String
+
+          attribute :path, Types::String
+
+          attribute :name, Types::String
+
+          attribute :ext do
+            attribute :flight_id, Types::String
+
+            attribute :drone_model_key, Types::String
+
+            attribute :payload_model_key, Types::String
+
+            # {"0":"No","1":"Yes"}
+            attribute :is_original, Types::Bool
+          end
+
+          attribute :metadata do
+            attribute :gimbal_yaw_degree, Types::JSON::Decimal
+
+            attribute :absolute_altitude, Types::JSON::Decimal
+
+            attribute :relative_altitude, Types::JSON::Decimal
+
+            attribute :created_time, Types::JSON::DateTime
+
+            attribute :shoot_position do
+              include Mixins::LatitudeConditional
+              include Mixins::LongitudeConditional
+
+              attribute :lat, Types::Latitude
+              attribute :lng, Types::Longitude
+
+              alias_method :latitude, :lat
+              alias_method :longitude, :lng
+            end
+          end
+        end
+
+        attribute :result, Types::Integer
+      end
+    end
+  end
+end

data/lib/dji_mqtt_connect/version.rb

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

data/lib/dji_mqtt_connect.rb

@@ -33,6 +33,7 @@ module DjiMqttConnect
   module Thing
     module Product
       # Messages
+      autoload :FileUploadCallbackEventsMessage, "dji_mqtt_connect/messages/thing/product/file_upload_callback_events_message"
       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"
@@ -43,12 +44,14 @@ module DjiMqttConnect
       autoload :RemoteOsdMessage, "dji_mqtt_connect/messages/thing/product/remote_osd_message"
 
       autoload :AirportBindStatusRequestsMessage, "dji_mqtt_connect/messages/thing/product/airport_bind_status_requests_message"
+      autoload :AirportOrganizationBindRequestsMessage, "dji_mqtt_connect/messages/thing/product/airport_organization_bind_requests_message"
       autoload :AirportOrganizationGetRequestsMessage, "dji_mqtt_connect/messages/thing/product/airport_organization_get_requests_message"
       autoload :ConfigRequestsMessage, "dji_mqtt_connect/messages/thing/product/config_requests_message"
       autoload :StorageConfigGetRequestsMessage, "dji_mqtt_connect/messages/thing/product/storage_config_get_requests_message"
       autoload :RequestsMessage, "dji_mqtt_connect/messages/thing/product/requests_message"
 
       autoload :AirportBindStatusRequestsReplyMessage, "dji_mqtt_connect/messages/thing/product/airport_bind_status_requests_reply_message"
+      autoload :AirportOrganizationBindRequestsReplyMessage, "dji_mqtt_connect/messages/thing/product/airport_organization_bind_requests_reply_message"
       autoload :AirportOrganizationGetRequestsReplyMessage, "dji_mqtt_connect/messages/thing/product/airport_organization_get_requests_reply_message"
       autoload :ConfigRequestsReplyMessage, "dji_mqtt_connect/messages/thing/product/config_requests_reply_message"
       autoload :StorageConfigGetRequestsReplyMessage, "dji_mqtt_connect/messages/thing/product/storage_config_get_requests_reply_message"
@@ -89,7 +92,7 @@ module DjiMqttConnect
     autoload :MessageSerializer, "dji_mqtt_connect/railties/message_serializer"
   end
 
-  cattr_accessor :client_id, default: MQTT::Client.generate_client_id(name)
+  cattr_accessor :client_name, default: name
   cattr_accessor :logger, default: ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new($stdout)).tap { |logger| logger.level = Logger::INFO }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dji_mqtt_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Sphere Drones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -121,6 +121,8 @@ files:
 - lib/dji_mqtt_connect/messages/sys/product/update_topo_status_reply_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/airport_bind_status_requests_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/airport_bind_status_requests_reply_message.rb
+- lib/dji_mqtt_connect/messages/thing/product/airport_organization_bind_requests_message.rb
+- lib/dji_mqtt_connect/messages/thing/product/airport_organization_bind_requests_reply_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/airport_organization_get_requests_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/airport_organization_get_requests_reply_message.rb
 - lib/dji_mqtt_connect/messages/thing/product/config_requests_message.rb
@@ -128,6 +130,7 @@ files:
 - 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/file_upload_callback_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