nkellenicki/node-poweredup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug where calling scan multiple times adds multiple discovery events, closes #10

Browse Source
This commit is contained in:
Nathan Kellenicki 2019-01-09 11:42:08 -08:00
parent b64f9800e4
commit 363eb5f4d0
3 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

2
src/lpf2hub.ts
View File

@ -240,7 +240,7 @@ export class LPF2Hub extends Hub {
if ((data[3] === 0x3b && this.type === Consts.HubType.POWERED_UP_REMOTE) || (data[3] === 0x3c && this.type !== Consts.HubType.POWERED_UP_REMOTE)) { // Voltage if ((data[3] === 0x3b && this.type === Consts.HubType.POWERED_UP_REMOTE) || (data[3] === 0x3c && this.type !== Consts.HubType.POWERED_UP_REMOTE)) { // Voltage
data = this._padMessage(data, 6); data = this._padMessage(data, 6);
const batteryLevel = (data.readUInt16LE(4) / 4096) * 100; const batteryLevel = data.readUInt16LE(4) / 400;
this._batteryLevel = Math.floor(batteryLevel); this._batteryLevel = Math.floor(batteryLevel);
return; return;
} else if (data[3] === 0x3b && this.type !== Consts.HubType.POWERED_UP_REMOTE) { // Current (Non-PUP Remote) } else if (data[3] === 0x3b && this.type !== Consts.HubType.POWERED_UP_REMOTE) { // Current (Non-PUP Remote)

108
src/poweredup.ts
View File

@ -19,6 +19,7 @@ import noble = require("noble-mac");
let ready = false; let ready = false;
let wantScan = false; let wantScan = false;
let discoveryEventAttached = false;
const startScanning = () => { const startScanning = () => {
if (isBrowserContext) { if (isBrowserContext) {
@ -55,6 +56,7 @@ export class PoweredUP extends EventEmitter {
constructor () { constructor () {
super(); super();
this._discoveryEventHandler = this._discoveryEventHandler.bind(this);
} }
@ -65,53 +67,10 @@ export class PoweredUP extends EventEmitter {
public scan () { public scan () {
wantScan = true; wantScan = true;
noble.on("discover", async (peripheral: Peripheral) => { if (!discoveryEventAttached) {
noble.on("discover", this._discoveryEventHandler);
let hub: Hub; discoveryEventAttached = true;
}
if (await WeDo2SmartHub.IsWeDo2SmartHub(peripheral)) {
hub = new WeDo2SmartHub(peripheral, this.autoSubscribe);
} else if (await BoostMoveHub.IsBoostMoveHub(peripheral)) {
hub = new BoostMoveHub(peripheral, this.autoSubscribe);
} else if (await PUPHub.IsPUPHub(peripheral)) {
hub = new PUPHub(peripheral, this.autoSubscribe);
} else if (await PUPRemote.IsPUPRemote(peripheral)) {
hub = new PUPRemote(peripheral, this.autoSubscribe);
} else if (await DuploTrainBase.IsDuploTrainBase(peripheral)) {
hub = new DuploTrainBase(peripheral, this.autoSubscribe);
} else {
return;
}
peripheral.removeAllListeners();
noble.stopScanning();
if (!isBrowserContext) {
startScanning();
}
hub.on("connect", () => {
debug(`Hub ${hub.uuid} connected`);
this._connectedHubs[hub.uuid] = hub;
});
hub.on("disconnect", () => {
debug(`Hub ${hub.uuid} disconnected`);
delete this._connectedHubs[hub.uuid];
if (wantScan) {
startScanning();
}
});
debug(`Hub ${hub.uuid} discovered`);
/**
* Emits when a Powered UP Hub device is found.
* @event PoweredUP#discover
* @param {WeDo2SmartHub | BoostMoveHub | PUPHub | PUPRemote | DuploTrainBase} hub
*/
this.emit("discover", hub);
});
if (ready) { if (ready) {
debug("Scanning started"); debug("Scanning started");
@ -126,6 +85,12 @@ export class PoweredUP extends EventEmitter {
*/ */
public stop () { public stop () {
wantScan = false; wantScan = false;
if (discoveryEventAttached) {
noble.removeListener("discover", this._discoveryEventHandler);
discoveryEventAttached = false;
}
noble.stopScanning(); noble.stopScanning();
} }
@ -151,4 +116,53 @@ export class PoweredUP extends EventEmitter {
} }
private async _discoveryEventHandler (peripheral: Peripheral) {
let hub: Hub;
if (await WeDo2SmartHub.IsWeDo2SmartHub(peripheral)) {
hub = new WeDo2SmartHub(peripheral, this.autoSubscribe);
} else if (await BoostMoveHub.IsBoostMoveHub(peripheral)) {
hub = new BoostMoveHub(peripheral, this.autoSubscribe);
} else if (await PUPHub.IsPUPHub(peripheral)) {
hub = new PUPHub(peripheral, this.autoSubscribe);
} else if (await PUPRemote.IsPUPRemote(peripheral)) {
hub = new PUPRemote(peripheral, this.autoSubscribe);
} else if (await DuploTrainBase.IsDuploTrainBase(peripheral)) {
hub = new DuploTrainBase(peripheral, this.autoSubscribe);
} else {
return;
}
peripheral.removeAllListeners();
noble.stopScanning();
if (!isBrowserContext) {
startScanning();
}
hub.on("connect", () => {
debug(`Hub ${hub.uuid} connected`);
this._connectedHubs[hub.uuid] = hub;
});
hub.on("disconnect", () => {
debug(`Hub ${hub.uuid} disconnected`);
delete this._connectedHubs[hub.uuid];
if (wantScan) {
startScanning();
}
});
debug(`Hub ${hub.uuid} discovered`);
/**
* Emits when a Powered UP Hub device is found.
* @event PoweredUP#discover
* @param {WeDo2SmartHub | BoostMoveHub | PUPHub | PUPRemote | DuploTrainBase} hub
*/
this.emit("discover", hub);
}
} }