@switchbot/homebridge-switchbot 2.8.0 → 2.8.1-beta.0

package/.github/npm-version-script.js

@@ -0,0 +1,81 @@
+#!/bin/env node
+
+/**
+ * This scripts queries the npm registry to pull out the latest version for a given tag.
+ */
+
+const fs = require("fs");
+const semver = require("semver");
+const child_process = require("child_process");
+const assert = require("assert");
+
+const BRANCH_VERSION_PATTERN = /^([A-Za-z]*)-(\d+.\d+.\d+)$/
+
+// Load the contents of the package.json file
+const packageJSON = JSON.parse(fs.readFileSync("package.json", "utf8"));
+
+let refArgument = process.argv[2];
+let tagArgument = process.argv[3] || "latest";
+
+if (refArgument == null) {
+  console.error("ref argument is missing");
+  console.error("Usage: npm-version-script.js <ref> [tag]");
+  process.exit(1);
+}
+
+/**
+ * Queries the NPM registry for the latest version for the provided tag.
+ * @param tag The tag to query for.
+ * @returns {string} Returns the version.
+ */
+function getTagVersionFromNpm(tag) {
+  try {
+    return child_process.execSync(`npm info ${packageJSON.name} version --tag="${tag}"`).toString("utf8").trim();
+  } catch (e) {
+    throw e;
+  }
+}
+
+function desiredTargetVersion(ref) {
+  // ref is a GitHub action ref string
+  if (ref.startsWith("refs/pull/")) {
+    throw Error("The version script was executed inside a PR!");
+  }
+
+  assert(ref.startsWith("refs/heads/"))
+  let branchName = ref.slice("refs/heads/".length);
+
+  let results = branchName.match(BRANCH_VERSION_PATTERN);
+  if (results != null) {
+    if (results[1] !== tagArgument) {
+      console.warn(`The base branch name (${results[1]}) differs from the tag name ${tagArgument}`);
+    }
+
+    return results[2];
+  }
+
+  // legacy mode were we use the `betaVersion` property in the package.json
+  if (branchName === "beta" && packageJSON.betaVersion) {
+    return packageJSON.betaVersion
+  }
+
+  throw new Error("Malformed branch name for ref: " + ref + ". Can't derive the base version. Use a branch name like: beta-x.x.x!");
+}
+
+// derive the base version from the branch ref
+const baseVersion = desiredTargetVersion(refArgument);
+
+// query the npm registry for the latest version of the provided tag name
+const latestReleasedVersion = getTagVersionFromNpm(tagArgument); // e.g. 0.7.0-beta.12
+const latestReleaseBase = semver.inc(latestReleasedVersion, "patch"); // will produce 0.7.0 (removing the preid, needed for the equality check below)
+
+let publishTag;
+if (semver.eq(baseVersion, latestReleaseBase)) { // check if we are releasing another version for the latest beta
+  publishTag = latestReleasedVersion; // set the current latest beta to be incremented
+} else {
+  publishTag = baseVersion; // start of with a new beta version
+}
+
+// save the package.json
+packageJSON.version = publishTag;
+fs.writeFileSync("package.json", JSON.stringify(packageJSON, null, 2));

package/dist/device/blindtilt.d.ts

@@ -5,7 +5,7 @@ import { MqttClient } from 'mqtt';
 import { Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, serviceData, switchbot, deviceStatus, ad } from '../settings';
+import { device, devicesConfig, serviceData, deviceStatus } from '../settings';
 declare enum BlindTiltMappingMode {
     OnlyUp = "only_up",
     OnlyDown = "only_down",
@@ -17,36 +17,34 @@ export declare class BlindTilt {
     private readonly platform;
     private accessory;
     device: device & devicesConfig;
-    windowCoveringService: Service;
+    batteryService: Service;
     lightSensorService?: Service;
-    batteryService?: Service;
-    CurrentPosition: CharacteristicValue;
+    windowCoveringService: Service;
+    BatteryLevel: CharacteristicValue;
     PositionState: CharacteristicValue;
     TargetPosition: CharacteristicValue;
+    CurrentPosition: CharacteristicValue;
+    StatusLowBattery: CharacteristicValue;
     CurrentAmbientLightLevel?: CharacteristicValue;
-    BatteryLevel?: CharacteristicValue;
-    StatusLowBattery?: CharacteristicValue;
-    CurrentHorizontalTiltAngle: CharacteristicValue;
     TargetHorizontalTiltAngle: CharacteristicValue;
-    Version: deviceStatus['version'];
-    deviceStatus: any;
-    slidePosition: deviceStatus['slidePosition'];
-    direction: deviceStatus['direction'];
-    moving: deviceStatus['moving'];
-    brightness: deviceStatus['brightness'];
-    setPositionMode?: string | number;
+    CurrentHorizontalTiltAngle: CharacteristicValue;
+    OpenAPI_InMotion: deviceStatus['moving'];
+    OpenAPI_BatteryLevel: serviceData['battery'];
+    OpenAPI_Direction: deviceStatus['direction'];
+    OpenAPI_Calibration: serviceData['calibration'];
+    OpenAPI_CurrentPosition: serviceData['position'];
+    OpenAPI_FirmwareRevision: deviceStatus['version'];
+    OpenAPI_CurrentAmbientLightLevel: deviceStatus['brightness'];
     Mode: string;
+    setPositionMode?: string | number;
     mappingMode: BlindTiltMappingMode;
-    connected?: boolean;
-    switchbot: switchbot;
-    serviceData: serviceData;
+    BLE_InMotion: serviceData['inMotion'];
+    BLE_BatteryLevel: serviceData['battery'];
+    BLE_Calibration: serviceData['calibration'];
+    BLE_CurrentPosition: serviceData['position'];
+    BLE_CurrentAmbientLightLevel: serviceData['lightLevel'];
+    BLE_IsConnected?: boolean;
     spaceBetweenLevels: number;
-    address: ad['address'];
-    calibration: serviceData['calibration'];
-    battery: serviceData['battery'];
-    position: serviceData['position'];
-    inMotion: serviceData['inMotion'];
-    lightLevel: serviceData['lightLevel'];
     setNewTarget: boolean;
     setNewTargetTimer: NodeJS.Timeout;
     mqttClient: MqttClient | null;

package/dist/device/blindtilt.d.ts.map

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

package/dist/device/blindtilt.js

@@ -112,22 +112,11 @@ class BlindTilt {
         })
             .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
         // Battery Service
-        if (!this.BLE) {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Battery Service`);
-            this.batteryService = this.accessory.getService(this.platform.Service.Battery);
-            accessory.removeService(this.batteryService);
-        }
-        else if (this.BLE && !this.batteryService) {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Battery Service`);
-            (this.batteryService = 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`);
-            if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
-                this.batteryService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
-            }
-        }
-        else {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Battery Service Not Added`);
+        (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
+            `${accessory.displayName} Battery`;
+        this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
+        if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+            this.batteryService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
         }
         // Update Homekit
         this.updateHomeKitCharacteristics();
@@ -186,13 +175,13 @@ class BlindTilt {
     async BLEparseStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // CurrentPosition
-        this.CurrentPosition = 100 - Number(this.position);
+        this.CurrentPosition = 100 - Number(this.BLE_CurrentPosition);
         await this.setMinMax();
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition ${this.CurrentPosition}`);
         if (this.setNewTarget) {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Checking Status ...`);
         }
-        if (this.setNewTarget && this.inMotion) {
+        if (this.setNewTarget && this.BLE_InMotion) {
             await this.setMinMax();
             if (Number(this.TargetPosition) > this.CurrentPosition) {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
@@ -226,54 +215,54 @@ class BlindTilt {
             this.set_maxLux = this.maxLux();
             this.spaceBetweenLevels = 9;
             // Brightness
-            switch (this.lightLevel) {
+            switch (this.BLE_CurrentAmbientLightLevel) {
                 case 1:
                     this.CurrentAmbientLightLevel = this.set_minLux;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 2:
                     this.CurrentAmbientLightLevel = (this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
                         ` Calculation: ${(this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels}`);
                     break;
                 case 3:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 2;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 4:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 3;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 5:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 4;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 6:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 5;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 7:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 6;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 8:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 7;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 9:
                     this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 8;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
                     break;
                 case 10:
                 default:
                     this.CurrentAmbientLightLevel = this.set_maxLux;
                     this.debugLog();
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
                 ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
         // Battery
-        this.BatteryLevel = Number(this.battery);
+        this.BatteryLevel = Number(this.BLE_BatteryLevel);
         if (this.BatteryLevel < 10) {
             this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
@@ -284,8 +273,8 @@ class BlindTilt {
     }
     async openAPIparseStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
-        const [homekitPosition, homekitTiltAngle] = this.mapDeviceValuesToHomekitValues(Number(this.slidePosition), String(this.direction));
-        this.debugLog(` device: ${this.slidePosition} => HK: ${homekitPosition}`);
+        const [homekitPosition, homekitTiltAngle] = this.mapDeviceValuesToHomekitValues(Number(this.OpenAPI_CurrentPosition), String(this.OpenAPI_Direction));
+        this.debugLog(` device: ${this.OpenAPI_CurrentPosition} => HK: ${homekitPosition}`);
         this.CurrentPosition = homekitPosition;
         // CurrentPosition
         await this.setMinMax();
@@ -297,7 +286,7 @@ class BlindTilt {
         if (this.setNewTarget) {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Checking Status ...`);
         }
-        if (this.setNewTarget && this.moving) {
+        if (this.setNewTarget && this.OpenAPI_InMotion) {
             await this.setMinMax();
             if (this.TargetPosition > this.CurrentPosition || (homekitTiltAngle && this.TargetHorizontalTiltAngle !== this.CurrentHorizontalTiltAngle)) {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
@@ -333,7 +322,7 @@ class BlindTilt {
             this.set_minLux = this.minLux();
             this.set_maxLux = this.maxLux();
             // Brightness
-            switch (this.brightness) {
+            switch (this.OpenAPI_CurrentAmbientLightLevel) {
                 case 'dim':
                     this.CurrentAmbientLightLevel = this.set_minLux;
                     break;
@@ -380,27 +369,25 @@ class BlindTilt {
                 .then(async () => {
                 // Set an event hander
                 switchbot.onadvertisement = async (ad) => {
-                    this.address = ad.address;
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-                        ` BLE Address Found: ${this.address}`);
-                    this.serviceData = ad.serviceData;
-                    this.calibration = ad.serviceData.calibration;
-                    this.battery = ad.serviceData.battery;
-                    this.inMotion = ad.serviceData.inMotion;
-                    this.position = ad.serviceData.position;
-                    this.lightLevel = ad.serviceData.lightLevel;
+                        ` BLE Address Found: ${ad.address}`);
+                    this.BLE_Calibration = ad.serviceData.calibration;
+                    this.BLE_BatteryLevel = ad.serviceData.battery;
+                    this.BLE_InMotion = ad.serviceData.inMotion;
+                    this.BLE_CurrentPosition = ad.serviceData.position;
+                    this.BLE_CurrentAmbientLightLevel = ad.serviceData.lightLevel;
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} calibration: ${ad.serviceData.calibration}, ` +
                         `position: ${ad.serviceData.position}, lightLevel: ${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}, ` +
                         `inMotion: ${ad.serviceData.inMotion}`);
-                    if (this.serviceData) {
-                        this.connected = true;
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+                    if (ad.serviceData) {
+                        this.BLE_IsConnected = true;
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
                         await this.stopScanning(switchbot);
                     }
                     else {
-                        this.connected = false;
-                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+                        this.BLE_IsConnected = false;
+                        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
                     }
                 };
                 // Wait
@@ -432,10 +419,12 @@ class BlindTilt {
             this.statusCode(statusCode);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(deviceStatus)}`);
-            this.slidePosition = deviceStatus.body.slidePosition;
-            this.direction = deviceStatus.body.direction;
-            this.moving = deviceStatus.body.moving;
-            this.brightness = deviceStatus.body.brightness;
+            this.OpenAPI_CurrentPosition = deviceStatus.body.slidePosition;
+            this.OpenAPI_Direction = deviceStatus.body.direction;
+            this.OpenAPI_InMotion = deviceStatus.body.moving;
+            this.OpenAPI_CurrentAmbientLightLevel = deviceStatus.body.brightness;
+            this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
+            this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
             this.openAPIparseStatus();
             this.updateHomeKitCharacteristics();
         }
@@ -715,29 +704,38 @@ class BlindTilt {
                     ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
             }
         }
-        if (this.BLE) {
-            if (this.BatteryLevel === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
-            }
-            else {
-                if (this.device.mqttURL) {
-                    this.mqttPublish('BatteryLevel', this.BatteryLevel);
-                }
-                this.accessory.context.BatteryLevel = this.BatteryLevel;
-                this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
-            }
-            if (this.StatusLowBattery === undefined) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+        if (this.BatteryLevel === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+        }
+        else {
+            if (this.device.mqttURL) {
+                this.mqttPublish('BatteryLevel', this.BatteryLevel);
             }
-            else {
-                if (this.device.mqttURL) {
-                    this.mqttPublish('StatusLowBattery', this.StatusLowBattery);
-                }
-                this.accessory.context.StatusLowBattery = this.StatusLowBattery;
-                this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+            this.accessory.context.BatteryLevel = this.BatteryLevel;
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+        }
+        if (this.StatusLowBattery === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+        }
+        else {
+            if (this.device.mqttURL) {
+                this.mqttPublish('StatusLowBattery', this.StatusLowBattery);
             }
+            this.accessory.context.StatusLowBattery = this.StatusLowBattery;
+            this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+        }
+        // FirmwareRevision
+        if (this.OpenAPI_FirmwareRevision === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} FirmwareRevision: ${this.OpenAPI_FirmwareRevision}`);
+        }
+        else {
+            this.accessory.context.OpenAPI_FirmwareRevision = this.OpenAPI_FirmwareRevision;
+            this.accessory.getService(this.platform.Service.AccessoryInformation)
+                .updateCharacteristic(this.platform.Characteristic.FirmwareRevision, this.OpenAPI_FirmwareRevision);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                + `updateCharacteristic CurrentTemperature: ${this.OpenAPI_FirmwareRevision}`);
         }
     }
     /*
@@ -773,7 +771,7 @@ class BlindTilt {
     }
     async stopScanning(switchbot) {
         await switchbot.stopScan();
-        if (this.connected) {
+        if (this.BLE_IsConnected) {
             await this.BLEparseStatus();
             await this.updateHomeKitCharacteristics();
         }