Merge pull request #86 from node-usb/detect-empty-string

Use nusb getters for device strings

Author: thegecko

Cargo.lock

@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 futures-lite = "2.6.1"
 napi = { version = "3.9.0", features = ["tokio_rt"] }
 napi-derive = "3.5.6"
-nusb = "=0.2.7"
+nusb = "=0.2.8"
 tokio = { version = "1.52.3", features = ["rt", "time", "fs", "macros"] }
 
 [build-dependencies]

Cargo.toml

@@ -680,53 +680,26 @@ impl UsbDevice {
 
     #[napi(getter)]
     pub unsafe fn manufacturerName(&mut self) -> Result<Option<String>> {
-        match &self.device_info.manufacturer_string() {
-            Some(str) => Ok(Some(str.to_string())),
-            None => {
-                let device = match self.device_guard().as_ref() {
-                    Some(device) => device.clone(),
-                    None => self._open()?,
-                };
-
-                get_string(
-                    &device,
-                    device.device_descriptor().manufacturer_string_index(),
-                )
-            }
-        }
+        self.device_info
+            .get_manufacturer_string()
+            .wait()
+            .map_err(|e| napi::Error::from_reason(format!("getString error: {e}")))
     }
 
     #[napi(getter)]
     pub unsafe fn productName(&mut self) -> Result<Option<String>> {
-        match &self.device_info.product_string() {
-            Some(str) => Ok(Some(str.to_string())),
-            None => {
-                let device = match self.device_guard().as_ref() {
-                    Some(device) => device.clone(),
-                    None => self._open()?,
-                };
-
-                get_string(&device, device.device_descriptor().product_string_index())
-            }
-        }
+        self.device_info
+            .get_product_string()
+            .wait()
+            .map_err(|e| napi::Error::from_reason(format!("getString error: {e}")))
     }
 
     #[napi(getter)]
     pub unsafe fn serialNumber(&mut self) -> Result<Option<String>> {
-        match &self.device_info.serial_number() {
-            Some(str) => Ok(Some(str.to_string())),
-            None => {
-                let device = match self.device_guard().as_ref() {
-                    Some(device) => device.clone(),
-                    None => self._open()?,
-                };
-
-                get_string(
-                    &device,
-                    device.device_descriptor().serial_number_string_index(),
-                )
-            }
-        }
+        self.device_info
+            .get_serial_number_string()
+            .wait()
+            .map_err(|e| napi::Error::from_reason(format!("getString error: {e}")))
     }
 
     #[napi(getter)]