@mcesystems/usb-device-listener 1.0.92 → 1.0.94

package/native/usb_listener_mac.cc

@@ -332,6 +332,13 @@ void USBListener::HandleDeviceAdded(io_iterator_t iterator) {
 					} else {
 						obj.Set("logicalPort", env.Null());
 					}
+					Napi::Array pathArr = Napi::Array::New(env, data->portPath.size());
+					for (size_t j = 0; j < data->portPath.size(); j++) {
+						pathArr[j] = Napi::Number::New(env, data->portPath[j]);
+					}
+					obj.Set("portPath", pathArr);
+					obj.Set("parentHubVid", Napi::Number::New(env, data->parentHubVid));
+					obj.Set("parentHubPid", Napi::Number::New(env, data->parentHubPid));
 					jsCallback.Call({obj});
 					delete data;
 				};
@@ -385,6 +392,13 @@ void USBListener::HandleDeviceRemoved(io_iterator_t iterator) {
 				} else {
 					obj.Set("logicalPort", env.Null());
 				}
+				Napi::Array pathArr = Napi::Array::New(env, data->portPath.size());
+				for (size_t j = 0; j < data->portPath.size(); j++) {
+					pathArr[j] = Napi::Number::New(env, data->portPath[j]);
+				}
+				obj.Set("portPath", pathArr);
+				obj.Set("parentHubVid", Napi::Number::New(env, data->parentHubVid));
+				obj.Set("parentHubPid", Napi::Number::New(env, data->parentHubPid));
 				jsCallback.Call({obj});
 				delete data;
 			};
@@ -433,6 +447,22 @@ bool USBListener::GetDeviceInfoFromService(io_service_t service, DeviceInfo& inf
 	// Get Location ID (used for physical port identification)
 	info.locationInfo = GetLocationId(service);
 	
+	// Get raw location ID for port path decoding
+	CFNumberRef locationRef = (CFNumberRef)IORegistryEntryCreateCFProperty(
+		service, CFSTR(kUSBDevicePropertyLocationID), kCFAllocatorDefault, 0);
+	if (!locationRef) {
+		locationRef = (CFNumberRef)IORegistryEntryCreateCFProperty(
+			service, CFSTR("locationID"), kCFAllocatorDefault, 0);
+	}
+	uint32_t locationId = 0;
+	if (locationRef) {
+		CFNumberGetValue(locationRef, kCFNumberSInt32Type, &locationId);
+		CFRelease(locationRef);
+	}
+	
+	// Fill port path and parent hub VID/PID (traverses IOKit hierarchy)
+	FillPortPathAndParentHub(service, locationId, info);
+	
 	// Get USB serial number
 	info.serialNumber = GetSerialNumber(service);
 	
@@ -480,6 +510,119 @@ std::string USBListener::GetLocationId(io_service_t service) {
 	return ss.str();
 }
 
+int USBListener::GetPortNumberFromService(io_service_t service) {
+	// Try "port" first (IOUSBHostDevice), then "PortNum" (older IOUSBDevice)
+	CFTypeRef portRef = IORegistryEntryCreateCFProperty(
+		service, CFSTR("port"), kCFAllocatorDefault, 0);
+	if (!portRef) {
+		portRef = IORegistryEntryCreateCFProperty(
+			service, CFSTR("PortNum"), kCFAllocatorDefault, 0);
+	}
+	if (!portRef || CFGetTypeID(portRef) != CFNumberGetTypeID()) {
+		if (portRef) CFRelease(portRef);
+		return 0;
+	}
+	int port = 0;
+	CFNumberGetValue((CFNumberRef)portRef, kCFNumberIntType, &port);
+	CFRelease(portRef);
+	return port;
+}
+
+bool USBListener::GetVidPidFromService(io_service_t service, uint16_t& vid, uint16_t& pid) {
+	CFTypeRef vidRef = IORegistryEntryCreateCFProperty(
+		service, CFSTR(kUSBVendorID), kCFAllocatorDefault, 0);
+	if (!vidRef) {
+		vidRef = IORegistryEntryCreateCFProperty(
+			service, CFSTR("idVendor"), kCFAllocatorDefault, 0);
+	}
+	CFTypeRef pidRef = IORegistryEntryCreateCFProperty(
+		service, CFSTR(kUSBProductID), kCFAllocatorDefault, 0);
+	if (!pidRef) {
+		pidRef = IORegistryEntryCreateCFProperty(
+			service, CFSTR("idProduct"), kCFAllocatorDefault, 0);
+	}
+	if (!vidRef || !pidRef || CFGetTypeID(vidRef) != CFNumberGetTypeID() ||
+	    CFGetTypeID(pidRef) != CFNumberGetTypeID()) {
+		if (vidRef) CFRelease(vidRef);
+		if (pidRef) CFRelease(pidRef);
+		return false;
+	}
+	int v = 0, p = 0;
+	CFNumberGetValue((CFNumberRef)vidRef, kCFNumberIntType, &v);
+	CFNumberGetValue((CFNumberRef)pidRef, kCFNumberIntType, &p);
+	CFRelease(vidRef);
+	CFRelease(pidRef);
+	vid = static_cast<uint16_t>(v);
+	pid = static_cast<uint16_t>(p);
+	return true;
+}
+
+void USBListener::FillPortPathAndParentHub(io_service_t service, uint32_t locationId, DeviceInfo& info) {
+	info.portPath.clear();
+	info.parentHubVid = 0;
+	info.parentHubPid = 0;
+	
+	std::vector<int> pathDeviceToRoot;
+	io_registry_entry_t current = service;  // We don't retain - we don't own service
+	bool foundParentHub = false;
+	
+	while (current) {
+		int portNum = GetPortNumberFromService(current);
+		if (portNum > 0) {
+			pathDeviceToRoot.push_back(portNum);
+		}
+		
+		io_registry_entry_t parentEntry = 0;
+		kern_return_t kr = IORegistryEntryGetParentEntry(current, kIOServicePlane, &parentEntry);
+		
+		if (current != service) {
+			IOObjectRelease(current);
+		}
+		current = 0;
+		
+		if (kr != KERN_SUCCESS || parentEntry == 0) {
+			if (parentEntry) IOObjectRelease(parentEntry);
+			break;
+		}
+		
+		// Check if parent is a USB device (hub or controller with VID/PID)
+		if (!foundParentHub) {
+			uint16_t pvid = 0, ppid = 0;
+			if (GetVidPidFromService(parentEntry, pvid, ppid)) {
+				info.parentHubVid = pvid;
+				info.parentHubPid = ppid;
+				foundParentHub = true;
+			}
+		}
+		
+		current = parentEntry;
+	}
+	
+	if (current && current != service) {
+		IOObjectRelease(current);
+	}
+	
+	// Build port path: reverse to get root-to-device (match Windows format)
+	for (auto it = pathDeviceToRoot.rbegin(); it != pathDeviceToRoot.rend(); ++it) {
+		info.portPath.push_back(*it);
+	}
+	
+	// If registry walk yielded no port path, decode from location ID
+	// macOS location ID encodes port path: nibbles (loc>>24)&0xFF, (loc>>20)&0x0F, etc.
+	if (info.portPath.empty() && locationId != 0) {
+		int p1 = static_cast<int>((locationId >> 24) & 0xFF);
+		int p2 = static_cast<int>((locationId >> 20) & 0x0F);
+		int p3 = static_cast<int>((locationId >> 16) & 0x0F);
+		int p4 = static_cast<int>((locationId >> 12) & 0x0F);
+		int p5 = static_cast<int>((locationId >> 8) & 0x0F);
+		if (p1 > 0) info.portPath.push_back(p1);
+		if (p2 > 0) info.portPath.push_back(p2);
+		if (p3 > 0) info.portPath.push_back(p3);
+		if (p4 > 0) info.portPath.push_back(p4);
+		if (p5 > 0) info.portPath.push_back(p5);
+	}
+}
+
 void USBListener::EnumerateConnectedDevices() {
 	// This is called at startup via HandleDeviceAdded when draining the iterator
 	// No additional implementation needed

package/native/usb_listener_mac.h

@@ -48,6 +48,9 @@ private:
 	// Helper methods
 	bool GetDeviceInfoFromService(io_service_t service, DeviceInfo& info);
 	std::string GetLocationId(io_service_t service);
+	void FillPortPathAndParentHub(io_service_t service, uint32_t locationId, DeviceInfo& info);
+	static int GetPortNumberFromService(io_service_t service);
+	static bool GetVidPidFromService(io_service_t service, uint16_t& vid, uint16_t& pid);
 	void EnumerateConnectedDevices();
 	void RunLoopThread();
 	

package/package.json

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