Merge remote-tracking branch 'upstream/dev' into feature-cleanup

Author: jsmnbom

CLAUDE.md

@@ -38,7 +38,6 @@ Buttplug is a framework for interfacing with intimate hardware devices. It uses
 **Hardware Managers** (under `buttplug_server_hwmgr_*`):
 - `btleplug` - Bluetooth LE (primary, cross-platform)
 - `serial`, `hid` - USB serial and HID devices
-- `lovense_dongle`, `lovense_connect` - Lovense-specific (deprecated)
 - `xinput` - Windows gamepad vibration
 - `websocket` - WebSocket device forwarders
 

Cargo.toml

@@ -9,8 +9,6 @@ members = [
     "crates/buttplug_server_device_config",
     "crates/buttplug_server_hwmgr_btleplug",
     "crates/buttplug_server_hwmgr_hid",
-    "crates/buttplug_server_hwmgr_lovense_connect",
-    "crates/buttplug_server_hwmgr_lovense_dongle",
     "crates/buttplug_server_hwmgr_serial",
     "crates/buttplug_server_hwmgr_websocket",
     "crates/buttplug_server_hwmgr_xinput",

README.md

@@ -101,8 +101,6 @@ This project consists of the following crates:
 | [buttplug_server_device_config](crates/buttplug_server_device_config/) | Device configuration file loading and database implementation. |
 | [buttplug_server_hwmgr_btleplug](crates/buttplug_server_hwmgr_btleplug/) | Bluetooth LE device communication support |
 | [buttplug_server_hwmgr_hid](crates/buttplug_server_hwmgr_hid/) | HID device communication support |
-| [buttplug_server_hwmgr_lovense_connect](crates/buttplug_server_hwmgr_lovense_connect/) | Lovense Connect device communication support (soon to be deprecated) |
-| [buttplug_server_hwmgr_lovense_dongle](crates/buttplug_server_hwmgr_lovense_dongle/) | Lovense Dongle device communication support (soon to be deprecated) |
 | [buttplug_server_hwmgr_serial](crates/buttplug_server_hwmgr_serial/) | Serial device communication support |
 | [buttplug_server_hwmgr_websocket](crates/buttplug_server_hwmgr_websocket/) | Websocket device communication suppor, used for devices that may connect in ways not directly supported by other formats |
 | [buttplug_server_hwmgr_xinput](crates/buttplug_server_hwmgr_xinput/) | XInput gamepad support (windows only) |

crates/buttplug_client/Cargo.toml

@@ -18,15 +18,19 @@ test = true
 doctest = true
 doc = true
 
+[features]
+default = ["tokio-runtime"]
+tokio-runtime = ["buttplug_core/tokio-runtime"]
+wasm = ["buttplug_core/wasm"]
+
 [dependencies]
-buttplug_core = { version = "10.0.1", path = "../buttplug_core" }
+buttplug_core = { version = "10.0.1", path = "../buttplug_core", default-features = false }
 futures = "0.3.32"
 thiserror = "2.0.18"
 log = "0.4.29"
 getset = "0.1.6"
 tokio = { version = "1.50.0", features = ["macros"] }
 dashmap = { version = "6.1.0" }
-tracing-futures = "0.2.5"
 tracing = "0.1.44"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"

crates/buttplug_client/src/lib.rs

@@ -32,7 +32,7 @@ use buttplug_core::{
     StopCmdV4,
     StopScanningV0,
   },
-  util::{async_manager, stream::convert_broadcast_receiver_to_stream},
+  util::stream::convert_broadcast_receiver_to_stream,
 };
 use client_event_loop::{ButtplugClientEventLoop, ButtplugClientRequest};
 use dashmap::DashMap;
@@ -53,7 +53,6 @@ use std::{
 use strum_macros::Display;
 use thiserror::Error;
 use tokio::sync::{Mutex, broadcast, mpsc};
-use tracing_futures::Instrument;
 
 /// Result type used for public APIs.
 ///
@@ -320,12 +319,9 @@ impl ButtplugClient {
     );
 
     // Start the event loop before we run the handshake.
-    async_manager::spawn(
-      async move {
-        client_event_loop.run().await;
-      }
-      .instrument(tracing::info_span!("Client Loop Span")),
-    );
+    buttplug_core::spawn!("ButtplugClient event loop", async move {
+      client_event_loop.run().await;
+    });
     self.run_handshake().await
   }
 

crates/buttplug_client_in_process/Cargo.toml

@@ -20,24 +20,22 @@ doc = true
 
 
 [features]
-default = ["btleplug-manager", "hid-manager", "lovense-dongle-manager", "lovense-connect-service-manager", "serial-manager", "websocket-manager", "xinput-manager"]
+default = ["tokio-runtime", "btleplug-manager", "hid-manager", "serial-manager", "websocket-manager", "xinput-manager"]
 btleplug-manager=["buttplug_server_hwmgr_btleplug"]
 hid-manager=["buttplug_server_hwmgr_hid"]
-lovense-dongle-manager=["buttplug_server_hwmgr_lovense_dongle"]
-lovense-connect-service-manager=["buttplug_server_hwmgr_lovense_connect"]
 serial-manager=["buttplug_server_hwmgr_serial"]
 websocket-manager=["buttplug_server_hwmgr_websocket"]
 xinput-manager=["buttplug_server_hwmgr_xinput"]
+tokio-runtime = ["buttplug_core/tokio-runtime", "buttplug_client/tokio-runtime", "buttplug_server/tokio-runtime"]
+wasm = ["buttplug_core/wasm", "buttplug_client/wasm", "buttplug_server/wasm"]
 
 [dependencies]
-buttplug_core = { version = "10.0.1", path = "../buttplug_core" }
-buttplug_client = { version = "10.0.1", path = "../buttplug_client" }
-buttplug_server = { version = "10.0.1", path = "../buttplug_server" }
+buttplug_core = { version = "10.0.1", path = "../buttplug_core", default-features = false }
+buttplug_client = { version = "10.0.1", path = "../buttplug_client", default-features = false }
+buttplug_server = { version = "10.0.1", path = "../buttplug_server", default-features = false }
 buttplug_server_device_config = { version = "10.0.2", path = "../buttplug_server_device_config" }
 buttplug_server_hwmgr_btleplug = { version = "10.0.1", path = "../buttplug_server_hwmgr_btleplug", optional = true}
 buttplug_server_hwmgr_hid = { version = "10.0.0", path = "../buttplug_server_hwmgr_hid", optional = true}
-buttplug_server_hwmgr_lovense_connect = { version = "10.0.0", path = "../buttplug_server_hwmgr_lovense_connect", optional = true}
-buttplug_server_hwmgr_lovense_dongle = { version = "10.0.0", path = "../buttplug_server_hwmgr_lovense_dongle", optional = true}
 buttplug_server_hwmgr_serial = { version = "10.0.0", path = "../buttplug_server_hwmgr_serial", optional = true}
 buttplug_server_hwmgr_websocket = { version = "10.0.0", path = "../buttplug_server_hwmgr_websocket", optional = true}
 buttplug_server_hwmgr_xinput = { version = "10.0.0", path = "../buttplug_server_hwmgr_xinput", optional = true}
@@ -48,5 +46,4 @@ log = "0.4.29"
 getset = "0.1.6"
 tokio = { version = "1.50.0", features = ["macros"] }
 dashmap = { version = "6.1.0" }
-tracing-futures = "0.2.5"
 tracing = "0.1.44"

crates/buttplug_client_in_process/src/in_process_client.rs

@@ -70,20 +70,6 @@ pub async fn in_process_client(client_name: &str) -> ButtplugClient {
     use buttplug_server_hwmgr_serial::SerialPortCommunicationManagerBuilder;
     device_manager_builder.comm_manager(SerialPortCommunicationManagerBuilder::default());
   }
-  #[cfg(feature = "lovense-connect-service-manager")]
-  {
-    use buttplug_server_hwmgr_lovense_connect::LovenseConnectServiceCommunicationManagerBuilder;
-    device_manager_builder
-      .comm_manager(LovenseConnectServiceCommunicationManagerBuilder::default());
-  }
-  #[cfg(all(
-    feature = "lovense-dongle-manager",
-    any(target_os = "windows", target_os = "macos", target_os = "linux")
-  ))]
-  {
-    use buttplug_server_hwmgr_lovense_dongle::LovenseHIDDongleCommunicationManagerBuilder;
-    device_manager_builder.comm_manager(LovenseHIDDongleCommunicationManagerBuilder::default());
-  }
   #[cfg(all(feature = "xinput-manager", target_os = "windows"))]
   {
     use buttplug_server_hwmgr_xinput::XInputDeviceCommunicationManagerBuilder;

crates/buttplug_client_in_process/src/in_process_connector.rs

@@ -11,7 +11,6 @@ use buttplug_core::{
   connector::{ButtplugConnector, ButtplugConnectorError, ButtplugConnectorResultFuture},
   errors::{ButtplugError, ButtplugMessageError},
   message::{ButtplugClientMessageV4, ButtplugServerMessageV4},
-  util::async_manager,
 };
 use buttplug_server::{
   ButtplugServer,
@@ -29,7 +28,6 @@ use std::sync::{
   atomic::{AtomicBool, Ordering},
 };
 use tokio::sync::mpsc::{Sender, channel};
-use tracing_futures::Instrument;
 
 #[derive(Default)]
 pub struct ButtplugInProcessClientConnectorBuilder {
@@ -116,7 +114,7 @@ impl ButtplugConnector<ButtplugClientMessageV4, ButtplugServerMessageV4>
       self.server_outbound_sender = message_sender;
       let server_recv = self.server.server_version_event_stream();
       async move {
-        async_manager::spawn(async move {
+        buttplug_core::spawn!("InProcessClientConnector event sender loop", async move {
           info!("Starting In Process Client Connector Event Sender Loop");
           pin_mut!(server_recv);
           while let Some(event) = server_recv.next().await {
@@ -130,7 +128,7 @@ impl ButtplugConnector<ButtplugClientMessageV4, ButtplugServerMessageV4>
             }
           }
           info!("Stopping In Process Client Connector Event Sender Loop, due to channel receiver being dropped.");
-        }.instrument(tracing::info_span!("InProcessClientConnectorEventSenderLoop")));
+        });
         connected.store(true, Ordering::Relaxed);
         Ok(())
       }.boxed()

crates/buttplug_core/Cargo.toml

@@ -20,8 +20,8 @@ doc = true
 
 [features]
 default=["tokio-runtime"]
-tokio-runtime=["tokio/rt"]
-wasm=[]
+tokio-runtime=["tokio/rt", "tokio/time"]
+wasm=["wasm-bindgen-futures", "wasmtimer"]
 
 # Only build docs on one platform (linux)
 [package.metadata.docs.rs]
@@ -46,11 +46,14 @@ log = "0.4.29"
 getset = "0.1.6"
 jsonschema = { version = "0.45.0", default-features = false }
 cfg-if = "1.0.4"
-tokio = { version = "1.50.0", features = ["sync", "time", "macros"] }
+tokio = { version = "1.50.0", features = ["sync", "macros"] }
 async-stream = "0.3.6"
 strum_macros = "0.28.0"
 strum = "0.28.0"
 derive_builder = "0.20.2"
 enum_dispatch = "0.3"
+tracing = "0.1.44"
+wasm-bindgen-futures = { version = "0.4.64", optional = true }
+wasmtimer = { version = "0.4.3", optional = true }
 smallvec = { version = "1.15.1", features = ["serde", "const_generics"] }
 enumflags2 = "0.7.12"

crates/buttplug_core/schema/buttplug-schema.json

@@ -341,6 +341,7 @@
         "enum": [
           "FleshlightLaunchFW12Cmd",
           "SingleMotorVibrateCmd",
+          "StopDeviceCmd",
           "KiirooCmd",
           "LovenseCmd",
           "VorzeA10CycloneCmd"