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

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 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.
+- Automatically removes cached `switch_inching` Switch/Outlet services from multi-gang switch accessories when the accessory is reconfigured.
+- Filters hidden/internal switch configuration DPs from switch auto-discovery so they cannot create invalid HomeKit names.
+- Prevents future HAP-NodeJS invalid-name warnings caused by the raw `switch_inching` service after the affected accessory cache is refreshed.
+
+## 1.0.11
+
+- Fixed custom Homebridge UI initialization so the Adaptive Lighting checkbox stays checked after saving and reopening plugin settings.
+- Fixed config reload handling so saved `options.enableAdaptiveLighting` is copied into the checkbox before the UI normalizes/stages plugin config.
+- Preserved the `options.userCode` fix from v1.0.10 while preventing checkbox defaults from overwriting saved values.
+
+## 1.0.10
+
+- Fixed the custom Homebridge settings UI so saving Adaptive Lighting or other configuration-only changes preserves `options.userCode`.
+- Added automatic discovery of existing `tuya-ha-qr-auth.<USER_CODE>.json` files from Homebridge storage. If the config is missing `userCode` but an auth file exists, the UI restores the User Code field and asks the user to save.
+- Prevented empty User Code values from overwriting an existing QR-auth configuration during `updatePluginConfig()`.
+
 ## 1.0.9
 
 - Fixed the custom Homebridge settings UI so toggling Adaptive Lighting marks the config as changed and enables **Save Configuration**.

package/README.md

@@ -251,6 +251,10 @@ HomeKit stores temperature characteristic metadata in Celsius. Do not enter Fahr
 ## Adaptive Lighting
 
 
+### v1.0.11 User Code preservation fix
+
+Version 1.0.11 fixes a custom settings UI regression where saving Adaptive Lighting or other configuration-only changes could preserve the auth file but remove `options.userCode` from `config.json`. The UI now preserves the existing User Code and can recover it automatically from saved `tuya-ha-qr-auth.<USER_CODE>.json` files.
+
 ### v1.0.9 UI save-state fix
 
 Version 1.0.9 fixes the custom settings UI so changing the Adaptive Lighting checkbox immediately enables **Save Configuration**. If QR authentication is already saved, the UI performs a final auth check during save and no longer blocks normal configuration-only changes.

package/dist/shared/accessories/SwitchAccessory.js

@@ -20,6 +20,9 @@ const SCHEMA_CODE = {
     CURRENT_HUMIDITY: ['va_humidity', 'humidity_value'],
     INCHING: ['switch_inching'],
 };
+const INTERNAL_SWITCH_SCHEMA_CODES = new Set([
+    'switch_inching',
+]);
 class SwitchAccessory extends BaseAccessory_1.default {
     requiredSchema() {
         return [SCHEMA_CODE.ON];
@@ -30,7 +33,9 @@ class SwitchAccessory extends BaseAccessory_1.default {
             this.platform.log.warn('Remove old service:', oldService.UUID);
             this.accessory.removeService(oldService);
         }
-        const schemata = this.device.schema.filter((schema) => schema.code.startsWith('switch') && schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Boolean);
+        const schemata = this.device.schema.filter((schema) => schema.code.startsWith('switch')
+            && schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Boolean
+            && !INTERNAL_SWITCH_SCHEMA_CODES.has(schema.code));
         this.log.info(`[SwitchAccessory] Found ${schemata.length} switch schemas: ${schemata.map(s => s.code).join(', ')}`);
         // Track which switch services should exist
         const validSubtypes = new Set(schemata.map(s => s.code));
@@ -38,20 +43,27 @@ class SwitchAccessory extends BaseAccessory_1.default {
         // Match both Switch and Outlet UUIDs since OutletAccessory uses Service.Outlet.
         const switchOrOutletUUIDs = new Set([this.Service.Switch.UUID, this.Service.Outlet.UUID]);
         const allSwitchServices = this.accessory.services.filter(s => switchOrOutletUUIDs.has(s.UUID) && s.subtype);
+        for (const oldService of [...allSwitchServices]) {
+            if (oldService.subtype && INTERNAL_SWITCH_SCHEMA_CODES.has(oldService.subtype)) {
+                this.log.warn(`Removing internal Tuya switch config service from cache: ${oldService.displayName} (subtype: ${oldService.subtype})`);
+                this.accessory.removeService(oldService);
+            }
+        }
+        const activeSwitchServices = this.accessory.services.filter(s => switchOrOutletUUIDs.has(s.UUID) && s.subtype);
         // Check early if we'll be keeping services due to auto-detect or config unchanged
         const configChanged = this.device?.configChanged ?? true;
         const isAutoDetecting = this.device?.isAutoDetecting ?? false;
         const shouldRemoveExtras = configChanged && !isAutoDetecting;
-        if (allSwitchServices.length > schemata.length) {
+        if (activeSwitchServices.length > schemata.length) {
             if (shouldRemoveExtras) {
-                this.log.warn(`[SwitchAccessory] Found ${allSwitchServices.length} cached switch services but only ${schemata.length} in schema. Removing extras...`);
+                this.log.warn(`[SwitchAccessory] Found ${activeSwitchServices.length} cached switch services but only ${schemata.length} in schema. Removing extras...`);
             }
             else {
-                this.log.info(`[SwitchAccessory] Found ${allSwitchServices.length} cached switch services but only ${schemata.length} in schema. ${isAutoDetecting ? 'Auto-detect in progress' : 'Config unchanged'} – keeping for now...`);
+                this.log.info(`[SwitchAccessory] Found ${activeSwitchServices.length} cached switch services but only ${schemata.length} in schema. ${isAutoDetecting ? 'Auto-detect in progress' : 'Config unchanged'} – keeping for now...`);
             }
         }
         const keptCachedServices = new Map();
-        for (const oldService of allSwitchServices) {
+        for (const oldService of activeSwitchServices) {
             if (!validSubtypes.has(oldService.subtype)) {
                 if (shouldRemoveExtras) {
                     // Config changed and not in auto-detect, so enforce the new schema
@@ -95,7 +107,7 @@ class SwitchAccessory extends BaseAccessory_1.default {
         // Other
         (0, CurrentTemperature_1.configureCurrentTemperature)(this, undefined, this.getSchema(...SCHEMA_CODE.CURRENT_TEMP));
         (0, CurrentRelativeHumidity_1.configureCurrentRelativeHumidity)(this, undefined, this.getSchema(...SCHEMA_CODE.CURRENT_HUMIDITY));
-        this.configureInching();
+        this.removeInternalSwitchServices();
     }
     async onDeviceInfoUpdate(info) {
         // Re-run service configuration so newly auto-detected switches get their handlers registered.
@@ -115,33 +127,16 @@ class SwitchAccessory extends BaseAccessory_1.default {
             (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));
         }
     }
-    configureInching() {
-        const schema = this.getSchema(...SCHEMA_CODE.INCHING);
-        if (!schema || schema.type !== TuyaDevice_1.TuyaDeviceSchemaType.String) {
-            return;
-        }
-        const service = this.accessory.getService(schema.code)
-            || this.accessory.addService(this.Service.Switch, schema.code, schema.code);
-        (0, Name_1.configureName)(this, service, schema.code);
-        service.getCharacteristic(this.Characteristic.On)
-            .onGet(() => {
-            this.checkOnlineStatus();
-            const status = this.getStatus(schema.code);
-            const buffer = Buffer.from(status.value, 'base64');
-            return (buffer.length === 3) && (buffer[0] === 1);
-        })
-            .onSet(async (value) => {
-            const status = this.getStatus(schema.code);
-            let buffer = Buffer.from(status.value, 'base64');
-            if (buffer.length !== 3) {
-                buffer = Buffer.alloc(3);
+    removeInternalSwitchServices() {
+        const switchOrOutletUUIDs = new Set([this.Service.Switch.UUID, this.Service.Outlet.UUID]);
+        for (const service of [...this.accessory.services]) {
+            if (switchOrOutletUUIDs.has(service.UUID)
+                && service.subtype
+                && INTERNAL_SWITCH_SCHEMA_CODES.has(service.subtype)) {
+                this.log.warn(`Removing internal Tuya switch config service from cache: ${service.displayName} (subtype: ${service.subtype})`);
+                this.accessory.removeService(service);
             }
-            buffer[0] = value ? 1 : 0;
-            await this.sendCommands([{
-                    code: schema.code,
-                    value: buffer.toString('base64'),
-                }], true);
-        });
+        }
     }
 }
 exports.default = SwitchAccessory;

package/homebridge-ui/public/index.html

@@ -193,6 +193,7 @@
   let isAuthenticated = false;
   let isDirty = false;
   let detectedDevices = [];
+  let discoveredUserCode = '';
 
   const $ = (id) => document.getElementById(id);
 
@@ -208,8 +209,39 @@
     el.textContent = message;
   }
 
+  function firstNonEmpty(...values) {
+    for (const value of values) {
+      if (value === undefined || value === null) {
+        continue;
+      }
+      const text = String(value).trim();
+      if (text) {
+        return text;
+      }
+    }
+    return '';
+  }
+
   function getUserCode() {
-    return $('tuyaNodevUserCode').value.trim();
+    return firstNonEmpty(
+      $('tuyaNodevUserCode')?.value,
+      currentConfig?.options?.userCode,
+      discoveredUserCode
+    );
+  }
+
+  function setUserCode(userCode) {
+    const value = String(userCode || '').trim();
+    if (!value) {
+      return;
+    }
+    discoveredUserCode = value;
+    if ($('tuyaNodevUserCode')) {
+      $('tuyaNodevUserCode').value = value;
+    }
+    currentConfig = currentConfig && typeof currentConfig === 'object' ? currentConfig : {};
+    currentConfig.options = currentConfig.options && typeof currentConfig.options === 'object' ? currentConfig.options : {};
+    currentConfig.options.userCode = value;
   }
 
   function getPlatformName() {
@@ -225,7 +257,10 @@
     cfg.platform = PLATFORM;
     cfg.name = getPlatformName();
     cfg.options = cfg.options && typeof cfg.options === 'object' ? cfg.options : {};
-    cfg.options.userCode = getUserCode();
+    const effectiveUserCode = getUserCode();
+    if (effectiveUserCode) {
+      cfg.options.userCode = effectiveUserCode;
+    }
     cfg.options.projectType = '3';
     cfg.options.enableAdaptiveLighting = $('tuyaNodevAdaptiveLighting')?.checked === true;
     if (!Array.isArray(cfg.options.deviceOverrides)) {
@@ -591,6 +626,34 @@
     }
   }
 
+
+
+  async function discoverExistingAuth(showMessage = false) {
+    try {
+      const res = await homebridge.request('/auth/discover', {});
+      if (res && res.found && res.userCode) {
+        const hadUserCode = !!getUserCode();
+        setUserCode(res.userCode);
+        if (!hadUserCode) {
+          isAuthenticated = true;
+          isDirty = true;
+          enableSaving();
+          const who = res.username || res.uid || res.endpoint || res.userCode;
+          setStatus(`Existing Tuya QR auth was found for ${who}. Click Save Configuration to restore the User Code in config.json.`, 'warning');
+        } else if (showMessage) {
+          const who = res.username || res.uid || res.endpoint || res.userCode;
+          setStatus(`Existing Tuya QR auth found for ${who}.`, 'success');
+        }
+        return res;
+      }
+    } catch (e) {
+      if (showMessage) {
+        setStatus(e.message || 'Could not discover existing Tuya QR authentication.', 'warning');
+      }
+    }
+    return null;
+  }
+
   async function verifySavedConfig(userCode) {
     const blocks = await withTimeout(
       homebridge.getPluginConfig(),
@@ -602,12 +665,16 @@
   }
 
   async function saveConfig() {
+    if (!getUserCode()) {
+      await discoverExistingAuth(false);
+    }
     const userCode = getUserCode();
     if (!userCode) {
       setStatus('User Code is required before saving.', 'warning');
       homebridge.toast.error('User Code is required before saving.', 'Tuya');
       return;
     }
+    setUserCode(userCode);
 
     try {
       if (!isAuthenticated) {
@@ -686,10 +753,14 @@
         mode: 'cloud',
         options: { projectType: '3', deviceOverrides: [] },
       };
-      ensureConfig();
+      currentConfig.options = currentConfig.options && typeof currentConfig.options === 'object' ? currentConfig.options : {};
+
+      // Important: restore saved values into the UI before normalising/staging config.
+      // Otherwise the default unchecked checkbox can overwrite a saved true value.
       $('tuyaNodevName').value = currentConfig.name || 'Tuya without developer account';
-      $('tuyaNodevUserCode').value = currentConfig.options?.userCode || '';
+      if (currentConfig.options?.userCode) setUserCode(currentConfig.options.userCode);
       $('tuyaNodevAdaptiveLighting').checked = currentConfig.options?.enableAdaptiveLighting === true;
+      ensureConfig();
 
       if (homebridge.showSchemaForm) homebridge.showSchemaForm();
       window.homebridge.addEventListener('configChanged', (event) => {
@@ -697,10 +768,14 @@
         const block = Array.isArray(data) ? data[0] : data;
         if (block && typeof block === 'object') {
           currentConfig = block;
-          ensureConfig();
+          currentConfig.options = currentConfig.options && typeof currentConfig.options === 'object' ? currentConfig.options : {};
+
+          // Same ordering as initial load: update form controls first, then normalise.
           if (block.name) $('tuyaNodevName').value = block.name;
-          if (block.options?.userCode) $('tuyaNodevUserCode').value = block.options.userCode;
+          if (block.options?.userCode) setUserCode(block.options.userCode);
+          else if (getUserCode()) setUserCode(getUserCode());
           $('tuyaNodevAdaptiveLighting').checked = block.options?.enableAdaptiveLighting === true;
+          ensureConfig();
           renderAcOverrides();
         }
       });
@@ -727,6 +802,10 @@
       $('tuyaNodevApplyAc').addEventListener('click', addOrUpdateAcOverride);
       $('tuyaNodevRemoveAc').addEventListener('click', removeSelectedAcOverride);
 
+      if (!getUserCode()) {
+        await discoverExistingAuth(false);
+      }
+
       await syncConfigToUi();
       await loadDetectedDevices(false);
       if (getUserCode()) {

package/homebridge-ui/server.js

@@ -179,6 +179,7 @@ function collectDevicesFromObject(root) {
       this.onRequest('/qr/status', this.qrStatus.bind(this));
       this.onRequest('/auth/status', this.authStatus.bind(this));
       this.onRequest('/auth/clear', this.clearAuth.bind(this));
+      this.onRequest('/auth/discover', this.discoverAuth.bind(this));
       this.onRequest('/devices/list', this.listDevices.bind(this));
       this.ready();
     }
@@ -271,6 +272,62 @@ function collectDevicesFromObject(root) {
       };
     }
 
+
+
+    async discoverAuth() {
+      let entries;
+      try {
+        entries = await fs.promises.readdir(this.homebridgeStoragePath, { withFileTypes: true });
+      } catch (err) {
+        if (err && err.code === 'ENOENT') {
+          return { found: false, auths: [] };
+        }
+        throw err;
+      }
+
+      const auths = [];
+      for (const entry of entries) {
+        if (!entry.isFile()) {
+          continue;
+        }
+        const match = entry.name.match(/^tuya-ha-qr-auth\.(.+)\.json$/i);
+        if (!match) {
+          continue;
+        }
+        const userCode = normaliseUserCode(match[1]);
+        if (!userCode) {
+          continue;
+        }
+        const file = path.join(this.homebridgeStoragePath, entry.name);
+        try {
+          const stat = await fs.promises.stat(file);
+          const data = await this.readAuthFile(userCode);
+          if (!data) {
+            continue;
+          }
+          auths.push({
+            userCode,
+            file,
+            username: data.username || null,
+            uid: data.tokenInfo?.uid || null,
+            endpoint: data.endpoint || null,
+            savedAt: data.savedAt || null,
+            mtimeMs: stat.mtimeMs,
+          });
+        } catch {
+          // Ignore unreadable or incomplete auth files.
+        }
+      }
+
+      auths.sort((a, b) => (b.savedAt || b.mtimeMs || 0) - (a.savedAt || a.mtimeMs || 0));
+      const latest = auths[0] || null;
+      return {
+        found: !!latest,
+        ...(latest || {}),
+        auths,
+      };
+    }
+
     async authStatus(payload = {}) {
       const userCode = normaliseUserCode(payload.userCode);
       if (!userCode) {

package/package.json

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