@mcesystems/usb-device-listener 1.0.31 → 1.0.32

package/dist/types.d.ts

@@ -19,6 +19,12 @@ export interface DeviceInfo {
      * Empty string if the device doesn't expose a serial number
      */
     serialNumber: string;
+    /**
+     * USB product name / device description
+     * Examples: "iPhone", "SAMSUNG_Android", "Arduino Uno"
+     * Empty string if not available
+     */
+    deviceName: string;
     /**
      * USB Vendor ID (decimal)
      * Use .toString(16) to convert to hex string

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,UAAU;IAC1B;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC9B;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExC;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAE/B;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC;IAEhC;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAClC;;;;;;;;;;;;;;;;OAgBG;IACH,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IAE7C;;;;;;;;OAQG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAE/C;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAErD;;;;;;;;;;;;;;OAcG;IACH,WAAW,IAAI,UAAU,EAAE,CAAC;CAC5B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,UAAU;IAC1B;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC5B;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC9B;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAExC;;;;;;;;;;OAUG;IACH,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAE/B;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,YAAY,EAAE,CAAC;IAEhC;;;;;;;;;;OAUG;IACH,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,UAAU,EAAE,UAAU,KAAK,IAAI,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAClC;;;;;;;;;;;;;;;;OAgBG;IACH,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IAE7C;;;;;;;;OAQG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAE/C;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAErD;;;;;;;;;;;;;;OAcG;IACH,WAAW,IAAI,UAAU,EAAE,CAAC;CAC5B"}

package/native/addon.cc

@@ -98,6 +98,7 @@ Napi::Value ListDevices(const Napi::CallbackInfo& info) {
 		Napi::Object obj = Napi::Object::New(env);
 		obj.Set("deviceId", Napi::String::New(env, devices[i].deviceId));
 		obj.Set("serialNumber", Napi::String::New(env, devices[i].serialNumber));
+		obj.Set("deviceName", Napi::String::New(env, devices[i].deviceName));
 		obj.Set("vid", Napi::Number::New(env, devices[i].vid));
 		obj.Set("pid", Napi::Number::New(env, devices[i].pid));
 		obj.Set("locationInfo", Napi::String::New(env, devices[i].locationInfo));

package/native/usb_listener_common.h

@@ -16,6 +16,7 @@
 struct DeviceInfo {
 	std::string deviceId;       // Device ID (serial number if available, otherwise platform-specific)
 	std::string serialNumber;   // USB serial number (raw, without formatting)
+	std::string deviceName;     // USB product name / device description
 	uint16_t vid{0};            // Vendor ID
 	uint16_t pid{0};            // Product ID
 	std::string locationInfo;   // Physical port location (platform-specific format)

package/native/usb_listener_mac.cc

@@ -26,39 +26,72 @@ static const char* GetUSBDeviceClassName() {
 }
 
 /**
- * Get the USB serial number from the IOKit service
- * Returns empty string if serial number is not available
+ * Get a string property from an IOKit service
+ * Returns empty string if the property is not available
  */
-static std::string GetSerialNumber(io_service_t service) {
-	// Try kUSBSerialNumberString first (standard USB property)
-	CFStringRef serialRef = (CFStringRef)IORegistryEntryCreateCFProperty(
-		service, CFSTR(kUSBSerialNumberString), kCFAllocatorDefault, 0);
+static std::string GetStringProperty(io_service_t service, CFStringRef propertyName) {
+	CFStringRef stringRef = (CFStringRef)IORegistryEntryCreateCFProperty(
+		service, propertyName, kCFAllocatorDefault, 0);
 	
-	// Fallback to "USB Serial Number" property name
-	if (!serialRef) {
-		serialRef = (CFStringRef)IORegistryEntryCreateCFProperty(
-			service, CFSTR("USB Serial Number"), kCFAllocatorDefault, 0);
-	}
-	
-	if (!serialRef) {
+	if (!stringRef) {
 		return "";
 	}
 	
 	// Convert CFString to std::string
-	CFIndex length = CFStringGetLength(serialRef);
+	CFIndex length = CFStringGetLength(stringRef);
 	CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8) + 1;
 	std::string result(maxSize, '\0');
 	
-	if (CFStringGetCString(serialRef, &result[0], maxSize, kCFStringEncodingUTF8)) {
+	if (CFStringGetCString(stringRef, &result[0], maxSize, kCFStringEncodingUTF8)) {
 		result.resize(strlen(result.c_str()));
 	} else {
 		result.clear();
 	}
 	
-	CFRelease(serialRef);
+	CFRelease(stringRef);
 	return result;
 }
 
+/**
+ * Get the USB product name / device name from the IOKit service
+ * Returns empty string if not available
+ */
+static std::string GetDeviceName(io_service_t service) {
+	// Try kUSBProductString first (standard USB property)
+	std::string name = GetStringProperty(service, CFSTR(kUSBProductString));
+	
+	// Fallback to "USB Product Name"
+	if (name.empty()) {
+		name = GetStringProperty(service, CFSTR("USB Product Name"));
+	}
+	
+	// Fallback to IOKit device name
+	if (name.empty()) {
+		io_name_t deviceName;
+		if (IORegistryEntryGetName(service, deviceName) == KERN_SUCCESS) {
+			name = deviceName;
+		}
+	}
+	
+	return name;
+}
+
+/**
+ * Get the USB serial number from the IOKit service
+ * Returns empty string if serial number is not available
+ */
+static std::string GetSerialNumber(io_service_t service) {
+	// Try kUSBSerialNumberString first (standard USB property)
+	std::string serial = GetStringProperty(service, CFSTR(kUSBSerialNumberString));
+	
+	// Fallback to "USB Serial Number" property name
+	if (serial.empty()) {
+		serial = GetStringProperty(service, CFSTR("USB Serial Number"));
+	}
+	
+	return serial;
+}
+
 /**
  * Format serial number in iOS-style dash-separated format
  * iOS UDIDs are typically 24-25 characters and formatted as: XXXXXXXX-XXXXXXXXXXXXXXXX
@@ -290,6 +323,7 @@ void USBListener::HandleDeviceAdded(io_iterator_t iterator) {
 					Napi::Object obj = Napi::Object::New(env);
 					obj.Set("deviceId", Napi::String::New(env, data->deviceId));
 					obj.Set("serialNumber", Napi::String::New(env, data->serialNumber));
+					obj.Set("deviceName", Napi::String::New(env, data->deviceName));
 					obj.Set("vid", Napi::Number::New(env, data->vid));
 					obj.Set("pid", Napi::Number::New(env, data->pid));
 					obj.Set("locationInfo", Napi::String::New(env, data->locationInfo));
@@ -342,6 +376,7 @@ void USBListener::HandleDeviceRemoved(io_iterator_t iterator) {
 				Napi::Object obj = Napi::Object::New(env);
 				obj.Set("deviceId", Napi::String::New(env, data->deviceId));
 				obj.Set("serialNumber", Napi::String::New(env, data->serialNumber));
+				obj.Set("deviceName", Napi::String::New(env, data->deviceName));
 				obj.Set("vid", Napi::Number::New(env, data->vid));
 				obj.Set("pid", Napi::Number::New(env, data->pid));
 				obj.Set("locationInfo", Napi::String::New(env, data->locationInfo));
@@ -401,6 +436,9 @@ bool USBListener::GetDeviceInfoFromService(io_service_t service, DeviceInfo& inf
 	// Get USB serial number
 	info.serialNumber = GetSerialNumber(service);
 	
+	// Get device name
+	info.deviceName = GetDeviceName(service);
+	
 	// Use serial number as device ID if available (formatted for iOS style)
 	// Otherwise fall back to VID/PID/location combination
 	if (!info.serialNumber.empty()) {

package/native/usb_listener_win.cc

@@ -188,6 +188,7 @@ void USBListener::HandleDeviceChange(WPARAM wParam, LPARAM lParam) {
 			Napi::Object obj = Napi::Object::New(env);
 			obj.Set("deviceId", Napi::String::New(env, data->deviceId));
 			obj.Set("serialNumber", Napi::String::New(env, data->serialNumber));
+			obj.Set("deviceName", Napi::String::New(env, data->deviceName));
 			obj.Set("vid", Napi::Number::New(env, data->vid));
 			obj.Set("pid", Napi::Number::New(env, data->pid));
 			obj.Set("locationInfo", Napi::String::New(env, data->locationInfo));
@@ -205,6 +206,7 @@ void USBListener::HandleDeviceChange(WPARAM wParam, LPARAM lParam) {
 			Napi::Object obj = Napi::Object::New(env);
 			obj.Set("deviceId", Napi::String::New(env, data->deviceId));
 			obj.Set("serialNumber", Napi::String::New(env, data->serialNumber));
+			obj.Set("deviceName", Napi::String::New(env, data->deviceName));
 			obj.Set("vid", Napi::Number::New(env, data->vid));
 			obj.Set("pid", Napi::Number::New(env, data->pid));
 			obj.Set("locationInfo", Napi::String::New(env, data->locationInfo));
@@ -290,6 +292,9 @@ bool USBListener::GetDeviceInfo(const std::string& devicePath, DeviceInfo& info)
 					info.deviceId = fullDeviceId;
 				}
 				
+				// Get device name
+				info.deviceName = GetDeviceName(deviceInfoSet, devInfoData);
+				
 				SetupDiDestroyDeviceInfoList(deviceInfoSet);
 				return true;
 			}
@@ -334,6 +339,29 @@ bool USBListener::GetVidPid(const std::string& deviceId, uint16_t& vid, uint16_t
 	}
 }
 
+/**
+ * Get device description/name from Windows registry
+ */
+std::string USBListener::GetDeviceName(HDEVINFO deviceInfoSet, SP_DEVINFO_DATA& devInfoData) {
+	WCHAR buffer[MAX_PATH];
+	
+	// Try to get device description first (usually the friendly name)
+	if (SetupDiGetDeviceRegistryPropertyW(deviceInfoSet, &devInfoData, SPDRP_DEVICEDESC, 
+		nullptr, reinterpret_cast<PBYTE>(buffer), sizeof(buffer), nullptr)) {
+		std::wstring nameW = buffer;
+		return std::string(nameW.begin(), nameW.end());
+	}
+	
+	// Fallback to friendly name
+	if (SetupDiGetDeviceRegistryPropertyW(deviceInfoSet, &devInfoData, SPDRP_FRIENDLYNAME, 
+		nullptr, reinterpret_cast<PBYTE>(buffer), sizeof(buffer), nullptr)) {
+		std::wstring nameW = buffer;
+		return std::string(nameW.begin(), nameW.end());
+	}
+	
+	return "";
+}
+
 /**
  * Get USB serial number from device instance ID
  * The serial number is typically the last part after the last backslash
@@ -416,6 +444,9 @@ void USBListener::EnumerateConnectedDevices() {
 				info.deviceId = fullDeviceId;
 			}
 			
+			// Get device name
+			info.deviceName = GetDeviceName(deviceInfoSet, devInfoData);
+			
 			// Cache device with exclusive lock
 			{
 				std::unique_lock lock(m_cacheMutex);
@@ -427,6 +458,7 @@ void USBListener::EnumerateConnectedDevices() {
 					Napi::Object obj = Napi::Object::New(env);
 					obj.Set("deviceId", Napi::String::New(env, data->deviceId));
 					obj.Set("serialNumber", Napi::String::New(env, data->serialNumber));
+					obj.Set("deviceName", Napi::String::New(env, data->deviceName));
 					obj.Set("vid", Napi::Number::New(env, data->vid));
 					obj.Set("pid", Napi::Number::New(env, data->pid));
 					obj.Set("locationInfo", Napi::String::New(env, data->locationInfo));
@@ -481,6 +513,9 @@ std::vector<DeviceInfo> USBListener::ListAllDevices() {
 				info.deviceId = fullDeviceId;
 			}
 			
+			// Get device name
+			info.deviceName = GetDeviceName(deviceInfoSet, devInfoData);
+			
 			devices.push_back(info);
 		}
 	}

package/native/usb_listener_win.h

@@ -75,6 +75,7 @@ private:
 	bool GetDeviceInfoFromPath(const std::string& devicePath, DeviceInfo& info); // Parse device info from path (for disconnections)
 	bool GetLocationInfo(DEVINST devInst, std::string& locationInfo);          // Get physical port location
 	std::string GetSerialNumber(HDEVINFO deviceInfoSet, SP_DEVINFO_DATA& devInfoData); // Get USB serial number
+	std::string GetDeviceName(HDEVINFO deviceInfoSet, SP_DEVINFO_DATA& devInfoData);   // Get device description/name
 	bool GetVidPid(const std::string& deviceId, uint16_t& vid, uint16_t& pid); // Parse VID/PID from device ID string
 	void EnumerateConnectedDevices();                                          // Enumerate devices on startup
 	

package/package.json

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