Added vendor support (#7)

Co-authored-by: Azarattum <azarattum@pm.me>

Author: zzahkaboom24

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.1
+
+- Added support for the vendor flag on OpenRGB clients.
+
+  The vendor name is read from the manufacturer string from what the OS got off the keyboard's USB firmware when it was plugged in, using the manufacturer field added to async-hid's DeviceInfo in version 0.5.1. The manufacturer name has been compiled into the QMK firmware and is then basically reported to OpenRGB clients.
+
 ## 0.7.0
 
 - (potentially breaking) Direct mode is now always reported to clients at index 0 (this does not affect your JSON configs)

Cargo.lock

@@ -1,11 +1,11 @@
 [package]
 name = "ColorHoster"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 
 [dependencies]
 anyhow = "1.0.97"
-async-hid = "0.4.2"
+async-hid = "0.5.1"
 ceviche = "0.7.0"
 chrono = "0.4.40"
 clap = { version = "4.5.32", features = ["derive"] }

Cargo.toml

@@ -18,6 +18,7 @@ type Effect = (String, i32, u32);
 #[derive(Debug, Clone)]
 pub struct Config {
     pub name: String,
+    pub vendor: String,
     pub vendor_id: u16,
     pub product_id: u16,
     pub leds: Vec<(u8, Position)>,
@@ -42,6 +43,7 @@ impl Config {
 
         Ok(Self {
             name,
+            vendor: "Unknown".to_string(),
             vendor_id: parse_hex(&vendor_id),
             product_id: parse_hex(&product_id),
             matrix: (matrix.cols, matrix.rows),

src/config.rs

@@ -88,9 +88,12 @@ pub async fn handle(
             buffer.extend_from_slice(&DEVICE_TYPE_KEYBOARD.to_le_bytes());
             buffer.extend_from_str(&config.name);
             if ctx.protocol_version >= 1 {
-                buffer.extend_from_str("Unknown");
+                buffer.extend_from_str(&config.vendor);
             }
-            buffer.extend_from_str(&format!("{} via ColorHoster", &config.name));
+            buffer.extend_from_str(&format!(
+                "{} {} via ColorHoster",
+                &config.vendor, &config.name
+            ));
             buffer.extend_from_str(env!("CARGO_PKG_VERSION"));
             buffer.extend_from_str(&id);
             buffer.extend_from_str(&format!("HID: {}", id));

src/handlers.rs

@@ -35,9 +35,16 @@ impl Keyboards {
 
         while let Some(device) = stream.next().await {
             if is_compatible(&device)
-                && let Some(config) = configs.remove(&(device.vendor_id, device.product_id))
+                && let Some(mut config) = configs.remove(&(device.vendor_id, device.product_id))
             {
-                debug!("Keyboard {} connected!", config.name.bold());
+                if let Some(manufacturer) = device.manufacturer.clone() {
+                    config.vendor = manufacturer;
+                }
+                debug!(
+                    "Keyboard {} {} connected!",
+                    config.name.bold().blue(),
+                    format!("({})", config.vendor).bold().cyan()
+                );
                 match Keyboard::from_config(config, device).await {
                     Err(error) => warn!("Failed to initialize keyboard: {error}"),
                     Ok(keyboard) => {
@@ -74,8 +81,15 @@ impl Keyboards {
                                 configs.lock().unwrap().remove(key)
                             });
 
-                            if let (Some(config), Some(device)) = (config, device) {
-                                debug!("Keyboard {} connected!", config.name.bold());
+                            if let (Some(mut config), Some(device)) = (config, device) {
+                                if let Some(manufacturer) = device.manufacturer.clone() {
+                                    config.vendor = manufacturer;
+                                }
+                                debug!(
+                                    "Keyboard {} {} connected!",
+                                    config.name.bold().blue(),
+                                    format!("({})", config.vendor).bold().cyan()
+                                );
                                 match Keyboard::from_config(config, device).await {
                                     Err(error) => warn!("Failed to initialize keyboard: {error}"),
                                     Ok(keyboard) => {
@@ -89,7 +103,11 @@ impl Keyboards {
                         DeviceEvent::Disconnected(id) => {
                             if let Some(device) = keyboards.lock().await.shift_remove(&id) {
                                 let config = device.into_config().await;
-                                debug!("Keyboard {} disconnected!", config.name.bold());
+                                debug!(
+                                    "Keyboard {} {} disconnected!",
+                                    config.name.bold().blue(),
+                                    format!("({})", config.vendor).bold().cyan()
+                                );
 
                                 configs
                                     .lock()