@switchbot/homebridge-switchbot 3.5.0 → 3.5.1-beta.1

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

@@ -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.cjs <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/config.schema.json

@@ -275,7 +275,7 @@
                   ],
                   "description": "Bluetooth (BLE) API is only available for the following Device Types: Humidifier, Meter, MeterPlus, Curtain, Bot, Motion Sensor, Contact Sensor, Plug Mini (US), Plug Mini (JP), & Color Bulb",
                   "condition": {
-                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device && model.options.devices[arrayIndices].configDeviceType !== 'Hub 2');"
+                    "functionBody": "return (model.options && model.options.devices && model.options.devices[arrayIndices].deviceId && !model.options.devices[arrayIndices].hide_device);"
                   }
                 },
                 "webhook": {
@@ -1887,15 +1887,15 @@
         {
           "key": "options.refreshRate",
           "description": "<em class='primary-text'>Specifies the interval, in seconds, for retrieving the latest device status from the SwitchBot API.</em>"
-          },
+        },
         {
           "key": "options.updateRate",
           "description": "<em class='primary-text'>Specifies the interval, in seconds, at which devices will request updates from the SwitchBot API while in motion, for Curtain(s) and Blind Tilt(s) only.</em>"
-          },
+        },
         {
           "key": "options.pushRate",
           "description": "<em class='primary-text'>Specifies the interval, in seconds, between pushes to the SwitchBot API.</em>"
-          },
+        },
         "options.logging"
       ]
     }

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

@@ -1 +1 @@
-{"version":3,"file":"blindtilt.d.ts","sourceRoot":"","sources":["../../src/device/blindtilt.ts"],"names":[],"mappings":";AAMA,OAAO,EAAY,OAAO,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGvF,qBAAa,SAAU,SAAQ,UAAU;IAsCrC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB;IApCtC,OAAO,CAAC,cAAc,CAQpB;IAEF,OAAO,CAAC,OAAO,CAMb;IAEF,OAAO,CAAC,WAAW,CAAC,CAIlB;IAGF,WAAW,EAAE,oBAAoB,CAA+B;IAGhE,YAAY,EAAG,OAAO,CAAC;IACvB,iBAAiB,EAAG,MAAM,CAAC,OAAO,CAAC;IAGnC,yBAAyB,EAAG,OAAO,CAAC;IACpC,iBAAiB,EAAG,OAAO,CAAC,IAAI,CAAC,CAAC;gBAGvB,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM,GAAG,aAAa;IAyKhC;;OAEG;IACG,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA6G7D;;OAEG;IACG,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA4G7D,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAc9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCjC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBrC,eAAe,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa;IA2B5E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB5B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C/B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmEzC;;OAEG;IACG,4BAA4B,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB7E;;OAEG;IACG,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAc5D,8BAA8B,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC/C,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IA0G7C,iBAAiB;IAOjB,oBAAoB,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IASnD,cAAc;;;;IA6Bd,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAerC;;;;;;OAMG;IACH,8BAA8B,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;IAgD5H;;;;;;OAMG;IACH,8BAA8B,CAAC,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAyDpG"}
+{"version":3,"file":"blindtilt.d.ts","sourceRoot":"","sources":["../../src/device/blindtilt.ts"],"names":[],"mappings":";AAIA,OAAO,EAAY,OAAO,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGvF,qBAAa,SAAU,SAAQ,UAAU;IAsCrC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB;IApCtC,OAAO,CAAC,cAAc,CAQpB;IAEF,OAAO,CAAC,OAAO,CAMb;IAEF,OAAO,CAAC,WAAW,CAAC,CAIlB;IAGF,WAAW,EAAE,oBAAoB,CAA+B;IAGhE,YAAY,EAAG,OAAO,CAAC;IACvB,iBAAiB,EAAG,MAAM,CAAC,OAAO,CAAC;IAGnC,yBAAyB,EAAG,OAAO,CAAC;IACpC,iBAAiB,EAAG,OAAO,CAAC,IAAI,CAAC,CAAC;gBAGvB,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM,GAAG,aAAa;IAyKhC;;OAEG;IACG,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA4G7D;;OAEG;IACG,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA4G7D,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAc9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBjC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBrC,eAAe,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa;IA2B5E,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC/B,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DzC;;OAEG;IACG,4BAA4B,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7E;;OAEG;IACG,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,8BAA8B,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC/C,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IAiC7C,iBAAiB;IAOjB,oBAAoB,CAAC,SAAS,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IASnD,cAAc;;;;IA6Bd,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAerC;;;;;;OAMG;IACH,8BAA8B,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;IAiD5H;;;;;;OAMG;IACH,8BAA8B,CAAC,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAyDpG"}

package/dist/device/blindtilt.js

@@ -2,8 +2,6 @@
  *
  * blindtilt.ts: @switchbot/homebridge-switchbot.
  */
-import { request } from 'undici';
-import { Devices } from '../settings.js';
 import { interval, Subject } from 'rxjs';
 import { deviceBase } from './device.js';
 import { BlindTiltMappingMode } from '../utils.js';
@@ -218,13 +216,13 @@ export class BlindTilt extends deviceBase {
         }
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition},`
             + ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
-        if (!this.device.blindTilt?.hide_lightsensor) {
-            const set_minLux = this.device.blindTilt?.set_minLux ?? 1;
-            const set_maxLux = this.device.blindTilt?.set_maxLux ?? 6001;
-            const spaceBetweenLevels = 9;
+        if (!this.device.blindTilt?.hide_lightsensor && this.LightSensor?.Service) {
             if (this.LightSensor?.CurrentAmbientLightLevel === 0) {
                 this.LightSensor.CurrentAmbientLightLevel = 0.0001;
             }
+            const set_minLux = this.device.blindTilt?.set_minLux ?? 1;
+            const set_maxLux = this.device.blindTilt?.set_maxLux ?? 6001;
+            const spaceBetweenLevels = 9;
             // Brightness
             switch (serviceData.lightLevel) {
                 case 1:
@@ -408,64 +406,46 @@ export class BlindTilt extends deviceBase {
     }
     async BLERefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLERefreshStatus`);
-        const switchbot = await this.platform.connectBLE();
-        // Convert to BLE Address
-        this.device.bleMac = this.device
-            .deviceId.match(/.{1,2}/g)
-            .join(':')
-            .toLowerCase();
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-        this.getCustomBLEAddress(switchbot);
-        // Start to monitor advertisement packets
-        (async () => {
+        const switchbot = await this.switchbotBLE();
+        if (switchbot === undefined) {
+            await this.BLERefreshConnection(switchbot);
+        }
+        else {
             // Start to monitor advertisement packets
-            await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
-            // Set an event handler
-            switchbot.onadvertisement = (ad) => {
-                if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+            (async () => {
+                // Start to monitor advertisement packets
+                const serviceData = await this.monitorAdvertisementPackets(switchbot);
+                // Update HomeKit
+                if (serviceData.model !== '' && serviceData.modelName !== '') {
+                    await this.BLEparseStatus(serviceData);
+                    await this.updateHomeKitCharacteristics();
                 }
                 else {
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
+                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed to get serviceData, serviceData: ${serviceData}`);
+                    await this.BLERefreshConnection(switchbot);
                 }
-            };
-            // Wait 10 seconds
-            await switchbot.wait(this.scanDuration * 1000);
-            // Stop to monitor
-            await switchbot.stopScan();
-            // Update HomeKit
-            await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
-            await this.updateHomeKitCharacteristics();
-        })();
-        if (switchbot === undefined) {
-            await this.BLERefreshConnection(switchbot);
+            })();
         }
     }
     async openAPIRefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
-            const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
+            const { body, statusCode } = await this.deviceRefreshStatus();
             const deviceStatus = await body.json();
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
+            await this.refreshStatusCodes(statusCode, deviceStatus);
+            ;
             if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-                this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
-                    + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-                this.openAPIparseStatus(deviceStatus);
-                this.updateHomeKitCharacteristics();
+                await this.successfulRefreshStatus(statusCode, deviceStatus);
+                await this.openAPIparseStatus(deviceStatus);
+                await this.updateHomeKitCharacteristics();
             }
             else {
-                this.statusCode(statusCode);
-                this.statusCode(deviceStatus.statusCode);
+                await this.statusCodes(statusCode, deviceStatus);
             }
         }
         catch (e) {
-            this.apiError(e);
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
-                + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
+            await this.apiError(e);
+            await this.openAPIRefreshError(e);
         }
     }
     async registerWebhook(accessory, device) {
@@ -485,7 +465,7 @@ export class BlindTilt extends deviceBase {
                     if (!device.blindTilt?.hide_lightsensor) {
                         this.LightSensor.CurrentAmbientLightLevel = lightLevel;
                     }
-                    this.updateHomeKitCharacteristics();
+                    await this.updateHomeKitCharacteristics();
                 }
                 catch (e) {
                     this.errorLog(`${device.deviceType}: ${accessory.displayName} failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
@@ -508,8 +488,7 @@ export class BlindTilt extends deviceBase {
         }
         else {
             await this.offlineOff();
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
-                + ` ${this.device.connectionType}, pushChanges will not happen.`);
+            await this.pushChangeDisabled();
         }
         // Refresh the status from the API
         interval(15000)
@@ -524,16 +503,12 @@ export class BlindTilt extends deviceBase {
         if (this.WindowCovering.TargetPosition !== this.WindowCovering.CurrentPosition) {
             const switchbot = await this.platform.connectBLE();
             // Convert to BLE Address
-            this.device.bleMac = this.device
-                .deviceId.match(/.{1,2}/g)
-                .join(':')
-                .toLowerCase();
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+            await this.convertBLEAddress();
             const { setPositionMode, Mode } = await this.setPerformance();
             this.debugLog(`${this.accessory.displayName} Mode: ${Mode}`);
             if (switchbot !== false) {
                 switchbot
-                    .discover({ model: 'c', quick: true, id: this.device.bleMac })
+                    .discover({ model: this.device.bleModel, quick: true, id: this.device.bleMac })
                     .then(async (device_list) => {
                     this.infoLog(`${this.accessory.displayName} Target Position: ${this.WindowCovering.TargetPosition}`);
                     return await this.retryBLE({
@@ -549,14 +524,13 @@ export class BlindTilt extends deviceBase {
                         + `Target Position: ${this.WindowCovering.TargetPosition} sent over BLE,  sent successfully`);
                 })
                     .catch(async (e) => {
-                    this.apiError(e);
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
-                        + ` Connection, Error Message: ${JSON.stringify(e.message)}`);
+                    await this.apiError(e);
+                    await this.failedBLEChanges(e);
                     await this.BLEPushConnection();
                 });
             }
             else {
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection`);
+                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection,`);
                 await this.BLEPushConnection();
             }
         }
@@ -600,25 +574,16 @@ export class BlindTilt extends deviceBase {
             }
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
             try {
-                const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/commands`, {
-                    body: bodyChange,
-                    method: 'POST',
-                    headers: this.platform.generateHeaders(),
-                });
-                this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
+                const { body, statusCode } = await this.pushChangeRequest(bodyChange);
                 const deviceStatus = await body.json();
-                this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
-                this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
-                this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
+                await this.pushStatusCodes(statusCode, deviceStatus);
                 if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-                    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
-                        + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-                    this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
-                        + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
+                    await this.successfulPushChange(statusCode, deviceStatus, bodyChange);
+                    await this.updateHomeKitCharacteristics();
                 }
                 else {
-                    this.statusCode(statusCode);
-                    this.statusCode(deviceStatus.statusCode);
+                    await this.statusCode(statusCode);
+                    await this.statusCode(deviceStatus.statusCode);
                 }
             }
             catch (e) {
@@ -638,34 +603,30 @@ export class BlindTilt extends deviceBase {
      * Handle requests to set the value of the "Target Horizontal Tilt" characteristic
      */
     async TargetHorizontalTiltAngleSet(value) {
-        if (this.WindowCovering.TargetHorizontalTiltAngle === this.accessory.context.TargetHorizontalTiltAngle) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set TargetHorizontalTiltAngle: ${value}`);
+        if (this.WindowCovering.TargetHorizontalTiltAngle !== this.accessory.context.TargetHorizontalTiltAngle) {
+            await this.changeSet(value, 'TargetHorizontalTiltAngle');
         }
         else {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHorizontalTiltAngle: ${value}`);
+            await this.noChangeSet(value, 'TargetHorizontalTiltAngle');
         }
         //value = value < 0 ? -90 : 90;
         this.WindowCovering.TargetHorizontalTiltAngle = value;
-        if (this.device.mqttURL) {
-            this.mqttPublish('TargetHorizontalTiltAngle', this.WindowCovering.TargetHorizontalTiltAngle.toString());
-        }
-        this.startUpdatingBlindTiltIfNeeded();
+        await this.mqtt('TargetHorizontalTiltAngle', this.WindowCovering.TargetHorizontalTiltAngle);
+        await this.startUpdatingBlindTiltIfNeeded();
     }
     /**
      * Handle requests to set the value of the "Target Position" characteristic
      */
     async TargetPositionSet(value) {
-        if (this.WindowCovering.TargetPosition === this.accessory.context.TargetPosition) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set TargetPosition: ${value}`);
+        if (this.WindowCovering.TargetPosition !== this.accessory.context.TargetPosition) {
+            await this.changeSet(value, 'TargetPosition');
         }
         else {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
+            await this.noChangeSet(value, 'TargetPosition');
         }
         this.WindowCovering.TargetPosition = value;
-        if (this.device.mqttURL) {
-            this.mqttPublish('TargetPosition', this.WindowCovering.TargetPosition.toString());
-        }
-        this.startUpdatingBlindTiltIfNeeded();
+        await this.mqtt('TargetPosition', this.WindowCovering.TargetPosition);
+        await this.startUpdatingBlindTiltIfNeeded();
     }
     async startUpdatingBlindTiltIfNeeded() {
         await this.setMinMax();
@@ -709,112 +670,25 @@ export class BlindTilt extends deviceBase {
         await this.setMinMax();
         // CurrentHorizontalTiltAngle
         if (this.mappingMode === BlindTiltMappingMode.UseTiltForDirection) {
-            if (this.WindowCovering.CurrentHorizontalTiltAngle === undefined || Number.isNaN(this.WindowCovering.CurrentHorizontalTiltAngle)) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-                    + ` CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
-            }
-            else {
-                if (this.device.mqttURL) {
-                    this.mqttPublish('CurrentHorizontalTiltAngle', this.WindowCovering.CurrentHorizontalTiltAngle.toString());
-                }
-                this.accessory.context.CurrentHorizontalTiltAngle = this.WindowCovering.CurrentHorizontalTiltAngle;
-                this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentHorizontalTiltAngle, Number(this.WindowCovering.CurrentHorizontalTiltAngle));
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} 
-        updateCharacteristic CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
-            }
+            await this.updateCharacteristic(this.WindowCovering.Service, this.hap.Characteristic.CurrentHorizontalTiltAngle, this.WindowCovering.CurrentHorizontalTiltAngle, 'CurrentHorizontalTiltAngle');
         }
         // CurrentPosition
-        if (this.WindowCovering.CurrentPosition === undefined || Number.isNaN(this.WindowCovering.CurrentPosition)) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
-        }
-        else {
-            if (this.device.mqttURL) {
-                this.mqttPublish('CurrentPosition', this.WindowCovering.CurrentPosition.toString());
-            }
-            this.accessory.context.CurrentPosition = this.WindowCovering.CurrentPosition;
-            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, Number(this.WindowCovering.CurrentPosition));
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-                + ` updateCharacteristic CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
-        }
+        await this.updateCharacteristic(this.WindowCovering.Service, this.hap.Characteristic.CurrentPosition, this.WindowCovering.CurrentPosition, 'CurrentPosition');
         // PositionState
-        if (this.WindowCovering.PositionState === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} PositionState: ${this.WindowCovering.PositionState}`);
-        }
-        else {
-            if (this.device.mqttURL) {
-                this.mqttPublish('PositionState', this.WindowCovering.PositionState.toString());
-            }
-            this.accessory.context.PositionState = this.WindowCovering.PositionState;
-            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, Number(this.WindowCovering.PositionState));
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-                + ` PositionState: ${this.WindowCovering.PositionState}`);
-        }
+        await this.updateCharacteristic(this.WindowCovering.Service, this.hap.Characteristic.PositionState, this.WindowCovering.PositionState, 'PositionState');
         // TargetPosition
-        if (this.WindowCovering.TargetPosition === undefined || Number.isNaN(this.WindowCovering.TargetPosition)) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${this.WindowCovering.TargetPosition}`);
-        }
-        else {
-            if (this.device.mqttURL) {
-                this.mqttPublish('TargetPosition', this.WindowCovering.TargetPosition.toString());
-            }
-            this.accessory.context.TargetPosition = this.WindowCovering.TargetPosition;
-            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, Number(this.WindowCovering.TargetPosition));
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-                + ` TargetPosition: ${this.WindowCovering.TargetPosition}`);
-        }
+        await this.updateCharacteristic(this.WindowCovering.Service, this.hap.Characteristic.TargetPosition, this.WindowCovering.TargetPosition, 'TargetPosition');
         // CurrentAmbientLightLevel
-        if (!this.device.blindTilt?.hide_lightsensor) {
-            if (this.LightSensor.CurrentAmbientLightLevel === undefined || Number.isNaN(this.LightSensor.CurrentAmbientLightLevel)) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-                    + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
-            }
-            else {
-                if (this.device.mqttURL) {
-                    this.mqttPublish('CurrentAmbientLightLevel', this.LightSensor.CurrentAmbientLightLevel.toString());
-                }
-                this.accessory.context.CurrentAmbientLightLevel = this.LightSensor.CurrentAmbientLightLevel;
-                this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, this.LightSensor.CurrentAmbientLightLevel);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-                    + ` updateCharacteristic CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
-            }
+        if (!this.device.blindTilt?.hide_lightsensor && this.LightSensor?.Service) {
+            const history = { time: Math.round(new Date().valueOf() / 1000), lux: this.LightSensor.CurrentAmbientLightLevel };
+            await this.updateCharacteristic(this.LightSensor?.Service, this.hap.Characteristic.CurrentAmbientLightLevel, this.LightSensor?.CurrentAmbientLightLevel, 'CurrentAmbientLightLevel', history);
         }
         // BatteryLevel
-        if (this.Battery.BatteryLevel === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
-        }
-        else {
-            if (this.device.mqttURL) {
-                this.mqttPublish('BatteryLevel', this.Battery.BatteryLevel.toString());
-            }
-            this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
-            this.Battery?.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
-        }
+        await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel, 'BatteryLevel');
         // StatusLowBattery
-        if (this.Battery.StatusLowBattery === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
-        }
-        else {
-            if (this.device.mqttURL) {
-                this.mqttPublish('StatusLowBattery', this.Battery.StatusLowBattery.toString());
-            }
-            this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
-            this.Battery?.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-                + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
-        }
-        if (this.Battery.ChargingState === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ChargingState: ${this.Battery.ChargingState}`);
-        }
-        else {
-            if (this.device.mqttURL) {
-                this.mqttPublish('ChargingState', this.Battery.ChargingState.toString());
-            }
-            this.accessory.context.ChargingState = this.Battery.ChargingState;
-            this.Battery.Service.updateCharacteristic(this.hap.Characteristic.ChargingState, this.Battery.ChargingState);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-                + ` ChargingState: ${this.Battery.ChargingState}`);
-        }
+        await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery, 'StatusLowBattery');
+        // ChargingState
+        await this.updateCharacteristic(this.Battery.Service, this.hap.Characteristic.ChargingState, this.Battery.ChargingState, 'ChargingState');
     }
     async BLEPushConnection() {
         if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
@@ -914,7 +788,8 @@ export class BlindTilt extends deviceBase {
         // device position 100 => closed up
         // homekit position 0 =>  closed
         // homekit position 100 => open
-        deviceDirection;
+        const direction = deviceDirection === 'up' ? 'up' : 'down';
+        this.debugLog(`Mapping device values to homekit values, devicePostion: ${devicePosition}, deviceDirection: ${direction}`);
         switch (this.mappingMode) {
             case BlindTiltMappingMode.OnlyUp:
                 // we only close upwards, so we see anything that is tilted downwards(<50) as open