usb 2.7.0 → 2.8.0

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [2.8.0] - 2023-02-11
+
+### Changed
+- Minor tweaks to avoid some race conditions - [`569`](https://github.com/node-usb/node-usb/pull/569) ([Rob Moran](https://github.com/thegecko))
+
 ## [2.7.0] - 2023-01-25
 
 ### Fixed

package/package.json

@@ -2,7 +2,7 @@
   "name": "usb",
   "description": "Library to access USB devices",
   "license": "MIT",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "main": "dist/index.js",
   "engines": {
     "node": ">=10.20.0 <11.x || >=12.17.0 <13.0 || >=14.0.0"

package/src/hotplug/windows.cc

@@ -80,6 +80,7 @@ class HotPlugManagerWindows : public HotPlugManager
 {
 public:
     HotPlugManagerWindows()
+    : hcm(nullptr)
     {
         cmNotifyFilter = { 0 };
         cmNotifyFilter.cbSize = sizeof(cmNotifyFilter);
@@ -105,6 +106,7 @@ public:
         auto res = CM_Register_Notification(&cmNotifyFilter, (PVOID)instanceData, (PCM_NOTIFY_CALLBACK)&MyCMInterfaceNotification, &hcm);
         if (res != CR_SUCCESS)
         {
+            isRunning = false;
             THROW_ERROR("RegisterNotification failed")
         }
     }

package/src/node_usb.cc

@@ -141,9 +141,10 @@ Napi::Value EnableHotplugEvents(const Napi::CallbackInfo& info) {
     if (!instanceData->hotplugEnabled) {
         instanceData->hotplugThis.Reset(info.This().As<Napi::Object>(), 1);
 
+        // Start queue, then enable hotplug events
+        instanceData->hotplugQueue.start(env);
         instanceData->hotplugManager->enableHotplug(env, instanceData);
         
-        instanceData->hotplugQueue.start(env);
         instanceData->hotplugEnabled = true;
     }
     return env.Undefined();
@@ -155,9 +156,11 @@ Napi::Value DisableHotplugEvents(const Napi::CallbackInfo& info) {
     ModuleData* instanceData = env.GetInstanceData<ModuleData>();
 
     if (instanceData->hotplugEnabled) {
-        instanceData->hotplugManager->disableHotplug(env, instanceData);
 
+        // Disable events, then stop queue
+        instanceData->hotplugManager->disableHotplug(env, instanceData);
         instanceData->hotplugQueue.stop();
+
         instanceData->hotplugEnabled = false;
     }
     return env.Undefined();