node-switchbot 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/)
 
+## [Version 1.4.1](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.4.1) (2022-08-27)
+
+## What's Changed
+
+- Fix Plug Mini (US) implimentation
+- Housekeeping and update dependencies
+
+**Full Changelog**: https://github.com/OpenWonderLabs/node-switchbot/compare/v1.4.0...v1.4.1
+
 ## [Version 1.4.0](https://github.com/OpenWonderLabs/node-switchbot/releases/tag/v1.4.0) (2022-08-19)
 
 ## What's Changed

package/lib/switchbot-advertising.js

@@ -104,11 +104,11 @@ class SwitchbotAdvertising {
       // WoColorBulb
       sd = this._parseServiceDataForWoColorBulb(buf, onlog);
     } else if (model === "g") {
-      // WoPlugMini
-      sd = this._parseServiceDataForWoPlugMini(buf, onlog);
+      // WoPlugMini (US)
+      sd = this._parseServiceDataForWoPlugMiniUS(manufacturerData, onlog);
     } else if (model === "j") {
-      // WoPlugMini (JP) ??
-      sd = this._parseServiceDataForWoPlugMini(manufacturerData, onlog);
+      // WoPlugMini (JP)
+      sd = this._parseServiceDataForWoPlugMiniJP(manufacturerData, onlog);
     } else if (model === "o") {
       // WoSmartLock
       sd = this._parseServiceDataForWoSmartLock(buf, onlog);
@@ -386,11 +386,52 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoPlugMini(buf, onlog) {
+  _parseServiceDataForWoPlugMiniUS(buf, onlog) {
     if (buf.length !== 14) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoPlugMini] Buffer length ${buf.length} should be 14`
+          `[_parseServiceDataForWoPlugMiniUS] Buffer length ${buf.length} should be 14`
+        );
+      }
+      return null;
+    }
+    const byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
+    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
+
+    const state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    const delay = !!(byte10 & 0b00000001);
+    const timer = !!(byte10 & 0b00000010);
+    const syncUtcTime = !!(byte10 & 0b00000100);
+    const wifiRssi = byte11;
+    const overload = !!(byte12 & 0b10000000);
+    const currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    // TODO: voltage ???
+
+    const data = {
+      model: "g",
+      modelName: "WoPlugMini",
+      state: state,
+      delay: delay,
+      timer: timer,
+      syncUtcTime: syncUtcTime,
+      wifiRssi: wifiRssi,
+      overload: overload,
+      currentPower: currentPower,
+    };
+
+    return data;
+  }
+
+
+
+  _parseServiceDataForWoPlugMiniJP(buf, onlog) {
+    if (buf.length !== 14) {
+      if (onlog && typeof onlog === "function") {
+        onlog(
+          `[_parseServiceDataForWoPlugMiniJP] Buffer length ${buf.length} should be 14`
         );
       }
       return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.4.0",
+  "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": [
@@ -37,6 +37,6 @@
     "@abandonware/noble": "^1.9.2-15"
   },
   "devDependencies": {
-    "npm-check-updates": "^16.0.5"
+    "npm-check-updates": "^16.0.6"
   }
 }