node-switchbot 1.1.3-beta.9 → 1.2.1-beta.1

package/CHANGELOG.md

@@ -2,25 +2,32 @@
 
 All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/)
 
-## [Beta - Version 1.2.0](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.1.2) (2021-11-13)
+## [Version 1.2.0](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.2.0) (2022-03-04)
 
 ### Changes
 
 - Added support for SwitchBot "Contact" and "Motion"
+- Fix for Curtains on Firmware v3.3 and above
 - Housekeeping and update dependencies
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.1.2...v1.2.0
+
 ## [Version 1.1.2](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.1.2) (2021-11-13)
 
 ### Changes
 
 - Housekeeping and update dependencies
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.1.1...v1.1.2
+
 ## [Version 1.1.1](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.1.1) (2021-11-02)
 
 ### Changes
 
 - Change back from @node/noble to @abandonware/noble
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.1.0...v1.1.1
+
 ## [Version 1.1.0](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.1.0) (2021-10-26)
 
 ### Changes
@@ -29,24 +36,32 @@ All notable changes to this project will be documented in this file. This projec
 - Add Humidifier advertisement
 - Correct Model for advertisement
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.8...v1.1.0
+
 ## [Version 1.0.8](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.8) (2021-09-30)
 
 ### Changes
 
 - fix extra trace of old noble from @abandonware/noble
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.7...v1.0.8
+
 ## [Version 1.0.7](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.7) (2021-09-24)
 
 ### Changes
 
 - Change from @abandonware/noble to @homebridge/noble
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.6...v1.0.7
+
 ## [Version 1.0.6](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.6) (2021-08-29)
 
 ### Changes
 
 - Fixes FATAL ERROR: ad_id is not defined
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.5...v1.0.6
+
 ## [Version 1.0.5](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.5) (2021-08-04)
 
 ### Changes
@@ -54,42 +69,56 @@ All notable changes to this project will be documented in this file. This projec
 - Adding code for Contact and Motion Sensors
   - Not Ready to be used yet though
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.4...v1.0.5
+
 ## [Version 1.0.4](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.4) (2021-08-03)
 
 ### Changes
 
 - Support for the discover method with id on macOS
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.3...v1.0.4
+
 ## [Version 1.0.3](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.3) (2021-07-30)
 
 ### Changes
 
 - Fixed misspelling.
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.2...v1.0.3
+
 ## [Version 1.0.2](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.2) (2021-07-29)
 
 ### Changes
 
 - Housekeeping and update dependencies
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.1...v1.0.2
+
 ## [Version 1.0.1](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.1) (2021-07-29)
 
 ### Changes
 
 - Fixed issue where after switching Bluetooth off and on, would not work properly.
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.0.0...v1.0.1
+
 ## [Version 1.0.0](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.0.0) (2021-01-21)
 
 ### Changes
 
 -   * fix "No device was found" in MacOS
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v0.2.0...v1.0.0
+
 ## [Version 0.2.0](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v0.2.0) (2020-11-05)
 
 ### Changes
 
 - Modify Curtain's action command to support group and running mode. (Thanks to [@SwitchBot-Wonderlabs](https://github.com/OpenWonderLabs/node-switchbot/pull/7/))
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v0.1.0...v0.2.0
+
 ## [Version 0.1.0](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v0.1.0) (2020-10-28)
 
 ### Changes
@@ -97,18 +126,24 @@ All notable changes to this project will be documented in this file. This projec
 - Added support for SwitchBot Curtain. (Thanks to [@SwitchBot-Wonderlabs](https://github.com/OpenWonderLabs/node-switchbot/pull/6/))
 - Added support for running on the Raspberry Pi Zero W. (Thanks to [@zizi4n5](https://github.com/OpenWonderLabs/node-switchbot/pull/5))
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v0.0.5...v0.1.0
+
 ## [Version 0.0.5](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v0.0.5) (2020-02-19)
 
 ### Changes
 
 - Improved the stability of discovering the BLE characteristics. (Thanks to [@dnicolson](https://github.com/OpenWonderLabs/node-switchbot/issues/3))
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v0.0.4...v0.0.5
+
 ## [Version 0.0.4](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v0.0.4) (2020-02-11)
 
 ### Changes
 
 - Fixed the bug that temperature value lower than 0 degC could not be handled. (Thanks to [@musimasami](https://github.com/OpenWonderLabs/node-switchbot/issues/2))
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v0.0.3...v0.0.4
+
 ## [Version 0.0.3](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v0.0.3) (2020-02-10)
 
 ### Changes
@@ -116,6 +151,8 @@ All notable changes to this project will be documented in this file. This projec
 - Now the characteristic UUID `0x2a00` (Device Name) is not mandatory. Some models of Bot don't seem to support the characteristic. (Thanks to [@dnicolson](https://github.com/OpenWonderLabs/node-switchbot/issues/1))
 - Fixed the bug that the `turnOn()` method returns an error if the "Press mode" is selected on the Bot.
 
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v0.0.2...v0.0.3
+
 ## [Version 0.0.2](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v0.0.2) (2019-11-20)
 
 ### Changes

package/lib/switchbot-advertising.js

@@ -76,16 +76,26 @@ class SwitchbotAdvertising {
 
     if (model === 'H') { // WoHand
       sd = this._parseServiceDataForWoHand(buf, onlog);
-    } else if (model === 'e') { // WoHumi
-      sd = this._parseServiceDataForWoHumi(buf, onlog);
     } else if (model === 'T') { // WoSensorTH
       sd = this._parseServiceDataForWoSensorTH(buf, onlog);
-    } else if (model === 'c') { // WoCurtain
-      sd = this._parseServiceDataForWoCurtain(buf, onlog);
+    } else if (model === 'e') { // WoHumi
+      sd = this._parseServiceDataForWoHumi(buf, onlog);
     } else if (model === 's') { // WoMotion
       sd = this._parseServiceDataForWoPresence(buf, onlog);
     } else if (model === 'd') { // WoContact
       sd = this._parseServiceDataForWoContact(buf, onlog);
+    } else if (model === 'c') { // WoCurtain
+      sd = this._parseServiceDataForWoCurtain(buf, onlog);
+    } else if (model === 'u') { // WoColorBulb
+      sd = this._parseServiceDataForWoColorBulb(buf, onlog);
+    } else if (model === 'g') { // WoPlugMini
+      sd = this._parseServiceDataForWoPlugMini(buf, onlog);
+    } else if (model === 'o') { // WoSmartLock
+      sd = this._parseServiceDataForWoSmartLock(buf, onlog);
+    } else if (model === 'i') { // WoMeterPlus
+      sd = this._parseServiceDataForWoSensorTHPlus(buf, onlog);
+    } else if (model === 'r') { // WoLEDStripLight
+      sd = this._parseServiceDataForWoLEDStripLight(buf, onlog);
     } else {
       if (onlog && typeof onlog === 'function') {
         onlog(`[parseAdvertising.${peripheral.id}] return null, model "${model}" not available!`);
@@ -152,34 +162,6 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoHumi(buf, onlog) {
-    if (buf.length !== 8) {
-      if (onlog && typeof onlog === 'function') {
-        onlog(`[_parseServiceDataForWoHumi] Buffer length ${buf.length} !== 8!`);
-      }
-      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);
-
-    let onState = (byte1 & 0b10000000) ? true : false; // 1 - on
-    let autoMode = (byte4 & 0b10000000) ? true : false; // 1 - auto
-    let percentage = byte4 & 0b01111111; // 0-100%, 101/102/103 - Quick gear 1/2/3
-
-    let data = {
-      model: 'e',
-      modelName: 'WoHumi',
-      onState: onState,
-      autoMode: autoMode,
-      percentage: autoMode ? 0 : percentage,
-    };
-
-    return data;
-  }
-
   _parseServiceDataForWoSensorTH(buf, onlog) {
     if (buf.length !== 6) {
       if (onlog && typeof onlog === 'function') {
@@ -212,6 +194,34 @@ class SwitchbotAdvertising {
     return data;
   }
 
+  _parseServiceDataForWoHumi(buf, onlog) {
+    if (buf.length !== 8) {
+      if (onlog && typeof onlog === 'function') {
+        onlog(`[_parseServiceDataForWoHumi] Buffer length ${buf.length} !== 8!`);
+      }
+      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);
+
+    let onState = (byte1 & 0b10000000) ? true : false; // 1 - on
+    let autoMode = (byte4 & 0b10000000) ? true : false; // 1 - auto
+    let percentage = byte4 & 0b01111111; // 0-100%, 101/102/103 - Quick gear 1/2/3
+
+    let data = {
+      model: 'e',
+      modelName: 'WoHumi',
+      onState: onState,
+      autoMode: autoMode,
+      percentage: autoMode ? 0 : percentage,
+    };
+
+    return data;
+  }
+
   _parseServiceDataForWoPresence(buf, onlog) {
     if (buf.length !== 6) {
       if (onlog && typeof onlog === 'function') {
@@ -303,6 +313,129 @@ class SwitchbotAdvertising {
 
     return data;
   }
+
+  _parseServiceDataForWoColorBulb(buf, onlog) {
+    if (buf.length !== 6) {
+      if (onlog && typeof onlog === 'function') {
+        onlog(`[_parseServiceDataForWoColorBulb] Buffer length ${buf.length} !== 6!`);
+      }
+      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);
+
+    let data = {
+      model: 'u',
+      modelName: 'WoColorBulb',
+    };
+
+    return data;
+  }
+
+  _parseServiceDataForWoPlugMini(buf, onlog) {
+    if (buf.length !== 6) {
+      if (onlog && typeof onlog === 'function') {
+        onlog(`[_parseServiceDataForWoPlugMini] Buffer length ${buf.length} !== 6!`);
+      }
+      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);
+
+    let data = {
+      model: 'g',
+      modelName: 'WoPlugMini',
+    };
+
+    return data;
+  }
+
+  _parseServiceDataForWoSmartLock(buf, onlog) {
+    if (buf.length !== 6) {
+      if (onlog && typeof onlog === 'function') {
+        onlog(`[_parseServiceDataForWoSmartLock] Buffer length ${buf.length} !== 6!`);
+      }
+      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);
+
+    //let pirState = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
+    let battery = byte2 & 0b01111111; // %
+    //let lightLevel = byte5 & 0b00000011;
+
+    let data = {
+      model: 'o',
+      modelName: 'WoSmartLock',
+      //movement: pirState,
+      battery: battery,
+      //lightLevel: (lightLevel == 1) ? 'dark' : ((lightLevel == 2) ? 'bright' : 'unknown'),
+    };
+
+    return data;
+  }
+
+  _parseServiceDataForWoSensorTHPlus(buf, onlog) {
+    if (buf.length !== 6) {
+      if (onlog && typeof onlog === 'function') {
+        onlog(`[_parseServiceDataForWoSensorTHPlus] Buffer length ${buf.length} !== 6!`);
+      }
+      return null;
+    }
+    let byte2 = buf.readUInt8(2);
+    let byte3 = buf.readUInt8(3);
+    let byte4 = buf.readUInt8(4);
+    let byte5 = buf.readUInt8(5);
+
+    let temp_sign = (byte4 & 0b10000000) ? 1 : -1;
+    let temp_c = temp_sign * ((byte4 & 0b01111111) + (byte3 / 10));
+    let temp_f = (temp_c * 9 / 5) + 32;
+    temp_f = Math.round(temp_f * 10) / 10;
+
+    let data = {
+      model: 'i',
+      modelName: 'WoSensorTHPlus',
+      temperature: {
+        c: temp_c,
+        f: temp_f
+      },
+      fahrenheit: (byte5 & 0b10000000) ? true : false,
+      humidity: byte5 & 0b01111111,
+      battery: (byte2 & 0b01111111)
+    };
+
+    return data;
+  }
+
+  _parseServiceDataForWoLEDStripLight(buf, onlog) {
+    if (buf.length !== 6) {
+      if (onlog && typeof onlog === 'function') {
+        onlog(`[_parseServiceDataForWoLEDStripLight] Buffer length ${buf.length} !== 6!`);
+      }
+      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);
+
+    let data = {
+      model: 'r',
+      modelName: 'WoLEDStripLight',
+    };
+
+    return data;
+  }
 }
 
 module.exports = new SwitchbotAdvertising();

package/lib/switchbot.js

@@ -51,13 +51,18 @@ class Switchbot {
   *   - duration | Integer | Optional | Duration for discovery process (msec).
   *              |         |          | The value must be in the range of 1 to 60000.
   *              |         |          | The default value is 5000 (msec).
-  *   - model    | String  | Optional | "H", "T", "e", "s", "d", or "c".
+  *   - model    | String  | Optional | "H", "T", "e", "s", "d", "c", "u", "g", "o", "i", or "r".
   *              |         |          | If "H" is specified, this method will discover only Bots.
   *              |         |          | If "T" is specified, this method will discover only Meters.
   *              |         |          | If "e" is specified, this method will discover only Humidifiers.
   *              |         |          | If "s" is specified, this method will discover only Motion Sensors.
   *              |         |          | If "d" is specified, this method will discover only Contact Sensors.
   *              |         |          | If "c" is specified, this method will discover only Curtains.
+  *              |         |          | If "u" is specified, this method will discover only Color Bulbs.
+  *              |         |          | If "g" is specified, this method will discover only Plugs.
+  *              |         |          | If "o" is specified, this method will discover only Locks.
+  *              |         |          | If "i" is specified, this method will discover only Meter Pluses.
+  *              |         |          | If "r" is specified, this method will discover only Locks.
   *   - id       | String  | Optional | If this value is set, this method will discover
   *              |         |          | only a device whose ID is as same as this value.
   *              |         |          | The ID is identical to the MAC address.
@@ -79,7 +84,7 @@ class Switchbot {
       // Check the parameters
       let valid = parameterChecker.check(params, {
         duration: { required: false, type: 'integer', min: 1, max: 60000 },
-        model: { required: false, type: 'string', enum: ['H', 'T', 'e', 's', 'd', 'c'] },
+        model: { required: false, type: 'string', enum: ['H', 'T', 'e', 's', 'd', 'c', 'u', 'g', 'o', 'i', 'r'] },
         id: { required: false, type: 'string', min: 12, max: 17 },
         quick: { required: false, type: 'boolean' }
       }, false);
@@ -186,12 +191,12 @@ class Switchbot {
         case 'H':
           device = new SwitchbotDeviceWoHand(peripheral, this.noble);
           break;
-        case 'e':
-          device = new SwitchbotDeviceWoHumi(peripheral, this.noble);
-          break;
         case 'T':
           device = new SwitchbotDeviceWoSensorTH(peripheral, this.noble);
           break;
+        case 'e':
+          device = new SwitchbotDeviceWoHumi(peripheral, this.noble);
+          break;
         case 's':
           device = new SwitchbotDeviceWoPresence(peripheral, this.noble);
           break;
@@ -201,6 +206,21 @@ class Switchbot {
         case 'c':
           device = new SwitchbotDeviceWoCurtain(peripheral, this.noble);
           break;
+        case 'u':
+          device = new SwitchbotDeviceWoColorBulb(peripheral, this.noble);
+          break;
+        case 'g':
+          device = new SwitchbotDeviceWoPlugMini(peripheral, this.noble);
+          break;
+        case 'o':
+          device = new SwitchbotDeviceWoSmartLock(peripheral, this.noble);
+          break;
+        case 'i':
+          device = new SwitchbotDeviceWoSensorTHPlus(peripheral, this.noble);
+          break;
+        case 'r':
+          device = new SwitchbotDeviceWoLEDStripLight(peripheral, this.noble);
+          break;
         default: // 'resetting', 'unknown'
           device = new SwitchbotDevice(peripheral, this.noble);
       }
@@ -235,7 +255,7 @@ class Switchbot {
   *
   * [Arguments]
   *   - params   | Object  | Optional |
-  *   - model    | String  | Optional | "H", "T", "e", "s", "d", or "c".
+  *   - model    | String  | Optional | "H", "T", "e", "s", "d", "c", "u", "g", "o", "i", or "r".
   *              |         |          | If "H" is specified, the `onadvertisement`
   *              |         |          | event handler will be called only when advertising
   *              |         |          | packets comes from Bots.
@@ -254,6 +274,21 @@ class Switchbot {
   *              |         |          | If "c" is specified, the `onadvertisement`
   *              |         |          | event handler will be called only when advertising
   *              |         |          | packets comes from Curtains.
+  *              |         |          | If "u" is specified, the `onadvertisement`
+  *              |         |          | event handler will be called only when advertising
+  *              |         |          | packets comes from Color Bulb.
+  *              |         |          | If "g" is specified, the `onadvertisement`
+  *              |         |          | event handler will be called only when advertising
+  *              |         |          | packets comes from Plug Mini.
+  *              |         |          | If "o" is specified, the `onadvertisement`
+  *              |         |          | event handler will be called only when advertising
+  *              |         |          | packets comes from Smart Lock.
+  *              |         |          | If "i" is specified, the `onadvertisement`
+  *              |         |          | event handler will be called only when advertising
+  *              |         |          | packets comes from Meter Plus.
+  *              |         |          | If "r" is specified, the `onadvertisement`
+  *              |         |          | event handler will be called only when advertising
+  *              |         |          | packets comes from LED Strip Light.
   *   - id       | String  | Optional | If this value is set, the `onadvertisement`
   *              |         |          | event handler will be called only when advertising
   *              |         |          | packets comes from devices whose ID is as same as
@@ -270,7 +305,7 @@ class Switchbot {
     let promise = new Promise((resolve, reject) => {
       // Check the parameters
       let valid = parameterChecker.check(params, {
-        model: { required: false, type: 'string', enum: ['H', 'T', 'e', 's', 'd', 'c'] },
+        model: { required: false, type: 'string', enum: ['H', 'T', 'e', 's', 'd', 'c', 'u', 'g', 'o', 'i', 'r'] },
         id: { required: false, type: 'string', min: 12, max: 17 },
       }, false);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-switchbot",
-    "version": "1.1.3-beta.9",
+    "version": "1.2.1-beta.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": [
@@ -37,6 +37,6 @@
         "@abandonware/noble": "^1.9.2-15"
     },
     "devDependencies": {
-        "npm-check-updates": "^12.5.0"
+        "npm-check-updates": "^12.5.2"
     }
 }