From 6315f54a23a01470b95e56dafbedf47995868cc9 Mon Sep 17 00:00:00 2001
From: Nathan Kellenicki <nathan@kellenicki.com>
Date: Sun, 10 Nov 2019 20:40:59 -0800
Subject: [PATCH] Fixed double disconnect bug, added hardware versions

---
 examples/web_bluetooth.html |  4 ++--
 package-lock.json           |  2 +-
 package.json                |  2 +-
 src/hub.ts                  | 11 ++++++++++-
 src/lpf2hub.ts              |  5 +++++
 5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/examples/web_bluetooth.html b/examples/web_bluetooth.html
index 672248b..9f66394 100644
--- a/examples/web_bluetooth.html
+++ b/examples/web_bluetooth.html
@@ -3,8 +3,8 @@
 
 <head>
 <title>Web Bluetooth node-poweredup Example</title>
-<!-- <script src="https://cdn.jsdelivr.net/npm/node-poweredup@latest/dist/browser/poweredup.js"></script> -->
-<script src="../dist/browser/poweredup.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/node-poweredup@latest/dist/browser/poweredup.js"></script>
+<!-- <script src="../dist/browser/poweredup.js"></script> -->
 <link rel="stylesheet" type="text/css" href="./web_bluetooth.css" />
 <script>
 
diff --git a/package-lock.json b/package-lock.json
index 7790019..8a784cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "node-poweredup",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4a63f8d..3c926b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-poweredup",
-  "version": "4.0.2",
+  "version": "4.1.0",
   "description": "A Javascript module to interface with LEGO Powered Up components.",
   "homepage": "https://github.com/nathankellenicki/node-poweredup/",
   "main": "dist/node/index-node.js",
diff --git a/src/hub.ts b/src/hub.ts
index 2d1ed25..f08661e 100644
--- a/src/hub.ts
+++ b/src/hub.ts
@@ -25,6 +25,7 @@ export class Hub extends EventEmitter {
 
     protected _name: string = "";
     protected _firmwareVersion: string = "0.0.00.0000";
+    protected _hardwareVersion: string = "0.0.00.0000";
     protected _batteryLevel: number = 100;
     protected _voltage: number = 0;
     protected _current: number = 0;
@@ -63,6 +64,15 @@ export class Hub extends EventEmitter {
     }
 
 
+    /**
+     * @readonly
+     * @property {string} firmwareVersion Hardware version of the hub
+     */
+    public get hardwareVersion () {
+        return this._hardwareVersion;
+    }
+
+
     /**
      * @readonly
      * @property {string} uuid UUID of the hub
@@ -134,7 +144,6 @@ export class Hub extends EventEmitter {
      * @returns {Promise} Resolved upon successful disconnect.
      */
     public async disconnect () {
-        this.emit("disconnect");
         this._bleDevice.disconnect();
     }
 
diff --git a/src/lpf2hub.ts b/src/lpf2hub.ts
index ee8e583..ab9adda 100644
--- a/src/lpf2hub.ts
+++ b/src/lpf2hub.ts
@@ -36,6 +36,7 @@ export class LPF2Hub extends Hub {
             this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.LPF2_ALL, this._parseMessage.bind(this));
             this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x01, 0x02, 0x02])); // Activate button reports
             this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x01, 0x03, 0x05])); // Request firmware version
+            this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x01, 0x04, 0x05])); // Request hardware version
             this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x01, 0x06, 0x02])); // Activate battery level reports
             this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x41, 0x3c, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01])); // Activate voltage reports
             this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x41, 0x3b, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01])); // Activate current reports
@@ -250,6 +251,10 @@ export class LPF2Hub extends Hub {
             this._firmwareVersion = LPF2Hub.decodeVersion(data.readInt32LE(5));
             this._checkFirmware(this._firmwareVersion);
 
+        // Hardware version
+        } else if (data[3] === 0x04) {
+            this._hardwareVersion = LPF2Hub.decodeVersion(data.readInt32LE(5));
+
         // Battery level reports
         } else if (data[3] === 0x06) {
             this._batteryLevel = data[5];
