node-switchbot 1.4.2-beta.5 → 1.4.2-beta.7

package/lib/switchbot-advertising.js

@@ -83,41 +83,29 @@ class SwitchbotAdvertising {
     let sd = null;
 
     if (model === "H") {
-      // WoHand
-      sd = this._parseServiceDataForWoHand(buf, onlog);
+      sd = this._parseServiceDataForWoHand(buf, onlog);//WoHand
     } else if (model === "T") {
-      // WoSensorTH
-      sd = this._parseServiceDataForWoSensorTH(buf, onlog);
+      sd = this._parseServiceDataForWoSensorTH(buf, onlog);//WoSensorTH
     } else if (model === "e") {
-      // WoHumi
-      sd = this._parseServiceDataForWoHumi(buf, onlog);
+      sd = this._parseServiceDataForWoHumi(buf, onlog);//WoHumi
     } else if (model === "s") {
-      // WoMotion
-      sd = this._parseServiceDataForWoPresence(buf, onlog);
+      sd = this._parseServiceDataForWoPresence(buf, onlog);//WoPresence
     } else if (model === "d") {
-      // WoContact
-      sd = this._parseServiceDataForWoContact(buf, onlog);
+      sd = this._parseServiceDataForWoContact(buf, onlog);//WoContact
     } else if (model === "c") {
-      // WoCurtain
-      sd = this._parseServiceDataForWoCurtain(buf, onlog);
+      sd = this._parseServiceDataForWoCurtain(buf, onlog);// WoCurtain
     } else if (model === "u") {
-      // WoColorBulb
-      sd = this._parseServiceDataForWoColorBulb(buf, onlog);
+      sd = this._parseServiceDataForWoBulb(manufacturerData, onlog);// WoBulb
     } else if (model === "g") {
-      // WoPlugMini (US)
-      sd = this._parseServiceDataForWoPlugMiniUS(manufacturerData, onlog);
+      sd = this._parseServiceDataForWoPlugMiniUS(manufacturerData, onlog);      // WoPlugMini (US)
     } else if (model === "j") {
-      // WoPlugMini (JP)
-      sd = this._parseServiceDataForWoPlugMiniJP(manufacturerData, onlog);
+      sd = this._parseServiceDataForWoPlugMiniJP(manufacturerData, onlog);// WoPlugMini (JP)
     } else if (model === "o") {
-      // WoSmartLock
-      sd = this._parseServiceDataForWoSmartLock(buf, onlog);
+      sd = this._parseServiceDataForWoSmartLock(buf, onlog);// WoSmartLock
     } else if (model === "i") {
-      // WoMeterPlus
-      sd = this._parseServiceDataForWoSensorTHPlus(buf, onlog);
+      sd = this._parseServiceDataForWoSensorTHPlus(buf, onlog);// WoMeterPlus
     } else if (model === "r") {
-      // WoLEDStripLight
-      sd = this._parseServiceDataForWoLEDStripLight(buf, onlog);
+      sd = this._parseServiceDataForWoStrip(buf, onlog);// WoStrip
     } else {
       if (onlog && typeof onlog === "function") {
         onlog(
@@ -363,11 +351,11 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoColorBulb(buf, onlog) {
+  _parseServiceDataForWoBulb(buf, onlog) {
     if (buf.length !== 6) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoColorBulb] Buffer length ${buf.length} !== 6!`
+          `[_parseServiceDataForWoBulb] Buffer length ${buf.length} !== 6!`
         );
       }
       return null;
@@ -391,7 +379,7 @@ class SwitchbotAdvertising {
 
     const data = {
       model: "u",
-      modelName: "WoColorBulb",
+      modelName: "WoBulb",
       state: state,
       lightLevel: lightLevel,
       delay: delay,

package/lib/{switchbot-device-wocolorbulb.js → switchbot-device-wobulb.js}

@@ -4,7 +4,7 @@ const SwitchbotDevice = require("./switchbot-device.js");
 /**
  * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/colorbulb.md
  */
-class SwitchbotDeviceWoColorBulb extends SwitchbotDevice {
+class SwitchbotDeviceWoBulb extends SwitchbotDevice {
   /**
    * @returns {Promise<boolean>} resolves with a boolean that tells whether the plug in ON(true) or OFF(false)
    */
@@ -78,4 +78,4 @@ class SwitchbotDeviceWoColorBulb extends SwitchbotDevice {
   }
 }
 
-module.exports = SwitchbotDeviceWoColorBulb;
+module.exports = SwitchbotDeviceWoBulb;

package/lib/switchbot-device-wostrip.js

@@ -0,0 +1,81 @@
+"use strict";
+const SwitchbotDevice = require("./switchbot-device.js");
+
+/**
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/colorbulb.md
+ */
+class SwitchbotDeviceWoStrip 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, 0x48, 0x01]);
+  }
+
+  /**
+   * @private
+   */
+  _setState(reqByteArray) {
+    const base = [0x57, 0x0f, 0x47, 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 = SwitchbotDeviceWoStrip;

package/lib/switchbot.js

@@ -10,6 +10,8 @@ const SwitchbotDeviceWoContact = require("./switchbot-device-wocontact.js");
 const SwitchbotDeviceWoSensorTH = require("./switchbot-device-wosensorth.js");
 const SwitchbotDeviceWoHumi = require("./switchbot-device-wohumi.js");
 const SwitchbotDeviceWoPlugMini = require("./switchbot-device-woplugmini.js");
+const SwitchbotDeviceWoBulb = require("./switchbot-device-wobulb.js");
+const SwitchbotDeviceWoStrip = require("./switchbot-device-wostrip.js");
 
 class Switchbot {
   /* ------------------------------------------------------------------
@@ -226,7 +228,7 @@ class Switchbot {
           device = new SwitchbotDeviceWoCurtain(peripheral, this.noble);
           break;
         case "u":
-          device = new SwitchbotDeviceWoColorBulb(peripheral, this.noble);
+          device = new SwitchbotDeviceWoBulb(peripheral, this.noble);
           break;
         case "g":
         case "j":
@@ -239,7 +241,7 @@ class Switchbot {
           device = new SwitchbotDeviceWoSensorTHPlus(peripheral, this.noble);
           break;
         case "r":
-          device = new SwitchbotDeviceWoLEDStripLight(peripheral, this.noble);
+          device = new SwitchbotDeviceWoStrip(peripheral, this.noble);
           break;
         default: // 'resetting', 'unknown'
           device = new SwitchbotDevice(peripheral, this.noble);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-switchbot",
-    "version": "1.4.2-beta.5",
+    "version": "1.4.2-beta.7",
     "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": [