feat: Add ability to add/delete serial port info via rust bridge

qdot · qdot · commit c058483edc83 · 2024-05-12T17:24:40.000-07:00
diff --git a/intiface-engine-flutter-bridge/src/api.rs b/intiface-engine-flutter-bridge/src/api.rs
@@ -4,7 +4,7 @@ use crate::{
   mobile_init,
 };
 use anyhow::Result;
-use buttplug::server::device::configuration::DeviceConfigurationManagerBuilder;
+use buttplug::server::device::configuration::{DeviceConfigurationManagerBuilder, SerialSpecifier};
 pub use buttplug::{
   core::message::{ButtplugActuatorFeatureMessageType, ButtplugDeviceMessageType, ButtplugSensorFeatureMessageType, DeviceFeature, DeviceFeatureActuator, DeviceFeatureRaw, DeviceFeatureSensor, Endpoint, FeatureType},
   server::device::{
@@ -295,6 +295,34 @@ impl Into<UserDeviceIdentifier> for ExposedUserDeviceIdentifier {
   }
 }
 
+
+#[derive(Debug, Clone)]
+pub struct ExposedSerialSpecifier {
+  pub baud_rate: u32,
+  pub data_bits: u8,
+  pub stop_bits: u8,
+  pub parity: String,
+  pub port: String,
+}
+
+impl From<SerialSpecifier> for ExposedSerialSpecifier {
+  fn from(value: SerialSpecifier) -> Self {
+    Self {
+      port: value.port().clone(),
+      parity: value.parity().clone().into(),
+      baud_rate: value.baud_rate().clone(),
+      data_bits: value.data_bits().clone(),
+      stop_bits: value.stop_bits().clone()
+    }
+  }
+}
+
+impl Into<SerialSpecifier> for ExposedSerialSpecifier {
+  fn into(self) -> SerialSpecifier {
+    SerialSpecifier::new(&self.port, self.baud_rate, self.data_bits, self.stop_bits, self.parity.chars().next().unwrap())
+  }
+}
+
 #[derive(Debug, Clone)]
 pub struct ExposedWebsocketSpecifier {
   pub name: String,
@@ -570,7 +598,7 @@ pub fn setup_device_configuration_manager(base_config: Option<String>, user_conf
   }
 }
 
-pub fn get_user_communication_specifiers() -> Vec<(String, ExposedWebsocketSpecifier)> {
+pub fn get_user_websocket_communication_specifiers() -> Vec<(String, ExposedWebsocketSpecifier)> {
   let dcm = DEVICE_CONFIG_MANAGER.try_read().expect("We should have a reader at this point");
   let mut ws_specs = vec!();
   for kv in dcm.user_communication_specifiers() {
@@ -583,6 +611,19 @@ pub fn get_user_communication_specifiers() -> Vec<(String, ExposedWebsocketSpeci
   ws_specs
 }
 
+pub fn get_user_serial_communication_specifiers() -> Vec<(String, ExposedSerialSpecifier)> {
+  let dcm = DEVICE_CONFIG_MANAGER.try_read().expect("We should have a reader at this point");
+  let mut port_specs = vec!();
+  for kv in dcm.user_communication_specifiers() {
+    for comm_spec in kv.value() {
+      if let ProtocolCommunicationSpecifier::Serial(port) = comm_spec {
+        port_specs.push((kv.key().to_owned(), ExposedSerialSpecifier::from(port.clone())))
+      }  
+    }
+  }
+  port_specs
+}
+
 pub fn get_user_device_definitions() -> Vec<(ExposedUserDeviceIdentifier, ExposedUserDeviceDefinition)> {
   let dcm = DEVICE_CONFIG_MANAGER.try_read().expect("We should have a reader at this point");
   dcm
@@ -610,6 +651,16 @@ pub fn remove_websocket_specifier(protocol: String, name: String) {
   dcm.remove_user_communication_specifier(&protocol, &ProtocolCommunicationSpecifier::Websocket(WebsocketSpecifier::new(&name)));
 }
 
+pub fn add_serial_specifier(protocol: String, port: String, baud_rate: u32, data_bits: u8, stop_bits: u8, parity: String) {
+  let dcm = DEVICE_CONFIG_MANAGER.try_read().expect("We should have a reader at this point");
+  dcm.add_user_communication_specifier(&protocol, &ProtocolCommunicationSpecifier::Serial(SerialSpecifier::new(&port, baud_rate, data_bits, stop_bits, parity.chars().next().unwrap())));
+}
+
+pub fn remove_serial_specifier(protocol: String, port: String) {
+  let dcm = DEVICE_CONFIG_MANAGER.try_read().expect("We should have a reader at this point");
+  dcm.remove_user_communication_specifier(&protocol, &ProtocolCommunicationSpecifier::Serial(SerialSpecifier::new_from_name(&port)));
+}
+
 pub fn update_user_config(identifier: ExposedUserDeviceIdentifier, config: ExposedUserDeviceDefinition) {
   let dcm = DEVICE_CONFIG_MANAGER.try_read().expect("We should have a reader at this point");
   dcm.add_user_device_definition(&identifier.into(), &config.into());
diff --git a/intiface-engine-flutter-bridge/src/bridge_generated.io.rs b/intiface-engine-flutter-bridge/src/bridge_generated.io.rs
@@ -36,8 +36,13 @@ pub extern "C" fn wire_setup_device_configuration_manager(
 }
 
 #[no_mangle]
-pub extern "C" fn wire_get_user_communication_specifiers(port_: i64) {
-  wire_get_user_communication_specifiers_impl(port_)
+pub extern "C" fn wire_get_user_websocket_communication_specifiers(port_: i64) {
+  wire_get_user_websocket_communication_specifiers_impl(port_)
+}
+
+#[no_mangle]
+pub extern "C" fn wire_get_user_serial_communication_specifiers(port_: i64) {
+  wire_get_user_serial_communication_specifiers_impl(port_)
 }
 
 #[no_mangle]
@@ -68,6 +73,30 @@ pub extern "C" fn wire_remove_websocket_specifier(
   wire_remove_websocket_specifier_impl(port_, protocol, name)
 }
 
+#[no_mangle]
+pub extern "C" fn wire_add_serial_specifier(
+  port_: i64,
+  protocol: *mut wire_uint_8_list,
+  port: *mut wire_uint_8_list,
+  baud_rate: u32,
+  data_bits: u8,
+  stop_bits: u8,
+  parity: *mut wire_uint_8_list,
+) {
+  wire_add_serial_specifier_impl(
+    port_, protocol, port, baud_rate, data_bits, stop_bits, parity,
+  )
+}
+
+#[no_mangle]
+pub extern "C" fn wire_remove_serial_specifier(
+  port_: i64,
+  protocol: *mut wire_uint_8_list,
+  port: *mut wire_uint_8_list,
+) {
+  wire_remove_serial_specifier_impl(port_, protocol, port)
+}
+
 #[no_mangle]
 pub extern "C" fn wire_update_user_config(
   port_: i64,
diff --git a/intiface-engine-flutter-bridge/src/bridge_generated.rs b/intiface-engine-flutter-bridge/src/bridge_generated.rs
@@ -110,14 +110,24 @@ fn wire_setup_device_configuration_manager_impl(
     },
   )
 }
-fn wire_get_user_communication_specifiers_impl(port_: MessagePort) {
+fn wire_get_user_websocket_communication_specifiers_impl(port_: MessagePort) {
   FLUTTER_RUST_BRIDGE_HANDLER.wrap::<_, _, _, Vec<(String, ExposedWebsocketSpecifier)>, _>(
     WrapInfo {
-      debug_name: "get_user_communication_specifiers",
+      debug_name: "get_user_websocket_communication_specifiers",
       port: Some(port_),
       mode: FfiCallMode::Normal,
     },
-    move || move |task_callback| Result::<_, ()>::Ok(get_user_communication_specifiers()),
+    move || move |task_callback| Result::<_, ()>::Ok(get_user_websocket_communication_specifiers()),
+  )
+}
+fn wire_get_user_serial_communication_specifiers_impl(port_: MessagePort) {
+  FLUTTER_RUST_BRIDGE_HANDLER.wrap::<_, _, _, Vec<(String, ExposedSerialSpecifier)>, _>(
+    WrapInfo {
+      debug_name: "get_user_serial_communication_specifiers",
+      port: Some(port_),
+      mode: FfiCallMode::Normal,
+    },
+    move || move |task_callback| Result::<_, ()>::Ok(get_user_serial_communication_specifiers()),
   )
 }
 fn wire_get_user_device_definitions_impl(port_: MessagePort) {
@@ -177,6 +187,59 @@ fn wire_remove_websocket_specifier_impl(
     },
   )
 }
+fn wire_add_serial_specifier_impl(
+  port_: MessagePort,
+  protocol: impl Wire2Api<String> + UnwindSafe,
+  port: impl Wire2Api<String> + UnwindSafe,
+  baud_rate: impl Wire2Api<u32> + UnwindSafe,
+  data_bits: impl Wire2Api<u8> + UnwindSafe,
+  stop_bits: impl Wire2Api<u8> + UnwindSafe,
+  parity: impl Wire2Api<String> + UnwindSafe,
+) {
+  FLUTTER_RUST_BRIDGE_HANDLER.wrap::<_, _, _, (), _>(
+    WrapInfo {
+      debug_name: "add_serial_specifier",
+      port: Some(port_),
+      mode: FfiCallMode::Normal,
+    },
+    move || {
+      let api_protocol = protocol.wire2api();
+      let api_port = port.wire2api();
+      let api_baud_rate = baud_rate.wire2api();
+      let api_data_bits = data_bits.wire2api();
+      let api_stop_bits = stop_bits.wire2api();
+      let api_parity = parity.wire2api();
+      move |task_callback| {
+        Result::<_, ()>::Ok(add_serial_specifier(
+          api_protocol,
+          api_port,
+          api_baud_rate,
+          api_data_bits,
+          api_stop_bits,
+          api_parity,
+        ))
+      }
+    },
+  )
+}
+fn wire_remove_serial_specifier_impl(
+  port_: MessagePort,
+  protocol: impl Wire2Api<String> + UnwindSafe,
+  port: impl Wire2Api<String> + UnwindSafe,
+) {
+  FLUTTER_RUST_BRIDGE_HANDLER.wrap::<_, _, _, (), _>(
+    WrapInfo {
+      debug_name: "remove_serial_specifier",
+      port: Some(port_),
+      mode: FfiCallMode::Normal,
+    },
+    move || {
+      let api_protocol = protocol.wire2api();
+      let api_port = port.wire2api();
+      move |task_callback| Result::<_, ()>::Ok(remove_serial_specifier(api_protocol, api_port))
+    },
+  )
+}
 fn wire_update_user_config_impl(
   port_: MessagePort,
   identifier: impl Wire2Api<ExposedUserDeviceIdentifier> + UnwindSafe,
@@ -481,6 +544,25 @@ impl rust2dart::IntoIntoDart<ExposedDeviceFeatureSensor> for ExposedDeviceFeatur
   }
 }
 
+impl support::IntoDart for ExposedSerialSpecifier {
+  fn into_dart(self) -> support::DartAbi {
+    vec![
+      self.baud_rate.into_into_dart().into_dart(),
+      self.data_bits.into_into_dart().into_dart(),
+      self.stop_bits.into_into_dart().into_dart(),
+      self.parity.into_into_dart().into_dart(),
+      self.port.into_into_dart().into_dart(),
+    ]
+    .into_dart()
+  }
+}
+impl support::IntoDartExceptPrimitive for ExposedSerialSpecifier {}
+impl rust2dart::IntoIntoDart<ExposedSerialSpecifier> for ExposedSerialSpecifier {
+  fn into_into_dart(self) -> Self {
+    self
+  }
+}
+
 impl support::IntoDart for ExposedUserDeviceCustomization {
   fn into_dart(self) -> support::DartAbi {
     vec![
diff --git a/ios/Runner/bridge_generated.h b/ios/Runner/bridge_generated.h
@@ -137,7 +137,9 @@ void wire_setup_device_configuration_manager(int64_t port_,
                                              struct wire_uint_8_list *base_config,
                                              struct wire_uint_8_list *user_config);
 
-void wire_get_user_communication_specifiers(int64_t port_);
+void wire_get_user_websocket_communication_specifiers(int64_t port_);
+
+void wire_get_user_serial_communication_specifiers(int64_t port_);
 
 void wire_get_user_device_definitions(int64_t port_);
 
@@ -151,6 +153,18 @@ void wire_remove_websocket_specifier(int64_t port_,
                                      struct wire_uint_8_list *protocol,
                                      struct wire_uint_8_list *name);
 
+void wire_add_serial_specifier(int64_t port_,
+                               struct wire_uint_8_list *protocol,
+                               struct wire_uint_8_list *port,
+                               uint32_t baud_rate,
+                               uint8_t data_bits,
+                               uint8_t stop_bits,
+                               struct wire_uint_8_list *parity);
+
+void wire_remove_serial_specifier(int64_t port_,
+                                  struct wire_uint_8_list *protocol,
+                                  struct wire_uint_8_list *port);
+
 void wire_update_user_config(int64_t port_,
                              struct wire_ExposedUserDeviceIdentifier *identifier,
                              struct wire_ExposedUserDeviceDefinition *config);
@@ -197,11 +211,14 @@ static int64_t dummy_method_to_enforce_bundling(void) {
     dummy_var ^= ((int64_t) (void*) wire_stop_engine);
     dummy_var ^= ((int64_t) (void*) wire_send_backend_server_message);
     dummy_var ^= ((int64_t) (void*) wire_setup_device_configuration_manager);
-    dummy_var ^= ((int64_t) (void*) wire_get_user_communication_specifiers);
+    dummy_var ^= ((int64_t) (void*) wire_get_user_websocket_communication_specifiers);
+    dummy_var ^= ((int64_t) (void*) wire_get_user_serial_communication_specifiers);
     dummy_var ^= ((int64_t) (void*) wire_get_user_device_definitions);
     dummy_var ^= ((int64_t) (void*) wire_get_protocol_names);
     dummy_var ^= ((int64_t) (void*) wire_add_websocket_specifier);
     dummy_var ^= ((int64_t) (void*) wire_remove_websocket_specifier);
+    dummy_var ^= ((int64_t) (void*) wire_add_serial_specifier);
+    dummy_var ^= ((int64_t) (void*) wire_remove_serial_specifier);
     dummy_var ^= ((int64_t) (void*) wire_update_user_config);
     dummy_var ^= ((int64_t) (void*) wire_remove_user_config);
     dummy_var ^= ((int64_t) (void*) wire_get_user_config_str);
diff --git a/lib/bridge_generated.dart b/lib/bridge_generated.dart
diff --git a/macos/Runner/bridge_generated.h b/macos/Runner/bridge_generated.h
