node-switchbot 1.8.2 → 1.9.0-beta.1

package/lib/switchbot-advertising.js

@@ -110,6 +110,8 @@ class SwitchbotAdvertising {
       sd = this._parseServiceDataForWoSensorTHPlus(buf, onlog);// WoMeterPlus
     } else if (model === "r") {
       sd = this._parseServiceDataForWoStrip(buf, onlog);// WoStrip
+    } else if (model === "w") {
+      sd = this._parseServiceDataForWoIOSensorTH(buf, manufacturerData, onlog); // Indoor/Outdoor Thermo-Hygrometer
     } else {
       if (onlog && typeof onlog === "function") {
         onlog(
@@ -662,6 +664,49 @@ class SwitchbotAdvertising {
 
     return data;
   }
+
+  _parseServiceDataForWoIOSensorTH(serviceDataBuf, manufacturerDataBuf, onlog) {
+    if (serviceDataBuf.length !== 3) {
+      if (onlog && typeof onlog === "function") {
+        onlog(
+          `[_parseServiceDataForWoIOSensorTH] Service Data Buffer length ${serviceDataBuf.length} !== 3!`
+        );
+      }
+      return null;
+    }
+    if (manufacturerDataBuf.length !== 14) {
+      if (onlog && typeof onlog === "function") {
+        onlog(
+          `[_parseServiceDataForWoIOSensorTH] Manufacturer Data Buffer length ${manufacturerDataBuf.length} !== 14!`
+        );
+      }
+      return null;
+    }
+    const mdByte10 = manufacturerDataBuf.readUInt8(10);
+    const mdByte11 = manufacturerDataBuf.readUInt8(11);
+    const mdByte12 = manufacturerDataBuf.readUInt8(12);
+
+    const sdByte2 = serviceDataBuf.readUInt8(2);
+
+    const temp_sign = mdByte11 & 0b10000000 ? 1 : -1;
+    const temp_c = temp_sign * ((mdByte11 & 0b01111111) + (mdByte10 & 0b00001111) / 10);
+    const temp_f = Math.round(((temp_c * 9 / 5) + 32) * 10) / 10;
+
+    const data = {
+      model: "w",
+      modelName: "WoIOSensorTH",
+      temperature: {
+        c: temp_c,
+        f: temp_f,
+      },
+      fahrenheit: mdByte12 & 0b10000000 ? true : false, // needs to be confirmed!
+      humidity: mdByte12 & 0b01111111,
+      battery: sdByte2 & 0b01111111,
+    };
+
+    console.log(data);
+    return data;
+  }
 }
 
 module.exports = new SwitchbotAdvertising();

package/lib/switchbot.js

@@ -196,29 +196,35 @@ class Switchbot {
   _init() {
     const promise = new Promise((resolve, reject) => {
       let err;
-      switch (this.noble.state) {
-        case ("unsupported", "unauthorized", "poweredOff"):
-          err = new Error(
-            "Failed to initialize the Noble object: " + this.noble.state
-          );
-          reject(err);
-          return;
-        case ("resetting", "unknown"):
-          err = new Error(
-            "Adapter is not ready: " + this.noble.state
-          );
-          reject(err);
-          return;
-        case "poweredOn":
-          resolve();
-          return;
-        default:
-          err = new Error(
-            "Uknown state: " + this.noble.state
-          );
-          reject(err);
-          return;
+      if (this.noble.state === "poweredOn") {
+        resolve();
+        return;
       }
+      this.noble.once('stateChange', state => {
+        switch (state) {
+          case ("unsupported", "unauthorized", "poweredOff"):
+            err = new Error(
+              "Failed to initialize the Noble object: " + this.noble.state
+            );
+            reject(err);
+            return;
+          case ("resetting", "unknown"):
+            err = new Error(
+              "Adapter is not ready: " + this.noble.state
+            );
+            reject(err);
+            return;
+          case "poweredOn":
+            resolve();
+            return;
+          default:
+            err = new Error(
+              "Uknown state: " + this.noble.state
+            );
+            reject(err);
+            return;
+        }
+      });
     });
     return promise;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.8.2",
+  "version": "1.9.0-beta.1",
   "description": "The node-switchbot is a Node.js module which allows you to control your Switchbot Devices through Bluetooth (BLE).",
   "main": "./lib/switchbot.js",
   "files": [
@@ -36,13 +36,13 @@
   },
   "readmeFilename": "README.md",
   "dependencies": {
-    "@abandonware/noble": "1.9.2-21"
+    "@abandonware/noble": "^1.9.2-23"
   },
   "optionalDependencies": {
-    "@abandonware/bluetooth-hci-socket": "0.5.3-10"
+    "@abandonware/bluetooth-hci-socket": "^0.5.3-10"
   },
   "devDependencies": {
-    "eslint": "^8.45.0",
-    "npm-check-updates": "^16.10.17"
+    "eslint": "^8.48.0",
+    "npm-check-updates": "^16.13.2"
   }
 }