node-switchbot 1.4.1 → 1.4.2-beta.0

package/lib/switchbot-advertising.js

@@ -372,15 +372,35 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    let byte1 = buf.readUInt8(1);
-    let byte2 = buf.readUInt8(2);
-    // let byte3 = buf.readUInt8(3);
-    // let byte4 = buf.readUInt8(4);
-    let byte5 = buf.readUInt8(5);
+    const byte9 = buf.readUInt8(9); // byte9:  color bulb state; 0x00=off, 0x80=on & lightLevel: 1~100%
+    const byte10 = buf.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
+    const byte11 = buf.readUInt8(11); // byte11: wifi rssi
+    const byte12 = buf.readUInt8(12); // byte12: bit7: overload?
+    const byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
 
-    let data = {
+    const state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    const lightLevel = byte9 & 0b01111111;
+    const delay = !!(byte10 & 0b00000001);
+    const networkStatus = !!(byte10 & 0b00000001);
+    const statePreset = !!(byte10 & 0b00000010);
+    const lightState = !!(byte10 & 0b00000100);
+    const wifiRssi = byte11;
+    const dynamicRate = !!(byte12 & 0b10000000);
+    const loopIndex = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    // TODO: voltage ???
+
+    const data = {
       model: "u",
       modelName: "WoColorBulb",
+      state: state,
+      lightLevel: lightLevel,
+      delay: delay,
+      networkStatus: networkStatus,
+      statePreset: statePreset,
+      lightState: lightState,
+      wifiRssi: wifiRssi,
+      dynamicRate: dynamicRate,
+      loopIndex: loopIndex,
     };
 
     return data;
@@ -425,8 +445,6 @@ class SwitchbotAdvertising {
     return data;
   }
 
-
-
   _parseServiceDataForWoPlugMiniJP(buf, onlog) {
     if (buf.length !== 14) {
       if (onlog && typeof onlog === "function") {

package/lib/switchbot-device-wocolorbulb.js

@@ -0,0 +1,81 @@
+"use strict";
+const SwitchbotDevice = require("./switchbot-device.js");
+
+/**
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/plugmini.md
+ */
+class SwitchbotDeviceWoPlugMini extends SwitchbotDevice {
+  /**
+   * @returns {Promise<boolean>} resolves with a boolean that tells whether the plug in ON(true) or OFF(false)
+   */
+  readState() {
+    return this._operateBot([0x57, 0x0f, 0x51, 0x01]);
+  }
+
+  /**
+   * @private
+   */
+  _setState(reqByteArray) {
+    const base = [0x57, 0x0f, 0x50, 0x01];
+    return this._operateBot([].concat(base, reqByteArray));
+  }
+
+  /**
+   * @returns {Promise<boolean>} resolves with a boolean that tells whether the plug in ON(true) or OFF(false)
+   */
+  turnOn() {
+    return this._setState([0x01, 0x01]);
+  }
+
+  /**
+   * @returns {Promise<boolean>} resolves with a boolean that tells whether the plug in ON(true) or OFF(false)
+   */
+  turnOff() {
+    return this._setState([0x01, 0x02]);
+  }
+
+  /**
+   * @returns {Promise<boolean>} resolves with a boolean that tells whether the plug in ON(true) or OFF(false)
+   */
+  toggle() {
+    return this._setState([0x02, 0x03]);
+  }
+
+  /**
+   * @private
+   */
+  _operateBot(bytes) {
+    const req_buf = Buffer.from(bytes);
+    return new Promise((resolve, reject) => {
+      this._command(req_buf)
+        .then((res_bytes) => {
+          const res_buf = Buffer.from(res_bytes);
+          if (res_buf.length === 2) {
+            let code = res_buf.readUInt8(1);
+            if (code === 0x00 || code === 0x80) {
+              const is_on = code === 0x80;
+              resolve(is_on);
+            } else {
+              reject(
+                new Error(
+                  "The device returned an error: 0x" + res_buf.toString("hex")
+                )
+              );
+            }
+          } else {
+            reject(
+              new Error(
+                "Expecting a 2-byte response, got instead: 0x" +
+                  res_buf.toString("hex")
+              )
+            );
+          }
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  }
+}
+
+module.exports = SwitchbotDeviceWoPlugMini;

package/package.json

@@ -1,42 +1,42 @@
 {
-  "name": "node-switchbot",
-  "version": "1.4.1",
-  "description": "The node-switchbot is a Node.js module which allows you to move your Switchbot (Bot)'s arm and Switchbot Curtain(Curtain), also monitor the temperature/humidity from SwitchBot Thermometer & Hygrometer (Meter).",
-  "main": "./lib/switchbot.js",
-  "files": [
-    "lib"
-  ],
-  "directories": {
-    "lib": "./lib"
-  },
-  "scripts": {
-    "check": "npm install && npm outdated",
-    "update": "ncu -u && npm update && npm install"
-  },
-  "keywords": [
-    "switchbot",
-    "bot",
-    "meter",
-    "temperature",
-    "humidity",
-    "curtain",
-    "BLE",
-    "Bluetooth Low Energy",
-    "Bluetooth smart",
-    "Bluetooth"
-  ],
-  "homepage": "https://github.com/OpenWonderLabs",
-  "author": "OpenWonderLabs (https://github.com/OpenWonderLabs)",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/OpenWonderLabs/node-switchbot.git"
-  },
-  "readmeFilename": "README.md",
-  "dependencies": {
-    "@abandonware/noble": "^1.9.2-15"
-  },
-  "devDependencies": {
-    "npm-check-updates": "^16.0.6"
-  }
-}
+    "name": "node-switchbot",
+    "version": "1.4.2-beta.0",
+    "description": "The node-switchbot is a Node.js module which allows you to move your Switchbot (Bot)'s arm and Switchbot Curtain(Curtain), also monitor the temperature/humidity from SwitchBot Thermometer & Hygrometer (Meter).",
+    "main": "./lib/switchbot.js",
+    "files": [
+        "lib"
+    ],
+    "directories": {
+        "lib": "./lib"
+    },
+    "scripts": {
+        "check": "npm install && npm outdated",
+        "update": "ncu -u && npm update && npm install"
+    },
+    "keywords": [
+        "switchbot",
+        "bot",
+        "meter",
+        "temperature",
+        "humidity",
+        "curtain",
+        "BLE",
+        "Bluetooth Low Energy",
+        "Bluetooth smart",
+        "Bluetooth"
+    ],
+    "homepage": "https://github.com/OpenWonderLabs",
+    "author": "OpenWonderLabs (https://github.com/OpenWonderLabs)",
+    "license": "MIT",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/OpenWonderLabs/node-switchbot.git"
+    },
+    "readmeFilename": "README.md",
+    "dependencies": {
+        "@abandonware/noble": "^1.9.2-15"
+    },
+    "devDependencies": {
+        "npm-check-updates": "^16.0.6"
+    }
+}