node-poweredup 8.0.0 → 8.0.4

package/docs/WeDo2SmartHub.html

@@ -329,7 +329,267 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line143">line 143</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line157">line 157</a>
+        </li>
+      </ul>
+    </dd>
+  
+
+  
+
+  
+
+  
+</dl>
+
+
+
+
+
+
+          
+        
+            
+
+<h4 class="name" id="connected">
+  <span class="type-signature">(readonly) </span>connected<span class="type-signature"></span>
+</h4>
+
+
+
+
+
+
+
+  <h5 class="subsection-title">Properties:</h5>
+
+  
+
+<table class="props">
+  <thead>
+    <tr>
+      
+        <th>Name</th>
+      
+
+      <th>Type</th>
+
+      
+
+      
+
+      <th class="last">Description</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    
+
+    <tr>
+      
+        <td class="name"><code>connected</code></td>
+      
+
+      <td class="type">
+        
+          
+    <span class="param-type">
+      string
+    </span>
+
+    
+
+
+        
+      </td>
+
+        
+
+        
+
+        <td class="description last">
+          <p>Connected status</p>
+          </td>
+    </tr>
+
+  
+  </tbody>
+</table>
+
+
+
+
+<dl class="details">
+
+  
+
+  
+
+  
+    <dt class="inherited-from">Inherited From:</dt>
+    <dd class="inherited-from">
+      <ul class="dummy">
+        <li>
+          <a href="BaseHub.html#connected">BaseHub#connected</a>
+        </li>
+      </ul>
+    </dd>
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source">
+      <ul class="dummy">
+        <li>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line101">line 101</a>
+        </li>
+      </ul>
+    </dd>
+  
+
+  
+
+  
+
+  
+</dl>
+
+
+
+
+
+
+          
+        
+            
+
+<h4 class="name" id="connecting">
+  <span class="type-signature">(readonly) </span>connecting<span class="type-signature"></span>
+</h4>
+
+
+
+
+
+
+
+  <h5 class="subsection-title">Properties:</h5>
+
+  
+
+<table class="props">
+  <thead>
+    <tr>
+      
+        <th>Name</th>
+      
+
+      <th>Type</th>
+
+      
+
+      
+
+      <th class="last">Description</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    
+
+    <tr>
+      
+        <td class="name"><code>connecting</code></td>
+      
+
+      <td class="type">
+        
+          
+    <span class="param-type">
+      string
+    </span>
+
+    
+
+
+        
+      </td>
+
+        
+
+        
+
+        <td class="description last">
+          <p>Connecting status</p>
+          </td>
+    </tr>
+
+  
+  </tbody>
+</table>
+
+
+
+
+<dl class="details">
+
+  
+
+  
+
+  
+    <dt class="inherited-from">Inherited From:</dt>
+    <dd class="inherited-from">
+      <ul class="dummy">
+        <li>
+          <a href="BaseHub.html#connecting">BaseHub#connecting</a>
+        </li>
+      </ul>
+    </dd>
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source">
+      <ul class="dummy">
+        <li>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line108">line 108</a>
         </li>
       </ul>
     </dd>
@@ -459,7 +719,7 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line115">line 115</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line129">line 129</a>
         </li>
       </ul>
     </dd>
@@ -589,7 +849,7 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line122">line 122</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line136">line 136</a>
         </li>
       </ul>
     </dd>
@@ -849,7 +1109,7 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line108">line 108</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line122">line 122</a>
         </li>
       </ul>
     </dd>
@@ -979,7 +1239,7 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line129">line 129</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line143">line 143</a>
         </li>
       </ul>
     </dd>
@@ -1109,7 +1369,7 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line150">line 150</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line164">line 164</a>
         </li>
       </ul>
     </dd>
@@ -1239,7 +1499,7 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line101">line 101</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line115">line 115</a>
         </li>
       </ul>
     </dd>
@@ -1369,7 +1629,7 @@
     <dd class="tag-source">
       <ul class="dummy">
         <li>
-          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line136">line 136</a>
+          <a href="hubs_basehub.js.html">hubs/basehub.js</a>, <a href="hubs_basehub.js.html#line150">line 150</a>
         </li>
       </ul>
     </dd>

package/docs/hubs_basehub.js.html

@@ -186,6 +186,20 @@ class BaseHub extends events_1.EventEmitter {
     get name() {
         return this._bleDevice.name;
     }
+    /**
+     * @readonly
+     * @property {string} connected Connected status
+     */
+    get connected() {
+        return this._bleDevice.connected;
+    }
+    /**
+     * @readonly
+     * @property {string} connecting Connecting status
+     */
+    get connecting() {
+        return this._bleDevice.connecting;
+    }
     /**
      * @readonly
      * @property {string} type Hub type

package/docs/poweredup-node.js.html

@@ -128,11 +128,12 @@ const noble = require("@abandonware/noble");
 const technicsmallhub_1 = require("./hubs/technicsmallhub");
 let ready = false;
 let wantScan = false;
-let discoveryEventAttached = false;
 const startScanning = () => {
     noble.startScanning([
         Consts.BLEService.LPF2_HUB,
-        Consts.BLEService.WEDO2_SMART_HUB
+        Consts.BLEService.LPF2_HUB.replace(/-/g, ""),
+        Consts.BLEService.WEDO2_SMART_HUB,
+        Consts.BLEService.WEDO2_SMART_HUB.replace(/-/g, "")
     ]);
 };
 noble.on("stateChange", (state) => {
@@ -168,10 +169,9 @@ class PoweredUP extends events_1.EventEmitter {
      */
     async scan() {
         wantScan = true;
-        if (!discoveryEventAttached) {
-            noble.on("discover", this._discoveryEventHandler);
-            discoveryEventAttached = true;
-        }
+        // @ts-ignore
+        noble.removeAllListeners();
+        noble.on("discover", this._discoveryEventHandler);
         if (ready) {
             debug("Scanning started");
             startScanning();
@@ -184,10 +184,9 @@ class PoweredUP extends events_1.EventEmitter {
      */
     stop() {
         wantScan = false;
-        if (discoveryEventAttached) {
-            noble.removeListener("discover", this._discoveryEventHandler);
-            discoveryEventAttached = false;
-        }
+        // @ts-ignore
+        noble.removeAllListeners();
+        noble.removeListener("discover", this._discoveryEventHandler);
         noble.stopScanning();
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-poweredup",
-  "version": "8.0.0",
+  "version": "8.0.4",
   "description": "A Javascript module to interface with LEGO Powered Up components.",
   "homepage": "https://github.com/nathankellenicki/node-poweredup/",
   "main": "dist/node/index-node.js",

package/src/hubs/basehub.ts

@@ -92,6 +92,24 @@ export class BaseHub extends EventEmitter {
     }
 
 
+    /**
+     * @readonly
+     * @property {string} connected Connected status
+     */
+     public get connected () {
+        return this._bleDevice.connected;
+    }
+
+
+    /**
+     * @readonly
+     * @property {string} connecting Connecting status
+     */
+     public get connecting () {
+        return this._bleDevice.connecting;
+    }
+
+
     /**
      * @readonly
      * @property {string} type Hub type

package/src/nobleabstraction.ts

@@ -79,6 +79,8 @@ export class NobleDevice extends EventEmitter implements IBLEAbstraction {
     public disconnect () {
         return new Promise<void>((resolve) => {
             this._noblePeripheral.disconnect();
+            this._connecting = false;
+            this._connected = false;
             return resolve();
         });
     }

package/src/poweredup-node.ts

@@ -22,12 +22,13 @@ import { TechnicSmallHub } from "./hubs/technicsmallhub";
 
 let ready = false;
 let wantScan = false;
-let discoveryEventAttached = false;
 
 const startScanning = () => {
     noble.startScanning([
         Consts.BLEService.LPF2_HUB,
-        Consts.BLEService.WEDO2_SMART_HUB
+        Consts.BLEService.LPF2_HUB.replace(/-/g, ""),
+        Consts.BLEService.WEDO2_SMART_HUB,
+        Consts.BLEService.WEDO2_SMART_HUB.replace(/-/g, "")
     ]);
 };
 
@@ -70,11 +71,9 @@ export class PoweredUP extends EventEmitter {
      */
     public async scan () {
         wantScan = true;
-
-        if (!discoveryEventAttached) {
-            noble.on("discover", this._discoveryEventHandler);
-            discoveryEventAttached = true;
-        }
+        // @ts-ignore
+        noble.removeAllListeners();
+        noble.on("discover", this._discoveryEventHandler);
 
         if (ready) {
             debug("Scanning started");
@@ -91,12 +90,9 @@ export class PoweredUP extends EventEmitter {
      */
     public stop () {
         wantScan = false;
-
-        if (discoveryEventAttached) {
-            noble.removeListener("discover", this._discoveryEventHandler);
-            discoveryEventAttached = false;
-        }
-
+        // @ts-ignore
+        noble.removeAllListeners();
+        noble.removeListener("discover", this._discoveryEventHandler);
         noble.stopScanning();
     }
 

package/src/webbleabstraction.ts

@@ -68,6 +68,7 @@ export class WebBLEDevice extends EventEmitter implements IBLEAbstraction {
     public disconnect () {
         return new Promise<void>((resolve) => {
             this._webBLEServer.device.gatt.disconnect();
+            this._connected = false;
             return resolve();
         });
     }