node-switchbot 1.6.0-beta.9 → 1.6.1-beta.0

package/README.md

@@ -110,9 +110,9 @@ Monitoring the advertising packets, you can find your devices and know the lates
 
 ```JavaScript
 // Load the node-switchbot and get a `Switchbot` constructor object
-const Switchbot = require('node-switchbot');
+let Switchbot = require('node-switchbot');
 // Create an `Switchbot` object
-const switchbot = new Switchbot();
+let switchbot = new Switchbot();
 
 (async () => {
   // Start to monitor advertisement packets
@@ -137,7 +137,7 @@ The [`startScan()`](#startscan-method) and [`wait()`](#Switchbot-wait-method) me
 
 ```javascript
 // Load the node-switchbot and get a `Switchbot` constructor object
-const Switchbot = require("node-switchbot");
+let Switchbot = require("node-switchbot");
 // Create an `Switchbot` object
 let switchbot = new Switchbot();
 
@@ -213,13 +213,13 @@ This sample discovers a Bot (WoHand), then put the Bot's arm down, finally put i
 
 ```javascript
 // Load the node-switchbot and get a `Switchbot` constructor object
-const Switchbot = require("node-switchbot");
+let Switchbot = require("node-switchbot");
 // Create an `Switchbot` object
-const switchbot = new Switchbot();
+let switchbot = new Switchbot();
 
 (async () => {
   // Find a Bot (WoHand)
-  const bot_list = await switchbot.discover({ model: "H", quick: true });
+  let bot_list = await switchbot.discover({ model: "H", quick: true });
   if (bot_list.length === 0) {
     throw new Error("No device was found.");
   }
@@ -246,13 +246,13 @@ In this code, you can get a [`SwitchbotDeviceWoHand`](#SwitchbotDeviceWoHand-obj
 In order to use the node-switchbot, you have to load the node-switchbot module as follows:
 
 ```JavaScript
-const Switchbot = require('node-switchbot');
+let Switchbot = require('node-switchbot');
 ```
 
 You can get an `Switchbot` constructor from the code above. Then you have to create an `Switchbot` object from the `Switchbot` constructor as follows:
 
 ```javascript
-const switchbot = new Switchbot();
+let switchbot = new Switchbot();
 ```
 
 The `Switchbot` constructor takes an argument optionally. It must be a hash object containing the properties as follows:
@@ -267,11 +267,11 @@ The sample code below shows how to pass a `Nobel` object to the `Switchbot` cons
 
 ```JavaScript
 // Create a Noble object
-const noble = require('@abandonware/noble');
+let noble = require('@abandonware/noble');
 
 // Create a Switchbot object
-const Switchbot = require('node-switchbot');
-const switchbot = new Switchbot({'noble': noble});
+let Switchbot = require('node-switchbot');
+let switchbot = new Switchbot({'noble': noble});
 ```
 
 In the code snippet above, the variable `switchbot` is an `Switchbot` object. The `Switchbot` object has a lot of methods as described in sections below.

package/lib/switchbot-advertising.js

@@ -69,8 +69,8 @@ class SwitchbotAdvertising {
     let manufacturerData = ad.manufacturerData;
     let buf = serviceData.data;
 
-    const bufIsInvalid = !buf || !Buffer.isBuffer(buf) || buf.length < 3;
-    const manufacturerDataIsInvalid =
+    let bufIsInvalid = !buf || !Buffer.isBuffer(buf) || buf.length < 3;
+    let manufacturerDataIsInvalid =
       !manufacturerData ||
       !Buffer.isBuffer(manufacturerData) ||
       manufacturerData.length < 3;
@@ -127,7 +127,7 @@ class SwitchbotAdvertising {
     if (address === "") {
       address = peripheral.advertisement.manufacturerData || "";
       if (address !== "") {
-        const str = peripheral.advertisement.manufacturerData
+        let str = peripheral.advertisement.manufacturerData
           .toString("hex")
           .slice(4, 16);
         address = str.substr(0, 2);
@@ -255,12 +255,10 @@ class SwitchbotAdvertising {
       return null;
     }
 
-
     let byte1 = buf.readUInt8(1);
     let byte2 = buf.readUInt8(2);
     let byte5 = buf.readUInt8(5);
 
-
     let tested = byte1 & 0b10000000 ? true : false;
     let movement = byte1 & 0b01000000 ? true : false;
     let battery = byte2 & 0b01111111;
@@ -350,7 +348,6 @@ class SwitchbotAdvertising {
     let battery = byte2 & 0b01111111; // %
     let inMotion = byte3 & 0b10000000 ? true : false;
     let currPosition = byte3 & 0b01111111; // current positon %
-    //let currPosition = max(min(byte3 & 0b01111111, 100), 0) //byte3 & 0b01111111; // current positon %
     let lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
     let deviceChain = byte4 & 0b00000111;
 
@@ -388,6 +385,7 @@ class SwitchbotAdvertising {
     let byte9 = buf.readUInt8(9);
     let byte10 = buf.readUInt8(10);//bulb mode
 
+    let power = byte1;
     let red = byte3;
     let green = byte4;
     let blue = byte5;
@@ -404,6 +402,7 @@ class SwitchbotAdvertising {
       model: "u",
       modelName: "WoBulb",
       color_temperature: color_temperature,
+      power: power,
       state: state,
       red: red,
       green: green,
@@ -566,6 +565,11 @@ class SwitchbotAdvertising {
       return null;
     }
 
+    let byte1 = buf.readUInt8(1);//power and light status
+    let byte2 = buf.readUInt8(2);//bulb brightness
+    let byte3 = buf.readUInt8(3);//bulb R
+    let byte4 = buf.readUInt8(4);//bulb G
+    let byte5 = buf.readUInt8(5);//bulb B
     let byte7 = buf.readUInt8(7);
     let byte8 = buf.readUInt8(8);
     let byte9 = buf.readUInt8(9);
@@ -573,6 +577,9 @@ class SwitchbotAdvertising {
 
     let state = byte7 & 0b10000000 ? true : false;
     let brightness = byte7 & 0b01111111;
+    let red = byte3;
+    let green = byte4;
+    let blue = byte5;
     let delay = byte8 & 0b10000000;
     let preset = byte8 & 0b00001000;
     let color_mode = byte8 & 0b00000111;
@@ -584,6 +591,9 @@ class SwitchbotAdvertising {
       modelName: "WoStrip",
       state: state,
       brightness: brightness,
+      red: red,
+      green: green,
+      blue: blue,
       delay: delay,
       preset: preset,
       color_mode: color_mode,

package/lib/switchbot-device-wobulb.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 /**
  * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/colorbulb.md
@@ -16,7 +16,7 @@ class SwitchbotDeviceWoBulb extends SwitchbotDevice {
    * @private
    */
   _setState(reqByteArray) {
-    const base = [0x57, 0x0f, 0x47, 0x01];
+    let base = [0x57, 0x0f, 0x47, 0x01];
     return this._operateBot([].concat(base, reqByteArray));
   }
 
@@ -149,15 +149,15 @@ class SwitchbotDeviceWoBulb extends SwitchbotDevice {
    * @private
    */
   _operateBot(bytes) {
-    const req_buf = Buffer.from(bytes);
+    let req_buf = Buffer.from(bytes);
     return new Promise((resolve, reject) => {
       this._command(req_buf)
         .then((res_bytes) => {
-          const res_buf = Buffer.from(res_bytes);
+          let 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;
+              let is_on = code === 0x80;
               resolve(is_on);
             } else {
               reject(

package/lib/switchbot-device-wocontact.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 class SwitchbotDeviceWoContact extends SwitchbotDevice {}
 

package/lib/switchbot-device-wocurtain.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
   /* ------------------------------------------------------------------

package/lib/switchbot-device-wohand.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 class SwitchbotDeviceWoHand extends SwitchbotDevice {
   /* ------------------------------------------------------------------

package/lib/switchbot-device-wohumi.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 class SwitchbotDeviceWoHumi extends SwitchbotDevice {
   /* ------------------------------------------------------------------

package/lib/switchbot-device-woplugmini.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 /**
  * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/plugmini.md
@@ -16,7 +16,7 @@ class SwitchbotDeviceWoPlugMini extends SwitchbotDevice {
    * @private
    */
   _setState(reqByteArray) {
-    const base = [0x57, 0x0f, 0x50, 0x01];
+    let base = [0x57, 0x0f, 0x50, 0x01];
     return this._operateBot([].concat(base, reqByteArray));
   }
 
@@ -45,15 +45,15 @@ class SwitchbotDeviceWoPlugMini extends SwitchbotDevice {
    * @private
    */
   _operateBot(bytes) {
-    const req_buf = Buffer.from(bytes);
+    let req_buf = Buffer.from(bytes);
     return new Promise((resolve, reject) => {
       this._command(req_buf)
         .then((res_bytes) => {
-          const res_buf = Buffer.from(res_bytes);
+          let 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;
+              let is_on = code === 0x80;
               resolve(is_on);
             } else {
               reject(

package/lib/switchbot-device-wopresence.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 class SwitchbotDeviceWoPresence extends SwitchbotDevice {}
 

package/lib/switchbot-device-wosensorth.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 class SwitchbotDeviceWoSensorTH extends SwitchbotDevice {}
 

package/lib/switchbot-device-wostrip.js

@@ -1,5 +1,5 @@
 "use strict";
-const SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDevice = require("./switchbot-device.js");
 
 /**
  * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/colorbulb.md
@@ -16,7 +16,7 @@ class SwitchbotDeviceWoStrip extends SwitchbotDevice {
    * @private
    */
   _setState(reqByteArray) {
-    const base = [0x57, 0x0f, 0x49, 0x01];
+    let base = [0x57, 0x0f, 0x49, 0x01];
     return this._operateBot([].concat(base, reqByteArray));
   }
 
@@ -143,15 +143,15 @@ class SwitchbotDeviceWoStrip extends SwitchbotDevice {
    * @private
    */
   _operateBot(bytes) {
-    const req_buf = Buffer.from(bytes);
+    let req_buf = Buffer.from(bytes);
     return new Promise((resolve, reject) => {
       this._command(req_buf)
         .then((res_bytes) => {
-          const res_buf = Buffer.from(res_bytes);
+          let 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;
+              let is_on = code === 0x80;
               resolve(is_on);
             } else {
               reject(

package/lib/switchbot-device.js

@@ -1,6 +1,6 @@
 "use strict";
-const parameterChecker = require("./parameter-checker.js");
-const switchbotAdvertising = require("./switchbot-advertising.js");
+let parameterChecker = require("./parameter-checker.js");
+let switchbotAdvertising = require("./switchbot-advertising.js");
 
 class SwitchbotDevice {
   /* ------------------------------------------------------------------

package/lib/switchbot.js

@@ -1,17 +1,17 @@
 "use strict";
-const parameterChecker = require("./parameter-checker.js");
-const switchbotAdvertising = require("./switchbot-advertising.js");
+let parameterChecker = require("./parameter-checker.js");
+let switchbotAdvertising = require("./switchbot-advertising.js");
 
-const SwitchbotDevice = require("./switchbot-device.js");
-const SwitchbotDeviceWoHand = require("./switchbot-device-wohand.js");
-const SwitchbotDeviceWoCurtain = require("./switchbot-device-wocurtain.js");
-const SwitchbotDeviceWoPresence = require("./switchbot-device-wopresence.js");
-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");
+let SwitchbotDevice = require("./switchbot-device.js");
+let SwitchbotDeviceWoHand = require("./switchbot-device-wohand.js");
+let SwitchbotDeviceWoCurtain = require("./switchbot-device-wocurtain.js");
+let SwitchbotDeviceWoPresence = require("./switchbot-device-wopresence.js");
+let SwitchbotDeviceWoContact = require("./switchbot-device-wocontact.js");
+let SwitchbotDeviceWoSensorTH = require("./switchbot-device-wosensorth.js");
+let SwitchbotDeviceWoHumi = require("./switchbot-device-wohumi.js");
+let SwitchbotDeviceWoPlugMini = require("./switchbot-device-woplugmini.js");
+let SwitchbotDeviceWoBulb = require("./switchbot-device-wobulb.js");
+let SwitchbotDeviceWoStrip = require("./switchbot-device-wostrip.js");
 
 class Switchbot {
   /* ------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.6.0-beta.9",
+  "version": "1.6.1-beta.0",
   "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": [