usb 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [2.5.1] - 2022-08-29
+
+### Fixed
+- USB device plug/unplug detection on Windows when devce already attached - [`531`](https://github.com/node-usb/node-usb/pull/531) ([Rob Moran](https://github.com/thegecko))
+- Removed dependency on yarn in package.json scripts - [`535`](https://github.com/node-usb/node-usb/pull/535) ([Rob Moran](https://github.com/thegecko))
+
 ## [2.5.0] - 2022-07-30
 
 ### Fixed

package/README.md

@@ -594,11 +594,17 @@ git submodule update --init
 ```
 
 ## Building
-The package uses `yarn` for the typescript code and `prebuildify` to generate the native binaries. These can be executed as follows:
+The package uses `prebuildify` to generate the native binaries using an `install` script and `TypeScript` for the binding code using the `compile` script. The package can be built as follows:
 
 ```bash
 yarn
-yarn prebuild
+yarn compile
+```
+
+The native binaries can be rebuilt with:
+
+```bash
+yarn rebuild
 ```
 
 __Note:__ On Linux, you'll need libudev to build libusb. On Ubuntu/Debian:

package/dist/usb/index.d.ts

@@ -4,14 +4,18 @@ interface EventListeners<T> {
     newListener: keyof T;
     removeListener: keyof T;
 }
+interface DeviceIds {
+    idVendor: number;
+    idProduct: number;
+}
 declare module './bindings' {
     interface Device extends ExtendedDevice {
     }
     interface DeviceEvents extends EventListeners<DeviceEvents> {
         attach: Device;
         detach: Device;
-        attachIds: undefined;
-        detachIds: undefined;
+        attachIds: DeviceIds;
+        detachIds: DeviceIds;
     }
     function addListener<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
     function removeListener<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;

package/dist/usb/index.js

@@ -21,50 +21,52 @@ Object.setPrototypeOf(usb, events_1.EventEmitter.prototype);
 Object.getOwnPropertyNames(device_1.ExtendedDevice.prototype).forEach(function (name) {
     Object.defineProperty(usb.Device.prototype, name, Object.getOwnPropertyDescriptor(device_1.ExtendedDevice.prototype, name) || Object.create(null));
 });
-// Polling mechanism for discovering device changes where hotplug detection is not available
-var pollTimeout = 500;
+// Hotplug support
 var hotplugSupported = usb._supportedHotplugEvents();
-var pollingHotplug = false;
-var pollDevices = new Set();
-var pollHotplugOnce = function (start) {
+// Devices delta support for non-libusb hotplug events
+// This methd needs to be used for attach/detach IDs (hotplugSupportType === 2) rather than a lookup because vid/pid are not unique
+var hotPlugDevices = new Set();
+var emitHotplugEvents = function () {
     var e_1, _a, e_2, _b;
     // Collect current devices
     var devices = new Set(usb.getDeviceList());
-    if (!start) {
-        try {
-            // Find attached devices
-            for (var devices_1 = __values(devices), devices_1_1 = devices_1.next(); !devices_1_1.done; devices_1_1 = devices_1.next()) {
-                var device = devices_1_1.value;
-                if (!pollDevices.has(device))
-                    usb.emit('attach', device);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (devices_1_1 && !devices_1_1.done && (_a = devices_1.return)) _a.call(devices_1);
+    try {
+        // Find attached devices
+        for (var devices_1 = __values(devices), devices_1_1 = devices_1.next(); !devices_1_1.done; devices_1_1 = devices_1.next()) {
+            var device = devices_1_1.value;
+            if (!hotPlugDevices.has(device)) {
+                usb.emit('attach', device);
             }
-            finally { if (e_1) throw e_1.error; }
         }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
         try {
-            // Find detached devices
-            for (var pollDevices_1 = __values(pollDevices), pollDevices_1_1 = pollDevices_1.next(); !pollDevices_1_1.done; pollDevices_1_1 = pollDevices_1.next()) {
-                var device = pollDevices_1_1.value;
-                if (!devices.has(device))
-                    usb.emit('detach', device);
-            }
+            if (devices_1_1 && !devices_1_1.done && (_a = devices_1.return)) _a.call(devices_1);
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (pollDevices_1_1 && !pollDevices_1_1.done && (_b = pollDevices_1.return)) _b.call(pollDevices_1);
+        finally { if (e_1) throw e_1.error; }
+    }
+    try {
+        // Find detached devices
+        for (var hotPlugDevices_1 = __values(hotPlugDevices), hotPlugDevices_1_1 = hotPlugDevices_1.next(); !hotPlugDevices_1_1.done; hotPlugDevices_1_1 = hotPlugDevices_1.next()) {
+            var device = hotPlugDevices_1_1.value;
+            if (!devices.has(device)) {
+                usb.emit('detach', device);
             }
-            finally { if (e_2) throw e_2.error; }
         }
     }
-    pollDevices = devices;
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (hotPlugDevices_1_1 && !hotPlugDevices_1_1.done && (_b = hotPlugDevices_1.return)) _b.call(hotPlugDevices_1);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    hotPlugDevices = devices;
 };
-var pollHotplugLoop = function (start) {
+// Polling mechanism for checking device changes where hotplug detection is not available
+var pollingHotplug = false;
+var pollHotplug = function (start) {
     if (start === void 0) { start = false; }
     if (start) {
         pollingHotplug = true;
@@ -72,33 +74,53 @@ var pollHotplugLoop = function (start) {
     else if (!pollingHotplug) {
         return;
     }
-    pollHotplugOnce(start);
-    setTimeout(function () {
-        pollHotplugLoop();
-    }, pollTimeout);
+    else {
+        emitHotplugEvents();
+    }
+    setTimeout(function () { return pollHotplug(); }, 500);
+};
+// Hotplug control
+var startHotplug = function () {
+    if (hotplugSupported !== 1) {
+        // Collect initial devices when not using libusb
+        hotPlugDevices = new Set(usb.getDeviceList());
+    }
+    if (hotplugSupported) {
+        // Use hotplug event emitters
+        usb._enableHotplugEvents();
+        if (hotplugSupported === 2) {
+            // Use hotplug ID events to trigger a change check
+            usb.on('attachIds', emitHotplugEvents);
+            usb.on('detachIds', emitHotplugEvents);
+        }
+    }
+    else {
+        // Fallback to using polling to check for changes
+        pollHotplug(true);
+    }
+};
+var stopHotplug = function () {
+    if (hotplugSupported) {
+        // Disable hotplug events
+        usb._disableHotplugEvents();
+        if (hotplugSupported === 2) {
+            // Remove hotplug ID event listeners
+            usb.off('attachIds', emitHotplugEvents);
+            usb.off('detachIds', emitHotplugEvents);
+        }
+    }
+    else {
+        // Stop polling
+        pollingHotplug = false;
+    }
 };
-var hotplugModeIsIdsOnly = hotplugSupported === 2;
-if (hotplugModeIsIdsOnly) {
-    // The hotplug backend doesnt emit 'attach' or 'detach', so we need to do some conversion
-    var hotplugEventConversion = function () {
-        // Future: This might want a debounce, to avoid doing multiple polls when attaching a usb hub or something
-        pollHotplugOnce(false);
-    };
-    usb.on('attachIds', hotplugEventConversion);
-    usb.on('detachIds', hotplugEventConversion);
-}
 usb.on('newListener', function (event) {
     if (event !== 'attach' && event !== 'detach') {
         return;
     }
     var listenerCount = usb.listenerCount('attach') + usb.listenerCount('detach');
     if (listenerCount === 0) {
-        if (hotplugSupported) {
-            usb._enableHotplugEvents();
-        }
-        else {
-            pollHotplugLoop(true);
-        }
+        startHotplug();
     }
 });
 usb.on('removeListener', function (event) {
@@ -107,12 +129,7 @@ usb.on('removeListener', function (event) {
     }
     var listenerCount = usb.listenerCount('attach') + usb.listenerCount('detach');
     if (listenerCount === 0) {
-        if (hotplugSupported) {
-            usb._disableHotplugEvents();
-        }
-        else {
-            pollingHotplug = false;
-        }
+        stopHotplug();
     }
 });
 module.exports = usb;

package/dist/usb/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../tsc/usb/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "usb",
   "description": "Library to access USB devices",
   "license": "MIT",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "main": "dist/index.js",
   "engines": {
     "node": ">=10.20.0 <11.x || >=12.17.0 <13.0 || >=14.0.0"
@@ -36,12 +36,11 @@
     "hardware"
   ],
   "scripts": {
-    "prepare": "yarn compile",
     "install": "node-gyp-build",
     "rebuild": "node-gyp rebuild",
-    "clean": "git clean -dfx",
-    "compile": "tsc && yarn lint && yarn docs",
-    "lint": "eslint . --ext .ts",
+    "clean": "git clean -fx ./build ./prebuilds ./dist ./docs ./node_modules",
+    "compile": "tsc",
+    "postcompile": "eslint . --ext .ts",
     "watch": "tsc -w --preserveWatchOutput",
     "test": "mocha --require coffeescript/register --grep Module test/*",
     "full-test": "mocha --require coffeescript/register test/*.coffee",

package/src/hotplug/libusb.cc

@@ -61,12 +61,11 @@ void handleHotplug(HotPlug* info) {
     Napi::Object v8dev = Device::get(env, dev);
     libusb_unref_device(dev);
 
-    Napi::Value v8Vid = env.Null();
-    Napi::Value v8Pid = env.Null();
+    Napi::Object v8VidPid = Napi::Object::New(env);
     auto deviceDescriptor = v8dev.Get("deviceDescriptor");
     if (deviceDescriptor.IsObject()) {
-        v8Vid = deviceDescriptor.As<Napi::Object>().Get("idVendor");
-        v8Pid = deviceDescriptor.As<Napi::Object>().Get("idProduct");
+        v8VidPid.Set("idVendor", deviceDescriptor.As<Napi::Object>().Get("idVendor"));
+        v8VidPid.Set("idProduct", deviceDescriptor.As<Napi::Object>().Get("idProduct"));
     }
 
     Napi::String eventName;
@@ -87,5 +86,5 @@ void handleHotplug(HotPlug* info) {
     }
 
     hotplugThis->Get("emit").As<Napi::Function>().MakeCallback(hotplugThis->Value(), { eventName, v8dev });
-    hotplugThis->Get("emit").As<Napi::Function>().MakeCallback(hotplugThis->Value(), { changeEventName, v8Vid, v8Pid });
+    hotplugThis->Get("emit").As<Napi::Function>().MakeCallback(hotplugThis->Value(), { changeEventName, v8VidPid });
 }

package/src/hotplug/windows.cc

@@ -135,8 +135,9 @@ void handleHotplug(HotPlug* info) {
 
     int vid = info->vid;
     int pid = info->pid;
-    auto v8Vid = Napi::Number::New(env, vid);
-    auto v8Pid = Napi::Number::New(env, pid);
+    Napi::Object v8VidPid = Napi::Object::New(env);
+    v8VidPid.Set("idVendor", Napi::Number::New(env, vid));
+    v8VidPid.Set("idProduct", Napi::Number::New(env, pid));
     CM_NOTIFY_ACTION event = info->event;
     delete info;
 
@@ -156,5 +157,5 @@ void handleHotplug(HotPlug* info) {
         return;
     }
     
-    hotplugThis->Get("emit").As<Napi::Function>().MakeCallback(hotplugThis->Value(), { eventName, v8Vid, v8Pid });
+    hotplugThis->Get("emit").As<Napi::Function>().MakeCallback(hotplugThis->Value(), { eventName, v8VidPid });
 }

package/tsc/usb/index.ts

@@ -18,6 +18,11 @@ interface EventListeners<T> {
     removeListener: keyof T;
 }
 
+interface DeviceIds {
+    idVendor: number;
+    idProduct: number;
+}
+
 declare module './bindings' {
 
     /* eslint-disable @typescript-eslint/no-empty-interface */
@@ -26,8 +31,8 @@ declare module './bindings' {
     interface DeviceEvents extends EventListeners<DeviceEvents> {
         attach: Device;
         detach: Device;
-        attachIds: undefined;
-        detachIds: undefined;
+        attachIds: DeviceIds;
+        detachIds: DeviceIds;
     }
 
     function addListener<K extends keyof DeviceEvents>(event: K, listener: (arg: DeviceEvents[K]) => void): void;
@@ -42,58 +47,84 @@ declare module './bindings' {
     function listenerCount<K extends keyof DeviceEvents>(event: K): number;
 }
 
-// Polling mechanism for discovering device changes where hotplug detection is not available
-const pollTimeout = 500;
+// Hotplug support
 const hotplugSupported = usb._supportedHotplugEvents();
-let pollingHotplug = false;
-let pollDevices = new Set<usb.Device>();
 
-const pollHotplugOnce = (start: boolean) => {
+// Devices delta support for non-libusb hotplug events
+// This methd needs to be used for attach/detach IDs (hotplugSupportType === 2) rather than a lookup because vid/pid are not unique
+let hotPlugDevices = new Set<usb.Device>();
+const emitHotplugEvents = () => {
     // Collect current devices
     const devices = new Set(usb.getDeviceList());
 
-    if (!start) {
-        // Find attached devices
-        for (const device of devices) {
-            if (!pollDevices.has(device))
-                usb.emit('attach', device);
+    // Find attached devices
+    for (const device of devices) {
+        if (!hotPlugDevices.has(device)) {
+            usb.emit('attach', device);
         }
+    }
 
-        // Find detached devices
-        for (const device of pollDevices) {
-            if (!devices.has(device))
-                usb.emit('detach', device);
+    // Find detached devices
+    for (const device of hotPlugDevices) {
+        if (!devices.has(device)) {
+            usb.emit('detach', device);
         }
     }
 
-    pollDevices = devices;
+    hotPlugDevices = devices;
 };
 
-const pollHotplugLoop = (start = false) => {
+// Polling mechanism for checking device changes where hotplug detection is not available
+let pollingHotplug = false;
+const pollHotplug = (start = false) => {
     if (start) {
         pollingHotplug = true;
     } else if (!pollingHotplug) {
         return;
+    } else {
+        emitHotplugEvents();
+    }
+
+    setTimeout(() => pollHotplug(), 500);
+};
+
+// Hotplug control
+const startHotplug = () => {
+    if (hotplugSupported !== 1) {
+        // Collect initial devices when not using libusb
+        hotPlugDevices = new Set(usb.getDeviceList());
     }
 
-    pollHotplugOnce(start);
+    if (hotplugSupported) {
+        // Use hotplug event emitters
+        usb._enableHotplugEvents();
 
-    setTimeout(() => {
-        pollHotplugLoop();
-    }, pollTimeout);
+        if (hotplugSupported === 2) {
+            // Use hotplug ID events to trigger a change check
+            usb.on('attachIds', emitHotplugEvents);
+            usb.on('detachIds', emitHotplugEvents);
+        }
+    } else {
+        // Fallback to using polling to check for changes
+        pollHotplug(true);
+    }
 };
 
-const hotplugModeIsIdsOnly = hotplugSupported === 2;
-if (hotplugModeIsIdsOnly) {
-    // The hotplug backend doesnt emit 'attach' or 'detach', so we need to do some conversion
-    const hotplugEventConversion = () => {
-        // Future: This might want a debounce, to avoid doing multiple polls when attaching a usb hub or something
-        pollHotplugOnce(false);
-    };
+const stopHotplug = () => {
+    if (hotplugSupported) {
+        // Disable hotplug events
+        usb._disableHotplugEvents();
 
-    usb.on('attachIds', hotplugEventConversion);
-    usb.on('detachIds', hotplugEventConversion);
-}
+        if (hotplugSupported === 2) {
+            // Remove hotplug ID event listeners
+            usb.off('attachIds', emitHotplugEvents);
+            usb.off('detachIds', emitHotplugEvents);
+        }
+    } else {
+        // Stop polling
+        pollingHotplug = false;
+    }
+};
 
 usb.on('newListener', event => {
     if (event !== 'attach' && event !== 'detach') {
@@ -101,11 +132,7 @@ usb.on('newListener', event => {
     }
     const listenerCount = usb.listenerCount('attach') + usb.listenerCount('detach');
     if (listenerCount === 0) {
-        if (hotplugSupported) {
-            usb._enableHotplugEvents();
-        } else {
-            pollHotplugLoop(true);
-        }
+        startHotplug();
     }
 });
 
@@ -115,11 +142,7 @@ usb.on('removeListener', event => {
     }
     const listenerCount = usb.listenerCount('attach') + usb.listenerCount('detach');
     if (listenerCount === 0) {
-        if (hotplugSupported) {
-            usb._disableHotplugEvents();
-        } else {
-            pollingHotplug = false;
-        }
+        stopHotplug();
     }
 });