@stoprocent/bleno 0.10.0 → 0.10.2

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

@@ -11,16 +11,17 @@ class AclStream extends EventEmitter {
     this._smp = new Smp(this, localAddressType, localAddress, remoteAddressType, remoteAddress);
   }
 
+  close () {
+    this.emit('end', this._handle);
+    this._smp.close();
+  }
+
   write (cid, data) {
     this._hci.queueAclDataPkt(this._handle, cid, data);
   }
 
-  push (handle, cid, data) {
-    if (data) {
-      this.emit('data', handle, cid, data);
-    } else {
-      this.emit('end', handle);
-    }
+  push (cid, data) {
+    this.emit('data', this._handle, cid, data);
   }
 
   pushEncrypt (encrypt) {

package/lib/hci-socket/bindings.js

@@ -77,6 +77,7 @@ class BlenoBindings extends EventEmitter {
   }
 
   init () {
+    
     this._sigIntHandler = this.onSigInt.bind(this);
     this._exitHandler = this.onExit.bind(this);
 
@@ -173,12 +174,13 @@ class BlenoBindings extends EventEmitter {
     }
 
     const { address, aclStream } = this._connections.get(handle);
-
+  
     if (aclStream) {
-      aclStream.push(handle, null, null);
+      aclStream.close();
     }
     
     this._connections.delete(handle);
+
     this.emit('disconnect', address, handle);
 
     if (this._advertising) {
@@ -211,7 +213,7 @@ class BlenoBindings extends EventEmitter {
   onAclDataPkt (handle, cid, data) {
     const connection = this._connections.get(handle);
     if (connection && connection.aclStream) {
-      connection.aclStream.push(handle, cid, data);
+      connection.aclStream.push(cid, data);
     }
   }
 

package/lib/hci-socket/gatt.js

@@ -278,14 +278,13 @@ class Gatt extends EventEmitter {
       aclStream,
       mtu: 23,
     });
-    
     this._aclStreamCallbacks.set(connection, {
       onData: function (connection, cid, data) {
         this.onAclStreamData(connection, cid, data);
-      },
+      }.bind(this),
       onEnd: function (connection) {
         this.onAclStreamEnd(connection);
-      }
+      }.bind(this)
     });
 
     aclStream.on('data', this._aclStreamCallbacks.get(connection).onData.bind(this));
@@ -308,8 +307,8 @@ class Gatt extends EventEmitter {
     const { aclStream } = this._connections.get(connection);
 
     aclStream.removeListener('data', this._aclStreamCallbacks.get(connection).onData);
-    aclStream.removeListener('end', this._aclStreamCallbacks.get(connection).onEnd);
-
+    aclStream.removeListener('end', this._aclStreamCallbacks.get(connection).onEnd);  
+    
     // Clean up subscriptions for this connection
     for (let i = 0; i < this._handles.length; i++) {
       if (this._handles[i] && 
@@ -327,6 +326,7 @@ class Gatt extends EventEmitter {
     }
 
     this._connections.delete(connection);
+    this._aclStreamCallbacks.delete(connection);
     this._preparedWriteRequests.delete(connection);
   }
 
@@ -740,6 +740,10 @@ class Gatt extends EventEmitter {
           data = this._handles[valueHandle].value;
         }
 
+        if (!data && this._handles[valueHandle].uuid === '2902' && this._connections.get(connection)) {
+          data = Buffer.from([0x00, 0x00]);
+        }
+        
         if (data) {
           callback(ATT_ECODE_SUCCESS, data);
         } else if (handleAttribute) {

package/lib/hci-socket/mgmt.js

@@ -18,6 +18,10 @@ class Mgmt {
     this._socket.start();
   }
 
+  close () {
+    this._socket.stop();
+  }
+
   onSocketData (data) {
     debug('on data ->' + data.toString('hex'));
   }

package/lib/hci-socket/smp.js

@@ -41,6 +41,10 @@ class Smp extends EventEmitter {
     this._aclStream.on('end', this.onAclStreamEndBinded);
   }
 
+  close () {
+    this._mgmt.close();
+  }
+
   onAclStreamData (cid, data) {
     if (cid !== SMP_CID) {
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stoprocent/bleno",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "A Node.js module for implementing BLE (Bluetooth Low Energy) peripherals",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -69,7 +69,7 @@
     "node-gyp-build": "^4.8.4"
   },
   "optionalDependencies": {
-    "@stoprocent/bluetooth-hci-socket": "^2.1.0"
+    "@stoprocent/bluetooth-hci-socket": "^2.1.1"
   },
   "publishConfig": {
     "access": "public"