usb 2.4.2 → 2.5.1

package/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "libusb"]
-	path = libusb
-	url = https://github.com/libusb/libusb.git
+    path = libusb
+    url = https://github.com/libusb/libusb.git

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 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
+- Native USB device plug/unplug detection on Windows - [`524`](https://github.com/node-usb/node-usb/pull/524) ([Julian Waller](https://github.com/Julusian))
+
+## [2.4.3] - 2022-06-21
+
+### Fixed
+- Fixed poll transfer tracking - [`522`](https://github.com/node-usb/node-usb/pull/522) ([Rob Moran](https://github.com/thegecko))
+
 ## [2.4.2] - 2022-05-27
 
 ### Fixed

package/README.md

@@ -547,6 +547,40 @@ Restore (re-reference) the hotplug events unreferenced by `unrefHotplugEvents()`
 #### usb.unrefHotplugEvents();
 Listening to events will prevent the process to exit. By calling this function, hotplug events will be unreferenced by the event loop, allowing the process to exit even when listening for the `attach` and `detach` events.
 
+# Migrating from node-usb-detection
+
+If you have been referred here by `node-usb-detection`, the following may be helpful for you to update your existing code.
+
+## usbDetect.startMonitoring() & usbDetect.stopMonitoring()
+
+There is no direct equivalent to these methods. This is handled automatically for you when you add and remove event listeners.
+
+You may find `usb.unrefHotplugEvents()` useful as it is intended to help with exit conditions.
+
+## usbDetect.find()
+
+You can instead use `usb.getDeviceList()`. Be aware that this will do an enumeration to find all of the devices, and not look at a cache of the known devices. If you call it too often it may have a performance impact.
+
+To find a specific device by vid and pid, call `usb.findByIds`. e.g. `usb.findByIds(0x12, 0x34)`.
+
+## usbDetect.on('add', function(device) { ... })
+
+These should be changed to `usb.on('attach', function(device) { ... })`.
+
+There is no equivalent to filter based on the vid or pid, instead you should do a check inside the callback you provide.  
+The contents of the device object has also changed.
+
+## usbDetect.on('remove', function(device) { ... })
+
+These should be changed to `usb.on('detach', function(device) { ... })`.
+
+There is no equivalent to filter based on the vid or pid, instead you should do a check inside the callback you provide.  
+The contents of the device object has also changed.
+
+## usbDetect.on('change', function(device) { ... })
+
+There is no direct equivalent to this. Instead you can listen to both `attach` and `detach` to get the same behaviour.
+
 # Development
 The library is based on native bindings wrapping the [libusb](https://github.com/libusb/libusb) library.
 
@@ -560,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/binding.gyp

@@ -1,25 +1,32 @@
 {
   'variables': {
     'use_udev%': 1,
-    'use_system_libusb%': 'false',
+    'use_system_libusb%': 'false'
   },
   'targets': [
     {
       'target_name': 'usb_bindings',
-      'cflags!': [ '-fno-exceptions' ],
-      'cflags_cc!': [ '-fno-exceptions' ],
-      'xcode_settings': { 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+      'cflags!': [
+        '-fno-exceptions'
+      ],
+      'cflags_cc!': [
+        '-fno-exceptions'
+      ],
+      'xcode_settings': {
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
         'CLANG_CXX_LIBRARY': 'libc++',
-        'MACOSX_DEPLOYMENT_TARGET': '10.7',
+        'MACOSX_DEPLOYMENT_TARGET': '10.7'
       },
       'msvs_settings': {
-        'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+        'VCCLCompilerTool': {
+          'ExceptionHandling': 1
+        }
       },
       'sources': [
-        './src/node_usb.cc',
-        './src/device.cc',
-        './src/transfer.cc',
-        './src/thread_name.cc',
+        'src/node_usb.cc',
+        'src/device.cc',
+        'src/transfer.cc',
+        'src/thread_name.cc'
       ],
       'cflags_cc': [
         '-std=c++14'
@@ -27,7 +34,7 @@
       'defines': [
         '_FILE_OFFSET_BITS=64',
         '_LARGEFILE_SOURCE',
-        'NAPI_VERSION=6',
+        'NAPI_VERSION=6'
       ],
       'include_dirs+': [
         'src/',
@@ -37,7 +44,7 @@
           ['use_system_libusb=="false" and OS!="freebsd"', {
             'dependencies': [
               'libusb.gypi:libusb',
-            ],
+            ]
           }],
           ['use_system_libusb=="true" or OS=="freebsd"', {
             'include_dirs+': [
@@ -45,7 +52,7 @@
             ],
             'libraries': [
               '<!@(pkg-config libusb-1.0 --libs)'
-            ],
+            ]
           }],
           ['OS=="mac"', {
             'xcode_settings': {
@@ -62,40 +69,56 @@
                 '-arch arm64'
               ],
               'SDKROOT': 'macosx',
-              'MACOSX_DEPLOYMENT_TARGET': '10.7',
-            },
+              'MACOSX_DEPLOYMENT_TARGET': '10.7'
+            }
+          }],
+          ['OS!="win"', {
+            'sources': [
+              'src/hotplug/libusb.cc'
+            ],
           }],
           ['OS=="win"', {
+            'sources': [
+              'src/hotplug/windows.cc'
+            ],
             'defines':[
               'WIN32_LEAN_AND_MEAN'
             ],
+            'libraries': [
+              'cfgmgr32.lib'
+            ],
             'default_configuration': 'Debug',
             'configurations': {
               'Debug': {
-                'defines': [ 'DEBUG', '_DEBUG' ],
+                'defines': [
+                  'DEBUG',
+                  '_DEBUG'
+                ],
                 'msvs_settings': {
                   'VCCLCompilerTool': {
                     'RuntimeLibrary': 1, # static debug
-                  },
-                },
+                  }
+                }
               },
               'Release': {
-                'defines': [ 'NDEBUG' ],
+                'defines': [
+                  'NDEBUG'
+                ],
                 'msvs_settings': {
                   'VCCLCompilerTool': {
                     'RuntimeLibrary': 0, # static release
-                  },
-                },
+                  }
+                }
               }
             },
             'msvs_settings': {
               'VCCLCompilerTool': {
-                'AdditionalOptions': [ '/EHsc' ],
-              },
-            },
+                'AdditionalOptions': [ '/EHsc' ]
+              }
+            }
           }
         ]
       ]
-    },
+    }
   ]
 }

package/dist/usb/bindings.d.ts

@@ -17,6 +17,7 @@ export declare function setDebugLevel(level: number): void;
  * Use USBDK Backend (Windows only)
  */
 export declare function useUsbDkBackend(): void;
+export declare function _supportedHotplugEvents(): number;
 export declare function _enableHotplugEvents(): void;
 export declare function _disableHotplugEvents(): void;
 export declare function _getLibusbCapability(capability: number): number;

package/dist/usb/endpoint.d.ts

@@ -32,7 +32,7 @@ export declare abstract class Endpoint extends EventEmitter {
 export declare class InEndpoint extends Endpoint {
     /** Endpoint direction. */
     direction: 'in' | 'out';
-    protected pollTransfers: Transfer[] | undefined;
+    protected pollTransfers: Transfer[];
     protected pollTransferSize: number;
     protected pollPending: number;
     pollActive: boolean;

package/dist/usb/endpoint.js

@@ -58,6 +58,7 @@ var InEndpoint = /** @class */ (function (_super) {
         var _this = _super.call(this, device, descriptor) || this;
         /** Endpoint direction. */
         _this.direction = 'in';
+        _this.pollTransfers = [];
         _this.pollTransferSize = 0;
         _this.pollPending = 0;
         _this.pollActive = false;
@@ -115,6 +116,7 @@ var InEndpoint = /** @class */ (function (_super) {
                 _this.pollPending--;
                 if (_this.pollPending === 0) {
                     _this.pollTransfers = [];
+                    _this.pollActive = false;
                     _this.emit('end');
                 }
             }
@@ -140,7 +142,7 @@ var InEndpoint = /** @class */ (function (_super) {
     InEndpoint.prototype.startPollTransfers = function (nTransfers, transferSize, callback) {
         if (nTransfers === void 0) { nTransfers = 3; }
         if (transferSize === void 0) { transferSize = this.descriptor.wMaxPacketSize; }
-        if (this.pollTransfers) {
+        if (this.pollActive) {
             throw new Error('Polling already active');
         }
         this.pollTransferSize = transferSize;
@@ -162,7 +164,7 @@ var InEndpoint = /** @class */ (function (_super) {
      * @param callback
      */
     InEndpoint.prototype.stopPoll = function (callback) {
-        if (!this.pollTransfers) {
+        if (!this.pollActive) {
             throw new Error('Polling is not active.');
         }
         for (var i = 0; i < this.pollTransfers.length; i++) {

package/dist/usb/endpoint.js.map

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

package/dist/usb/index.d.ts

@@ -4,12 +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: 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,14 +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 until this is fixed:
-// https://github.com/libusb/libusb/issues/86
-var pollTimeout = 500;
-var hotplugSupported = usb._getLibusbCapability(usb.LIBUSB_CAP_HAS_HOTPLUG) > 0;
+// Hotplug support
+var hotplugSupported = usb._supportedHotplugEvents();
+// 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());
+    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);
+            }
+        }
+    }
+    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);
+        }
+        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);
+            }
+        }
+    }
+    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;
+};
+// Polling mechanism for checking device changes where hotplug detection is not available
 var pollingHotplug = false;
-var pollDevices = new Set();
 var pollHotplug = function (start) {
-    var e_1, _a, e_2, _b;
     if (start === void 0) { start = false; }
     if (start) {
         pollingHotplug = true;
@@ -36,44 +74,45 @@ var pollHotplug = function (start) {
     else if (!pollingHotplug) {
         return;
     }
-    // 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);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        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);
-            }
+    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);
         }
-        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_2) throw e_2.error; }
+    }
+    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);
         }
     }
-    pollDevices = devices;
-    setTimeout(function () {
-        pollHotplug();
-    }, pollTimeout);
+    else {
+        // Stop polling
+        pollingHotplug = false;
+    }
 };
 usb.on('newListener', function (event) {
     if (event !== 'attach' && event !== 'detach') {
@@ -81,12 +120,7 @@ usb.on('newListener', function (event) {
     }
     var listenerCount = usb.listenerCount('attach') + usb.listenerCount('detach');
     if (listenerCount === 0) {
-        if (hotplugSupported) {
-            usb._enableHotplugEvents();
-        }
-        else {
-            pollHotplug(true);
-        }
+        startHotplug();
     }
 });
 usb.on('removeListener', function (event) {
@@ -95,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":";;;;;;;;;;;;AAAA,iCAAsC;AACtC,mCAA0C;AAC1C,gCAAkC;AAElC,IAAI,GAAG,CAAC,UAAU,EAAE;IAChB,+BAA+B;IAC/B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;CAChD;AAED,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,qBAAY,CAAC,SAAS,CAAC,CAAC;AAEnD,MAAM,CAAC,mBAAmB,CAAC,uBAAc,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAA,IAAI;IAC7D,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,wBAAwB,CAAC,uBAAc,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9I,CAAC,CAAC,CAAC;AAoCH,kBAAkB;AAClB,IAAM,gBAAgB,GAAG,GAAG,CAAC,uBAAuB,EAAE,CAAC;AAEvD,sDAAsD;AACtD,mIAAmI;AACnI,IAAI,cAAc,GAAG,IAAI,GAAG,EAAc,CAAC;AAC3C,IAAM,iBAAiB,GAAG;;IACtB,0BAA0B;IAC1B,IAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC;;QAE7C,wBAAwB;QACxB,KAAqB,IAAA,YAAA,SAAA,OAAO,CAAA,gCAAA,qDAAE;YAAzB,IAAM,MAAM,oBAAA;YACb,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC7B,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aAC9B;SACJ;;;;;;;;;;QAED,wBAAwB;QACxB,KAAqB,IAAA,mBAAA,SAAA,cAAc,CAAA,8CAAA,0EAAE;YAAhC,IAAM,MAAM,2BAAA;YACb,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBACtB,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aAC9B;SACJ;;;;;;;;;IAED,cAAc,GAAG,OAAO,CAAC;AAC7B,CAAC,CAAC;AAEF,yFAAyF;AACzF,IAAI,cAAc,GAAG,KAAK,CAAC;AAC3B,IAAM,WAAW,GAAG,UAAC,KAAa;IAAb,sBAAA,EAAA,aAAa;IAC9B,IAAI,KAAK,EAAE;QACP,cAAc,GAAG,IAAI,CAAC;KACzB;SAAM,IAAI,CAAC,cAAc,EAAE;QACxB,OAAO;KACV;SAAM;QACH,iBAAiB,EAAE,CAAC;KACvB;IAED,UAAU,CAAC,cAAM,OAAA,WAAW,EAAE,EAAb,CAAa,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,kBAAkB;AAClB,IAAM,YAAY,GAAG;IACjB,IAAI,gBAAgB,KAAK,CAAC,EAAE;QACxB,gDAAgD;QAChD,cAAc,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC;KACjD;IAED,IAAI,gBAAgB,EAAE;QAClB,6BAA6B;QAC7B,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAE3B,IAAI,gBAAgB,KAAK,CAAC,EAAE;YACxB,kDAAkD;YAClD,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YACvC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;SAC1C;KACJ;SAAM;QACH,iDAAiD;QACjD,WAAW,CAAC,IAAI,CAAC,CAAC;KACrB;AACL,CAAC,CAAC;AAEF,IAAM,WAAW,GAAG;IAChB,IAAI,gBAAgB,EAAE;QAClB,yBAAyB;QACzB,GAAG,CAAC,qBAAqB,EAAE,CAAC;QAE5B,IAAI,gBAAgB,KAAK,CAAC,EAAE;YACxB,oCAAoC;YACpC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;YACxC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;SAC3C;KACJ;SAAM;QACH,eAAe;QACf,cAAc,GAAG,KAAK,CAAC;KAC1B;AACL,CAAC,CAAC;AAEF,GAAG,CAAC,EAAE,CAAC,aAAa,EAAE,UAAA,KAAK;IACvB,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE;QAC1C,OAAO;KACV;IACD,IAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChF,IAAI,aAAa,KAAK,CAAC,EAAE;QACrB,YAAY,EAAE,CAAC;KAClB;AACL,CAAC,CAAC,CAAC;AAEH,GAAG,CAAC,EAAE,CAAC,gBAAgB,EAAE,UAAA,KAAK;IAC1B,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,EAAE;QAC1C,OAAO;KACV;IACD,IAAM,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChF,IAAI,aAAa,KAAK,CAAC,EAAE;QACrB,WAAW,EAAE,CAAC;KACjB;AACL,CAAC,CAAC,CAAC;AAEH,iBAAS,GAAG,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "usb",
   "description": "Library to access USB devices",
   "license": "MIT",
-  "version": "2.4.2",
+  "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",