@switchbot/homebridge-switchbot 3.7.1-beta.2 → 3.7.1-beta.21

package/dist/device/curtain.js

@@ -1,20 +1,22 @@
-/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * curtain.ts: @switchbot/homebridge-switchbot.
- */
-import { hostname } from 'os';
-import { deviceBase } from './device.js';
+import { hostname } from 'node:os';
+/*
+* For Testing Locally:
+* import { SwitchBotBLEModel, SwitchBotBLEModelName } from '/Users/Shared/GitHub/OpenWonderLabs/node-switchbot/dist/index.js';
+*/
 import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot';
-import { Subject, debounceTime, interval, skipWhile, take, tap } from 'rxjs';
+import { debounceTime, interval, skipWhile, Subject, take, tap } from 'rxjs';
+import { deviceBase } from './device.js';
 export class Curtain extends deviceBase {
     platform;
     // Services
     WindowCovering;
     Battery;
     LightSensor;
+    OpenModeSwitch;
+    CloseModeSwitch;
     // OpenAPI
     deviceStatus;
-    //Webhook
+    // Webhook
     webhookContext;
     // BLE
     serviceData;
@@ -22,6 +24,7 @@ export class Curtain extends deviceBase {
     setNewTarget;
     setNewTargetTimer;
     // Updates
+    curtainMoving;
     curtainUpdateInProgress;
     doCurtainUpdate;
     constructor(platform, accessory, device) {
@@ -31,6 +34,7 @@ export class Curtain extends deviceBase {
         accessory.category = 14 /* this.hap.Categories.WINDOW_COVERING */;
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doCurtainUpdate = new Subject();
+        this.curtainMoving = false;
         this.curtainUpdateInProgress = false;
         this.setNewTarget = false;
         // Initialize WindowCovering Service
@@ -45,45 +49,31 @@ export class Curtain extends deviceBase {
         };
         accessory.context.WindowCovering = this.WindowCovering;
         // Initialize WindowCovering Service
-        this.WindowCovering.Service.
-            setCharacteristic(this.hap.Characteristic.Name, this.WindowCovering.Name)
-            .setCharacteristic(this.hap.Characteristic.ObstructionDetected, false)
-            .getCharacteristic(this.hap.Characteristic.PositionState)
-            .onGet(() => {
+        this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.Name, this.WindowCovering.Name).setCharacteristic(this.hap.Characteristic.ObstructionDetected, false).getCharacteristic(this.hap.Characteristic.PositionState).onGet(() => {
             return this.WindowCovering.PositionState;
         });
         // Initialize WindowCovering CurrentPosition
-        this.WindowCovering.Service
-            .getCharacteristic(this.hap.Characteristic.CurrentPosition)
-            .setProps({
+        this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.CurrentPosition).setProps({
             minStep: device.curtain?.set_minStep ?? 1,
             minValue: 0,
             maxValue: 100,
             validValueRanges: [0, 100],
-        })
-            .onGet(() => {
+        }).onGet(() => {
             return this.WindowCovering.CurrentPosition;
         });
         // Initialize WindowCovering TargetPosition
-        this.WindowCovering.Service
-            .getCharacteristic(this.hap.Characteristic.TargetPosition)
-            .setProps({
+        this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.TargetPosition).setProps({
             minStep: device.curtain?.set_minStep ?? 1,
             minValue: 0,
             maxValue: 100,
             validValueRanges: [0, 100],
-        })
-            .onGet(() => {
+        }).onGet(() => {
             return this.WindowCovering.TargetPosition;
-        })
-            .onSet(this.TargetPositionSet.bind(this));
+        }).onSet(this.TargetPositionSet.bind(this));
         // Initialize WindowCovering TargetPosition
-        this.WindowCovering.Service
-            .getCharacteristic(this.hap.Characteristic.HoldPosition)
-            .onGet(() => {
+        this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.HoldPosition).onGet(() => {
             return this.WindowCovering.HoldPosition;
-        })
-            .onSet(this.HoldPositionSet.bind(this));
+        }).onSet(this.HoldPositionSet.bind(this));
         // Initialize Battery Service
         accessory.context.Battery = accessory.context.Battery ?? {};
         this.Battery = {
@@ -95,24 +85,17 @@ export class Curtain extends deviceBase {
         };
         accessory.context.Battery = this.Battery;
         // Initialize Battery Service
-        this.Battery.Service
-            .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
-            .getCharacteristic(this.hap.Characteristic.BatteryLevel)
-            .onGet(() => {
+        this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name).getCharacteristic(this.hap.Characteristic.BatteryLevel).onGet(() => {
             return this.Battery.BatteryLevel;
         });
-        this.Battery.Service
-            .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
-            .onGet(() => {
+        this.Battery.Service.getCharacteristic(this.hap.Characteristic.StatusLowBattery).onGet(() => {
             return this.Battery.StatusLowBattery;
         });
-        this.Battery.Service
-            .getCharacteristic(this.hap.Characteristic.ChargingState)
-            .onGet(() => {
+        this.Battery.Service.getCharacteristic(this.hap.Characteristic.ChargingState).onGet(() => {
             return this.Battery.ChargingState;
         });
         // Initialize LightSensor Service
-        if (device.curtain?.hide_lightsensor) {
+        if (device.curtain?.hide_lightsensor || (device.deviceType !== 'curtain' && device.deviceType !== 'curtain3')) {
             if (this.LightSensor?.Service) {
                 this.debugLog('Removing Light Sensor Service');
                 this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor);
@@ -120,7 +103,7 @@ export class Curtain extends deviceBase {
                 accessory.context.LightSensor = {};
             }
         }
-        else {
+        else if (device.deviceType === 'curtain' || device.deviceType === 'curtain3') {
             accessory.context.LightSensor = accessory.context.LightSensor ?? {};
             this.LightSensor = {
                 Name: `${accessory.displayName} Light Sensor`,
@@ -129,20 +112,80 @@ export class Curtain extends deviceBase {
             };
             accessory.context.LightSensor = this.LightSensor;
             // Initialize LightSensor Characteristic
-            this.LightSensor.Service
-                .setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name)
-                .setCharacteristic(this.hap.Characteristic.StatusActive, true)
-                .getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel)
-                .onGet(() => {
+            this.LightSensor.Service.setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name).setCharacteristic(this.hap.Characteristic.StatusActive, true).getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel).onGet(() => {
                 return this.LightSensor.CurrentAmbientLightLevel;
             });
         }
+        // Initialize Open Mode Switch Service
+        if (!device.curtain?.silentModeSwitch) {
+            if (this.OpenModeSwitch?.Service) {
+                this.debugLog('Removing Open Mode Switch Service');
+                this.OpenModeSwitch.Service = this.accessory.getService(this.hap.Service.Switch);
+                accessory.removeService(this.OpenModeSwitch.Service);
+                accessory.context.OpenModeSwitch = {};
+            }
+        }
+        else {
+            accessory.context.OpenModeSwitch = accessory.context.OpenModeSwitch ?? {};
+            this.OpenModeSwitch = {
+                Name: `${accessory.displayName} Silent Open Mode`,
+                Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch),
+                On: accessory.context.OpenModeSwitch.On ?? false,
+            };
+            accessory.context.OpenModeSwitch = this.OpenModeSwitch;
+            // Initialize Open Mode Switch Service
+            this.OpenModeSwitch.Service.setCharacteristic(this.hap.Characteristic.Name, this.OpenModeSwitch.Name).getCharacteristic(this.hap.Characteristic.On).onGet(() => {
+                return this.OpenModeSwitch?.On ?? false;
+            });
+            this.OpenModeSwitch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OpenModeSwitchSet.bind(this));
+        }
+        // Initialize Close Mode Switch Service
+        if (!device.curtain?.silentModeSwitch) {
+            if (this.CloseModeSwitch?.Service) {
+                this.debugLog('Removing Close Mode Switch Service');
+                this.CloseModeSwitch.Service = this.accessory.getService(this.hap.Service.Switch);
+                accessory.removeService(this.CloseModeSwitch.Service);
+                accessory.context.CloseModeSwitch = {};
+            }
+        }
+        else {
+            accessory.context.CloseModeSwitch = accessory.context.CloseModeSwitch ?? {};
+            this.CloseModeSwitch = {
+                Name: `${accessory.displayName} Silent Close Mode`,
+                Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch),
+                On: accessory.context.CloseModeSwitch.On ?? false,
+            };
+            accessory.context.CloseModeSwitch = this.CloseModeSwitch;
+            // Initialize Close Mode Switch Service
+            this.CloseModeSwitch.Service.setCharacteristic(this.hap.Characteristic.Name, this.CloseModeSwitch.Name).getCharacteristic(this.hap.Characteristic.On).onGet(() => {
+                return this.CloseModeSwitch?.On ?? false;
+            });
+            this.CloseModeSwitch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.CloseModeSwitchSet.bind(this));
+        }
         // Retrieve initial values and updateHomekit
-        this.debugLog('Retrieve initial values and update Homekit');
-        this.refreshStatus();
-        //regisiter webhook event handler
-        this.debugLog('Registering Webhook Event Handler');
-        this.registerWebhook();
+        try {
+            this.debugLog('Retrieve initial values and update Homekit');
+            this.refreshStatus();
+        }
+        catch (e) {
+            this.errorLog(`failed to retrieve initial values and update Homekit, Error: ${e}`);
+        }
+        // regisiter webhook event handler if enabled
+        try {
+            this.debugLog('Registering Webhook Event Handler');
+            this.registerWebhook();
+        }
+        catch (e) {
+            this.errorLog(`failed to registerWebhook, Error: ${e}`);
+        }
+        // regisiter platform BLE event handler if enabled
+        try {
+            this.debugLog('Registering Platform BLE Event Handler');
+            this.registerPlatformBLE();
+        }
+        catch (e) {
+            this.errorLog(`failed to registerPlatformBLE, Error: ${e}`);
+        }
         // History
         this.history();
         // Start an update interval
@@ -153,7 +196,7 @@ export class Curtain extends deviceBase {
         });
         // update slide progress
         interval(this.deviceUpdateRate * 1000)
-            //.pipe(skipWhile(() => this.curtainUpdateInProgress))
+            .pipe(skipWhile(() => !this.curtainMoving))
             .subscribe(async () => {
             if (this.WindowCovering.PositionState === this.hap.Characteristic.PositionState.STOPPED) {
                 return;
@@ -206,8 +249,8 @@ export class Curtain extends deviceBase {
             storage: 'fs',
             filename: `${hostname().split('.')[0]}_${mac}_persist.json`,
         });
-        const motion = this.accessory.getService(this.hap.Service.MotionSensor) ||
-            this.accessory.addService(this.hap.Service.MotionSensor, 'Motion');
+        const motion = this.accessory.getService(this.hap.Service.MotionSensor)
+            || this.accessory.addService(this.hap.Service.MotionSensor, 'Motion');
         motion.addOptionalCharacteristic(this.platform.eve.Characteristics.LastActivation);
         motion.getCharacteristic(this.platform.eve.Characteristics.LastActivation).onGet(() => {
             const lastActivation = this.accessory.context.lastActivation
@@ -234,7 +277,7 @@ export class Curtain extends deviceBase {
         const motion = Number(this.WindowCovering.CurrentPosition) > 0 ? 1 : 0;
         this.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
-            motion: motion,
+            motion,
         });
         setTimeout(async () => {
             await this.updateHistory();
@@ -242,8 +285,7 @@ export class Curtain extends deviceBase {
     }
     async BLEparseStatus() {
         await this.debugLog('BLEparseStatus');
-        await this.debugLog(`(position, battery) = BLE:(${this.serviceData.position}, ${this.serviceData.battery}),`
-            + ` current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
+        await this.debugLog(`(position, battery) = BLE:(${this.serviceData.position}, ${this.serviceData.battery}), current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
         // CurrentPosition
         this.WindowCovering.CurrentPosition = 100 - this.serviceData.position;
         await this.getCurrentPostion();
@@ -253,21 +295,20 @@ export class Curtain extends deviceBase {
             const set_maxLux = this.device.curtain?.set_maxLux ?? 6001;
             const lightLevel = this.serviceData.lightLevel;
             this.LightSensor.CurrentAmbientLightLevel = await this.getLightLevel(lightLevel, set_minLux, set_maxLux, 19);
-            this.debugLog(`LightLevel: ${this.serviceData.lightLevel},`
-                + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
+            this.debugLog(`LightLevel: ${this.serviceData.lightLevel}, CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
         }
         // BatteryLevel
         this.Battery.BatteryLevel = this.serviceData.battery;
         await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
         // StatusLowBattery
         this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+            : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     }
     async openAPIparseStatus() {
         await this.debugLog('openAPIparseStatus');
-        await this.debugLog(`(slidePosition, battery) = OpenAPI:(${this.deviceStatus.slidePosition}, ${this.deviceStatus.battery}),`
-            + ` current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
+        await this.debugLog(`(slidePosition, battery, version) = OpenAPI:(${this.deviceStatus.slidePosition}, ${this.deviceStatus.battery}, ${this.deviceStatus.version}), current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel}, ${this.accessory.context.version})`);
         // CurrentPosition
         this.WindowCovering.CurrentPosition = 100 - this.deviceStatus.slidePosition;
         await this.setMinMax();
@@ -276,6 +317,7 @@ export class Curtain extends deviceBase {
             await this.infoLog('Checking Status ...');
         }
         if (this.setNewTarget && this.deviceStatus.moving) {
+            this.curtainMoving = true;
             await this.setMinMax();
             if (Number(this.WindowCovering.TargetPosition) > this.WindowCovering.CurrentPosition) {
                 await this.debugLog(`Closing, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
@@ -297,13 +339,13 @@ export class Curtain extends deviceBase {
             }
         }
         else {
+            this.curtainMoving = false;
             await this.debugLog(`Standby, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
             this.WindowCovering.TargetPosition = this.WindowCovering.CurrentPosition;
             this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
             await this.debugLog(`Stopped, PositionState: ${this.WindowCovering.PositionState}`);
         }
-        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition},`
-            + ` PositionState: ${this.WindowCovering.PositionState},`);
+        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
         // Brightness
         if (!this.device.curtain?.hide_lightsensor && this.LightSensor?.Service) {
             const set_minLux = this.device.curtain?.set_minLux ?? 1;
@@ -317,7 +359,8 @@ export class Curtain extends deviceBase {
         await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
         // StatusLowBattery
         this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+            : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         // Firmware Version
         if (this.deviceStatus.version) {
@@ -336,8 +379,7 @@ export class Curtain extends deviceBase {
     }
     async parseStatusWebhook() {
         await this.debugLog('parseStatusWebhook');
-        await this.debugLog(`(slidePosition, battery) = Webhook:(${this.webhookContext.slidePosition}, ${this.webhookContext.battery}),`
-            + ` current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
+        await this.debugLog(`(slidePosition, battery) = Webhook:(${this.webhookContext.slidePosition}, ${this.webhookContext.battery}), current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
         // CurrentPosition
         this.WindowCovering.CurrentPosition = 100 - this.webhookContext.slidePosition;
         await this.getCurrentPostion();
@@ -346,7 +388,8 @@ export class Curtain extends deviceBase {
         await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
         // StatusLowBattery
         this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+            : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     }
     /**
@@ -356,7 +399,7 @@ export class Curtain extends deviceBase {
         if (!this.device.enableCloudService && this.OpenAPI) {
             await this.errorLog(`refreshStatus enableCloudService: ${this.device.enableCloudService}`);
         }
-        else if (this.BLE || this.config.options?.BLE) {
+        else if (this.BLE) {
             await this.BLERefreshStatus();
         }
         else if (this.OpenAPI && this.platform.config.credentials?.token) {
@@ -369,46 +412,27 @@ export class Curtain extends deviceBase {
     }
     async BLERefreshStatus() {
         await this.debugLog('BLERefreshStatus');
-        if (this.config.options?.BLE) {
-            await this.debugLog('is listening to Platform BLE.');
-            this.device.bleMac = this.device.deviceId.match(/.{1,2}/g).join(':').toLowerCase();
-            await this.debugLog(`bleMac: ${this.device.bleMac}`);
-            this.platform.bleEventHandler[this.device.bleMac] = async (context) => {
-                try {
-                    await this.debugLog(`received BLE: ${JSON.stringify(context)}`);
-                    this.serviceData = context;
+        const switchbot = await this.switchbotBLE();
+        if (switchbot === undefined) {
+            await this.BLERefreshConnection(switchbot);
+        }
+        else {
+            // Start to monitor advertisement packets
+            (async () => {
+                // Start to monitor advertisement packets
+                const serviceData = await this.monitorAdvertisementPackets(switchbot);
+                // Update HomeKit
+                if ((serviceData.model === SwitchBotBLEModel.Curtain || SwitchBotBLEModel.Curtain3)
+                    && (serviceData.modelName === SwitchBotBLEModelName.Curtain || SwitchBotBLEModelName.Curtain3)) {
+                    this.serviceData = serviceData;
                     await this.BLEparseStatus();
                     await this.updateHomeKitCharacteristics();
                 }
-                catch (e) {
-                    await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`);
+                else {
+                    await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
+                    await this.BLERefreshConnection(switchbot);
                 }
-            };
-        }
-        else {
-            await this.debugLog('is using Device BLE Scanning.');
-            const switchbot = await this.switchbotBLE();
-            if (switchbot === undefined) {
-                await this.BLERefreshConnection(switchbot);
-            }
-            else {
-                // Start to monitor advertisement packets
-                (async () => {
-                    // Start to monitor advertisement packets
-                    const serviceData = await this.monitorAdvertisementPackets(switchbot);
-                    // Update HomeKit
-                    if ((serviceData.model === SwitchBotBLEModel.Curtain || SwitchBotBLEModel.Curtain3)
-                        && (serviceData.modelName === SwitchBotBLEModelName.Curtain || SwitchBotBLEModelName.Curtain3)) {
-                        this.serviceData = serviceData;
-                        await this.BLEparseStatus();
-                        await this.updateHomeKitCharacteristics();
-                    }
-                    else {
-                        await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
-                        await this.BLERefreshConnection(switchbot);
-                    }
-                })();
-            }
+            })();
         }
     }
     async openAPIRefreshStatus() {
@@ -417,7 +441,6 @@ export class Curtain extends deviceBase {
             const { body, statusCode } = await this.deviceRefreshStatus();
             const deviceStatus = await body.json();
             await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-            ;
             if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
                 await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                 this.deviceStatus = deviceStatus.body;
@@ -453,6 +476,28 @@ export class Curtain extends deviceBase {
             await this.debugLog('is not listening webhook.');
         }
     }
+    async registerPlatformBLE() {
+        await this.debugLog('registerPlatformBLE');
+        if (this.config.options?.BLE) {
+            await this.debugLog('is listening to Platform BLE.');
+            this.device.bleMac = this.device.deviceId.match(/.{1,2}/g).join(':').toLowerCase();
+            await this.debugLog(`bleMac: ${this.device.bleMac}`);
+            this.platform.bleEventHandler[this.device.bleMac] = async (context) => {
+                try {
+                    await this.debugLog(`received BLE: ${JSON.stringify(context)}`);
+                    this.serviceData = context;
+                    await this.BLEparseStatus();
+                    await this.updateHomeKitCharacteristics();
+                }
+                catch (e) {
+                    await this.errorLog(`failed to handle BLE. Received: ${JSON.stringify(context)} Error: ${e}`);
+                }
+            };
+        }
+        else {
+            await this.debugLog('is not listening to Platform BLE');
+        }
+    }
     /**
      * Pushes the requested changes to the SwitchBot API
      */
@@ -484,7 +529,7 @@ export class Curtain extends deviceBase {
             const switchbot = await this.platform.connectBLE(this.accessory, this.device);
             await this.convertBLEAddress();
             const { setPositionMode, Mode } = await this.setPerformance();
-            const adjustedMode = setPositionMode === 1 ? 0x01 : 0xff;
+            const adjustedMode = setPositionMode === 1 ? 0x01 : 0xFF;
             await this.debugLog(`Mode: ${Mode}, setPositionMode: ${setPositionMode}`);
             if (switchbot !== false) {
                 switchbot
@@ -513,8 +558,7 @@ export class Curtain extends deviceBase {
             }
         }
         else {
-            await this.debugLog(`No changes (BLEpushChanges), TargetPosition: ${this.WindowCovering.TargetPosition},`
-                + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+            await this.debugLog(`No changes (BLEpushChanges), TargetPosition: ${this.WindowCovering.TargetPosition}, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         }
     }
     async openAPIpushChanges() {
@@ -560,8 +604,7 @@ export class Curtain extends deviceBase {
             }
         }
         else {
-            await this.debugLog(`No changes (openAPIpushChanges), CurrentPosition: ${this.WindowCovering.CurrentPosition},`
-                + ` TargetPosition: ${this.WindowCovering.TargetPosition}`);
+            await this.debugLog(`No changes (openAPIpushChanges), CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition}`);
         }
     }
     /**
@@ -623,6 +666,28 @@ export class Curtain extends deviceBase {
         this.WindowCovering.HoldPosition = value;
         this.doCurtainUpdate.next();
     }
+    /**
+     * Handle requests to set the value of the "Target Position" characteristic
+     */
+    async OpenModeSwitchSet(value) {
+        if (this.OpenModeSwitch && this.device.curtain?.silentModeSwitch) {
+            this.debugLog(`Silent Open Mode: ${value}`);
+            this.OpenModeSwitch.On = value;
+            this.accessory.context.OpenModeSwitch.On = value;
+            this.doCurtainUpdate.next();
+        }
+    }
+    /**
+     * Handle requests to set the value of the "Target Position" characteristic
+     */
+    async CloseModeSwitchSet(value) {
+        if (this.CloseModeSwitch && this.device.curtain?.silentModeSwitch) {
+            this.debugLog(`Silent Close Mode: ${value}`);
+            this.CloseModeSwitch.On = value;
+            this.accessory.context.CloseModeSwitch.On = value;
+            this.doCurtainUpdate.next();
+        }
+    }
     async updateHomeKitCharacteristics() {
         await this.setMinMax();
         // CurrentPosition
@@ -662,11 +727,11 @@ export class Curtain extends deviceBase {
         let setPositionMode;
         let Mode;
         if (Number(this.WindowCovering.TargetPosition) > 50) {
-            if (this.device.curtain?.setOpenMode === '1') {
+            if (this.device.curtain?.setOpenMode === '1' || this.OpenModeSwitch?.On) {
                 setPositionMode = 1;
                 Mode = 'Silent Mode';
             }
-            else if (this.device.curtain?.setOpenMode === '0') {
+            else if (this.device.curtain?.setOpenMode === '0' || !this.OpenModeSwitch?.On) {
                 setPositionMode = 0;
                 Mode = 'Performance Mode';
             }
@@ -676,11 +741,11 @@ export class Curtain extends deviceBase {
             }
         }
         else {
-            if (this.device.curtain?.setCloseMode === '1') {
+            if (this.device.curtain?.setCloseMode === '1' || this.CloseModeSwitch?.On) {
                 setPositionMode = 1;
                 Mode = 'Silent Mode';
             }
-            else if (this.device.curtain?.setOpenMode === '0') {
+            else if (this.device.curtain?.setCloseMode === '0' || !this.CloseModeSwitch?.On) {
                 setPositionMode = 0;
                 Mode = 'Performance Mode';
             }
@@ -695,6 +760,7 @@ export class Curtain extends deviceBase {
         await this.setMinMax();
         await this.debugLog(`CurrentPosition ${this.WindowCovering.CurrentPosition}`);
         if (this.setNewTarget) {
+            this.curtainMoving = true;
             this.infoLog('Checking Status ...');
             await this.setMinMax();
             if (this.WindowCovering.TargetPosition > this.WindowCovering.CurrentPosition) {
@@ -717,13 +783,13 @@ export class Curtain extends deviceBase {
             }
         }
         else {
+            this.curtainMoving = false;
             await this.debugLog(`Standby, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
             this.WindowCovering.TargetPosition = this.WindowCovering.CurrentPosition;
             this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
             await this.debugLog(`Stopped, PositionState: ${this.WindowCovering.PositionState}`);
         }
-        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition},`
-            + ` PositionState: ${this.WindowCovering.PositionState},`);
+        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
     }
     async setMinMax() {
         if (this.device.curtain?.set_min) {