usb 1.8.1 → 1.8.8

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [1.8.8] - 2022-02-07
+
+### Fixed
+- Reverted exit delay and hang by moving queue start/stop to device open/close  - [`460`](https://github.com/node-usb/node-usb/pull/460) ([MikeColeGuru](https://github.com/MikeColeGuru))
+
+## [1.8.7] - 2022-02-07
+
+### Fixed
+- Fixed prebuildify tags which lead to missing binaries - [`477`](https://github.com/node-usb/node-usb/pull/477) ([Rob Moran](https://github.com/thegecko))
+
+## [1.8.5] - 2022-01-29
+
+### Fixed
+- Fixed lack of universal binary for MacOS darwin arm64 - [`473`](https://github.com/node-usb/node-usb/pull/473) ([Rob Moran](https://github.com/thegecko))
+
+## [1.8.2] - 2022-01-07
+
+### Added
+- Added definition for `NAPI_VERSION 4` and added N-API v4 target to prebuildify - ([Rob Moran](https://github.com/thegecko))
+
+### Fixed
+- Fixed exit delay and hang by moving queue start/stop to device open/close  - [`460`](https://github.com/node-usb/node-usb/pull/460) ([MikeColeGuru](https://github.com/MikeColeGuru))
+
 ## [1.8.1] - 2021-11-08
 
 ### Added

package/binding.gyp

@@ -49,8 +49,18 @@
           }],
           ['OS=="mac"', {
             'xcode_settings': {
-              'OTHER_CFLAGS': [ '-std=c++1y', '-stdlib=libc++' ],
-              'OTHER_LDFLAGS': [ '-framework', 'CoreFoundation', '-framework', 'IOKit' ],
+              'OTHER_CFLAGS': [
+                '-std=c++1y',
+                '-stdlib=libc++',
+                '-arch x86_64',
+                '-arch arm64'
+              ],
+              'OTHER_LDFLAGS': [
+                '-framework', 'CoreFoundation',
+                '-framework', 'IOKit',
+                '-arch x86_64',
+                '-arch arm64'
+              ],
               'SDKROOT': 'macosx',
               'MACOSX_DEPLOYMENT_TARGET': '10.7',
             },

package/libusb.gypi

@@ -103,6 +103,14 @@
           'defines': [
             'OS_DARWIN=1',
           ],
+          'xcode_settings': {
+            'OTHER_CFLAGS': [
+              '-arch x86_64',
+              '-arch arm64'
+            ],
+            'CLANG_CXX_LIBRARY': 'libc++',
+            'MACOSX_DEPLOYMENT_TARGET': '10.7'
+          }
         }],
         [ 'OS == "win"', {
           'sources': [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "usb",
   "description": "Library to access USB devices",
-  "version": "1.8.1",
+  "version": "1.8.8",
   "engines": {
     "node": ">=10.16.0"
   },
@@ -37,16 +37,11 @@
   "scripts": {
     "install": "node-gyp-build",
     "test": "mocha --require coffeescript/register --grep Module test/*",
-    "full-test": "mocha --require coffeescript/register test/*",
-    "valgrind": "coffee -c test/usb.coffee; valgrind --leak-check=full --show-possibly-lost=no node --expose-gc --trace-gc node_modules/mocha/bin/_mocha -R spec",
-    "prebuild": "prebuildify --napi --strip",
-    "prebuild-darwin": "prebuildify --napi --strip --arch x64+arm64",
-    "prebuild-win32-x86": "prebuildify --napi --strip",
-    "prebuild-win32-x64": "prebuildify --napi --strip",
-    "prebuild-linux-x86": "prebuildify-cross -i ghcr.io/node-usb/linux-x86 --napi --strip",
-    "prebuild-linux-x64": "prebuildify-cross -i ghcr.io/node-usb/centos7-devtoolset7 -i ghcr.io/node-usb/alpine --napi --strip --tag-libc",
-    "prebuild-linux-arm": "prebuildify-cross -i ghcr.io/node-usb/linux-arm64 -i ghcr.io/node-usb/linux-armv7 -i ghcr.io/node-usb/linux-armv6 --napi --strip --tag-armv",
-    "prebuild-android-arm": "prebuildify-cross -i ghcr.io/node-usb/android-arm64 -i ghcr.io/node-usb/android-armv7 --napi --strip --tag-armv",
+    "full-test": "mocha --require coffeescript/register test/*.coffee",
+    "valgrind": "coffee -c test/*.coffee; valgrind --leak-check=full --show-possibly-lost=no node --expose-gc --trace-gc node_modules/mocha/bin/_mocha -R spec",
+    "prebuild": "prebuildify --napi --target 10.16.0 --strip",
+    "prebuild-cross": "prebuildify-cross --napi --target 10.16.0 --strip",
+    "prepublishOnly": "prebuildify-ci download",
     "prebuild-download": "prebuildify-ci download"
   },
   "dependencies": {
@@ -55,7 +50,7 @@
   },
   "devDependencies": {
     "coffeescript": "~2.4.1",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.0",
     "node-gyp": "^7.1.2",
     "prebuildify": "^4.2.1",
     "prebuildify-ci": "^1.0.5",

package/src/device.cc

@@ -21,8 +21,6 @@ Device::Device(const Napi::CallbackInfo & info) : Napi::ObjectWrap<Device>(info)
 	byPtr.insert(std::make_pair(device, this));
 #ifndef USE_POLL
 	completionQueue.start(info.Env());
-	// Unref threadsafe function immediately to avoid delay in program exit
-	completionQueue.unref(info.Env());
 #endif
 	DEBUG_LOG("Created device %p", this);
 	Constructor(info);
@@ -30,6 +28,9 @@ Device::Device(const Napi::CallbackInfo & info) : Napi::ObjectWrap<Device>(info)
 
 Device::~Device(){
 	DEBUG_LOG("Freed device %p", this);
+#ifndef USE_POLL
+	completionQueue.stop();
+#endif
 	byPtr.erase(device);
 	libusb_close(device_handle);
 	libusb_unref_device(device);

package/src/node_usb.h

@@ -10,6 +10,7 @@
 #endif
 #include <libusb.h>
 
+#define NAPI_VERSION 4
 #include <napi.h>
 #include <node_buffer.h>