usb 1.8.1 → 1.8.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "usb",
   "description": "Library to access USB devices",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "engines": {
     "node": ">=10.16.0"
   },
@@ -37,16 +37,16 @@
   "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-darwin": "prebuildify --napi --target 10.16.0 --strip --arch x64+arm64",
+    "prebuild-win32-x86": "prebuildify --napi --target 10.16.0 --strip",
+    "prebuild-win32-x64": "prebuildify --napi --target 10.16.0 --strip",
+    "prebuild-linux-x86": "prebuildify-cross -i ghcr.io/node-usb/linux-x86 --napi --target 10.16.0 --strip",
+    "prebuild-linux-x64": "prebuildify-cross -i ghcr.io/node-usb/centos7-devtoolset7 -i ghcr.io/node-usb/alpine --napi --target 10.16.0 --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 --target 10.16.0 --strip --tag-armv",
+    "prebuild-android-arm": "prebuildify-cross -i ghcr.io/node-usb/android-arm64 -i ghcr.io/node-usb/android-armv7 --napi --target 10.16.0 --strip --tag-armv",
     "prebuild-download": "prebuildify-ci download"
   },
   "dependencies": {

package/src/device.cc

@@ -19,11 +19,6 @@ Device::Device(const Napi::CallbackInfo & info) : Napi::ObjectWrap<Device>(info)
 	device = info[0].As<Napi::External<libusb_device>>().Data();
 	libusb_ref_device(device);
 	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);
 }
@@ -193,6 +188,9 @@ Napi::Value Device::Open(const Napi::CallbackInfo& info) {
 	ENTER_METHOD(Device, 0);
 	if (!self->device_handle){
 		CHECK_USB(libusb_open(self->device, &self->device_handle));
+#ifndef USE_POLL
+    	completionQueue.start(info.Env());
+#endif
 	}
 	return env.Undefined();
 }
@@ -202,6 +200,9 @@ Napi::Value Device::Close(const Napi::CallbackInfo& info) {
 	if (self->canClose()){
 		libusb_close(self->device_handle);
 		self->device_handle = NULL;
+#ifndef USE_POLL
+	    completionQueue.stop();
+#endif        
 	}else{
 		THROW_ERROR("Can't close device with a pending request");
 	}

package/src/node_usb.h

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