@stoprocent/bleno 0.12.1 → 0.12.3

package/examples/pizza/pizza.js

@@ -1,6 +1,6 @@
-const events = require('events');
+const BlenoEventEmitter = require('../../lib/bleno-event-emitter');
 
-class Pizza extends events.EventEmitter {
+class Pizza extends BlenoEventEmitter {
   constructor () {
     super();
     this.toppings = PizzaToppings.NONE;

package/lib/bleno-event-emitter.js

@@ -0,0 +1,27 @@
+const { EventEmitter } = require('events');
+
+class BlenoEventEmitter extends EventEmitter {
+  /**
+   * Like once(), but ensures at most one listener exists for the given event.
+   * If a previous exclusive listener was registered for the same event, it is
+   * removed before the new one is added. This prevents listener accumulation
+   * when a method is called repeatedly before the event fires.
+   */
+  onceExclusive (event, callback) {
+    if (!this._exclusiveCallbacks) {
+      this._exclusiveCallbacks = new Map();
+    }
+    const prev = this._exclusiveCallbacks.get(event);
+    if (prev) {
+      this.removeListener(event, prev);
+    }
+    const wrappedCallback = (...args) => {
+      this._exclusiveCallbacks.delete(event);
+      callback(...args);
+    };
+    this._exclusiveCallbacks.set(event, wrappedCallback);
+    this.once(event, wrappedCallback);
+  }
+}
+
+module.exports = BlenoEventEmitter;

package/lib/bleno.js

@@ -1,13 +1,13 @@
 const debug = require('debug')('bleno');
 const UuidUtil = require('./uuid-util');
 
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('./bleno-event-emitter');
 
 const PrimaryService = require('./primary-service');
 const Characteristic = require('./characteristic');
 const Descriptor = require('./descriptor');
 
-class Bleno extends EventEmitter {
+class Bleno extends BlenoEventEmitter {
   constructor (bindings) {
     super();
     this.initialized = false;
@@ -138,7 +138,7 @@ class Bleno extends EventEmitter {
       }
     } else {
       if (typeof callback === 'function') {
-        this.once('advertisingStart', callback);
+        this.onceExclusive('advertisingStart', callback);
       }
 
       const undashedServiceUuids = [];
@@ -186,7 +186,7 @@ class Bleno extends EventEmitter {
       iBeaconData.writeInt8(measuredPower, uuidDataLength + 4);
 
       if (typeof callback === 'function') {
-        this.once('advertisingStart', callback);
+        this.onceExclusive('advertisingStart', callback);
       }
 
       debug('iBeacon data = ' + iBeaconData.toString('hex'));
@@ -225,7 +225,7 @@ class Bleno extends EventEmitter {
       }
     } else {
       if (typeof callback === 'function') {
-        this.once('advertisingStart', callback);
+        this.onceExclusive('advertisingStart', callback);
       }
 
       this._bindings.startAdvertisingWithEIRData(advertisementData, scanData);
@@ -243,7 +243,7 @@ class Bleno extends EventEmitter {
 
   stopAdvertising (callback) {
     if (typeof callback === 'function') {
-      this.once('advertisingStop', callback);
+      this.onceExclusive('advertisingStop', callback);
     }
     this._bindings.stopAdvertising();
   }
@@ -264,7 +264,7 @@ class Bleno extends EventEmitter {
 
   setServices (services, callback) {
     if (typeof callback === 'function') {
-      this.once('servicesSet', callback);
+      this.onceExclusive('servicesSet', callback);
     }
     this._bindings.setServices(services);
   }
@@ -303,7 +303,7 @@ class Bleno extends EventEmitter {
 
   updateRssi (callback) {
     if (typeof callback === 'function') {
-      this.once('rssiUpdate', (rssi) => callback(null, rssi));
+      this.onceExclusive('rssiUpdate', (rssi) => callback(null, rssi));
     }
 
     this._bindings.updateRssi();

package/lib/characteristic.js

@@ -1,7 +1,7 @@
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('./bleno-event-emitter');
 const UuidUtil = require('./uuid-util');
 
-class Characteristic extends EventEmitter {
+class Characteristic extends BlenoEventEmitter {
   constructor (options) {
     super();
 

package/lib/hci-socket/acl-stream.js

@@ -1,8 +1,8 @@
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('../bleno-event-emitter');
 const Smp = require('./smp');
 const Mgmt = require('./mgmt');
 
-class AclStream extends EventEmitter {
+class AclStream extends BlenoEventEmitter {
   constructor (hci, handle, localAddressType, localAddress, remoteAddressType, remoteAddress) {
     super();
     this._hci = hci;

package/lib/hci-socket/bindings.js

@@ -1,6 +1,6 @@
 const debug = require('debug')('bindings');
 
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('../bleno-event-emitter');
 const os = require('os');
 
 const AclStream = require('./acl-stream');
@@ -8,7 +8,7 @@ const Hci = require('./hci');
 const Gap = require('./gap');
 const Gatt = require('./gatt');
 
-class BlenoBindings extends EventEmitter {
+class BlenoBindings extends BlenoEventEmitter {
   constructor (options) {
     super();
 

package/lib/hci-socket/gap.js

@@ -1,6 +1,6 @@
 const debug = require('debug')('gap');
 
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('../bleno-event-emitter');
 const os = require('os');
 
 const Hci = require('./hci');
@@ -9,7 +9,7 @@ const isLinux = (os.platform() === 'linux');
 const isIntelEdison = isLinux && (os.release().includes('edison'));
 const isYocto = isLinux && (os.release().includes('yocto'));
 
-class Gap extends EventEmitter {
+class Gap extends BlenoEventEmitter {
   constructor (hci) {
     super();
 

package/lib/hci-socket/gatt.js

@@ -3,7 +3,7 @@
 
 const debug = require('debug')('gatt');
 
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('../bleno-event-emitter');
 const os = require('os');
 const Characteristic = require('../characteristic');
 
@@ -64,7 +64,7 @@ const ATT_ECODE_INSUFF_RESOURCES = 0x11;
 
 const ATT_CID = 0x0004;
 
-class Gatt extends EventEmitter {
+class Gatt extends BlenoEventEmitter {
   constructor () {
     super();
 

package/lib/hci-socket/hci.js

@@ -1,6 +1,6 @@
 const debug = require('debug')('hci');
 
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('../bleno-event-emitter');
 const { loadDriver } = require('@stoprocent/bluetooth-hci-socket');
 
 const vendorSpecific = require('./vs');
@@ -74,7 +74,7 @@ const HCI_OE_USER_ENDED_CONNECTION = 0x13;
 
 const STATUS_MAPPER = require('./hci-status');
 
-class Hci extends EventEmitter {
+class Hci extends BlenoEventEmitter {
   constructor (options) {
     super();
     options = options || {};

package/lib/hci-socket/smp.js

@@ -1,4 +1,4 @@
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('../bleno-event-emitter');
 const crypto = require('./crypto');
 
 const SMP_CID = 0x0006;
@@ -13,7 +13,7 @@ const SMP_MASTER_IDENT = 0x07;
 
 const SMP_UNSPECIFIED = 0x08;
 
-class Smp extends EventEmitter {
+class Smp extends BlenoEventEmitter {
 
   constructor (aclStream, mgmt, localAddressType, localAddress, remoteAddressType, remoteAddress) {
     super();

package/lib/mac/bindings.js

@@ -1,4 +1,4 @@
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('../bleno-event-emitter');
 
 const { resolve } = require('path');
 const dir = resolve(__dirname, '..', '..');
@@ -6,6 +6,6 @@ const binding = require('node-gyp-build')(dir);
 
 const { BlenoMac } = binding;
 
-Object.setPrototypeOf(BlenoMac.prototype, EventEmitter.prototype);
+Object.setPrototypeOf(BlenoMac.prototype, BlenoEventEmitter.prototype);
 
 module.exports = BlenoMac;

package/lib/primary-service.js

@@ -1,7 +1,7 @@
-const { EventEmitter } = require('events');
+const BlenoEventEmitter = require('./bleno-event-emitter');
 const UuidUtil = require('./uuid-util');
 
-class PrimaryService extends EventEmitter {
+class PrimaryService extends BlenoEventEmitter {
   constructor (options) {
     super();
     this.uuid = UuidUtil.removeDashes(options.uuid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoprocent/bleno",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "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 })
+