@mcesystems/usb-device-listener 1.0.38 → 1.0.40

package/native/usb_listener_win.cc

@@ -222,31 +222,6 @@ void USBListener::HandleDeviceChange(WPARAM wParam, LPARAM lParam) {
 	}
 }
 
-bool USBListener::GetDeviceInfoFromPath(const std::string& devicePath, DeviceInfo& info) {
-	size_t hashPos = devicePath.rfind('#');
-	if (hashPos == std::string::npos) {
-		return false;
-	}
-	
-	std::string deviceIdStr = devicePath.substr(4, hashPos - 4);
-	std::replace(deviceIdStr.begin(), deviceIdStr.end(), '#', '\\');
-	
-	info.deviceId = deviceIdStr;
-	
-	if (!GetVidPid(info.deviceId, info.vid, info.pid)) {
-		return false;
-	}
-	
-	size_t lastHash = deviceIdStr.rfind('\\');
-	if (lastHash != std::string::npos) {
-		info.locationInfo = deviceIdStr.substr(lastHash + 1);
-	} else {
-		info.locationInfo = "";
-	}
-	
-	return true;
-}
-
 /**
  * Format serial number in iOS-style dash-separated format
  * iOS UDIDs are typically 24-25 characters and formatted as: XXXXXXXX-XXXXXXXXXXXXXXXX
@@ -273,6 +248,35 @@ static std::string FormatSerialAsDeviceId(const std::string& serial) {
 	return serial;
 }
 
+bool USBListener::GetDeviceInfoFromPath(const std::string& devicePath, DeviceInfo& info) {
+	size_t hashPos = devicePath.rfind('#');
+	if (hashPos == std::string::npos) {
+		return false;
+	}
+	
+	std::string deviceIdStr = devicePath.substr(4, hashPos - 4);
+	std::replace(deviceIdStr.begin(), deviceIdStr.end(), '#', '\\');
+	
+	if (!GetVidPid(deviceIdStr, info.vid, info.pid)) {
+		return false;
+	}
+	
+	// Extract serial number from the device ID (last segment after backslash)
+	// Format: USB\VID_XXXX&PID_XXXX\SERIAL_NUMBER
+	size_t lastBackslash = deviceIdStr.rfind('\\');
+	if (lastBackslash != std::string::npos && lastBackslash + 1 < deviceIdStr.length()) {
+		info.serialNumber = deviceIdStr.substr(lastBackslash + 1);
+		info.locationInfo = info.serialNumber;
+		// Format the serial number the same way as GetDeviceInfo does for cache key matching
+		info.deviceId = FormatSerialAsDeviceId(info.serialNumber);
+	} else {
+		info.locationInfo = "";
+		info.deviceId = deviceIdStr;
+	}
+	
+	return true;
+}
+
 bool USBListener::GetDeviceInfo(const std::string& devicePath, DeviceInfo& info) {
 	size_t hashPos = devicePath.rfind('#');
 	if (hashPos == std::string::npos) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcesystems/usb-device-listener",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "description": "Native cross-platform USB device listener for Windows and macOS",
   "main": "dist/index.js",
   "module": "dist/index.mjs",