fix: Actually pay attention to message ids for readings

DO NOT HARDCODE THEM TO 1. :(

Author: qdot

crates/buttplug_server/src/device/server_device.rs

@@ -48,6 +48,7 @@ use buttplug_core::{
   errors::{ButtplugDeviceError, ButtplugError},
   message::{
     self,
+    ButtplugMessage,
     ButtplugServerMessageV4,
     DeviceFeature,
     DeviceMessageInfoV4,
@@ -535,9 +536,17 @@ impl ServerDevice {
     &self,
     command_message: ButtplugDeviceCommandMessageUnionV4,
   ) -> ButtplugServerResultFuture {
-    match command_message {
+    match &command_message {
       // Input messages
-      ButtplugDeviceCommandMessageUnionV4::InputCmd(msg) => self.handle_input_cmd(msg),
+      ButtplugDeviceCommandMessageUnionV4::InputCmd(msg) => {
+        let fut = self.handle_input_cmd(msg);
+        let msg_id = msg.id();
+        async move {
+          let mut msg = fut.await?;
+          msg.set_id(msg_id);
+          Ok(msg)
+        }.boxed()
+      },
       // Actuator messages
       ButtplugDeviceCommandMessageUnionV4::OutputCmd(msg) => self.handle_outputcmd_v4(&msg),
       ButtplugDeviceCommandMessageUnionV4::OutputVecCmd(msg) => {
@@ -610,7 +619,7 @@ impl ServerDevice {
 
   fn handle_input_cmd(
     &self,
-    message: CheckedInputCmdV4,
+    message: &CheckedInputCmdV4,
   ) -> BoxFuture<'static, Result<ButtplugServerMessageV4, ButtplugError>> {
     match message.input_command() {
       InputCommandType::Read => self.handle_input_read_cmd(

crates/buttplug_server/src/message/v2/battery_level_cmd.rs

@@ -80,6 +80,7 @@ impl TryFromDeviceAttributes<BatteryLevelCmdV2> for CheckedInputCmdV4 {
       .0;
 
     Ok(CheckedInputCmdV4::new(
+      msg.id(),
       msg.device_index(),
       *feature_index,
       InputType::Battery,

crates/buttplug_server/src/message/v3/sensor_read_cmd.rs

@@ -83,6 +83,7 @@ impl TryFromDeviceAttributes<SensorReadCmdV3> for CheckedInputCmdV4 {
       .find(|(_, p)| p.input().as_ref().is_some_and(|x| x.battery().is_some()))
     {
       Ok(CheckedInputCmdV4::new(
+        msg.id(),
         msg.device_index(),
         *feature_index,
         InputType::Battery,

crates/buttplug_server/src/message/v4/checked_input_cmd.rs

@@ -36,14 +36,15 @@ pub struct CheckedInputCmdV4 {
 
 impl CheckedInputCmdV4 {
   pub fn new(
+    id: u32,
     device_index: u32,
     feature_index: u32,
     input_type: InputType,
     input_command: InputCommandType,
     feature_id: Uuid,
   ) -> Self {
     Self {
-      id: 1,
+      id,
       device_index,
       feature_index,
       input_type,
@@ -69,6 +70,7 @@ impl TryFromDeviceAttributes<InputCmdV4> for CheckedInputCmdV4 {
       if let Some(sensor_map) = feature.input() {
         if sensor_map.contains(msg.input_type()) {
           Ok(CheckedInputCmdV4::new(
+            msg.id(),
             msg.device_index(),
             msg.feature_index(),
             msg.input_type(),