@mcesystems/usb-device-listener 1.0.95 → 1.0.97

package/LICENSE

@@ -1,15 +1,15 @@
-ISC License
-
-Copyright (c) 2025 MCE Systems
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ISC License
+
+Copyright (c) 2025 MCE Systems
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

package/binding.gyp

@@ -1,67 +1,67 @@
-{
-	"targets": [
-		{
-			"target_name": "usb_device_listener",
-			"sources": [
-				"native/addon.cc"
-			],
-			"include_dirs": [
-				"<!@(node -p \"require('node-addon-api').include\")"
-			],
-			"dependencies": [
-				"<!(node -p \"require('node-addon-api').gyp\")"
-			],
-			"defines": [
-				"NAPI_DISABLE_CPP_EXCEPTIONS"
-			],
-			"conditions": [
-				[
-					"OS=='win'",
-					{
-						"sources": [
-							"native/usb_listener_win.cc"
-						],
-						"defines": [
-							"UNICODE",
-							"_UNICODE"
-						],
-						"libraries": [
-							"Setupapi.lib",
-							"Cfgmgr32.lib"
-						],
-						"msvs_settings": {
-							"VCCLCompilerTool": {
-								"ExceptionHandling": 1,
-								"AdditionalOptions": [
-									"/std:c++20"
-								]
-							}
-						}
-					}
-				],
-				[
-					"OS=='mac'",
-					{
-						"sources": [
-							"native/usb_listener_mac.cc"
-						],
-						"xcode_settings": {
-							"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-							"CLANG_CXX_LANGUAGE_STANDARD": "c++20",
-							"MACOSX_DEPLOYMENT_TARGET": "10.15",
-							"OTHER_CFLAGS": [
-								"-fno-strict-aliasing"
-							]
-						},
-						"link_settings": {
-							"libraries": [
-								"-framework CoreFoundation",
-								"-framework IOKit"
-							]
-						}
-					}
-				]
-			]
-		}
-	]
-}
+{
+	"targets": [
+		{
+			"target_name": "usb_device_listener",
+			"sources": [
+				"native/addon.cc"
+			],
+			"include_dirs": [
+				"<!@(node -p \"require('node-addon-api').include\")"
+			],
+			"dependencies": [
+				"<!(node -p \"require('node-addon-api').gyp\")"
+			],
+			"defines": [
+				"NAPI_DISABLE_CPP_EXCEPTIONS"
+			],
+			"conditions": [
+				[
+					"OS=='win'",
+					{
+						"sources": [
+							"native/usb_listener_win.cc"
+						],
+						"defines": [
+							"UNICODE",
+							"_UNICODE"
+						],
+						"libraries": [
+							"Setupapi.lib",
+							"Cfgmgr32.lib"
+						],
+						"msvs_settings": {
+							"VCCLCompilerTool": {
+								"ExceptionHandling": 1,
+								"AdditionalOptions": [
+									"/std:c++20"
+								]
+							}
+						}
+					}
+				],
+				[
+					"OS=='mac'",
+					{
+						"sources": [
+							"native/usb_listener_mac.cc"
+						],
+						"xcode_settings": {
+							"GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+							"CLANG_CXX_LANGUAGE_STANDARD": "c++20",
+							"MACOSX_DEPLOYMENT_TARGET": "10.15",
+							"OTHER_CFLAGS": [
+								"-fno-strict-aliasing"
+							]
+						},
+						"link_settings": {
+							"libraries": [
+								"-framework CoreFoundation",
+								"-framework IOKit"
+							]
+						}
+					}
+				]
+			]
+		}
+	]
+}

package/native/addon.cc

@@ -1,129 +1,129 @@
-#include <napi.h>
-#include "usb_listener.h"
-#include <memory>
-
-static std::unique_ptr<USBListener> g_listener;
-
-Napi::Value StartListening(const Napi::CallbackInfo& info) {
-	Napi::Env env = info.Env();
-	
-	if (!g_listener) {
-		g_listener = std::make_unique<USBListener>();
-	}
-	
-	std::string errorMsg;
-	if (!g_listener->StartListening(errorMsg)) {
-		Napi::Error::New(env, errorMsg).ThrowAsJavaScriptException();
-		return env.Undefined();
-	}
-	
-	return env.Undefined();
-}
-
-Napi::Value StopListening(const Napi::CallbackInfo& info) {
-	Napi::Env env = info.Env();
-	
-	if (g_listener) {
-		g_listener->StopListening();
-	}
-	
-	return env.Undefined();
-}
-
-Napi::Value OnDeviceAdd(const Napi::CallbackInfo& info) {
-	Napi::Env env = info.Env();
-	
-	if (info.Length() < 1 || !info[0].IsFunction()) {
-		Napi::TypeError::New(env, "Callback function expected").ThrowAsJavaScriptException();
-		return env.Undefined();
-	}
-	
-	Napi::Function callback = info[0].As<Napi::Function>();
-	
-	if (!g_listener) {
-		g_listener = std::make_unique<USBListener>();
-	}
-	
-	Napi::ThreadSafeFunction tsfn = Napi::ThreadSafeFunction::New(
-		env,
-		callback,
-		"DeviceAddCallback",
-		0,
-		1
-	);
-	
-	g_listener->SetAddCallback(tsfn);
-	
-	return env.Undefined();
-}
-
-Napi::Value OnDeviceRemove(const Napi::CallbackInfo& info) {
-	Napi::Env env = info.Env();
-	
-	if (info.Length() < 1 || !info[0].IsFunction()) {
-		Napi::TypeError::New(env, "Callback function expected").ThrowAsJavaScriptException();
-		return env.Undefined();
-	}
-	
-	Napi::Function callback = info[0].As<Napi::Function>();
-	
-	if (!g_listener) {
-		g_listener = std::make_unique<USBListener>();
-	}
-	
-	Napi::ThreadSafeFunction tsfn = Napi::ThreadSafeFunction::New(
-		env,
-		callback,
-		"DeviceRemoveCallback",
-		0,
-		1
-	);
-	
-	g_listener->SetRemoveCallback(tsfn);
-	
-	return env.Undefined();
-}
-
-Napi::Value ListDevices(const Napi::CallbackInfo& info) {
-	Napi::Env env = info.Env();
-	
-	if (!g_listener) {
-		g_listener = std::make_unique<USBListener>();
-	}
-	
-	std::vector<DeviceInfo> devices = g_listener->ListAllDevices();
-	
-	Napi::Array result = Napi::Array::New(env, devices.size());
-	for (size_t i = 0; i < devices.size(); i++) {
-		const DeviceInfo& d = devices[i];
-		Napi::Object obj = Napi::Object::New(env);
-		obj.Set("deviceId", Napi::String::New(env, d.deviceId));
-		obj.Set("serialNumber", Napi::String::New(env, d.serialNumber));
-		obj.Set("deviceName", Napi::String::New(env, d.deviceName));
-		obj.Set("vid", Napi::Number::New(env, d.vid));
-		obj.Set("pid", Napi::Number::New(env, d.pid));
-		obj.Set("locationInfo", Napi::String::New(env, d.locationInfo));
-		obj.Set("logicalPort", env.Null());
-		Napi::Array pathArr = Napi::Array::New(env, d.portPath.size());
-		for (size_t j = 0; j < d.portPath.size(); j++) {
-			pathArr[j] = Napi::Number::New(env, d.portPath[j]);
-		}
-		obj.Set("portPath", pathArr);
-		obj.Set("parentHubVid", Napi::Number::New(env, d.parentHubVid));
-		obj.Set("parentHubPid", Napi::Number::New(env, d.parentHubPid));
-		result[i] = obj;
-	}
-	
-	return result;
-}
-
-Napi::Object Init(Napi::Env env, Napi::Object exports) {
-	exports.Set("startListening", Napi::Function::New(env, StartListening));
-	exports.Set("stopListening", Napi::Function::New(env, StopListening));
-	exports.Set("onDeviceAdd", Napi::Function::New(env, OnDeviceAdd));
-	exports.Set("onDeviceRemove", Napi::Function::New(env, OnDeviceRemove));
-	exports.Set("listDevices", Napi::Function::New(env, ListDevices));
-	return exports;
-}
-
-NODE_API_MODULE(usb_device_listener, Init)
+#include <napi.h>
+#include "usb_listener.h"
+#include <memory>
+
+static std::unique_ptr<USBListener> g_listener;
+
+Napi::Value StartListening(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	
+	if (!g_listener) {
+		g_listener = std::make_unique<USBListener>();
+	}
+	
+	std::string errorMsg;
+	if (!g_listener->StartListening(errorMsg)) {
+		Napi::Error::New(env, errorMsg).ThrowAsJavaScriptException();
+		return env.Undefined();
+	}
+	
+	return env.Undefined();
+}
+
+Napi::Value StopListening(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	
+	if (g_listener) {
+		g_listener->StopListening();
+	}
+	
+	return env.Undefined();
+}
+
+Napi::Value OnDeviceAdd(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	
+	if (info.Length() < 1 || !info[0].IsFunction()) {
+		Napi::TypeError::New(env, "Callback function expected").ThrowAsJavaScriptException();
+		return env.Undefined();
+	}
+	
+	Napi::Function callback = info[0].As<Napi::Function>();
+	
+	if (!g_listener) {
+		g_listener = std::make_unique<USBListener>();
+	}
+	
+	Napi::ThreadSafeFunction tsfn = Napi::ThreadSafeFunction::New(
+		env,
+		callback,
+		"DeviceAddCallback",
+		0,
+		1
+	);
+	
+	g_listener->SetAddCallback(tsfn);
+	
+	return env.Undefined();
+}
+
+Napi::Value OnDeviceRemove(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	
+	if (info.Length() < 1 || !info[0].IsFunction()) {
+		Napi::TypeError::New(env, "Callback function expected").ThrowAsJavaScriptException();
+		return env.Undefined();
+	}
+	
+	Napi::Function callback = info[0].As<Napi::Function>();
+	
+	if (!g_listener) {
+		g_listener = std::make_unique<USBListener>();
+	}
+	
+	Napi::ThreadSafeFunction tsfn = Napi::ThreadSafeFunction::New(
+		env,
+		callback,
+		"DeviceRemoveCallback",
+		0,
+		1
+	);
+	
+	g_listener->SetRemoveCallback(tsfn);
+	
+	return env.Undefined();
+}
+
+Napi::Value ListDevices(const Napi::CallbackInfo& info) {
+	Napi::Env env = info.Env();
+	
+	if (!g_listener) {
+		g_listener = std::make_unique<USBListener>();
+	}
+	
+	std::vector<DeviceInfo> devices = g_listener->ListAllDevices();
+	
+	Napi::Array result = Napi::Array::New(env, devices.size());
+	for (size_t i = 0; i < devices.size(); i++) {
+		const DeviceInfo& d = devices[i];
+		Napi::Object obj = Napi::Object::New(env);
+		obj.Set("deviceId", Napi::String::New(env, d.deviceId));
+		obj.Set("serialNumber", Napi::String::New(env, d.serialNumber));
+		obj.Set("deviceName", Napi::String::New(env, d.deviceName));
+		obj.Set("vid", Napi::Number::New(env, d.vid));
+		obj.Set("pid", Napi::Number::New(env, d.pid));
+		obj.Set("locationInfo", Napi::String::New(env, d.locationInfo));
+		obj.Set("logicalPort", env.Null());
+		Napi::Array pathArr = Napi::Array::New(env, d.portPath.size());
+		for (size_t j = 0; j < d.portPath.size(); j++) {
+			pathArr[j] = Napi::Number::New(env, d.portPath[j]);
+		}
+		obj.Set("portPath", pathArr);
+		obj.Set("parentHubVid", Napi::Number::New(env, d.parentHubVid));
+		obj.Set("parentHubPid", Napi::Number::New(env, d.parentHubPid));
+		result[i] = obj;
+	}
+	
+	return result;
+}
+
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+	exports.Set("startListening", Napi::Function::New(env, StartListening));
+	exports.Set("stopListening", Napi::Function::New(env, StopListening));
+	exports.Set("onDeviceAdd", Napi::Function::New(env, OnDeviceAdd));
+	exports.Set("onDeviceRemove", Napi::Function::New(env, OnDeviceRemove));
+	exports.Set("listDevices", Napi::Function::New(env, ListDevices));
+	return exports;
+}
+
+NODE_API_MODULE(usb_device_listener, Init)

package/native/usb_listener.h

@@ -1,22 +1,22 @@
-#ifndef USB_LISTENER_H
-#define USB_LISTENER_H
-
-/**
- * Platform-specific USB Listener
- * 
- * This header includes the appropriate platform-specific implementation
- * based on the target OS. Both implementations expose the same USBListener class
- * that inherits from USBListenerBase.
- */
-
-#include "usb_listener_common.h"
-
-#if defined(_WIN32) || defined(_WIN64)
-	#include "usb_listener_win.h"
-#elif defined(__APPLE__)
-	#include "usb_listener_mac.h"
-#else
-	#error "Unsupported platform. Only Windows and macOS are supported."
-#endif
-
-#endif // USB_LISTENER_H
+#ifndef USB_LISTENER_H
+#define USB_LISTENER_H
+
+/**
+ * Platform-specific USB Listener
+ * 
+ * This header includes the appropriate platform-specific implementation
+ * based on the target OS. Both implementations expose the same USBListener class
+ * that inherits from USBListenerBase.
+ */
+
+#include "usb_listener_common.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+	#include "usb_listener_win.h"
+#elif defined(__APPLE__)
+	#include "usb_listener_mac.h"
+#else
+	#error "Unsupported platform. Only Windows and macOS are supported."
+#endif
+
+#endif // USB_LISTENER_H

package/native/usb_listener_common.h

@@ -1,56 +1,56 @@
-#ifndef USB_LISTENER_COMMON_H
-#define USB_LISTENER_COMMON_H
-
-#include <napi.h>
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <atomic>
-#include <shared_mutex>
-
-/**
- * Device information structure
- * Contains all relevant USB device identification and location data
- * Platform-agnostic: used by both Windows and macOS implementations
- */
-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)
-	int logicalPort{-1};        // User-defined logical port number (-1 if not mapped)
-	std::vector<int> portPath; // Port numbers from root to device (e.g. [2, 3, 1])
-	uint16_t parentHubVid{0};  // VID of hub device is directly connected to (0 if on root)
-	uint16_t parentHubPid{0};  // PID of that hub
-};
-
-/**
- * Abstract USB Device Listener Interface
- * 
- * Defines the common interface for platform-specific implementations.
- * Each platform (Windows, macOS) provides its own implementation.
- */
-class USBListenerBase {
-public:
-	virtual ~USBListenerBase() = default;
-	
-	// Start monitoring USB device events
-	virtual bool StartListening(std::string& errorMsg) = 0;
-	
-	// Stop monitoring and clean up resources
-	virtual void StopListening() = 0;
-	
-	// Set callback for device connection events
-	virtual void SetAddCallback(Napi::ThreadSafeFunction callback) = 0;
-	
-	// Set callback for device disconnection events
-	virtual void SetRemoveCallback(Napi::ThreadSafeFunction callback) = 0;
-	
-	// Get list of all currently connected USB devices
-	virtual std::vector<DeviceInfo> ListAllDevices() = 0;
-};
-
-#endif // USB_LISTENER_COMMON_H
-
+#ifndef USB_LISTENER_COMMON_H
+#define USB_LISTENER_COMMON_H
+
+#include <napi.h>
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <atomic>
+#include <shared_mutex>
+
+/**
+ * Device information structure
+ * Contains all relevant USB device identification and location data
+ * Platform-agnostic: used by both Windows and macOS implementations
+ */
+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)
+	int logicalPort{-1};        // User-defined logical port number (-1 if not mapped)
+	std::vector<int> portPath; // Port numbers from root to device (e.g. [2, 3, 1])
+	uint16_t parentHubVid{0};  // VID of hub device is directly connected to (0 if on root)
+	uint16_t parentHubPid{0};  // PID of that hub
+};
+
+/**
+ * Abstract USB Device Listener Interface
+ * 
+ * Defines the common interface for platform-specific implementations.
+ * Each platform (Windows, macOS) provides its own implementation.
+ */
+class USBListenerBase {
+public:
+	virtual ~USBListenerBase() = default;
+	
+	// Start monitoring USB device events
+	virtual bool StartListening(std::string& errorMsg) = 0;
+	
+	// Stop monitoring and clean up resources
+	virtual void StopListening() = 0;
+	
+	// Set callback for device connection events
+	virtual void SetAddCallback(Napi::ThreadSafeFunction callback) = 0;
+	
+	// Set callback for device disconnection events
+	virtual void SetRemoveCallback(Napi::ThreadSafeFunction callback) = 0;
+	
+	// Get list of all currently connected USB devices
+	virtual std::vector<DeviceInfo> ListAllDevices() = 0;
+};
+
+#endif // USB_LISTENER_COMMON_H
+