Skip to content

Commit 72ef125

Browse files
Nathan KellenickiNathan Kellenicki
Nathan Kellenicki
authored and
Nathan Kellenicki
committed
Connection and discovery improvements
1 parent a8a27ea commit 72ef125

File tree

5 files changed

+32
-41
lines changed

5 files changed

+32
-41
lines changed

‎docs/PoweredUP.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ <h5>Parameters:</h5>
482482
<dd class="tag-source">
483483
<ul class="dummy">
484484
<li>
485-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line120">line 120</a>
485+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line117">line 117</a>
486486
</li>
487487
</ul>
488488
</dd>
@@ -774,7 +774,7 @@ <h5>Parameters:</h5>
774774
<dd class="tag-source">
775775
<ul class="dummy">
776776
<li>
777-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line111">line 111</a>
777+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line108">line 108</a>
778778
</li>
779779
</ul>
780780
</dd>
@@ -956,7 +956,7 @@ <h4 class="name" id="getHubs">
956956
<dd class="tag-source">
957957
<ul class="dummy">
958958
<li>
959-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line103">line 103</a>
959+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line100">line 100</a>
960960
</li>
961961
</ul>
962962
</dd>
@@ -1248,7 +1248,7 @@ <h5>Parameters:</h5>
12481248
<dd class="tag-source">
12491249
<ul class="dummy">
12501250
<li>
1251-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line129">line 129</a>
1251+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line126">line 126</a>
12521252
</li>
12531253
</ul>
12541254
</dd>
@@ -1540,7 +1540,7 @@ <h5>Parameters:</h5>
15401540
<dd class="tag-source">
15411541
<ul class="dummy">
15421542
<li>
1543-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line138">line 138</a>
1543+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line135">line 135</a>
15441544
</li>
15451545
</ul>
15461546
</dd>
@@ -1722,7 +1722,7 @@ <h4 class="name" id="scan">
17221722
<dd class="tag-source">
17231723
<ul class="dummy">
17241724
<li>
1725-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line75">line 75</a>
1725+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line74">line 74</a>
17261726
</li>
17271727
</ul>
17281728
</dd>
@@ -1813,7 +1813,7 @@ <h4 class="name" id="stop">
18131813
<dd class="tag-source">
18141814
<ul class="dummy">
18151815
<li>
1816-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line91">line 91</a>
1816+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line89">line 89</a>
18171817
</li>
18181818
</ul>
18191819
</dd>
@@ -2161,7 +2161,7 @@ <h5>Parameters:</h5>
21612161
<dd class="tag-source">
21622162
<ul class="dummy">
21632163
<li>
2164-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line191">line 191</a>
2164+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line188">line 188</a>
21652165
</li>
21662166
</ul>
21672167
</dd>
@@ -2271,7 +2271,7 @@ <h4 class="name" id="PoweredUP">
22712271
<dd class="tag-source">
22722272
<ul class="dummy">
22732273
<li>
2274-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line65">line 65</a>
2274+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line64">line 64</a>
22752275
</li>
22762276
</ul>
22772277
</dd>
@@ -2592,7 +2592,7 @@ <h5>Parameters:</h5>
25922592
<dd class="tag-source">
25932593
<ul class="dummy">
25942594
<li>
2595-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line120">line 120</a>
2595+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line117">line 117</a>
25962596
</li>
25972597
</ul>
25982598
</dd>
@@ -2884,7 +2884,7 @@ <h5>Parameters:</h5>
28842884
<dd class="tag-source">
28852885
<ul class="dummy">
28862886
<li>
2887-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line111">line 111</a>
2887+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line108">line 108</a>
28882888
</li>
28892889
</ul>
28902890
</dd>
@@ -3066,7 +3066,7 @@ <h4 class="name" id="getHubs">
30663066
<dd class="tag-source">
30673067
<ul class="dummy">
30683068
<li>
3069-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line103">line 103</a>
3069+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line100">line 100</a>
30703070
</li>
30713071
</ul>
30723072
</dd>
@@ -3358,7 +3358,7 @@ <h5>Parameters:</h5>
33583358
<dd class="tag-source">
33593359
<ul class="dummy">
33603360
<li>
3361-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line129">line 129</a>
3361+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line126">line 126</a>
33623362
</li>
33633363
</ul>
33643364
</dd>
@@ -3650,7 +3650,7 @@ <h5>Parameters:</h5>
36503650
<dd class="tag-source">
36513651
<ul class="dummy">
36523652
<li>
3653-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line138">line 138</a>
3653+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line135">line 135</a>
36543654
</li>
36553655
</ul>
36563656
</dd>
@@ -3832,7 +3832,7 @@ <h4 class="name" id="scan">
38323832
<dd class="tag-source">
38333833
<ul class="dummy">
38343834
<li>
3835-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line75">line 75</a>
3835+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line74">line 74</a>
38363836
</li>
38373837
</ul>
38383838
</dd>
@@ -3923,7 +3923,7 @@ <h4 class="name" id="stop">
39233923
<dd class="tag-source">
39243924
<ul class="dummy">
39253925
<li>
3926-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line91">line 91</a>
3926+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line89">line 89</a>
39273927
</li>
39283928
</ul>
39293929
</dd>
@@ -4271,7 +4271,7 @@ <h5>Parameters:</h5>
42714271
<dd class="tag-source">
42724272
<ul class="dummy">
42734273
<li>
4274-
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line191">line 191</a>
4274+
<a href="poweredup-node.js.html">poweredup-node.js</a>, <a href="poweredup-node.js.html#line188">line 188</a>
42754275
</li>
42764276
</ul>
42774277
</dd>

‎docs/poweredup-node.js.html‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ <h1 class="page-title">
128128
const technicsmallhub_1 = require("./hubs/technicsmallhub");
129129
let ready = false;
130130
let wantScan = false;
131-
let discoveryEventAttached = false;
132131
const startScanning = () => {
133132
noble.startScanning([
134133
Consts.BLEService.LPF2_HUB,
@@ -170,10 +169,9 @@ <h1 class="page-title">
170169
*/
171170
async scan() {
172171
wantScan = true;
173-
if (!discoveryEventAttached) {
174-
noble.on("discover", this._discoveryEventHandler);
175-
discoveryEventAttached = true;
176-
}
172+
// @ts-ignore
173+
noble.removeAllListeners();
174+
noble.on("discover", this._discoveryEventHandler);
177175
if (ready) {
178176
debug("Scanning started");
179177
startScanning();
@@ -186,10 +184,9 @@ <h1 class="page-title">
186184
*/
187185
stop() {
188186
wantScan = false;
189-
if (discoveryEventAttached) {
190-
noble.removeListener("discover", this._discoveryEventHandler);
191-
discoveryEventAttached = false;
192-
}
187+
// @ts-ignore
188+
noble.removeAllListeners();
189+
noble.removeListener("discover", this._discoveryEventHandler);
193190
noble.stopScanning();
194191
}
195192
/**

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-poweredup",
3-
"version": "8.0.3",
3+
"version": "8.0.4",
44
"description": "A Javascript module to interface with LEGO Powered Up components.",
55
"homepage": "https://github.com/nathankellenicki/node-poweredup/",
66
"main": "dist/node/index-node.js",

‎src/poweredup-node.ts‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import { TechnicSmallHub } from "./hubs/technicsmallhub";
2222

2323
let ready = false;
2424
let wantScan = false;
25-
let discoveryEventAttached = false;
2625

2726
const startScanning = () => {
2827
noble.startScanning([
@@ -72,11 +71,9 @@ export class PoweredUP extends EventEmitter {
7271
*/
7372
public async scan () {
7473
wantScan = true;
75-
76-
if (!discoveryEventAttached) {
77-
noble.on("discover", this._discoveryEventHandler);
78-
discoveryEventAttached = true;
79-
}
74+
// @ts-ignore
75+
noble.removeAllListeners();
76+
noble.on("discover", this._discoveryEventHandler);
8077

8178
if (ready) {
8279
debug("Scanning started");
@@ -93,12 +90,9 @@ export class PoweredUP extends EventEmitter {
9390
*/
9491
public stop () {
9592
wantScan = false;
96-
97-
if (discoveryEventAttached) {
98-
noble.removeListener("discover", this._discoveryEventHandler);
99-
discoveryEventAttached = false;
100-
}
101-
93+
// @ts-ignore
94+
noble.removeAllListeners();
95+
noble.removeListener("discover", this._discoveryEventHandler);
10296
noble.stopScanning();
10397
}
10498

0 commit comments

Comments
 (0)