usb 1.8.0-libusb.2 → 1.8.1-libusb.5

package/index.js

@@ -0,0 +1,20 @@
+const usb = require('./');
+
+const a = d => console.log('a', d);
+const d = d => console.log('d', d);
+
+console.log('listening');
+usb.on('attach', a);
+usb.on('detach', d);
+
+setTimeout(() => {
+    console.log('ignoring');
+    usb.off('attach', a);
+    usb.off('detach', d);
+
+    setTimeout(() => {
+        console.log('listening');
+        usb.on('attach', a);
+        usb.on('detach', d); 
+    }, 5000);
+}, 5000);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "usb",
   "description": "Library to access USB devices",
-  "version": "1.8.0-libusb.2",
+  "version": "1.8.1-libusb.5",
   "engines": {
     "node": ">=10.16.0"
   },

package/usb.js

@@ -1,6 +1,9 @@
 var usb = exports = module.exports = require('node-gyp-build')(__dirname);
-var events = require('events')
-var util = require('util')
+var events = require('events');
+var util = require('util');
+var os = require('os');
+
+var isWindows = os.platform() === 'win32';
 
 var isBuffer = function(obj) {
 	return obj && obj instanceof Uint8Array
@@ -512,13 +515,59 @@ var hotplugListeners = 0;
 exports.on('newListener', function(name) {
 	if (name !== 'attach' && name !== 'detach') return;
 	if (++hotplugListeners === 1) {
-		usb._enableHotplugEvents();
+		if (isWindows) {
+			pollHotplug(true);
+		} else {
+			usb._enableHotplugEvents();
+		}
 	}
 });
 
 exports.on('removeListener', function(name) {
 	if (name !== 'attach' && name !== 'detach') return;
 	if (--hotplugListeners === 0) {
-		usb._disableHotplugEvents();
+		if (isWindows) {
+			pollingHotplug = false;
+		} else {
+			usb._disableHotplugEvents();
+		}
 	}
 });
+
+// Polling mechanism for discovering Windows device changes until this is fixed:
+// https://github.com/libusb/libusb/issues/86
+exports._windowsPollTimeout = 500;
+var pollingHotplug = false;
+var windowsDevices = [];
+function pollHotplug(start) {
+	if (start) {
+		pollingHotplug = true;
+	} else if (!pollingHotplug) {
+		return;
+	}
+
+	var devices = usb.getDeviceList();
+
+	if (!start) {
+		// Find attached devices
+		for (var device of devices) {
+			var found = windowsDevices.find(item => item.deviceAddress === device.deviceAddress);
+			if (!found) {
+				usb.emit('attach', device);
+			}
+		}
+
+		// Find detached devices
+		for (var device of windowsDevices) {
+			var found = devices.find(item => item.deviceAddress === device.deviceAddress);
+			if (!found) {
+				usb.emit('detach', device);
+			}
+		}
+	}
+
+	windowsDevices = devices;
+	setTimeout(() => {
+		pollHotplug();
+	}, exports._windowsPollTimeout);
+}