@switchbot/homebridge-switchbot 1.7.1-beta.1 → 1.7.1-beta.10

package/CHANGELOG.md

@@ -2,17 +2,22 @@
 
 All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/)
 
-## [Beta - Version 1.7.1](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.7.1) (2022-01-00)
+## [Beta - Version 1.8.0](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.8.0) (2022-01-XX)
 
 ## What's Changed
 * Added option to display Bot a Stateful Programmable Switch.
     * This will only Works in 3rd Party Home App, Like [Eve](https://apps.apple.com/us/app/eve-for-homekit/id917695792) or [Home+ 5](https://apps.apple.com/us/app/home-5/id995994352)
 * Add option to Hide Motion Sensor's Light Sensor.
 * Add option to Set Motion Sensor's Light Sensor `set_minLux` and `set_maxLux`.
+* Fixed Bug: Where BLE config would show for devices that don't support BLE.
 * Fixed Bug: Contact Sensors's Motion Sensor and Light Sensor showing undefined values.
 * Fixed Bug: Motion Sensors's Light Sensor showing undefined values.
+* Fixed Bug: Battery Service wouldn't be removed from Curtain, Contact Sensor, or Motion Sensor when switching from BLE to OpenAPI.
+* Enhancments: Made some improvemnt on the switch from BLE to OpenAPI when BLE connection fails.
+* Enhancments: Made Optional Switchbot Device Settings and Optional IR Device Settings more managable by using Tabs.
+* Housekeeping and updated dependencies.
 
-**Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.7.0...v1.7.1
+**Full Changelog**: https://github.com/OpenWonderLabs/homebridge-switchbot/compare/v1.7.0...v1.8.0
 
 ## [Version 1.7.0](https://github.com/OpenWonderLabs/homebridge-switchbot/releases/tag/v1.7.0) (2022-01-05)
 

package/config.schema.json

@@ -11,8 +11,7 @@
       "name": {
         "type": "string",
         "title": "Name",
-        "default": "SwitchBot",
-        "required": true
+        "default": "SwitchBot"
       },
       "credentials": {
         "type": "object",
@@ -20,7 +19,6 @@
           "openToken": {
             "title": "Token",
             "type": "string",
-            "required": true,
             "x-schema-form": {
               "type": "password"
             }
@@ -28,10 +26,13 @@
           "notice": {
             "title": "Notice",
             "type": "string",
-            "required": true,
             "default": "Keep your token a secret!"
           }
-        }
+        },
+        "required": [
+          "openToken",
+          "notice"
+        ]
       },
       "options": {
         "type": "object",
@@ -52,7 +53,7 @@
                   "type": "string",
                   "placeholder": "SwitchBot",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && model.options.devices[arrayIndices].ble && !model.options.devices[arrayIndices].hide_device);"
+                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId);"
                   }
                 },
                 "hide_device": {
@@ -137,11 +138,11 @@
                   "title": "Enable Bluetooth Low Energy (BLE) Connection",
                   "type": "boolean",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device);"
+                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device && (model.options.devices[arrayIndices].configDeviceType === 'Humidifier' || model.options.devices[arrayIndices].configDeviceType === 'Meter' || model.options.devices[arrayIndices].configDeviceType === 'Curtain' || model.options.devices[arrayIndices].configDeviceType === 'Bot'));"
                   }
                 },
                 "scanDuration": {
-                  "title": "Scan Duration (Default is 1 Second)",
+                  "title": "BLE Scan Duration (Default is 1 Second)",
                   "type": "number",
                   "placeholder": 1,
                   "condition": {
@@ -455,7 +456,7 @@
                   "placeholder": 360,
                   "description": "Indicates the number of seconds between polls of SwitchBot API.",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device);"
+                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device && model.options.devices[arrayIndices].configDeviceType);"
                   }
                 },
                 "logging": {
@@ -482,11 +483,17 @@
                     }
                   ],
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device);"
+                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device && model.options.devices[arrayIndices].configDeviceType);"
                   }
                 }
-              }
-            }
+              },
+              "required": [
+                "deviceId",
+                "configDeviceType",
+                "configDeviceName"
+              ]
+            },
+            "uniqueItems": true
           },
           "irdevices": {
             "type": "array",
@@ -804,11 +811,16 @@
                     }
                   ],
                   "condition": {
-                    "functionBody": "return (model.options && model.options.irdevices && model.options.irdevices[arrayIndices].deviceId && !model.options.irdevices[arrayIndices].hide_device);"
+                    "functionBody": "return (model.options && model.options.irdevices && model.options.irdevices[arrayIndices].deviceId && !model.options.irdevices[arrayIndices].hide_device && model.options.irdevices[arrayIndices].configRemoteType);"
                   }
                 }
-              }
-            }
+              },
+              "required": [
+                "deviceId",
+                "configRemoteType"
+              ]
+            },
+            "uniqueItems": true
           },
           "refreshRate": {
             "title": "Refresh Rate",
@@ -849,7 +861,10 @@
           }
         }
       }
-    }
+    },
+    "required": [
+      "name"
+    ]
   },
   "layout": [
     {
@@ -862,28 +877,27 @@
       ]
     },
     {
-      "key": "options.devices",
-      "notitle": false,
-      "add": "Add Another Device",
       "type": "fieldset",
       "title": "Optional SwitchBot Device Settings",
       "expandable": true,
       "expanded": false,
-      "orderable": false,
-      "buttonText": "Add Device",
       "items": [
         {
-          "type": "div",
-          "displayFlex": true,
-          "flex-direction": "column",
+          "key": "options.devices",
+          "notitle": false,
+          "type": "tabarray",
+          "title": "{{ value.configDeviceName || value.deviceId || 'New SwitchBot Device' }}",
+          "expandable": true,
+          "expanded": false,
+          "orderable": false,
           "items": [
             "options.devices[].configDeviceName",
             "options.devices[].deviceId",
             "options.devices[].hide_device",
+            "options.devices[].configDeviceType",
             "options.devices[].offline",
             "options.devices[].ble",
             "options.devices[].scanDuration",
-            "options.devices[].configDeviceType",
             "options.devices[].bot.mode",
             "options.devices[].bot.deviceType",
             "options.devices[].bot.doublePress",
@@ -915,20 +929,19 @@
       ]
     },
     {
-      "key": "options.irdevices",
-      "notitle": false,
-      "add": "Add Another IR Device",
       "type": "fieldset",
       "title": "Optional IR Device Settings",
       "expandable": true,
       "expanded": false,
-      "orderable": false,
-      "buttonText": "Add IR Device",
       "items": [
         {
-          "type": "div",
-          "displayFlex": true,
-          "flex-direction": "column",
+          "key": "options.irdevices",
+          "notitle": false,
+          "type": "tabarray",
+          "title": "{{ value.configDeviceName || value.deviceId || 'New IR Device' }}",
+          "expandable": true,
+          "expanded": false,
+          "orderable": false,
           "items": [
             "options.irdevices[].deviceId",
             "options.irdevices[].hide_device",

package/dist/devices/bots.d.ts

@@ -1,7 +1,7 @@
 import { Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, serviceData, switchbot, deviceStatusResponse } from '../settings';
+import { device, devicesConfig, serviceData, switchbot, deviceStatusResponse, deviceStatus } from '../settings';
 /**
  * Platform Accessory
  * An instance of this class is created for each accessory your platform registers
@@ -26,9 +26,11 @@ export declare class Bot {
     OnCached: CharacteristicValue;
     BatteryLevel: CharacteristicValue;
     StatusLowBattery: CharacteristicValue;
+    power: deviceStatus['power'];
     deviceStatus: deviceStatusResponse;
     connected?: boolean;
     switchbot: switchbot;
+    SwitchToOpenAPI?: boolean;
     serviceData: serviceData;
     mode: serviceData['mode'];
     state: serviceData['state'];
@@ -41,6 +43,7 @@ export declare class Bot {
     botUpdateInProgress: boolean;
     doBotUpdate: Subject<void>;
     constructor(platform: SwitchBotPlatform, accessory: PlatformAccessory, device: device & devicesConfig);
+    config(device: device & devicesConfig): void;
     removeOutletService(accessory: PlatformAccessory): void;
     removeGarageDoorService(accessory: PlatformAccessory): void;
     removeDoorService(accessory: PlatformAccessory): void;
@@ -65,7 +68,6 @@ export declare class Bot {
      * Asks the SwitchBot API for the latest device information
      */
     refreshStatus(): Promise<void>;
-    connectBLE(): Promise<any>;
     private BLERefreshStatus;
     private openAPIRefreshStatus;
     /**

package/dist/devices/bots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bots.d.ts","sourceRoot":"","sources":["../../src/devices/bots.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bots.d.ts","sourceRoot":"","sources":["../../src/devices/bots.ts"],"names":[],"mappings":"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"}

package/dist/devices/bots.js

@@ -19,6 +19,7 @@ class Bot {
         this.scan();
         this.refreshRate();
         this.PressOrSwitch();
+        this.config(device);
         if (this.On === undefined) {
             this.On = false;
             this.accessory.context.On = this.On;
@@ -35,9 +36,6 @@ class Bot {
         }
         this.BatteryLevel = 100;
         this.StatusLowBattery = 0;
-        // Bot Config
-        this.debugLog(`Bot: ${this.accessory.displayName} Config: (ble: ${device.ble}, offline: ${device.offline}, mode: ${device.bot?.mode},`
-            + ` deviceType: ${device.bot?.deviceType}, doublePress: ${this.doublePress})`);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doBotUpdate = new rxjs_1.Subject();
         this.botUpdateInProgress = false;
@@ -254,12 +252,22 @@ class Bot {
             this.outletService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
             this.outletService.getCharacteristic(this.platform.Characteristic.On).onSet(this.handleOnSet.bind(this));
         }
-        if (device.ble) {
+        // Battery Service
+        if (!device.ble) {
+            this.debugLog(`Bot: ${accessory.displayName} Removing Battery Service`);
+            this.batteryService = this.accessory.getService(this.platform.Service.Battery);
+            accessory.removeService(this.batteryService);
+        }
+        else if (device.ble && !this.batteryService) {
+            this.debugLog(`Bot: ${accessory.displayName} Add Battery Service`);
             (this.batteryService =
-                accessory.getService(this.platform.Service.Battery) ||
-                    accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
+                this.accessory.getService(this.platform.Service.Battery) ||
+                    this.accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
             this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
         }
+        else {
+            this.debugLog(`Bot: ${accessory.displayName} Battery Service Not Added`);
+        }
         // Retrieve initial values and updateHomekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -296,6 +304,11 @@ class Bot {
             this.botUpdateInProgress = false;
         });
     }
+    config(device) {
+        if (device.bot !== undefined || device.ble !== undefined) {
+            this.warnLog(`Bot: ${this.accessory.displayName} Config: ${JSON.stringify(device.bot)}, BLE: ${device.ble}`);
+        }
+    }
     removeOutletService(accessory) {
         // If outletService still pressent, then remove first
         this.outletService = this.accessory.getService(this.platform.Service.Outlet);
@@ -379,13 +392,13 @@ class Bot {
     refreshRate() {
         if (this.device.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = this.device.refreshRate;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.deviceLogging === 'debug' || this.deviceLogging === 'standard') {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
             }
         }
         else if (this.platform.config.options.refreshRate) {
             this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.deviceLogging === 'debug') {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
             }
         }
@@ -393,13 +406,13 @@ class Bot {
     scan() {
         if (this.device.scanDuration) {
             this.scanDuration = this.accessory.context.scanDuration = this.device.scanDuration;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.device.ble && (this.deviceLogging === 'debug' || this.deviceLogging === 'standard')) {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
             }
         }
         else {
             this.scanDuration = this.accessory.context.scanDuration = 1;
-            if (this.platform.debugMode || (this.deviceLogging === 'debug')) {
+            if (this.device.ble && this.deviceLogging === 'debug') {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
             }
         }
@@ -447,11 +460,11 @@ class Bot {
      * Parse the device status from the SwitchBot api
      */
     async parseStatus() {
-        if (this.device.ble) {
-            await this.BLEparseStatus();
+        if (this.SwitchToOpenAPI || !this.device.ble) {
+            await this.openAPIparseStatus();
         }
         else {
-            await this.openAPIparseStatus();
+            await this.BLEparseStatus();
         }
     }
     async BLEparseStatus() {
@@ -484,6 +497,9 @@ class Bot {
         this.debugLog(`Bot: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
     }
     async openAPIparseStatus() {
+        if (this.device.ble) {
+            this.SwitchToOpenAPI = false;
+        }
         if (this.platform.config.credentials?.openToken) {
             this.debugLog(`Bot: ${this.accessory.displayName} OpenAPI parseStatus`);
             if (this.botMode === 'press') {
@@ -492,7 +508,7 @@ class Bot {
                 this.accessory.context.On = this.OnCached;
             }
             else {
-                /*if (this.deviceStatus.body.power === 'on') {
+                /*if (this.power === 'on') {
                   this.On = true;
                   this.OnCached = this.On;
                   this.accessory.context.On = this.OnCached;
@@ -521,34 +537,12 @@ class Bot {
             await this.openAPIRefreshStatus();
         }
     }
-    async connectBLE() {
-        let switchbot;
-        try {
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const Switchbot = require('node-switchbot');
-            switchbot = new Switchbot();
-            // Convert to BLE Address
-            this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
-            this.debugLog(`Bot: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        }
-        catch (e) {
-            switchbot = false;
-            this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot}`);
-            if (this.deviceLogging === 'debug') {
-                this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-                    + ` Error Message: ${JSON.stringify(e.message)}`);
-            }
-            if (this.platform.debugMode) {
-                this.errorLog(`Bot: ${this.accessory.displayName} 'node-switchbot' found: ${switchbot},`
-                    + ` Error: ${JSON.stringify(e)}`);
-            }
-        }
-        return switchbot;
-    }
     async BLERefreshStatus() {
         this.debugLog(`Bot: ${this.accessory.displayName} BLE refreshStatus`);
+        const switchbot = await this.platform.connectBLE();
         // Convert to BLE Address
-        const switchbot = await this.connectBLE();
+        this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
+        this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         // Start to monitor advertisement packets
         if (switchbot === false) {
             this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection: ${switchbot}`);
@@ -588,6 +582,7 @@ class Bot {
                 this.errorLog(`Bot: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
                 if (this.platform.config.credentials?.openToken) {
                     this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+                    this.SwitchToOpenAPI = true;
                     await this.openAPIRefreshStatus();
                 }
             }
@@ -603,6 +598,7 @@ class Bot {
             }
             if (this.platform.config.credentials?.openToken) {
                 this.warnLog(`Bot: ${this.accessory.displayName} Using OpenAPI Connection`);
+                this.SwitchToOpenAPI = true;
                 await this.openAPIRefreshStatus();
             }
             this.apiError(e);
@@ -614,6 +610,7 @@ class Bot {
             try {
                 this.deviceStatus = (await this.platform.axios.get(`${settings_1.DeviceURL}/${this.device.deviceId}/status`)).data;
                 this.debugLog(`Bot: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
+                this.power = this.deviceStatus.body.power;
                 this.parseStatus();
                 this.updateHomeKitCharacteristics();
             }
@@ -656,7 +653,10 @@ class Bot {
         this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges On: ${this.On} OnCached: ${this.OnCached}`);
         if (this.On !== this.OnCached) {
             this.debugLog(`Bot: ${this.accessory.displayName} BLE pushChanges`);
-            const switchbot = await this.connectBLE();
+            const switchbot = await this.platform.connectBLE();
+            // Convert to BLE Address
+            this.device.bleMac = ((this.device.deviceId.match(/.{1,2}/g)).join(':')).toLowerCase();
+            this.debugLog(`Curtain: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
             //if (switchbot !== false) {
             if (this.botMode === 'press') {
                 this.debugLog(`Bot: ${this.accessory.displayName} Bot Mode: ${this.botMode}`);