homebridge-tuya-without-developer-account 1.0.4 → 1.0.7

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 1.0.7
+
+- Added Smart Pet Feeder support for `quick_feed`, `manual_feed`, `slow_feed`, `feed_state`, battery, and charging state.
+- Added optional `deviceOverrides[].petFeeder.manualFeedAmount` and `deviceOverrides[].petFeeder.exposeSlowFeed`.
+- Added Tuya alarm panel support as a HomeKit Security System using `master_mode`, `master_state`, and optional tamper/battery DPs.
+- Added optional `deviceOverrides[].alarm` fields for alarm sound, muffling, and notification switches.
+- Added clearer logging when Tuya returns an empty schema for aroma diffusers. Diffuser scenes remain exposed separately.
+
+## 1.0.6
+
+- Fixed a Homebridge UI issue where clicking **Save Configuration** could leave the custom settings page spinner running indefinitely even when QR authentication data had already been saved.
+- Added timeout handling around the custom UI save flow.
+- Added post-save verification of the plugin config so users receive a clear success or recovery message instead of a permanent spinner.
+
+
+## 1.0.5
+
+- Added support for DP10 / category `tgq` Tuya dimmer plugs that expose `switch_led` + `bright_value_v2`.
+- Fixed dimmer validation so devices using `bright_value_v2` are exposed as HomeKit Lightbulb accessories with On and Brightness instead of being marked unsupported.
+- Fixed dimmer on/off schema matching so `bright_value_v2` no longer incorrectly searches for `switch_v2` / `switch_led_v2`.
+
 ## 1.0.4
 
 - Added a Homebridge settings UI helper for air conditioner temperature overrides.

package/README.md

@@ -4,6 +4,9 @@
 
 # Tuya without developer account for Homebridge
 
+Current release: **1.0.6**
+
+
 A Homebridge platform plugin for Tuya and Smart Life devices that uses **Home Assistant-style Tuya QR Cloud Authentication**.
 
 This plugin is designed for users who want to add Tuya / Smart Life devices to HomeKit through Homebridge **without creating a Tuya IoT Developer Platform account** and without entering Tuya cloud project credentials.
@@ -305,3 +308,15 @@ Version 1.0.1 and later persist refreshed Tuya QR tokens back to the Homebridge
 ```
 
 If this still happens after upgrading, open the plugin settings, clear the saved authentication, generate a new QR code, scan it with the Tuya Smart or Smart Life app, save the configuration, and restart Homebridge. Also confirm the Homebridge host clock is synchronized, because Tuya signed requests depend on the current time.
+
+### DP10 Smart Dimmer Plug / `bright_value_v2` dimmers
+
+Version **1.0.5** adds support for DP10-style Tuya dimmer plugs that expose `switch_led` and `bright_value_v2`. These are exposed in HomeKit as Lightbulb accessories with On and Brightness. If the accessory was previously shown as **Not Supported**, remove only that cached accessory in Homebridge UI and restart Homebridge after upgrading.
+
+
+
+## Version 1.0.7 device support
+
+This release adds native support for Tuya Smart Pet Feeders and Tuya alarm panels that expose `master_mode`. Pet feeders expose quick/manual feed controls, optional slow-feed control, feed-state sensor, and battery when available. Alarm panels are exposed as HomeKit Security System accessories, with optional extra switches controlled through `deviceOverrides[].alarm`.
+
+Aroma diffuser devices whose Tuya QR cloud schema is empty remain visible as unsupported direct devices, but any diffuser scenes returned by Tuya are still exposed separately.

package/SUPPORTED_DEVICES.md

@@ -204,3 +204,28 @@ Most category code is pinyin abbreviation of Chinese name.
 
 
 For the undocumented product category, you can try override it to the most similar one. See [ADVANCED_OPTIONS.md](./ADVANCED_OPTIONS.md).
+
+### DP10 / Treatlife Smart Dimmer Plug
+
+Supported from **v1.0.5**. These devices normally report category `tgq` and expose:
+
+- `switch_led` for On/Off
+- `bright_value_v2` for Brightness
+
+They are exposed to HomeKit as a Lightbulb with On and Brightness. After upgrading from an older version where the device showed as unsupported, remove the affected cached accessory from Homebridge UI and restart Homebridge.
+
+
+
+## Added in 1.0.7
+
+### Smart Pet Feeder
+
+Supported when Tuya exposes one or more of: `quick_feed`, `manual_feed`, `slow_feed`, `feed_state`, `battery_percentage`, `charge_state`.
+
+### Alarm / Security System
+
+Supported when Tuya exposes `master_mode`. Alarm-triggered state is detected from `master_state=alarm`, `sos_state=true`, or `master_mode=sos` when available. Optional extra switches can be enabled through `deviceOverrides[].alarm`.
+
+### Aroma Diffuser with Empty Schema
+
+If Tuya QR cloud returns an empty schema for the diffuser device, direct device control cannot be mapped. The plugin keeps diffuser Tuya scenes exposed and logs a clearer explanation.

package/config.schema.json

@@ -110,6 +110,49 @@
                       "default": 1
                     }
                   }
+                },
+                "petFeeder": {
+                  "type": "object",
+                  "title": "Smart Pet Feeder Options",
+                  "description": "Optional settings for Tuya pet feeders. The plugin exposes quick/manual feed switches, feed-state sensor, and battery when supported.",
+                  "properties": {
+                    "manualFeedAmount": {
+                      "type": "integer",
+                      "title": "Manual feed amount",
+                      "description": "Portions sent when the Manual Feed switch is turned on.",
+                      "minimum": 1,
+                      "maximum": 12,
+                      "default": 1
+                    },
+                    "exposeSlowFeed": {
+                      "type": "boolean",
+                      "title": "Expose Slow Feed switch",
+                      "description": "Expose slow_feed as a HomeKit switch when the device supports it.",
+                      "default": true
+                    }
+                  }
+                },
+                "alarm": {
+                  "type": "object",
+                  "title": "Alarm Options",
+                  "description": "Optional extra switches for Tuya alarm panels. The main alarm is exposed as a HomeKit Security System when master_mode is available.",
+                  "properties": {
+                    "exposeAlarmSoundSwitch": {
+                      "type": "boolean",
+                      "title": "Expose Alarm Sound switch",
+                      "default": false
+                    },
+                    "exposeMufflingSwitch": {
+                      "type": "boolean",
+                      "title": "Expose Mute/Muffling switch",
+                      "default": false
+                    },
+                    "exposeNotificationSwitches": {
+                      "type": "boolean",
+                      "title": "Expose Call/SMS/App/Low Battery switches",
+                      "default": false
+                    }
+                  }
                 }
               },
               "required": [

package/dist/platform.js

@@ -122,6 +122,34 @@ class TuyaPlatform {
           delete item.airConditioner;
         }
       }
+      if (item.petFeeder && typeof item.petFeeder === 'object') {
+        const normalizedPetFeeder = {};
+        const manualFeedAmount = Number(item.petFeeder.manualFeedAmount);
+        if (Number.isFinite(manualFeedAmount)) {
+          normalizedPetFeeder.manualFeedAmount = Math.max(1, Math.min(12, Math.round(manualFeedAmount)));
+        }
+        if (typeof item.petFeeder.exposeSlowFeed === 'boolean') {
+          normalizedPetFeeder.exposeSlowFeed = item.petFeeder.exposeSlowFeed;
+        }
+        if (Object.keys(normalizedPetFeeder).length > 0) {
+          item.petFeeder = normalizedPetFeeder;
+        } else {
+          delete item.petFeeder;
+        }
+      }
+      if (item.alarm && typeof item.alarm === 'object') {
+        const normalizedAlarm = {};
+        for (const key of ['exposeAlarmSoundSwitch', 'exposeMufflingSwitch', 'exposeNotificationSwitches']) {
+          if (typeof item.alarm[key] === 'boolean') {
+            normalizedAlarm[key] = item.alarm[key];
+          }
+        }
+        if (Object.keys(normalizedAlarm).length > 0) {
+          item.alarm = normalizedAlarm;
+        } else {
+          delete item.alarm;
+        }
+      }
       seenIds.add(id);
       validOverrides.push(item);
     }
@@ -249,6 +277,8 @@ class TuyaPlatform {
         unbridged: deviceConfig?.unbridged ?? false,
         schemaOverrides: deviceConfig?.schema ? JSON.stringify(deviceConfig.schema) : undefined,
         airConditioner: deviceConfig?.airConditioner ? JSON.stringify(deviceConfig.airConditioner) : undefined,
+        petFeeder: deviceConfig?.petFeeder ? JSON.stringify(deviceConfig.petFeeder) : undefined,
+        alarm: deviceConfig?.alarm ? JSON.stringify(deviceConfig.alarm) : undefined,
         adaptiveLighting: deviceConfig?.adaptiveLighting ?? false,
       };
       const { changed: configChanged } = this.configHash.hasConfigChanged(device.id, configToHash);

package/dist/shared/accessories/DiffuserAccessory.js

@@ -23,6 +23,13 @@ class DiffuserAccessory extends BaseAccessory_1.default {
     requiredSchema() {
         return [SCHEMA_CODE.SPRAY_ON];
     }
+
+    checkRequirements() {
+        if (this.device && Array.isArray(this.device.schema) && this.device.schema.length === 0) {
+            this.log.warn('Tuya returned an empty schema for this diffuser. Direct diffuser control cannot be mapped until Tuya exposes switch_spray or equivalent DPs. Any Tuya scenes for this diffuser will still be exposed separately.');
+        }
+        return super.checkRequirements();
+    }
     configureServices() {
         // Main Switch
         (0, On_1.configureOn)(this, undefined, this.getSchema(...SCHEMA_CODE.ON));

package/dist/shared/accessories/DimmerAccessory.js

@@ -9,7 +9,7 @@ const Name_1 = require("./characteristic/Name");
 const On_1 = require("./characteristic/On");
 const SCHEMA_CODE = {
     ON: ['switch', 'switch_led', 'switch_1', 'switch_led_1'],
-    BRIGHTNESS: ['bright_value', 'bright_value_1'],
+    BRIGHTNESS: ['bright_value', 'bright_value_v2', 'bright_value_1', 'bright_value_2', 'brightness'],
 };
 class DimmerAccessory extends BaseAccessory_1.default {
     requiredSchema() {
@@ -28,10 +28,31 @@ class DimmerAccessory extends BaseAccessory_1.default {
             const service = this.accessory.getService(_schema.code)
                 || this.accessory.addService(this.Service.Lightbulb, name, _schema.code);
             (0, Name_1.configureName)(this, service, name);
-            (0, On_1.configureOn)(this, service, this.getSchema('switch' + suffix, 'switch_led' + suffix));
+            const onSchema = this.resolveOnSchemaForBrightness(suffix);
+            if (!onSchema) {
+                this.log.warn(`No on/off schema found for brightness DP ${_schema.code}. Tried switch/switch_led variants.`);
+            }
+            (0, On_1.configureOn)(this, service, onSchema);
             this.configureBrightness(service, suffix);
         }
     }
+
+    resolveOnSchemaForBrightness(suffix) {
+        const candidates = [];
+        if (suffix) {
+            candidates.push('switch' + suffix, 'switch_led' + suffix);
+        }
+        // bright_value_v2 is a schema generation/version marker, not a separate channel suffix.
+        // Devices such as the Treatlife/DP10 Smart dimmer Plug expose:
+        //   switch_led + bright_value_v2
+        // The older logic looked for switch_v2/switch_led_v2 and marked the device unsupported.
+        if (suffix === '_v2') {
+            candidates.push('switch_led', 'switch');
+        }
+        candidates.push('switch', 'switch_led', 'switch_1', 'switch_led_1');
+        return this.getSchema(...candidates);
+    }
+
     configureBrightness(service, suffix) {
         const schema = this.getSchema('bright_value' + suffix);
         if (!schema) {

package/dist/shared/accessories/PetFeederAccessory.js

@@ -4,136 +4,107 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
-const Active_1 = require("./characteristic/Active");
+const Name_1 = require("./characteristic/Name");
 const SCHEMA_CODE = {
-    ACTIVE: ['switch'],
-    LIGHT: ['light'],
     QUICK_FEED: ['quick_feed'],
     SLOW_FEED: ['slow_feed'],
     MANUAL_FEED: ['manual_feed'],
-    MEAL_PLAN: ['meal_plan'],
-    BATTERY_PERCENTAGE: ['battery_percentage'],
-    FEED_REPORT: ['feed_report'],
     FEED_STATE: ['feed_state'],
 };
 class PetFeederAccessory extends BaseAccessory_1.default {
     requiredSchema() {
-        return [SCHEMA_CODE.ACTIVE];
+        // Tuya pet feeders often do not expose a generic "switch" DP.  A feeder is
+        // considered supported when it has at least one command DP we can expose.
+        return [[...SCHEMA_CODE.QUICK_FEED, ...SCHEMA_CODE.MANUAL_FEED, ...SCHEMA_CODE.SLOW_FEED]];
+    }
+    getPetFeederConfig() {
+        const config = this.device ? this.platform.getDeviceConfig(this.device) : undefined;
+        const feeder = (config && typeof config.petFeeder === 'object') ? config.petFeeder : {};
+        const manualFeedAmount = Number(feeder.manualFeedAmount);
+        return {
+            manualFeedAmount: Number.isFinite(manualFeedAmount) ? Math.max(1, Math.min(12, Math.round(manualFeedAmount))) : 1,
+            exposeSlowFeed: feeder.exposeSlowFeed !== false,
+        };
     }
     configureServices() {
-        (0, Active_1.configureActive)(this, this.mainService(), this.getSchema(...SCHEMA_CODE.ACTIVE));
-        this.configureLight();
         this.configureQuickFeed();
-        this.configureSlowFeed();
         this.configureManualFeed();
-        this.configureMealPlan();
-        this.configureBatteryPercentage();
-        this.configureFeedReport();
+        this.configureSlowFeed();
         this.configureFeedState();
     }
-    mainService() {
-        return this.accessory.getService(this.Service.Switch)
-            || this.accessory.addService(this.Service.Switch);
-    }
-    configureLight() {
-        const schema = this.getSchema(...SCHEMA_CODE.LIGHT);
-        if (!schema) {
-            this.log.warn('Light is not supported.');
-            return;
-        }
-        this.mainService().getCharacteristic(this.Characteristic.On)
-            .onSet(async (value) => {
-            await this.sendCommands([{ code: schema.code, value: value }]);
-        });
-    }
-    configureQuickFeed() {
-        const schema = this.getSchema(...SCHEMA_CODE.QUICK_FEED);
+    configureActionSwitch(schema, name, subtype, onSet) {
         if (!schema) {
-            this.log.warn('Quick feed is not supported.');
             return;
         }
-        this.mainService().getCharacteristic(this.Characteristic.On)
+        const service = this.accessory.getServiceById(this.Service.Switch, subtype)
+            || this.accessory.addService(this.Service.Switch, name, subtype);
+        (0, Name_1.configureName)(this, service, name);
+        service.getCharacteristic(this.Characteristic.On)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            // quick_feed/manual_feed are momentary actions.  Always display them as off.
+            return false;
+        })
             .onSet(async (value) => {
             if (value) {
-                await this.sendCommands([{ code: schema.code, value: true }]);
+                await onSet();
             }
+            setTimeout(() => service.getCharacteristic(this.Characteristic.On).updateValue(false), 500);
         });
     }
-    configureSlowFeed() {
-        const schema = this.getSchema(...SCHEMA_CODE.SLOW_FEED);
+    configureBooleanSwitch(schema, name, subtype) {
         if (!schema) {
-            this.log.warn('Slow feed is not supported.');
             return;
         }
-        this.mainService().getCharacteristic(this.Characteristic.On)
-            .onSet(async (value) => {
-            if (value) {
-                await this.sendCommands([{ code: schema.code, value: true }]);
-            }
-        });
-    }
-    configureManualFeed() {
-        const schema = this.getSchema(...SCHEMA_CODE.MANUAL_FEED);
-        if (!schema) {
-            this.log.warn('Manual feed is not supported.');
-            return;
-        }
-        this.mainService().getCharacteristic(this.Characteristic.On)
+        const service = this.accessory.getServiceById(this.Service.Switch, subtype)
+            || this.accessory.addService(this.Service.Switch, name, subtype);
+        (0, Name_1.configureName)(this, service, name);
+        service.getCharacteristic(this.Characteristic.On)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return !!(this.getStatus(schema.code)?.value ?? false);
+        })
             .onSet(async (value) => {
-            if (value) {
-                await this.sendCommands([{ code: schema.code, value: 1 }]);
-            }
+            await this.sendCommands([{ code: schema.code, value: !!value }], true);
         });
     }
-    configureMealPlan() {
-        const schema = this.getSchema(...SCHEMA_CODE.MEAL_PLAN);
-        if (!schema) {
-            this.log.warn('Meal plan is not supported.');
-            return;
-        }
-        this.mainService().getCharacteristic(this.Characteristic.On)
-            .onSet(async (value) => {
-            if (value) {
-                await this.sendCommands([{ code: schema.code, value: value }]);
-            }
+    configureQuickFeed() {
+        const schema = this.getSchema(...SCHEMA_CODE.QUICK_FEED);
+        this.configureActionSwitch(schema, `${this.device?.name || 'Pet Feeder'} Quick Feed`, 'quick_feed', async () => {
+            await this.sendCommands([{ code: schema.code, value: true }], true);
         });
     }
-    configureBatteryPercentage() {
-        const schema = this.getSchema(...SCHEMA_CODE.BATTERY_PERCENTAGE);
-        if (!schema) {
-            this.log.warn('Battery percentage is not supported.');
-            return;
-        }
-        this.mainService().getCharacteristic(this.Characteristic.BatteryLevel)
-            .onGet(() => {
-            const status = this.getStatus(schema.code);
-            return status.value;
+    configureManualFeed() {
+        const schema = this.getSchema(...SCHEMA_CODE.MANUAL_FEED);
+        const { manualFeedAmount } = this.getPetFeederConfig();
+        this.configureActionSwitch(schema, `${this.device?.name || 'Pet Feeder'} Manual Feed`, 'manual_feed', async () => {
+            await this.sendCommands([{ code: schema.code, value: manualFeedAmount }], true);
         });
     }
-    configureFeedReport() {
-        const schema = this.getSchema(...SCHEMA_CODE.FEED_REPORT);
-        if (!schema) {
-            this.log.warn('Feed report is not supported.');
+    configureSlowFeed() {
+        const schema = this.getSchema(...SCHEMA_CODE.SLOW_FEED);
+        const { exposeSlowFeed } = this.getPetFeederConfig();
+        if (!exposeSlowFeed) {
             return;
         }
-        this.mainService().getCharacteristic(this.Characteristic.StatusActive)
-            .onGet(() => {
-            const status = this.getStatus(schema.code);
-            return status.value;
-        });
+        this.configureBooleanSwitch(schema, `${this.device?.name || 'Pet Feeder'} Slow Feed`, 'slow_feed');
     }
     configureFeedState() {
         const schema = this.getSchema(...SCHEMA_CODE.FEED_STATE);
         if (!schema) {
-            this.log.warn('Feed state is not supported.');
             return;
         }
-        this.mainService().getCharacteristic(this.Characteristic.StatusActive)
+        const service = this.accessory.getServiceById(this.Service.OccupancySensor, 'feed_state')
+            || this.accessory.addService(this.Service.OccupancySensor, `${this.device?.name || 'Pet Feeder'} Feeding`, 'feed_state');
+        (0, Name_1.configureName)(this, service, `${this.device?.name || 'Pet Feeder'} Feeding`);
+        const { OCCUPANCY_DETECTED, OCCUPANCY_NOT_DETECTED } = this.Characteristic.OccupancyDetected;
+        service.getCharacteristic(this.Characteristic.OccupancyDetected)
             .onGet(() => {
-            const status = this.getStatus(schema.code);
-            return status.value === 'feeding';
+            this.checkOnlineStatus();
+            const value = this.getStatus(schema.code)?.value;
+            return value === 'feeding' ? OCCUPANCY_DETECTED : OCCUPANCY_NOT_DETECTED;
         });
     }
 }
 exports.default = PetFeederAccessory;
-//# sourceMappingURL=PetFeederAccessory.js.map
+//# sourceMappingURL=PetFeederAccessory.js.map

package/dist/shared/accessories/SecuritySystemAccessory.js

@@ -4,11 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
-const SecuritySystemState_1 = require("./characteristic/SecuritySystemState");
 const Name_1 = require("./characteristic/Name");
 const SCHEMA_CODE = {
     MASTER_MODE: ['master_mode'],
+    MASTER_STATE: ['master_state'],
     SOS_STATE: ['sos_state'],
+    TAMPER_ALARM: ['temper_alarm', 'tamper_alarm'],
+    ALARM_SOUND: ['switch_alarm_sound'],
+    MUFFLING: ['muffling'],
+    ALARM_CALL: ['switch_alarm_call'],
+    ALARM_SMS: ['switch_alarm_sms'],
+    ALARM_PROPEL: ['switch_alarm_propel'],
+    LOW_BATTERY_ALERT: ['switch_low_battery'],
+    MODE_DELAY_SOUND: ['switch_mode_dl_sound'],
 };
 class SecuritySystemAccessory extends BaseAccessory_1.default {
     constructor() {
@@ -16,15 +24,146 @@ class SecuritySystemAccessory extends BaseAccessory_1.default {
         this.isNightArm = false;
     }
     requiredSchema() {
-        return [SCHEMA_CODE.MASTER_MODE, SCHEMA_CODE.SOS_STATE];
+        // Some Tuya alarm panels expose master_mode + master_state, but not sos_state.
+        return [SCHEMA_CODE.MASTER_MODE];
+    }
+    getAlarmConfig() {
+        const config = this.device ? this.platform.getDeviceConfig(this.device) : undefined;
+        const alarm = (config && typeof config.alarm === 'object') ? config.alarm : {};
+        return {
+            exposeAlarmSoundSwitch: !!alarm.exposeAlarmSoundSwitch,
+            exposeMufflingSwitch: !!alarm.exposeMufflingSwitch,
+            exposeNotificationSwitches: !!alarm.exposeNotificationSwitches,
+        };
     }
     configureServices() {
         const service = this.accessory.getService(this.Service.SecuritySystem)
             || this.accessory.addService(this.Service.SecuritySystem);
         (0, Name_1.configureName)(this, service, this.device.name);
-        (0, SecuritySystemState_1.configureSecuritySystemCurrentState)(this, service, this.getSchema(...SCHEMA_CODE.MASTER_MODE), this.getSchema(...SCHEMA_CODE.SOS_STATE));
-        (0, SecuritySystemState_1.configureSecuritySystemTargetState)(this, service, this.getSchema(...SCHEMA_CODE.MASTER_MODE), this.getSchema(...SCHEMA_CODE.SOS_STATE));
+        this.configureCurrentState(service);
+        this.configureTargetState(service);
+        this.configureTamper(service);
+        this.configureExtraSwitches();
+    }
+    mapTuyaModeToHomeKit(value, current = true) {
+        const Current = this.Characteristic.SecuritySystemCurrentState;
+        const Target = this.Characteristic.SecuritySystemTargetState;
+        const map = current ? {
+            disarmed: Current.DISARMED,
+            arm: Current.AWAY_ARM,
+            home: this.isNightArm ? Current.NIGHT_ARM : Current.STAY_ARM,
+            sos: Current.ALARM_TRIGGERED,
+        } : {
+            disarmed: Target.DISARM,
+            arm: Target.AWAY_ARM,
+            home: this.isNightArm ? Target.NIGHT_ARM : Target.STAY_ARM,
+            sos: Target.AWAY_ARM,
+        };
+        return map[value] ?? (current ? Current.DISARMED : Target.DISARM);
+    }
+    mapHomeKitTargetToTuya(value) {
+        const Target = this.Characteristic.SecuritySystemTargetState;
+        switch (value) {
+            case Target.DISARM:
+                return 'disarmed';
+            case Target.STAY_ARM:
+            case Target.NIGHT_ARM:
+                return 'home';
+            case Target.AWAY_ARM:
+            default:
+                return 'arm';
+        }
+    }
+    isAlarmTriggered() {
+        const masterStateSchema = this.getSchema(...SCHEMA_CODE.MASTER_STATE);
+        if (masterStateSchema && this.getStatus(masterStateSchema.code)?.value === 'alarm') {
+            return true;
+        }
+        const sosStateSchema = this.getSchema(...SCHEMA_CODE.SOS_STATE);
+        if (sosStateSchema && this.getStatus(sosStateSchema.code)?.value) {
+            return true;
+        }
+        const masterModeSchema = this.getSchema(...SCHEMA_CODE.MASTER_MODE);
+        if (masterModeSchema && this.getStatus(masterModeSchema.code)?.value === 'sos') {
+            return true;
+        }
+        return false;
+    }
+    configureCurrentState(service) {
+        const masterModeSchema = this.getSchema(...SCHEMA_CODE.MASTER_MODE);
+        service.getCharacteristic(this.Characteristic.SecuritySystemCurrentState)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            if (this.isAlarmTriggered()) {
+                return this.Characteristic.SecuritySystemCurrentState.ALARM_TRIGGERED;
+            }
+            return this.mapTuyaModeToHomeKit(this.getStatus(masterModeSchema.code)?.value, true);
+        });
+    }
+    configureTargetState(service) {
+        const masterModeSchema = this.getSchema(...SCHEMA_CODE.MASTER_MODE);
+        service.getCharacteristic(this.Characteristic.SecuritySystemTargetState)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return this.mapTuyaModeToHomeKit(this.getStatus(masterModeSchema.code)?.value, false);
+        })
+            .onSet(async (value) => {
+            this.isNightArm = value === this.Characteristic.SecuritySystemTargetState.NIGHT_ARM;
+            const commands = [{ code: masterModeSchema.code, value: this.mapHomeKitTargetToTuya(value) }];
+            const sosStateSchema = this.getSchema(...SCHEMA_CODE.SOS_STATE);
+            if (sosStateSchema && value === this.Characteristic.SecuritySystemTargetState.DISARM) {
+                commands.push({ code: sosStateSchema.code, value: false });
+            }
+            await this.sendCommands(commands, true);
+        });
+    }
+    configureTamper(service) {
+        const schema = this.getSchema(...SCHEMA_CODE.TAMPER_ALARM);
+        if (!schema) {
+            return;
+        }
+        if (!service.testCharacteristic(this.Characteristic.StatusTampered)) {
+            service.addOptionalCharacteristic(this.Characteristic.StatusTampered);
+        }
+        const { TAMPERED, NOT_TAMPERED } = this.Characteristic.StatusTampered;
+        service.getCharacteristic(this.Characteristic.StatusTampered)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return this.getStatus(schema.code)?.value ? TAMPERED : NOT_TAMPERED;
+        });
+    }
+    configureExtraSwitches() {
+        const config = this.getAlarmConfig();
+        if (config.exposeAlarmSoundSwitch) {
+            this.configureBooleanSwitch(this.getSchema(...SCHEMA_CODE.ALARM_SOUND), `${this.device.name} Alarm Sound`, 'switch_alarm_sound');
+        }
+        if (config.exposeMufflingSwitch) {
+            this.configureBooleanSwitch(this.getSchema(...SCHEMA_CODE.MUFFLING), `${this.device.name} Mute`, 'muffling');
+        }
+        if (config.exposeNotificationSwitches) {
+            this.configureBooleanSwitch(this.getSchema(...SCHEMA_CODE.ALARM_CALL), `${this.device.name} Alarm Call`, 'switch_alarm_call');
+            this.configureBooleanSwitch(this.getSchema(...SCHEMA_CODE.ALARM_SMS), `${this.device.name} Alarm SMS`, 'switch_alarm_sms');
+            this.configureBooleanSwitch(this.getSchema(...SCHEMA_CODE.ALARM_PROPEL), `${this.device.name} App Push`, 'switch_alarm_propel');
+            this.configureBooleanSwitch(this.getSchema(...SCHEMA_CODE.LOW_BATTERY_ALERT), `${this.device.name} Low Battery Alert`, 'switch_low_battery');
+            this.configureBooleanSwitch(this.getSchema(...SCHEMA_CODE.MODE_DELAY_SOUND), `${this.device.name} Mode Delay Sound`, 'switch_mode_dl_sound');
+        }
+    }
+    configureBooleanSwitch(schema, name, subtype) {
+        if (!schema) {
+            return;
+        }
+        const service = this.accessory.getServiceById(this.Service.Switch, subtype)
+            || this.accessory.addService(this.Service.Switch, name, subtype);
+        (0, Name_1.configureName)(this, service, name);
+        service.getCharacteristic(this.Characteristic.On)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return !!(this.getStatus(schema.code)?.value ?? false);
+        })
+            .onSet(async (value) => {
+            await this.sendCommands([{ code: schema.code, value: !!value }], true);
+        });
     }
 }
 exports.default = SecuritySystemAccessory;
-//# sourceMappingURL=SecuritySystemAccessory.js.map
+//# sourceMappingURL=SecuritySystemAccessory.js.map

package/homebridge-ui/public/index.html

@@ -554,15 +554,92 @@
     }
   }
 
+
+  function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
+
+  async function withTimeout(promise, timeoutMs, timeoutMessage) {
+    let timer;
+    try {
+      return await Promise.race([
+        promise,
+        new Promise((_, reject) => {
+          timer = setTimeout(() => reject(new Error(timeoutMessage)), timeoutMs);
+        }),
+      ]);
+    } finally {
+      if (timer) {
+        clearTimeout(timer);
+      }
+    }
+  }
+
+  async function verifySavedConfig(userCode) {
+    const blocks = await withTimeout(
+      homebridge.getPluginConfig(),
+      8000,
+      'Configuration save timed out while verifying the saved plugin config.'
+    );
+    const block = Array.isArray(blocks) && blocks.length > 0 ? blocks[0] : blocks;
+    return !!(block && block.platform === PLATFORM && block.options && block.options.userCode === userCode);
+  }
+
   async function saveConfig() {
     if (!isAuthenticated) {
       setStatus('Scan and approve the QR code before saving.', 'warning');
       return;
     }
+
+    const userCode = getUserCode();
+    if (!userCode) {
+      setStatus('User Code is required before saving.', 'warning');
+      return;
+    }
+
     try {
       homebridge.showSpinner();
-      await syncConfigToUi();
-      await homebridge.savePluginConfig();
+      $('tuyaNodevSave').disabled = true;
+
+      await withTimeout(
+        syncConfigToUi(),
+        8000,
+        'Timed out while preparing the plugin configuration for saving.'
+      );
+
+      // Some Homebridge UI versions have been observed to save the config but never resolve
+      // savePluginConfig(), which leaves the custom UI spinner running forever. Timeout the
+      // UI call, then verify the saved config before showing the final result.
+      let saveTimedOut = false;
+      try {
+        await withTimeout(
+          homebridge.savePluginConfig(),
+          15000,
+          'Homebridge UI did not finish the save request in time.'
+        );
+      } catch (e) {
+        saveTimedOut = true;
+      }
+
+      let verified = false;
+      try {
+        await delay(750);
+        verified = await verifySavedConfig(userCode);
+      } catch (e) {
+        verified = false;
+      }
+
+      if (saveTimedOut && !verified) {
+        throw new Error('Save did not complete. The QR auth token is saved, but the plugin configuration could not be verified. Close this window, refresh Homebridge UI, and check whether the config was saved.');
+      }
+
+      if (saveTimedOut && verified) {
+        const message = 'Configuration appears to be saved, but Homebridge UI did not return a save confirmation. Close this settings window and restart Homebridge.';
+        homebridge.toast.success(message, 'Tuya');
+        setStatus(message, 'success');
+        return;
+      }
+
       homebridge.toast.success('Configuration saved. Restart Homebridge to load devices.', 'Tuya');
       setStatus('Configuration saved. Restart Homebridge to load devices.', 'success');
     } catch (e) {
@@ -570,6 +647,9 @@
       homebridge.toast.error(e.message || 'Failed to save configuration.', 'Tuya');
     } finally {
       homebridge.hideSpinner();
+      if (isAuthenticated) {
+        $('tuyaNodevSave').disabled = false;
+      }
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-tuya-without-developer-account",
   "displayName": "Tuya without developer account for Homebridge",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Homebridge plugin for Tuya and Smart Life devices using QR cloud authentication without a Tuya IoT developer account.",
   "license": "MIT",
   "author": "Kosztyk",