@stoprocent/noble 2.3.9 → 2.3.12

package/lib/win/src/ble_manager.cc

@@ -579,10 +579,10 @@ bool BLEManager::Read(const std::string& uuid, const winrt::guid& serviceUuid,
     {
         peripheral.GetCharacteristic(
             serviceUuid, characteristicUuid, [=](std::optional<GattCharacteristic> characteristic) {
+                std::string serviceId = toStr(serviceUuid);
+                std::string characteristicId = toStr(characteristicUuid);
                 if (characteristic)
                 {
-                    std::string serviceId = toStr(serviceUuid);
-                    std::string characteristicId = toStr(characteristicUuid);
                     characteristic->ReadValueAsync(BluetoothCacheMode::Uncached)
                         .Completed(
                             bind2(this, &BLEManager::OnRead, uuid, serviceId, characteristicId));
@@ -590,6 +590,7 @@ bool BLEManager::Read(const std::string& uuid, const winrt::guid& serviceUuid,
                 else
                 {
                     LOGE("GetCharacteristic error");
+                    mEmit.Read(uuid, serviceId, characteristicId, Data(), false, "GetCharacteristic error");
                 }
             });
         return true;
@@ -631,10 +632,10 @@ bool BLEManager::Write(const std::string& uuid, const winrt::guid& serviceUuid,
     {
         peripheral.GetCharacteristic(
             serviceUuid, characteristicUuid, [=](std::optional<GattCharacteristic> characteristic) {
+                std::string serviceId = toStr(serviceUuid);
+                std::string characteristicId = toStr(characteristicUuid);
                 if (characteristic)
                 {
-                    std::string serviceId = toStr(serviceUuid);
-                    std::string characteristicId = toStr(characteristicUuid);
                     auto writer = DataWriter();
                     writer.WriteBytes(data);
                     auto value = writer.DetachBuffer();
@@ -647,6 +648,7 @@ bool BLEManager::Write(const std::string& uuid, const winrt::guid& serviceUuid,
                 else
                 {
                     LOGE("GetCharacteristic error");
+                    mEmit.Write(uuid, serviceId, characteristicId, "GetCharacteristic error");
                 }
             });
         return true;
@@ -689,10 +691,10 @@ bool BLEManager::Notify(const std::string& uuid, const winrt::guid& serviceUuid,
     IFDEVICE(device, uuid)
     {
         auto onCharacteristic = [=](std::optional<GattCharacteristic> characteristic) {
+            std::string serviceId = toStr(serviceUuid);
+            std::string characteristicId = toStr(characteristicUuid);
             if (characteristic)
             {
-                std::string serviceId = toStr(serviceUuid);
-                std::string characteristicId = toStr(characteristicUuid);
                 bool subscribed = mNotifyMap.IsSubscribed(uuid, *characteristic);
 
                 if (on)
@@ -703,6 +705,11 @@ bool BLEManager::Notify(const std::string& uuid, const winrt::guid& serviceUuid,
                         mEmit.Notify(uuid, serviceId, characteristicId, true);
                         return;
                     }
+
+                    auto onChanged = bind2(this, &BLEManager::OnValueChanged, uuid);
+                    auto token = characteristic->ValueChanged(onChanged);
+                    mNotifyMap.Add(uuid, *characteristic, token);
+
                     auto descriptorValue =
                         GetDescriptorValue(characteristic->CharacteristicProperties());
 
@@ -736,6 +743,7 @@ bool BLEManager::Notify(const std::string& uuid, const winrt::guid& serviceUuid,
             else
             {
                 LOGE("GetCharacteristic error");
+                mEmit.Notify(uuid, serviceId, characteristicId, on, "GetCharacteristic error");
             }
         };
         peripheral.GetCharacteristic(serviceUuid, characteristicUuid, onCharacteristic);
@@ -750,18 +758,16 @@ void BLEManager::OnNotify(IAsyncOperation<GattWriteResult> asyncOp, AsyncStatus
 {
     if (status == AsyncStatus::Completed)
     {
-        if (state == true)
-        {
-            auto onChanged = bind2(this, &BLEManager::OnValueChanged, uuid);
-            auto token = characteristic.ValueChanged(onChanged);
-            mNotifyMap.Add(uuid, characteristic, token);
-        }
         mEmit.Notify(uuid, serviceId, characteristicId, state);
     }
     else
     {
         std::string error = "status: " + std::to_string((int)status);
         mEmit.Notify(uuid, serviceId, characteristicId, state, error);
+        if (state == true)
+        {
+            mNotifyMap.Unsubscribe(uuid, characteristic);
+        }
     }
 }
 
@@ -784,10 +790,10 @@ bool BLEManager::DiscoverDescriptors(const std::string& uuid, const winrt::guid&
     {
         peripheral.GetCharacteristic(
             serviceUuid, characteristicUuid, [=](std::optional<GattCharacteristic> characteristic) {
+                std::string serviceId = toStr(serviceUuid);
+                std::string characteristicId = toStr(characteristicUuid);
                 if (characteristic)
                 {
-                    std::string serviceId = toStr(serviceUuid);
-                    std::string characteristicId = toStr(characteristicUuid);
                     auto completed = bind2(this, &BLEManager::OnDescriptorsDiscovered, uuid,
                                            serviceId, characteristicId);
                     characteristic->GetDescriptorsAsync(BluetoothCacheMode::Uncached)
@@ -796,6 +802,8 @@ bool BLEManager::DiscoverDescriptors(const std::string& uuid, const winrt::guid&
                 else
                 {
                     LOGE("GetCharacteristic error");
+                    std::vector<std::string> emptyDescriptors;
+                    mEmit.DescriptorsDiscovered(uuid, serviceId, characteristicId, emptyDescriptors, "GetCharacteristic error");
                 }
             });
         return true;
@@ -833,11 +841,11 @@ bool BLEManager::ReadValue(const std::string& uuid, const winrt::guid& serviceUu
         peripheral.GetDescriptor(
             serviceUuid, characteristicUuid, descriptorUuid,
             [=](std::optional<GattDescriptor> descriptor) {
+                std::string serviceId = toStr(serviceUuid);
+                std::string characteristicId = toStr(characteristicUuid);
+                std::string descriptorId = toStr(descriptorUuid);
                 if (descriptor)
                 {
-                    std::string serviceId = toStr(serviceUuid);
-                    std::string characteristicId = toStr(characteristicUuid);
-                    std::string descriptorId = toStr(descriptorUuid);
                     auto completed = bind2(this, &BLEManager::OnReadValue, uuid, serviceId,
                                            characteristicId, descriptorId);
                     descriptor->ReadValueAsync(BluetoothCacheMode::Uncached).Completed(completed);
@@ -845,6 +853,7 @@ bool BLEManager::ReadValue(const std::string& uuid, const winrt::guid& serviceUu
                 else
                 {
                     LOGE("descriptor not found");
+                    mEmit.ReadValue(uuid, serviceId, characteristicId, descriptorId, Data(), "descriptor not found");
                 }
             });
         return true;
@@ -885,11 +894,11 @@ bool BLEManager::WriteValue(const std::string& uuid, const winrt::guid& serviceU
     IFDEVICE(device, uuid)
     {
         auto onDescriptor = [=](std::optional<GattDescriptor> descriptor) {
+            std::string serviceId = toStr(serviceUuid);
+            std::string characteristicId = toStr(characteristicUuid);
+            std::string descriptorId = toStr(descriptorUuid);
             if (descriptor)
             {
-                std::string serviceId = toStr(serviceUuid);
-                std::string characteristicId = toStr(characteristicUuid);
-                std::string descriptorId = toStr(descriptorUuid);
                 auto writer = DataWriter();
                 writer.WriteBytes(data);
                 auto value = writer.DetachBuffer();
@@ -900,6 +909,7 @@ bool BLEManager::WriteValue(const std::string& uuid, const winrt::guid& serviceU
             else
             {
                 LOGE("descriptor not found");
+                mEmit.WriteValue(uuid, serviceId, characteristicId, descriptorId, "descriptor not found");
             }
         };
         peripheral.GetDescriptor(serviceUuid, characteristicUuid, descriptorUuid, onDescriptor);

package/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "name": "@stoprocent/noble",
   "description": "A Node.js BLE (Bluetooth Low Energy) central library.",
-  "version": "2.3.9",
+  "version": "2.3.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/stoprocent/noble.git"
@@ -30,7 +30,8 @@
   "dependencies": {
     "debug": "^4.3.7",
     "node-addon-api": "^8.1.0",
-    "node-gyp-build": "^4.8.1"
+    "node-gyp-build": "^4.8.1",
+    "patch-package": "^8.0.0"
   },
   "optionalDependencies": {
     "@stoprocent/bluetooth-hci-socket": "^2.2.3"
@@ -67,7 +68,7 @@
     "lint": "eslint \"**/*.js\"",
     "lint-fix": "eslint \"**/*.js\" --fix",
     "prebuildify": "prebuildify --napi --target 17.0.0 --force --strip --verbose",
-    "prebuildify-cross": "prebuildify-cross --napi --target 17.0.0 --force --strip --verbose",
+    "prebuildify-cross": "patch-package && prebuildify-cross --napi --target 17.0.0 --force --strip --verbose",
     "semantic-release": "semantic-release",
     "pretest": "npm run rebuild",
     "rebuild": "node-gyp rebuild",

package/patches/@thegecko+docker-run+3.1.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@thegecko/docker-run/index.js b/node_modules/@thegecko/docker-run/index.js
+index 5299bee..4de15b3 100644
+--- a/node_modules/@thegecko/docker-run/index.js
++++ b/node_modules/@thegecko/docker-run/index.js
+@@ -14,7 +14,7 @@ var endsWith = function(str, suffix) {
+ var run = function(image, opts) {
+   if (!opts) opts = {}
+ 
+-  var request = docker({host: opts.host, version: opts.version || 'v1.21'})
++  var request = docker({host: opts.host, version: opts.version || 'v1.44'})
+   var that = new events.EventEmitter()
+   var tty = !!opts.tty
+ 

package/patches/@vweevers+docker-pull+1.1.1.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@vweevers/docker-pull/index.js b/node_modules/@vweevers/docker-pull/index.js
+index 67b3e73..5fcb567 100644
+--- a/node_modules/@vweevers/docker-pull/index.js
++++ b/node_modules/@vweevers/docker-pull/index.js
+@@ -12,7 +12,7 @@ var pull = function (image, opts, cb) {
+   image = parse(image)
+   if (!image) throw new Error('Invalid image')
+ 
+-  var request = docker({host: opts.host, version: opts.version || 'v1.21'})
++  var request = docker({host: opts.host, version: opts.version || 'v1.44'})
+   var that = new events.EventEmitter()
+   var layers = {}
+   var progress = {}

package/patches/prebuildify-cross+5.1.1.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/prebuildify-cross/index.js b/node_modules/prebuildify-cross/index.js
+index 3048337..0031ced 100644
+--- a/node_modules/prebuildify-cross/index.js
++++ b/node_modules/prebuildify-cross/index.js
+@@ -11,7 +11,7 @@ const unixify = require('unixify')
+ const once = require('once')
+ const path = require('path')
+ 
+-const DOCKER_VERSION = 'v1.24'
++const DOCKER_VERSION = 'v1.44'
+ 
+ module.exports = function (opts, callback) {
+   if (typeof opts === 'function') {