@stoprocent/bleno 0.12.0 → 0.12.2

package/lib/hci-socket/hci.js

@@ -133,7 +133,6 @@ class Hci extends EventEmitter {
   }
 
   resetBuffers () {
-    this._mainHandle = null;
     this._handleAclsInProgress = {};
     this._handleBuffers = {};
     this._aclOutQueue = [];
@@ -527,7 +526,7 @@ class Hci extends EventEmitter {
       if (subEventType === EVT_DISCONN_COMPLETE) {
         handle = data.readUInt16LE(4);
         debug('\t\thandle = ' + handle);
-        if (handle !== this._mainHandle) {
+        if (this._handleAclsInProgress[handle] === undefined) {
           debug('\tignoring event because handle is unknown to bleno.');
           debug('This might be OK in a multi role scenario in which the handle is part of a noble connection.');
           return;
@@ -543,7 +542,6 @@ class Hci extends EventEmitter {
         Controller for the returned Handle have been flushed, and that the
         corresponding data buffers have been freed. */
         delete this._handleAclsInProgress[handle];
-        this._mainHandle = null;
         const aclOutQueue = [];
         let discarded = 0;
         for (const i in this._aclOutQueue) {
@@ -789,7 +787,6 @@ class Hci extends EventEmitter {
     debug('\t\t\tsupervision timeout = ' + supervisionTimeout);
     debug('\t\t\tmaster clock accuracy = ' + masterClockAccuracy);
 
-    this._mainHandle = handle;
     this._handleAclsInProgress[handle] = 0;
 
     this.emit('leConnComplete', status, handle, role, addressType, address, interval, latency, supervisionTimeout, masterClockAccuracy);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoprocent/bleno",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "A Node.js module for implementing BLE (Bluetooth Low Energy) peripherals",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -19,7 +19,7 @@
     "lint": "eslint \"**/*.js\"",
     "lint-fix": "eslint \"**/*.js\" --fix",
     "prebuildify": "prebuildify --napi --target 14.0.0 --force --strip --verbose",
-    "prebuildify-cross": "prebuildify-cross --napi --target 14.0.0 --force --strip --verbose",
+    "prebuildify-cross": "patch-package && prebuildify-cross --napi --target 14.0.0 --force --strip --verbose",
     "semantic-release": "semantic-release",
     "pretest": "npm run rebuild",
     "rebuild": "node-gyp rebuild",
@@ -65,11 +65,12 @@
   },
   "dependencies": {
     "debug": "^4.4.0",
+    "patch-package": "^8.0.0",
     "node-addon-api": "^8.3.1",
     "node-gyp-build": "^4.8.4"
   },
   "optionalDependencies": {
-    "@stoprocent/bluetooth-hci-socket": "^2.2.3"
+    "@stoprocent/bluetooth-hci-socket": "^2.2.5"
   },
   "publishConfig": {
     "access": "public"

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,30 @@
+diff --git a/node_modules/prebuildify-cross/guest.js b/node_modules/prebuildify-cross/guest.js
+index dfd9eb7..6d284fb 100644
+--- a/node_modules/prebuildify-cross/guest.js
++++ b/node_modules/prebuildify-cross/guest.js
+@@ -9,19 +9,15 @@ const cwd = '/home/node/app'
+ const files = JSON.parse(process.env.PREBUILDIFY_CROSS_FILES)
+ const argv = process.argv.slice(2)
+ 
+-// Copy host files to working directory
+-for (const file of files) {
+-  const a = path.join('/input', file)
+-  const b = path.join(cwd, file)
++// Recursively copy all input files to working directory
++fs.cpSync('/input', cwd, { recursive: true })
+ 
+-  fs.mkdirSync(path.dirname(b), { recursive: true })
+-  fs.copyFileSync(a, b, fs.constants.COPYFILE_EXCL)
+-  fs.chmodSync(b, 0o644)
++// Clean build directory if it exists to ensure fresh build
++const buildDir = path.join(cwd, 'build')
++if (fs.existsSync(buildDir)) {
++  fs.rmSync(buildDir, { recursive: true, force: true })
+ }
+ 
+-// Use node_modules of host to avoid a second install step
+-fs.symlinkSync('/input/node_modules', path.join(cwd, 'node_modules'))
+-
+ const stdio = ['ignore', 2, 2]
+ const res = cp.spawnSync('npx', ['--no-install', 'prebuildify', ...argv], { cwd, stdio })
+