@stoprocent/bleno 0.8.5 → 0.9.0

package/lib/hci-socket/bindings.js

@@ -20,9 +20,7 @@ class BlenoBindings extends EventEmitter {
     this._gap = new Gap(this._hci);
     this._gatt = new Gatt(this._hci);
 
-    this._address = null;
-    this._handle = null;
-    this._aclStream = null;
+    this._connections = new Map();
   }
 
   setAddress (address) {
@@ -32,6 +30,7 @@ class BlenoBindings extends EventEmitter {
   startAdvertising (name, serviceUuids) {
     this._advertising = true;
 
+    this._gatt.updateName(name);
     this._gap.startAdvertising(name, serviceUuids);
   }
 
@@ -59,11 +58,15 @@ class BlenoBindings extends EventEmitter {
     this.emit('servicesSet');
   }
 
-  disconnect () {
-    if (this._handle) {
-      debug('disconnect by server');
-
-      this._hci.disconnect(this._handle);
+  disconnect (handle = null) {
+    if (handle) {
+      debug('disconnect by server for handle', handle);
+      this._hci.disconnect(handle);
+    } else {
+      for (const [handle, connection] of this._connections) {
+        debug('disconnect by server for handle', handle, connection.address);
+        this._hci.disconnect(handle);
+      }
     }
   }
 
@@ -146,16 +149,18 @@ class BlenoBindings extends EventEmitter {
 
   onLeConnComplete (status, handle, role, addressType, address, interval, latency, supervisionTimeout, masterClockAccuracy) {
     if (role !== 1) {
-      // not slave, ignore
       return;
     }
 
-    this._address = address;
-    this._handle = handle;
-    this._aclStream = new AclStream(this._hci, handle, this._hci.addressType, this._hci.address, addressType, address);
-    this._gatt.setAclStream(this._aclStream);
+    const aclStream = new AclStream(this._hci, handle, this._hci.addressType, this._hci.address, addressType, address);
+    this._connections.set(handle, { address, aclStream });
+    this._gatt.registerAclStream(aclStream, handle);
 
-    this.emit('accept', address);
+    this.emit('accept', address, handle);
+    
+    if (this._advertising) {
+      this._gap.restartAdvertising();
+    }
   }
 
   onLeConnUpdateComplete (handle, interval, latency, supervisionTimeout) {
@@ -163,19 +168,18 @@ class BlenoBindings extends EventEmitter {
   }
 
   onDisconnComplete (handle, reason) {
-    if (this._aclStream) {
-      this._aclStream.push(null, null);
+    if (this._connections.has(handle) === false) {
+      return;
     }
 
-    const address = this._address;
-
-    this._address = null;
-    this._handle = null;
-    this._aclStream = null;
+    const { address, aclStream } = this._connections.get(handle);
 
-    if (address) {
-      this.emit('disconnect', address); // TODO: use reason
+    if (aclStream) {
+      aclStream.push(handle, null, null);
     }
+    
+    this._connections.delete(handle);
+    this.emit('disconnect', address, handle);
 
     if (this._advertising) {
       this._gap.restartAdvertising();
@@ -183,14 +187,16 @@ class BlenoBindings extends EventEmitter {
   }
 
   onEncryptChange (handle, encrypt) {
-    if (this._handle === handle && this._aclStream) {
-      this._aclStream.pushEncrypt(encrypt);
+    const connection = this._connections.get(handle);
+    if (connection && connection.aclStream) {
+      connection.aclStream.pushEncrypt(encrypt);
     }
   }
 
   onLeLtkNegReply (handle) {
-    if (this._handle === handle && this._aclStream) {
-      this._aclStream.pushLtkNegReply();
+    const connection = this._connections.get(handle);
+    if (connection && connection.aclStream) {
+      connection.aclStream.pushLtkNegReply();
     }
   }
 
@@ -203,8 +209,9 @@ class BlenoBindings extends EventEmitter {
   }
 
   onAclDataPkt (handle, cid, data) {
-    if (this._handle === handle && this._aclStream) {
-      this._aclStream.push(cid, data);
+    const connection = this._connections.get(handle);
+    if (connection && connection.aclStream) {
+      connection.aclStream.push(handle, cid, data);
     }
   }