@switchbot/homebridge-switchbot 0.2.0-alpha.2 → 1.0.1-beta.2

package/dist/devices/curtains.d.ts

@@ -1,46 +1,34 @@
 /// <reference types="node" />
-import { PlatformAccessory, CharacteristicValue, MacAddress } from 'homebridge';
+import { PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { SwitchBotPlatform } from '../platform';
-import { device, devicesConfig } from '../settings';
+import { Subject } from 'rxjs';
+import { device, devicesConfig, serviceData, switchbot, deviceStatusResponse } from '../settings';
 export declare class Curtain {
     private readonly platform;
     private accessory;
     device: device & devicesConfig;
     private service;
     private lightSensorService;
+    private batteryService?;
     CurrentPosition: CharacteristicValue;
     PositionState: CharacteristicValue;
     TargetPosition: CharacteristicValue;
     CurrentAmbientLightLevel: CharacteristicValue;
-    deviceStatus: any;
-    moveTimer: NodeJS.Timeout;
-    ScanIntervalId: NodeJS.Timeout;
-    setNewTargetTimer: NodeJS.Timeout;
-    AutoDisableFastScanTimeoutId: NodeJS.Timeout;
+    BatteryLevel?: CharacteristicValue;
+    StatusLowBattery?: CharacteristicValue;
+    deviceStatus: deviceStatusResponse;
     setNewTarget: boolean;
-    moveTime: number;
-    ScanDuration: any;
-    ReverseDir: any;
-    FastScanEnabled: boolean;
-    FastScanInterval: number;
-    SlowScanInterval: number;
-    OpenCloseThreshold: any;
-    PreviousPosition: any;
-    Position: any;
-    FastScanDuration: number | undefined;
+    setNewTargetTimer: NodeJS.Timeout;
+    switchbot: switchbot;
+    serviceData: serviceData;
+    calibration: serviceData['calibration'];
+    battery: serviceData['battery'];
+    position: serviceData['position'];
+    lightLevel: serviceData['lightLevel'];
     set_minStep: number;
     refreshRate: number;
-    switchbot: {
-        discover: (arg0: {
-            duration: any;
-            model: string;
-            quick: boolean;
-            id: MacAddress;
-        }) => Promise<any>;
-        wait: (arg0: number) => any;
-    };
     curtainUpdateInProgress: boolean;
-    doCurtainUpdate: any;
+    doCurtainUpdate: Subject<void>;
     constructor(platform: SwitchBotPlatform, accessory: PlatformAccessory, device: device & devicesConfig);
     private curtainRefreshRate;
     private minStep;
@@ -48,7 +36,8 @@ export declare class Curtain {
     private BLEparseStatus;
     private openAPIparseStatus;
     refreshStatus(): Promise<void>;
-    private BLErefreshStatus;
+    private connectBLE;
+    private BLERefreshStatus;
     private openAPIRefreshStatus;
     pushChanges(): Promise<void>;
     private BLEpushChanges;
@@ -60,29 +49,6 @@ export declare class Curtain {
      * Handle requests to set the value of the "Target Position" characteristic
      */
     TargetPositionSet(value: CharacteristicValue): void;
-    /**
-     * Convert to/from device/HomeKit's position, since:
-     *
-     * - opened is 0% in HomeKit and 100% in Curtain device.
-     * - closed is 100% in HomeKit, 0% in Curtain device.
-     */
-    convertFromHomeKitPosition(n: number): number;
-    /**
-     * Ask the device to start moving to the given position (which must be a device value and not an HomeKit value).
-     * Returns a Promise that's resolved as soon as the command was sent to the device.
-     */
-    runToPosition(pos: number): Promise<void>;
-    /**
-     * Start a faster scan loop (using fastScanInterval). Used in calls to `runToPosition` to
-     * report quicker on device position change. Will disable on its own as soon if the curtain's
-     * device position does not change for more than `fastScanDuration`.
-     */
-    private startFastScan;
-    private stopFastScan;
-    private get scanInterval();
-    private startScanLoop;
-    private scan;
-    private applyPosition;
     setMinMax(): void;
 }
 //# sourceMappingURL=curtains.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"curtains.d.ts","sourceRoot":"","sources":["../../src/devices/curtains.ts"],"names":[],"mappings":";AACA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,EAAa,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D,qBAAa,OAAO;IAkDhB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACV,MAAM,EAAE,MAAM,GAAG,aAAa;IAlDvC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,kBAAkB,CAAU;IAGpC,eAAe,EAAG,mBAAmB,CAAC;IACtC,aAAa,EAAG,mBAAmB,CAAC;IACpC,cAAc,EAAG,mBAAmB,CAAC;IACrC,wBAAwB,EAAG,mBAAmB,CAAC;IAG/C,YAAY,EAAG,GAAG,CAAC;IACnB,SAAS,EAAG,MAAM,CAAC,OAAO,CAAC;IAC3B,cAAc,EAAG,MAAM,CAAC,OAAO,CAAC;IAChC,iBAAiB,EAAG,MAAM,CAAC,OAAO,CAAC;IACnC,4BAA4B,EAAG,MAAM,CAAC,OAAO,CAAC;IAC9C,YAAY,EAAG,OAAO,CAAC;IACvB,QAAQ,EAAG,MAAM,CAAC;IAClB,YAAY,EAAE,GAAG,CAAC;IAClB,UAAU,EAAE,GAAG,CAAC;IAChB,eAAe,EAAG,OAAO,CAAC;IAC1B,gBAAgB,EAAG,MAAM,CAAC;IAC1B,gBAAgB,EAAG,MAAM,CAAC;IAC1B,kBAAkB,EAAE,GAAG,CAAC;IACxB,gBAAgB,EAAE,GAAG,CAAC;IACtB,QAAQ,EAAE,GAAG,CAAC;IACd,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,WAAW,EAAG,MAAM,CAAC;IACrB,WAAW,EAAG,MAAM,CAAC;IACrB,SAAS,EAAG;QACV,QAAQ,EAAE,CACR,IAAI,EACF;YACE,QAAQ,EAAE,GAAG,CAAC;YACd,KAAK,EAAE,MAAM,CAAC;YACd,KAAK,EAAE,OAAO,CAAC;YACf,EAAE,EAAE,UAAU,CAAC;SAChB,KACA,OAAO,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,EAAE,CACJ,IAAI,EAAE,MAAM,KACT,GAAG,CAAC;KACV,CAAC;IAGF,uBAAuB,EAAG,OAAO,CAAC;IAClC,eAAe,MAAC;gBAGG,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,GAAG,aAAa;IAqIvC,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,OAAO;IAST,WAAW;YAUH,cAAc;YAId,kBAAkB;IA2C1B,aAAa;YAUL,gBAAgB;YAkDhB,oBAAoB;IAc5B,WAAW;YAUH,cAAc;YAId,kBAAkB;IA8BhC,4BAA4B;IAoCrB,QAAQ,CAAC,CAAC,EAAE,GAAG;IAOtB,OAAO,CAAC,UAAU;IA4BlB;;OAEG;IACH,iBAAiB,CAAC,KAAK,EAAE,mBAAmB;IA6E5C;;;;;OAKG;IACH,0BAA0B,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IAU7C;;;OAGG;IACU,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BtD;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,YAAY;IAQpB,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,IAAI;IAqBZ,OAAO,CAAC,aAAa;IAyBd,SAAS;CAYjB"}
+{"version":3,"file":"curtains.d.ts","sourceRoot":"","sources":["../../src/devices/curtains.ts"],"names":[],"mappings":";AACA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAY,OAAO,EAAE,MAAM,MAAM,CAAC;AAEzC,OAAO,EAAa,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAG7G,qBAAa,OAAO;IAoChB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,SAAS;IACV,MAAM,EAAE,MAAM,GAAG,aAAa;IApCvC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,kBAAkB,CAAU;IACpC,OAAO,CAAC,cAAc,CAAC,CAAU;IAGjC,eAAe,EAAG,mBAAmB,CAAC;IACtC,aAAa,EAAG,mBAAmB,CAAC;IACpC,cAAc,EAAG,mBAAmB,CAAC;IACrC,wBAAwB,EAAG,mBAAmB,CAAC;IAC/C,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,gBAAgB,CAAC,EAAE,mBAAmB,CAAC;IAGvC,YAAY,EAAG,oBAAoB,CAAC;IACpC,YAAY,EAAG,OAAO,CAAC;IACvB,iBAAiB,EAAG,MAAM,CAAC,OAAO,CAAC;IAGnC,SAAS,EAAG,SAAS,CAAC;IACtB,WAAW,EAAG,WAAW,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IACxC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,QAAQ,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAClC,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;IAGtC,WAAW,EAAG,MAAM,CAAC;IACrB,WAAW,EAAG,MAAM,CAAC;IAGrB,uBAAuB,EAAG,OAAO,CAAC;IAClC,eAAe,EAAG,OAAO,CAAC,IAAI,CAAC,CAAC;gBAGb,QAAQ,EAAE,iBAAiB,EACpC,SAAS,EAAE,iBAAiB,EAC7B,MAAM,EAAE,MAAM,GAAG,aAAa;IA+HvC,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,OAAO;IAST,WAAW;YAUH,cAAc;YA0Ed,kBAAkB;IA4C1B,aAAa;IAUnB,OAAO,CAAC,UAAU;YAWJ,gBAAgB;YAkChB,oBAAoB;IAc5B,WAAW;YAUH,cAAc;YAad,kBAAkB;IA6BhC,4BAA4B;IAiDrB,QAAQ,CAAC,CAAC,EAAE,GAAG;IAWtB,OAAO,CAAC,UAAU;IA4BlB;;OAEG;IACH,iBAAiB,CAAC,KAAK,EAAE,mBAAmB;IAgCrC,SAAS;CAYjB"}

package/dist/devices/curtains.js

@@ -9,12 +9,14 @@ class Curtain {
         this.platform = platform;
         this.accessory = accessory;
         this.device = device;
+        // Curtain Config
+        this.platform.device(`[Curtain Config] ble: ${device.ble}, disable_group: ${device.curtain?.disable_group},`
+            + ` refreshRate: ${device.curtain?.refreshRate}, set_max: ${device.curtain?.set_max}, set_min: ${device.curtain?.set_min},`
+            + ` set_minStep: ${device.curtain?.set_minStep}`);
         // default placeholders
-        this.setMinMax();
         this.CurrentPosition = 0;
         this.TargetPosition = 0;
         this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-        this.ScanDuration = this.platform.config.options.refreshRate;
         // BLE Connection
         if (device.ble) {
             // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -61,7 +63,7 @@ class Curtain {
             validValueRanges: [0, 100],
         })
             .onGet(() => {
-            return Number.isNaN(this.CurrentPosition);
+            return this.CurrentPosition;
         });
         this.service
             .getCharacteristic(this.platform.Characteristic.TargetPosition)
@@ -75,15 +77,6 @@ class Curtain {
             accessory.getService(this.platform.Service.LightSensor) ||
                 accessory.addService(this.platform.Service.LightSensor)), `${device.deviceName} Light Sensor`;
         this.lightSensorService.setCharacteristic(this.platform.Characteristic.Name, `${device.deviceName} Light Sensor`);
-        // handle on / off events using the On characteristic
-        this.lightSensorService.getCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel).onGet(() => {
-            if (this.CurrentAmbientLightLevel === 'bright') {
-                return 100000;
-            }
-            else {
-                return 0.0001;
-            }
-        });
         // Update Homekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -153,9 +146,81 @@ class Curtain {
     }
     async BLEparseStatus() {
         this.platform.device('Curtains BLE Device parseStatus');
+        this.CurrentPosition = 100 - Number(this.position);
+        this.setMinMax();
+        this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition - Device is Currently: ${this.CurrentPosition}`);
+        if (this.setNewTarget) {
+            this.platform.log.info(`Checking ${this.accessory.displayName} Status ...`);
+        }
+        if (this.setNewTarget) {
+            if (this.TargetPosition > this.CurrentPosition) {
+                this.platform.debug(`Curtain ${this.accessory.displayName} - Current position: ${this.CurrentPosition} closing`);
+                this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
+            }
+            else if (this.TargetPosition < this.CurrentPosition) {
+                this.platform.debug(`Curtain ${this.accessory.displayName} - Current position: ${this.CurrentPosition} opening`);
+                this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
+            }
+            else {
+                this.platform.debug(`Curtain ${this.CurrentPosition} - standby`);
+                this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+            }
+        }
+        else {
+            this.platform.debug(`Curtain ${this.accessory.displayName} - Current position: ${this.CurrentPosition} standby`);
+            if (!this.setNewTarget) {
+                /*If Curtain calibration distance is short, there will be an error between the current percentage and the target percentage.*/
+                this.TargetPosition = this.CurrentPosition;
+                this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+            }
+        }
+        // Brightness
+        switch (this.lightLevel) {
+            case 1:
+                this.CurrentAmbientLightLevel = 0.0001;
+                break;
+            case 2:
+                this.CurrentAmbientLightLevel = 100;
+                break;
+            case 3:
+                this.CurrentAmbientLightLevel = 200;
+                break;
+            case 4:
+                this.CurrentAmbientLightLevel = 4000;
+                break;
+            case 5:
+                this.CurrentAmbientLightLevel = 12000;
+                break;
+            case 6:
+                this.CurrentAmbientLightLevel = 28000;
+                break;
+            case 7:
+                this.CurrentAmbientLightLevel = 56000;
+                break;
+            case 8:
+                this.CurrentAmbientLightLevel = 75000;
+                break;
+            case 9:
+                this.CurrentAmbientLightLevel = 90000;
+                break;
+            case 10:
+            default:
+                this.CurrentAmbientLightLevel = 100000;
+        }
+        // Battery
+        this.BatteryLevel = Number(this.battery);
+        if (this.BatteryLevel < 10) {
+            this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        }
+        else {
+            this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+        }
+        this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},`
+            + ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`
+            + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
     }
     async openAPIparseStatus() {
-        this.setMinMax();
+        this.platform.device('Curtains OpenAPI Device parseStatus');
         this.CurrentPosition = 100 - this.deviceStatus.body.slidePosition;
         this.setMinMax();
         this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition - Device is Currently: ${this.CurrentPosition}`);
@@ -189,77 +254,72 @@ class Curtain {
             case 'dim':
                 this.CurrentAmbientLightLevel = 0.0001;
                 break;
+            case 'bright':
             default:
                 this.CurrentAmbientLightLevel = 100000;
         }
-        this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}
-      , TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState}
-      , CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+        this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},`
+            + ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`
+            + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
     }
     async refreshStatus() {
         if (this.device.ble) {
             this.platform.device('BLE');
-            await this.BLErefreshStatus();
+            await this.BLERefreshStatus();
         }
         else {
             this.platform.device('OpenAPI');
             await this.openAPIRefreshStatus();
         }
     }
-    async BLErefreshStatus() {
-        this.platform.debug('Curtains BLE Device RefreshStatus');
+    connectBLE() {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const Switchbot = require('node-switchbot');
         const switchbot = new Switchbot();
         const colon = this.device.deviceId.match(/.{1,2}/g);
         const bleMac = colon.join(':'); //returns 1A:23:B4:56:78:9A;
         this.device.bleMac = bleMac.toLowerCase();
-        this.platform.debug(this.device.bleMac);
-        switchbot.onadvertisement = (ad) => {
-            this.platform.debug(JSON.stringify(ad, null, '  '));
-            this.platform.device(`ad: ${JSON.stringify(ad)}`);
-        };
-        this.parseStatus();
-        this.updateHomeKitCharacteristics();
-        switchbot
-            .startScan({
+        this.platform.device(this.device.bleMac);
+        return switchbot;
+    }
+    async BLERefreshStatus() {
+        this.platform.debug('Curtains BLE Device RefreshStatus');
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const switchbot = this.connectBLE();
+        // Start to monitor advertisement packets
+        switchbot.startScan({
+            model: 'c',
             id: this.device.bleMac,
-        })
-            .then(() => {
-            return switchbot.wait(this.platform.config.options.refreshRate * 1000);
-        })
-            .then(() => {
+        }).then(() => {
+            // Set an event hander
+            switchbot.onadvertisement = (ad) => {
+                this.serviceData = ad.serviceData;
+                this.platform.device(`${this.device.bleMac}: ${JSON.stringify(ad.serviceData)}`);
+                this.calibration = ad.serviceData.calibration;
+                this.battery = ad.serviceData.battery;
+                this.position = ad.serviceData.position;
+                this.lightLevel = ad.serviceData.lightLevel;
+                this.platform.device(`${this.accessory.displayName}, Calibration: ${ad.serviceData.calibration}, Position: ${ad.serviceData.position},`
+                    + ` Light Level: ${ad.serviceData.lightLevel}, Battery: ${ad.serviceData.battery}`);
+            };
+            // Wait 10 seconds
+            return switchbot.wait(10000);
+        }).then(() => {
+            // Stop to monitor
             switchbot.stopScan();
-        })
-            .catch(async (error) => {
-            this.platform.log.error(error);
+            this.parseStatus();
+            this.updateHomeKitCharacteristics();
+        }).catch(async (e) => {
+            this.platform.log.error(`BLE Connection Failed: ${e.message}`);
+            this.platform.log.warn('Using OpenAPI Connection');
             await this.openAPIRefreshStatus();
         });
-        setInterval(() => {
-            this.platform.log.info('Start scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
-            switchbot
-                .startScan({
-                mode: 'T',
-                id: bleMac,
-            })
-                .then(() => {
-                return switchbot.wait(this.platform.config.options.refreshRate * 1000);
-            })
-                .then(() => {
-                switchbot.stopScan();
-                this.platform.log.info('Stop scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
-            })
-                .catch(async (error) => {
-                this.platform.log.error(error);
-                await this.openAPIRefreshStatus();
-            });
-        }, this.platform.config.options.refreshRate * 60000);
     }
     async openAPIRefreshStatus() {
+        this.platform.debug('Curtains OpenAPI Device RefreshStatus');
         try {
             this.deviceStatus = (await this.platform.axios.get(`${settings_1.DeviceURL}/${this.device.deviceId}/status`)).data;
             this.platform.debug(`Curtain ${this.accessory.displayName} refreshStatus: ${JSON.stringify(this.deviceStatus)}`);
-            this.setMinMax();
             this.parseStatus();
             this.updateHomeKitCharacteristics();
         }
@@ -281,6 +341,15 @@ class Curtain {
     }
     async BLEpushChanges() {
         this.platform.device('Curtains BLE Device pushChanges');
+        const switchbot = this.connectBLE();
+        switchbot.discover({ model: 'c', quick: true, id: this.device.bleMac }).then((device_list) => {
+            this.platform.log.info(`${this.accessory.displayName}, Target Position: ${this.TargetPosition}`);
+            return device_list[0].runToPos(100 - Number(this.TargetPosition));
+        }).then(() => {
+            this.platform.device('Done.');
+        }).catch((e) => {
+            this.platform.log.error(`BLE pushChanges Error Message: ${e.message}`);
+        });
     }
     async OpenAPIpushChanges() {
         if (this.TargetPosition !== this.CurrentPosition) {
@@ -294,7 +363,6 @@ class Curtain {
             this.platform.log.info('Sending request for', this.accessory.displayName, 'to SwitchBot API. command:', payload.command, 'parameter:', payload.parameter, 'commandType:', payload.commandType);
             this.platform.debug(`Curtain ${this.accessory.displayName} pushchanges: ${JSON.stringify(payload)}`);
             // Make the API request
-            this.platform.log.error(this.device.deviceId);
             const push = (await this.platform.axios.post(`${settings_1.DeviceURL}/${this.device.deviceId}/commands`, payload));
             this.platform.debug(`Curtain ${this.accessory.displayName} Changes pushed: ${JSON.stringify(push.data)}`);
             this.statusCode(push);
@@ -302,12 +370,11 @@ class Curtain {
     }
     updateHomeKitCharacteristics() {
         this.platform.debug(`Curtain ${this.accessory.displayName} updateHomeKitCharacteristics - ${JSON.stringify({
-            CurrentPosition: Number.isNaN(this.CurrentPosition),
+            CurrentPosition: this.CurrentPosition,
             PositionState: this.PositionState,
-            TargetPosition: Number.isNaN(this.TargetPosition),
+            TargetPosition: this.TargetPosition,
             CurrentAmbientLightLevel: this.CurrentAmbientLightLevel,
         })}`);
-        this.setMinMax();
         if (this.CurrentPosition === undefined) {
             this.platform.debug(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
         }
@@ -336,12 +403,32 @@ class Curtain {
             this.lightSensorService.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
             this.platform.device(`Curtain ${this.accessory.displayName} updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
         }
+        if (this.device.ble) {
+            if (this.BatteryLevel === undefined) {
+                this.platform.debug(`Curtain ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+            }
+            else {
+                this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
+                this.platform.device(`Curtain ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+            }
+            if (this.StatusLowBattery === undefined) {
+                this.platform.debug(`Curtain ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+            }
+            else {
+                this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
+                this.platform.device(`Curtain ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+            }
+        }
     }
     apiError(e) {
         this.service.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
         this.service.updateCharacteristic(this.platform.Characteristic.PositionState, e);
         this.service.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
         this.lightSensorService.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
+        if (this.device.ble) {
+            this.batteryService.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
+            this.batteryService.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
+        }
     }
     statusCode(push) {
         switch (push.data.statusCode) {
@@ -374,199 +461,34 @@ class Curtain {
      * Handle requests to set the value of the "Target Position" characteristic
      */
     TargetPositionSet(value) {
-        if (this.device.ble) {
-            this.TargetPosition = value;
-            this.platform.log.info('Target position of Curtain setting: ' + this.TargetPosition + '%');
-            clearTimeout(this.moveTimer);
-            if (this.TargetPosition > this.CurrentPosition) {
-                this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
-            }
-            else if (this.TargetPosition < this.CurrentPosition) {
-                this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
-            }
-            else {
-                this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-            }
-            if (this.PositionState === this.platform.Characteristic.PositionState.STOPPED) {
-                this.service?.getCharacteristic(this.platform.Characteristic.TargetPosition).updateValue(this.TargetPosition);
-                this.service?.getCharacteristic(this.platform.Characteristic.CurrentPosition).updateValue(this.CurrentPosition);
-                this.service?.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-            }
-            else {
-                this.runToPosition(this.convertFromHomeKitPosition(this.TargetPosition))
-                    .then(() => {
-                    this.platform.log.info('Done.');
-                    this.platform.log.info('Target position of Curtain has been set to: ' + this.TargetPosition + '%');
-                    this.moveTimer = setTimeout(() => {
-                        // log.info("setTimeout", this.positionState.toString(), this.currentPosition.toString(), this.targetPosition.toString());
-                        this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-                        // this.curtainService?.getCharacteristic(hap.Characteristic.TargetPosition).updateValue(this.targetPosition);
-                        this.service?.getCharacteristic(this.platform.Characteristic.CurrentPosition).updateValue(this.CurrentPosition);
-                        this.service?.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                    }, this.moveTime);
-                })
-                    .catch((error) => {
-                    this.platform.log.error(error);
-                    this.moveTimer = setTimeout(() => {
-                        this.TargetPosition = this.CurrentPosition;
-                        this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-                        this.service?.getCharacteristic(this.platform.Characteristic.TargetPosition).updateValue(this.TargetPosition);
-                        // this.curtainService?.getCharacteristic(hap.Characteristic.CurrentPosition).updateValue(this.currentPosition);
-                        this.service?.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
-                    }, 1000);
-                    this.platform.log.info('Target position of Curtain failed to be set to: ' + this.TargetPosition + '%');
-                });
-            }
-        }
-        else {
-            this.platform.debug(`Curtain ${this.accessory.displayName} - Set TargetPosition: ${value}`);
-            this.TargetPosition = value;
-            if (value > this.CurrentPosition) {
-                this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
-                this.setNewTarget = true;
-                this.setMinMax();
-            }
-            else if (value < this.CurrentPosition) {
-                this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
-                this.setNewTarget = true;
-                this.setMinMax();
-            }
-            else {
-                this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
-                this.setNewTarget = false;
-                this.setMinMax();
-            }
-            this.service.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
-            /**
-           * If Curtain movement time is short, the moving flag from backend is always false.
-           * The minimum time depends on the network control latency.
-           */
-            clearTimeout(this.setNewTargetTimer);
-            if (this.setNewTarget) {
-                this.setNewTargetTimer = setTimeout(() => {
-                    this.platform.debug(`Curtain ${this.accessory.displayName} - setNewTarget ${this.setNewTarget} timeout`);
-                    this.setNewTarget = false;
-                }, 10000);
-            }
-            this.doCurtainUpdate.next();
+        this.platform.debug(`Curtain ${this.accessory.displayName} - Set TargetPosition: ${value}`);
+        this.TargetPosition = value;
+        this.setMinMax();
+        if (value > this.CurrentPosition) {
+            this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
+            this.setNewTarget = true;
         }
-    }
-    /**
-     * Convert to/from device/HomeKit's position, since:
-     *
-     * - opened is 0% in HomeKit and 100% in Curtain device.
-     * - closed is 100% in HomeKit, 0% in Curtain device.
-     */
-    convertFromHomeKitPosition(n) {
-        let covertToDevicePosition;
-        if (this.ReverseDir) {
-            covertToDevicePosition = n;
+        else if (value < this.CurrentPosition) {
+            this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
+            this.setNewTarget = true;
         }
         else {
-            covertToDevicePosition = 100 - n;
-        }
-        return covertToDevicePosition;
-    }
-    /**
-     * Ask the device to start moving to the given position (which must be a device value and not an HomeKit value).
-     * Returns a Promise that's resolved as soon as the command was sent to the device.
-     */
-    async runToPosition(pos) {
-        const SwitchBot = require('node-switchbot');
-        const switchbot = new SwitchBot();
-        return switchbot
-            .discover({ duration: this.ScanDuration, model: 'c', quick: false })
-            .then((device_list) => {
-            let targetDevice = null;
-            for (const device of device_list) {
-                this.platform.log.info(device.modelName, device.address);
-                if (device.address === this.device.bleMac.toLowerCase()) {
-                    targetDevice = device;
-                    break;
-                }
-            }
-            if (!targetDevice) {
-                return new Promise((resolve, reject) => {
-                    reject(new Error('Curtain \'' + this.device.deviceName + '\' (' + this.device.bleMac.toLowerCase() + '): device not found.'));
-                });
-            }
-            this.startFastScan();
-            this.platform.log.info(`Curtain ${this.device.deviceName} (${this.device.bleMac.toLowerCase()}) is moving to ${pos}...`);
-            return targetDevice.runToPos(pos);
-        });
-    }
-    /**
-     * Start a faster scan loop (using fastScanInterval). Used in calls to `runToPosition` to
-     * report quicker on device position change. Will disable on its own as soon if the curtain's
-     * device position does not change for more than `fastScanDuration`.
-     */
-    startFastScan() {
-        if (this.FastScanEnabled) {
-            return;
+            this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
+            this.setNewTarget = false;
         }
-        this.FastScanEnabled = true;
-        this.startScanLoop();
-    }
-    stopFastScan() {
-        if (!this.FastScanEnabled) {
-            return;
-        }
-        this.FastScanEnabled = false;
-        this.startScanLoop();
-    }
-    get scanInterval() {
-        return this.FastScanEnabled ? this.FastScanInterval : this.SlowScanInterval;
-    }
-    startScanLoop() {
-        if (this.ScanIntervalId !== null) {
-            clearInterval(this.ScanIntervalId);
-        }
-        this.platform.log.info(`Curtain ${this.device.deviceName}: starting scan loop with interval ${this.scanInterval}`);
-        this.ScanIntervalId = setInterval(() => {
-            this.scan().catch((err) => {
-                this.platform.log.error(`error while scanning for Curtain ${this.device.deviceName}: ${err}`);
-            });
-        }, this.scanInterval);
-    }
-    scan() {
-        return new Promise((resolve, reject) => {
-            const SwitchBot = require('node-switchbot');
-            const switchbot = new SwitchBot();
-            switchbot.onadvertisement = (ad) => {
-                this.applyPosition(ad);
-            };
-            switchbot.startScan({ id: this.device.bleMac.toLowerCase() })
-                .then(() => {
-                return switchbot.wait(this.ScanDuration);
-            })
-                .then(() => {
-                resolve();
-                switchbot.stopScan();
-            })
-                .catch((err) => {
-                reject(err);
-            });
-        });
-    }
-    applyPosition(ad) {
-        let pos = ad.serviceData.position;
-        if (pos + this.OpenCloseThreshold >= 100) {
-            pos = 100;
-        }
-        else if (pos - this.OpenCloseThreshold <= 0) {
-            pos = 0;
-        }
-        if (pos === this.PreviousPosition) {
-            return;
-        }
-        this.PreviousPosition = this.Position;
-        this.Position = pos;
-        if (this.AutoDisableFastScanTimeoutId !== null) {
-            clearTimeout(this.AutoDisableFastScanTimeoutId);
+        this.service.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
+        /**
+       * If Curtain movement time is short, the moving flag from backend is always false.
+       * The minimum time depends on the network control latency.
+       */
+        clearTimeout(this.setNewTargetTimer);
+        if (this.setNewTarget) {
+            this.setNewTargetTimer = setTimeout(() => {
+                this.platform.debug(`Curtain ${this.accessory.displayName} - setNewTarget ${this.setNewTarget} timeout`);
+                this.setNewTarget = false;
+            }, 10000);
         }
-        this.AutoDisableFastScanTimeoutId = setTimeout(() => {
-            this.stopFastScan();
-        }, this.FastScanDuration);
+        this.doCurtainUpdate.next();
     }
     setMinMax() {
         if (this.device.curtain?.set_min) {