homebridge-tuya-without-developer-account 1.0.8 → 1.0.11

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 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**.
+- Save now performs a final existing-auth check before blocking, so normal configuration-only changes are not prevented when a QR auth token is already saved.
+- Name and AC override UI changes also mark the custom config as dirty more reliably.
+
 ## 1.0.8
 
 - Added optional HomeKit Adaptive Lighting support for eligible Tuya lights.

package/README.md

@@ -250,6 +250,15 @@ 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.
+
 Version 1.0.8 adds optional HomeKit Adaptive Lighting support. Enable it in the Homebridge plugin settings with **Enable Adaptive Lighting for eligible CCT/RGBCW lights**.
 
 Adaptive Lighting is applied only to Tuya light accessories that expose both:

package/homebridge-ui/public/index.html

@@ -191,7 +191,9 @@
   let currentConfig = null;
   let pollTimer = null;
   let isAuthenticated = false;
+  let isDirty = false;
   let detectedDevices = [];
+  let discoveredUserCode = '';
 
   const $ = (id) => document.getElementById(id);
 
@@ -207,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() {
@@ -224,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)) {
@@ -269,6 +305,11 @@
     if (homebridge.enableSaveButton) homebridge.enableSaveButton();
   }
 
+  function markDirty() {
+    isDirty = true;
+    enableSaving();
+  }
+
   function getDeviceName(id) {
     const device = detectedDevices.find((item) => item.id === id);
     return device ? device.name : '';
@@ -417,9 +458,7 @@
       const name = getDeviceName(id) || id;
       setAcStatus(`AC override saved in plugin config for ${name}: ${minTemperature}–${maxTemperature} °C, step ${temperatureStep} °C. Click Save Configuration when ready.`, 'success');
       homebridge.toast.success('AC temperature override added to config.', 'Tuya');
-      if (isAuthenticated) {
-        enableSaving();
-      }
+      markDirty();
     } catch (e) {
       setAcStatus(e.message || 'Failed to add AC override.', 'danger');
     }
@@ -453,9 +492,7 @@
       setAcStatus('Selected AC override was removed from the plugin config. Click Save Configuration when ready.', 'success');
       homebridge.toast.success('AC temperature override removed from config.', 'Tuya');
     }
-    if (isAuthenticated) {
-      enableSaving();
-    }
+    markDirty();
   }
 
   async function checkAuth(showSuccessToast = false) {
@@ -589,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(),
@@ -600,18 +665,28 @@
   }
 
   async function saveConfig() {
-    if (!isAuthenticated) {
-      setStatus('Scan and approve the QR code before saving.', 'warning');
-      return;
+    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) {
+        // Do a last auth check here. This prevents normal configuration-only changes
+        // such as Adaptive Lighting from being blocked when the token already exists
+        // but this UI session has not marked itself authenticated yet.
+        const auth = await homebridge.request('/auth/status', { userCode });
+        isAuthenticated = !!auth.authenticated;
+        if (!isAuthenticated) {
+          throw new Error('Scan and approve the QR code, or click Check Existing Auth, before saving.');
+        }
+      }
       homebridge.showSpinner();
       $('tuyaNodevSave').disabled = true;
 
@@ -649,11 +724,13 @@
 
       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.';
+        isDirty = false;
         homebridge.toast.success(message, 'Tuya');
         setStatus(message, 'success');
         return;
       }
 
+      isDirty = false;
       homebridge.toast.success('Configuration saved. Restart Homebridge to load devices.', 'Tuya');
       setStatus('Configuration saved. Restart Homebridge to load devices.', 'success');
     } catch (e) {
@@ -661,7 +738,7 @@
       homebridge.toast.error(e.message || 'Failed to save configuration.', 'Tuya');
     } finally {
       homebridge.hideSpinner();
-      if (isAuthenticated) {
+      if (isAuthenticated || isDirty) {
         $('tuyaNodevSave').disabled = false;
       }
     }
@@ -676,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) => {
@@ -687,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();
         }
       });
@@ -699,10 +784,14 @@
       $('tuyaNodevCheck').addEventListener('click', () => checkAuth(true));
       $('tuyaNodevClear').addEventListener('click', clearAuth);
       $('tuyaNodevSave').addEventListener('click', saveConfig);
-      $('tuyaNodevName').addEventListener('input', syncConfigToUi);
+      $('tuyaNodevName').addEventListener('input', async () => {
+        await syncConfigToUi();
+        markDirty();
+      });
       $('tuyaNodevAdaptiveLighting').addEventListener('change', async () => {
         await syncConfigToUi();
-        if (isAuthenticated) enableSaving();
+        markDirty();
+        setStatus('Adaptive Lighting setting changed. Click Save Configuration when ready.', 'info');
       });
       $('tuyaNodevUserCode').addEventListener('input', () => {
         isAuthenticated = false;
@@ -713,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.8",
+  "version": "1.0.11",
   "description": "Homebridge plugin for Tuya and Smart Life devices using QR cloud authentication without a Tuya IoT developer account.",
   "license": "MIT",
   "author": "Kosztyk",