homebridge-tuya-without-developer-account 1.0.12 → 1.0.14

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.0.14
+
+- Preserves service names changed by users in Apple Home/Homebridge instead of resetting multi-gang switch and outlet names on every restart.
+- Added global `options.preserveHomeKitNames` setting, enabled by default.
+- Added per-device `deviceOverrides[].preserveHomeKitNames` override.
+- Added explicit `deviceOverrides[].switchNames` channel-name overrides keyed by Tuya schema code, such as `switch_1`, `switch_2`, and `switch_usb1`.
+- Added a Homebridge custom UI section for preserving HomeKit names and assigning explicit names to detected multi-switch/outlet channels.
+- Name priority is now: explicit `switchNames` override → existing HomeKit `ConfiguredName` → plugin-generated default.
+- Added `nameOverride` as a compatibility alias for `preserveHomeKitNames`.
+
+## 1.0.13
+
+- Changed Smart Pet Feeder presentation to use a refined HomeKit `Valve` service as the main **Feed Now** control.
+- `Active` triggers the configured `manual_feed` amount when available, falling back to `quick_feed` when needed.
+- `InUse` reflects `feed_state` so HomeKit can show when the feeder is currently feeding.
+- Kept the dedicated Quick Feed switch, optional Slow Feed switch, Battery service, and Feeding occupancy/status sensor.
+- Removes the old cached Manual Feed switch from feeder accessories when reconfigured, since the Valve now handles manual feeding.
+
 ## 1.0.12
 
 - Stopped exposing `switch_inching` as a HomeKit switch because it is an internal Tuya inching/timer configuration DP, not a user-facing relay.

package/README.md

@@ -192,6 +192,57 @@ Optional. Use only when a device is discovered with the wrong category or requir
 
 Use `global` as the override ID to apply an override globally.
 
+### Preserve HomeKit names and name multi-gang channels
+
+Version 1.0.14 preserves names that users assign to individual services in Apple Home or the Homebridge Accessories page. This is especially useful for multi-gang switches and outlets that would otherwise return to generated names such as `Brilliant 1` and `Brilliant 2` after a restart.
+
+The setting is enabled by default and is available in the custom plugin UI:
+
+```text
+HomeKit Names → Preserve names changed in HomeKit
+```
+
+Equivalent configuration:
+
+```json
+{
+  "options": {
+    "userCode": "YOUR_TUYA_USER_CODE",
+    "preserveHomeKitNames": true
+  }
+}
+```
+
+You can also assign deterministic names to individual Tuya switch channels. The Homebridge UI can load detected devices and save these channel names automatically. The internal configuration looks like this:
+
+```json
+{
+  "options": {
+    "userCode": "YOUR_TUYA_USER_CODE",
+    "deviceOverrides": [
+      {
+        "id": "YOUR_MULTI_SWITCH_DEVICE_ID",
+        "switchNames": {
+          "switch_1": "Coffee Machine",
+          "switch_2": "Kitchen Lamp",
+          "switch_usb1": "USB Ports"
+        }
+      }
+    ]
+  }
+}
+```
+
+Name priority is:
+
+```text
+Explicit switchNames override
+→ Existing HomeKit ConfiguredName
+→ Generated device/channel name
+```
+
+Set `deviceOverrides[].preserveHomeKitNames` to `false` for a specific device when you want the plugin to reapply generated names at every restart.
+
 ### Air conditioner temperature limits
 
 Optional. For Wi-Fi AC units, you can limit the Home app setpoint range and step size. Values are always configured in Celsius. If the iPhone/Home app is set to Fahrenheit, HomeKit converts the values automatically.
@@ -351,6 +402,6 @@ Version **1.0.5** adds support for DP10-style Tuya dimmer plugs that expose `swi
 
 ## 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`.
+This release adds native support for Tuya Smart Pet Feeders and Tuya alarm panels that expose `master_mode`. Pet feeders expose a refined HomeKit Valve-style **Feed Now** control, Quick Feed switch, optional Slow Feed switch, 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

@@ -222,6 +222,8 @@ They are exposed to HomeKit as a Lightbulb with On and Brightness. After upgradi
 
 Supported when Tuya exposes one or more of: `quick_feed`, `manual_feed`, `slow_feed`, `feed_state`, `battery_percentage`, `charge_state`.
 
+From v1.0.13 the feeder uses a refined HomeKit `Valve` service as the main **Feed Now** control. Activating it sends the configured `manual_feed` amount when available, or falls back to `quick_feed`. `InUse` reflects `feed_state`. The plugin also keeps the Quick Feed switch, optional Slow Feed switch, Feeding occupancy/status sensor, and Battery service.
+
 ### 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`.
@@ -235,3 +237,7 @@ If Tuya QR cloud returns an empty schema for the diffuser device, direct device
 Adaptive Lighting is supported for eligible Tuya light accessories that expose both brightness and real white color-temperature datapoints, for example CCT, CW, or RGBCW lights.
 
 Not eligible: simple on/off lights, outlets, switches, brightness-only dimmers, DP10 dimmer plugs, and RGB-only lights without a real white-temperature datapoint.
+## Multi-gang switch and outlet names
+
+From v1.0.14, names changed in Apple Home/Homebridge are preserved by default for multi-service accessories. Optional `deviceOverrides[].switchNames` entries can assign explicit names to Tuya channels such as `switch_1`, `switch_2`, and `switch_usb1`.
+

package/config.schema.json

@@ -42,6 +42,12 @@
             "description": "Optional. Enables HomeKit Adaptive Lighting only for Tuya lights that expose both brightness and real white color-temperature controls. RGB-only lights and dimmer plugs are skipped.",
             "default": false
           },
+          "preserveHomeKitNames": {
+            "type": "boolean",
+            "title": "Preserve names changed in HomeKit",
+            "description": "Recommended. Prevents Homebridge restarts from replacing names you assigned to individual services in Apple Home, especially multi-gang switches and outlets. Explicit switchNames overrides still take priority.",
+            "default": true
+          },
           "deviceOverrides": {
             "type": "array",
             "title": "Device Overrides",
@@ -62,6 +68,19 @@
                   "title": "Expose as external accessory",
                   "default": false
                 },
+                "preserveHomeKitNames": {
+                  "type": "boolean",
+                  "title": "Preserve HomeKit names for this device",
+                  "description": "Optional per-device override of the global setting. True preserves names changed in Apple Home; false lets the plugin reapply generated/default names on restart."
+                },
+                "switchNames": {
+                  "type": "object",
+                  "title": "Multi-switch channel names",
+                  "description": "Optional explicit names keyed by Tuya schema code. These names take priority over preserved HomeKit names and generated defaults. Example: {\"switch_1\":\"Coffee Machine\",\"switch_2\":\"Kitchen Lamp\",\"switch_usb1\":\"USB Ports\"}.",
+                  "additionalProperties": {
+                    "type": "string"
+                  }
+                },
                 "adaptiveLighting": {
                   "title": "Adaptive Lighting Override",
                   "description": "Optional per-device override. Use enabled=true to force-enable for this device, or enabled=false to disable it even when global Adaptive Lighting is enabled.",
@@ -106,26 +125,26 @@
                 "airConditioner": {
                   "type": "object",
                   "title": "Air Conditioner Temperature Limits",
-                  "description": "Optional HomeKit temperature range override for Wi-Fi air conditioners. Values are always Celsius; Home app converts to Fahrenheit automatically for users using \u00b0F.",
+                  "description": "Optional HomeKit temperature range override for Wi-Fi air conditioners. Values are always Celsius; Home app converts to Fahrenheit automatically for users using °F.",
                   "properties": {
                     "minTemperature": {
                       "type": "number",
-                      "title": "Minimum temperature (\u00b0C)",
+                      "title": "Minimum temperature (°C)",
                       "description": "Lowest setpoint exposed to HomeKit. Common values are 16 or 17. Leave empty to use Tuya schema.",
                       "minimum": 0,
                       "maximum": 50
                     },
                     "maxTemperature": {
                       "type": "number",
-                      "title": "Maximum temperature (\u00b0C)",
+                      "title": "Maximum temperature (°C)",
                       "description": "Highest setpoint exposed to HomeKit. Common value is 31. Leave empty to use Tuya schema.",
                       "minimum": 0,
                       "maximum": 60
                     },
                     "temperatureStep": {
                       "type": "number",
-                      "title": "Temperature step (\u00b0C)",
-                      "description": "Set to 1 to suppress 0.5 \u00b0C steps. Values are Celsius even when Home app displays Fahrenheit.",
+                      "title": "Temperature step (°C)",
+                      "description": "Set to 1 to suppress 0.5 °C steps. Values are Celsius even when Home app displays Fahrenheit.",
                       "minimum": 0.1,
                       "maximum": 5,
                       "default": 1
@@ -135,12 +154,12 @@
                 "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.",
+                  "description": "Optional settings for Tuya pet feeders. The plugin exposes a refined HomeKit Valve-style Feed Now control, Quick Feed switch, optional Slow Feed switch, feeding-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.",
+                      "description": "Portions sent when the Valve-style Feed Now control is activated.",
                       "minimum": 1,
                       "maximum": 12,
                       "default": 1
@@ -216,6 +235,7 @@
       "items": [
         "options.homeWhitelist",
         "options.enableAdaptiveLighting",
+        "options.preserveHomeKitNames",
         "options.deviceOverrides",
         "options.debug",
         "options.debugLevel"

package/dist/platform.js

@@ -48,6 +48,11 @@ class TuyaPlatform {
     this.config.mode = "cloud";
     this.options.projectType = "3";
     this.options.enableAdaptiveLighting = this.options.enableAdaptiveLighting === true;
+    // Preserve names changed by users in Apple Home/Homebridge by default.
+    // nameOverride is accepted as a compatibility alias used by some plugins.
+    this.options.preserveHomeKitNames = typeof this.options.preserveHomeKitNames === 'boolean'
+      ? this.options.preserveHomeKitNames
+      : (typeof this.options.nameOverride === 'boolean' ? this.options.nameOverride : true);
 
     if (!this.options.userCode || String(this.options.userCode).trim().length === 0) {
       this.log.error("[Tuya QR] Missing Tuya User Code. Open Homebridge UI → Plugins → Tuya without developer account for Homebridge → Settings, generate/scan the QR code, then save.");
@@ -151,6 +156,41 @@ class TuyaPlatform {
           delete item.alarm;
         }
       }
+      if (item.preserveHomeKitNames === undefined && typeof item.nameOverride === 'boolean') {
+        item.preserveHomeKitNames = item.nameOverride;
+      }
+      if (item.preserveHomeKitNames !== undefined && typeof item.preserveHomeKitNames !== 'boolean') {
+        this.log.warn('[Tuya QR] Ignoring invalid preserveHomeKitNames override for id "%s". Use true or false.', id);
+        delete item.preserveHomeKitNames;
+      }
+      delete item.nameOverride;
+      if (item.switchNames !== undefined) {
+        if (!item.switchNames || typeof item.switchNames !== 'object' || Array.isArray(item.switchNames)) {
+          this.log.warn('[Tuya QR] Ignoring invalid switchNames override for id "%s" because it is not an object.', id);
+          delete item.switchNames;
+        } else {
+          const normalizedSwitchNames = {};
+          for (const [rawCode, rawName] of Object.entries(item.switchNames)) {
+            const code = String(rawCode || '').trim();
+            const requestedName = String(rawName || '').trim();
+            if (!code || !requestedName) {
+              continue;
+            }
+            const fallbackName = requestedName.replace(/[^A-Za-z0-9 '\s]/g, ' ').replace(/\s+/g, ' ').trim();
+            const safeName = sanitizeName(requestedName) ?? fallbackName;
+            if (!safeName) {
+              this.log.warn('[Tuya QR] Ignoring invalid switch name for code "%s" on device id "%s".', code, id);
+              continue;
+            }
+            normalizedSwitchNames[code] = safeName;
+          }
+          if (Object.keys(normalizedSwitchNames).length > 0) {
+            item.switchNames = normalizedSwitchNames;
+          } else {
+            delete item.switchNames;
+          }
+        }
+      }
       if (item.adaptiveLighting !== undefined) {
         if (typeof item.adaptiveLighting === 'boolean') {
           item.adaptiveLighting = { enabled: item.adaptiveLighting };
@@ -292,6 +332,9 @@ class TuyaPlatform {
         alarm: deviceConfig?.alarm ? JSON.stringify(deviceConfig.alarm) : undefined,
         globalAdaptiveLighting: !!this.options.enableAdaptiveLighting,
         adaptiveLighting: deviceConfig?.adaptiveLighting ? JSON.stringify(deviceConfig.adaptiveLighting) : undefined,
+        globalPreserveHomeKitNames: this.options.preserveHomeKitNames !== false,
+        preserveHomeKitNames: typeof deviceConfig?.preserveHomeKitNames === 'boolean' ? deviceConfig.preserveHomeKitNames : undefined,
+        switchNames: deviceConfig?.switchNames ? JSON.stringify(deviceConfig.switchNames) : undefined,
       };
       const { changed: configChanged } = this.configHash.hasConfigChanged(device.id, configToHash);
       device.configChanged = configChanged;

package/dist/shared/accessories/PetFeederAccessory.js

@@ -27,10 +27,92 @@ class PetFeederAccessory extends BaseAccessory_1.default {
         };
     }
     configureServices() {
+        this.configureFeedNowValve();
         this.configureQuickFeed();
-        this.configureManualFeed();
         this.configureSlowFeed();
         this.configureFeedState();
+        this.removeLegacyManualFeedSwitch();
+    }
+    isFeeding() {
+        const schema = this.getSchema(...SCHEMA_CODE.FEED_STATE);
+        if (!schema) {
+            return false;
+        }
+        const status = this.getStatus(schema.code);
+        if (!status) {
+            return false;
+        }
+        const value = status.value;
+        if (typeof value === 'boolean') {
+            return value;
+        }
+        if (typeof value === 'number') {
+            return value > 0;
+        }
+        const text = String(value ?? '').trim().toLowerCase();
+        if (!text) {
+            return false;
+        }
+        return !['0', 'false', 'idle', 'standby', 'normal', 'done', 'finish', 'finished', 'complete', 'completed', 'none', 'ready'].includes(text);
+    }
+    getFeedNowCommand() {
+        const manualSchema = this.getSchema(...SCHEMA_CODE.MANUAL_FEED);
+        if (manualSchema) {
+            const { manualFeedAmount } = this.getPetFeederConfig();
+            return [{ code: manualSchema.code, value: manualFeedAmount }];
+        }
+        const quickSchema = this.getSchema(...SCHEMA_CODE.QUICK_FEED);
+        if (quickSchema) {
+            return [{ code: quickSchema.code, value: true }];
+        }
+        return undefined;
+    }
+    configureFeedNowValve() {
+        const commands = this.getFeedNowCommand();
+        if (!commands) {
+            return;
+        }
+        const name = `${this.device?.name || 'Pet Feeder'} Feed Now`;
+        const service = this.accessory.getServiceById(this.Service.Valve, 'feed_now')
+            || this.accessory.addService(this.Service.Valve, name, 'feed_now');
+        (0, Name_1.configureName)(this, service, name);
+        const valveType = this.Characteristic.ValveType.GENERIC_VALVE ?? this.Characteristic.ValveType.IRRIGATION;
+        service.setCharacteristic(this.Characteristic.ValveType, valveType);
+        const { ACTIVE, INACTIVE } = this.Characteristic.Active;
+        const { IN_USE, NOT_IN_USE } = this.Characteristic.InUse;
+        service.getCharacteristic(this.Characteristic.Active)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return this.isFeeding() ? ACTIVE : INACTIVE;
+        })
+            .onSet(async (value) => {
+            this.checkOnlineStatus();
+            if (value === ACTIVE) {
+                await this.sendCommands(commands, true);
+                service.getCharacteristic(this.Characteristic.Active).updateValue(ACTIVE);
+                service.getCharacteristic(this.Characteristic.InUse).updateValue(IN_USE);
+                setTimeout(() => {
+                    if (!this.isFeeding()) {
+                        service.getCharacteristic(this.Characteristic.Active).updateValue(INACTIVE);
+                        service.getCharacteristic(this.Characteristic.InUse).updateValue(NOT_IN_USE);
+                    }
+                }, 2500);
+            }
+            else {
+                // Tuya pet feeders usually expose manual_feed/quick_feed as momentary actions,
+                // not cancellable feed sessions.  Show HomeKit as inactive but do not send a
+                // fake cancel command that the device does not support.
+                service.getCharacteristic(this.Characteristic.Active).updateValue(INACTIVE);
+                if (!this.isFeeding()) {
+                    service.getCharacteristic(this.Characteristic.InUse).updateValue(NOT_IN_USE);
+                }
+            }
+        });
+        service.getCharacteristic(this.Characteristic.InUse)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return this.isFeeding() ? IN_USE : NOT_IN_USE;
+        });
     }
     configureActionSwitch(schema, name, subtype, onSet) {
         if (!schema) {
@@ -42,7 +124,7 @@ class PetFeederAccessory extends BaseAccessory_1.default {
         service.getCharacteristic(this.Characteristic.On)
             .onGet(() => {
             this.checkOnlineStatus();
-            // quick_feed/manual_feed are momentary actions.  Always display them as off.
+            // quick_feed is a momentary action. Always display it as off.
             return false;
         })
             .onSet(async (value) => {
@@ -74,13 +156,6 @@ class PetFeederAccessory extends BaseAccessory_1.default {
             await this.sendCommands([{ code: schema.code, value: true }], true);
         });
     }
-    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);
-        });
-    }
     configureSlowFeed() {
         const schema = this.getSchema(...SCHEMA_CODE.SLOW_FEED);
         const { exposeSlowFeed } = this.getPetFeederConfig();
@@ -101,10 +176,16 @@ class PetFeederAccessory extends BaseAccessory_1.default {
         service.getCharacteristic(this.Characteristic.OccupancyDetected)
             .onGet(() => {
             this.checkOnlineStatus();
-            const value = this.getStatus(schema.code)?.value;
-            return value === 'feeding' ? OCCUPANCY_DETECTED : OCCUPANCY_NOT_DETECTED;
+            return this.isFeeding() ? OCCUPANCY_DETECTED : OCCUPANCY_NOT_DETECTED;
         });
     }
+    removeLegacyManualFeedSwitch() {
+        const service = this.accessory.getServiceById(this.Service.Switch, 'manual_feed');
+        if (service) {
+            this.log.warn(`Removing old pet feeder Manual Feed switch from cache: ${service.displayName}`);
+            this.accessory.removeService(service);
+        }
+    }
 }
 exports.default = PetFeederAccessory;
 //# sourceMappingURL=PetFeederAccessory.js.map

package/dist/shared/accessories/SwitchAccessory.js

@@ -102,7 +102,7 @@ class SwitchAccessory extends BaseAccessory_1.default {
             const name = schemata.length === 1 ? this.device.name : `${this.device.name} ${switchNum}`;
             // Extract schema info from the cached service's current state
             // In this case we reuse the service without re-adding it
-            (0, Name_1.configureName)(this, service, name);
+            (0, Name_1.configureName)(this, service, name, { overrideName: this.getSwitchNameOverride(subtype) });
         }
         // Other
         (0, CurrentTemperature_1.configureCurrentTemperature)(this, undefined, this.getSchema(...SCHEMA_CODE.CURRENT_TEMP));
@@ -118,10 +118,17 @@ class SwitchAccessory extends BaseAccessory_1.default {
     mainService() {
         return this.Service.Switch;
     }
+    getSwitchNameOverride(schemaCode) {
+        const config = typeof this.platform.getDeviceConfig === 'function'
+            ? this.platform.getDeviceConfig(this.device)
+            : undefined;
+        const value = config?.switchNames?.[schemaCode];
+        return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+    }
     configureSwitch(schema, name) {
         const service = this.accessory.getService(schema.code)
             || this.accessory.addService(this.mainService(), name, schema.code);
-        (0, Name_1.configureName)(this, service, name);
+        (0, Name_1.configureName)(this, service, name, { overrideName: this.getSwitchNameOverride(schema.code) });
         (0, On_1.configureOn)(this, service, schema);
         if (schema.code === this.getSchema(...SCHEMA_CODE.ON)?.code) {
             (0, EnergyUsage_1.configureEnergyUsage)(this.platform.api, this, service, this.getSchema(...SCHEMA_CODE.CURRENT), this.getSchema(...SCHEMA_CODE.POWER), this.getSchema(...SCHEMA_CODE.VOLTAGE), this.getSchema(...SCHEMA_CODE.TOTAL_POWER));

package/dist/shared/accessories/characteristic/Name.js

@@ -2,14 +2,70 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureName = configureName;
 const util_1 = require("../../util/util");
-function configureName(accessory, service, name) {
-    const fallbackName = name.replace(/[^A-Za-z0-9 '\s]/g, ' ').replace(/\s+/g, ' ').trim();
-    const safeName = (0, util_1.sanitizeName)(name) ?? (fallbackName || 'Tuya Service');
-    service.setCharacteristic(accessory.Characteristic.Name, safeName);
-    if (!service.testCharacteristic(accessory.Characteristic.ConfiguredName)) {
-        service.addOptionalCharacteristic(accessory.Characteristic.ConfiguredName); // silence warning
-    }
-    // update every time so cached invalid names get corrected on restart
-    service.setCharacteristic(accessory.Characteristic.ConfiguredName, safeName);
+
+function toSafeName(name, fallback = 'Tuya Service') {
+    const raw = String(name ?? '');
+    const asciiFallback = raw
+        .replace(/[^A-Za-z0-9 '\s]/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim();
+    return (0, util_1.sanitizeName)(raw) ?? (asciiFallback || fallback);
 }
-//# sourceMappingURL=Name.js.map
+
+function getPreserveHomeKitNames(accessory) {
+    const globalSetting = accessory?.platform?.options?.preserveHomeKitNames !== false;
+    const device = accessory?.device;
+    const deviceConfig = device && typeof accessory?.platform?.getDeviceConfig === 'function'
+        ? accessory.platform.getDeviceConfig(device)
+        : undefined;
+    if (typeof deviceConfig?.preserveHomeKitNames === 'boolean') {
+        return deviceConfig.preserveHomeKitNames;
+    }
+    return globalSetting;
+}
+
+/**
+ * Configure a HomeKit service name without overwriting a user-renamed
+ * ConfiguredName on every Homebridge restart.
+ *
+ * Priority:
+ *   1. Explicit override supplied by the plugin configuration.
+ *   2. Existing HomeKit ConfiguredName when preservation is enabled.
+ *   3. Plugin-generated default name.
+ */
+function configureName(accessory, service, name, options = {}) {
+    const explicitOverride = typeof options.overrideName === 'string' && options.overrideName.trim()
+        ? options.overrideName.trim()
+        : undefined;
+    const generatedName = toSafeName(name);
+    const forcedName = explicitOverride ? toSafeName(explicitOverride, generatedName) : undefined;
+    const preserveExisting = options.preserveExisting ?? getPreserveHomeKitNames(accessory);
+
+    const hadConfiguredName = service.testCharacteristic(accessory.Characteristic.ConfiguredName);
+    if (!hadConfiguredName) {
+        service.addOptionalCharacteristic(accessory.Characteristic.ConfiguredName);
+    }
+
+    const configuredCharacteristic = service.getCharacteristic(accessory.Characteristic.ConfiguredName);
+    const currentConfiguredName = hadConfiguredName && typeof configuredCharacteristic.value === 'string'
+        ? configuredCharacteristic.value.trim()
+        : '';
+
+    let targetName;
+    if (forcedName) {
+        targetName = forcedName;
+    }
+    else if (preserveExisting && currentConfiguredName) {
+        // Preserve names changed by the user in Apple Home/Homebridge. If an
+        // older cached name is invalid, correct it once rather than reverting
+        // to the generated default.
+        targetName = toSafeName(currentConfiguredName, generatedName);
+    }
+    else {
+        targetName = generatedName;
+    }
+
+    service.updateCharacteristic(accessory.Characteristic.Name, targetName);
+    service.updateCharacteristic(accessory.Characteristic.ConfiguredName, targetName);
+}
+//# sourceMappingURL=Name.js.map

package/homebridge-ui/public/index.html

@@ -127,6 +127,55 @@
   <small class="form-text text-muted">HomeKit automatic mode may send color-temperature updates roughly once per minute while Adaptive Lighting is active.</small>
 </div>
 
+<div class="tuya-nodev-card">
+  <div class="tuya-nodev-title">HomeKit Names</div>
+  <p class="tuya-nodev-small mb-3">
+    Preserve names assigned in Apple Home so multi-gang switches and outlets do not return to generated names such as <em>Brilliant 1</em> and <em>Brilliant 2</em> after every Homebridge restart. You can also set explicit channel names below.
+  </p>
+  <div class="form-check mb-3">
+    <input id="tuyaNodevPreserveNames" class="form-check-input" type="checkbox" checked>
+    <label class="form-check-label" for="tuyaNodevPreserveNames">Preserve names changed in HomeKit</label>
+  </div>
+  <small class="form-text text-muted">Explicit channel names take priority over preserved HomeKit names. Disable preservation only when you want the plugin to reapply generated names at every restart.</small>
+
+  <div class="form-group mt-3">
+    <label for="tuyaNodevSwitchDevice">Select multi-switch / outlet device</label>
+    <select id="tuyaNodevSwitchDevice" class="form-control">
+      <option value="">Load devices first...</option>
+    </select>
+  </div>
+
+  <div id="tuyaNodevSwitchChannels" class="tuya-nodev-table-wrap">
+    <div class="tuya-nodev-small">Select a detected multi-switch device to configure channel names.</div>
+  </div>
+
+  <div class="tuya-nodev-actions">
+    <button id="tuyaNodevLoadSwitchDevices" class="btn btn-outline-primary" type="button">Load Detected Devices</button>
+    <button id="tuyaNodevApplySwitchNames" class="btn btn-primary" type="button">Add / Update Channel Names</button>
+    <button id="tuyaNodevRemoveSwitchNames" class="btn btn-outline-danger" type="button">Remove Channel Name Overrides</button>
+  </div>
+
+  <div id="tuyaNodevSwitchStatus" class="tuya-nodev-ac-status alert alert-secondary">
+    Names changed directly in Apple Home are preserved automatically when the option above is enabled.
+  </div>
+
+  <div class="tuya-nodev-table-wrap">
+    <table class="tuya-nodev-table">
+      <thead>
+        <tr>
+          <th>Device</th>
+          <th>Device ID</th>
+          <th>Configured channel names</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody id="tuyaNodevSwitchOverrideRows">
+        <tr><td colspan="4" class="tuya-nodev-small">No explicit channel-name overrides configured.</td></tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+
 <div class="tuya-nodev-card">
   <div class="tuya-nodev-title">Air Conditioner Temperature Overrides</div>
   <p class="tuya-nodev-small mb-3">
@@ -209,6 +258,12 @@
     el.textContent = message;
   }
 
+  function setSwitchStatus(message, type = 'secondary') {
+    const el = $('tuyaNodevSwitchStatus');
+    el.className = `tuya-nodev-ac-status alert alert-${type}`;
+    el.textContent = message;
+  }
+
   function firstNonEmpty(...values) {
     for (const value of values) {
       if (value === undefined || value === null) {
@@ -263,6 +318,7 @@
     }
     cfg.options.projectType = '3';
     cfg.options.enableAdaptiveLighting = $('tuyaNodevAdaptiveLighting')?.checked === true;
+    cfg.options.preserveHomeKitNames = $('tuyaNodevPreserveNames')?.checked !== false;
     if (!Array.isArray(cfg.options.deviceOverrides)) {
       cfg.options.deviceOverrides = [];
     }
@@ -286,6 +342,7 @@
     ensureConfig();
     await homebridge.updatePluginConfig([currentConfig]);
     renderAcOverrides();
+    renderSwitchNameOverrides();
   }
 
   function stopPolling() {
@@ -310,6 +367,191 @@
     enableSaving();
   }
 
+  function getSwitchCodes(device) {
+    const codes = Array.from(new Set([
+      ...(Array.isArray(device?.schemaCodes) ? device.schemaCodes : []),
+      ...(Array.isArray(device?.statusCodes) ? device.statusCodes : []),
+    ].map((code) => String(code || '').trim()).filter(Boolean)));
+
+    return codes.filter((code) => {
+      if (code === 'switch_inching') return false;
+      return code === 'switch'
+        || /^switch_\d+$/.test(code)
+        || /^switch_usb_?\d+$/.test(code);
+    }).sort((a, b) => a.localeCompare(b, undefined, { numeric: true }));
+  }
+
+  function getSwitchNameOverrides() {
+    const cfg = ensureConfig();
+    return (cfg.options.deviceOverrides || []).filter((item) => item && item.id && item.switchNames && typeof item.switchNames === 'object' && !Array.isArray(item.switchNames));
+  }
+
+  function findDeviceOverride(id) {
+    const cfg = ensureConfig();
+    return (cfg.options.deviceOverrides || []).find((item) => item && item.id === id);
+  }
+
+  function ensureDeviceOverride(id) {
+    const cfg = ensureConfig();
+    let override = (cfg.options.deviceOverrides || []).find((item) => item && item.id === id);
+    if (!override) {
+      override = { id };
+      cfg.options.deviceOverrides.push(override);
+    }
+    return override;
+  }
+
+  function removeEmptyDeviceOverride(id) {
+    const cfg = ensureConfig();
+    const index = cfg.options.deviceOverrides.findIndex((item) => item && item.id === id);
+    if (index < 0) return;
+    const item = cfg.options.deviceOverrides[index];
+    const meaningfulKeys = Object.keys(item).filter((key) => key !== 'id' && item[key] !== undefined && item[key] !== null && item[key] !== '');
+    if (meaningfulKeys.length === 0) {
+      cfg.options.deviceOverrides.splice(index, 1);
+    }
+  }
+
+  function populateSwitchDeviceSelect(devices) {
+    const select = $('tuyaNodevSwitchDevice');
+    const current = select.value;
+    const candidates = devices
+      .map((device) => ({ ...device, switchCodes: getSwitchCodes(device) }))
+      .filter((device) => device.switchCodes.length > 0)
+      .sort((a, b) => {
+        if ((a.switchCodes.length > 1) !== (b.switchCodes.length > 1)) {
+          return a.switchCodes.length > 1 ? -1 : 1;
+        }
+        return String(a.name).localeCompare(String(b.name));
+      });
+
+    if (!candidates.length) {
+      select.innerHTML = '<option value="">No switch/outlet devices found</option>';
+      renderSwitchChannelEditor();
+      return;
+    }
+
+    select.innerHTML = '<option value="">Select a switch/outlet device...</option>' + candidates.map((device) => {
+      const label = `${device.name} — ${device.switchCodes.length} channel${device.switchCodes.length === 1 ? '' : 's'} — ${device.id}`;
+      return `<option value="${escapeHtml(device.id)}">${escapeHtml(label)}</option>`;
+    }).join('');
+
+    if (current && candidates.some((device) => device.id === current)) {
+      select.value = current;
+    }
+    renderSwitchChannelEditor();
+  }
+
+  function renderSwitchChannelEditor() {
+    const container = $('tuyaNodevSwitchChannels');
+    const id = $('tuyaNodevSwitchDevice')?.value || '';
+    if (!id) {
+      container.innerHTML = '<div class="tuya-nodev-small">Select a detected multi-switch device to configure channel names.</div>';
+      return;
+    }
+    const device = detectedDevices.find((item) => item.id === id);
+    const override = findDeviceOverride(id);
+    const configured = override?.switchNames || {};
+    const codes = getSwitchCodes(device || { schemaCodes: Object.keys(configured) });
+    const allCodes = Array.from(new Set([...codes, ...Object.keys(configured)])).sort((a, b) => a.localeCompare(b, undefined, { numeric: true }));
+    if (!allCodes.length) {
+      container.innerHTML = '<div class="tuya-nodev-small">No controllable switch channels were found for this device.</div>';
+      return;
+    }
+    container.innerHTML = `
+      <table class="tuya-nodev-table">
+        <thead><tr><th>Tuya channel</th><th>HomeKit name</th></tr></thead>
+        <tbody>${allCodes.map((code) => `
+          <tr>
+            <td><code>${escapeHtml(code)}</code></td>
+            <td><input class="form-control tuya-nodev-switch-name-input" type="text" data-code="${escapeHtml(code)}" value="${escapeHtml(configured[code] || '')}" placeholder="Leave blank to preserve the HomeKit name"></td>
+          </tr>`).join('')}</tbody>
+      </table>`;
+  }
+
+  function renderSwitchNameOverrides() {
+    const tbody = $('tuyaNodevSwitchOverrideRows');
+    if (!tbody) return;
+    const overrides = getSwitchNameOverrides();
+    if (!overrides.length) {
+      tbody.innerHTML = '<tr><td colspan="4" class="tuya-nodev-small">No explicit channel-name overrides configured.</td></tr>';
+      return;
+    }
+    tbody.innerHTML = overrides.map((override) => {
+      const name = getDeviceName(override.id) || 'Unknown / not in detected cache';
+      const names = Object.entries(override.switchNames || {})
+        .map(([code, value]) => `<code>${escapeHtml(code)}</code>: ${escapeHtml(value)}`)
+        .join('<br>');
+      return `
+        <tr>
+          <td>${escapeHtml(name)}</td>
+          <td><code>${escapeHtml(override.id)}</code></td>
+          <td>${names}</td>
+          <td><button class="btn btn-sm btn-outline-secondary tuya-nodev-edit-switch-names" type="button" data-id="${escapeHtml(override.id)}">Edit</button></td>
+        </tr>`;
+    }).join('');
+    tbody.querySelectorAll('.tuya-nodev-edit-switch-names').forEach((button) => {
+      button.addEventListener('click', () => editSwitchNameOverride(button.getAttribute('data-id')));
+    });
+  }
+
+  function editSwitchNameOverride(id) {
+    const select = $('tuyaNodevSwitchDevice');
+    if (!detectedDevices.some((device) => device.id === id)) {
+      const option = document.createElement('option');
+      option.value = id;
+      option.textContent = `${id} — not currently in detected device cache`;
+      select.appendChild(option);
+    }
+    select.value = id;
+    renderSwitchChannelEditor();
+    select.scrollIntoView({ behavior: 'smooth', block: 'center' });
+  }
+
+  async function addOrUpdateSwitchNames() {
+    const id = $('tuyaNodevSwitchDevice')?.value || '';
+    if (!id) {
+      setSwitchStatus('Select a switch/outlet device first.', 'warning');
+      return;
+    }
+    const inputs = Array.from(document.querySelectorAll('.tuya-nodev-switch-name-input'));
+    const switchNames = {};
+    for (const input of inputs) {
+      const code = String(input.getAttribute('data-code') || '').trim();
+      const value = String(input.value || '').trim();
+      if (code && value) switchNames[code] = value;
+    }
+    const override = ensureDeviceOverride(id);
+    if (Object.keys(switchNames).length > 0) {
+      override.switchNames = switchNames;
+      setSwitchStatus('Explicit channel names staged. Click Save Configuration, then restart Homebridge.', 'success');
+    } else {
+      delete override.switchNames;
+      removeEmptyDeviceOverride(id);
+      setSwitchStatus('No explicit names entered. HomeKit-renamed services will still be preserved by the global option.', 'info');
+    }
+    await syncConfigToUi();
+    markDirty();
+    renderSwitchChannelEditor();
+  }
+
+  async function removeSelectedSwitchNames() {
+    const id = $('tuyaNodevSwitchDevice')?.value || '';
+    if (!id) {
+      setSwitchStatus('Select a switch/outlet device first.', 'warning');
+      return;
+    }
+    const override = findDeviceOverride(id);
+    if (override) {
+      delete override.switchNames;
+      removeEmptyDeviceOverride(id);
+    }
+    await syncConfigToUi();
+    markDirty();
+    renderSwitchChannelEditor();
+    setSwitchStatus('Explicit channel-name overrides removed. Preserved HomeKit names will be used.', 'success');
+  }
+
   function getDeviceName(id) {
     const device = detectedDevices.find((item) => item.id === id);
     return device ? device.name : '';
@@ -375,6 +617,7 @@
     const current = select.value;
     if (!devices.length) {
       select.innerHTML = '<option value="">No detected devices found</option>';
+      populateSwitchDeviceSelect(devices);
       return;
     }
 
@@ -387,6 +630,7 @@
     if (current && devices.some((device) => device.id === current)) {
       select.value = current;
     }
+    populateSwitchDeviceSelect(devices);
   }
 
   async function loadDetectedDevices(showToast = true) {
@@ -760,6 +1004,7 @@
       $('tuyaNodevName').value = currentConfig.name || 'Tuya without developer account';
       if (currentConfig.options?.userCode) setUserCode(currentConfig.options.userCode);
       $('tuyaNodevAdaptiveLighting').checked = currentConfig.options?.enableAdaptiveLighting === true;
+      $('tuyaNodevPreserveNames').checked = currentConfig.options?.preserveHomeKitNames !== false;
       ensureConfig();
 
       if (homebridge.showSchemaForm) homebridge.showSchemaForm();
@@ -775,8 +1020,11 @@
           if (block.options?.userCode) setUserCode(block.options.userCode);
           else if (getUserCode()) setUserCode(getUserCode());
           $('tuyaNodevAdaptiveLighting').checked = block.options?.enableAdaptiveLighting === true;
+          $('tuyaNodevPreserveNames').checked = block.options?.preserveHomeKitNames !== false;
           ensureConfig();
           renderAcOverrides();
+          renderSwitchNameOverrides();
+          renderSwitchChannelEditor();
         }
       });
 
@@ -793,6 +1041,11 @@
         markDirty();
         setStatus('Adaptive Lighting setting changed. Click Save Configuration when ready.', 'info');
       });
+      $('tuyaNodevPreserveNames').addEventListener('change', async () => {
+        await syncConfigToUi();
+        markDirty();
+        setSwitchStatus('HomeKit name preservation setting changed. Click Save Configuration, then restart Homebridge.', 'info');
+      });
       $('tuyaNodevUserCode').addEventListener('input', () => {
         isAuthenticated = false;
         disableSaving();
@@ -801,6 +1054,10 @@
       $('tuyaNodevLoadDevices').addEventListener('click', () => loadDetectedDevices(true));
       $('tuyaNodevApplyAc').addEventListener('click', addOrUpdateAcOverride);
       $('tuyaNodevRemoveAc').addEventListener('click', removeSelectedAcOverride);
+      $('tuyaNodevLoadSwitchDevices').addEventListener('click', () => loadDetectedDevices(true));
+      $('tuyaNodevSwitchDevice').addEventListener('change', renderSwitchChannelEditor);
+      $('tuyaNodevApplySwitchNames').addEventListener('click', addOrUpdateSwitchNames);
+      $('tuyaNodevRemoveSwitchNames').addEventListener('click', removeSelectedSwitchNames);
 
       if (!getUserCode()) {
         await discoverExistingAuth(false);

package/package.json

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